diff --git a/toopie.html b/toopie.html
index 4e9880a..5c83fc6 100644
--- a/toopie.html
+++ b/toopie.html
@@ -4,74 +4,152 @@
     <title>I2P Router Information</title>
     <link href="home.css" rel="stylesheet" type="text/css">
 </head>
-  <body>
+<body>
     <h1>I2P Router Information</h1>
+
     <ul>
-      <li>
-        <div id="label-router-status">Router Status:</div>
-        <div id="router-status">Replace with Router Status</div>
-      </li>
-      <li>
-        <div id="label-router-uptime">Router Uptime(Ms):</div>
-        <div id="router-uptime">Replace with Router Uptime</div>
-      </li>
-      <li>
-        <div id="label-router-version">Router Version:</div>
-        <div id="router-version">Replace with Router Version</div>
-      </li>
-      <li>
-      <ul>
-      <li>
-        <div id="label-router-bw-outbound-1s">Outbound bw 1s:</div>
-        <div id="router-net-bw-outbound-1s">Replace with Router Bandwidth Outbound 1s</div>
-      </li>
-      <li>
-        <div id="label-router-bw-outbound-15s">Outbound bw 15s:</div>
-        <div id="router-net-bw-outbound-15s">Replace with Router Bandwidth Outbound 15s</div>
-      </li>
-      <li>
-        <div id="label-router-bw-inbound-1s">Inbound bw 1s:</div>
-        <div id="router-net-bw-inbound-1s">Replace with Router Bandwidth Inbound 1s</div>
-      </li>
-      <li>
-        <div id="label-router-bw-inbound-15s">Inbound bw 15s:</div>
-        <div id="router-net-bw-inbound-15s">Replace with Router Bandwidth Outbound 15s</div>
-      </li>
-      </ul>
-      </li>
-      <!--<li>
+        <li>
+            <div id="label-router-status">
+                Router Status:
+            </div>
+
+            <div id="router-status">
+                Replace with Router Status
+            </div>
+        </li>
+
+        <li>
+            <div id="label-router-uptime">
+                Router Uptime(Ms):
+            </div>
+
+            <div id="router-uptime">
+                Replace with Router Uptime
+            </div>
+        </li>
+
+        <li>
+            <div id="label-router-version">
+                Router Version:
+            </div>
+
+            <div id="router-version">
+                Replace with Router Version
+            </div>
+        </li>
+
+        <li>
+            <ul>
+                <li>
+                    <div id="label-router-bw-outbound-1s">
+                        Outbound bw 1s:
+                    </div>
+
+                    <div id="router-net-bw-outbound-1s">
+                        Replace with Router Bandwidth Outbound 1s
+                    </div>
+                </li>
+
+                <li>
+                    <div id="label-router-bw-outbound-15s">
+                        Outbound bw 15s:
+                    </div>
+
+                    <div id="router-net-bw-outbound-15s">
+                        Replace with Router Bandwidth Outbound 15s
+                    </div>
+                </li>
+
+                <li>
+                    <div id="label-router-bw-inbound-1s">
+                        Inbound bw 1s:
+                    </div>
+
+                    <div id="router-net-bw-inbound-1s">
+                        Replace with Router Bandwidth Inbound 1s
+                    </div>
+                </li>
+
+                <li>
+                    <div id="label-router-bw-inbound-15s">
+                        Inbound bw 15s:
+                    </div>
+
+                    <div id="router-net-bw-inbound-15s">
+                        Replace with Router Bandwidth Outbound 15s
+                    </div>
+                </li>
+            </ul>
+        </li>
+        <!--<li>
         <div id="label-router-net-status">Network Status:</div>
         <div id="router-net-status">Replace with Router Network Status</div>
       </li>-->
-      <li>
-      <ul>
-      <li>
-        <div id="label-router-net-tunnels-participating">Participating Tunnels:</div>
-        <div id="router-net-tunnels-participating">Replace with Router Participating Tunnel Count</div>
-      </li>
-      <li>
-        <div id="label-router-activepeers">Active Peers:</div>
-        <div id="router-netdb-activepeers">Replace with Router Active Peers</div>
-      </li>
-      <li>
-        <div id="label-router-netdb-fastpeers">Fast Peers:</div>
-        <div id="router-netdb-fastpeers">Replace with Router Fast Peers</div>
-      </li>
-      <li>
-        <div id="label-router-netdb-highcapacitypeers">High Capacity Peers:</div>
-        <div id="router-netdb-highcapacitypeers">Replace with High Capacity Peers</div>
-      </li>
-      <li>
-        <div id="label-router-netdb-isreseeding">Reseed status:</div>
-        <div id="router-netdb-isreseeding">Replace with Router netDB Reseeding Status</div>
-      </li>
-      <li>
-        <div id="label-router-netdb-knownpeers">Known Peers:</div>
-        <div id="router-netdb-knownpeers">Replace with Router Known Peers</div>
-      </li>
-      </ul>
-      </li>
+
+        <li>
+            <ul>
+                <li>
+                    <div id="label-router-net-tunnels-participating">
+                        Participating Tunnels:
+                    </div>
+
+                    <div id="router-net-tunnels-participating">
+                        Replace with Router Participating Tunnel Count
+                    </div>
+                </li>
+
+                <li>
+                    <div id="label-router-activepeers">
+                        Active Peers:
+                    </div>
+
+                    <div id="router-netdb-activepeers">
+                        Replace with Router Active Peers
+                    </div>
+                </li>
+
+                <li>
+                    <div id="label-router-netdb-fastpeers">
+                        Fast Peers:
+                    </div>
+
+                    <div id="router-netdb-fastpeers">
+                        Replace with Router Fast Peers
+                    </div>
+                </li>
+
+                <li>
+                    <div id="label-router-netdb-highcapacitypeers">
+                        High Capacity Peers:
+                    </div>
+
+                    <div id="router-netdb-highcapacitypeers">
+                        Replace with High Capacity Peers
+                    </div>
+                </li>
+
+                <li>
+                    <div id="label-router-netdb-isreseeding">
+                        Reseed status:
+                    </div>
+
+                    <div id="router-netdb-isreseeding">
+                        Replace with Router netDB Reseeding Status
+                    </div>
+                </li>
+
+                <li>
+                    <div id="label-router-netdb-knownpeers">
+                        Known Peers:
+                    </div>
+
+                    <div id="router-netdb-knownpeers">
+                        Replace with Router Known Peers
+                    </div>
+                </li>
+            </ul>
+        </li>
     </ul>
     <script src="i2pcontrol/i2pcontrol.js"></script>
-  </body>
+</body>
 </html>
