diff --git a/app/lang/de/texts.php b/app/lang/de/texts.php
index 57c9e94a7c09..e2a016554695 100644
--- a/app/lang/de/texts.php
+++ b/app/lang/de/texts.php
@@ -336,7 +336,7 @@ return array(
 
   'chart_builder' => 'Chart Builder',
   'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
-
+  'go_pro' => 'Go Pro',
 
   // Quotes
   'quote' => 'Quote',
diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php
index f09d1d300a31..a11045828d87 100644
--- a/app/lang/en/texts.php
+++ b/app/lang/en/texts.php
@@ -351,7 +351,7 @@ return array(
 
   'chart_builder' => 'Chart Builder',
   'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
-
+  'go_pro' => 'Go Pro',
 
   // Quotes
   'quote' => 'Quote',
diff --git a/app/lang/es/texts.php b/app/lang/es/texts.php
index 40b8fd5c392e..74e268cbae45 100644
--- a/app/lang/es/texts.php
+++ b/app/lang/es/texts.php
@@ -335,7 +335,7 @@ return array(
 
   'chart_builder' => 'Chart Builder',
   'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
-
+  'go_pro' => 'Go Pro',
   // Quotes
   'quote' => 'Quote',
   'quotes' => 'Quotes',
diff --git a/app/lang/fr/texts.php b/app/lang/fr/texts.php
index caf5f0a538a5..250c666d7a87 100644
--- a/app/lang/fr/texts.php
+++ b/app/lang/fr/texts.php
@@ -336,7 +336,7 @@ return array(
 
   'chart_builder' => 'Chart Builder',
   'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
-
+  'go_pro' => 'Go Pro',
 
   // Quotes
   'quote' => 'Quote',
diff --git a/app/lang/it/texts.php b/app/lang/it/texts.php
index 51499dc2001a..9d6de7f2ba45 100644
--- a/app/lang/it/texts.php
+++ b/app/lang/it/texts.php
@@ -336,7 +336,7 @@ return array(
 
   'chart_builder' => 'Chart Builder',
   'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
-
+  'go_pro' => 'Go Pro',
 
   // Quotes
   'quote' => 'Quote',
diff --git a/app/lang/nl/texts.php b/app/lang/nl/texts.php
index 3003eb71e3f0..84b9dcaaf2a7 100644
--- a/app/lang/nl/texts.php
+++ b/app/lang/nl/texts.php
@@ -337,7 +337,7 @@ return array(
 
   'chart_builder' => 'Chart Builder',
   'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
-
+  'go_pro' => 'Go Pro',
 
   // Quotes
   'quote' => 'Quote',
diff --git a/app/lang/pt_BR/texts.php b/app/lang/pt_BR/texts.php
index 26f8f5b9a06d..c0069f713f37 100644
--- a/app/lang/pt_BR/texts.php
+++ b/app/lang/pt_BR/texts.php
@@ -325,7 +325,7 @@ return array(
 
   'chart_builder' => 'Chart Builder',
   'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
-
+  'go_pro' => 'Go Pro',
 
   // Quotes
   'quote' => 'Quote',
diff --git a/app/models/Invoice.php b/app/models/Invoice.php
index 4419c99ad1e4..063253cbd506 100755
--- a/app/models/Invoice.php
+++ b/app/models/Invoice.php
@@ -62,7 +62,7 @@ class Invoice extends EntityModel
 		$this->setVisible([
 			'invoice_number', 
 			'discount', 
-			'shipping',
+			//'shipping',
 			'po_number', 
 			'invoice_date', 
 			'due_date', 
diff --git a/app/ninja/repositories/InvoiceRepository.php b/app/ninja/repositories/InvoiceRepository.php
index c5abf435e010..14e3dbaad7bb 100755
--- a/app/ninja/repositories/InvoiceRepository.php
+++ b/app/ninja/repositories/InvoiceRepository.php
@@ -318,7 +318,7 @@ class InvoiceRepository
 		return $invoice;
 	}
 
-  public function cloneInvoice($invoice, $quoteId = null)
+  public function cloneInvoice($invoice, $quotePublicId = null)
   {
     $clone = Invoice::createNew();    
     $clone->balance = $invoice->amount;
@@ -327,7 +327,7 @@ class InvoiceRepository
     foreach ([
       'client_id',       
       'discount', 
-      'shipping',
+      //'shipping',
       'invoice_date', 
       'po_number', 
       'due_date', 
@@ -346,17 +346,17 @@ class InvoiceRepository
       $clone->$field = $invoice->$field;  
     }   
 
-    if ($quoteId)
+    if ($quotePublicId)
     {
       $clone->is_quote = false;
-      $clone->quote_id = $quoteId;
+      $clone->quote_id = $quotePublicId;
     }    
 
     $clone->save();
 
-    if ($quoteId)
+    if ($quotePublicId)
     {
-      $invoice->quote_invoice_id = $clone->id;      
+      $invoice->quote_invoice_id = $clone->public_id;
       $invoice->save();
     }
 
diff --git a/app/views/header.blade.php b/app/views/header.blade.php
index 32e6df6bb29a..022205a53d59 100755
--- a/app/views/header.blade.php
+++ b/app/views/header.blade.php
@@ -78,7 +78,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a href="{{ Utils::isNinja() || Auth::check() ? URL::to('/') : NINJA_URL }}" class='navbar-brand'>
+      <a href="{{ URL::to('/') }}" class='navbar-brand'>
         <img src="{{ asset('images/invoiceninja-logo.png') }}" style="height:18px;width:auto"/>
       </a>	    
     </div>
@@ -97,8 +97,12 @@
       </ul>
 
       <div class="navbar-form navbar-right">
-        @if (Auth::check() && !Auth::user()->registered)
-        {{ Button::sm_success_primary(trans('texts.sign_up'), array('id' => 'signUpButton', 'data-toggle'=>'modal', 'data-target'=>'#signUpModal')) }} &nbsp;
+        @if (Auth::check())
+          @if (!Auth::user()->registered)
+            {{ Button::sm_success_primary(trans('texts.sign_up'), array('id' => 'signUpButton', 'data-toggle'=>'modal', 'data-target'=>'#signUpModal')) }} &nbsp;
+          @elseif (!Auth::user()->isPro())
+            {{ Button::sm_success_primary(trans('texts.go_pro'), array('id' => 'proPlanButton', 'data-toggle'=>'modal', 'data-target'=>'#proPlanModal')) }} &nbsp;
+          @endif
         @endif
 
         @if (Auth::user()->getPopOverText() && !Utils::isRegistered())
@@ -475,8 +479,10 @@ Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice
           localStorage.setItem('guest_key', '');
           trackUrl('/user/sign_up');
           NINJA.isRegistered = true;
+          /*
           $('#signUpButton').hide();
           $('#myAccountButton').html(result);                            
+          */
         }            
         $('#signUpSuccessDiv, #signUpFooter').show();
         $('#working, #saveSignUpButton').hide();
diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index c3d79d880786..735c2f2c708a 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -243,7 +243,7 @@
 						@elseif ($invoice && $entityType == ENTITY_INVOICE)
 							@if ($invoice->quote_id)
 								<li class="divider"></li>
-								<li><a href="{{ URL::to("invoices/{$invoice->quote_id}/edit") }}">{{ trans("texts.view_quote") }}</a></li>
+								<li><a href="{{ URL::to("quotes/{$invoice->quote_id}/edit") }}">{{ trans("texts.view_quote") }}</a></li>
 							@endif
 						@endif
 
@@ -740,7 +740,7 @@
 	}
 
 	function onDeleteClick() {
-		if (confirm('Are you sure you want to delete this invoice?')) {
+		if (confirm('Are you sure you want to delete this {{ $entityType }}?')) {
 			$('#action').val('delete');
 			$('#submitButton').click();			
 		}		
diff --git a/app/views/master.blade.php b/app/views/master.blade.php
index 69deab1f6b8f..1ace6a7867ef 100755
--- a/app/views/master.blade.php
+++ b/app/views/master.blade.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Invoice Ninja {{ isset($title) ? $title : ' - Free Online Invoicing' }}</title>
+    <title>Invoice Ninja {{ isset($title) ? $title : ' - Free and Open-Source Online Invoicing' }}</title>
     
     <meta charset="utf-8">
     <meta property="og:site_name" content="Invoice Ninja"></meta>
diff --git a/app/views/public/header.blade.php b/app/views/public/header.blade.php
index b5db45b5f060..3af6942304d4 100644
--- a/app/views/public/header.blade.php
+++ b/app/views/public/header.blade.php
@@ -94,13 +94,13 @@
 <div class="navbar" style="margin-bottom:0px">
   <div class="container">
     <div class="navbar-inner">
-      <a class="brand" href="{{ URL::to('/') }}"><img src="{{ asset('images/invoiceninja-logo.png') }}"></a>
+      <a class="brand" href="https://www.invoiceninja.com/"><img src="{{ asset('images/invoiceninja-logo.png') }}"></a>
       <ul class="navbar-list">
-        <!-- <li>{{ link_to('features', 'Features' ) }}</li> -->
-        <!-- <li>{{ link_to('faq', 'FAQ' ) }}</li> -->
-        <li>{{ link_to('about', 'About Us' ) }}</li>
-        <li>{{ link_to('plans', 'Plans' ) }}</li>
-        <li>{{ link_to('contact', 'Contact Us' ) }}</li>
+        <!-- <li>{{ link_to('https://www.invoiceninja.com/features', 'Features' ) }}</li> -->
+        <!-- <li>{{ link_to('https://www.invoiceninja.com/faq', 'FAQ' ) }}</li> -->
+        <li>{{ link_to('https://www.invoiceninja.com/about', 'About Us' ) }}</li>
+        <li>{{ link_to('https://www.invoiceninja.com/plans', 'Plans' ) }}</li>
+        <li>{{ link_to('https://www.invoiceninja.com/contact', 'Contact Us' ) }}</li>
         <li>{{ link_to('http://blog.invoiceninja.com', 'Blog' ) }}</li>
         <li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
       </ul>
@@ -167,11 +167,11 @@
         <img src="{{ asset('images/footer-logo.png') }}">
         <hr>
         <ul class="navbar-vertical">
-          <!-- <li>{{ link_to('features', 'Features' ) }}</li> -->
-          <!-- <li>{{ link_to('faq', 'FAQ' ) }}</li> -->
-          <li>{{ link_to('about', 'About Us' ) }}</li>
-          <li>{{ link_to('plans', 'Plans' ) }}</li>
-          <li>{{ link_to('contact', 'Contact Us' ) }}</li>
+          <!-- <li>{{ link_to('https://www.invoiceninja.com/features', 'Features' ) }}</li> -->
+          <!-- <li>{{ link_to('https://www.invoiceninja.com/faq', 'FAQ' ) }}</li> -->
+          <li>{{ link_to('https://www.invoiceninja.com/about', 'About Us' ) }}</li>
+          <li>{{ link_to('https://www.invoiceninja.com/plans', 'Plans' ) }}</li>
+          <li>{{ link_to('https://www.invoiceninja.com/contact', 'Contact Us' ) }}</li>
           <li>{{ link_to('http://blog.invoiceninja.com', 'Blog' ) }}</li>
           <li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
         </ul>