diff --git a/templates/caveindex.html b/templates/caveindex.html
index d912385f2..58b003c7e 100644
--- a/templates/caveindex.html
+++ b/templates/caveindex.html
@@ -32,30 +32,24 @@ See <em><a href="/cavesall">All Caves</a></em> for all the caves in areas 1623,
 
 
 <h3>This year's caves</h3>
-<div style="column-count: 3;">
-<table class="searchable">
+<div style="column-count: 3; -moz-column-count: 3;">
 {% for cave in caves_this_year %}
 	{% include 'cavelist_columns.html' %}
 {% endfor %}
-</table>
 </div>
 
 <h3>Last year's caves</h3>
-<div style="column-count: 3;">
-<table class="searchable">
+<div style="column-count: 3;-moz-column-count: 3">
 {% for cave in caves_last_year %}
 	{% include 'cavelist_columns.html' %}
 {% endfor %}
-</table>
 </div>
 
 <h3>Previous year's caves</h3>
-<div style="column-count: 3;">
-<table class="searchable">
+<div style="column-count: 3;-moz-column-count: 3">
 {% for cave in caves_previous_year %}
 	{% include 'cavelist_columns.html' %}
 {% endfor %}
-</table>
 </div>
 <p>
 See <em><a href="/cavesall">All Caves</a></em> for all the caves in areas 1623, 1626, 1624, 1627 
diff --git a/templates/cavelist_columns.html b/templates/cavelist_columns.html
index d65fdc814..407a5a509 100644
--- a/templates/cavelist_columns.html
+++ b/templates/cavelist_columns.html
@@ -1,6 +1,6 @@
- <tr><td> <a href="/{{ cave.url }}">
+<a href="/{{ cave.url }}">
    {% if cave.unexplored %}
-   <span style="color:red">
+   <span style="color:red" title="The cave is marked as unexplored/undescended">
    {% else %}
    <span>
    {% endif %}
@@ -28,4 +28,4 @@
 
       {% endif %}
    </span>
-  </td></tr>
+<br />