diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php
index 6cf6ff353386..0e6faf7c6b3d 100644
--- a/app/lang/en/texts.php
+++ b/app/lang/en/texts.php
@@ -341,4 +341,5 @@ return array(
   'created_product' => 'Successfully created product',
   'archived_product' => 'Successfully archived product',
   
+  'pro_plan_custom_fields' => ':link to enable custom fields by joining the Pro Plan'
 );
diff --git a/app/models/User.php b/app/models/User.php
index 11741b5fc85f..07bae4f74cf0 100755
--- a/app/models/User.php
+++ b/app/models/User.php
@@ -121,7 +121,7 @@ class User extends ConfideUser implements UserInterface, RemindableInterface
 
 	public function getPopOverText()
 	{
-		if (!Auth::check())
+		if (!Auth::check() || Session::has('error'))
 		{
 			return false;
 		}
diff --git a/app/ninja/repositories/AccountRepository.php b/app/ninja/repositories/AccountRepository.php
index f17f96a9b3a4..eb9d3f6ad241 100755
--- a/app/ninja/repositories/AccountRepository.php
+++ b/app/ninja/repositories/AccountRepository.php
@@ -182,7 +182,7 @@ class AccountRepository
 			$accountGateway->user_id = $user->id;
 			$accountGateway->gateway_id = NINJA_GATEWAY_ID;
 			$accountGateway->public_id = 1;
-			$accountGateway->config = isset($_ENV['NINJA_GATEWAY_CONFIG']) ? $_ENV['NINJA_GATEWAY_CONFIG'] : null;
+			$accountGateway->config = NINJA_GATEWAY_CONFIG;
 			$account->account_gateways()->save($accountGateway);
 		}
 
diff --git a/app/routes.php b/app/routes.php
index 6da40f42a111..7a7deb4427f3 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -192,6 +192,7 @@ define('PRO_PLAN_PRICE', 50);
 define('REQUESTED_PRO_PLAN', 'REQUESTED_PRO_PLAN');
 define('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h');
 define('NINJA_GATEWAY_ID', GATEWAY_PAYPAL_EXPRESS);
+define('NINJA_GATEWAY_CONFIG', '{"apiLoginId":"626vWcD5","transactionKey":"4bn26TgL9r4Br4qJ","testMode":"","developerMode":""}');
 
 
 /*
diff --git a/app/views/accounts/custom_fields.blade.php b/app/views/accounts/custom_fields.blade.php
index 5e83614bb014..b79de815c8d2 100644
--- a/app/views/accounts/custom_fields.blade.php
+++ b/app/views/accounts/custom_fields.blade.php
@@ -3,6 +3,16 @@
 @section('content')	
 	@parent
 
+	@if (!Auth::user()->account->isPro())
+  <div class="container">
+    <div class="row">
+			<div style="font-size:larger;" class="col-md-8 col-md-offset-2">{{ trans('texts.pro_plan_custom_fields', ['link'=>'<a href="#" onclick="showProPlan()">'.trans('texts.pro_plan.remove_logo_link').'</a>']) }}</div>
+			&nbsp;<p/>&nbsp;
+		</div>		
+	</div>
+	@endif
+
+
 	{{ Former::open()->addClass('col-md-8 col-md-offset-2 warn-on-exit') }}
 	{{ Former::populate($account) }}
 
diff --git a/app/views/accounts/nav.blade.php b/app/views/accounts/nav.blade.php
index cae5809b5566..db3b1940b704 100755
--- a/app/views/accounts/nav.blade.php
+++ b/app/views/accounts/nav.blade.php
@@ -5,10 +5,10 @@
 	<ul class="nav nav-tabs nav nav-justified">
 	{{ HTML::nav_link('company/details', 'company_details') }}
     {{ HTML::nav_link('company/payments', 'online_payments') }}
-    {{-- HTML::nav_link('company/products', 'product_library') --}}
+    {{ HTML::nav_link('company/products', 'product_library') }}
   	{{ HTML::nav_link('company/notifications', 'notifications') }}
-	{{ HTML::nav_link('company/import_export', 'import_export', 'company/import_map') }}
-  	{{-- HTML::nav_link('company/custom_fields', 'custom_fields') --}}
+    {{ HTML::nav_link('company/import_export', 'import_export', 'company/import_map') }}
+  	{{ HTML::nav_link('company/custom_fields', 'custom_fields') }}
 	</ul>
 	<p>&nbsp;</p>
 
diff --git a/app/views/header.blade.php b/app/views/header.blade.php
index a3b9f42e762e..05e44b479720 100755
--- a/app/views/header.blade.php
+++ b/app/views/header.blade.php
@@ -119,6 +119,7 @@
         @if (Auth::user()->getPopOverText())
         <script>
           $(function() {
+            if (screen.width < 1170) return;
             $('#ninjaPopOver').show().popover('show').hide();
             $('body').click(function() {
               $('#ninjaPopOver').popover('hide');
@@ -137,10 +138,10 @@
           <ul class="dropdown-menu" role="menu">
             <li>{{ link_to('company/details', uctrans('texts.company_details')) }}</li>
             <li>{{ link_to('company/payments', uctrans('texts.online_payments')) }}</li>
-            <!--<li>{{ link_to('company/products', uctrans('texts.product_library')) }}</li>-->
+            <li>{{ link_to('company/products', uctrans('texts.product_library')) }}</li>
             <li>{{ link_to('company/notifications', uctrans('texts.notifications')) }}</li>
             <li>{{ link_to('company/import_export', uctrans('texts.import_export')) }}</li>
-            <!--<li><a href="{{ url('company/custom_fields') }}">{{ uctrans('texts.custom_fields') . Utils::getProLabel(ACCOUNT_CUSTOM_FIELDS) }}</a></li>-->
+            <li><a href="{{ url('company/custom_fields') }}">{{ uctrans('texts.custom_fields') . Utils::getProLabel(ACCOUNT_CUSTOM_FIELDS) }}</a></li>
 
             <li class="divider"></li>
             <li>{{ link_to('#', trans('texts.logout'), array('onclick'=>'logout()')) }}</li>
@@ -332,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:150px">
+    <div class="modal-dialog" style="min-width:1000px">
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
@@ -340,8 +341,15 @@ Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice
         </div>
 
         <div style="background-color: #fff; padding-left: 16px; padding-right: 16px" id="proPlanDiv">
-          &nbsp; 
-          {{-- trans('texts.') --}}
+          &nbsp;<p/>          
+          <b>Go Pro to Unlock Premium Invoice Ninja Features</b><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.          
+          <br/>&nbsp;<br/>
+          <img src="{{ asset('images/pro-plan-chart.png') }}"/>
+
           &nbsp;
       </div>
 
diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index 06d8e79f7f70..615e5f2b37c3 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -274,7 +274,7 @@
 	<iframe id="theFrame" style="display:none" frameborder="1" width="100%" height="1180"></iframe>
 	<canvas id="theCanvas" style="display:none;width:100%;border:solid 1px #CCCCCC;"></canvas>
 
-	@if (false && !Auth::user()->account->isPro())
+	@if (!Auth::user()->account->isPro())
 		<div style="font-size:larger">
 			{{ trans('texts.pro_plan.remove_logo', ['link'=>'<a href="#" onclick="showProPlan()">'.trans('texts.pro_plan.remove_logo_link').'</a>']) }}
 		</div>
diff --git a/app/views/master.blade.php b/app/views/master.blade.php
index f9c617b0e5f7..0bd3c0ff29e8 100755
--- a/app/views/master.blade.php
+++ b/app/views/master.blade.php
@@ -82,6 +82,8 @@
       $(window).on('beforeunload', function() {
         if (NINJA.formIsChanged) {
           return "{{ trans('texts.unsaved_changes') }}";
+        } else {
+          return undefined;
         }
       }); 
       //$('a[rel!=ext]').click(function() { $(window).off('beforeunload') });
diff --git a/app/views/public/splash.blade.php b/app/views/public/splash.blade.php
index 15df89465101..72c0ea50265d 100755
--- a/app/views/public/splash.blade.php
+++ b/app/views/public/splash.blade.php
@@ -41,7 +41,7 @@
           <div class="col-md-3 one">
             <div class="box">
               <div class="icon"><img src="{{ asset('images/icon-free.png') }}"></div>
-              <h2>100% FREE, ALWAYS</h2>
+              <h2>FREE, ALWAYS</h2>
               <p>Invoicing with no monthly fee, because you have enough bills already! Free, now and forever! Quality invoicing to build your business and get paid.</p>
             </div>
           </div>
diff --git a/public/images/pro-plan-chart.png b/public/images/pro-plan-chart.png
new file mode 100644
index 000000000000..7a34cefe94a8
Binary files /dev/null and b/public/images/pro-plan-chart.png differ