diff --git a/app/config/packages/zizaco/confide/config.php b/app/config/packages/zizaco/confide/config.php
index 28dd091171..29535d8845 100755
--- a/app/config/packages/zizaco/confide/config.php
+++ b/app/config/packages/zizaco/confide/config.php
@@ -87,7 +87,7 @@ return array(
     |
     |
     */
-    'signup_cache' => 120,
+    'signup_cache' => 0,
     
     /*
     |--------------------------------------------------------------------------
diff --git a/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php b/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
index e3237c88ff..b1d16d6272 100755
--- a/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
+++ b/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
@@ -391,7 +391,7 @@ class ConfideSetupUsersTable extends Migration {
             $t->softDeletes();
 
             $t->string('product_key');
-            $t->string('notes');
+            $t->text('notes');
             $t->decimal('cost', 13, 4);
             $t->decimal('qty', 13, 4);
             
diff --git a/app/ninja/mailers/UserMailer.php b/app/ninja/mailers/UserMailer.php
index 42e6f1b562..d4037be660 100755
--- a/app/ninja/mailers/UserMailer.php
+++ b/app/ninja/mailers/UserMailer.php
@@ -37,11 +37,11 @@ class UserMailer extends Mailer {
 		}
 		else if ($type == 'sent')
 		{
-			$subject = 'sent to';
+			$action = 'sent to';
 		}
 		else
 		{
-			$subject = 'viewed by';
+			$action = 'viewed by';
 		}
 
 		$subject = "Invoice {$invoice->invoice_number} was $action {$invoice->client->getDisplayName()}";	
diff --git a/app/routes.php b/app/routes.php
index af5aceeacc..b8ba6b5ef3 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -184,7 +184,7 @@ define('DEFAULT_INVOICE_NUMBER', '0001');
 define('RECENTLY_VIEWED_LIMIT', 8);
 define('LOGGED_ERROR_LIMIT', 100);
 define('RANDOM_KEY_LENGTH', 32);
-define('MAX_NUM_CLIENTS', 3);
+define('MAX_NUM_CLIENTS', 2000);
 
 define('INVOICE_STATUS_DRAFT', 1);
 define('INVOICE_STATUS_SENT', 2);
diff --git a/app/views/header.blade.php b/app/views/header.blade.php
index 79a9ab088c..2f69fe6efc 100755
--- a/app/views/header.blade.php
+++ b/app/views/header.blade.php
@@ -70,7 +70,7 @@
 	      <span class="icon-bar"></span>
 	      <span class="icon-bar"></span>
 	    </button>
-	    {{ link_to('/', 'Invoice Ninja', array('class'=>'navbar-brand')) }}
+      <a href="{{ URL::to('/rocksteady') }}" class='navbar-brand'>Invoice Ninja <sup><small>BETA</small></sup></a>	    
 	  </div>
 
 	  <div class="collapse navbar-collapse" id="navbar-collapse-1">
diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index c43977b730..cb1182e142 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -20,7 +20,7 @@
     <div class="row" style="min-height:195px" onkeypress="formEnterClick(event)">
     	<div class="col-md-5" id="col_1">
 
-    		@if ($invoice && $invoice->isSent())
+    		@if ($invoice)
 				<div class="form-group">
 					<label for="client" class="control-label col-lg-4 col-sm-4">Client</label>
 					<div class="col-lg-8 col-sm-8" style="padding-top: 7px">
@@ -38,7 +38,7 @@
 				</div>
 			</div>
 
-			@if ($invoice && $invoice->isSent())
+			@if ($invoice)
 				</div>
 			@endif
 
diff --git a/app/views/splash.blade.php b/app/views/splash.blade.php
index eb0ebb69ab..861454970e 100755
--- a/app/views/splash.blade.php
+++ b/app/views/splash.blade.php
@@ -98,7 +98,7 @@
               <div class="box">
                 <div class="icon"><img src="images/icon-free.png"></div>
                 <h2>100% FREE, ALWAYS</h2>
-                <p>Invoicing with no monthly fee, because you have enough bills already!  It’s free, now and forever!  Quality invoicing, build business and get paid.</p>
+                <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>
 
@@ -107,7 +107,7 @@
                   <div class="icon"><img src=
                     "images/icon-opensource.png"></div>
                     <h2>OPEN-SOURCE</h2>
-                    <p>Cloud-based, super secure, and user-developed.  Open source platforms are a better way to do business (and save the world). Need we say more?</p>
+                    <p>Cloud-based, super secure, and user-developed. Open source platforms are a better way to do business (and save the world). Need we say more?</p>
                     </div>
                   </div>
 
@@ -115,7 +115,7 @@
                     <div class="box">
                       <div class="icon"><img src="images/icon-pdf.png"></div>
                       <h2>LIVE .PDF VIEW</h2>
-                      <p>Beautiful email-ready .PDF invoices created instantly as you type.  Our ‘Save & send’ functionality to saves you time and impresses clients.</p>
+                      <p>Create beautiful email-ready .PDF invoices created instantly as you type. Our ‘Save & send’ feature saves you time and impresses clients.</p>
                       </div>
                     </div>
 
@@ -124,7 +124,7 @@
                         <div class="icon"><img src=
                           "images/icon-payment.png"></div>
                           <h2>ONLINE PAYMENTS</h2>
-                          <p>PayPal? Authorize.Net? Stripe? We support many payment technologies and if you need help we’ll lend a hand (we’re pretty friendly).</p>
+                          <p>PayPal? Authorize.Net? Stripe? We support many payment technologies and if you need help or advise we’ll lend a hand (we’re pretty friendly).</p>
                           </div>
                         </div>
                       </div>
@@ -147,7 +147,7 @@
                   <section class="hero2">
                     <div class="container">
                       <div class="caption">
-                        <h1>Wherever you are, invoice the easy way.</h1>
+                        <h1>SIMPLE, INTUITIVE INVOICING</h1>
                       </div>
                     </div>
                   </section>