diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php
index bb677b0ce87d..f6f04fca99a2 100644
--- a/app/Http/Controllers/MigrationController.php
+++ b/app/Http/Controllers/MigrationController.php
@@ -202,6 +202,9 @@ class MigrationController extends BaseController
         if (app()->environment() == 'testing') return;
 
         $user = auth()->user();
+\Log::error($user);
+\Log::error($company);
+\Log::error("starting migration");
 
         StartMigration::dispatch($migration_file, $user, $company);
 
diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php
index 0a14945996f5..0de882479888 100644
--- a/app/Http/Controllers/PreviewController.php
+++ b/app/Http/Controllers/PreviewController.php
@@ -94,7 +94,7 @@ class PreviewController extends BaseController
             request()->has('body'))
         {
 
-            $design_object = json_decode(json_encode(request()->input('body')));
+            $design_object = json_decode(json_encode(request()->input('design')));
 
             if(!is_object($design_object))
                 return response()->json(['message' => 'Invalid custom design object'], 400);
@@ -151,7 +151,7 @@ class PreviewController extends BaseController
             $invoice->setRelation('company', auth()->user()->company());
             $invoice->load('client');
 
-            $design_object = json_decode(json_encode(request()->input('body')));
+            $design_object = json_decode(json_encode(request()->input('design')));
 
             if(!is_object($design_object))
                 return response()->json(['message' => 'Invalid custom design object'], 400);
diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index cd9fcf69ddd8..3cb04d315b72 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -129,7 +129,7 @@ class Import implements ShouldQueue
     public function handle()
     {
         foreach ($this->data as $key => $resource) {
-
+\Log::error("importing {$key}");
             if (!in_array($key, $this->available_imports)) {
                 throw new ResourceNotAvailableForMigration("Resource {$key} is not available for migration.");
             }
diff --git a/app/Jobs/Util/StartMigration.php b/app/Jobs/Util/StartMigration.php
index d281402688be..d2f35726124c 100644
--- a/app/Jobs/Util/StartMigration.php
+++ b/app/Jobs/Util/StartMigration.php
@@ -58,6 +58,7 @@ class StartMigration implements ShouldQueue
      */
     public function handle()
     {
+        \Log::error("start handle");
         MultiDB::setDb($this->company->db);
 
         auth()->login($this->user, false);
@@ -85,6 +86,8 @@ class StartMigration implements ShouldQueue
 
             if (app()->environment() !== 'production') info($e->getMessage());
         }
+
+        \Log::error("stop handle");
     }
 
 
@@ -94,6 +97,9 @@ class StartMigration implements ShouldQueue
      */
     public function start(string $filename): void
     {
+
+        \Log::error("start start");
+
         $file = storage_path("migrations/$filename/migration.json");
 
         if (!file_exists($file))
@@ -105,5 +111,8 @@ class StartMigration implements ShouldQueue
 
         $data = json_decode($file, 1);
         Import::dispatchNow($data, $this->company, $this->user);
+
+
+        \Log::error("start stop");
     }
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index 5897f421fee1..788948f8f78f 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -145,6 +145,8 @@ class User extends Authenticatable implements MustVerifyEmail
     */
     public function setCompany($company)
     {
+        config(['ninja.company_id' => $company->id]);
+        
         $this->company = $company;
     }
 
diff --git a/database/migrations/2014_10_13_000000_create_users_table.php b/database/migrations/2014_10_13_000000_create_users_table.php
index 1b3ede7ac48e..5390ec2b92f9 100644
--- a/database/migrations/2014_10_13_000000_create_users_table.php
+++ b/database/migrations/2014_10_13_000000_create_users_table.php
@@ -1332,8 +1332,8 @@ class CreateUsersTable extends Migration
             $t->timestamps(6);
             $t->softDeletes();
             
+            $t->foreign('company_id')->references('id')->on('companies')->onDelete('cascade')->onUpdate('cascade');
             $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade')->onUpdate('cascade');
-            $t->foreign('company_id')->references('id')->on('companies')->onUpdate('cascade');
             
             $t->unique(['company_id', 'name']);
         });
diff --git a/tests/Feature/PreviewTest.php b/tests/Feature/PreviewTest.php
index 146e7e705be4..13eef11f9202 100644
--- a/tests/Feature/PreviewTest.php
+++ b/tests/Feature/PreviewTest.php
@@ -54,7 +54,8 @@ class PreviewTest extends TestCase
         $data = [
             'entity' => 'invoice',
             'entity_id' => $this->invoice->hashed_id,
-            'body' => $design,
+            'design' => $design,
+
         ];
 
 
@@ -77,7 +78,7 @@ class PreviewTest extends TestCase
         $design = Design::find(3);
 
         $data = [
-            'body' => $design,
+            'design' => $design,
         ];