diff --git a/app/models/Account.php b/app/models/Account.php
index 5b9140908e3e..4767cf5dc998 100755
--- a/app/models/Account.php
+++ b/app/models/Account.php
@@ -207,7 +207,7 @@ class Account extends Eloquent
   		'your_quote',
   		'quote_date',
   		'quote_number',
-  		'total'
+  		'total',
 		];
 
 		foreach ($fields as $field)
@@ -236,6 +236,10 @@ class Account extends Eloquent
 		{
 			return false;
 		}
+		else if ($datePaid == '2000-01-01')
+		{
+			return true;
+		}		
 
 		$today = new DateTime('now');
 		$datePaid = DateTime::createFromFormat('Y-m-d', $datePaid);		
diff --git a/app/models/Invoice.php b/app/models/Invoice.php
index 32a9dd0a7917..a951b5a1ef4b 100755
--- a/app/models/Invoice.php
+++ b/app/models/Invoice.php
@@ -67,7 +67,6 @@ class Invoice extends EntityModel
 		$this->setVisible([
 			'invoice_number', 
 			'discount', 
-			//'shipping',
 			'po_number', 
 			'invoice_date', 
 			'due_date', 
@@ -123,7 +122,9 @@ class Invoice extends EntityModel
 			'primary_color',
 			'secondary_color',
 			'hide_quantity',
-			'hide_paid_to_date']);		
+			'hide_paid_to_date',
+			'custom_invoice_label1',
+			'custom_invoice_label2']);		
 
 		foreach ($this->invoice_items as $invoiceItem) 
 		{
diff --git a/app/views/accounts/user_management.blade.php b/app/views/accounts/user_management.blade.php
index 3906222c553f..1bba99364492 100644
--- a/app/views/accounts/user_management.blade.php
+++ b/app/views/accounts/user_management.blade.php
@@ -4,7 +4,9 @@
 	@parent
 	@include('accounts.nav_advanced')
 
-  {{ Button::success_link(URL::to('users/create'), trans("texts.add_user"), array('class' => 'pull-right'))->append_with_icon('plus-sign') }} 
+  @if (Utils::isPro())
+    {{ Button::success_link(URL::to('users/create'), trans("texts.add_user"), array('class' => 'pull-right'))->append_with_icon('plus-sign') }} 
+  @endif
 
   {{ Datatable::table()   
       ->addColumn(
diff --git a/app/views/payments/payment.blade.php b/app/views/payments/payment.blade.php
index db672ed2c805..a00f612b2942 100755
--- a/app/views/payments/payment.blade.php
+++ b/app/views/payments/payment.blade.php
@@ -184,6 +184,13 @@
     {{ Button::block_primary_submit_lg(strtoupper(trans('texts.pay_now')) . ' - ' . Utils::formatMoney($amount, $currencyId) ) }}
   </div>
 </div>
+<div class="row">
+  <div class="col-md-12">
+    <p>&nbsp;</p>
+    <a href="https://www.invoiceninja.com/terms" target="_blank">Click here</a> to view our terms of service.
+  </div>
+</div>
+
 </div>
 </div>
 
diff --git a/app/views/plans.blade.php b/app/views/plans.blade.php
index c2628a884ae6..6aa004835e4e 100644
--- a/app/views/plans.blade.php
+++ b/app/views/plans.blade.php
@@ -8,6 +8,7 @@
     <div class="cell">Live .PDF invoice creation </div>
     <div class="cell">4 beautiful invoice templates</div>
     <div class="cell">Accept credit card payments</div>
+    <div class="cell">Multi-user support</div>
     <div class="cell">Quotes/pro-forma invoices</div>
     <div class="cell">Custom invoice fields and colors</div>
     <div class="cell">Dynamic chart builder</div>
@@ -25,6 +26,7 @@
     <div class="cell"><div class="hide-desktop">Live .PDF invoice creation</div><span class="glyphicon glyphicon-ok"></div>
     <div class="cell"><div class="hide-desktop">4 beautiful invoice templates</div><span class="glyphicon glyphicon-ok"></div>
     <div class="cell"><div class="hide-desktop">Accept credit card payments</div><span class="glyphicon glyphicon-ok"></div>
+    <div class="cell"><div class="hide-desktop">Multi-user support</div><span class="glyphicon glyphicon-remove"></div>
     <div class="cell"><div class="hide-desktop">Quotes/pro-forma invoices</div><span class="glyphicon glyphicon-remove"></div>
     <div class="cell"><div class="hide-desktop">Custom fields and invoice colors</div><span class="glyphicon glyphicon-remove"></div>
     <div class="cell"><div class="hide-desktop">Dynamic chart builder</div><span class="glyphicon glyphicon-remove"></div>
@@ -42,6 +44,7 @@
     <div class="cell"><div class="hide-desktop">Live .PDF invoice creation</div><span class="glyphicon glyphicon-ok"></div>
     <div class="cell"><div class="hide-desktop">4 beautiful invoice templates</div><span class="glyphicon glyphicon-ok"></div>
     <div class="cell"><div class="hide-desktop">Accept credit card payments</div><span class="glyphicon glyphicon-ok"></div>
+    <div class="cell"><div class="hide-desktop">Multi-user support</div><span class="glyphicon glyphicon-ok"></div>
     <div class="cell"><div class="hide-desktop">Quotes/pro-forma invoices</div><span class="glyphicon glyphicon-ok"></div>
     <div class="cell"><div class="hide-desktop">Custom invoice fields and colors</div><span class="glyphicon glyphicon-ok"></div>
     <div class="cell"><div class="hide-desktop">Dynamic chart builder</div><span class="glyphicon glyphicon-ok"></div>
diff --git a/app/views/public/terms.blade.php b/app/views/public/terms.blade.php
index 44776fa9fabf..ddbea803a134 100644
--- a/app/views/public/terms.blade.php
+++ b/app/views/public/terms.blade.php
@@ -29,7 +29,7 @@
     <div class="row">
       <div class="col-md-8 col-md-offset-2">
         <h2>Definitions</h2>
-        <p>Invoiceninja.com users who access invoiceninja.com services are defined as “User Accounts.” User Account clients who use access invoiceninja.com services to view and/or pay invoices are defined as “Clients.” The wording “data” and “content” are used interchangeably. </p></div>
+        <p>Invoiceninja.com users who access invoiceninja.com services are defined as “User Accounts”. User Account clients who use invoiceninja.com services to view and/or pay invoices are defined as “Clients.” The wording “data” and “content” are used interchangeably. </p></div>
     </div>
   </div>
   </section>
diff --git a/public/built.public.css b/public/built.public.css
index 2483d9faf366..d77447734409 100644
--- a/public/built.public.css
+++ b/public/built.public.css
@@ -298,7 +298,7 @@ a .cta:hover span {
     padding-right: 15px;
     position: relative;
     padding: 10px 35px 20px 35px;
-    height: 212px;
+    xheight: 212px;
     border-left: 1px dotted #ccc;
     margin-top: 100px;
     text-align: left;
diff --git a/public/css/splash.css b/public/css/splash.css
index 6667d6f24f7c..bff37eabf211 100644
--- a/public/css/splash.css
+++ b/public/css/splash.css
@@ -280,7 +280,7 @@ a .cta:hover span {
     padding-right: 15px;
     position: relative;
     padding: 10px 35px 20px 35px;
-    height: 212px;
+    xheight: 212px;
     border-left: 1px dotted #ccc;
     margin-top: 100px;
     text-align: left;