diff --git a/python/web/src/templates/index.html b/python/web/src/templates/index.html
index f787be89..b8bcedeb 100644
--- a/python/web/src/templates/index.html
+++ b/python/web/src/templates/index.html
@@ -193,143 +193,6 @@
 </section>
 
 <hr/>
-
-<section id="attach-devices">
-<details>
-    <summary class="heading">
-        {{ _("Attach Device") }}
-    </summary>
-    <ul>
-        </li>
-        {% if bridge_configured %}
-        <li>{{ _("The <tt>piscsi_bridge</tt> network bridge is active and ready to be used by an emulated network adapter!") }}</li>
-        {% else %}
-        <li>{{ _("Please configure the <tt>piscsi_bridge</tt> network bridge before attaching an emulated network adapter!") }}</li>
-        {% endif %}
-        <li>{{ _("To browse the modern web, install a vintage web proxy such as <a href=\"%(url)s\" target=\"_blank\">Macproxy</a>.", url="https://github.com/PiSCSI/piscsi/wiki/Vintage-Web-Proxy#macproxy") }}</li>
-        </li>
-        <li>{{ _("Read more about <a href=\"%(url)s\" target=\"_blank\">supported device types</a> on the wiki.", url="https://github.com/PiSCSI/piscsi/wiki/Supported-Device-Types") }}
-        </li>
-    </ul>
-</details>
-<table border="black" cellpadding="3" summary="List of peripheral devices">
-    <tr>
-        <th scope="col">{{ _("Device") }}</th>
-        <th scope="col">{{ _("Key") }}</th>
-        <th scope="col">{{ _("Parameters and Actions") }}</th>
-    </tr>
-    {% for type in device_types.keys() %}
-    <tr>
-        <td>
-            <div>{{ device_types[type]["name"] }}</div>
-        </td>
-        <td>
-            <div>{{ type }}</div>
-        </td>
-        <td>
-            <form action="/scsi/attach" method="post" class="device-attach">
-                <input name="type" type="hidden" value="{{ type }}">
-                {% for key, value in device_types[type]["params"] | dictsort %}
-                <label for="param_{{ type }}_{{ key }}">{{ key }}:</label>
-                {% if value.isnumeric() %}
-                <input name="param_{{ key }}" id="param_{{ type }}_{{ key }}" type="number" value="{{ value }}">
-                {% elif key == "interface" %}
-                <select name="param_{{ key }}" id="param_{{ type }}_{{ key }}">
-                {% for if in netinfo["ifs"] %}
-                    <option value="{{ if }}">
-                        {{ if }}
-                    </option>
-                {% endfor %}
-                </select>
-                {% else %}
-                <input name="param_{{ key }}" id="param_{{ type }}_{{ key }}" type="text" size="{{ value|length }}" placeholder="{{ value }}">
-                {% endif %}
-                {% endfor %}
-                {% if type in DISK_DEVICE_TYPES %}
-                <label for="{{ type }}_drive_name">{{ _("Masquerade as:") }}</label>
-                <select name="drive_name" id="{{ type }}_drive_name">
-                <option value="">
-                {{ _("None") }}
-                </option>
-                {% if type == "SCHD" %}
-                {% for drive in drive_properties["hd_conf"] | sort(attribute='name') %}
-                <option value="{{ drive.name }}">
-                {{ drive.name }}
-                </option>
-                {% endfor %}
-                {% endif %}
-                {% if type == "SCCD" %}
-                {% for drive in drive_properties["cd_conf"] | sort(attribute='name') %}
-                <option value="{{ drive.name }}">
-                {{ drive.name }}
-                </option>
-                {% endfor %}
-                {% endif %}
-                {% if type == "SCRM" %}
-                {% for drive in drive_properties["rm_conf"] | sort(attribute='name') %}
-                <option value="{{ drive.name }}">
-                {{ drive.name }}
-                </option>
-                {% endfor %}
-                {% endif %}
-                {% if type == "SCMO" %}
-                {% for drive in drive_properties["mo_conf"] | sort(attribute='name') %}
-                <option value="{{ drive.name }}">
-                {{ drive.name }}
-                </option>
-                {% endfor %}
-                {% endif %}
-                </select>
-                <label for="{{ type }}_image_file_name">{{ _("Image file:") }}</label>
-                <select name="file_name" id="{{ type }}_image_file_name">
-                {% if type != "SCHD" %}
-                <option value="">
-                {{ _("None") }}
-                </option>
-                {% endif %}
-                {% for f in files|sort(attribute='name') %}
-                {% if type == "SCHD" %}
-                {% if f["name"].lower().endswith(env['hd_suffixes']) %}
-                <option value="{{ f["name"] }}">{{ f["name"].replace(env["image_dir"], '') }}</option>
-                {% endif %}
-                {% elif type == "SCCD" %}
-                {% if f["name"].lower().endswith(env['cd_suffixes']) %}
-                <option value="{{ f["name"] }}">{{ f["name"].replace(env["image_dir"], '') }}</option>
-                {% endif %}
-                {% elif type == "SCRM" %}
-                {% if f["name"].lower().endswith(env['rm_suffixes']) %}
-                <option value="{{ f["name"] }}">{{ f["name"].replace(env["image_dir"], '') }}</option>
-                {% endif %}
-                {% elif type == "SCMO" %}
-                {% if f["name"].lower().endswith(env['mo_suffixes']) %}
-                <option value="{{ f["name"] }}">{{ f["name"].replace(env["image_dir"], '') }}</option>
-                {% endif %}
-                {% else %}
-                <option value="{{ f["name"] }}">{{ f["name"].replace(env["image_dir"], '') }}</option>
-                {% endif %}
-                {% endfor %}
-                </select>
-                {% endif %}
-                <label for="{{ type }}_scsi_id">{{ _("ID") }}</label>
-                <select name="scsi_id" id="{{ type }}_scsi_id">
-                {% for id in scsi_ids["valid_ids"] %}
-                    <option value="{{ id }}"{% if id == scsi_ids["recommended_id"] %} selected{% endif %}>
-                        {{ id }}
-                    </option>
-                {% endfor %}
-                </select>
-                <label for="{{ type }}_unit">{{ _("LUN") }}</label>
-                <input class="lun" name="unit" id="{{ type }}_unit" type="number" value="0" min="0" max="31" step="1" size="3">
-                <input type="submit" value="{{ _("Attach") }}" title="{{ _("Attach") }}">
-            </form>
-        </td>
-    </tr>
-    {% endfor %}
-</table>
-</section>
-
-<hr/>
-
 <section id="files">
 <details>
     <summary class="heading">
@@ -530,6 +393,142 @@
 
 <hr/>
 
+<section id="attach-devices">
+<details>
+    <summary class="heading">
+        {{ _("Attach Device") }}
+    </summary>
+    <ul>
+        </li>
+        {% if bridge_configured %}
+        <li>{{ _("The <tt>piscsi_bridge</tt> network bridge is active and ready to be used by an emulated network adapter!") }}</li>
+        {% else %}
+        <li>{{ _("Please configure the <tt>piscsi_bridge</tt> network bridge before attaching an emulated network adapter!") }}</li>
+        {% endif %}
+        <li>{{ _("To browse the modern web, install a vintage web proxy such as <a href=\"%(url)s\" target=\"_blank\">Macproxy</a>.", url="https://github.com/PiSCSI/piscsi/wiki/Vintage-Web-Proxy#macproxy") }}</li>
+        </li>
+        <li>{{ _("Read more about <a href=\"%(url)s\" target=\"_blank\">supported device types</a> on the wiki.", url="https://github.com/PiSCSI/piscsi/wiki/Supported-Device-Types") }}
+        </li>
+    </ul>
+</details>
+<table border="black" cellpadding="3" summary="List of peripheral devices">
+    <tr>
+        <th scope="col">{{ _("Device") }}</th>
+        <th scope="col">{{ _("Key") }}</th>
+        <th scope="col">{{ _("Parameters and Actions") }}</th>
+    </tr>
+    {% for type in device_types.keys() %}
+    <tr>
+        <td>
+            <div>{{ device_types[type]["name"] }}</div>
+        </td>
+        <td>
+            <div>{{ type }}</div>
+        </td>
+        <td>
+            <form action="/scsi/attach" method="post" class="device-attach">
+                <input name="type" type="hidden" value="{{ type }}">
+                {% for key, value in device_types[type]["params"] | dictsort %}
+                <label for="param_{{ type }}_{{ key }}">{{ key }}:</label>
+                {% if value.isnumeric() %}
+                <input name="param_{{ key }}" id="param_{{ type }}_{{ key }}" type="number" value="{{ value }}">
+                {% elif key == "interface" %}
+                <select name="param_{{ key }}" id="param_{{ type }}_{{ key }}">
+                {% for if in netinfo["ifs"] %}
+                    <option value="{{ if }}">
+                        {{ if }}
+                    </option>
+                {% endfor %}
+                </select>
+                {% else %}
+                <input name="param_{{ key }}" id="param_{{ type }}_{{ key }}" type="text" size="{{ value|length }}" placeholder="{{ value }}">
+                {% endif %}
+                {% endfor %}
+                {% if type in DISK_DEVICE_TYPES %}
+                <label for="{{ type }}_drive_name">{{ _("Masquerade as:") }}</label>
+                <select name="drive_name" id="{{ type }}_drive_name">
+                <option value="">
+                {{ _("None") }}
+                </option>
+                {% if type == "SCHD" %}
+                {% for drive in drive_properties["hd_conf"] | sort(attribute='name') %}
+                <option value="{{ drive.name }}">
+                {{ drive.name }}
+                </option>
+                {% endfor %}
+                {% endif %}
+                {% if type == "SCCD" %}
+                {% for drive in drive_properties["cd_conf"] | sort(attribute='name') %}
+                <option value="{{ drive.name }}">
+                {{ drive.name }}
+                </option>
+                {% endfor %}
+                {% endif %}
+                {% if type == "SCRM" %}
+                {% for drive in drive_properties["rm_conf"] | sort(attribute='name') %}
+                <option value="{{ drive.name }}">
+                {{ drive.name }}
+                </option>
+                {% endfor %}
+                {% endif %}
+                {% if type == "SCMO" %}
+                {% for drive in drive_properties["mo_conf"] | sort(attribute='name') %}
+                <option value="{{ drive.name }}">
+                {{ drive.name }}
+                </option>
+                {% endfor %}
+                {% endif %}
+                </select>
+                <label for="{{ type }}_image_file_name">{{ _("Image file:") }}</label>
+                <select name="file_name" id="{{ type }}_image_file_name">
+                {% if type != "SCHD" %}
+                <option value="">
+                {{ _("None") }}
+                </option>
+                {% endif %}
+                {% for f in files|sort(attribute='name') %}
+                {% if type == "SCHD" %}
+                {% if f["name"].lower().endswith(env['hd_suffixes']) %}
+                <option value="{{ f["name"] }}">{{ f["name"].replace(env["image_dir"], '') }}</option>
+                {% endif %}
+                {% elif type == "SCCD" %}
+                {% if f["name"].lower().endswith(env['cd_suffixes']) %}
+                <option value="{{ f["name"] }}">{{ f["name"].replace(env["image_dir"], '') }}</option>
+                {% endif %}
+                {% elif type == "SCRM" %}
+                {% if f["name"].lower().endswith(env['rm_suffixes']) %}
+                <option value="{{ f["name"] }}">{{ f["name"].replace(env["image_dir"], '') }}</option>
+                {% endif %}
+                {% elif type == "SCMO" %}
+                {% if f["name"].lower().endswith(env['mo_suffixes']) %}
+                <option value="{{ f["name"] }}">{{ f["name"].replace(env["image_dir"], '') }}</option>
+                {% endif %}
+                {% else %}
+                <option value="{{ f["name"] }}">{{ f["name"].replace(env["image_dir"], '') }}</option>
+                {% endif %}
+                {% endfor %}
+                </select>
+                {% endif %}
+                <label for="{{ type }}_scsi_id">{{ _("ID") }}</label>
+                <select name="scsi_id" id="{{ type }}_scsi_id">
+                {% for id in scsi_ids["valid_ids"] %}
+                    <option value="{{ id }}"{% if id == scsi_ids["recommended_id"] %} selected{% endif %}>
+                        {{ id }}
+                    </option>
+                {% endfor %}
+                </select>
+                <label for="{{ type }}_unit">{{ _("LUN") }}</label>
+                <input class="lun" name="unit" id="{{ type }}_unit" type="number" value="0" min="0" max="31" step="1" size="3">
+                <input type="submit" value="{{ _("Attach") }}" title="{{ _("Attach") }}">
+            </form>
+        </td>
+    </tr>
+    {% endfor %}
+</table>
+</section>
+
+<hr/>
+
 <section id="download-url">
 <details>
     <summary class="heading">
@@ -586,6 +585,69 @@
 
 <hr/>
 
+<section id="create-image">
+<details>
+    <summary class="heading">
+        {{ _("Create Empty Disk Image") }}
+    </summary>
+    <ul>
+        <li>{{ _("Please refer to <a href=\"%(url)s\" target=\"_blank\">wiki documentation</a> to learn more about the supported image file types.", url="https://github.com/PiSCSI/piscsi/wiki/Supported-Device-Types#image-types") }}</li>
+        <li>{{ _("It is not recommended to use the Lido hard disk driver with the Macintosh Plus.") }}</li>
+    </ul>
+</details>
+
+<form action="/files/create" method="post">
+    <label for="image_create_file_name">{{ _("File Name:") }}</label>
+    <input name="file_name" id="image_create_file_name" required="" type="text">
+    <label for="image_create_type">{{ _("Type:") }}</label>
+    <select name="type" id="image_create_type">
+        {% for key, value in image_suffixes_to_create.items() %}
+        <option value="{{ key }}">
+        {{ value }} [.{{ key }}]
+        </option>
+        {% endfor %}
+    </select>
+    <label for="image_create_size">{{ _("Size:") }}</label>
+    <input name="size" id="image_create_size" type="number" placeholder="{{ _("MiB") }}" min="1" max="262144" required>
+    <label for="image_create_drive_name">{{ _("Masquerade as:") }}</label>
+    <select name="drive_name" id="image_create_drive_name">
+    <option value="">
+    {{ _("None") }}
+    </option>
+    {% for drive in drive_properties["hd_conf"] | sort(attribute='name') %}
+    <option value="{{ drive.name }}">
+    {{ drive.name }}
+    </option>
+    {% endfor %}
+    </select>
+    <label for="drive_format">{{ _("Format as:") }}</label>
+    <select name="drive_format" id="drive_format">
+    <option value="">
+    {{ _("None") }}
+    </option>
+    <option value="Lido 7.56">
+    HFS + Lido
+    </option>
+    <option value="SpeedTools 3.6">
+    HFS + SpeedTools
+    </option>
+    <option value="FAT16">
+    FAT16
+    </option>
+    <option value="FAT32">
+    FAT32
+    </option>
+    </select>
+    <input type="submit" value="{{ _("Create") }}">
+</form>
+</section>
+
+<section id="create-drive">
+    <a href="/drive/list"><p>{{ _("Create Disk Image With Properties") }}</p></a>
+</section>
+
+<hr/>
+
 <section id="create-iso">
 <details>
     <summary class="heading">
@@ -661,66 +723,4 @@
 
 <hr/>
 
-<section id="create-image">
-<details>
-    <summary class="heading">
-        {{ _("Create Empty Disk Image") }}
-    </summary>
-    <ul>
-        <li>{{ _("Please refer to <a href=\"%(url)s\" target=\"_blank\">wiki documentation</a> to learn more about the supported image file types.", url="https://github.com/PiSCSI/piscsi/wiki/Supported-Device-Types#image-types") }}</li>
-        <li>{{ _("It is not recommended to use the Lido hard disk driver with the Macintosh Plus.") }}</li>
-    </ul>
-</details>
-
-<form action="/files/create" method="post">
-    <label for="image_create_file_name">{{ _("File Name:") }}</label>
-    <input name="file_name" id="image_create_file_name" required="" type="text">
-    <label for="image_create_type">{{ _("Type:") }}</label>
-    <select name="type" id="image_create_type">
-        {% for key, value in image_suffixes_to_create.items() %}
-        <option value="{{ key }}">
-        {{ value }} [.{{ key }}]
-        </option>
-        {% endfor %}
-    </select>
-    <label for="image_create_size">{{ _("Size:") }}</label>
-    <input name="size" id="image_create_size" type="number" placeholder="{{ _("MiB") }}" min="1" max="262144" required>
-    <label for="image_create_drive_name">{{ _("Masquerade as:") }}</label>
-    <select name="drive_name" id="image_create_drive_name">
-    <option value="">
-    {{ _("None") }}
-    </option>
-    {% for drive in drive_properties["hd_conf"] | sort(attribute='name') %}
-    <option value="{{ drive.name }}">
-    {{ drive.name }}
-    </option>
-    {% endfor %}
-    </select>
-    <label for="drive_format">{{ _("Format as:") }}</label>
-    <select name="drive_format" id="drive_format">
-    <option value="">
-    {{ _("None") }}
-    </option>
-    <option value="Lido 7.56">
-    HFS + Lido
-    </option>
-    <option value="SpeedTools 3.6">
-    HFS + SpeedTools
-    </option>
-    <option value="FAT16">
-    FAT16
-    </option>
-    <option value="FAT32">
-    FAT32
-    </option>
-    </select>
-    <input type="submit" value="{{ _("Create") }}">
-</form>
-</section>
-
-<section id="create-drive">
-    <a href="/drive/list"><p>{{ _("Create Disk Image With Properties") }}</p></a>
-</section>
-
-<hr/>
 {% endblock content %}