diff --git a/app/Http/Requests/CreateProposalRequest.php b/app/Http/Requests/CreateProposalRequest.php
index cb67fbab5c35..cac756a49204 100644
--- a/app/Http/Requests/CreateProposalRequest.php
+++ b/app/Http/Requests/CreateProposalRequest.php
@@ -23,7 +23,6 @@ class CreateProposalRequest extends ProposalRequest
     {
         return [
             'quote_id' => 'required',
-            'proposal_template_id' => 'required',
         ];
     }
 }
diff --git a/app/Http/Requests/UpdateProposalRequest.php b/app/Http/Requests/UpdateProposalRequest.php
index 8f40ec0792a2..d525f11e8dc2 100644
--- a/app/Http/Requests/UpdateProposalRequest.php
+++ b/app/Http/Requests/UpdateProposalRequest.php
@@ -27,7 +27,6 @@ class UpdateProposalRequest extends ProposalRequest
 
         return [
             'quote_id' => 'required',
-            'proposal_template_id' => 'required',
         ];
     }
 }
diff --git a/database/migrations/2018_01_10_073825_add_subscription_format.php b/database/migrations/2018_01_10_073825_add_subscription_format.php
index 738580f6589c..ed9da10f9b26 100644
--- a/database/migrations/2018_01_10_073825_add_subscription_format.php
+++ b/database/migrations/2018_01_10_073825_add_subscription_format.php
@@ -90,7 +90,7 @@ class AddSubscriptionFormat extends Migration
             $table->boolean('is_deleted')->default(false);
 
             $table->unsignedInteger('quote_id')->index();
-            $table->unsignedInteger('proposal_template_id')->index();
+            $table->unsignedInteger('proposal_template_id')->nullable()->index();
             $table->text('private_notes');
             $table->mediumText('html');
             $table->mediumText('css');
diff --git a/resources/views/proposals/edit.blade.php b/resources/views/proposals/edit.blade.php
index c624d5ef053c..22cdd0c7fbbf 100644
--- a/resources/views/proposals/edit.blade.php
+++ b/resources/views/proposals/edit.blade.php
@@ -3,17 +3,8 @@
 @section('head')
     @parent
 
-    <script src="{{ asset('js/grapesjs.min.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script>
-    <link href="{{ asset('css/grapesjs.css') }}?no_cache={{ NINJA_VERSION }}" rel="stylesheet" type="text/css"/>
-
-    <style>
-    .gjs-four-color {
-        color: white !important;
-    }
-    .gjs-block.fa {
-        font-size: 4em !important;
-    }
-    </style>
+    @include('money_script')
+    @include('proposals.grapesjs_header')
 
 @stop
 
@@ -24,7 +15,6 @@
             ->id('mainForm')
             ->rules([
                 'quote_id' => 'required',
-                'proposal_template_id' => 'required',
             ]) !!}
 
     @if ($proposal)
@@ -122,11 +112,22 @@
 
                 if (field == 'quote_number') {
                     field = 'invoice_number';
+                } else if (field == 'valid_until') {
+                    field = 'due_date';
+                } else if (field == 'quote_date') {
+                    field = 'invoice_date';
                 }
 
                 var value = getDescendantProp(quote, field) || ' ';
                 value = doubleDollarSign(value) + '';
                 value = value.replace(/\n/g, "\\n").replace(/\r/g, "\\r");
+
+                if (field == 'amount' || field == 'partial') {
+                    value = formatMoneyInvoice(value, quote);
+                } else if (['invoice_date', 'due_date'].indexOf(field) >= 0) {
+                    value = moment.utc(value).format('{{ $account->getMomentDateFormat() }}');
+                }
+
                 html = html.replace(match, value);
             }
         }
diff --git a/resources/views/proposals/grapesjs_header.blade.php b/resources/views/proposals/grapesjs_header.blade.php
new file mode 100644
index 000000000000..4a3e84bb3d13
--- /dev/null
+++ b/resources/views/proposals/grapesjs_header.blade.php
@@ -0,0 +1,15 @@
+<script src="{{ asset('js/grapesjs.min.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script>
+<link href="{{ asset('css/grapesjs.css') }}?no_cache={{ NINJA_VERSION }}" rel="stylesheet" type="text/css"/>
+
+<style>
+.gjs-four-color {
+    color: white !important;
+}
+.gjs-block-label,
+.gjs-block-categories {
+    font-size: 12px !important;
+}
+.gjs-toolbar-item {
+    font-size: 2em !important;
+}
+</style>
diff --git a/resources/views/proposals/snippets/edit.blade.php b/resources/views/proposals/snippets/edit.blade.php
index 68fc78b0597b..af232dd046d5 100644
--- a/resources/views/proposals/snippets/edit.blade.php
+++ b/resources/views/proposals/snippets/edit.blade.php
@@ -3,20 +3,7 @@
 @section('head')
     @parent
 
-    <script src="{{ asset('js/grapesjs.min.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script>
-    <link href="{{ asset('css/grapesjs.css') }}?no_cache={{ NINJA_VERSION }}" rel="stylesheet" type="text/css"/>
-
-    <style>
-    .gjs-four-color {
-        color: white !important;
-    }
-    .gjs-block.fa {
-        font-size: 4em !important;
-    }
-    .icon-select {
-        font-family: sans-serif, 'FontAwesome';
-    }
-    </style>
+    @include('proposals.grapesjs_header')
 
 @stop
 
diff --git a/resources/views/proposals/templates/edit.blade.php b/resources/views/proposals/templates/edit.blade.php
index b1e3b569afbc..aff8ece02bbd 100644
--- a/resources/views/proposals/templates/edit.blade.php
+++ b/resources/views/proposals/templates/edit.blade.php
@@ -3,17 +3,7 @@
 @section('head')
     @parent
 
-    <script src="{{ asset('js/grapesjs.min.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script>
-    <link href="{{ asset('css/grapesjs.css') }}?no_cache={{ NINJA_VERSION }}" rel="stylesheet" type="text/css"/>
-
-    <style>
-    .gjs-four-color {
-        color: white !important;
-    }
-    .gjs-block.fa {
-        font-size: 4em !important;
-    }
-    </style>
+    @include('proposals.grapesjs_header')
 
 @stop