diff --git a/horizon/horizon/api/nova.py b/horizon/horizon/api/nova.py
index 1802d1a48d..d523efd40c 100644
--- a/horizon/horizon/api/nova.py
+++ b/horizon/horizon/api/nova.py
@@ -103,7 +103,7 @@ class ServerAttributes(APIDictWrapper):
 
        Preserves the request info so image name can later be retrieved
     """
-    _attrs = ['description', 'disk_gb', 'host', 'image_ref', 'kernel_id',
+    _attrs = ['disk_gb', 'host', 'image_ref', 'kernel_id',
               'key_name', 'launched_at', 'mac_address', 'memory_mb', 'name',
               'os_type', 'tenant_id', 'ramdisk_id', 'scheduled_at',
               'terminated_at', 'user_data', 'user_id', 'vcpus', 'hostname',
@@ -231,12 +231,11 @@ def server_delete(request, instance):
 
 
 def server_get(request, instance_id):
-    return Server(extras_api(request).servers.get(instance_id), request)
+    return Server(novaclient(request).servers.get(instance_id), request)
 
 
-@check_openstackx
 def server_list(request):
-    return [Server(s, request) for s in extras_api(request).servers.list()]
+    return [Server(s, request) for s in novaclient(request).servers.list()]
 
 
 @check_openstackx
@@ -251,10 +250,8 @@ def server_reboot(request,
     server.reboot(hardness)
 
 
-def server_update(request, instance_id, name, description):
-    return extras_api(request).servers.update(instance_id,
-                                              name=name,
-                                              description=description)
+def server_update(request, instance_id, name):
+    return novaclient(request).servers.update(instance_id, name=name)
 
 
 def server_add_floating_ip(request, server, address):
diff --git a/horizon/horizon/context_processors.py b/horizon/horizon/context_processors.py
index eccb0452a8..6f3c8af684 100644
--- a/horizon/horizon/context_processors.py
+++ b/horizon/horizon/context_processors.py
@@ -46,8 +46,12 @@ def horizon(request):
 
     ``network_configured``
         Boolean. Will be ``True`` if ``settings.QUANTUM_ENABLED`` is ``True``.
+
+    Additionally, it sets the names ``True`` and ``False`` in the context
+    to their boolean equivalents for convenience.
     """
-    context = {}
+    context = {"True": True,
+               "False": False}
 
     # Auth/Keystone context
     context.setdefault('authorized_tenants', [])
diff --git a/horizon/horizon/dashboards/nova/images/forms.py b/horizon/horizon/dashboards/nova/images/forms.py
index 806d06210b..14e07b559f 100644
--- a/horizon/horizon/dashboards/nova/images/forms.py
+++ b/horizon/horizon/dashboards/nova/images/forms.py
@@ -65,7 +65,7 @@ class UpdateImageForm(forms.SelfHandlingForm):
             LOG.exception(error_retrieving)
             messages.error(request, error_retrieving)
 
-        if image.owner == request.user.username:
+        if image.owner == request.user.tenant_id:
             try:
                 meta = {
                     'is_public': True,
diff --git a/horizon/horizon/dashboards/nova/images/views.py b/horizon/horizon/dashboards/nova/images/views.py
index 12e3ef3b6b..c2b12b48c3 100644
--- a/horizon/horizon/dashboards/nova/images/views.py
+++ b/horizon/horizon/dashboards/nova/images/views.py
@@ -46,8 +46,6 @@ def index(request):
         unused, handled = f.maybe_handle(request)
         if handled:
             return handled
-    delete_form = DeleteImage()
-
     all_images = []
     try:
         all_images = api.image_list_detailed(request)
@@ -67,9 +65,12 @@ def index(request):
     images = [im for im in all_images
               if im['container_format'] not in ['aki', 'ari']]
 
+    quotas = api.tenant_quota_get(request, request.user.tenant_id)
+
     return shortcuts.render(request,
                             'nova/images/index.html', {
-                                'delete_form': delete_form,
+                                'delete_form': DeleteImage(),
+                                'quotas': quotas,
                                 'images': images})
 
 
diff --git a/horizon/horizon/dashboards/nova/instances/forms.py b/horizon/horizon/dashboards/nova/instances/forms.py
index 1296008e89..70d6fc3052 100644
--- a/horizon/horizon/dashboards/nova/instances/forms.py
+++ b/horizon/horizon/dashboards/nova/instances/forms.py
@@ -82,16 +82,13 @@ class UpdateInstance(forms.SelfHandlingForm):
     instance = forms.CharField(widget=forms.TextInput(
                                attrs={'readonly': 'readonly'}))
     name = forms.CharField(required=True)
-    description = forms.CharField(required=False)
 
     def handle(self, request, data):
         tenant_id = data['tenant_id']
-        description = data.get('description', '')
         try:
             api.server_update(request,
                               data['instance'],
-                              data['name'],
-                              description)
+                              data['name'])
             messages.success(request, _("Instance '%s' updated") %
                                       data['name'])
         except api_exceptions.ApiException, e:
diff --git a/horizon/horizon/dashboards/nova/instances/views.py b/horizon/horizon/dashboards/nova/instances/views.py
index 75b975e2ef..9674b97fbf 100644
--- a/horizon/horizon/dashboards/nova/instances/views.py
+++ b/horizon/horizon/dashboards/nova/instances/views.py
@@ -209,8 +209,7 @@ def update(request, instance_id):
     form, handled = UpdateInstance.maybe_handle(request, initial={
                                 'instance': instance_id,
                                 'tenant_id': tenant_id,
-                                'name': instance.name,
-                                'description': instance.attrs['description']})
+                                'name': instance.name})
 
     if handled:
         return handled
diff --git a/horizon/horizon/dashboards/nova/templates/nova/containers/_create.html b/horizon/horizon/dashboards/nova/templates/nova/containers/_create.html
index c82d716cc8..1fd10b3862 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/containers/_create.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/containers/_create.html
@@ -1,11 +1,24 @@
-{% extends 'nova/keypairs/_form.html' %}
+{% extends "horizon/common/_modal_form.html" %}
 {%load i18n%}
 
-{% block form_url %}{% url horizon:nova:containers:create %}{% endblock %}
+{% block form_id %}create_container_form{% endblock %}
+{% block form_action %}{% url horizon:nova:containers:create %}{% endblock %}
 
-{% block submit %}
-<div class="modal-footer">
-  <input class="btn primary pull-right" type="submit" value="{%trans "Create Keypair"%}" />
-  <a href="#" class="btn secondary cancel close">Cancel</a>
+{% block modal-header %}Create Container{% endblock %}
+
+{% block modal-body %}
+<div class="left">
+    <fieldset>
+        {% include "horizon/common/_form_fields.html" %}
+    </fieldset>
+</div>
+<div class="right">
+    <h3>{% trans "Description"%}:</h3>
+    <p>{% trans "A container is a storage compartment for your data and provides a way for you to organize your data. You can think of a container as a folder in Windows® or a directory in UNIX®. The primary difference between a container and these other file system concepts is that containers cannot be nested. You can, however, create an unlimited number of containers within your account. Data must be stored in a container so you must have at least one container defined in your account prior to uploading data."%}</p>
 </div>
 {% endblock %}
+
+{% block modal-footer %}
+  <input class="btn primary pull-right" type="submit" value="{% trans "Create Container" %}" />
+  <a href="{% url horizon:nova:containers:index %}" class="btn secondary cancel close">Cancel</a>
+{% endblock %}
diff --git a/horizon/horizon/dashboards/nova/templates/nova/containers/_form.html b/horizon/horizon/dashboards/nova/templates/nova/containers/_form.html
deleted file mode 100644
index 9899151d89..0000000000
--- a/horizon/horizon/dashboards/nova/templates/nova/containers/_form.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{%load i18n%}
-<form id="import_keypair_form" action="{% block form_url %}{% endblock %}" method="post">
-  {% csrf_token %}
-  <fieldset>
-    {% for hidden in form.hidden_fields %}
-      {{hidden}}
-    {% endfor %}
-    {% for field in form.visible_fields %}
-      <div class="clearfix{% if field.errors %} error{% endif %}">
-        {{field.label_tag}}
-        {% if field.errors %}
-          {% for error in field.errors %}
-            <span class="help-inline">{{error}}</span>
-          {% endfor %}
-        {% endif %}
-        <span class="help-block">{{field.help_text}}</span>
-        <div class="input">
-          {{field}}
-        </div>
-      </div>
-    {% endfor %}
-    {% block submit %}
-      <input type="submit" value="{%trans "Create Container" %}" />
-    {% endblock %}
-  </fieldset>
-</form>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/containers/create.html b/horizon/horizon/dashboards/nova/templates/nova/containers/create.html
index 8139197634..caaf2b43f5 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/containers/create.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/containers/create.html
@@ -12,20 +12,7 @@
 {% endblock page_header %}
 
 {% block dash_main %}
-  <div id="create_container_form" class="modal static_page">
-    <div class="modal-header">
-      <h3>Create Container</h3>
-    </div>
-    <div class="modal-body">
-      <div class="left">
-        {% include 'nova/containers/_create.html' with form=create_form %}
-      </div>
-      <div class="right">
-        <h3>{% trans "Description"%}:</h3>
-        <p>{% trans "A container is a storage compartment for your data and provides a way for you to organize your data. You can think of a container as a folder in Windows® or a directory in UNIX®. The primary difference between a container and these other file system concepts is that containers cannot be nested. You can, however, create an unlimited number of containers within your account. Data must be stored in a container so you must have at least one container defined in your account prior to uploading data."%}</p>
-      </div>
-    </div>
-  </div>
+  {% include "nova/containers/_create.html" with form=create_form %}
 {% endblock %}
 
 
diff --git a/horizon/horizon/dashboards/nova/templates/nova/floating_ips/_associate.html b/horizon/horizon/dashboards/nova/templates/nova/floating_ips/_associate.html
index ff069712d2..a94476242e 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/floating_ips/_associate.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/floating_ips/_associate.html
@@ -1,12 +1,24 @@
-{% extends 'nova/instances/_form.html' %}
+{% extends "horizon/common/_modal_form.html" %}
 {%load i18n%}
 
-{% block form_url %}{% url horizon:nova:floating_ips:associate floating_ip_id %}{% endblock %}
+{% block form_id %}associate_floating_ip_form{% endblock %}
+{% block form_action %}{% url horizon:nova:floating_ips:associate floating_ip_id %}{% endblock %}
 
-{% block submit %}
-<div class="modal-footer">
-  <input class="btn primary pull-right" type="submit" value="{%trans "Associate IP"%}" />
-  <a href="#" class="btn secondary cancel close">Cancel</a>
+{% block modal-header %}Associate Floating IP{% endblock %}
+
+{% block modal-body %}
+<div class="left">
+    <fieldset>
+    {% include "horizon/common/_form_fields.html" %}
+    </fieldset>
+</div>
+<div class="right">
+    <h3>{% trans "Description:"%}</h3>
+    <p>{% trans "Associate a floating ip with an instance."%}</p>
 </div>
 {% endblock %}
 
+{% block modal-footer %}
+  <input class="btn primary pull-right" type="submit" value="{%trans "Associate IP"%}" />
+  <a href="{% url horizon:nova:floating_ips:index %}" class="btn secondary cancel close">Cancel</a>
+{% endblock %}
diff --git a/horizon/horizon/dashboards/nova/templates/nova/floating_ips/_form.html b/horizon/horizon/dashboards/nova/templates/nova/floating_ips/_form.html
deleted file mode 100644
index 4a1d7c533f..0000000000
--- a/horizon/horizon/dashboards/nova/templates/nova/floating_ips/_form.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{%load i18n%}
-<form action="{% block form_url %}{% endblock %}" method="post">
-  {% csrf_token %}
-  <fieldset>
-    {% for hidden in form.hidden_fields %}
-      {{hidden}}
-    {% endfor %}
-    {% for field in form.visible_fields %}
-      <div class="clearfix{% if field.errors %} error{% endif %}">
-        {{field.label_tag}}
-        {% if field.errors %}
-          {% for error in field.errors %}
-            <span class="help-inline">{{error}}</span>
-          {% endfor %}
-        {% endif %}
-        <span class="help-block">{{field.help_text}}</span>
-        <div class="input">
-          {{field}}
-        </div>
-      </div>
-    {% endfor %}
-    {% block submit %}
-      <input type="submit" value="{%trans "Associate IP" %}" />
-    {% endblock %}
-  </fieldset>
-</form>
-
diff --git a/horizon/horizon/dashboards/nova/templates/nova/floating_ips/associate.html b/horizon/horizon/dashboards/nova/templates/nova/floating_ips/associate.html
index 6375f383e2..b8c3447ba5 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/floating_ips/associate.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/floating_ips/associate.html
@@ -13,19 +13,5 @@
 {% endblock page_header %}
 
 {% block dash_main %}
-  <div id="update_instance_modal" class="modal static_page">
-    <div class="modal-header">
-      <h3>Associate Floating IP</h3>
-    </div>
-    <div class="modal-body">
-      <div class="left">
-        {% include 'nova/floating_ips/_associate.html' with form=associate_form %}
-      </div>
-      <div class="right">
-        <h3>{% trans "Description:"%}</h3>
-        <p>{% trans "Associate a floating ip with an instance."%}</p>
-      </div>
-    </div>
-  </div>
-
+  {% include 'nova/floating_ips/_associate.html' with form=associate_form %}
 {% endblock %}
diff --git a/horizon/horizon/dashboards/nova/templates/nova/images/_delete.html b/horizon/horizon/dashboards/nova/templates/nova/images/_delete.html
index cc8def96f3..68a9054e6a 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/images/_delete.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/images/_delete.html
@@ -2,8 +2,8 @@
 <form id="form_delete_{{image.id}}" class="form-delete" method="post">
   {% csrf_token %}
   {% for hidden in form.hidden_fields %}
-    {{hidden}}
+    {{ hidden }}
   {% endfor %}
   <input name="image_id" type="hidden" value="{{image.id}}" />
-  <input id="delete_{{image.id}}" class="delete" title="Image: {{image.name}}" type="submit" value="{%trans "Delete"%}" />
+  <input id="delete_{{image.id}}" class="btn small delete danger" title="Image: {{image.name}}" type="submit" value="{%trans "Delete"%}" />
 </form>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/images/_form.html b/horizon/horizon/dashboards/nova/templates/nova/images/_form.html
deleted file mode 100644
index d993253464..0000000000
--- a/horizon/horizon/dashboards/nova/templates/nova/images/_form.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{%load i18n%}
-<form action="{% block form_url %}{% endblock %}" method="post">
-  {% csrf_token %}
-  <fieldset>
-    {% for hidden in form.hidden_fields %}
-      {{hidden}}
-    {% endfor %}
-    {% for field in form.visible_fields %}
-      <div class="clearfix{% if field.errors %} error{% endif %}">
-        {{field.label_tag}}
-        {% if field.errors %}
-          {% for error in field.errors %}
-            <span class="help-inline">{{error}}</span>
-          {% endfor %}
-        {% endif %}
-        <span class="help-block">{{field.help_text}}</span>
-        <div class="input">
-          {{field}}
-        </div>
-      </div>
-    {% endfor %}
-    {% block submit %}
-      <input type="submit" value="{%trans "Launch Image" %}" />
-    {% endblock %}
-  </fieldset>
-</form>
-
diff --git a/horizon/horizon/dashboards/nova/templates/nova/images/_launch.html b/horizon/horizon/dashboards/nova/templates/nova/images/_launch.html
index f9110ef78d..b63b436cbc 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/images/_launch.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/images/_launch.html
@@ -1,11 +1,52 @@
-{% extends 'nova/images/_launch_form.html' %}
+{% extends "horizon/common/_modal_form.html" %}
 {%load i18n%}
 
-{% block form_url %}{% url horizon:nova:images:launch image_id %}{% endblock %}
+{% block form_id %}{% endblock %}
+{% block form_action %}{% url horizon:nova:images:launch image_id %}{% endblock %}
 
-{% block submit %}
-<div class="modal-footer">
-  <input class="btn primary pull-right" type="submit" value="{%trans "Launch Instance"%}" />
-  <a href="#" class="btn secondary cancel close">Cancel</a>
+{% block modal_id %}launch_image_{{ image_id }}{% endblock %}
+
+{% block modal-header %}Launch Instances{% endblock %}
+
+{% block modal-body %}
+<div class="left">
+    <fieldset>
+    {% include "horizon/common/_form_fields.html" %}
+    </fieldset>
+</div>
+<div class="right">
+    <h3>{% trans "Description:"%}</h3>
+        <p>{% trans "Specify the details for launching an instance. Also please make note of the table below; all tenants have quotas which define the limit of resources they are allowed to provision."%}</p>
+        <table border="0">
+          <tr>
+            <th>{% trans "Quota Name"%}</th>
+            <th>{% trans "Limit"%}</th>
+          </tr>
+          <tr>
+            <td>{% trans "RAM (MB)"%}</td>
+            <td>{{quotas.ram}}MB</td>
+          </tr>
+          <tr>
+            <td>{% trans "Floating IPs"%}</td>
+            <td>{{quotas.floating_ips}}</td>
+          </tr>
+          <tr>
+            <td>{% trans "Instances"%}</td>
+            <td>{{quotas.instances}}</td>
+          </tr>
+          <tr>
+            <td>{% trans "Volumes"%}</td>
+            <td>{{quotas.volumes}}</td>
+          </tr>
+          <tr>
+            <td>{% trans "Gigabytes"%}</td>
+            <td>{{quotas.gigabytes}}GB</td>
+          </tr>
+        </table>
 </div>
 {% endblock %}
+
+{% block modal-footer %}
+  <input class="btn primary pull-right" type="submit" value="{%trans "Launch Instance"%}" />
+  <a href="{% url horizon:nova:images:index %}" class="btn secondary cancel close">Cancel</a>
+{% endblock %}
diff --git a/horizon/horizon/dashboards/nova/templates/nova/images/_launch_form.html b/horizon/horizon/dashboards/nova/templates/nova/images/_launch_form.html
deleted file mode 100644
index b28d9a530d..0000000000
--- a/horizon/horizon/dashboards/nova/templates/nova/images/_launch_form.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{%load i18n%}
-<form id="launch_img" action="{% block form_url %}{% endblock %}" method="post">
-  {% csrf_token %}
-  <fieldset>
-    {% for hidden in form.hidden_fields %}
-      {{hidden}}
-    {% endfor %}
-    {% for field in form.visible_fields %}
-      <div class="clearfix{% if field.errors %} error{% endif %}">
-        {{field.label_tag}}
-        {% if field.errors %}
-          {% for error in field.errors %}
-            <span class="help-inline">{{error}}</span>
-          {% endfor %}
-        {% endif %}
-        <span class="help-block">{{field.help_text}}</span>
-        <div class="input">
-          {{field}}
-        </div>
-      </div>
-    {% endfor %}
-    {% block submit %}8
-      <input type="submit" value="{%trans "Launch Instance" %}" />
-    {% endblock %}
-  </fieldset>
-</form>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/images/_list.html b/horizon/horizon/dashboards/nova/templates/nova/images/_list.html
index e365b4dcf6..63eb50d64f 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/images/_list.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/images/_list.html
@@ -1,12 +1,4 @@
-{%load i18n%}
-
-{% block footer_js %}
-  <script type="text/javascript" charset="utf-8">
-    $(function(){
-
-    })
-  </script>
-{% endblock %}
+{% load i18n %}
 
 {% load parse_date %}
 {% load launch_form %}
@@ -27,13 +19,18 @@
       <td>{{image.status|capfirst}}</td>
       <td id="actions">
           <ul>
-      {% if image.owner == request.user.username %}
+            <li>{{ image.request.user.id }}<a class="btn small primary" data-controls-modal="launch_image_{{image.id}}" data-backdrop="static" href="{% url horizon:nova:images:launch image.id %}">{% trans "Launch" %}</a></li>
+            {% if image.owner == request.user.tenant_id %}
             <li class="form">{% include "nova/images/_delete.html" with form=delete_form %}</li>
-            <li><a href="{% url horizon:nova:images:update image.id %}">{%trans "Edit"%}</a></li>
-      {% endif %}
-            <li><a class="btn small" href="{% url horizon:nova:images:launch image.id %}">{%trans "Launch"%}</a></li>
+            <li><a class='btn small' href="{% url horizon:nova:images:update image.id %}">{% trans "Edit" %}</a></li>
+            {% endif %}
           </ul>
         </td>
   </tr>
   {% endfor %}
 </table>
+
+{% for image in images %}
+  {% launch_form request request.user.tenant_id image.id as launch_form %}
+  {% include 'nova/images/_launch.html' with form=launch_form image_id=image.id hide=True %}
+{% endfor %}
diff --git a/horizon/horizon/dashboards/nova/templates/nova/images/_update.html b/horizon/horizon/dashboards/nova/templates/nova/images/_update.html
new file mode 100644
index 0000000000..8f862523fd
--- /dev/null
+++ b/horizon/horizon/dashboards/nova/templates/nova/images/_update.html
@@ -0,0 +1,24 @@
+{% extends "horizon/common/_modal_form.html" %}
+{%load i18n%}
+
+{% block form_id %}update_image_form{% endblock %}
+{% block form_action %}{% url horizon:nova:image:update %}{% endblock %}
+
+{% block modal-header %}Update Image{% endblock %}
+
+{% block modal-body %}
+<div class="left">
+    <fieldset>
+    {% include "horizon/common/_form_fields.html" %}
+    </fieldset>
+</div>
+<div class="right">
+    <h3>{% trans "Description:"%}</h3>
+    <p>{% trans "From here you can modify different properties of an image."%}</p>
+</div>
+{% endblock %}
+
+{% block modal-footer %}
+  <input class="btn primary pull-right" type="submit" value="{%trans "Update Image"%}" />
+  <a href="{% url horizon:nova:images:index %}" class="btn secondary cancel close">Cancel</a>
+{% endblock %}
diff --git a/horizon/horizon/dashboards/nova/templates/nova/images/launch.html b/horizon/horizon/dashboards/nova/templates/nova/images/launch.html
index 44f9e1a6d3..693ece3eb8 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/images/launch.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/images/launch.html
@@ -12,55 +12,7 @@
   {% include "horizon/common/_page_header.html" with title=_("Launch Instance") %}
 {% endblock page_header %}
 
-{% block headerjs %}
-  <script type="text/javascript" charset="utf-8">
-    // $("#foo").modal('show', {
-    //   'backdrop': true,
-    // })
-  </script>
-{% endblock %}
-
 {% block dash_main %}
-  <div class="modal static_page">
-    <div class="modal-header">
-      <h3>Launch Instances</h3>
-    </div>
-    <div class="modal-body">
-      <div class="left">
-        {% include 'nova/images/_launch.html' with image_id=image.id %}
-      </div>
-      <div class="right">
-        <h3>{% trans "Description:"%}</h3>
-        <p>{% trans "Specify the details for launching an instance. Also please make note of the table below; all tenants have quotas which define the limit of resources they are allowed to provision."%}</p>
-        <table border="0">
-          <tr>
-            <th>{% trans "Quota Name"%}</th>
-            <th>{% trans "Limit"%}</th>
-          </tr>
-          <tr>
-            <td>{% trans "RAM (MB)"%}</td>
-            <td>{{quotas.ram}}MB</td>
-          </tr>
-          <tr>
-            <td>{% trans "Floating IPs"%}</td>
-            <td>{{quotas.floating_ips}}</td>
-          </tr>
-          <tr>
-            <td>{% trans "Instances"%}</td>
-            <td>{{quotas.instances}}</td>
-          </tr>
-          <tr>
-            <td>{% trans "Volumes"%}</td>
-            <td>{{quotas.volumes}}</td>
-          </tr>
-          <tr>
-            <td>{% trans "Gigabytes"%}</td>
-            <td>{{quotas.gigabytes}}GB</td>
-          </tr>
-        </table>
-      </div>
-      <div class="clear">&nbsp;</div>
-    </div>
-  </div>
+  {% include 'nova/images/_launch.html' with image_id=image.id %}
 {% endblock %}
 
diff --git a/horizon/horizon/dashboards/nova/templates/nova/images/update.html b/horizon/horizon/dashboards/nova/templates/nova/images/update.html
index d20491aaa5..de149284d1 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/images/update.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/images/update.html
@@ -12,15 +12,5 @@
 {% endblock page_header %}
 
 {% block dash_main %}
-  <div class="dash_block">
-    <div class="left">
-      {% include 'nova/images/_form.html' %}
-    </div>
-
-    <div class="right">
-      <h3>{% trans "Description:"%}</h3>
-      <p>{% trans "From here you can modify different properties of an image."%}</p>
-    </div>
-    <div class="clear">&nbsp;</div>
-  </div>
+  {% include 'nova/images/_update.html' %}
 {% endblock %}
diff --git a/horizon/horizon/dashboards/nova/templates/nova/instances/_form.html b/horizon/horizon/dashboards/nova/templates/nova/instances/_form.html
deleted file mode 100644
index b6859387bf..0000000000
--- a/horizon/horizon/dashboards/nova/templates/nova/instances/_form.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{%load i18n%}
-<form action="{% block form_url %}{% endblock %}" method="post">
-  {% csrf_token %}
-  <fieldset>
-    {% for hidden in form.hidden_fields %}
-      {{hidden}}
-    {% endfor %}
-    {% for field in form.visible_fields %}
-      <div class="clearfix{% if field.errors %} error{% endif %}">
-        {{field.label_tag}}
-        {% if field.errors %}
-          {% for error in field.errors %}
-            <span class="help-inline">{{error}}</span>
-          {% endfor %}
-        {% endif %}
-        <span class="help-block">{{field.help_text}}</span>
-        <div class="input">
-          {{field}}
-        </div>
-      </div>
-    {% endfor %}
-    {% block submit %}
-      <input type="submit" value="{%trans "Update Instance" %}" />
-    {% endblock %}
-  </fieldset>
-</form>
-
diff --git a/horizon/horizon/dashboards/nova/templates/nova/instances/_list.html b/horizon/horizon/dashboards/nova/templates/nova/instances/_list.html
index 5bf1763569..e7b7f57c0f 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/instances/_list.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/instances/_list.html
@@ -61,12 +61,12 @@
           <td>{{instance.status|lower|capfirst}}</td>
           <td id="actions">
             <ul>
-              <li class="form">{% include "horizon/common/instances/_terminate.html" with form=terminate_form %}</li>
-              <li class="form">{% include "horizon/common/instances/_reboot.html" with form=reboot_form %}</li>
               <li><a class="btn small" target="_blank" href="{% url horizon:nova:instances:console instance.id %}">{% trans "Log"%}</a></li>
               <li><a class="btn small" target="_blank" href="{% url horizon:nova:instances:vnc instance.id %}">{% trans "VNC Console"%}</a></li>
               <li><a class="btn small" href="{% url horizon:nova:instances:update instance.id %}">{% trans "Edit"%}</a></li>
               <li><a class="btn small" href="{% url horizon:nova:snapshots:create instance.id %}">{% trans "Snapshot"%}</a></li>
+              <li class="form">{% include "horizon/common/instances/_reboot.html" with form=reboot_form %}</li>
+              <li class="form">{% include "horizon/common/instances/_terminate.html" with form=terminate_form %}</li>
             </ul>
         </td>
       </tr>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/instances/_snapshot.html b/horizon/horizon/dashboards/nova/templates/nova/instances/_snapshot.html
index 740df9fbd3..f1243709a9 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/instances/_snapshot.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/instances/_snapshot.html
@@ -1,9 +1,9 @@
 {% extends 'nova/instances/_form.html' %}
 {%load i18n%}
 
-{% block form_url %}{% url horizon:nova:snapshots:create instance.id %}{% endblock %}
+{% block form_action %}{% url horizon:nova:snapshots:create instance.id %}{% endblock %}
 
-{% block submit %}
+{% block modal-footer %}
 <div class="modal-footer">
   <input class="btn primary pull-right" type="submit" value="{%trans "Create Snapshot"%}" />
   <a href="#" class="btn secondary cancel close">Cancel</a>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/instances/_update.html b/horizon/horizon/dashboards/nova/templates/nova/instances/_update.html
index 8974117b7e..9c1eec2c16 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/instances/_update.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/instances/_update.html
@@ -1,11 +1,24 @@
-{% extends 'nova/instances/_form.html' %}
+{% extends "horizon/common/_modal_form.html" %}
 {%load i18n%}
 
-{% block form_url %}{% url horizon:nova:instances:update instance.id %}{% endblock %}
+{% block form_id %}update_instance_form{% endblock %}
+{% block form_action %}{% url horizon:nova:instances:update instance.id %}{% endblock %}
 
-{% block submit %}
-<div class="modal-footer">
-  <input class="btn primary pull-right" type="submit" value="{%trans "Update Instance"%}" />
-  <a href="#" class="btn secondary cancel close">Cancel</a>
+{% block modal-header %}Update Instance{% endblock %}
+
+{% block modal-body %}
+<div class="left">
+    <fieldset>
+    {% include "horizon/common/_form_fields.html" %}
+    </fieldset>
+</div>
+<div class="right">
+    <h3>{% trans "Description:"%}</h3>
+    <p>{% trans "Update the name of your instance"%}</p>
 </div>
 {% endblock %}
+
+{% block modal-footer %}
+  <input class="btn primary pull-right" type="submit" value="{%trans "Update Instance"%}" />
+  <a href="{% url horizon:nova:instances:index %}" class="btn secondary cancel close">Cancel</a>
+{% endblock %}
diff --git a/horizon/horizon/dashboards/nova/templates/nova/instances/update.html b/horizon/horizon/dashboards/nova/templates/nova/instances/update.html
index 32649ea136..7ef87a9be5 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/instances/update.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/instances/update.html
@@ -13,20 +13,7 @@
 {% endblock page_header %}
 
 {% block dash_main %}
-  <div id="update_instance_modal" class="modal static_page">
-    <div class="modal-header">
-      <h3>Update Instance</h3>
-    </div>
-    <div class="modal-body">
-      <div class="left">
-        {% include 'nova/instances/_update.html' with form=form %}
-      </div>
-      <div class="right">
-        <h3>{% trans "Description:"%}</h3>
-        <p>{% trans "Update the name and description of your instance"%}</p>
-      </div>
-    </div>
-  </div>
+  {% include 'nova/instances/_update.html' with form=form %}
 {% endblock %}
 
 {% block footer_js %}
diff --git a/horizon/horizon/dashboards/nova/templates/nova/keypairs/_create.html b/horizon/horizon/dashboards/nova/templates/nova/keypairs/_create.html
index b5408e2ff2..b66d04116b 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/keypairs/_create.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/keypairs/_create.html
@@ -1,9 +1,9 @@
 {% extends 'nova/keypairs/_form.html' %}
 {%load i18n%}
 
-{% block form_url %}{% url horizon:nova:keypairs:create %}{% endblock %}
+{% block form_action %}{% url horizon:nova:keypairs:create %}{% endblock %}
 
-{% block submit %}
+{% block modal-footer %}
 <div class="modal-footer">
   <input class="btn primary pull-right" type="submit" value="{%trans "Create Keypair"%}" />
   <a href="#" class="btn secondary cancel close">Cancel</a>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/keypairs/_form.html b/horizon/horizon/dashboards/nova/templates/nova/keypairs/_form.html
index 4195282a6d..ab6bf353ab 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/keypairs/_form.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/keypairs/_form.html
@@ -1,5 +1,5 @@
 {%load i18n%}
-<form id="import_keypair_form" action="{% block form_url %}{% endblock %}" method="post">
+<form id="import_keypair_form" action="{% block form_action %}{% endblock %}" method="post">
   {% csrf_token %}
   <fieldset>
     {% for hidden in form.hidden_fields %}
@@ -19,7 +19,7 @@
         </div>
       </div>
     {% endfor %}
-    {% block submit %}
+    {% block modal-footer %}
       <input type="submit" value="{%trans "Add Keypair" %}" />
     {% endblock %}
   </fieldset>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/keypairs/_import.html b/horizon/horizon/dashboards/nova/templates/nova/keypairs/_import.html
index 541df59434..9bf6e8749b 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/keypairs/_import.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/keypairs/_import.html
@@ -1,9 +1,9 @@
 {% extends 'nova/keypairs/_form.html' %}
 {%load i18n%}
 
-{% block form_url %}{% url horizon:nova:keypairs:import %}{% endblock %}
+{% block form_action %}{% url horizon:nova:keypairs:import %}{% endblock %}
 
-{% block submit %}
+{% block modal-footer %}
 <div class="modal-footer">
   <input class="btn primary pull-right" type="submit" value="{%trans "Import Keypair"%}" />
   <a href="#" class="btn secondary cancel close">Cancel</a>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/networks/_create.html b/horizon/horizon/dashboards/nova/templates/nova/networks/_create.html
index e653f548f9..fc991b93ec 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/networks/_create.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/networks/_create.html
@@ -1,7 +1,7 @@
 {% extends 'nova/networks/_form.html' %}
 {%load i18n%}
 
-{% block submit %}
+{% block modal-footer %}
   <div class="modal-footer">
     <input class="btn primary pull-right" type="submit" value="{%trans "Create"%}" />
     <a href="#" class="btn secondary cancel close">Cancel</a>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/networks/_delete.html b/horizon/horizon/dashboards/nova/templates/nova/networks/_delete.html
index 1d1dfd02d0..d1000af36d 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/networks/_delete.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/networks/_delete.html
@@ -1,7 +1,7 @@
 {% extends 'nova/networks/_form.html' %}
 {%load i18n%}
 
-{% block submit %}
+{% block modal-footer %}
   <div class="modal-footer">
     <input class="btn primary pull-right" type="submit" value="{%trans "Delete"%}" />
     <a href="#" class="btn secondary cancel close">Cancel</a>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/networks/_delete_port.html b/horizon/horizon/dashboards/nova/templates/nova/networks/_delete_port.html
index 105e58a7c2..535af7cb3d 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/networks/_delete_port.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/networks/_delete_port.html
@@ -1,7 +1,7 @@
 {% extends 'nova/networks/_form.html' %}
 {% load i18n%}
 
-{% block submit %}
+{% block modal-footer %}
   <div class="modal-footer">
     <input name="network" type="hidden" value="{{network.id}}" />
     <input name="port" type="hidden" value="{{port.id}}" />
diff --git a/horizon/horizon/dashboards/nova/templates/nova/networks/_detach_port.html b/horizon/horizon/dashboards/nova/templates/nova/networks/_detach_port.html
index 7a3724e462..cdf3c2f0ce 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/networks/_detach_port.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/networks/_detach_port.html
@@ -12,7 +12,7 @@
 {% extends 'nova/networks/_form.html' %}
 {%load i18n%}
 
-{% block submit %}
+{% block modal-footer %}
   <div class="modal-footer">
     <input name="network" type="hidden" value="{{network.id}}" />
     <input name="port" type="hidden" value="{{port.id}}" />
diff --git a/horizon/horizon/dashboards/nova/templates/nova/networks/_form.html b/horizon/horizon/dashboards/nova/templates/nova/networks/_form.html
index 1c86bdc2f5..e3be60084b 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/networks/_form.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/networks/_form.html
@@ -1,5 +1,5 @@
 {%load i18n%}
-<form action="{% block form_url %}{% endblock %}" method="post">
+<form action="{% block form_action %}{% endblock %}" method="post">
   {% csrf_token %}
   <fieldset>
     {% for hidden in form.hidden_fields %}
@@ -19,7 +19,7 @@
         </div>
       </div>
     {% endfor %}
-    {% block submit %}
+    {% block modal-footer %}
       <input type="submit" value="{%trans "Create Network" %}" />
     {% endblock %}
   </fieldset>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/objects/_copy.html b/horizon/horizon/dashboards/nova/templates/nova/objects/_copy.html
index 80230ee47b..5c729f8e93 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/objects/_copy.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/objects/_copy.html
@@ -1,6 +1,6 @@
 {%load i18n%}
 
-<form id="import_keypair_form" action="{% block form_url %}{% endblock %}" method="post">
+<form id="copy_object_form" action="{% block form_action %}{% endblock %}" method="post">
   {% csrf_token %}
   <fieldset>
     {% for hidden in form.hidden_fields %}
@@ -20,7 +20,7 @@
         </div>
       </div>
     {% endfor %}
-    {% block submit %}
+    {% block modal-footer %}
       <input type="submit" value="{%trans "Add Keypair" %}" />
     {% endblock %}
   </fieldset>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/objects/_delete.html b/horizon/horizon/dashboards/nova/templates/nova/objects/_delete.html
index 4a0af7bfc2..727359538d 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/objects/_delete.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/objects/_delete.html
@@ -5,5 +5,5 @@
     {{hidden}}
   {% endfor %}
   <input name="object_name" type="hidden" value="{{ object.name }}" />
-  <input id="delete_{{ object.name }}" class="delete" title="Object: {{ object.name }}" type="submit" value="{% trans "Delete"%}" />
+  <input id="delete_{{ object.name }}" class="btn small danger delete" title="Object: {{ object.name }}" type="submit" value="{% trans "Delete"%}" />
 </form>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/objects/_form.html b/horizon/horizon/dashboards/nova/templates/nova/objects/_form.html
index ac2212aba2..4a3c58b6ec 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/objects/_form.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/objects/_form.html
@@ -1,5 +1,5 @@
 {%load i18n%}
-<form id="object_form" action="{% block form_url %}{% endblock %}" method="post">
+<form id="object_form" action="{% block form_action %}{% endblock %}" method="post">
   {% csrf_token %}
   <fieldset>
     {% for hidden in form.hidden_fields %}
@@ -19,7 +19,7 @@
         </div>
       </div>
     {% endfor %}
-    {% block submit %}
+    {% block modal-footer %}
       <input type="submit" value="{%trans "Upload Object" %}" />
     {% endblock %}
   </fieldset>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/objects/_list.html b/horizon/horizon/dashboards/nova/templates/nova/objects/_list.html
index 26a27af7c6..f36a616276 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/objects/_list.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/objects/_list.html
@@ -13,9 +13,9 @@
       <td>{{ object.name }}</td>
       <td id="actions">
         <ul>
-          <li><a href="{% url horizon:nova:containers:object_copy container_name object.name %}">{% trans "Copy"%}</a></li>
+          <li><a class="btn small" href="{% url horizon:nova:containers:object_copy container_name object.name %}">{% trans "Copy"%}</a></li>
+          <li><a class="btn small" href="{% url horizon:nova:containers:object_download container_name object.name %}">{% trans "Download"%}</a>
           <li class="form">{% include "nova/objects/_delete.html" with form=delete_form %}</li>
-          <li><a href="{% url horizon:nova:containers:object_download container_name object.name %}">{% trans "Download"%}</a>
         </ul>
       </td>
     </tr>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/objects/_upload.html b/horizon/horizon/dashboards/nova/templates/nova/objects/_upload.html
index 3c2067e4be..b6cd9f4165 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/objects/_upload.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/objects/_upload.html
@@ -1,9 +1,9 @@
 {% extends 'nova/keypairs/_form.html' %}
 {%load i18n%}
 
-{% block form_url %}{% url horizon:nova:containers:object_upload container_name %}{% endblock %}
+{% block form_action %}{% url horizon:nova:containers:object_upload container_name %}{% endblock %}
 
-{% block submit %}
+{% block modal-footer %}
 <div class="modal-footer">
   <input class="btn primary pull-right" type="submit" value="{%trans "Upload Object"%}" />
   <a href="#" class="btn secondary cancel close">Cancel</a>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/ports/_create.html b/horizon/horizon/dashboards/nova/templates/nova/ports/_create.html
index 56e383ee73..2424b91571 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/ports/_create.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/ports/_create.html
@@ -1,5 +1,5 @@
 {%load i18n%}
-<form action="{% block form_url %}{% endblock %}" method="post">
+<form action="{% block form_action %}{% endblock %}" method="post">
   {% csrf_token %}
   <fieldset>
     {% for hidden in form.hidden_fields %}
@@ -19,7 +19,7 @@
         </div>
       </div>
     {% endfor %}
-    {% block submit %}
+    {% block modal-footer %}
       <input type="submit" value="{%trans "Update Instance" %}" />
     {% endblock %}
   </fieldset>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/security_groups/_create.html b/horizon/horizon/dashboards/nova/templates/nova/security_groups/_create.html
index d8ca891dae..5cad9387ad 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/security_groups/_create.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/security_groups/_create.html
@@ -1,9 +1,9 @@
 {% extends 'nova/security_groups/_form.html' %}
 {%load i18n%}
 
-{% block form_url %}{% url horizon:nova:security_groups:create %}{% endblock %}
+{% block form_action %}{% url horizon:nova:security_groups:create %}{% endblock %}
 
-{% block submit %}
+{% block modal-footer %}
 <div class="modal-footer">
   <input class="btn primary pull-right" type="submit" value="{%trans "Create Security Group"%}" />
   <a href="#" class="btn secondary cancel close">Cancel</a>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/security_groups/_form.html b/horizon/horizon/dashboards/nova/templates/nova/security_groups/_form.html
index 28c5b343bd..4e5acb7cc6 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/security_groups/_form.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/security_groups/_form.html
@@ -1,5 +1,5 @@
 {%load i18n%}
-<form id="security_group_form" action="{% block form_url %}{% endblock %}" method="post">
+<form id="security_group_form" action="{% block form_action %}{% endblock %}" method="post">
   {% csrf_token %}
   <fieldset>
     {% for hidden in form.hidden_fields %}
@@ -19,7 +19,7 @@
         </div>
       </div>
     {% endfor %}
-    {% block submit %}
+    {% block modal-footer %}
       <input type="submit" value="{%trans "Create Security Group" %}" />
     {% endblock %}
   </fieldset>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/settings.html b/horizon/horizon/dashboards/nova/templates/nova/settings.html
index 44012585b7..8f91489cbc 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/settings.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/settings.html
@@ -42,7 +42,7 @@
                     </select>
                   </div>
                 </div>
-                {% block submit %}
+                {% block modal-footer %}
                 <div class="modal-footer">
                   <input class="btn primary" type="submit" value="{% trans "Select Language" %}" />
                   <a href="#" class="btn secondary cancel close">Cancel</a>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/snapshots/_create.html b/horizon/horizon/dashboards/nova/templates/nova/snapshots/_create.html
index 194b6b72b6..6bb409a687 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/snapshots/_create.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/snapshots/_create.html
@@ -1,9 +1,9 @@
 {% extends 'nova/snapshots/_form.html' %}
 {%load i18n%}
 
-{% block form_url %}{% url horizon:nova:snapshots:create instance.id %}{% endblock %}
+{% block form_action %}{% url horizon:nova:snapshots:create instance.id %}{% endblock %}
 
-{% block submit %}
+{% block modal-footer %}
 <div class="modal-footer">
   <input class="btn primary pull-right" type="submit" value="{%trans "Create Snapshot"%}" />
   <a href="#" class="btn secondary cancel close">Cancel</a>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/snapshots/_form.html b/horizon/horizon/dashboards/nova/templates/nova/snapshots/_form.html
index 3f03227998..be36a3ea14 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/snapshots/_form.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/snapshots/_form.html
@@ -1,5 +1,5 @@
 {%load i18n%}
-<form action="{% block form_url %}{% endblock %}" method="post">
+<form action="{% block form_action %}{% endblock %}" method="post">
   {% csrf_token %}
   <fieldset>
     {% for hidden in form.hidden_fields %}
@@ -19,7 +19,7 @@
         </div>
       </div>
     {% endfor %}
-    {% block submit %}
+    {% block modal-footer %}
       <input type="submit" value="{%trans "Create Snapshot" %}" />
     {% endblock %}
   </fieldset>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/volumes/_create.html b/horizon/horizon/dashboards/nova/templates/nova/volumes/_create.html
index 345723d890..8d8b789a98 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/volumes/_create.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/volumes/_create.html
@@ -1,9 +1,9 @@
 {% extends 'nova/volumes/_form.html' %}
 {%load i18n%}
 
-{% block form_url %}{% url horizon:nova:volumes:create %}{% endblock %}
+{% block form_action %}{% url horizon:nova:volumes:create %}{% endblock %}
 
-{% block submit %}
+{% block modal-footer %}
 <div class="modal-footer">
   <input class="btn primary pull-right" type="submit" value="{%trans "Create Volume"%}" />
   <a href="#" class="btn secondary cancel close">Cancel</a>
diff --git a/horizon/horizon/dashboards/nova/templates/nova/volumes/_form.html b/horizon/horizon/dashboards/nova/templates/nova/volumes/_form.html
index 8f2ac35ff3..396bd4e0ab 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/volumes/_form.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/volumes/_form.html
@@ -1,5 +1,5 @@
 {%load i18n%}
-<form id="volume_form" action="{% block form_url %}{% endblock %}" method="post">
+<form id="volume_form" action="{% block form_action %}{% endblock %}" method="post">
   {% csrf_token %}
   <fieldset>
     {% for hidden in form.hidden_fields %}
@@ -19,7 +19,7 @@
         </div>
       </div>
     {% endfor %}
-    {% block submit %}
+    {% block modal-footer %}
       <input type="submit" value="{%trans "Create Security Group" %}" />
     {% endblock %}
   </fieldset>
diff --git a/horizon/horizon/dashboards/syspanel/templates/syspanel/flavors/_create.html b/horizon/horizon/dashboards/syspanel/templates/syspanel/flavors/_create.html
index e8a6ee716e..ef453ba085 100644
--- a/horizon/horizon/dashboards/syspanel/templates/syspanel/flavors/_create.html
+++ b/horizon/horizon/dashboards/syspanel/templates/syspanel/flavors/_create.html
@@ -1,9 +1,9 @@
 {% extends 'syspanel/flavors/_form.html' %}
 {%load i18n%}
 
-{% block form_url %}{% url horizon:syspanel:users:create %}{% endblock %}
+{% block form_action %}{% url horizon:syspanel:users:create %}{% endblock %}
 
-{% block submit %}
+{% block modal-footer %}
 <div class="modal-footer">
   <input class="btn primary pull-right" type="submit" value="{%trans "Create Flavor"%}" />
   <a href="#" class="btn secondary cancel close">Cancel</a>
diff --git a/horizon/horizon/dashboards/syspanel/templates/syspanel/flavors/_form.html b/horizon/horizon/dashboards/syspanel/templates/syspanel/flavors/_form.html
index 2f9711eb7f..e45f9a6a09 100644
--- a/horizon/horizon/dashboards/syspanel/templates/syspanel/flavors/_form.html
+++ b/horizon/horizon/dashboards/syspanel/templates/syspanel/flavors/_form.html
@@ -1,5 +1,5 @@
 {%load i18n%}
-<form action="{% block form_url %}{% endblock %}" method="post">
+<form action="{% block form_action %}{% endblock %}" method="post">
   {% csrf_token %}
   <fieldset>
     {% for hidden in form.hidden_fields %}
@@ -19,7 +19,7 @@
         </div>
       </div>
     {% endfor %}
-    {% block submit %}
+    {% block modal-footer %}
       <input type="submit" value="{%trans "Create Flavor" %}" />
     {% endblock %}
   </fieldset>
diff --git a/horizon/horizon/dashboards/syspanel/templates/syspanel/images/_form.html b/horizon/horizon/dashboards/syspanel/templates/syspanel/images/_form.html
index 4811210c87..6657b13634 100644
--- a/horizon/horizon/dashboards/syspanel/templates/syspanel/images/_form.html
+++ b/horizon/horizon/dashboards/syspanel/templates/syspanel/images/_form.html
@@ -1,5 +1,5 @@
 {%load i18n%}
-<form action="{% block form_url %}{% endblock %}" method="post">
+<form action="{% block form_action %}{% endblock %}" method="post">
   {% csrf_token %}
   <fieldset>
     {% for hidden in form.hidden_fields %}
@@ -19,7 +19,7 @@
         </div>
       </div>
     {% endfor %}
-    {% block submit %}
+    {% block modal-footer %}
       <input type="submit" value="{%trans "Update Image" %}" />
     {% endblock %}
   </fieldset>
diff --git a/horizon/horizon/dashboards/syspanel/templates/syspanel/images/_update.html b/horizon/horizon/dashboards/syspanel/templates/syspanel/images/_update.html
index 6e006edfbe..8ae979b7eb 100644
--- a/horizon/horizon/dashboards/syspanel/templates/syspanel/images/_update.html
+++ b/horizon/horizon/dashboards/syspanel/templates/syspanel/images/_update.html
@@ -1,9 +1,9 @@
 {% extends 'syspanel/images/_form.html' %}
 {%load i18n%}
 
-{% block form_url %}{% url horizon:syspanel:images:update image.id %}{% endblock %}
+{% block form_action %}{% url horizon:syspanel:images:update image.id %}{% endblock %}
 
-{% block submit %}
+{% block modal-footer %}
 <div class="modal-footer">
   <input class="btn primary pull-right" type="submit" value="{%trans "Update Image"%}" />
   <a href="#" class="btn secondary cancel close">Cancel</a>
diff --git a/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_create.html b/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_create.html
index 67da3b229a..1477b98c32 100644
--- a/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_create.html
+++ b/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_create.html
@@ -1,9 +1,9 @@
 {% extends 'syspanel/images/_form.html' %}
 {%load i18n%}
 
-{% block form_url %}{% url horizon:syspanel:tenants:create %}{% endblock %}
+{% block form_action %}{% url horizon:syspanel:tenants:create %}{% endblock %}
 
-{% block submit %}
+{% block modal-footer %}
 <div class="modal-footer">
   <input class="btn primary pull-right" type="submit" value="{%trans "Create Tenant"%}" />
   <a href="#" class="btn secondary cancel close">Cancel</a>
diff --git a/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_create_form.html b/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_create_form.html
index 6bdae710e1..1e0caea263 100644
--- a/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_create_form.html
+++ b/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_create_form.html
@@ -1,6 +1,6 @@
 {% extends "syspanel/tenants/_form.html" %}
 {%load i18n%}
 
-{% block submit %}
+{% block modal-footer %}
   <input type="submit" value="{% trans "Create Tenant"%}" class="large-rounded" />
 {% endblock %}
diff --git a/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_form.html b/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_form.html
index 766c19045a..b8db3f658d 100644
--- a/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_form.html
+++ b/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_form.html
@@ -1,5 +1,5 @@
 {%load i18n%}
-<form action="{% block form_url %}{% endblock %}" method="post">
+<form action="{% block form_action %}{% endblock %}" method="post">
   {% csrf_token %}
   <fieldset>
     {% for hidden in form.hidden_fields %}
@@ -19,7 +19,7 @@
         </div>
       </div>
     {% endfor %}
-    {% block submit %}
+    {% block modal-footer %}
       <input type="submit" value="{%trans "Update Tenant" %}" />
     {% endblock %}
   </fieldset>
diff --git a/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_quotas_form.html b/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_quotas_form.html
index a2168618c8..e9e353e244 100644
--- a/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_quotas_form.html
+++ b/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_quotas_form.html
@@ -6,7 +6,7 @@
     {{ field.errors }}
     {{ field }}
   {% endfor %}
-  {% block submit %}
+  {% block modal-footer %}
   {% endblock %}
 </form>
 
diff --git a/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_update.html b/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_update.html
index 6bb77ae8ed..0e7f6d197d 100644
--- a/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_update.html
+++ b/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_update.html
@@ -1,9 +1,9 @@
 {% extends 'syspanel/images/_form.html' %}
 {%load i18n%}
 
-{% block form_url %}{% url horizon:syspanel:tenants:update tenant_id %}{% endblock %}
+{% block form_action %}{% url horizon:syspanel:tenants:update tenant_id %}{% endblock %}
 
-{% block submit %}
+{% block modal-footer %}
 <div class="modal-footer">
   <input class="btn primary pull-right" type="submit" value="{%trans "Update Tenant"%}" />
   <a href="#" class="btn secondary cancel close">Cancel</a>
diff --git a/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_update_form.html b/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_update_form.html
index 5748ec0ff1..70d8cf9df4 100644
--- a/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_update_form.html
+++ b/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_update_form.html
@@ -1,6 +1,6 @@
 {% extends "syspanel/tenants/_form.html" %}
 {%load i18n%}
 
-{% block submit %}
+{% block modal-footer %}
   <input type="submit" value="{% trans "Update Tenant"%}" class="large-rounded" />
 {% endblock %}
diff --git a/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_update_quotas.html b/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_update_quotas.html
index b1a26305bc..b3f54537e6 100644
--- a/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_update_quotas.html
+++ b/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_update_quotas.html
@@ -1,9 +1,9 @@
 {% extends 'syspanel/images/_form.html' %}
 {%load i18n%}
 
-{% block form_url %}{% url horizon:syspanel:tenants:quotas tenant_id %}{% endblock %}
+{% block form_action %}{% url horizon:syspanel:tenants:quotas tenant_id %}{% endblock %}
 
-{% block submit %}
+{% block modal-footer %}
 <div class="modal-footer">
   <input class="btn primary pull-right" type="submit" value="{%trans "Update Quotas"%}" />
   <a href="#" class="btn secondary cancel close">Cancel</a>
diff --git a/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_update_quotas_form.html b/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_update_quotas_form.html
index 5875f6ad32..0dd01e330f 100644
--- a/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_update_quotas_form.html
+++ b/horizon/horizon/dashboards/syspanel/templates/syspanel/tenants/_update_quotas_form.html
@@ -1,6 +1,6 @@
 {% extends "syspanel/tenants/_quotas_form.html" %}
 {%load i18n%}
 
-{% block submit %}
+{% block modal-footer %}
   <input type="submit" value="{% trans "Update Quotas"%}" class="large-rounded" />
 {% endblock %}
diff --git a/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_create.html b/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_create.html
index 8523153018..3ccc2ff368 100644
--- a/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_create.html
+++ b/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_create.html
@@ -1,9 +1,9 @@
 {% extends "syspanel/users/_form.html" %}
 {%load i18n%}
 
-{% block form_url %}{% url horizon:syspanel:users:create %}{% endblock %}
+{% block form_action %}{% url horizon:syspanel:users:create %}{% endblock %}
 
-{% block submit %}
+{% block modal-footer %}
 <div class="modal-footer">
   <input class="btn primary pull-right" type="submit" value="{%trans "Create Tenant"%}" />
   <a href="#" class="btn secondary cancel close">Cancel</a>
diff --git a/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_create_form.html b/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_create_form.html
index c55fd77d5a..fe3c3fce6a 100644
--- a/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_create_form.html
+++ b/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_create_form.html
@@ -1,7 +1,7 @@
 {% extends "syspanel/users/_form.html" %}
 {%load i18n%}
 
-{% block submit %}
+{% block modal-footer %}
   <input type="submit" value="{% trans "Create User"%}" class="large-rounded" />
 {% endblock %}
 
diff --git a/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_form.html b/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_form.html
index 766c19045a..b8db3f658d 100644
--- a/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_form.html
+++ b/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_form.html
@@ -1,5 +1,5 @@
 {%load i18n%}
-<form action="{% block form_url %}{% endblock %}" method="post">
+<form action="{% block form_action %}{% endblock %}" method="post">
   {% csrf_token %}
   <fieldset>
     {% for hidden in form.hidden_fields %}
@@ -19,7 +19,7 @@
         </div>
       </div>
     {% endfor %}
-    {% block submit %}
+    {% block modal-footer %}
       <input type="submit" value="{%trans "Update Tenant" %}" />
     {% endblock %}
   </fieldset>
diff --git a/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_update.html b/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_update.html
index aeceb44b6e..6e72b746ed 100644
--- a/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_update.html
+++ b/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_update.html
@@ -1,9 +1,9 @@
 {% extends "syspanel/users/_form.html" %}
 {%load i18n%}
 
-{% block form_url %}{% url horizon:syspanel:users:create %}{% endblock %}
+{% block form_action %}{% url horizon:syspanel:users:create %}{% endblock %}
 
-{% block submit %}
+{% block modal-footer %}
 <div class="modal-footer">
   <input class="btn primary pull-right" type="submit" value="{%trans "Update User"%}" />
   <a href="#" class="btn secondary cancel close">Cancel</a>
diff --git a/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_update_form.html b/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_update_form.html
index 02b77f752a..fd2d493245 100644
--- a/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_update_form.html
+++ b/horizon/horizon/dashboards/syspanel/templates/syspanel/users/_update_form.html
@@ -1,7 +1,7 @@
 {% extends "syspanel/users/_form.html" %}
 {%load i18n%}
 
-{% block submit %}
+{% block modal-footer %}
   <input type="submit" value="{% trans "Update User"%}" class="large-rounded" />
 {% endblock %}
 
diff --git a/horizon/horizon/templates/horizon/auth/_login.html b/horizon/horizon/templates/horizon/auth/_login.html
index c986f15014..726a761c37 100644
--- a/horizon/horizon/templates/horizon/auth/_login.html
+++ b/horizon/horizon/templates/horizon/auth/_login.html
@@ -1,36 +1,16 @@
+{% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
 
-<div class="modal">
-  <div class="modal-header">
-    <h3>Log In</h3>
-  </div>
-  <div class="modal-body">
-    <form action="{% url horizon:auth_login %}" method="post">
-      {% csrf_token %}
-      <fieldset>
-      {% for hidden in form.hidden_fields %}
-        {{ hidden }}
-      {% endfor %}
-      {% for field in form.visible_fields %}
-          <div class="clearfix{% if field.errors %} error{% endif %}">
-            {{field.label_tag}}
-            {% if field.errors %}
-              {% for error in field.errors %}
-                <span class="help-inline">{{error}}</span>
-              {% endfor %}
-            {% endif %}
-            <span class="help-block">{{field.help_text}}</span>
-            <div class="input">
-              {{field}}
-            </div>
-          </div>
-        {% endfor %}
-      </fieldset>
-    </div>
-    <div class="modal-footer">
-    {% block submit %}
-      <input type="submit" value="{% trans "Login" %}" />
-    {% endblock %}
-    </div>
-  </form>
-</div>
+{% block modal-header %}Log In{% endblock %}
+
+{% block form-action %}{% url horizon:auth_login %}{% endblock %}
+
+{% block modal-body %}
+  <fieldset>
+    {% include "horizon/common/_form_fields.html" %}
+  </fieldset>
+{% endblock %}
+
+{% block modal-footer %}
+  <input type="submit" class="btn primary pull-right" value="{% trans "Login" %}" />
+{% endblock %}
diff --git a/horizon/horizon/templates/horizon/auth/_switch.html b/horizon/horizon/templates/horizon/auth/_switch.html
index 6db914510b..37f02c832b 100644
--- a/horizon/horizon/templates/horizon/auth/_switch.html
+++ b/horizon/horizon/templates/horizon/auth/_switch.html
@@ -19,7 +19,7 @@
       </div>
     </div>
   {% endfor %}
-  {% block submit %}
+  {% block modal-footer %}
     <input class="btn primary" type="submit" value="{%trans "Login"%}" />
   {% endblock %}
   </fieldset>
diff --git a/horizon/horizon/templates/horizon/common/_form_fields.html b/horizon/horizon/templates/horizon/common/_form_fields.html
new file mode 100644
index 0000000000..73af73f8a8
--- /dev/null
+++ b/horizon/horizon/templates/horizon/common/_form_fields.html
@@ -0,0 +1,17 @@
+{% for hidden in form.hidden_fields %}
+  {{ hidden }}
+{% endfor %}
+{% for field in form.visible_fields %}
+  <div class="clearfix{% if field.errors %} error{% endif %}">
+    {{field.label_tag}}
+    {% if field.errors %}
+      {% for error in field.errors %}
+        <span class="help-inline">{{error}}</span>
+      {% endfor %}
+    {% endif %}
+    <span class="help-block">{{field.help_text}}</span>
+    <div class="input">
+      {{field}}
+    </div>
+  </div>
+{% endfor %}
diff --git a/horizon/horizon/templates/horizon/common/_modal_form.html b/horizon/horizon/templates/horizon/common/_modal_form.html
new file mode 100644
index 0000000000..6f2de4ed71
--- /dev/null
+++ b/horizon/horizon/templates/horizon/common/_modal_form.html
@@ -0,0 +1,16 @@
+<div id="{% block modal_id %}{% endblock %}" class="{% block modal_class %}modal{% if hide %} hide {% else %} static_page{% endif %}{% endblock %}">
+  <form id="{% block form_id %}{% endblock %}" class="{% block form_class %}{% endblock %}" action="{% block form_action %}{% endblock %}" method="{% block form-method %}POST{% endblock %}">{% csrf_token %}
+    <div class="modal-header">
+      {% if hide %}<a href="#" class="close">&times;</a>{% endif %}
+      <h3>{% block modal-header %}{% endblock %}</h3>
+    </div>
+    <div class="modal-body clearfix">
+    {% block modal-body %}
+        <fieldset>
+        {% include "horizon/common/_form_fields.html" %}
+        </fieldset>
+    {% endblock %}
+    </div>
+    <div class="modal-footer">{% block modal-footer %}{% endblock %}</div>
+  </form>
+</div>
diff --git a/horizon/horizon/templates/horizon/common/instances/_terminate.html b/horizon/horizon/templates/horizon/common/instances/_terminate.html
index 054c64ea9c..256133b45d 100644
--- a/horizon/horizon/templates/horizon/common/instances/_terminate.html
+++ b/horizon/horizon/templates/horizon/common/instances/_terminate.html
@@ -5,5 +5,5 @@
     {{ hidden }}
   {% endfor %}
   <input name="instance" type="hidden" value="{{ instance.id }}" />
-  <input id="terminate_{{instance.id}}" class="terminate" title="{{ instance.name }}" type="submit" value="{% trans "Terminate" %}" />
+  <input id="terminate_{{instance.id}}" class="btn small danger terminate" title="{{ instance.name }}" type="submit" value="{% trans "Terminate" %}" />
 </form>
diff --git a/horizon/horizon/users.py b/horizon/horizon/users.py
index a3b880c135..d5e444f871 100644
--- a/horizon/horizon/users.py
+++ b/horizon/horizon/users.py
@@ -21,6 +21,13 @@
 Classes and methods related to user handling in Horizon.
 """
 
+import logging
+
+from horizon import exceptions
+
+
+LOG = logging.getLogger(__name__)
+
 
 def get_user_from_request(request):
     """ Checks the current session and returns a :class:`~horizon.users.User`.
@@ -34,11 +41,12 @@ def get_user_from_request(request):
     If the session contains invalid data,
     :exc:`~horizon.exceptions.NotAuthorized` will be raised.
     """
-    if 'user' not in request.session:
+    if 'user_id' not in request.session:
         return User()
     try:
-        return User(token=request.session['token'],
-                    user=request.session['user'],
+        return User(id=request.session['user_id'],
+                    token=request.session['token'],
+                    user=request.session['user_name'],
                     tenant_id=request.session['tenant_id'],
                     tenant_name=request.session['tenant'],
                     service_catalog=request.session['serviceCatalog'],
@@ -46,6 +54,7 @@ def get_user_from_request(request):
     except KeyError:
         # If any of those keys are missing from the session it is
         # overwhelmingly likely that we're dealing with an outdated session.
+        LOG.exception("Error while creating User from session.")
         request.session.clear()
         raise exceptions.NotAuthorized(_("Your session has expired. "
                                          "Please log in again."))
@@ -91,8 +100,9 @@ class User(object):
         Boolean value indicating whether or not this user has admin
         privileges. Internally mapped to :meth:`horizon.users.User.is_admin`.
     """
-    def __init__(self, token=None, user=None, tenant_id=None,
+    def __init__(self, id=None, token=None, user=None, tenant_id=None,
                     service_catalog=None, tenant_name=None, roles=None):
+        self.id = id
         self.token = token
         self.username = user
         self.tenant_id = tenant_id
diff --git a/horizon/horizon/views/auth_forms.py b/horizon/horizon/views/auth_forms.py
index 7664b69402..b4e855c65f 100644
--- a/horizon/horizon/views/auth_forms.py
+++ b/horizon/horizon/views/auth_forms.py
@@ -44,7 +44,8 @@ def _set_session_data(request, token):
     request.session['tenant'] = token.tenant['name']
     request.session['tenant_id'] = token.tenant['id']
     request.session['token'] = token.id
-    request.session['user'] = token.user['name']
+    request.session['user_name'] = token.user['name']
+    request.session['user_id'] = token.user['id']
     request.session['roles'] = token.user['roles']
 
 
diff --git a/openstack-dashboard/dashboard/static/dashboard/css/style.css b/openstack-dashboard/dashboard/static/dashboard/css/style.css
index 374bd5983a..c26a0b9e9b 100644
--- a/openstack-dashboard/dashboard/static/dashboard/css/style.css
+++ b/openstack-dashboard/dashboard/static/dashboard/css/style.css
@@ -63,7 +63,7 @@ html, #splash{
 }
 
 #create_container_form .modal-footer{
-		margin-top: 190px;
+	margin-top: 190px;
 }
 
 .nav li a {
@@ -308,6 +308,10 @@ table form {
 	width: 1px;
 }
 
+.modal > form {
+    margin-bottom: 0;
+}
+
 #actions.single {
 	width: 90px;
 }
diff --git a/openstack-dashboard/dashboard/templates/_login.html b/openstack-dashboard/dashboard/templates/_login.html
index 61e7169424..952648ae7d 100644
--- a/openstack-dashboard/dashboard/templates/_login.html
+++ b/openstack-dashboard/dashboard/templates/_login.html
@@ -1,7 +1,6 @@
 {% extends 'horizon/auth/_login.html' %}
 {% load i18n %}
 
-{% block submit %}
-  <input type="hidden" name="next" value="/" />
+{% block modal-footer %}
   <input id="home_login_btn" class="btn primary pull-right" type="submit" value="{% trans "Sign In"%}">
 {% endblock %}