diff --git a/app/views/clips/_form.html.erb b/app/views/clips/_form.html.erb
index b0aa46b..c0fa7cb 100644
--- a/app/views/clips/_form.html.erb
+++ b/app/views/clips/_form.html.erb
@@ -1,13 +1,23 @@
 <%= form_with model: clip do |form| %>
-  <div>
-    <%= form.label :title %>
-    <%= form.text_field :title %>
-    <%= form.file_field :video, :accept => 'video/quicktime,video/mp4' %>
-    <%= form.select :category_id, Category.all.collect{ |t| [ t.name, t.id ] }%>
-    <%= collection_select(:clip, :tag_ids, Tag.all, :id, :name, {}, { :multiple => true } )%>
-  </div>
-
-  <div>
-    <%= form.submit %>
-  </div>
+  <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/show.html.erb b/app/views/clips/show.html.erb
index 7bd66ef..daeb28c 100644
--- a/app/views/clips/show.html.erb
+++ b/app/views/clips/show.html.erb
@@ -1,13 +1,12 @@
 <% 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 @clip.video.attached? %>
-<%= video_tag @clip.video, :controls => true%>
-<% end %>
-<%= link_to "Back", clips_path%>
 <% if authenticated? %>
-  <%= link_to "Edit", edit_clip_path(@clip) %>
+  <%= 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