diff -uNr a/logotron/MANIFEST.TXT b/logotron/MANIFEST.TXT
--- a/logotron/MANIFEST.TXT 655b5de46011cf8638efc7ec9a57cc5ba577d3198567c657edb4f18d86bb88a668187573c97dec98e3bbac48f0ab588d27d2067e3d39b78c7ef0294d6d0ee9fb
+++ b/logotron/MANIFEST.TXT e013827d33619a712fc080bf2f2268feda18f01b26532f7540a85c999554c5469d60bf6bc1d8f093684feb9ea425bdf1cbb2c50385eba119e9c3005c6b4f592d
@@ -23,3 +23,4 @@
 684819  add_bitdash_theme   billymg         "Add dark theme used on http://logs.bitdash.io"
 689331  lose_fleanode       asciilifeform   "Remove all Freenodeisms."
 696566  archived_chans      asciilifeform   "Allow marking a chan as 'archived' to improve DB performance."
+697872  classic_css_tweaks  billymg         "Use list-based chan nav, fix highlight current chan bug from 684804, wrap chans when they overflow."
diff -uNr a/logotron/static/classic.css b/logotron/static/classic.css
--- a/logotron/static/classic.css da0ff8b2f9a180fab9855b9f86cb73ba056090992de825f970172766febdc6cf34986f1c2ed2ebd089208f8bdc4d0efb926819927a4145d1bcc3d5a29c205e6f
+++ b/logotron/static/classic.css 6fc64d21e03859a36e237aee79053841307bfb5e5b4046821015402e787b64b57adfc4e7654cdac138e4f5ebdfa4db2f0983324975f069bd4fc66627168ac600
@@ -2,6 +2,7 @@
     display: table;
     list-style: none;
     margin: 10px auto 18px auto;
+    text-align: center;
     padding: 5px;
     border: 1px solid black;
     border-spacing: 25px 0;
@@ -9,7 +10,7 @@
 
 .chan-link-wrapper {
     display: inline-block;
-    margin: 2px 15px;
+    margin: 6px 12px;
 }
 
 .chan-link {
@@ -27,6 +28,10 @@
     font-style: italic;
 }
 
+.lynx-spacer {
+    display: none;
+}
+
 .chan-filters {
     text-align: center;
     font-style: italic;
diff -uNr a/logotron/templates/chan-nav-table.html b/logotron/templates/chan-nav-table.html
--- a/logotron/templates/chan-nav-table.html 23b3fcde9e6f472619c9dc5ab61a54ba16bcc45184e72e8c6f15b1397f56e771c66d22c3fba478a76298c7a499bf9c9c875fc4f80aa53619b77ce4636fb49ceb
+++ b/logotron/templates/chan-nav-table.html false
@@ -1,21 +0,0 @@
-<table class='chan-list' align="center">
-    <thead>
-        <tr>
-            {% for chan_item in chan_list %}
-            <th>
-                <a class='chan-link {% if chan_item.name == chan %}chan-link-active{% endif %}'
-                   href='{{ chan_item.chan_url }}'><b>{{ chan_item.name }}</b></a>
-            </th>
-            {% endfor %}
-        </tr>
-    </thead>
-    <tbody>
-        <tr>
-            {% for chan_item in chan_list %}
-            <td>
-                <a class='chan-last-active-link' href='{{ chan_item.last_time_url }}'>{{ chan_item.last_time_txt }}</a>
-            </td>
-            {% endfor %}
-        </tr>
-    </tbody>
-</table>
diff -uNr a/logotron/templates/layout.html b/logotron/templates/layout.html
--- a/logotron/templates/layout.html de95f226f3a40f846d46ad729d874e1ea6cb6ebc9411758c44707b9f06d2a97003675447d699438f3a226f3472af0c7e0f7808b04dcfab267df88dd2b9959be3
+++ b/logotron/templates/layout.html ca6de84d3a820de7baed9fa864f4d5338e0de95136ad9b9e4dc1864d989b34f76f3e4000c1567464d0a76cb39740210024382da99ee52a55b2e374158cbc3358
@@ -12,7 +12,7 @@
         <a name="head"></a>
 
         <div class="chan-nav">
-            {% include 'chan-nav-table.html' %}
+            {% include 'chan-nav-list.html' %}
 
             {% if chan != 'all' %}
             <div class="chan-filters">