diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index c95278c362b1..59d0dc8e01b4 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -7,6 +7,8 @@ use Session;
 use Utils;
 use View;
 use Event;
+use Validator;
+use stdClass;
 
 use App\Models\Account;
 use App\Models\Country;
@@ -17,6 +19,7 @@ use App\Models\Language;
 use App\Models\Size;
 use App\Models\Timezone;
 use App\Models\Industry;
+use App\Models\InvoiceDesign;
 use App\Ninja\Repositories\AccountRepository;
 use App\Ninja\Mailers\UserMailer;
 use App\Ninja\Mailers\ContactMailer;
@@ -203,8 +206,9 @@ class AccountController extends BaseController
                 $invoice->invoice_items = [$invoiceItem];
 
                 $data['invoice'] = $invoice;
-                $data['invoiceDesigns'] = InvoiceDesign::remember(DEFAULT_QUERY_CACHE, 'invoice_designs_cache_'.Auth::user()->maxInvoiceDesignId())
-                    ->where('id', '<=', Auth::user()->maxInvoiceDesignId())->orderBy('id')->get();
+                //$data['invoiceDesigns'] = InvoiceDesign::remember(DEFAULT_QUERY_CACHE, 'invoice_designs_cache_'.Auth::user()->maxInvoiceDesignId())
+                //    ->where('id', '<=', Auth::user()->maxInvoiceDesignId())->orderBy('id')->get();
+                $data['invoiceDesigns'] = InvoiceDesign::where('id', '<=', Auth::user()->maxInvoiceDesignId())->orderBy('id')->get();
             } else if ($subSection == ACCOUNT_EMAIL_TEMPLATES) {
                 $data['invoiceEmail'] = $account->getEmailTemplate(ENTITY_INVOICE);
                 $data['quoteEmail'] = $account->getEmailTemplate(ENTITY_QUOTE);
@@ -297,7 +301,7 @@ class AccountController extends BaseController
             $account->quote_number_prefix = Input::get('quote_number_prefix');
             $account->share_counter = Input::get('share_counter') ? true : false;
             
-            $account->pdf_email_attachment = Input::get('pdf_email_attachment') ? true : false;
+            //$account->pdf_email_attachment = Input::get('pdf_email_attachment') ? true : false;
 
             if (!$account->share_counter) {
                 $account->quote_number_counter = Input::get('quote_number_counter');
diff --git a/app/Http/Controllers/AccountGatewayController.php b/app/Http/Controllers/AccountGatewayController.php
index 2cde2a4c7b57..9dffc318f425 100644
--- a/app/Http/Controllers/AccountGatewayController.php
+++ b/app/Http/Controllers/AccountGatewayController.php
@@ -7,8 +7,13 @@ use Input;
 use Redirect;
 use Session;
 use View;
+use Validator;
+use stdClass;
 
 use App\Models\Gateway;
+use App\Models\Account;
+use App\Models\AccountGateway;
+
 use App\Ninja\Repositories\AccountRepository;
 
 class AccountGatewayController extends BaseController
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 4352920d04fd..bfbeba8cc6ab 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -2,8 +2,16 @@
 
 use Auth;
 use Input;
+use Utils;
+use DB;
+use DateInterval;
+use DatePeriod;
+use Session;
+use View;
 
-class ReportController extends \BaseController
+use App\Models\Account;
+
+class ReportController extends BaseController
 {
     public function d3()
     {
diff --git a/app/Http/Controllers/TokenController.php b/app/Http/Controllers/TokenController.php
index d6a488e3a4b1..15bdf43a8838 100644
--- a/app/Http/Controllers/TokenController.php
+++ b/app/Http/Controllers/TokenController.php
@@ -9,6 +9,16 @@
 |
 */
 
+use Auth;
+use Session;
+use DB;
+use Validator;
+use Input;
+use View;
+use Redirect;
+
+use App\Models\AccountToken;
+
 use App\Ninja\Repositories\AccountRepository;
 
 class TokenController extends BaseController
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index e325136c1b90..107a715cc3a6 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -7,6 +7,9 @@ use Input;
 use View;
 use Redirect;
 use Session;
+use Utils;
+
+use App\Models\User;
 
 use App\Http\Requests;
 use App\Http\Controllers\Controller;
diff --git a/app/Listeners/HandleUserSettingsChanged.php b/app/Listeners/HandleUserSettingsChanged.php
index 8ebd1a9b3355..e01a010c9dd1 100644
--- a/app/Listeners/HandleUserSettingsChanged.php
+++ b/app/Listeners/HandleUserSettingsChanged.php
@@ -1,5 +1,7 @@
 <?php namespace App\Listeners;
 
+use Auth;
+
 use App\Events\UserSettingsChanged;
 
 use Illuminate\Queue\InteractsWithQueue;
diff --git a/app/Models/Gateway.php b/app/Models/Gateway.php
index 541354f8907d..cb275e23e826 100644
--- a/app/Models/Gateway.php
+++ b/app/Models/Gateway.php
@@ -3,13 +3,9 @@
 use Eloquent;
 use Omnipay;
 
-use Illuminate\Database\Eloquent\SoftDeletes;
-
 class Gateway extends Eloquent
 {
     public $timestamps = true;
-    use SoftDeletes;
-    protected $dates = ['deleted_at'];
 
     public function paymentlibrary()
     {
diff --git a/config/former.php b/config/former.php
index 9a9196c74969..3c30b7ad2871 100644
--- a/config/former.php
+++ b/config/former.php
@@ -48,7 +48,7 @@
 	////////////////////////////////////////////////////////////////////
 
 	// Where Former should look for translations
-	'translate_from'          => 'validation.attributes',
+	'translate_from'          => 'texts',
 
 	// Whether text that comes out of the translated
 	// should be capitalized (ex: email => Email) automatically
diff --git a/resources/views/accounts/account_gateway.blade.php b/resources/views/accounts/account_gateway.blade.php
index 9aa605664798..81f4f65dca35 100644
--- a/resources/views/accounts/account_gateway.blade.php
+++ b/resources/views/accounts/account_gateway.blade.php
@@ -3,14 +3,14 @@
 @section('content') 
     @parent 
 
-    {{ Former::open($url)->method($method)->rule()->addClass('col-md-8 col-md-offset-2 warn-on-exit') }} 
-    {{ Former::populate($account) }}
+    {!! Former::open($url)->method($method)->rule()->addClass('col-md-8 col-md-offset-2 warn-on-exit') !!} 
+    {!! Former::populate($account) !!}
 
-    {{ Former::legend($title) }}
+    {!! Former::legend($title) !!}
         
     @if ($accountGateway)
-        {{ Former::populateField('gateway_id', $accountGateway->gateway_id) }}
-        {{ Former::populateField('recommendedGateway_id', $accountGateway->gateway_id) }}
+        {!! Former::populateField('gateway_id', $accountGateway->gateway_id) !!}
+        {!! Former::populateField('recommendedGateway_id', $accountGateway->gateway_id) !!}
         @if ($config)
             @foreach ($accountGateway->fields as $field => $junk)
                 @if (in_array($field, ['solutionType', 'landingPage', 'headerImageUrl', 'brandName']))
@@ -23,24 +23,24 @@
     @endif
     
   <div class="two-column">
-        {{ Former::checkboxes('creditCardTypes[]')->label('Accepted Credit Cards')
+        {!! Former::checkboxes('creditCardTypes[]')->label('Accepted Credit Cards')
                 ->checkboxes($creditCardTypes)->class('creditcard-types')
-        }}
+        !!}
     </div>
 
     <p/>&nbsp;<p/>
     
     <div style="display:{{ $accountGateway ? 'none' : '' }}">
     <div class="two-column" style="display:{{ $onlyPayPal ? 'none' : '' }}">
-    {{ Former::radios('recommendedGateway_id')->label('Recommended Gateway')
+    {!! Former::radios('recommendedGateway_id')->label('Recommended Gateway')
             ->radios($recommendedGateways)->class('recommended-gateway')
-    }}
+    !!}
     </div>
 
-    {{ Former::select('gateway_id')->label('Select Gateway')->addOption('', '')
+    {!! Former::select('gateway_id')->label('Select Gateway')->addOption('', '')
         ->dataClass('gateway-dropdown')
         ->fromQuery($gateways, 'name', 'id')
-        ->onchange('setFieldsShown()'); }}
+        ->onchange('setFieldsShown()'); !!}
     </div>
 
     @foreach ($gateways as $gateway)
@@ -53,9 +53,9 @@
                 @elseif ($field == 'testMode' || $field == 'developerMode') 
                     {{-- Former::checkbox($gateway->id.'_'.$field)->label(Utils::toSpaceCase($field))->text('Enable') --}}              
                 @elseif ($field == 'username' || $field == 'password') 
-                    {{ Former::text($gateway->id.'_'.$field)->label('API '. ucfirst(Utils::toSpaceCase($field))) }}             
+                    {!! Former::text($gateway->id.'_'.$field)->label('API '. ucfirst(Utils::toSpaceCase($field))) !!}
                 @else
-                    {{ Former::text($gateway->id.'_'.$field)->label(Utils::toSpaceCase($field)) }}              
+                    {!! Former::text($gateway->id.'_'.$field)->label(Utils::toSpaceCase($field)) !!} 
                 @endif
 
             @endforeach
@@ -70,7 +70,7 @@
             @endif
 
             @if ($gateway->id == GATEWAY_STRIPE)
-                {{ Former::select('token_billing_type_id')->options($tokenBillingOptions)->help(trans('texts.token_billing_help')) }}
+                {!! Former::select('token_billing_type_id')->options($tokenBillingOptions)->help(trans('texts.token_billing_help')) !!}
             @endif
         </div>
         
@@ -78,11 +78,10 @@
 
     <p/>&nbsp;<p/>
 
-    {{ Former::actions( 
-        Button::lg_success_submit('Save')->append_with_icon('floppy-disk'),
-        $countGateways > 0 ? Button::lg_default_link('company/payments', 'Cancel')->append_with_icon('remove-circle') : false
-    )}}
-    {{ Former::close() }}
+    {!! Former::actions( 
+        Button::success('Save')->submit()->large()->appendIcon(Icon::create('floppy-disk')),
+        $countGateways > 0 ? Button::lg_default_link('company/payments', 'Cancel')->append_with_icon('remove-circle') : false) !!}
+    {!! Former::close() !!}
 
 
     <script type="text/javascript">
diff --git a/resources/views/accounts/details.blade.php b/resources/views/accounts/details.blade.php
index 7dd89ec9d428..5a60160afbac 100644
--- a/resources/views/accounts/details.blade.php
+++ b/resources/views/accounts/details.blade.php
@@ -11,10 +11,10 @@
 
 	</style>
 
-	{{ Former::open_for_files()->addClass('col-md-10 col-md-offset-1 warn-on-exit')->rules(array(
+	{!! Former::open_for_files()->addClass('col-md-10 col-md-offset-1 warn-on-exit')->rules(array(
   		'name' => 'required',
   		'email' => 'email|required'
-	)) }}
+	)) !!}
 
 	{{ Former::populate($account) }}
 	@if ($showUser)
@@ -27,66 +27,64 @@
 	<div class="row">
 		<div class="col-md-5">
 
-			{{ Former::legend('details') }}
-			{{ Former::text('name') }}
-                        {{ Former::text('id_number') }}
-                        {{ Former::text('vat_number') }}
-			{{ Former::text('work_email') }}
-			{{ Former::text('work_phone') }}
-			{{ Former::file('logo')->max(2, 'MB')->accept('image')->inlineHelp(trans('texts.logo_help')) }}
+			{!! Former::legend('details') !!}
+			{!! Former::text('name') !!}
+            {!! Former::text('id_number') !!}
+            {!! Former::text('vat_number') !!}
+			{!! Former::text('work_email') !!}
+			{!! Former::text('work_phone') !!}
+			{!! Former::file('logo')->max(2, 'MB')->accept('image')->inlineHelp(trans('texts.logo_help')) !!}
 
 			@if (file_exists($account->getLogoPath()))
 				<center>
-					{{ HTML::image($account->getLogoPath(), "Logo") }} &nbsp;
+					{!! HTML::image($account->getLogoPath(), "Logo") !!} &nbsp;
 					<a href="#" onclick="deleteLogo()">{{ trans('texts.remove_logo') }}</a>
 				</center><br/>
 			@endif
 
-			{{ Former::select('size_id')->addOption('','')
-				->fromQuery($sizes, 'name', 'id') }}
-			{{ Former::select('industry_id')->addOption('','')
-				->fromQuery($industries, 'name', 'id') }}
+			{!! Former::select('size_id')->addOption('','')->fromQuery($sizes, 'name', 'id') !!}
+			{!! Former::select('industry_id')->addOption('','')->fromQuery($industries, 'name', 'id') !!}
 
-			{{ Former::legend('address') }}	
-			{{ Former::text('address1') }}
-			{{ Former::text('address2') }}
-			{{ Former::text('city') }}
-			{{ Former::text('state') }}
-			{{ Former::text('postal_code') }}
-			{{ Former::select('country_id')->addOption('','')
-				->fromQuery($countries, 'name', 'id') }}
+			{!! Former::legend('address') !!}	
+			{!! Former::text('address1') !!}
+			{!! Former::text('address2') !!}
+			{!! Former::text('city') !!}
+			{!! Former::text('state') !!}
+			{!! Former::text('postal_code') !!}
+			{!! Former::select('country_id')->addOption('','')
+				->fromQuery($countries, 'name', 'id') !!}
 
 		</div>
 	
 		<div class="col-md-5 col-md-offset-1">		
 
 			@if ($showUser)
-				{{ Former::legend('users') }}
-				{{ Former::text('first_name') }}
-				{{ Former::text('last_name') }}
-				{{ Former::text('email') }}
-				{{ Former::text('phone') }}
-                {{ Former::actions(Button::primary_sm(trans('texts.change_password'), ['onclick'=>'showChangePassword()'])); }}
+				{!! Former::legend('users') !!}
+				{!! Former::text('first_name') !!}
+				{!! Former::text('last_name') !!}
+				{!! Former::text('email') !!}
+				{!! Former::text('phone') !!}
+                {!! Former::actions(Button::primary(trans('texts.change_password'), ['onclick'=>'showChangePassword()']))->small() !!}
 			@endif
 
-			{{ Former::legend('localization') }}
-			{{ Former::select('language_id')->addOption('','')
-				->fromQuery($languages, 'name', 'id') }}			
-			{{ Former::select('currency_id')->addOption('','')
-				->fromQuery($currencies, 'name', 'id') }}			
-			{{ Former::select('timezone_id')->addOption('','')
-				->fromQuery($timezones, 'location', 'id') }}
-			{{ Former::select('date_format_id')->addOption('','')
-				->fromQuery($dateFormats, 'label', 'id') }}
-			{{ Former::select('datetime_format_id')->addOption('','')
-				->fromQuery($datetimeFormats, 'label', 'id') }}
+			{!! Former::legend('localization') !!}
+			{!! Former::select('language_id')->addOption('','')
+				->fromQuery($languages, 'name', 'id') !!}			
+			{!! Former::select('currency_id')->addOption('','')
+				->fromQuery($currencies, 'name', 'id') !!}			
+			{!! Former::select('timezone_id')->addOption('','')
+				->fromQuery($timezones, 'location', 'id') !!}
+			{!! Former::select('date_format_id')->addOption('','')
+				->fromQuery($dateFormats, 'label', 'id') !!}
+			{!! Former::select('datetime_format_id')->addOption('','')
+				->fromQuery($datetimeFormats, 'label', 'id') !!}
 
 
 		</div>
 	</div>
 	
 	<center>
-		{{ Button::lg_success_submit(trans('texts.save'))->append_with_icon('floppy-disk') }}
+        {!! Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk')) !!}
 	</center>
 
 
@@ -101,9 +99,9 @@
                 <div style="background-color: #fff" id="changePasswordDiv" onkeyup="validateChangePassword()" onclick="validateChangePassword()" onkeydown="checkForEnter(event)">
                     &nbsp;
 
-                    {{ Former::password('current_password')->style('width:300px') }}
-                    {{ Former::password('new_password')->style('width:300px') }}
-                    {{ Former::password('confirm_password')->style('width:300px') }}
+                    {!! Former::password('current_password')->style('width:300px') !!}
+                    {!! Former::password('new_password')->style('width:300px') !!}
+                    {!! Former::password('confirm_password')->style('width:300px') !!}
 
                     &nbsp;
                     <br/>
@@ -142,10 +140,10 @@
     </div>
 
 
-	{{ Former::close() }}
+	{!! Former::close() !!}
 
-	{{ Form::open(['url' => 'remove_logo', 'class' => 'removeLogoForm']) }}	
-	{{ Form::close() }}
+	{!! Form::open(['url' => 'remove_logo', 'class' => 'removeLogoForm']) !!}	
+	{!! Form::close() !!}
 
 
 
diff --git a/resources/views/accounts/email_templates.blade.php b/resources/views/accounts/email_templates.blade.php
index f22abef5039e..32ee1d3c22e4 100644
--- a/resources/views/accounts/email_templates.blade.php
+++ b/resources/views/accounts/email_templates.blade.php
@@ -15,35 +15,35 @@
     @parent
     @include('accounts.nav_advanced')
 
-    {{ Former::open()->addClass('col-md-8 col-md-offset-2 warn-on-exit') }}
-    {{ Former::populateField('email_template_invoice', $invoiceEmail) }}
-    {{ Former::populateField('email_template_quote', $quoteEmail) }}
-    {{ Former::populateField('email_template_payment', $paymentEmail) }}
+    {!! Former::open()->addClass('col-md-8 col-md-offset-2 warn-on-exit') !!}
+    {!! Former::populateField('email_template_invoice', $invoiceEmail) !!}
+    {!! Former::populateField('email_template_quote', $quoteEmail) !!}
+    {!! Former::populateField('email_template_payment', $paymentEmail) !!}
 
-    {{ Former::legend('invoice_email') }}
+    {!! Former::legend('invoice_email') !!}
     <div class="row">
         <div class="col-md-7">
-            {{ Former::textarea('email_template_invoice')->raw() }}
+            {!! Former::textarea('email_template_invoice')->raw() !!}
         </div>
         <div class="col-md-5" id="invoice_preview"></div>
     </div>
 
     <p>&nbsp;</p>
 
-    {{ Former::legend('quote_email') }}
+    {!! Former::legend('quote_email') !!}
     <div class="row">
         <div class="col-md-7">
-            {{ Former::textarea('email_template_quote')->raw() }}
+            {!! Former::textarea('email_template_quote')->raw() !!}
         </div>
         <div class="col-md-5" id="quote_preview"></div>
     </div>
 
     <p>&nbsp;</p>
 
-    {{ Former::legend('payment_email') }}
+    {!! Former::legend('payment_email') !!}
     <div class="row">
         <div class="col-md-7">
-            {{ Former::textarea('email_template_payment')->raw() }}
+            {!! Former::textarea('email_template_payment')->raw() !!}
         </div>
         <div class="col-md-5" id="payment_preview"></div>
     </div>
@@ -51,9 +51,9 @@
     <p>&nbsp;</p>
 
     @if (Auth::user()->isPro())
-        {{ Former::actions( 
-            Button::lg_success_submit(trans('texts.save'))->append_with_icon('floppy-disk')
-        ) }}
+        {!! Former::actions( 
+            Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk'))
+        ) !!}
     @else
         <script>
             $(function() {
@@ -62,7 +62,7 @@
         </script>
     @endif
 
-    {{ Former::close() }}
+    {!! Former::close() !!}
 
     <script type="text/javascript">
 
@@ -94,7 +94,7 @@
             }
 
             keys = ['footer', 'account', 'client', 'amount', 'link'];
-            vals = [{{ json_encode($emailFooter) }}, '{{ Auth::user()->account->getDisplayName() }}', 'Client Name', formatMoney(100), '{{ NINJA_WEB_URL }}']
+            vals = [{!! json_encode($emailFooter) !!}, '{!! Auth::user()->account->getDisplayName() !!}', 'Client Name', formatMoney(100), '{!! NINJA_WEB_URL !!}']
 
             for (var i=0; i<keys.length; i++) {
                 var regExp = new RegExp('\\$'+keys[i], 'g');
diff --git a/resources/views/accounts/import_export.blade.php b/resources/views/accounts/import_export.blade.php
index 6a3baaddc5e0..bfe56882e602 100644
--- a/resources/views/accounts/import_export.blade.php
+++ b/resources/views/accounts/import_export.blade.php
@@ -3,35 +3,35 @@
 @section('content')
 @parent
 
-{{ Former::open_for_files('company/import_map')->addClass('col-md-9 col-md-offset-1') }}
-{{ Former::legend('import_clients') }}
-{{ Former::file('file')->label(trans('texts.csv_file')) }}
-{{ Former::actions( Button::lg_info_submit(trans('texts.upload'))->append_with_icon('open') ) }}
-{{ Former::close() }}
+{!! Former::open_for_files('company/import_map')->addClass('col-md-9 col-md-offset-1') !!}
+{!! Former::legend('texts.import_clients') !!}
+{!! Former::file('file')->label(trans('texts.csv_file')) !!}
+{!! Former::actions( Button::info(trans('texts.upload'))->submit()->large()->appendIcon(Icon::create('open'))) !!}
+{!! Former::close() !!}
 
-{{ Former::open('company/export')->addClass('col-md-9 col-md-offset-1') }}
-{{ Former::legend('export_clients') }}
-{{ Former::actions( Button::lg_primary_submit(trans('texts.download'))->append_with_icon('download-alt') ) }}
-{{ Former::close() }}
+{!! Former::open('company/export')->addClass('col-md-9 col-md-offset-1') !!}
+{!! Former::legend('texts.export_clients') !!}
+{!! Former::actions( Button::primary(trans('texts.download'))->submit()->large()->appendIcon(Icon::create('download-alt'))) !!}
+{!! Former::close() !!}
 
 <p>&nbsp;</p>
 <p>&nbsp;</p>
 
-{{ Former::open('company/cancel_account')->addClass('col-md-9 col-md-offset-1 cancel-account') }}
-{{ Former::legend('cancel_account') }}
-{{ Former::actions( Button::lg_danger_button(trans('texts.cancel_account'), ['onclick' => 'showConfirm()'])->append_with_icon('trash') ) }}
+{!! Former::open('company/cancel_account')->addClass('col-md-9 col-md-offset-1 cancel-account') !!}
+{!! Former::legend('cancel_account') !!}
+{!! Former::actions( Button::danger(trans('texts.cancel_account'))->large()->withAttributes(['onclick' => 'showConfirm()'])->appendIcon(Icon::create('trash'))) !!}
 
 <div class="modal fade" id="confirmCancelModal" tabindex="-1" role="dialog" aria-labelledby="confirmCancelModalLabel" aria-hidden="true">
   <div class="modal-dialog" style="min-width:150px">
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title" id="confirmCancelModalLabel">{{ trans('texts.cancel_account') }}</h4>
+        <h4 class="modal-title" id="confirmCancelModalLabel">{!! trans('texts.cancel_account') !!}</h4>
       </div>
 
       <div style="background-color: #fff; padding-left: 16px; padding-right: 16px">
         &nbsp;<p>{{ trans('texts.cancel_account_message') }}</p>&nbsp;
-        &nbsp;<p>{{ Former::textarea('reason')->placeholder(trans('texts.reason_for_canceling'))->raw() }}</p>&nbsp;        
+        &nbsp;<p>{!! Former::textarea('reason')->placeholder(trans('texts.reason_for_canceling'))->raw() !!}</p>&nbsp;        
       </div>
 
       <div class="modal-footer" style="margin-top: 0px">
@@ -43,7 +43,7 @@
   </div>
 </div>
 
-{{ Former::close() }}  
+{!! Former::close() !!}  
 
 
 <script type="text/javascript">
diff --git a/resources/views/accounts/invoice_design.blade.php b/resources/views/accounts/invoice_design.blade.php
index 8124fb13bd53..d6984104ccc2 100644
--- a/resources/views/accounts/invoice_design.blade.php
+++ b/resources/views/accounts/invoice_design.blade.php
@@ -3,8 +3,8 @@
 @section('head')
 	@parent
 
-		<script src="{{ asset('js/pdf_viewer.js') }}" type="text/javascript"></script>
-		<script src="{{ asset('js/compatibility.js') }}" type="text/javascript"></script>
+		<script src="{!! asset('js/pdf_viewer.js') !!}" type="text/javascript"></script>
+		<script src="{!! asset('js/compatibility.js') !!}" type="text/javascript"></script>
 @stop
 
 @section('content')	
@@ -12,8 +12,8 @@
 	@include('accounts.nav_advanced')
 
   <script>
-    var invoiceDesigns = {{ $invoiceDesigns }};
-    var invoice = {{ json_encode($invoice) }};      
+    var invoiceDesigns = {!! $invoiceDesigns !!};
+    var invoice = {!! json_encode($invoice) !!};      
       
     function getDesignJavascript() {
       var id = $('#invoice_design_id').val();
@@ -27,7 +27,7 @@
     }
 
     function getPDFString() {
-      invoice.is_pro = {{ Auth::user()->isPro() ? 'true' : 'false' }};
+      invoice.is_pro = {!! Auth::user()->isPro() ? 'true' : 'false' !!};
       invoice.account.hide_quantity = $('#hide_quantity').is(":checked");
       invoice.account.hide_paid_to_date = $('#hide_paid_to_date').is(":checked");
       invoice.invoice_design_id = $('#invoice_design_id').val();
@@ -45,7 +45,7 @@
     $(function() {   
       var options = {
         preferredFormat: 'hex',
-        disabled: {{ Auth::user()->isPro() ? 'false' : 'true' }},
+        disabled: {!! Auth::user()->isPro() ? 'false' : 'true' !!},
         showInitial: false,
         showInput: true,
         allowEmpty: true,
@@ -64,37 +64,37 @@
   <div class="row">
     <div class="col-md-6">
 
-      {{ Former::open()->addClass('warn-on-exit')->onchange('refreshPDF()') }}
-      {{ Former::populate($account) }}
-      {{ Former::populateField('hide_quantity', intval($account->hide_quantity)) }}
-      {{ Former::populateField('hide_paid_to_date', intval($account->hide_paid_to_date)) }}
+      {!! Former::open()->addClass('warn-on-exit')->onchange('refreshPDF()') !!}
+      {!! Former::populate($account) !!}
+      {!! Former::populateField('hide_quantity', intval($account->hide_quantity)) !!}
+      {!! Former::populateField('hide_paid_to_date', intval($account->hide_paid_to_date)) !!}
 
-      {{ Former::legend('invoice_design') }}
+      {!! Former::legend('invoice_design') !!}
 
 
-      @if (!Utils::isPro() || InvoiceDesign::count() == COUNT_FREE_DESIGNS)      
-        {{ Former::select('invoice_design_id')->style('display:inline;width:120px')->fromQuery($invoiceDesigns, 'name', 'id')->addOption(trans('texts.more_designs') . '...', '-1') }}        
+      @if (!Utils::isPro() || \App\Models\InvoiceDesign::count() == COUNT_FREE_DESIGNS)      
+        {!! Former::select('invoice_design_id')->style('display:inline;width:120px')->fromQuery($invoiceDesigns, 'name', 'id')->addOption(trans('texts.more_designs') . '...', '-1') !!}        
       @else 
-        {{ Former::select('invoice_design_id')->style('display:inline;width:120px')->fromQuery($invoiceDesigns, 'name', 'id') }}
+        {!! Former::select('invoice_design_id')->style('display:inline;width:120px')->fromQuery($invoiceDesigns, 'name', 'id') !!}
       @endif
 
       
 
-      {{ Former::text('primary_color') }}
-      {{ Former::text('secondary_color') }}
+      {!! Former::text('primary_color') !!}
+      {!! Former::text('secondary_color') !!}
 
       <p>&nbsp;</p>
       <p>&nbsp;</p>
 
-      {{ Former::legend('invoice_options') }}
-      {{ Former::checkbox('hide_quantity')->text(trans('texts.hide_quantity_help')) }}
-      {{ Former::checkbox('hide_paid_to_date')->text(trans('texts.hide_paid_to_date_help')) }}
+      {!! Former::legend('invoice_options') !!}
+      {!! Former::checkbox('hide_quantity')->text(trans('texts.hide_quantity_help')) !!}
+      {!! Former::checkbox('hide_paid_to_date')->text(trans('texts.hide_paid_to_date_help')) !!}
 
       <p>&nbsp;</p>
       <p>&nbsp;</p>
 
       @if (Auth::user()->isPro())
-      {{ Former::actions( Button::lg_success_submit(trans('texts.save'))->append_with_icon('floppy-disk') ) }}
+      {!! Former::actions( Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk'))) !!}
       @else
       <script>
           $(function() {   
@@ -103,7 +103,7 @@
       </script> 
       @endif
 
-      {{ Former::close() }}
+      {!! Former::close() !!}
 
     </div>
     <div class="col-md-6">
diff --git a/resources/views/accounts/invoice_settings.blade.php b/resources/views/accounts/invoice_settings.blade.php
index beb4fef9e022..0e5127ff4a8d 100644
--- a/resources/views/accounts/invoice_settings.blade.php
+++ b/resources/views/accounts/invoice_settings.blade.php
@@ -1,53 +1,66 @@
 @extends('accounts.nav')
 
+@section('head')
+    @parent
+
+        <style type="text/css">
+            div.checkbox {
+                display: inline;
+            }
+            span.input-group-addon {
+                padding-right: 30px;
+            }
+        </style>
+@stop
+
 @section('content')	
 	@parent
 	@include('accounts.nav_advanced')
 
-	{{ Former::open()->addClass('col-md-8 col-md-offset-2 warn-on-exit') }}
-	{{ Former::populate($account) }}
-	{{ Former::populateField('custom_invoice_taxes1', intval($account->custom_invoice_taxes1)) }}
-	{{ Former::populateField('custom_invoice_taxes2', intval($account->custom_invoice_taxes2)) }}
-  {{ Former::populateField('share_counter', intval($account->share_counter)) }}
+	{!! Former::open()->addClass('col-md-8 col-md-offset-2 warn-on-exit') !!}
+	{!! Former::populate($account) !!}
+	{!! Former::populateField('custom_invoice_taxes1', intval($account->custom_invoice_taxes1)) !!}
+	{!! Former::populateField('custom_invoice_taxes2', intval($account->custom_invoice_taxes2)) !!}
+  {!! Former::populateField('share_counter', intval($account->share_counter)) !!}
 
 
-	{{ Former::legend('invoice_fields') }}
-	{{ Former::text('custom_invoice_label1')->label(trans('texts.field_label'))
-			->append(Former::checkbox('custom_invoice_taxes1')->raw() . ' ' . trans('texts.charge_taxes')) }}		
-	{{ Former::text('custom_invoice_label2')->label(trans('texts.field_label'))
-			->append(Former::checkbox('custom_invoice_taxes2')->raw() . ' ' . trans('texts.charge_taxes')) }}			
+	{!! Former::legend('invoice_fields') !!}
+	{!! Former::text('custom_invoice_label1')->label(trans('texts.field_label'))
+			->append(Former::checkbox('custom_invoice_taxes1')->raw() . trans('texts.charge_taxes')) !!}
+	{!! Former::text('custom_invoice_label2')->label(trans('texts.field_label'))
+			->append(Former::checkbox('custom_invoice_taxes2')->raw() . ' ' . trans('texts.charge_taxes')) !!}			
 	<p>&nbsp;</p>
 
-	{{ Former::legend('client_fields') }}
-	{{ Former::text('custom_client_label1')->label(trans('texts.field_label')) }}
-	{{ Former::text('custom_client_label2')->label(trans('texts.field_label')) }}
+	{!! Former::legend('client_fields') !!}
+	{!! Former::text('custom_client_label1')->label(trans('texts.field_label')) !!}
+	{!! Former::text('custom_client_label2')->label(trans('texts.field_label')) !!}
 	<p>&nbsp;</p>
 
-	{{ Former::legend('company_fields') }}
-	{{ Former::text('custom_label1')->label(trans('texts.field_label')) }}
-	{{ Former::text('custom_value1')->label(trans('texts.field_value')) }}
+	{!! Former::legend('company_fields') !!}
+	{!! Former::text('custom_label1')->label(trans('texts.field_label')) !!}
+	{!! Former::text('custom_value1')->label(trans('texts.field_value')) !!}
 	<p>&nbsp;</p>
-	{{ Former::text('custom_label2')->label(trans('texts.field_label')) }}
-	{{ Former::text('custom_value2')->label(trans('texts.field_value')) }}
+	{!! Former::text('custom_label2')->label(trans('texts.field_label')) !!}
+	{!! Former::text('custom_value2')->label(trans('texts.field_value')) !!}
 	<p>&nbsp;</p>
 
-	{{ Former::legend('invoice_number') }}
-	{{ Former::text('invoice_number_prefix')->label(trans('texts.invoice_number_prefix')) }}
-	{{ Former::text('invoice_number_counter')->label(trans('texts.invoice_number_counter')) }}
+	{!! Former::legend('invoice_number') !!}
+	{!! Former::text('invoice_number_prefix')->label(trans('texts.invoice_number_prefix')) !!}
+	{!! Former::text('invoice_number_counter')->label(trans('texts.invoice_number_counter')) !!}
 	<p>&nbsp;</p>
 	
-	{{ Former::legend('quote_number') }}
-	{{ Former::text('quote_number_prefix')->label(trans('texts.quote_number_prefix')) }}
-	{{ Former::text('quote_number_counter')->label(trans('texts.quote_number_counter'))
-			->append(Former::checkbox('share_counter')->raw()->onclick('setQuoteNumberEnabled()') . ' ' . trans('texts.share_invoice_counter')) }}
+	{!! Former::legend('quote_number') !!}
+	{!! Former::text('quote_number_prefix')->label(trans('texts.quote_number_prefix')) !!}
+	{!! Former::text('quote_number_counter')->label(trans('texts.quote_number_counter'))
+			->append(Former::checkbox('share_counter')->raw()->onclick('setQuoteNumberEnabled()') . ' ' . trans('texts.share_invoice_counter')) !!}
 	<p>&nbsp;</p>
 
-	{{ Former::legend('email_settings') }}
-	{{ Former::checkbox('pdf_email_attachment') }}
+	{!! Former::legend('email_settings') !!}
+	{!! Former::checkbox('pdf_email_attachment') !!}
 	<p>&nbsp;</p>
 
 	@if (Auth::user()->isPro())
-	{{ Former::actions( Button::lg_success_submit(trans('texts.save'))->append_with_icon('floppy-disk') ) }}
+	{!! Former::actions( Button::success(trans('texts.save'))->large()->submit()->appendIcon(Icon::create('floppy-disk'))) !!}
 	@else
 	<script>
     $(function() {   
@@ -56,7 +69,7 @@
 	</script>	
 	@endif
 
-	{{ Former::close() }}
+	{!! Former::close() !!}
 
 
 	<script type="text/javascript">
@@ -64,7 +77,7 @@
   	function setQuoteNumberEnabled() {
 			var disabled = $('#share_counter').prop('checked');
 			$('#quote_number_counter').prop('disabled', disabled);
-			$('#quote_number_counter').val(disabled ? '' : '{{ $account->quote_number_counter }}');			
+			$('#quote_number_counter').val(disabled ? '' : '{!! $account->quote_number_counter !!}');			
 		}
 
     $(function() {       	
diff --git a/resources/views/accounts/nav.blade.php b/resources/views/accounts/nav.blade.php
index 5967295ffa9e..d03312d6803c 100644
--- a/resources/views/accounts/nav.blade.php
+++ b/resources/views/accounts/nav.blade.php
@@ -3,12 +3,12 @@
 @section('content')
 
 	<ul class="nav nav-tabs nav nav-justified">
-  	{{ HTML::nav_link('company/details', 'company_details') }}
-    {{ HTML::nav_link('company/payments', 'online_payments', 'gateways') }}
-    {{ 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/advanced_settings/invoice_settings', 'advanced_settings', '*/advanced_settings/*') }}
+  	{!! HTML::nav_link('company/details', 'company_details') !!}
+    {!! HTML::nav_link('company/payments', 'online_payments', 'gateways') !!}
+    {!! 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/advanced_settings/invoice_settings', 'advanced_settings', '*/advanced_settings/*') !!}
 	</ul>
 
     <br/>
diff --git a/resources/views/accounts/nav_advanced.blade.php b/resources/views/accounts/nav_advanced.blade.php
index 3f0d62789ca5..30b598c7775c 100644
--- a/resources/views/accounts/nav_advanced.blade.php
+++ b/resources/views/accounts/nav_advanced.blade.php
@@ -1,9 +1,9 @@
 <ul class="nav nav-tabs nav nav-justified">
-  {{ HTML::nav_link('company/advanced_settings/invoice_settings', 'invoice_settings') }}
-  {{ HTML::nav_link('company/advanced_settings/invoice_design', 'invoice_design') }}
-  {{ HTML::nav_link('company/advanced_settings/email_templates', 'email_templates') }}
-  {{ HTML::nav_link('company/advanced_settings/chart_builder', 'chart_builder') }}
-  {{ HTML::nav_link('company/advanced_settings/user_management', 'users_and_tokens') }}
+  {!! HTML::nav_link('company/advanced_settings/invoice_settings', 'invoice_settings') !!}
+  {!! HTML::nav_link('company/advanced_settings/invoice_design', 'invoice_design') !!}
+  {!! HTML::nav_link('company/advanced_settings/email_templates', 'email_templates') !!}
+  {!! HTML::nav_link('company/advanced_settings/chart_builder', 'chart_builder') !!}
+  {!! HTML::nav_link('company/advanced_settings/user_management', 'users_and_tokens') !!}
 </ul>
 <p>&nbsp;</p>
 
diff --git a/resources/views/accounts/notifications.blade.php b/resources/views/accounts/notifications.blade.php
index 08e0c97b4d82..15f9915d162f 100644
--- a/resources/views/accounts/notifications.blade.php
+++ b/resources/views/accounts/notifications.blade.php
@@ -3,18 +3,18 @@
 @section('content')	
 	@parent	
 
-	{{ Former::open()->addClass('col-md-8 col-md-offset-2 warn-on-exit') }}	
+	{!! Former::open()->addClass('col-md-8 col-md-offset-2 warn-on-exit') !!}	
 	{{ Former::populate($account) }}
 	{{ Former::populateField('notify_sent', intval(Auth::user()->notify_sent)) }}
 	{{ Former::populateField('notify_viewed', intval(Auth::user()->notify_viewed)) }}
 	{{ Former::populateField('notify_paid', intval(Auth::user()->notify_paid)) }}
 
-	{{ Former::legend('email_notifications') }}
-	{{ Former::checkbox('notify_sent')->label('&nbsp;')->text(trans('texts.email_sent')) }}
-	{{ Former::checkbox('notify_viewed')->label('&nbsp;')->text(trans('texts.email_viewed')) }}
-	{{ Former::checkbox('notify_paid')->label('&nbsp;')->text(trans('texts.email_paid')) }}
+	{!! Former::legend(trans('texts.email_notifications')) !!}
+	{!! Former::checkbox('notify_sent')->label('&nbsp;')->text(trans('texts.email_sent')) !!}
+	{!! Former::checkbox('notify_viewed')->label('&nbsp;')->text(trans('texts.email_viewed')) !!}
+	{!! Former::checkbox('notify_paid')->label('&nbsp;')->text(trans('texts.email_paid')) !!}
 
-	{{ Former::legend('site_updates') }}
+	{!! Former::legend(trans('texts.site_updates')) !!}
 
 	<div class="form-group">
 		<label for="invoice_terms" class="control-label col-lg-4 col-sm-4"></label>
@@ -36,12 +36,16 @@
 
   </div></div>
 
-	{{ Former::legend('custom_messages') }}
-    {{ Former::textarea('invoice_terms')->label(trans('texts.default_invoice_terms')) }}
-    {{ Former::textarea('invoice_footer')->label(trans('texts.default_invoice_footer')) }}
-	{{ Former::textarea('email_footer')->label(trans('texts.default_email_footer')) }} 
+	{!! Former::legend(trans('texts.custom_messages')) !!}
+    {!! Former::textarea('invoice_terms')->label(trans('texts.default_invoice_terms')) !!}
+    {!! Former::textarea('invoice_footer')->label(trans('texts.default_invoice_footer')) !!}
+	{!! Former::textarea('email_footer')->label(trans('texts.default_email_footer')) !!} 
 
-	{{ Former::actions( Button::lg_success_submit(trans('texts.save'))->append_with_icon('floppy-disk') ) }}
-	{{ Former::close() }}
+	{!! Former::actions( 
+            Button::success(trans('texts.save'))
+                ->submit()->large()
+                ->appendIcon(Icon::create('floppy-disk'))) !!}
+                                
+	{!! Former::close() !!}
 
 @stop
\ No newline at end of file
diff --git a/resources/views/accounts/payments.blade.php b/resources/views/accounts/payments.blade.php
index abb07a11c787..ce367f98962b 100644
--- a/resources/views/accounts/payments.blade.php
+++ b/resources/views/accounts/payments.blade.php
@@ -3,20 +3,24 @@
 @section('content')	
 	@parent	
 
-  {{ Former::open('gateways/delete')->addClass('user-form') }}
-  {{ Former::legend('online_payments') }}
+  {!! Former::open('gateways/delete')->addClass('user-form') !!}
+  {!! Former::legend(trans('texts.online_payments')) !!}
 
   <div style="display:none">
-    {{ Former::text('accountGatewayPublicId') }}
+    {!! Former::text('accountGatewayPublicId') !!}
   </div>
-  {{ Former::close() }}
+  {!! Former::close() !!}
 
 
   @if ($showAdd)
-    {{ Button::success_link(URL::to('gateways/create'), trans("texts.add_gateway"), array('class' => 'pull-right'))->append_with_icon('plus-sign') }}
+      {!! Button::success(trans('texts.add_gateway'))
+            ->asLinkTo('/gateways/create')
+            ->withAttributes(['class' => 'pull-right'])
+            ->appendIcon(Icon::create('plus-sign'))
+            ->large() !!}
   @endif
 
-  {{ Datatable::table()
+  {!! Datatable::table()
       ->addColumn(
         trans('texts.name'),
         trans('texts.action'))
@@ -26,7 +30,7 @@
       ->setOptions('bAutoWidth', false)
       ->setOptions('aoColumns', [[ "sWidth"=> "80%" ], ["sWidth"=> "20%"]])
       ->setOptions('aoColumnDefs', [['bSortable'=>false, 'aTargets'=>[1]]])
-      ->render('datatable') }}
+      ->render('datatable') !!}
 
   <script>
   window.onDatatableReady = function() {
diff --git a/resources/views/accounts/products.blade.php b/resources/views/accounts/products.blade.php
index 26cd3b66ee90..28be6ebc7872 100644
--- a/resources/views/accounts/products.blade.php
+++ b/resources/views/accounts/products.blade.php
@@ -3,21 +3,24 @@
 @section('content') 
   @parent
 
-  {{ Former::open()->addClass('col-md-10 col-md-offset-1 warn-on-exit') }}
+  {!! Former::open()->addClass('col-md-10 col-md-offset-1 warn-on-exit') !!}
   {{ Former::populateField('fill_products', intval($account->fill_products)) }}
   {{ Former::populateField('update_products', intval($account->update_products)) }}
 
 
-  {{ Former::legend('product_library') }}
-  {{ Former::checkbox('fill_products')->text(trans('texts.fill_products_help')) }}
-  {{ Former::checkbox('update_products')->text(trans('texts.update_products_help')) }}
+  {!! Former::legend(trans('texts.product_library')) !!}
+  {!! Former::checkbox('fill_products')->text(trans('texts.fill_products_help')) !!}
+  {!! Former::checkbox('update_products')->text(trans('texts.update_products_help')) !!}
   &nbsp;
-  {{ Former::actions( Button::lg_success_submit(trans('texts.save'))->append_with_icon('floppy-disk') ) }}
-  {{ Former::close() }}
+  {!! Former::actions( Button::success(trans('texts.save'))->submit()->appendIcon(Icon::create('floppy-disk')) ) !!}
+  {!! Former::close() !!}
 
-  {{ Button::success_link(URL::to('products/create'), trans("texts.create_product"), array('class' => 'pull-right'))->append_with_icon('plus-sign') }} 
+  {!! Button::success(trans('texts.create_product'))
+        ->asLinkTo('/products/create')
+        ->withAttributes(['class' => 'pull-right'])
+        ->appendIcon(Icon::create('plus-sign')) !!}
 
-  {{ Datatable::table()   
+  {!! Datatable::table()   
       ->addColumn(
         trans('texts.product'),
         trans('texts.description'),
@@ -29,7 +32,7 @@
       ->setOptions('bAutoWidth', false)      
       ->setOptions('aoColumns', [[ "sWidth"=> "20%" ], [ "sWidth"=> "45%" ], ["sWidth"=> "20%"], ["sWidth"=> "15%" ]])      
       ->setOptions('aoColumnDefs', [['bSortable'=>false, 'aTargets'=>[3]]])
-      ->render('datatable') }}
+      ->render('datatable') !!}
 
   <script>
   window.onDatatableReady = function() {        
diff --git a/resources/views/accounts/token.blade.php b/resources/views/accounts/token.blade.php
index ace566e9dbf3..616c0ea9a30b 100644
--- a/resources/views/accounts/token.blade.php
+++ b/resources/views/accounts/token.blade.php
@@ -4,27 +4,27 @@
   @parent
   @include('accounts.nav_advanced')
 
-  {{ Former::open($url)->method($method)->addClass('col-md-8 col-md-offset-2 warn-on-exit')->rules(array(
+  {!! Former::open($url)->method($method)->addClass('col-md-8 col-md-offset-2 warn-on-exit')->rules(array(
       'name' => 'required',
-  )); }}
+  )); !!}
 
-  {{ Former::legend($title) }}
+  {!! Former::legend($title) !!}
 
   <p>&nbsp;</p>
 
   @if ($token)
-    {{ Former::populate($token) }}    
+    {!! Former::populate($token) !!}    
   @endif
 
-  {{ Former::text('name') }}
+  {!! Former::text('name') !!}
 
   <p>&nbsp;</p>
   
-  {{ Former::actions( 
-      Button::lg_success_submit(trans('texts.save'))->append_with_icon('floppy-disk'),
-      Button::lg_default_link('company/advanced_settings/token_management', trans('texts.cancel'))->append_with_icon('remove-circle')      
-  ) }}
+  {!! Former::actions( 
+      Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk')),
+      Button::normal(trans('texts.cancel'))->asLinkTo('/company/advanced_settings/user_management')->appendIcon(Icon::create('remove-circle'))->large()
+  ) !!}
 
-  {{ Former::close() }}
+  {!! Former::close() !!}
 
 @stop
\ No newline at end of file
diff --git a/resources/views/accounts/token_management.blade.php b/resources/views/accounts/token_management.blade.php
index 9f1c0ed1c729..40c9f61635f2 100644
--- a/resources/views/accounts/token_management.blade.php
+++ b/resources/views/accounts/token_management.blade.php
@@ -4,27 +4,27 @@
 	@parent
 	@include('accounts.nav_advanced')
 
-  {{ Former::open('tokens/delete')->addClass('user-form') }}
-  {{ Former::legend('token_management') }}
+  {!! Former::open('tokens/delete')->addClass('user-form') !!}
+  {!! Former::legend('token_management') !!}
 
   <div style="display:none">
-    {{ Former::text('tokenPublicId') }}
+    {!! Former::text('tokenPublicId') !!}
   </div>
-  {{ Former::close() }}
+  {!! Former::close() !!}
 
 
   @if (Utils::isPro())
-    {{ Button::success_link(URL::to('tokens/create'), trans("texts.add_token"), array('class' => 'pull-right'))->append_with_icon('plus-sign') }}
+    {!! Button::success(trans('texts.add_token'))->asLinkTo('/tokens/create')->withAttributes(['class' => 'pull-right'])->appendIcon(Icon::create('plus-sign')) !!}
   @endif
 
   <!--
     <label for="trashed" style="font-weight:normal; margin-left: 10px;">
         <input id="trashed" type="checkbox" onclick="setTrashVisible()"
-            {{ Session::get('show_trash:token') ? 'checked' : ''}}/> {{ trans('texts.show_deleted_tokens')}}
+            {!! Session::get('show_trash:token') ? 'checked' : ''!!}/> {!! trans('texts.show_deleted_tokens')!!}
     </label>
   -->
 
-  {{ Datatable::table()
+  {!! Datatable::table()
       ->addColumn(
         trans('texts.name'),
         trans('texts.token'),
@@ -35,7 +35,7 @@
       ->setOptions('bAutoWidth', false)
       ->setOptions('aoColumns', [[ "sWidth"=> "40%" ], [ "sWidth"=> "40%" ], ["sWidth"=> "20%"]])
       ->setOptions('aoColumnDefs', [['bSortable'=>false, 'aTargets'=>[2]]])
-      ->render('datatable') }}
+      ->render('datatable') !!}
 
   <script>
   window.onDatatableReady = function() {
@@ -51,7 +51,7 @@
 
     function setTrashVisible() {
         var checked = $('#trashed').is(':checked');
-        window.location = '{{ URL::to('view_archive/token') }}' + (checked ? '/true' : '/false');
+        window.location = '{!! URL::to('view_archive/token') !!}' + (checked ? '/true' : '/false');
     }
 
   function deleteToken(id) {
diff --git a/resources/views/accounts/user_management.blade.php b/resources/views/accounts/user_management.blade.php
index c0e8e2819e8e..8b6e07e7150f 100644
--- a/resources/views/accounts/user_management.blade.php
+++ b/resources/views/accounts/user_management.blade.php
@@ -4,30 +4,30 @@
 	@parent
 	@include('accounts.nav_advanced')
 
-  {{ Former::open('users/delete')->addClass('user-form') }}
-  {{ Former::legend('user_management') }}
+  {!! Former::open('users/delete')->addClass('user-form') !!}
+  {!! Former::legend('user_management') !!}
 
   <div style="display:none">
-    {{ Former::text('userPublicId') }}
+    {!! Former::text('userPublicId') !!}
   </div>
-  {{ Former::close() }}
+  {!! Former::close() !!}
 
 
   <div class="pull-right">  
     @if (Utils::isPro())    
-        {{ Button::success_link(URL::to('users/create'), trans("texts.add_user"))->append_with_icon('plus-sign') }}
+        {!! Button::success(trans('texts.add_user'))->asLinkTo('/users/create')->appendIcon(Icon::create('plus-sign')) !!}
     @endif
-    {{ Button::default_link(URL::to('company/advanced_settings/token_management'), trans("texts.api_tokens"))->append_with_icon('cloud') }}
+    {!! Button::normal(trans('texts.api_tokens'))->asLinkTo('/company/advanced_settings/token_management')->appendIcon(Icon::create('cloud')) !!}
   </div>
 
 
     <label for="trashed" style="font-weight:normal; margin-left: 10px;">
         <input id="trashed" type="checkbox" onclick="setTrashVisible()"
-            {{ Session::get('show_trash:user') ? 'checked' : ''}}/> {{ trans('texts.show_deleted_users')}}
+            {!! Session::get('show_trash:user') ? 'checked' : ''!!}/> {!! trans('texts.show_deleted_users')!!}
     </label>
 
 
-  {{ Datatable::table()
+  {!! Datatable::table()
       ->addColumn(
         trans('texts.name'),
         trans('texts.email'),
@@ -39,7 +39,7 @@
       ->setOptions('bAutoWidth', false)
       ->setOptions('aoColumns', [[ "sWidth"=> "20%" ], [ "sWidth"=> "45%" ], ["sWidth"=> "20%"], ["sWidth"=> "15%" ]])
       ->setOptions('aoColumnDefs', [['bSortable'=>false, 'aTargets'=>[3]]])
-      ->render('datatable') }}
+      ->render('datatable') !!}
 
   <script>
   window.onDatatableReady = function() {
@@ -55,7 +55,7 @@
 
     function setTrashVisible() {
         var checked = $('#trashed').is(':checked');
-        window.location = '{{ URL::to('view_archive/user') }}' + (checked ? '/true' : '/false');
+        window.location = '{!! URL::to('view_archive/user') !!}' + (checked ? '/true' : '/false');
     }
 
   function deleteUser(id) {
diff --git a/resources/views/clients/edit.blade.php b/resources/views/clients/edit.blade.php
index 997820d1726f..c667a001c9dd 100644
--- a/resources/views/clients/edit.blade.php
+++ b/resources/views/clients/edit.blade.php
@@ -160,7 +160,7 @@
 
 	<center class="buttons">
 		{!! Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk')) !!}
-    	{!! Button::normal(trans('texts.cancel'))->large()->asLinkTo('clients/' . ($client ? $client->public_id : ''))->appendIcon(Icon::create('remove-circle')) !!}
+    	{!! Button::normal(trans('texts.cancel'))->large()->asLinkTo('/clients/' . ($client ? $client->public_id : ''))->appendIcon(Icon::create('remove-circle')) !!}
 	</center>
 
 	{!! Former::close() !!}
diff --git a/resources/views/invoices/view.blade.php b/resources/views/invoices/view.blade.php
index ac6567183caa..0780e9c6a082 100644
--- a/resources/views/invoices/view.blade.php
+++ b/resources/views/invoices/view.blade.php
@@ -24,7 +24,7 @@
         @if ($invoice->is_quote)            
             {!! Button::normal(trans('texts.download_pdf', array('onclick' => 'onDownloadClick()')))->large() !!}&nbsp;&nbsp;
             @if (!$isConverted)
-                {!! Button::success(trans('texts.approve'))->asLinkTo(URL::to('approve/' . $invitation->invitation_key))->large() !!}
+                {!! Button::success(trans('texts.approve'))->asLinkTo('approve/' . $invitation->invitation_key)->large() !!}
             @endif
 		@elseif ($invoice->client->account->isGatewayConfigured() && !$invoice->isPaid() && !$invoice->is_recurring)
 			{!! Button::normal(trans('texts.download_pdf'), array('onclick' => 'onDownloadClick()'))->large() !!}&nbsp;&nbsp;
diff --git a/resources/views/list.blade.php b/resources/views/list.blade.php
index 0dd5c2651d96..da1bfaa0c8bf 100644
--- a/resources/views/list.blade.php
+++ b/resources/views/list.blade.php
@@ -21,7 +21,7 @@
 
 	<div id="top_right_buttons" class="pull-right">
 		<input id="tableFilter" type="text" style="width:140px;margin-right:17px" class="form-control pull-left" placeholder="{{ trans('texts.filter') }}"/> 
-		{!! Button::normal(trans("texts.new_$entityType"))->asLinkTo(URL::to($entityType . 's/create'))->withAttributes(array('class' => 'pull-right'))->appendIcon(Icon::create('plus-sign')) !!}	
+		{!! Button::normal(trans("texts.new_$entityType"))->asLinkTo("/{$entityType}s/create")->withAttributes(array('class' => 'pull-right'))->appendIcon(Icon::create('plus-sign')) !!}	
         
 	</div>
 
diff --git a/resources/views/reports/d3.blade.php b/resources/views/reports/d3.blade.php
index 003cc95972f8..bb4c5d784fc3 100644
--- a/resources/views/reports/d3.blade.php
+++ b/resources/views/reports/d3.blade.php
@@ -3,7 +3,7 @@
 @section('head')
   @parent
 
-  <script src="{{ asset('js/d3.min.js') }}" type="text/javascript"></script>   
+  <script src="{!! asset('js/d3.min.js') !!}" type="text/javascript"></script>   
 
   <style type="text/css">
 
@@ -32,9 +32,9 @@
   @parent
   @include('accounts.nav_advanced')
 
-  {{ Former::open() }}
-  {{ Former::legend('data_visualizations') }}
-  {{ Former::close() }}
+  {!! Former::open() !!}
+  {!! Former::legend('data_visualizations') !!}
+  {!! Former::close() !!}
 
   <div id="tooltip" class="hidden">
     <p>
@@ -53,7 +53,7 @@
       <option>Invoices</option>
       <option>Products</option>
     </select>
-    &nbsp;&nbsp; <b>{{ $message }}</b>
+    &nbsp;&nbsp; <b>{!! $message !!}</b>
   </form>
 
   <p>&nbsp;</p>
@@ -63,7 +63,7 @@
   <script type="text/javascript">
 
     // store data as JSON
-    var data = {{ $clients }};
+    var data = {!! $clients !!};
 
     _.each(data, function(client) { 
       _.each(client.invoices, function(invoice) { 
diff --git a/resources/views/reports/report_builder.blade.php b/resources/views/reports/report_builder.blade.php
index e45e96063b03..6a66a6a7efc6 100644
--- a/resources/views/reports/report_builder.blade.php
+++ b/resources/views/reports/report_builder.blade.php
@@ -3,7 +3,7 @@
 @section('head')
 	@parent
 
-	<script src="{{ asset('js/Chart.js') }}" type="text/javascript"></script>		
+	<script src="{!! asset('js/Chart.js') !!}" type="text/javascript"></script>		
 @stop
 
 @section('content')
@@ -12,27 +12,27 @@
 
 
     <legend style="padding-bottom:32px">
-        {{ trans('texts.chart_builder') }}
+        {!! trans('texts.chart_builder') !!}
         <div class="pull-right">
-           {{ Button::default_link(URL::to('company/advanced_settings/data_visualizations'), trans("texts.data_visualizations"))->append_with_icon('globe') }}
+           {!! Button::normal(trans('texts.data_visualizations'))->asLinkTo('/company/advanced_settings/data_visualizations')->appendIcon(Icon::create('globe')) !!}
         </div>
     </legend>
 
 	<div class="row">
 		<div class="col-lg-4">
 
-			{{ Former::open()->addClass('warn-on-exit') }}
-			{{ Former::populateField('start_date', $startDate) }}
-			{{ Former::populateField('end_date', $endDate) }}
-			{{ Former::select('chart_type')->options($chartTypes, $chartType) }}
-			{{ Former::select('group_by')->options($dateTypes, $groupBy) }}
-			{{ Former::text('start_date')->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT))
-					->append('<i class="glyphicon glyphicon-calendar" onclick="toggleDatePicker(\'start_date\')"></i>') }}
-			{{ Former::text('end_date')->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT))
-					->append('<i class="glyphicon glyphicon-calendar" onclick="toggleDatePicker(\'end_date\')"></i>') }}
+			{!! Former::open()->addClass('warn-on-exit') !!}
+			{!! Former::populateField('start_date', $startDate) !!}
+			{!! Former::populateField('end_date', $endDate) !!}
+			{!! Former::select('chart_type')->options($chartTypes, $chartType) !!}
+			{!! Former::select('group_by')->options($dateTypes, $groupBy) !!}
+			{!! Former::text('start_date')->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT))
+					->append('<i class="glyphicon glyphicon-calendar" onclick="toggleDatePicker(\'start_date\')"></i>') !!}
+			{!! Former::text('end_date')->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT))
+					->append('<i class="glyphicon glyphicon-calendar" onclick="toggleDatePicker(\'end_date\')"></i>') !!}
 
 			@if (Auth::user()->isPro())
-				{{ Former::actions( Button::primary_submit('Generate') ) }}
+				{!! Former::actions( Button::primary('Generate')->submit() ) !!}
 			@else
 			<script>
 			    $(function() {   
@@ -41,7 +41,7 @@
 			</script>	
 			@endif
 			
-			{{ Former::close() }}
+			{!! Former::close() !!}
 
 			<p>&nbsp;</p>
 			<div style="padding-bottom:8px">
@@ -68,13 +68,13 @@
 
 	var ctx = document.getElementById('monthly-reports').getContext('2d');
 	var chart = {
-		labels: {{ json_encode($labels) }},		
+		labels: {!! json_encode($labels) !!},		
 		datasets: [
 		@foreach ($datasets as $dataset)
 			{
-				data: {{ json_encode($dataset['totals']) }},
-				fillColor : "rgba({{ $dataset['colors'] }},0.5)",
-				strokeColor : "rgba({{ $dataset['colors'] }},1)",
+				data: {!! json_encode($dataset['totals']) !!},
+				fillColor : "rgba({!! $dataset['colors'] !!},0.5)",
+				strokeColor : "rgba({!! $dataset['colors'] !!},1)",
 			},
 		@endforeach
 		]
@@ -83,12 +83,12 @@
 	var options = {		
 		scaleOverride: true,
 		scaleSteps: 10,
-		scaleStepWidth: {{ $scaleStepWidth }},
+		scaleStepWidth: {!! $scaleStepWidth !!},
 		scaleStartValue: 0,
 		scaleLabel : "<%=formatMoney(value)%>",
 	};
 
-	new Chart(ctx).{{ $chartType }}(chart, options);
+	new Chart(ctx).{!! $chartType !!}(chart, options);
 
 	</script>
 
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index c88f4b43370f..7e67dd508b64 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -4,27 +4,27 @@
   @parent
   @include('accounts.nav_advanced')
 
-  {{ Former::open($url)->method($method)->addClass('col-md-8 col-md-offset-2 warn-on-exit')->rules(array(
+  {!! Former::open($url)->method($method)->addClass('col-md-8 col-md-offset-2 warn-on-exit')->rules(array(
       'first_name' => 'required',
       'last_name' => 'required',
       'email' => 'required|email',
-  )); }}
+  )); !!}
 
-  {{ Former::legend($title) }}
+  {!! Former::legend($title) !!}
 
   @if ($user)
-    {{ Former::populate($user) }}    
+    {!! Former::populate($user) !!}    
   @endif
 
-  {{ Former::text('first_name') }}
-  {{ Former::text('last_name') }}
-  {{ Former::text('email') }}
+  {!! Former::text('first_name') !!}
+  {!! Former::text('last_name') !!}
+  {!! Former::text('email') !!}
 
-  {{ Former::actions( 
-      Button::lg_success_submit(trans($user && $user->confirmed ? 'texts.save' : 'texts.send_invite'))->append_with_icon($user && $user->confirmed ? 'floppy-disk' : 'send'),
-      Button::lg_default_link('company/advanced_settings/user_management', trans('texts.cancel'))->append_with_icon('remove-circle')      
-  )}}
+  {!! Former::actions( 
+      Button::success(trans($user && $user->confirmed ? 'texts.save' : 'texts.send_invite'))->submit()->large()->appendIcon(Icon::create($user && $user->confirmed ? 'floppy-disk' : 'send')),
+      Button::normal(trans('texts.cancel'))->asLinkTo('/company/advanced_settings/user_management')->appendIcon(Icon::create('remove-circle'))->large()
+  )!!}
 
-  {{ Former::close() }}
+  {!! Former::close() !!}
 
 @stop
\ No newline at end of file