diff --git a/app/Helpers/Invoice/InvoiceItemSum.php b/app/Helpers/Invoice/InvoiceItemSum.php
index 96d1e6157937..12b9878b4775 100644
--- a/app/Helpers/Invoice/InvoiceItemSum.php
+++ b/app/Helpers/Invoice/InvoiceItemSum.php
@@ -88,9 +88,11 @@ class InvoiceItemSum
         return $this;
     }
 
+    /* Don't round the cost x qty - will allow us to use higher precision costs */
     private function sumLineItem()
     {   //todo need to support quantities less than the precision amount
-        $this->setLineTotal($this->formatValue($this->item->cost, $this->currency->precision) * $this->formatValue($this->item->quantity, $this->currency->precision));
+        // $this->setLineTotal($this->formatValue($this->item->cost, $this->currency->precision) * $this->formatValue($this->item->quantity, $this->currency->precision));
+        $this->setLineTotal($this->item->cost * $this->item->quantity);
 
         return $this;
     }
@@ -112,8 +114,8 @@ class InvoiceItemSum
     {
         $item_tax = 0;
 
-        // info(print_r($this->item,1));
-        // info(print_r($this->invoice,1));
+        // nlog(print_r($this->item,1));
+        // nlog(print_r($this->invoice,1));
 
         $amount = $this->item->line_total - ($this->item->line_total * ($this->invoice->discount / 100));
         $item_tax_rate1_total = $this->calcAmountLineTax($this->item->tax_rate1, $amount);
diff --git a/app/Models/Presenters/CompanyPresenter.php b/app/Models/Presenters/CompanyPresenter.php
index ed58bf40b35b..6cf7a76bf449 100644
--- a/app/Models/Presenters/CompanyPresenter.php
+++ b/app/Models/Presenters/CompanyPresenter.php
@@ -36,7 +36,7 @@ class CompanyPresenter extends EntityPresenter
             $settings = $this->entity->settings;
         }
 
-        return (strlen($settings->company_logo) > 0) ? url($settings->company_logo) : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png';
+        return (strlen($settings->company_logo) > 0) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png';
     }
 
     public function address($settings = null)
diff --git a/resources/views/email/template/dark.blade.php b/resources/views/email/template/dark.blade.php
index 5ebfe46d5a35..1ffda38a1533 100644
--- a/resources/views/email/template/dark.blade.php
+++ b/resources/views/email/template/dark.blade.php
@@ -1,7 +1,7 @@
 @component('email.template.master', ['design' => 'dark', 'settings' => $settings, 'whitelabel' => $whitelabel])
 
 @slot('header')
-    @component('email.components.header', ['p' => $body, 'logo' => $settings->company_logo ?: 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])
+    @component('email.components.header', ['p' => $body, 'logo' => (strlen($settings->company_logo) > 1) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])
         
         @if(isset($title))
         {{$title}}
diff --git a/resources/views/email/template/light.blade.php b/resources/views/email/template/light.blade.php
index a95799e9e282..963b2b4a57a0 100644
--- a/resources/views/email/template/light.blade.php
+++ b/resources/views/email/template/light.blade.php
@@ -1,7 +1,7 @@
 @component('email.template.master', ['design' => 'light', 'settings' => $settings, 'whitelabel' => $whitelabel])
 
 @slot('header')
-    @component('email.components.header', ['p' => $body, 'logo' => $settings->company_logo ?: 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])
+    @component('email.components.header', ['p' => $body, (strlen($settings->company_logo) > 1) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])
         
         @if(isset($title))
             {{$title}}
diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
deleted file mode 100644
index f584d1bee202..000000000000
--- a/resources/views/header.blade.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<body class="app header-fixed sidebar-fixed aside-menu-fixed sidebar-lg-show">
-<header class="app-header navbar">
-    <button class="navbar-toggler sidebar-toggler d-lg-none mr-auto" type="button" data-toggle="sidebar-show">
-        <span class="navbar-toggler-icon"></span>
-    </button>
-    <a class="navbar-brand" href="https://invoiceninja.com">
-        <img class="navbar-brand-full" src="/images/logo.png" width="50" height="50" alt="Invoice Ninja Logo">
-        <img class="navbar-brand-minimized" src="/images/logo.png" width="30" height="30" alt="Invoice Ninja Logo">
-    </a>
-    <button class="sidebar-minimizer brand-minimizer" type="button">
-        <span class="navbar-toggler-icon"></span>
-    </button>
-
-    <ul class="nav navbar-nav ml-auto">
-        <li class="nav-item dropdown d-md-down-none" style="padding-left:20px; padding-right: 20px;">
-            <a class="nav-link" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
-                <i class="icon-list"></i>
-                <span class="badge badge-pill badge-warning">15</span>
-            </a>
-            <div class="dropdown-menu dropdown-menu-right dropdown-menu-lg">
-                <div class="dropdown-header text-center">
-                    <strong>You have 5 pending tasks</strong>
-                </div>
-                <a class="dropdown-item" href="#">
-                    <div class="small mb-1">Mr Miyagi todos
-                        <span class="float-right">
-                        <strong>0%</strong>
-                        </span>
-                    </div>
-                        <span class="progress progress-xs">
-                            <div class="progress-bar bg-info" role="progressbar" style="width: 0%" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
-                        </span>
-                </a>
-                <a class="dropdown-item" href="#">
-                    <div class="small mb-1">First, wash all car.
-                        <span class="float-right">
-                        <strong>25%</strong>
-                        </span>
-                    </div>
-                        <span class="progress progress-xs">
-                        <div class="progress-bar bg-danger" role="progressbar" style="width: 25%" aria-valuenow="25" aria-valuemin="0" aria-valuemax="100"></div>
-                        </span>
-                </a>
-                <a class="dropdown-item" href="#">
-                    <div class="small mb-1">Then wax. Wax on...
-                        <span class="float-right">
-                        <strong>50%</strong>
-                        </span>
-                    </div>
-                        <span class="progress progress-xs">
-                            <div class="progress-bar bg-warning" role="progressbar" style="width: 50%" aria-valuenow="50" aria-valuemin="0" aria-valuemax="100"></div>
-                        </span>
-                </a>
-                <a class="dropdown-item" href="#">
-                    <div class="small mb-1">No questions!
-                        <span class="float-right">
-                        <strong>75%</strong>
-                        </span>
-                    </div>
-                        <span class="progress progress-xs">
-                        <div class="progress-bar bg-info" role="progressbar" style="width: 75%" aria-valuenow="75" aria-valuemin="0" aria-valuemax="100"></div>
-                        </span>
-                </a>
-                <a class="dropdown-item" href="#">
-                    <div class="small mb-1">Wax on... wax off. Wax on... wax off.
-                        <span class="float-right">
-                        <strong>100%</strong>
-                        </span>
-                    </div>
-                        <span class="progress progress-xs">
-                        <div class="progress-bar bg-success" role="progressbar" style="width: 100%" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
-                        </span>
-                </a>
-                <a class="dropdown-item text-center" href="#">
-                    <strong>View all tasks</strong>
-                </a>
-            </div>
-        </li>
-
-        <li class="nav-item dropdown d-md-down-none" style="padding-left:20px; padding-right: 20px;">
-            <a class="nav-link" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
-                <i class="fa fa-building" aria-hidden="true"></i> {{ $current_company->present()->name() }}
-            </a>
-            <div class="dropdown-menu dropdown-menu-right dropdown-menu-lg">
-                <div class="dropdown-header text-center">
-                    <strong>trans('texts.manage_companies')</strong>
-                </div>
-
-                @foreach($companies as $company) <!-- List all remaining companies here-->
-                    <a class="dropdown-item" href="#">
-                        <div class="small mb-1">{{ $company->present()->name }}
-                        <span class="float-right">
-                        </span>
-                        </div>
-                        <span class="progress progress-xs">
-                            <div class="progress-bar bg-info" role="progressbar" style="width: 0%" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
-                        </span>
-                    </a>
-                @endforeach
-
-                <div class="dropdown-divider"></div>
-
-                <!-- Add Company-->
-                @if(count($companies) < 5)
-                <a class="dropdown-item" href="{{ route('user.logout') }}">
-                    <i class="fa fa-plus"></i> trans('texts.add_company')</a>
-                @endif
-            </div>
-        </li>
-
-        <li class="nav-item dropdown">
-            <a class="nav-link" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
-                <img class="img-avatar" src="/images/logo.png" alt=""> {{ auth()->user()->present()->name }}
-            </a>
-            <div class="dropdown-menu dropdown-menu-right">
-                <div class="dropdown-header text-center">
-                    <strong>Settings</strong>
-                </div>
-                <a class="dropdown-item" href="#">
-                    <i class="fa fa-user"></i> Profile</a>
-                <a class="dropdown-item" href="{{  route('user.settings') }}">
-                    <i class="fa fa-wrench"></i> trans('texts.settings')</a>
-
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item" href="{{ route('user.logout') }}">
-                    <i class="fa fa-lock"></i> Logout</a>
-            </div>
-        </li>
-    </ul>
-    <button class="navbar-toggler aside-menu-toggler d-md-down-none" type="button" data-toggle="aside-menu-lg-show">
-        <span class="navbar-toggler-icon"></span>
-    </button>
-    <button class="navbar-toggler aside-menu-toggler d-lg-none" type="button" data-toggle="aside-menu-show">
-        <span class="navbar-toggler-icon"></span>
-    </button>
-</header>
-<div class="app-body">
\ No newline at end of file
diff --git a/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php b/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php
index cd8b6854ae24..acb371424aaf 100644
--- a/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php
+++ b/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php
@@ -2,7 +2,7 @@
     <div class="flex flex-col w-64">
         <div class="flex items-center h-16 flex-shrink-0 px-4 bg-primary-darken justify-center">
             <a href="{{ route('client.dashboard') }}">
-                <img class="h-8 w-auto" src="{!! $settings->company_logo ?: asset('images/invoiceninja-white-logo.png') !!}" alt="{{ config('app.name') }}" />
+                <img class="h-8 w-auto" src="{!! url('') . $settings->company_logo ?: asset('images/invoiceninja-white-logo.png') !!}" alt="{{ config('app.name') }}" />
             </a>
         </div>
         <div class="h-0 flex-1 flex flex-col overflow-y-auto">
diff --git a/resources/views/portal/ninja2020/components/general/sidebar/mobile.blade.php b/resources/views/portal/ninja2020/components/general/sidebar/mobile.blade.php
index 904e9aa07aa7..66d7d704596e 100644
--- a/resources/views/portal/ninja2020/components/general/sidebar/mobile.blade.php
+++ b/resources/views/portal/ninja2020/components/general/sidebar/mobile.blade.php
@@ -9,7 +9,7 @@
             </button>
         </div>
         <div class="flex-shrink-0 flex items-center px-4">
-            <img class="h-6 w-auto" src="{!! $settings->company_logo ?: asset('images/invoiceninja-white-logo.png') !!}" alt="{{ config('app.name') }}" />
+            <img class="h-6 w-auto" src="{!! url($settings->company_logo) ?: asset('images/invoiceninja-white-logo.png') !!}" alt="{{ config('app.name') }}" />
         </div>
         <div class="mt-5 flex-1 h-0 overflow-y-auto">
             <nav class="flex-1 py-4 bg-primary">
diff --git a/resources/views/sidebar.blade.php b/resources/views/sidebar.blade.php
deleted file mode 100644
index d9f9cc8e62df..000000000000
--- a/resources/views/sidebar.blade.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<div class="sidebar">
-    <nav class="sidebar-nav">
-        <ul class="nav">
-
-            <li class="nav-item ">
-                <a class="nav-link" href="{{ route('dashboard.index') }}">
-                    <i class="nav-icon icon-speedometer"></i> @lang('texts.dashboard')
-                </a>
-            </li>
-
-            <li class="nav-item">
-                <a class="nav-link" href="/clients">
-                    <i class="nav-icon icon-user"></i> @lang('texts.clients')</a>
-            </li>
-
-            <li class="nav-item">
-                <a class="nav-link" href="{{ route('invoices.index') }}">
-                    <i class="nav-icon icon-notebook"></i> @lang('texts.invoices')</a>
-            </li>
-
-            <li class="nav-item">
-                <a class="nav-link" href="typography.html">
-                    <i class="nav-icon icon-wallet"></i> @lang('texts.payments')</a>
-            </li>
-
-            <li class="nav-item">
-                <a class="nav-link" href="typography.html">
-                    <i class="nav-icon icon-docs"></i> @lang('texts.recurring')</a>
-            </li>
-
-            <li class="nav-item">
-                <a class="nav-link" href="typography.html">
-                    <i class="nav-icon icon-badge"></i> @lang('texts.credits')</a>
-            </li>
-
-            <li class="nav-item">
-                <a class="nav-link" href="typography.html">
-                    <i class="nav-icon icon-vector"></i> @lang('texts.quotes')</a>
-            </li>
-
-            <li class="nav-item">
-                <a class="nav-link" href="typography.html">
-                    <i class="nav-icon icon-wrench"></i> @lang('texts.projects')</a>
-            </li>
-
-            <li class="nav-item">
-                <a class="nav-link" href="typography.html">
-                    <i class="nav-icon icon-grid"></i> @lang('texts.tasks')</a>
-            </li>
-
-            <li class="nav-item">
-                <a class="nav-link" href="typography.html">
-                    <i class="nav-icon icon-envelope-open"></i> @lang('texts.expenses')</a>
-            </li>
-
-            <li class="nav-item">
-                <a class="nav-link" href="typography.html">
-                    <i class="nav-icon icon-bell"></i> @lang('texts.vendors')</a>
-            </li>
-
-            <li class="nav-item">
-                <a class="nav-link" href="typography.html">
-                    <i class="nav-icon icon-printer"></i> @lang('texts.reports')</a>
-            </li>
-        </ul>
-    </nav>
-    <button class="sidebar-minimizer brand-minimizer" type="button"></button>
-</div>
\ No newline at end of file