diff --git a/ogcp/templates/actions/setup.html b/ogcp/templates/actions/setup.html
index 5dd3528..d741725 100644
--- a/ogcp/templates/actions/setup.html
+++ b/ogcp/templates/actions/setup.html
@@ -13,6 +13,7 @@
     <table class="table">
         <thead class="text-center">
             <tr>
+                <th>{{ _('Disk') }}</th>
                 <th>{{ _('Partition Table Type') }}</th>
                 <th>{{ _('Total Disk Size') }} (MB)</th>
             </tr>
@@ -20,6 +21,18 @@
 
         <tbody data-target="partitons-fieldset" id="setupTable" class="text-center">
                     <tr>
+                        <td>
+                            <select form="scopesForm" name="disk" >
+                            {% for disk in disks %}
+                                <option {% if disk == selected_disk %}selected{% endif %}
+                                        value="{{ disk }}">{{ disk }}</option>
+                            {% endfor %}
+                            </select>
+                            <button class="btn btn-dark" form="scopesForm" formmethod="get"
+                                    formaction="{{ url_for('action_setup_show') }}">
+                                {{ _('Change disk') }}
+                            </button>
+                        </td>
                         {{ form.hidden_tag() }}
                         <td>{{ form.disk_type(class_="form-control") }}</td>
                         <td>{{ disk_size }}</td>
@@ -58,17 +71,6 @@
     </table>
 </form>
 
-<select form="scopesForm" name="disk" >
-    {% for disk in disks %}
-        <option {% if disk == selected_disk %}selected{% endif %}
-                value="{{ disk }}">{{ disk }}</option>
-    {% endfor %}
-</select>
-<button class="btn btn-dark" form="scopesForm" formmethod="get"
-        formaction="{{ url_for('action_setup_show') }}">
-    {{ _('Change disk') }}
-</button>
-
 <button class="btn btn-primary" data-target="#partitionsTable" onclick="AddPartition(this)">
     {{ _('Add a new partition') }}
 </button>