diff --git a/app/models/Activity.php b/app/models/Activity.php
index 66b26c32d9e3..9a58ab882fde 100755
--- a/app/models/Activity.php
+++ b/app/models/Activity.php
@@ -47,7 +47,7 @@ class Activity extends Eloquent
 			$activity->user_id = $entity->user_id;
 			$activity->account_id = $entity->account_id;
 		} 
-		else if (Auth::check()) 
+		else if (Auth::check())
 		{
 			$activity->user_id = Auth::user()->id;
 			$activity->account_id = Auth::user()->account_id;	
@@ -257,18 +257,18 @@ class Activity extends Eloquent
 		$client->paid_to_date = $client->paid_to_date + $payment->amount;
 		$client->save();
 
-		if (Auth::check())
-		{
-			$activity = Activity::getBlank();
-			$message = $payment->payment_type_id == PAYMENT_TYPE_CREDIT ? 'applied credit' : 'entered payment';
-			$activity->message = Utils::encodeActivity(Auth::user(), $message);
-		}
-		else
+		if ($payment->contact_id)
 		{
 			$activity = new Activity;
 			$activity->contact_id = $payment->contact_id;
 			$activity->message = Utils::encodeActivity($payment->invitation->contact, 'entered payment');			
 		}
+		else
+		{
+			$activity = Activity::getBlank();
+			$message = $payment->payment_type_id == PAYMENT_TYPE_CREDIT ? 'applied credit' : 'entered payment';
+			$activity->message = Utils::encodeActivity(Auth::user(), $message);
+		}
 
 		$activity->payment_id = $payment->id;
 
diff --git a/app/routes.php b/app/routes.php
index 0b2064af0da8..7f5aeb0bf86d 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -217,7 +217,8 @@ define('DEFAULT_DATETIME_FORMAT', 'F j, Y, g:i a');
 define('DEFAULT_QUERY_CACHE', 120);
 
 
-if (Auth::check() && !Session::has(SESSION_TIMEZONE)) {
+if (Auth::check() && !Session::has(SESSION_TIMEZONE)) 
+{
 	Event::fire('user.refresh');
 }
 
diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index d805ee3d8a04..93a8d9d8d405 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -113,7 +113,7 @@
 	    <tbody data-bind="sortable: { data: invoice_items, afterMove: onDragged }">
 	    	<tr data-bind="event: { mouseover: showActions, mouseout: hideActions }" class="sortable-row">
 	        	<td style="min-width:20px;" class="hide-border td-icon">
-	        		<i data-bind="visible: actionsVisible() &amp;&amp; $parent.invoice_items().length > 1" class="fa fa-sort"></i>
+	        		<i style="display:none" data-bind="visible: actionsVisible() &amp;&amp; $parent.invoice_items().length > 1" class="fa fa-sort"></i>
 	        	</td>
 	            <td style="min-width:160px">	            	
 	            	{{ Former::text('product_key')->useDatalist(Product::getProductKeys($products), 'key')->onkeyup('onItemChange()')
@@ -128,13 +128,13 @@
 	            <td style="min-width:120px">
 	            	<input onkeyup="onItemChange()" data-bind="value: prettyQty, valueUpdate: 'afterkeydown'" style="text-align: right" class="form-control"//>
 	            </td>
-	            <td style="min-width:120px; vertical-align:middle" data-bind="visible: $root.invoice_item_taxes.show">
+	            <td style="display:none" style="min-width:120px; vertical-align:middle" data-bind="visible: $root.invoice_item_taxes.show">
 	            	<select class="form-control" style="width:100%" data-bind="value: tax, options: $root.tax_rates, optionsText: 'displayName'"></select>
 	            </td>
 	        	<td style="min-width:120px;text-align: right;padding-top:9px !important">
 	            	<span data-bind="text: totals.total"></span>
 	            </td>
-	        	<td style="min-width:20px; cursor:pointer" class="hide-border td-icon">
+	        	<td style="display:none" style="min-width:20px; cursor:pointer" class="hide-border td-icon">
 	        		&nbsp;<i data-bind="click: $parent.removeItem, visible: actionsVisible() &amp;&amp; $parent.invoice_items().length > 1" class="fa fa-minus-circle" title="Remove item"/>
 	        	</td>
 	        </tr>
@@ -157,17 +157,17 @@
 				<td colspan="2">Subtotal</td>
 				<td style="text-align: right"><span data-bind="text: totals.subtotal"/></td>
 	        </tr>
-	        <tr data-bind="visible: discount() > 0">
+	        <tr style="display:none" data-bind="visible: discount() > 0">
 	        	<td class="hide-border" colspan="3"/>
 	        	<td class="hide-border" data-bind="visible: $root.invoice_item_taxes.show"/>
 				<td colspan="2">Discount</td>
 				<td style="text-align: right"><span data-bind="text: totals.discounted"/></td>
 	        </tr>
-	        <tr data-bind="visible: $root.invoice_taxes.show">
+	        <tr style="display:none" data-bind="visible: $root.invoice_taxes.show">
 	        	<td class="hide-border" colspan="3"/>
 	        	<td class="hide-border" data-bind="visible: $root.invoice_item_taxes.show"/>	        	
 				<td style="vertical-align: middle">Tax</td>
-				<td><select class="form-control" style="width:100%" data-bind="value: tax, options: $root.tax_rates, optionsText: 'displayName'"></select></td>
+				<td style="min-width:120px"><select class="form-control" style="width:100%" data-bind="value: tax, options: $root.tax_rates, optionsText: 'displayName'"></select></td>
 				<td style="vertical-align: middle; text-align: right"><span data-bind="text: totals.taxAmount"/></td>
 	        </tr>
 	        <tr>
@@ -973,9 +973,12 @@
 
 		if (data) {
 			ko.mapping.fromJS(data, self.mapping, self);			
+			self.is_recurring(parseInt(data.is_recurring));
+			console.log('is rec %s', parseInt(data.is_recurring));
 		} else {
 			self.addItem();
 		}
+		console.log('test')
 
 		self._tax = ko.observable();
 		this.tax = ko.computed({
diff --git a/app/views/splash.blade.php b/app/views/splash.blade.php
index 861454970e24..9eb2d1fef1bf 100755
--- a/app/views/splash.blade.php
+++ b/app/views/splash.blade.php
@@ -147,7 +147,7 @@
                   <section class="hero2">
                     <div class="container">
                       <div class="caption">
-                        <h1>SIMPLE, INTUITIVE INVOICING</h1>
+                        <h1>SIMPLE, INTUITIVE INVOICING.</h1>
                       </div>
                     </div>
                   </section>
diff --git a/public/css/style.css b/public/css/style.css
index 0a6373548c96..92a198e72121 100755
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -7,7 +7,7 @@ div.required > label {
 }
 
 label.checkbox,
-div > label.control-label {
+label.control-label {
     font-weight: normal !important;
 }
 
diff --git a/public/images/invoiceninja-logo.png b/public/images/invoiceninja-logo.png
index ffa6cfdee246..ad5766df872f 100644
Binary files a/public/images/invoiceninja-logo.png and b/public/images/invoiceninja-logo.png differ
diff --git a/public/js/script.js b/public/js/script.js
index ee8e52f33485..ad7a68ffbee6 100755
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -294,7 +294,7 @@ function generatePDF(invoice, checkMath) {
 
 	doc.setLineWidth(1);
 	doc.line(tableLeft - tablePadding, x, lineTotalRight+tablePadding, x);
-	console.log('%s %s %s', lineTotalRight, tableLeft, (lineTotalRight-tableLeft));
+	//console.log('%s %s %s', lineTotalRight, tableLeft, (lineTotalRight-tableLeft));
 
 	doc.text(tableLeft, x+16, invoice.public_notes);
 	if (invoice.terms) {
@@ -369,9 +369,6 @@ function generatePDF(invoice, checkMath) {
 	doc.setFontType("bold");
 	doc.text(footerLeft, x, 'Balance Due');
 	
-	console.log('total %s', total);
-	console.log('inovice.amount %s', invoice.amount);
-	console.log('invoice.blance %s', invoice.balance);
 	total = formatMoney(total - (invoice.amount - invoice.balance), currencyId);
 	var totalX = headerRight - (doc.getStringUnitWidth(total) * doc.internal.getFontSize());
 	doc.text(totalX, x, total);		
@@ -872,7 +869,7 @@ function populateInvoiceComboboxes(clientId, invoiceId) {
 	if (invoiceId) {
 		var invoice = invoiceMap[invoiceId];
 		var client = clientMap[invoice.client.public_id];
-		console.log(invoice);
+		//console.log(invoice);
 		setComboboxValue($('.invoice-select'), invoice.public_id, (invoice.invoice_number + ' - ' + invoice.invoice_status.name + ' - ' + getClientDisplayName(client) + ' - ' + formatMoney(invoice.amount, invoice.currency_id) + ' | ' + formatMoney(invoice.balance, invoice.currency_id)));
 		$invoiceSelect.trigger('change');
 	} else if (clientId) {