diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py
index 6e50d83fd12..3518716750c 100644
--- a/netbox/secrets/views.py
+++ b/netbox/secrets/views.py
@@ -92,7 +92,7 @@ def secret_add(request, pk):
 
                 messages.success(request, "Added new secret: {0}".format(secret))
                 if '_addanother' in request.POST:
-                    return redirect('secrets:secret_add')
+                    return redirect('dcim:device_addsecret', pk=device.pk)
                 else:
                     return redirect('secrets:secret', pk=secret.pk)
 
diff --git a/netbox/templates/secrets/secret_edit.html b/netbox/templates/secrets/secret_edit.html
index 0698e718423..9a3df1a4550 100644
--- a/netbox/templates/secrets/secret_edit.html
+++ b/netbox/templates/secrets/secret_edit.html
@@ -2,19 +2,15 @@
 {% load static from staticfiles %}
 {% load form_helpers %}
 
-{% block title %}{% if secret.pk %}Editing Secret: {{ secret }}{% else %}Add a Secret{% endif %}{% endblock %}
+{% block title %}{% if secret.pk %}Editing {{ secret }}{% else %}Add a Secret{% endif %}{% endblock %}
 
 {% block content %}
-{% if secret.pk %}
-	<h1>Editing Secret: {{ secret }}</h1>
-{% else %}
-	<h1>Add a Secret</h1>
-{% endif %}
 <form action="." method="post" class="form form-horizontal requires-private-key">
     {% csrf_token %}
     {{ form.private_key }}
     <div class="row">
         <div class="col-md-6 col-md-offset-3">
+            <h3>{% if secret.pk %}Editing {{ secret }}{% else %}Add a Secret{% endif %}</h3>
             {% if form.non_field_errors %}
                 <div class="panel panel-danger">
                     <div class="panel-heading"><strong>Errors</strong></div>
@@ -23,10 +19,6 @@ <h1>Add a Secret</h1>
                     </div>
                 </div>
             {% endif %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-6">
             <div class="panel panel-default">
                 <div class="panel-heading"><strong>Secret Attributes</strong></div>
                 <div class="panel-body">
@@ -41,8 +33,6 @@ <h1>Add a Secret</h1>
                     {% render_field form.userkeys %}
                 </div>
             </div>
-        </div>
-        <div class="col-md-6">
             <div class="panel panel-default">
                 <div class="panel-heading"><strong>Secret Data</strong></div>
                 <div class="panel-body">