diff --git a/app/views/clips/index.html.erb b/app/views/clips/index.html.erb
index 2f08464..94d7053 100644
--- a/app/views/clips/index.html.erb
+++ b/app/views/clips/index.html.erb
@@ -10,6 +10,7 @@
     <th>Category</th>
     <th>Updated at</th>
     <th>Created at</th>
+    <th>Tags</th>
   </tr>
   <% @clips.each do |clip| %>
     <tr>
@@ -31,6 +32,11 @@
       <td>
         <%= clip.created_at %>
       </td>
+      <td>
+        <% clip.tags.each_with_index do |tag, index| %>
+          <%= link_to tag.name, tag_path(tag) %><% if index < clip.tags.size - 1 %>, <% end %>
+        <% end %>
+      </td>
     </tr>
   <% end %>
-</table>
\ No newline at end of file
+</table>
diff --git a/app/views/clips/show.html.erb b/app/views/clips/show.html.erb
index 0d28ad3..b682a03 100644
--- a/app/views/clips/show.html.erb
+++ b/app/views/clips/show.html.erb
@@ -1,7 +1,7 @@
 <% cache @clip do %>
   <h1><%= @clip.title %></h1>
 <% end %>
-<table>
+<table cellpadding="10">
   <tr>
     <% if @clip.video.attached? %>
       <td>
@@ -9,19 +9,31 @@
       </td>
     <% end %>
     <td valign="top">
-      <table border="1">
+      <table class="metatable" cellpadding="5" cellspacing="0">
+        <tr>
+          <td valign="top"><b>Clip ID:</b></td>
+          <td><%= @clip.id %></td>
+        </tr>
         <tr>
           <td valign="top"><b>Category:</b></td>
           <td><%= link_to @clip.category.name, @clip.category %></td>
         </tr>
         <tr>
           <td valign="top"><b>Tags:</b></td>
-          <td><%= @clip.tags.map(&:name).join(', ') %></td>
+          <td>
+            <% @clip.tags.each_with_index do |tag, index| %>
+              <%= link_to tag.name, tag_path(tag) %><% if index < @clip.tags.size - 1 %>, <% end %>
+            <% end %>
+          </td>
         </tr>
         <tr>
           <td valign="top"><b>Length:</b></td>
           <td><%= seconds_to_time(@clip.video.metadata["duration"]) %></td>
         </tr>
+        <tr>
+          <td valign="top"><b>Resolution:</b></td>
+          <td><%= @clip.video.metadata["width"].round %>x<%= @clip.video.metadata["height"].round %> (<%= get_video_aspect(@clip.video) %>)</td>
+        </tr>
         <tr>
           <td valign="top"><b>Last Updated:</b></td>
           <td><%= @clip.updated_at %></td>
@@ -30,14 +42,14 @@
           <td valign="top"><b>Created:</b></td>
           <td><%= @clip.created_at %></td>
         </tr>
-        <tr>
-          <td colspan="2">
-            <% if authenticated? %>
-              <%= button_to "Edit", edit_clip_path(@clip), :method => "get" %>
-              <%= button_to "Delete", @clip, method: :delete, data: { turbo_confirm: "Are you sure?" } %>
-            <% end %>
-          </td>
-        </tr>
+        <% if authenticated? %>
+          <tr>
+            <td colspan="2" class="editcontrols">
+                <%= button_to "Edit", edit_clip_path(@clip), :method => "get" %>
+                <%= button_to "Delete", @clip, method: :delete, data: { turbo_confirm: "Are you sure?" } %>
+            </td>
+          </tr>
+        <% end %>
       </table>
     </td>
   </tr>