diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 1896755b5d1b..d9d673f753a7 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -450,7 +450,7 @@ class AccountController extends \BaseController {
 
 		if ($validator->fails()) 
 		{
-			return Redirect::to('company/settings')
+			return Redirect::to('company/payments')
 				->withErrors($validator)
 				->withInput();
 		} 
diff --git a/app/views/emails/invoice_paid_html.blade.php b/app/views/emails/invoice_paid_html.blade.php
index c257675ba185..655c94f8b0de 100755
--- a/app/views/emails/invoice_paid_html.blade.php
+++ b/app/views/emails/invoice_paid_html.blade.php
@@ -12,7 +12,7 @@
   To view your client invoice click the link below: <br/>
   {{ $invoiceLink }} <p/>
 
-  To adjust your email notification settings please <a href="http://www.invoiceninja.com/company/settings">click here</a>.
+  To adjust your email notification settings please <a href="http://www.invoiceninja.com/company/notifications">click here</a>.
 
 </body>
 </html>
\ No newline at end of file
diff --git a/app/views/emails/invoice_paid_text.blade.php b/app/views/emails/invoice_paid_text.blade.php
index 155559e582a3..c2afac424870 100755
--- a/app/views/emails/invoice_paid_text.blade.php
+++ b/app/views/emails/invoice_paid_text.blade.php
@@ -6,4 +6,4 @@ A payment of {{ $paymentAmount }} was made by client {{ $clientName }} towards i
 To view your client invoice click the link below:
 {{ $invoiceLink }} <p/>
 
-To adjust your email notification settings please visit http://www.invoiceninja.com/company/settings
\ No newline at end of file
+To adjust your email notification settings please visit http://www.invoiceninja.com/company/notifications
\ No newline at end of file
diff --git a/app/views/emails/invoice_sent_html.blade.php b/app/views/emails/invoice_sent_html.blade.php
index ce54307f2bb7..d78d0775ec9e 100755
--- a/app/views/emails/invoice_sent_html.blade.php
+++ b/app/views/emails/invoice_sent_html.blade.php
@@ -9,7 +9,7 @@
 
   The following client {{ $clientName }} was emailed Invoice {{ $invoiceNumber }} for {{ $invoiceAmount}}.<p/>
 
-  To adjust your email notification settings please <a href="http://www.invoiceninja.com/company/settings">click here</a>.<p/>
+  To adjust your email notification settings please <a href="http://www.invoiceninja.com/company/notifications">click here</a>.<p/>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/app/views/emails/invoice_sent_text.blade.php b/app/views/emails/invoice_sent_text.blade.php
index 4191ec6dfb8a..e78b3d2cacf4 100755
--- a/app/views/emails/invoice_sent_text.blade.php
+++ b/app/views/emails/invoice_sent_text.blade.php
@@ -2,4 +2,4 @@ Dear {{ $userName }},
 
 The following client {{ $clientName }} was emailed Invoice {{ $invoiceNumber }} for {{ $invoiceAmount}}.
 
-To adjust your email notification settings visit this link http://www.invoiceninja.com/company/settings
\ No newline at end of file
+To adjust your email notification settings visit this link http://www.invoiceninja.com/company/notifications
\ No newline at end of file
diff --git a/app/views/emails/invoice_viewed_html.blade.php b/app/views/emails/invoice_viewed_html.blade.php
index 4a0abf7a8d18..00088e4bad66 100755
--- a/app/views/emails/invoice_viewed_html.blade.php
+++ b/app/views/emails/invoice_viewed_html.blade.php
@@ -9,7 +9,7 @@
 
   The following client {{ $clientName }} viewed Invoice {{ $invoiceNumber }} for {{ $invoiceAmount}}.<p/>
 
-  To adjust your email notification settings please <a href="http://www.invoiceninja.com/company/settings">click here</a>.<p/>
+  To adjust your email notification settings please <a href="http://www.invoiceninja.com/company/notifications">click here</a>.<p/>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/app/views/emails/invoice_viewed_text.blade.php b/app/views/emails/invoice_viewed_text.blade.php
index 3baa89e35707..5d18a110333d 100755
--- a/app/views/emails/invoice_viewed_text.blade.php
+++ b/app/views/emails/invoice_viewed_text.blade.php
@@ -2,4 +2,4 @@ Dear {{ $userName }},
 
 The following client {{ $clientName }} viewed Invoice {{ $invoiceNumber }} for {{ $invoiceAmount }}.
 
-To adjust your email notification settings visit this link http://www.invoiceninja.com/company/settings
\ No newline at end of file
+To adjust your email notification settings visit this link http://www.invoiceninja.com/company/notifications
\ No newline at end of file
diff --git a/public/js/script.js b/public/js/script.js
index 9dc246a9bb5e..5521a5367fad 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -1586,7 +1586,7 @@ function displayInvoiceItems(doc, invoice, layout) {
     var qtyX = layout.qtyRight - (doc.getStringUnitWidth(qty) * doc.internal.getFontSize());
     var taxX = layout.taxRight - (doc.getStringUnitWidth(tax+'%') * doc.internal.getFontSize());
     var totalX = layout.lineTotalRight - (doc.getStringUnitWidth(lineTotal) * doc.internal.getFontSize());
-    if (i==0) y -= 4;
+    //if (i==0) y -= 4;
 
     line += numLines;
 
@@ -1629,18 +1629,18 @@ function displayInvoiceItems(doc, invoice, layout) {
     } else {
       SetPdfColor('Black', doc);
     }
-    doc.text(layout.marginLeft, y, productKey);
+    doc.text(layout.marginLeft, y+2, productKey);
     
     SetPdfColor('Black', doc);
     doc.setFontType('normal');
 
-    doc.text(layout.descriptionLeft, y, notes);
-    doc.text(costX, y, cost);
-    doc.text(qtyX, y, qty);
-    doc.text(totalX, y, lineTotal);
+    doc.text(layout.descriptionLeft, y+2, notes);
+    doc.text(costX, y+2, cost);
+    doc.text(qtyX, y+2, qty);
+    doc.text(totalX, y+2, lineTotal);
 
     if (tax) {
-      doc.text(taxX, y, tax+'%');
+      doc.text(taxX, y+2, tax+'%');
     }
   }