diff --git a/app/views/clips/_form.html.erb b/app/views/clips/_form.html.erb
deleted file mode 100644
index c0fa7cb..0000000
--- a/app/views/clips/_form.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<%= form_with model: clip do |form| %>
-  <table border="1">
-    <tr>
-      <td valign="top"><b><%= form.label :title %></b></td>
-      <td valign="top"><%= form.text_field :title %></td>
-    </tr>
-    <tr>
-      <td valign="top"><b><%= form.label :video %></b></td>
-      <td valign="top"><%= form.file_field :video, :accept => 'video/quicktime,video/mp4' %></td>
-    </tr>
-    <tr>
-      <td valign="top"><b><%= form.label :category %></b></td>
-      <td valign="top"><%= form.select :category_id, Category.all.collect{ |t| [ t.name, t.id ] }%></td>
-    </tr>
-    <tr>
-      <td valign="top"><b><%= form.label :tag %></b></td>
-      <td valign="top"><%= collection_select(:clip, :tag_ids, Tag.all, :id, :name, {}, { :multiple => true } )%></td>
-    </tr>
-    <tr>
-      <td colspan="2"><%= form.submit %></td>
-    </tr>
-  </table>
-<% end %>
\ No newline at end of file
diff --git a/app/views/clips/edit.html.erb b/app/views/clips/edit.html.erb
index 2ec8eb0..e8d62a1 100644
--- a/app/views/clips/edit.html.erb
+++ b/app/views/clips/edit.html.erb
@@ -1,4 +1,26 @@
 <h1>Edit clip</h1>
 
-<%= render "form", clip: @clip %>
+<%= form_with model: @clip do |form| %>
+  <table border="1">
+    <tr>
+      <td valign="top"><b><%= form.label :title %></b></td>
+      <td valign="top"><%= form.text_field :title %></td>
+    </tr>
+    <tr>
+      <td valign="top"><b>Replace <%= form.label :video %></b></td>
+      <td valign="top"><%= form.file_field :video, :accept => 'video/quicktime,video/mp4' %></td>
+    </tr>
+    <tr>
+      <td valign="top"><b><%= form.label :category %></b></td>
+      <td valign="top"><%= form.select :category_id, Category.all.collect{ |t| [ t.name, t.id ] }%></td>
+    </tr>
+    <tr>
+      <td valign="top"><b><%= form.label :tag %></b></td>
+      <td valign="top"><%= collection_select(:clip, :tag_ids, Tag.all, :id, :name, {}, { :multiple => true } )%></td>
+    </tr>
+    <tr>
+      <td colspan="2"><%= form.submit %></td>
+    </tr>
+  </table>
+<% end %>
 <%= link_to "Cancel", @clip %>
\ No newline at end of file
diff --git a/app/views/clips/new.html.erb b/app/views/clips/new.html.erb
index 1d5b7b4..2859576 100644
--- a/app/views/clips/new.html.erb
+++ b/app/views/clips/new.html.erb
@@ -1,4 +1,26 @@
 <h1>New Clip</h1>
 
-<%= render "form", clip: @clip %>
+<%= form_with model: @clip do |form| %>
+  <table border="1">
+    <tr>
+      <td valign="top"><b><%= form.label :title %></b></td>
+      <td valign="top"><%= form.text_field :title %></td>
+    </tr>
+    <tr>
+      <td valign="top"><b><%= form.label :video %></b></td>
+      <td valign="top"><%= form.file_field :video, :accept => 'video/quicktime,video/mp4' %></td>
+    </tr>
+    <tr>
+      <td valign="top"><b><%= form.label :category %></b></td>
+      <td valign="top"><%= form.select :category_id, Category.all.collect{ |t| [ t.name, t.id ] }%></td>
+    </tr>
+    <tr>
+      <td valign="top"><b><%= form.label :tag %></b></td>
+      <td valign="top"><%= collection_select(:clip, :tag_ids, Tag.all, :id, :name, {}, { :multiple => true } )%></td>
+    </tr>
+    <tr>
+      <td colspan="2"><%= form.submit %></td>
+    </tr>
+  </table>
+<% end %>
 <%= link_to "Cancel", clips_path %>
\ No newline at end of file
diff --git a/app/views/clips/show.html.erb b/app/views/clips/show.html.erb
index daeb28c..0d28ad3 100644
--- a/app/views/clips/show.html.erb
+++ b/app/views/clips/show.html.erb
@@ -1,12 +1,44 @@
 <% cache @clip do %>
   <h1><%= @clip.title %></h1>
 <% end %>
-<% if @clip.video.attached? %>
-<%= video_tag @clip.video, :controls => true%><br>
-<% end %>
-<b>Category:</b> <%= link_to @clip.category.name, @clip.category %><br>
-<b>Tags:</b> <%= @clip.tags.map(&:name).join(', ') %><br>
-<% if authenticated? %>
-  <%= button_to "Edit", edit_clip_path(@clip), :method => "get" %>
-  <%= button_to "Delete", @clip, method: :delete, data: { turbo_confirm: "Are you sure?" } %>
-<% end %>
\ No newline at end of file
+<table>
+  <tr>
+    <% if @clip.video.attached? %>
+      <td>
+        <%= video_tag @clip.video, :controls => true%>
+      </td>
+    <% end %>
+    <td valign="top">
+      <table border="1">
+        <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>
+        </tr>
+        <tr>
+          <td valign="top"><b>Length:</b></td>
+          <td><%= seconds_to_time(@clip.video.metadata["duration"]) %></td>
+        </tr>
+        <tr>
+          <td valign="top"><b>Last Updated:</b></td>
+          <td><%= @clip.updated_at %></td>
+        </tr>
+        <tr>
+          <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>
+      </table>
+    </td>
+  </tr>
+</table>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b6ce16f..b0d9ddc 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -28,6 +28,7 @@
   </head>
 
   <body>
+    <h1>Misadventure</h1>
     <nav>
       <%= link_to "Home", root_path %>
       <%= button_to "Log out", session_path, method: :delete if authenticated? %>