diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php
index 5ce4a47e77..aa60b8b6c8 100644
--- a/app/lang/en/texts.php
+++ b/app/lang/en/texts.php
@@ -260,7 +260,7 @@ return array(
   'email_salutation' => 'Dear :name,',
   'email_signature' => 'Regards,',
   'email_from' => 'The InvoiceNinja Team',
-  'user_email_footer' => 'To adjust your email notification settings please visit http://www.invoiceninja.com/company/notifications',
+  'user_email_footer' => 'To adjust your email notification settings please visit http://' . $_SERVER['SERVER_NAME'] . '/company/notifications',
   'invoice_link_message' => 'To view your client invoice click the link below:',
   'notification_paid_subject' => 'Invoice :invoice was paid by :client',
   'notification_sent_subject' => 'Invoice :invoice was sent to :client',
diff --git a/app/views/header.blade.php b/app/views/header.blade.php
index 05e44b4797..829d3b847c 100755
--- a/app/views/header.blade.php
+++ b/app/views/header.blade.php
@@ -333,7 +333,7 @@ Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice
 
 @if (Auth::check() && !Auth::user()->isPro())
   <div class="modal fade" id="proPlanModal" tabindex="-1" role="dialog" aria-labelledby="proPlanModalLabel" aria-hidden="true">
-    <div class="modal-dialog" style="min-width:1000px">
+    <div class="modal-dialog" style="min-width:1040px">
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
diff --git a/app/views/public/plans.blade.php b/app/views/public/plans.blade.php
index 6898f31110..6fb9b09f1c 100644
--- a/app/views/public/plans.blade.php
+++ b/app/views/public/plans.blade.php
@@ -2,6 +2,12 @@
 
 @section('content')
 
+  <style>
+  section.body {
+    background-color: #f8f8f8 !important;
+  }
+  </style>
+
   <section class="hero background hero3" data-speed="2" data-type="background">
   <div class="caption-side"></div>
   <div class="container">
@@ -15,25 +21,28 @@
       </div>
     </section>
 
- <section class="about center">
+ <section class="center" style="background-color:#f8f8f8">
   <div class="container">
     <div class="row">
       <div class="col-md-8 col-md-offset-2">
+        &nbsp;<p/>
         <h2>Go Pro to Unlock Premium Invoice Ninja Features</h2>
         <p>We believe that the free version of Invoice Ninja is a truly awesome product loaded 
           with the key features you need to bill your clients electronically. But for those who 
           crave still more Ninja awesomeness, we've unmasked the Invoice Ninja Pro plan, which 
           offers more versatility, power and customization options for just $50 per year. </p>
           <br/>&nbsp;<br/>
-          <img src="{{ asset('images/pro-plan-chart.png') }}"/>
-        
       </div>
     </div>
   </div>
 </section>
 
+<div style="background-color:#f8f8f8">
+  <center><img src="{{ asset('images/pro-plan-chart.png') }}"/></center>
+</div>      
 
-<section class="upper-footer white-bg">
+
+<section style="background-color:#f8f8f8;padding-top:80px;padding-bottom:80px;">
  <div class="container">
   <div class="row">
     <div class="col-md-3 center-block">
diff --git a/public/images/pro-plan-chart.png b/public/images/pro-plan-chart.png
index 7a34cefe94..1ccb1bfe4f 100644
Binary files a/public/images/pro-plan-chart.png and b/public/images/pro-plan-chart.png differ
diff --git a/public/js/script.js b/public/js/script.js
index 526397797c..acd9750424 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -721,10 +721,12 @@ function GetReportTemplate1(doc, invoice, layout, checkMath)
     SetPdfColor('Black',doc); //set black color
     doc.setFontSize(9);
 
-    var detailsHeight = displayInvoice(doc, invoice, 50, 170, layout);
+    var invoiceHeight = displayInvoice(doc, invoice, 50, 170, layout);
+    var clientHeight = displayClient(doc, invoice, 220, 170, layout);
+    var detailsHeight = Math.max(invoiceHeight, clientHeight);
     layout.tableTop = Math.max(layout.tableTop, layout.headerTop + detailsHeight + (3 * layout.rowHeight));
 
-    displayClient(doc, invoice, 220, 170, layout);
+    
 
     doc.setLineWidth(0.3);        
     doc.setDrawColor(200,200,200);
@@ -1282,7 +1284,7 @@ function displayClient(doc, invoice, x, y, layout) {
     client.contacts[0].email
   ];
 
-  displayGrid(doc, invoice, data, x, y, layout, true);
+  return displayGrid(doc, invoice, data, x, y, layout, true);
 }
 
 function displayInvoice(doc, invoice, x, y, layout, rightAlignX) {