diff --git a/puppetboard/static/coffeescript/lists.coffee b/puppetboard/static/coffeescript/lists.coffee
index 86e89ec..adf347b 100644
--- a/puppetboard/static/coffeescript/lists.coffee
+++ b/puppetboard/static/coffeescript/lists.coffee
@@ -1,11 +1,9 @@
 $ = jQuery
-$ ->
-$('input.filter-list').parent('div').removeClass('hide')
 $("input.filter-list").on "keyup", (e) ->
   rex = new RegExp($(this).val(), "i")
 
   $(".searchable li").hide()
-  $(".searchable li").parent().parent().hide()
+  $(".searchable li").parent().parent('.list_hide_segment').hide()
   $(".searchable li").filter( ->
     rex.test $(this).text()
   ).show()
diff --git a/puppetboard/static/js/lists.js b/puppetboard/static/js/lists.js
index afaee34..206ed5d 100644
--- a/puppetboard/static/js/lists.js
+++ b/puppetboard/static/js/lists.js
@@ -4,15 +4,11 @@
 
   $ = jQuery;
 
-  $(function() {});
-
-  $('input.filter-list').parent('div').removeClass('hide');
-
   $("input.filter-list").on("keyup", function(e) {
     var ev, rex;
     rex = new RegExp($(this).val(), "i");
     $(".searchable li").hide();
-    $(".searchable li").parent().parent().hide();
+    $(".searchable li").parent().parent('.list_hide_segment').hide();
     $(".searchable li").filter(function() {
       return rex.test($(this).text());
     }).show();
diff --git a/puppetboard/templates/facts.html b/puppetboard/templates/facts.html
index 345b293..ce3fe77 100644
--- a/puppetboard/templates/facts.html
+++ b/puppetboard/templates/facts.html
@@ -1,29 +1,29 @@
 {% extends 'layout.html' %}
 {% block content %}
-<div class="ui fluid icon input hide" style="margin-bottom:20px">
+<div class="ui fluid icon input" style="margin-bottom:20px">
   <input autofocus="autofocus" class="filter-list" placeholder="Type here to filter...">
 </div>
 <div class="ui searchable stackable doubling four column grid factlist">
- <div class="column">
- {%- set facts_count = 0 -%}
- {%- set break = facts_len//4 + 1 -%}
- {%- for key,facts_list in facts_dict %}
-   <div class="ui segment">
-     <a class="ui darkblue ribbon label">{{key}}</a>
-     <ul>
-     {%- for fact in facts_list %}
-     <li><a href="{{url_for('fact', env=current_env, fact=fact)}}">{{fact}}</a></li>
-     {%- endfor %}
-     </ul>
-   </div>
-   {%- set facts_count = facts_count + facts_list|length -%}
-   {%- if facts_count >= break -%}
- </div>
- <div class="column">
-   {%- set break = facts_len//4  + 1 + break -%}
-   {%- endif -%}
-   {%- set facts_count = facts_count + 5 -%}
- {% endfor %}
- </div>
+  <div class="column">
+  {%- set facts_count = 0 -%}
+  {%- set break = facts_len//4 + 1 -%}
+  {%- for key,facts_list in facts_dict %}
+    <div class="ui list_hide_segment segment">
+      <a class="ui darkblue ribbon label">{{key}}</a>
+      <ul>
+        {%- for fact in facts_list %}
+        <li><a href="{{url_for('fact', env=current_env, fact=fact)}}">{{fact}}</a></li>
+        {%- endfor %}
+      </ul>
+    </div>
+    {%- set facts_count = facts_count + facts_list|length -%}
+    {%- if facts_count >= break -%}
+    </div>
+    <div class="column">
+    {%- set break = facts_len//4  + 1 + break -%}
+    {%- endif -%}
+    {%- set facts_count = facts_count + 5 -%}
+  {% endfor %}
+  </div>
 </div>
 {% endblock content %}
diff --git a/puppetboard/templates/metrics.html b/puppetboard/templates/metrics.html
index eb0440e..844ad41 100644
--- a/puppetboard/templates/metrics.html
+++ b/puppetboard/templates/metrics.html
@@ -1,19 +1,14 @@
 {% extends 'layout.html' %}
 {% block content %}
 <h1>Metrics</h1>
-<div class="ui fluid icon input hide" style="margin-bottom:20px">
-  <input autofocus="autofocus" class="filter-table" placeholder="Type here to filter...">
+<div class="ui fluid icon input" style="margin-bottom:20px">
+  <input autofocus="autofocus" class="filter-list" placeholder="Type here to filter...">
 </div>
-<table class='ui very compact very basic sortable table'>
-<thead>
-  <tr>Metric</tr>
-</thead>
-<tbody class="searchable">
+<ul class="ui list searchable">
   {% for metric in metrics %}
-  <tr>
-    <td><a href="{{url_for('metric', env=current_env, metric=metric)}}">{{metric}}</a></td>
-  </tr>
+  <li>
+    <a href="{{url_for('metric', env=current_env, metric=metric)}}">{{metric}}</a>
+  </li>
   {% endfor %}
-</tbody>
-</table>
+</ul>
 {% endblock content %}