diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php
index 9b40c428c9..7101461fcf 100644
--- a/app/Http/Controllers/ImportController.php
+++ b/app/Http/Controllers/ImportController.php
@@ -127,6 +127,12 @@ class ImportController extends Controller
      */
     public function finished(ImportJob $job)
     {
+        if (!$this->jobInCorrectStep($job, 'finished')) {
+            Log::debug('Job is not in correct state for finished()', ['status' => $job->status]);
+
+            return $this->redirectToCorrectStep($job);
+        }
+
         $subTitle     = trans('firefly.import_finished');
         $subTitleIcon = 'fa-star';
 
@@ -379,6 +385,8 @@ class ImportController extends Controller
             case 'settings':
             case 'store-settings':
                 return $job->status === 'import_configuration_saved';
+            case 'finished':
+                return $job->status === 'import_finished';
             case 'complete':
                 return $job->status === 'settings_complete';
             case 'status':
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index d34d230e31..b952928331 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -782,4 +782,8 @@ return [
     'import_status_settings_complete'           => 'The import is ready to start.',
     'import_status_import_complete'             => 'The import has completed.',
     'import_status_import_running'              => 'The import is currently running. Please be patient.',
+    'import_status_header'                      => 'Import status and progress',
+    'import_status_errors'                      => 'Import errors',
+    'import_status_report'                      => 'Import report',
+    'import_finished'                           => 'Import has finished',
 ];
diff --git a/resources/views/import/status.twig b/resources/views/import/status.twig
index 9a6bc4888b..97042f5141 100644
--- a/resources/views/import/status.twig
+++ b/resources/views/import/status.twig
@@ -5,15 +5,12 @@
 {% endblock %}
 {% block content %}
     <div class="row">
-        <div class="col-lg-12 col-md-12 col-sm-12">
-            <div class="box box-default">
+        <div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
+            <div class="box box-primary">
                 <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'import_status'|_ }}</h3>
+                    <h3 class="box-title">{{ 'import_status_header'|_ }}</h3>
                 </div>
                 <div class="box-body">
-                    <div class="row">
-
-                        <div class="col-lg-6 col-lg-offset-3">
                             <div class="progress" id="import-status-holder">
                                 <div id="import-status-bar" class="progress-bar progress-bar-info active progress-bar-striped" role="progressbar"
                                      aria-valuenow="100" aria-valuemin="0"
@@ -21,17 +18,42 @@
                                 </div>
                             </div>
                             <p id="import-status-txt">{{ 'import_status_settings_complete'|_ }}</p>
-                            <p id="import-status-more-info"></p>
-                            <p id="import-status-error-intro"></p>
-                            <ul id="import-status-error-list"></ul>
-                        </div>
-                    </div>
-
-
                 </div>
             </div>
         </div>
     </div>
+
+    <div class="row">
+        <div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
+            <div class="box box-danger">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'import_status_errors'|_ }}</h3>
+                </div>
+                <div class="box-body">
+                    <p id="import-status-error-intro">
+                        No errors detected.
+                    </p>
+                    <ul id="import-status-error-list"></ul>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
+            <div class="box box-default">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'import_status_report'|_ }}</h3>
+                </div>
+                <div class="box-body">
+                    <p id="import-status-more-info">
+                        Nothing to report so far
+                    </p>
+                </div>
+            </div>
+        </div>
+    </div>
+
 {% endblock %}
 {% block scripts %}
     <script type="text/javascript">