diff --git a/static/main.css b/static/main.css
index 75cb242..a4b3044 100644
--- a/static/main.css
+++ b/static/main.css
@@ -3,10 +3,6 @@ body {
     color: #f2e8d5;
 }
 
-tr {
-    height: 3rem;
-}
-
 td {
     text-align: center;
 }
@@ -20,18 +16,25 @@ a:hover {
     text-decoration: underline; 
 } 
 
-.has-tooltip span {
+.has-tooltip > .tooltip {
     display: none;
     padding: 2px 3px;
     margin-left: 8px;
     width: 230px;
 }
 
-.has-tooltip:hover span {
+.has-tooltip:hover > .tooltip {
     display: inline;
     position: absolute;
     background: #000000;
     border: 1px solid #111111;
     color: #ffffff;
     z-index: 5;
-}
\ No newline at end of file
+}
+
+.status {
+    vertical-align: middle; /* Does not work */
+    white-space: nowrap;
+    display: inline-block;
+    padding: 1rem 0; /* But this works? */
+}
diff --git a/templates/feature.liquid b/templates/feature.liquid
index e526f23..04c3ad1 100644
--- a/templates/feature.liquid
+++ b/templates/feature.liquid
@@ -16,40 +16,32 @@
     <table>
       <tr>
         <td>Name</td>
-        <td>
-          <div style="width: 70vw; position:relative;">
-            {% for year in data["date_offsets_years"] %}
-              <div style="position: absolute; display: inline; top: 0; left: {{ data["date_offsets"][year] }}vw;">
-                {{ year }}
-              </div>
-            {% endfor %}
-          </div>
-        </td>
+        {% for year in data["date_offsets_years"] %}
+          <td>{{ year }}</td>
+        {% endfor %}
         <td>Current state</td>    
       </tr>
       {% for terminal in data["terminals"] %}
         <tr>
           <td><a href="/terminals/{{ terminal }}.html">{{ data["terminal_data"][terminal]["name"] }}</a></td>
-          <td>
-            <div style="width: 71vw; position:relative;">
-            {% for segment in data["segments"][terminal] %}
-              <div class="has-tooltip status-{{ segment["name"] }}" style="display: inline; height: 2rem; text-align: center; width: {{ segment["len"] }}vw; left: {{ segment["pos"] }}vw; position:absolute;">
-                <div style="overflow: hidden;">
-                  {{ data["status_cases"][segment["name"]]["name"] }}
-                </div>
-                <span>
-                  {{ data["status_cases"][segment["name"]]["name"] }}  
-                  <ul>
-                    {% for l in segment["links"] %}
-                      <li><a href="{{ l["link"] }}"> {{ l["name"] }} </a></li>
-                    {% endfor %}
-                  </ul>
-                </span>
+          <td colspan="{{ data["date_offsets_years"] | size }}">
+          <!-- Have to do this to avoid whitespace gaps -->
+          {% for segment in data["segments"][terminal] %}<div class="has-tooltip status status-{{ segment["name"] }}" style="width: {{ segment["len"] }}vw;">
+              <span class="statuslabel">{{ data["status_cases"][segment["name"]]["name"] }}</span>
+              <div class="tooltip"><!-- Tooltip -->
+                {{ data["status_cases"][segment["name"]]["name"] }}  
+                <ul>
+                  {% for l in segment["links"] %}
+                    <li><a href="{{ l["link"] }}"> {{ l["name"] }} </a></li>
+                  {% endfor %}
+                </ul>
               </div>
-            {% endfor %}
-            </div>
+            </div>{% endfor %}
+          </td>
+          <!-- This extra div is evil but is required to get the borders to match -->
+          <td>
+            <div class="status status-{{ data["current_status"][terminal]["status"] }}" style="width: 100%">{{ data["current_status"][terminal]["text"] }}</div>
           </td>
-          <td class="status-{{ data["current_status"][terminal]["status"] }}">{{ data["current_status"][terminal]["text"] }}</td>
         </tr>
       {% endfor %}
     </table>