diff --git a/console/templates/console-vnc-full.html b/console/templates/console-vnc-full.html
index 61f90d3..f02106a 100755
--- a/console/templates/console-vnc-full.html
+++ b/console/templates/console-vnc-full.html
@@ -94,7 +94,7 @@
 
             <div class="noVNC_scroll">
 
-            <h1 class="noVNC_logo" translate="no"><span>no</span><br />VNC</h1>
+            <h1 class="noVNC_logo" translate="no"><span>no</span><br/>VNC</h1>
 
             <!-- Drag/Pan the viewport -->
             <input type="image" alt="viewport drag" src="{% static "js/novnc/app/images/drag.svg" %}"
@@ -225,7 +225,7 @@
                                 <div class="noVNC_expander">WebSocket</div>
                                 <div><ul>
                                     <li>
-                                        <label><input id="noVNC_setting_encrypt" type="checkbox" /> Encrypt</label>
+                                        <label><input id="noVNC_setting_encrypt" type="checkbox"/>Encrypt</label>
                                     </li>
                                      <li>
                                         <label for="noVNC_setting_host">Host:</label>
@@ -233,17 +233,17 @@
                                     </li>
                                     <li>
                                         <label for="noVNC_setting_port">Port:</label>
-                                        <input id="noVNC_setting_port" value="{{ ws_port }}" type="number" />
+                                        <input id="noVNC_setting_port" value="{{ ws_port }}" type="number"/>
                                     </li>
                                     <li>
                                         <label for="noVNC_setting_path">Path:</label>
-                                        <input id="noVNC_setting_path" type="input" value="websockify" />
+                                        <input id="noVNC_setting_path" type="input" value="websockify"/>
                                     </li>
                                 </ul></div>
                             </li>
                             <li><hr></li>
                             <li>
-                                <label><input id="noVNC_setting_reconnect" type="checkbox" /> Automatic Reconnect</label>
+                                <label><input id="noVNC_setting_reconnect" type="checkbox" />Automatic Reconnect</label>
                                 <input id="noVNC_setting_autoconnect" type="checkbox" value="true" hidden/>
                             </li>
                             <li>
@@ -252,7 +252,7 @@
                             </li>
                             <li><hr></li>
                              <li>
-                                <label><input id="noVNC_setting_show_dot" type="checkbox"> Show Dot when No Cursor</label>
+                                <label><input id="noVNC_setting_show_dot" type="checkbox">Show Dot when No Cursor</label>
                             </li>
                             <li><hr></li>
                             <!-- Logging selection dropdown -->
diff --git a/instances/templates/edit_instance_volume.html b/instances/templates/edit_instance_volume.html
new file mode 100644
index 0000000..8409a44
--- /dev/null
+++ b/instances/templates/edit_instance_volume.html
@@ -0,0 +1,151 @@
+{% load i18n %}
+{% if request.user.is_superuser %}
+    <a href="#addvol" type="button" class="btn btn-success pull-right" data-toggle="modal" title="Add Volume">
+        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+    </a>
+
+    <!-- Modal pool -->
+    <div class="modal fade" id="addvol" tabindex="-1" role="dialog" aria-labelledby="addInstanceVolumeLabel" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                    <h4 class="modal-title">{% trans "Add Instance Volume" %}</h4>
+                </div>
+                <div class="modal-body">
+                    <div class="row">
+                        <ul class="nav nav-tabs">
+                            <li role="presentation" class="active"><a href="#NewDisk" data-toggle="tab">{% trans 'New Disk' %}</a></li>
+                            <li role="presentation"><a href="#ExistingDisk" data-toggle="tab">{% trans 'Existing Disk' %}</a></li>
+                        </ul>
+
+                        <div class="tab-content">
+                            <div class="tab-pane active" id="NewDisk">
+                                <form class="form-horizontal" method="post" role="form">{% csrf_token %}
+
+                                <p style="font-weight:bold;">{% trans "Volume parameters" %}</p>
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">{% trans "Storage" %}</label>
+                                    <div class="col-sm-4">
+                                        <select name="storage" class="form-control image-format">
+                                            {% for storage in storages_host %}
+                                                <option value="{{ storage }}">{{ storage }}</option>
+                                            {% endfor %}
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">{% trans "Name" %}</label>
+                                    <div class="col-sm-4">
+                                        <input type="text" class="form-control" name="name" placeholder="{% trans "Name" %}" required pattern="[a-zA-Z0-9\.\-_]+">
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">{% trans "Format" %}</label>
+                                    <div class="col-sm-4">
+                                        <select name="format" class="form-control image-format">
+                                            {% for format in formats %}
+                                                <option value="{{ format }}" {% if format == default_format %}selected{% endif %}>{% trans format %}</option>
+                                            {% endfor %}
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">{% trans "Size" %}</label>
+                                    <div class="col-sm-4">
+                                        <input type="text" class="form-control" name="size" value="10" maxlength="5" required pattern="[0-9]+">
+                                    </div>
+                                    <label class="col-sm-1 control-label">{% trans "GB" %}</label>
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">{% trans "Bus" %}</label>
+                                    <div class="col-sm-4">
+                                        <select name="bus" class="form-control image-format">
+                                            {% for bus in bus_host %}
+                                                <option value="{{ bus }}" {% if bus == default_bus %}selected{% endif %}>{% trans bus %}</option>
+                                            {% endfor %}
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">{% trans "Cache" %}</label>
+                                    <div class="col-sm-4">
+                                        <select name="cache" class="form-control image-format">
+                                            {% for mode, name in cache_modes %}
+                                                <option value="{{ mode }}" {% if mode == default_cache %}selected{% endif %}>{% trans name %}</option>
+                                            {% endfor %}
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="form-group meta-prealloc">
+                                    <label class="col-sm-3 control-label">{% trans "Metadata" %}</label>
+                                    <div class="col-sm-4">
+                                        <input type="checkbox" name="meta_prealloc" value="true">
+                                    </div>
+                                </div>
+                                <div class="modal-footer">
+                                    <button type="submit" class="btn btn-lg btn-success pull-right" name="add_new_vol">{% trans "Add Volume" %}</button>
+                                </div>
+                            </form>
+                            </div>
+                            <div class="tab-pane" id="ExistingDisk">
+                                <form class="form-horizontal" method="post" role="form">{% csrf_token %}
+                                <div class="modal-body">
+                                    <p style="font-weight:bold;">{% trans "Volume parameters" %}</p>
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label">{% trans "Storage" %}</label>
+                                        <div class="col-sm-4">
+                                            <div class="dropdown">
+                                              <button id="select_storage" class="btn btn-default dropdown-toggle form-control" type="button" data-toggle="dropdown">{% trans 'Select Pool...' %}
+                                              <span class="caret"></span></button>
+                                              <ul class="dropdown-menu">
+                                                  {% for storage in storages_host %}
+                                                      <li><a href="#" onclick="get_volumes({{ compute_id }}, '{{ storage }}')">{{ storage }}</a></li>
+                                                  {% endfor %}
+                                              </ul>
+                                              <input id="selected_storage" name="selected_storage" hidden/>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label" >{% trans "Volume" %}</label>
+                                        <div class="col-sm-4">
+                                            <select id="vols" name="vols" class="form-control" disabled>
+                                                <option value="" selected>{% trans 'None' %}</option>
+                                                <!-- populate with javascript -->
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label">{% trans "Bus" %}</label>
+                                        <div class="col-sm-4">
+                                            <select name="bus" class="form-control image-format">
+                                                {% for bus in bus_host %}
+                                                    <option value="{{ bus }}" {% if bus == default_bus %}selected{% endif %}>{% trans bus %}</option>
+                                                {% endfor %}
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label">{% trans "Cache" %}</label>
+                                        <div class="col-sm-4">
+                                            <select name="cache" class="form-control image-format">
+                                                {% for mode, name in cache_modes %}
+                                                    <option value="{{ mode }}" {% if mode == default_cache %}selected{% endif %}>{% trans name %}</option>
+                                                {% endfor %}
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="modal-footer">
+                                     <button type="submit" class="btn btn-lg btn-success pull-right" name="add_existing_vol">{% trans "Add Volume" %}</button>
+                                </div>
+                            </form>
+                            </div>
+                        </div>
+                    </div> <!-- row -->
+                </div> <!-- /.modal-body -->
+            </div> <!-- /.modal-content -->
+        </div> <!-- /.modal-dialog -->
+    </div> <!-- /.modal -->
+{% endif %}