diff --git a/.travis.yml b/.travis.yml
index c6c877e0429e..83953d065523 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,6 +65,7 @@ before_script:
 script:
   - php ./vendor/bin/phpunit --debug --verbose --coverage-clover=coverage.xml
   - php artisan dusk
+  - npm test
 after_success:
     - bash <(curl -s https://codecov.io/bash)
 
diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
index 3d7c12bf014a..9a5d0e5260ab 100644
--- a/app/Http/Controllers/ClientController.php
+++ b/app/Http/Controllers/ClientController.php
@@ -81,7 +81,7 @@ class ClientController extends Controller
             'data' => 'function(d) { d.key = "value"; }',
         ]);
 
-        $data['header'] = $this->headerData();
+        //$data['header'] = $this->headerData();
         $data['html'] = $html;
 
         return view('client.list', $data);
diff --git a/app/Http/ViewComposers/HeaderComposer.php b/app/Http/ViewComposers/HeaderComposer.php
new file mode 100644
index 000000000000..1c781a073a43
--- /dev/null
+++ b/app/Http/ViewComposers/HeaderComposer.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\ViewComposers;
+
+use App\Utils\Traits\UserSessionAttributes;
+use Illuminate\View\View;
+
+class HeaderComposer
+{
+    use UserSessionAttributes;
+
+    /**
+     * Bind data to the view.
+     *
+     * @param  View  $view
+     * @return void
+     */
+    public function compose(View $view)
+    {
+        $view->with('header', $this->headerData());
+    }
+
+    private function headerData()
+    {
+        //companies
+        $companies = auth()->user()->companies;
+
+        $data['current_company'] = $companies->first(function ($company){
+            return $company->id == $this->getCurrentCompanyId();
+        });
+
+        $data['companies'] = $companies->reject(function ($company){
+            return $company->id == $this->getCurrentCompanyId();
+        });
+
+        return $data;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php
new file mode 100644
index 000000000000..7efbd76b9240
--- /dev/null
+++ b/app/Providers/ComposerServiceProvider.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\Facades\View;
+use Illuminate\Support\ServiceProvider;
+
+class ComposerServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        View::composer(
+            [
+                'client.edit', 
+                'client.list', 
+                'dashboard.index',
+            ],
+            'App\Http\ViewComposers\HeaderComposer'
+        );
+    }
+
+    /**
+     * Register services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        //
+    }
+}
diff --git a/app/Utils/Traits/MakesHeaderData.php b/app/Utils/Traits/MakesHeaderData.php
index d8d7832d796f..50b3db41fb8c 100644
--- a/app/Utils/Traits/MakesHeaderData.php
+++ b/app/Utils/Traits/MakesHeaderData.php
@@ -1,7 +1,6 @@
 <?php
 
 namespace App\Utils\Traits;
-use Illuminate\Support\Facades\Auth;
 
 
 /**
@@ -16,7 +15,7 @@ trait MakesHeaderData
     public function headerData()
     {
         //companies
-        $companies = Auth::user()->companies;
+        $companies = auth()->user()->companies;
 
         $data['current_company'] = $companies->first(function ($company){
             return $company->id == $this->getCurrentCompanyId();
diff --git a/config/app.php b/config/app.php
index 13eddf957dd3..03375f0b228b 100644
--- a/config/app.php
+++ b/config/app.php
@@ -179,6 +179,7 @@ return [
         // App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
+        App\Providers\ComposerServiceProvider::class,
 
     ],