diff --git a/dist/treebird20.css b/dist/treebird20.css
index 7db3018..d878bee 100644
--- a/dist/treebird20.css
+++ b/dist/treebird20.css
@@ -265,7 +265,6 @@ ul li:first-child a.sidebarbtn
     padding: 6px 2px 0 6px;
     border-bottom: 1px solid #cacaca !important;
     width: 100%;
-    /* border-collapse: collapse !important; */
     border-spacing: 0px;
 }
 
@@ -318,6 +317,7 @@ ul li:first-child a.sidebarbtn
 .status .status-info table.ui-table, .status .status-info table.ui-table td, .status .status-info table.ui-table tr
 {
     border-collapse: collapse !important;
+    border-spacing: 0px;
     padding: 0;
     margin: 0;
 }
@@ -744,3 +744,30 @@ ul.large-list li a
 {
     border-bottom: 1px solid #dadada;
 }
+
+/* Navigation */
+.navigation
+{
+    table-layout: fixed;
+    background-color: #eaeaea;
+    color: #000;
+    width: 100%;
+    border-spacing: 0px;
+    box-shadow: 0px 1px 0px #dadada;
+}
+
+.navigation tr
+{
+    padding: 0;
+}
+
+.navigation td
+{
+    padding: 8px !important;
+}
+
+.navigation tr td:not(:last-child)
+{
+    border-right: 1px solid #dadada;
+}
+
diff --git a/src/timeline.c b/src/timeline.c
index fac32c1..fc68bc8 100644
--- a/src/timeline.c
+++ b/src/timeline.c
@@ -25,6 +25,8 @@
 #include "easprintf.h"
 #include "reply.h"
 
+#include "../static/navigation.chtml"
+
 void tl_public(mastodont_t* api, int local)
 {
     int cleanup = 0;
@@ -60,7 +62,7 @@ void tl_public(mastodont_t* api, int local)
 
     // Create post box
     post_box = construct_post_box(NULL, "", NULL);
-    easprintf(&output, "%s %s", post_box, status_format);
+    easprintf(&output, "%s%s%s", post_box, status_format, data_navigation_html);
 
     struct base_page b = {
         .locale = L10N_EN_US,
@@ -111,7 +113,9 @@ void tl_list(mastodont_t* api, char* list_id)
 
     // Create post box
     post_box = construct_post_box(NULL, "", NULL);
-    easprintf(&output, "%s %s", post_box, status_format);
+    easprintf(&output, "%s%s%s", post_box,
+              status_format,
+              data_navigation_html);
 
     struct base_page b = {
         .locale = L10N_EN_US,
diff --git a/static/navigation.html b/static/navigation.html
index d70a74d..b6adedc 100644
--- a/static/navigation.html
+++ b/static/navigation.html
@@ -1,11 +1,7 @@
-<table class="navigation">
+<table class="navigation ui-table">
   <tr>
-    <td>Up</td>
-  </tr>
-  <tr>
-    <td>Previous</td>
-  </tr>
-  <tr>
-    <td>Next</td>
+    <td class="nav-up btn">Up</td>
+    <td class="nav-prev btn">Previous</td>
+    <td class="nav-next btn">Next</td>
   </tr>
 </table>