diff --git a/lib/philomena/tags.ex b/lib/philomena/tags.ex
index 846866c3..00385fda 100644
--- a/lib/philomena/tags.ex
+++ b/lib/philomena/tags.ex
@@ -18,7 +18,7 @@ defmodule Philomena.Tags do
 
   """
   def list_tags do
-    Repo.all(Tag)
+    Repo.all(Tag |> order_by(desc: :images_count) |> limit(250))
   end
 
   @doc """
diff --git a/lib/philomena_web/templates/tag/_tag_list.html.slime b/lib/philomena_web/templates/tag/_tag_list.html.slime
index 0798b1c3..42d4ddb4 100644
--- a/lib/philomena_web/templates/tag/_tag_list.html.slime
+++ b/lib/philomena_web/templates/tag/_tag_list.html.slime
@@ -1,2 +1,3 @@
-= for tag <- @tags do
-  = render PhilomenaWeb.TagView, "_tag.html", tag: tag
\ No newline at end of file
+.tag-list
+  = for tag <- @tags do
+    = render PhilomenaWeb.TagView, "_tag.html", tag: tag
\ No newline at end of file
diff --git a/lib/philomena_web/templates/tag/index.html.eex b/lib/philomena_web/templates/tag/index.html.eex
deleted file mode 100644
index 51086582..00000000
--- a/lib/philomena_web/templates/tag/index.html.eex
+++ /dev/null
@@ -1,24 +0,0 @@
-<h1>Listing Tags</h1>
-
-<table>
-  <thead>
-    <tr>
-
-      <th></th>
-    </tr>
-  </thead>
-  <tbody>
-<%= for tag <- @tags do %>
-    <tr>
-
-      <td>
-        <%= link "Show", to: Routes.tag_path(@conn, :show, tag) %>
-        <%= link "Edit", to: Routes.tag_path(@conn, :edit, tag) %>
-        <%= link "Delete", to: Routes.tag_path(@conn, :delete, tag), method: :delete, data: [confirm: "Are you sure?"] %>
-      </td>
-    </tr>
-<% end %>
-  </tbody>
-</table>
-
-<span><%= link "New Tag", to: Routes.tag_path(@conn, :new) %></span>
diff --git a/lib/philomena_web/templates/tag/index.html.slime b/lib/philomena_web/templates/tag/index.html.slime
new file mode 100644
index 00000000..4fb7b874
--- /dev/null
+++ b/lib/philomena_web/templates/tag/index.html.slime
@@ -0,0 +1 @@
+= render PhilomenaWeb.TagView, "_tag_list.html", tags: @tags
\ No newline at end of file