diff --git a/modules/backend/behaviors/importexportcontroller/partials/_column_sample_form.htm b/modules/backend/behaviors/importexportcontroller/partials/_column_sample_form.htm
index c13965604..9dfbf6622 100644
--- a/modules/backend/behaviors/importexportcontroller/partials/_column_sample_form.htm
+++ b/modules/backend/behaviors/importexportcontroller/partials/_column_sample_form.htm
@@ -7,25 +7,23 @@
         <?= e(trans('backend::lang.import_export.column')) ?>:
         <strong><?= $columnName ?></strong>
     </p>
-
     <div class="list-preview">
         <div class="control-simplelist is-divided is-scrollable size-small" data-control="simplelist">
             <ul>
                 <?php foreach ($columnData as $sample): ?>
-                <li class="oc-icon-file-o">
-                    <?= e($sample) ?>
-                </li>
+                    <li class="oc-icon-file-o">
+                        <?= e($sample) ?>
+                    </li>
                 <?php endforeach ?>
             </ul>
         </div>
     </div>
-
 </div>
 <div class="modal-footer">
     <button
-            type="button"
-            class="btn btn-default"
-            data-dismiss="popup">
+        type="button"
+        class="btn btn-default"
+        data-dismiss="popup">
         <?= e(trans('backend::lang.form.close')) ?>
     </button>
-</div>
\ No newline at end of file
+</div>
diff --git a/modules/backend/behaviors/importexportcontroller/partials/_export_form.htm b/modules/backend/behaviors/importexportcontroller/partials/_export_form.htm
index f9852c90a..f98f261f6 100644
--- a/modules/backend/behaviors/importexportcontroller/partials/_export_form.htm
+++ b/modules/backend/behaviors/importexportcontroller/partials/_export_form.htm
@@ -1,51 +1,50 @@
 <div id="exportFormPopup">
     <?php if (!$this->fatalError): ?>
 
-    <?= Form::open(['id' => 'exportForm']) ?>
-    <div class="modal-header">
-        <h4 class="modal-title"><?= e(trans('backend::lang.import_export.export_progress')) ?></h4>
-    </div>
+        <?= Form::open(['id' => 'exportForm']) ?>
+            <div class="modal-header">
+                <h4 class="modal-title"><?= e(trans('backend::lang.import_export.export_progress')) ?></h4>
+            </div>
 
-    <div id="exportContainer">
-        <div class="modal-body">
+            <div id="exportContainer">
+                <div class="modal-body">
+
+                    <div class="loading-indicator-container">
+                        <p>&nbsp;</p>
+                        <div class="loading-indicator transparent">
+                            <div><?= e(trans('backend::lang.import_export.processing')) ?></div>
+                            <span></span>
+                        </div>
+                    </div>
+                    <p>&nbsp;</p>
 
-            <div class="loading-indicator-container">
-                <p>&nbsp;</p>
-                <div class="loading-indicator transparent">
-                    <div><?= e(trans('backend::lang.import_export.processing')) ?></div>
-                    <span></span>
                 </div>
             </div>
-            <p>&nbsp;</p>
+        <?= Form::close() ?>
 
-        </div>
-    </div>
-
-    <?= Form::close() ?>
-
-    <script>
-        $('#exportFormPopup').on('popupComplete', function() {
-            $.oc.exportBehavior.processExport()
-        })
-    </script>
+        <script>
+            $('#exportFormPopup').on('popupComplete', function() {
+                $.oc.exportBehavior.processExport()
+            })
+        </script>
 
     <?php else: ?>
 
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="popup">&times;</button>
-        <h4 class="modal-title"><?= e(trans('backend::lang.import_export.export_error')) ?></h4>
-    </div>
-    <div class="modal-body">
-        <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-    </div>
-    <div class="modal-footer">
-        <button
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="popup">&times;</button>
+            <h4 class="modal-title"><?= e(trans('backend::lang.import_export.export_error')) ?></h4>
+        </div>
+        <div class="modal-body">
+            <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+        </div>
+        <div class="modal-footer">
+            <button
                 type="button"
                 class="btn btn-default"
                 data-dismiss="popup">
-            <?= e(trans('backend::lang.form.close')) ?>
-        </button>
-    </div>
+                <?= e(trans('backend::lang.form.close')) ?>
+            </button>
+        </div>
 
     <?php endif ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/modules/backend/behaviors/importexportcontroller/partials/_export_result_form.htm b/modules/backend/behaviors/importexportcontroller/partials/_export_result_form.htm
index 814b4e3a0..81038eaf6 100644
--- a/modules/backend/behaviors/importexportcontroller/partials/_export_result_form.htm
+++ b/modules/backend/behaviors/importexportcontroller/partials/_export_result_form.htm
@@ -1,34 +1,34 @@
 <?php if (!$this->fatalError): ?>
 
-<div class="modal-body">
-    <p>
-        <?= e(trans('backend::lang.import_export.processing_successful_line1')) ?>
-        <?= e(trans('backend::lang.import_export.processing_successful_line2')) ?>
-    </p>
-</div>
-<div class="modal-footer">
-    <a
+    <div class="modal-body">
+        <p>
+            <?= e(trans('backend::lang.import_export.processing_successful_line1')) ?>
+            <?= e(trans('backend::lang.import_export.processing_successful_line2')) ?>
+        </p>
+    </div>
+    <div class="modal-footer">
+        <a
             href="<?= $returnUrl ?>"
             class="btn btn-success"
             data-dismiss="popup">
-        <?= e(trans('backend::lang.form.complete')) ?>
-    </a>
-</div>
+            <?= e(trans('backend::lang.form.complete')) ?>
+        </a>
+    </div>
 
-<script> window.location = '<?= $fileUrl ?>' </script>
+    <script> window.location = '<?= $fileUrl ?>' </script>
 
 <?php else: ?>
 
-<div class="modal-body">
-    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-</div>
-<div class="modal-footer">
-    <button
+    <div class="modal-body">
+        <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+    </div>
+    <div class="modal-footer">
+        <button
             type="button"
             class="btn btn-default"
             data-dismiss="popup">
-        <?= e(trans('backend::lang.form.close')) ?>
-    </button>
-</div>
+            <?= e(trans('backend::lang.form.close')) ?>
+        </button>
+    </div>
 
 <?php endif ?>
\ No newline at end of file
diff --git a/modules/backend/behaviors/importexportcontroller/partials/_import_file_columns.htm b/modules/backend/behaviors/importexportcontroller/partials/_import_file_columns.htm
index 45a871aa3..7fc78f25c 100644
--- a/modules/backend/behaviors/importexportcontroller/partials/_import_file_columns.htm
+++ b/modules/backend/behaviors/importexportcontroller/partials/_import_file_columns.htm
@@ -1,44 +1,44 @@
 <div class="import-file-columns" id="importFileColumns">
     <?php if ($importFileColumns): ?>
-    <ul>
-        <?php foreach ($importFileColumns as $index => $column): ?>
-        <li data-column-id="<?= $index ?>">
-            <div class="import-column-name">
+        <ul>
+            <?php foreach ($importFileColumns as $index => $column): ?>
+                <li data-column-id="<?= $index ?>">
+                    <div class="import-column-name">
                         <span>
                             <i class="column-success-icon text-success icon-check"></i>
                             <a
-                                    href="javascript:;"
-                                    class="column-ignore-button"
-                                    data-toggle="tooltip"
-                                    data-delay="300"
-                                    data-placement="right"
-                                    title="<?= e(trans('backend::lang.import_export.ignore_this_column')) ?>"
-                                    onclick="$.oc.importBehavior.ignoreFileColumn(this)"
+                                href="javascript:;"
+                                class="column-ignore-button"
+                                data-toggle="tooltip"
+                                data-delay="300"
+                                data-placement="right"
+                                title="<?= e(trans('backend::lang.import_export.ignore_this_column')) ?>"
+                                onclick="$.oc.importBehavior.ignoreFileColumn(this)"
                             >
                                 <i class="icon-close"></i>
                             </a>
                             <a
-                                    href="javascript:;"
-                                    class="column-label"
-                                    onclick="$.oc.importBehavior.loadFileColumnSample(this)"
+                                href="javascript:;"
+                                class="column-label"
+                                onclick="$.oc.importBehavior.loadFileColumnSample(this)"
                             >
                                 <?= $column ?>
                             </a>
                         </span>
-            </div>
-            <div class="import-column-bindings">
-                <ul data-empty-text="<?= e(trans('backend::lang.import_export.drop_column_here')) ?>"></ul>
-            </div>
-        </li>
-        <?php endforeach ?>
-    </ul>
+                    </div>
+                    <div class="import-column-bindings">
+                        <ul data-empty-text="<?= e(trans('backend::lang.import_export.drop_column_here')) ?>"></ul>
+                    </div>
+                </li>
+            <?php endforeach ?>
+        </ul>
     <?php else: ?>
-    <p class="upload-prompt">
-        <?= e(trans('backend::lang.import_export.upload_valid_csv')) ?>.
-    </p>
+        <p class="upload-prompt">
+            <?= e(trans('backend::lang.import_export.upload_valid_csv')) ?>.
+        </p>
     <?php endif ?>
 </div>
 
 <script>
     $.oc.importBehavior.bindColumnSorting()
-</script>
\ No newline at end of file
+</script>
diff --git a/modules/backend/behaviors/importexportcontroller/partials/_import_form.htm b/modules/backend/behaviors/importexportcontroller/partials/_import_form.htm
index 94e363fc5..220879dff 100644
--- a/modules/backend/behaviors/importexportcontroller/partials/_import_form.htm
+++ b/modules/backend/behaviors/importexportcontroller/partials/_import_form.htm
@@ -1,51 +1,50 @@
 <div id="importFormPopup">
     <?php if (!$this->fatalError): ?>
 
-    <?= Form::open(['id' => 'importForm']) ?>
-    <div class="modal-header">
-        <h4 class="modal-title"><?= e(trans('backend::lang.import_export.import_progress')) ?></h4>
-    </div>
+        <?= Form::open(['id' => 'importForm']) ?>
+            <div class="modal-header">
+                <h4 class="modal-title"><?= e(trans('backend::lang.import_export.import_progress')) ?></h4>
+            </div>
 
-    <div id="importContainer">
-        <div class="modal-body">
+            <div id="importContainer">
+                <div class="modal-body">
+
+                    <div class="loading-indicator-container">
+                        <p>&nbsp;</p>
+                        <div class="loading-indicator transparent">
+                            <div><?= e(trans('backend::lang.import_export.processing')) ?></div>
+                            <span></span>
+                        </div>
+                    </div>
+                    <p>&nbsp;</p>
 
-            <div class="loading-indicator-container">
-                <p>&nbsp;</p>
-                <div class="loading-indicator transparent">
-                    <div><?= e(trans('backend::lang.import_export.processing')) ?></div>
-                    <span></span>
                 </div>
             </div>
-            <p>&nbsp;</p>
+        <?= Form::close() ?>
 
-        </div>
-    </div>
-
-    <?= Form::close() ?>
-
-    <script>
-        $('#importFormPopup').on('popupComplete', function() {
-            $.oc.importBehavior.processImport()
-        })
-    </script>
+        <script>
+            $('#importFormPopup').on('popupComplete', function() {
+                $.oc.importBehavior.processImport()
+            })
+        </script>
 
     <?php else: ?>
 
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="popup">&times;</button>
-        <h4 class="modal-title"><?= e(trans('backend::lang.import_export.import_error')) ?></h4>
-    </div>
-    <div class="modal-body">
-        <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-    </div>
-    <div class="modal-footer">
-        <button
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="popup">&times;</button>
+            <h4 class="modal-title"><?= e(trans('backend::lang.import_export.import_error')) ?></h4>
+        </div>
+        <div class="modal-body">
+            <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+        </div>
+        <div class="modal-footer">
+            <button
                 type="button"
                 class="btn btn-default"
                 data-dismiss="popup">
-            <?= e(trans('backend::lang.form.close')) ?>
-        </button>
-    </div>
+                <?= e(trans('backend::lang.form.close')) ?>
+            </button>
+        </div>
 
     <?php endif ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/modules/backend/behaviors/importexportcontroller/partials/_import_result_form.htm b/modules/backend/behaviors/importexportcontroller/partials/_import_result_form.htm
index d577a62a6..6a3cd1c40 100644
--- a/modules/backend/behaviors/importexportcontroller/partials/_import_result_form.htm
+++ b/modules/backend/behaviors/importexportcontroller/partials/_import_result_form.htm
@@ -1,102 +1,101 @@
 <?php if (!$this->fatalError): ?>
 
-<div class="modal-body">
+    <div class="modal-body">
 
-    <div class="scoreboard">
-        <div data-control="toolbar">
-            <div class="scoreboard-item title-value">
-                <h4><?= e(trans('backend::lang.import_export.created')) ?></h4>
-                <p><?= $importResults->created ?></p>
-            </div>
-            <div class="scoreboard-item title-value">
-                <h4><?= e(trans('backend::lang.import_export.updated')) ?></h4>
-                <p><?= $importResults->updated ?></p>
-            </div>
-            <?php if ($importResults->skippedCount): ?>
-            <div class="scoreboard-item title-value">
-                <h4><?= e(trans('backend::lang.import_export.skipped')) ?></h4>
-                <p><?= $importResults->skippedCount ?></p>
-            </div>
-            <?php endif ?>
-            <?php if ($importResults->warningCount): ?>
-            <div class="scoreboard-item title-value">
-                <h4><?= e(trans('backend::lang.import_export.warnings')) ?></h4>
-                <p><?= $importResults->warningCount ?></p>
-            </div>
-            <?php endif ?>
-            <div class="scoreboard-item title-value">
-                <h4><?= e(trans('backend::lang.import_export.errors')) ?></h4>
-                <p><?= $importResults->errorCount ?></p>
+        <div class="scoreboard">
+            <div data-control="toolbar">
+                <div class="scoreboard-item title-value">
+                    <h4><?= e(trans('backend::lang.import_export.created')) ?></h4>
+                    <p><?= $importResults->created ?></p>
+                </div>
+                <div class="scoreboard-item title-value">
+                    <h4><?= e(trans('backend::lang.import_export.updated')) ?></h4>
+                    <p><?= $importResults->updated ?></p>
+                </div>
+                <?php if ($importResults->skippedCount): ?>
+                    <div class="scoreboard-item title-value">
+                        <h4><?= e(trans('backend::lang.import_export.skipped')) ?></h4>
+                        <p><?= $importResults->skippedCount ?></p>
+                    </div>
+                <?php endif ?>
+                <?php if ($importResults->warningCount): ?>
+                    <div class="scoreboard-item title-value">
+                        <h4><?= e(trans('backend::lang.import_export.warnings')) ?></h4>
+                        <p><?= $importResults->warningCount ?></p>
+                    </div>
+                <?php endif ?>
+                <div class="scoreboard-item title-value">
+                    <h4><?= e(trans('backend::lang.import_export.errors')) ?></h4>
+                    <p><?= $importResults->errorCount ?></p>
+                </div>
             </div>
         </div>
-    </div>
 
-    <?php if ($importResults->hasMessages): ?>
-    <?php
+        <?php if ($importResults->hasMessages): ?>
+            <?php
                 $tabs = [
                     'skipped' => trans('backend::lang.import_export.skipped_rows'),
                     'warnings' => trans('backend::lang.import_export.warnings'),
                     'errors' => trans('backend::lang.import_export.errors'),
                 ];
 
-                              if (!$importResults->skippedCount) unset($tabs['skipped']);
-                              if (!$importResults->warningCount) unset($tabs['warnings']);
-                              if (!$importResults->errorCount) unset($tabs['errors']);
-                              ?>
-    <div class="control-tabs secondary-tabs" data-control="tab">
-        <ul class="nav nav-tabs">
-            <?php $count = 0; foreach ($tabs as $code => $tab): ?>
-            <li class="<?= $count++ == 0 ? 'active' : '' ?>">
-                <a href="#importTab<?= $code ?>">
-                    <?= $tab ?>
-                </a>
-            </li>
-            <?php endforeach ?>
-        </ul>
-        <div class="tab-content">
-            <?php $count = 0; foreach ($tabs as $code => $tab): ?>
-            <div class="tab-pane <?= $count++ == 0 ? 'active' : '' ?>">
-                <div class="list-preview">
-                    <div class="control-simplelist is-divided is-scrollable size-small" data-control="simplelist">
-                        <ul>
-                            <?php foreach ($importResults->{$code} as $row => $message): ?>
-                            <li>
-                                <strong>Row <?= $row ?></strong>
-                                - <?= e($message) ?>
-                            </li>
-                            <?php endforeach ?>
-                        </ul>
-                    </div>
+                if (!$importResults->skippedCount) unset($tabs['skipped']);
+                if (!$importResults->warningCount) unset($tabs['warnings']);
+                if (!$importResults->errorCount) unset($tabs['errors']);
+            ?>
+            <div class="control-tabs secondary-tabs" data-control="tab">
+                <ul class="nav nav-tabs">
+                    <?php $count = 0; foreach ($tabs as $code => $tab): ?>
+                        <li class="<?= $count++ == 0 ? 'active' : '' ?>">
+                            <a href="#importTab<?= $code ?>">
+                                <?= $tab ?>
+                            </a>
+                        </li>
+                    <?php endforeach ?>
+                </ul>
+                <div class="tab-content">
+                    <?php $count = 0; foreach ($tabs as $code => $tab): ?>
+                        <div class="tab-pane <?= $count++ == 0 ? 'active' : '' ?>">
+                            <div class="list-preview">
+                                <div class="control-simplelist is-divided is-scrollable size-small" data-control="simplelist">
+                                    <ul>
+                                        <?php foreach ($importResults->{$code} as $row => $message): ?>
+                                            <li>
+                                                <strong>Row <?= $row ?></strong>
+                                                - <?= e($message) ?>
+                                            </li>
+                                        <?php endforeach ?>
+                                    </ul>
+                                </div>
+                            </div>
+                        </div>
+                    <?php endforeach ?>
                 </div>
             </div>
-            <?php endforeach ?>
-        </div>
+        <?php endif ?>
+
     </div>
-
-    <?php endif ?>
-
-</div>
-<div class="modal-footer">
-    <a
+    <div class="modal-footer">
+        <a
             href="<?= $returnUrl ?>"
             class="btn btn-success"
             data-dismiss="popup">
-        <?= e(trans('backend::lang.form.complete')) ?>
-    </a>
-</div>
+            <?= e(trans('backend::lang.form.complete')) ?>
+        </a>
+    </div>
 
 <?php else: ?>
 
-<div class="modal-body">
-    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-</div>
-<div class="modal-footer">
-    <button
+    <div class="modal-body">
+        <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+    </div>
+    <div class="modal-footer">
+        <button
             type="button"
             class="btn btn-default"
             data-dismiss="popup">
-        <?= e(trans('backend::lang.form.close')) ?>
-    </button>
-</div>
+            <?= e(trans('backend::lang.form.close')) ?>
+        </button>
+    </div>
 
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm b/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm
index f7b86daa5..a7a80d73c 100644
--- a/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm
+++ b/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm
@@ -1,16 +1,16 @@
 <div data-control="toolbar">
     <a
-            href="javascript:;"
-            id="showIgnoredColumnsButton"
-            class="btn btn-sm btn-default oc-icon-eye disabled"
-            onclick="$.oc.importBehavior.showIgnoredColumns()">
+        href="javascript:;"
+        id="showIgnoredColumnsButton"
+        class="btn btn-sm btn-default oc-icon-eye disabled"
+        onclick="$.oc.importBehavior.showIgnoredColumns()">
         <?= e(trans('backend::lang.import_export.show_ignored_columns')) ?>
     </a>
     <a
-            href="javascript:;"
-            id="autoMatchColumnsButton"
-            class="btn btn-sm btn-default oc-icon-bullseye"
-            onclick="$.oc.importBehavior.autoMatchColumns()">
+        href="javascript:;"
+        id="autoMatchColumnsButton"
+        class="btn btn-sm btn-default oc-icon-bullseye"
+        onclick="$.oc.importBehavior.autoMatchColumns()">
         <?= e(trans('backend::lang.import_export.auto_match_columns')) ?>
     </a>
-</div>
\ No newline at end of file
+</div>