diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 066faf3d1..c2bc86fc7 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -924,6 +924,7 @@ class ConsoleConnectionsBulkImportView(PermissionRequiredMixin, BulkImportView):
     form = forms.ConsoleConnectionImportForm
     table = tables.ConsoleConnectionTable
     template_name = 'dcim/console_connections_import.html'
+    default_return_url = 'dcim:console_connections_list'
 
 
 #
@@ -1117,6 +1118,7 @@ class PowerConnectionsBulkImportView(PermissionRequiredMixin, BulkImportView):
     form = forms.PowerConnectionImportForm
     table = tables.PowerConnectionTable
     template_name = 'dcim/power_connections_import.html'
+    default_return_url = 'dcim:power_connections_list'
 
 
 #
@@ -1528,6 +1530,7 @@ class InterfaceConnectionsBulkImportView(PermissionRequiredMixin, BulkImportView
     form = forms.InterfaceConnectionImportForm
     table = tables.InterfaceConnectionTable
     template_name = 'dcim/interface_connections_import.html'
+    default_return_url = 'dcim:interface_connections_list'
 
 
 #
diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py
index 1d27c538a..75980ca08 100644
--- a/netbox/secrets/views.py
+++ b/netbox/secrets/views.py
@@ -183,6 +183,7 @@ def secret_import(request):
 
                     return render(request, 'import_success.html', {
                         'table': table,
+                        'return_url': 'secrets:secret_list',
                     })
 
                 except IntegrityError as e:
@@ -193,7 +194,7 @@ def secret_import(request):
 
     return render(request, 'secrets/secret_import.html', {
         'form': form,
-        'return_url': reverse('secrets:secret_list'),
+        'return_url': 'secrets:secret_list',
     })
 
 
diff --git a/netbox/templates/dcim/console_connections_import.html b/netbox/templates/dcim/console_connections_import.html
index 6b47ba3bb..31d24e58f 100644
--- a/netbox/templates/dcim/console_connections_import.html
+++ b/netbox/templates/dcim/console_connections_import.html
@@ -12,7 +12,9 @@
 		    {% csrf_token %}
 		    {% render_form form %}
             <div class="form-group">
-		        <button type="submit" class="btn btn-primary">Submit</button>
+                <div class="col-md-12 text-right">
+		            <button type="submit" class="btn btn-primary">Submit</button>
+                </div>
             </div>
 		</form>
     </div>
diff --git a/netbox/templates/dcim/interface_connections_import.html b/netbox/templates/dcim/interface_connections_import.html
index 6329e0680..9868a7b55 100644
--- a/netbox/templates/dcim/interface_connections_import.html
+++ b/netbox/templates/dcim/interface_connections_import.html
@@ -20,7 +20,9 @@
 		    {% csrf_token %}
 		    {% render_form form %}
             <div class="form-group">
-                <button type="submit" class="btn btn-primary">Submit</button>
+                <div class="col-md-12 text-right">
+		            <button type="submit" class="btn btn-primary">Submit</button>
+                </div>
             </div>
 		</form>
     </div>
diff --git a/netbox/templates/dcim/power_connections_import.html b/netbox/templates/dcim/power_connections_import.html
index 7c436508a..606694a8d 100644
--- a/netbox/templates/dcim/power_connections_import.html
+++ b/netbox/templates/dcim/power_connections_import.html
@@ -12,7 +12,9 @@
 		    {% csrf_token %}
 		    {% render_form form %}
             <div class="form-group">
-                <button type="submit" class="btn btn-primary">Submit</button>
+                <div class="col-md-12 text-right">
+		            <button type="submit" class="btn btn-primary">Submit</button>
+                </div>
             </div>
 		</form>
     </div>
diff --git a/netbox/templates/import_success.html b/netbox/templates/import_success.html
index 3056e39df..40a8b69af 100644
--- a/netbox/templates/import_success.html
+++ b/netbox/templates/import_success.html
@@ -4,10 +4,13 @@
 {% block title %}Import Completed{% endblock %}
 
 {% block content %}
-<h1>Import Completed</h1>
-{% render_table table %}
-<a href="{{ request.path }}" class="btn btn-primary">
-	<span class="fa fa-download" aria-hidden="true"></span>
-	Import more
-</a>
+    <h1>{% block title %}Import Completed{% endblock %}</h1>
+    {% render_table table %}
+    <a href="{{ request.path }}" class="btn btn-primary">
+        <span class="fa fa-download" aria-hidden="true"></span>
+        Import more
+    </a>
+    {% if return_url %}
+        <a href="{% url return_url %}" class="btn btn-default">View All</a>
+    {% endif %}
 {% endblock %}
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 80539a441..b69be08d6 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -395,6 +395,7 @@ class BulkImportView(View):
 
                 return render(request, "import_success.html", {
                     'table': obj_table,
+                    'return_url': self.default_return_url,
                 })
 
             except IntegrityError as e: