diff --git a/app/views/asciicasts/_actions.html.erb b/app/views/asciicasts/_actions.html.erb
new file mode 100644
index 0000000..5d20a6d
--- /dev/null
+++ b/app/views/asciicasts/_actions.html.erb
@@ -0,0 +1,12 @@
+<% if @asciicast.user == current_user %>
+  <ul class="delimited">
+    <li>
+      <%= link_to 'Edit title & description',
+          edit_asciicast_path(@asciicast) %>
+    </li>
+
+    <li>
+      <%= link_to_delete_asciicast 'Delete', @asciicast %>
+    </li>
+  </ul>
+<% end %>
diff --git a/app/views/asciicasts/_author.html.erb b/app/views/asciicasts/_author.html.erb
index 889e942..e7f3340 100644
--- a/app/views/asciicasts/_author.html.erb
+++ b/app/views/asciicasts/_author.html.erb
@@ -1,9 +1,11 @@
-<%= @asciicast.user.avatar_profile_link %>
+<div class="author">
+  <%= @asciicast.user.avatar_profile_link %>
 
-<h2>
-  <%= @asciicast.author_profile_link %>
-</h2>
+  <h2>
+    <%= @asciicast.author_profile_link %>
+  </h2>
 
-<% if @asciicast.user.asciicasts_count -%>
-  <p><%= @asciicast.user.asciicasts_count %> asciicasts</p>
-<% end -%>
+  <% if @asciicast.user.asciicasts_count -%>
+    <p><%= @asciicast.user.asciicasts_count %> asciicasts</p>
+  <% end -%>
+</div>
diff --git a/app/views/asciicasts/_info.html.erb b/app/views/asciicasts/_info.html.erb
new file mode 100644
index 0000000..fe115fa
--- /dev/null
+++ b/app/views/asciicasts/_info.html.erb
@@ -0,0 +1,19 @@
+<h1>Info</h1>
+
+<ul class="delimited">
+  <li>
+    Recorded: <%= time_ago_tag @asciicast.created_at %>
+  </li>
+  <li>
+    Viewed: <%= @asciicast.views_count %> times
+  </li>
+  <li>
+    OS: <%= @asciicast.os %>
+  </li>
+  <li>
+    SHELL: <%= @asciicast.shell %>
+  </li>
+  <li>
+    TERM: <%= @asciicast.terminal_type %>
+  </li>
+</ul>
diff --git a/app/views/asciicasts/_share.html.erb b/app/views/asciicasts/_share.html.erb
new file mode 100644
index 0000000..1b24740
--- /dev/null
+++ b/app/views/asciicasts/_share.html.erb
@@ -0,0 +1,7 @@
+<h1>Share</h1>
+
+<ul class="delimited">
+  <li>
+    Twitter
+  </li>
+</ul>
diff --git a/app/views/asciicasts/show.html.erb b/app/views/asciicasts/show.html.erb
index 712a7f6..9ef45bb 100644
--- a/app/views/asciicasts/show.html.erb
+++ b/app/views/asciicasts/show.html.erb
@@ -18,50 +18,10 @@
     </div>
 
     <div class="extras">
-      <div class="author">
-        <%= render :partial => 'author' %>
-      </div>
-
-      <% if @asciicast.user == current_user %>
-        <ul class="delimited">
-          <li>
-            <%= link_to 'Edit title & description',
-                edit_asciicast_path(@asciicast) %>
-          </li>
-
-          <li>
-            <%= link_to_delete_asciicast 'Delete', @asciicast %>
-          </li>
-        </ul>
-      <% end %>
-
-      <h1>Info</h1>
-
-      <ul class="delimited">
-        <li>
-          Recorded: <%= time_ago_tag @asciicast.created_at %>
-        </li>
-        <li>
-          Viewed: <%= @asciicast.views_count %> times
-        </li>
-        <li>
-          OS: <%= @asciicast.os %>
-        </li>
-        <li>
-          SHELL: <%= @asciicast.shell %>
-        </li>
-        <li>
-          TERM: <%= @asciicast.terminal_type %>
-        </li>
-      </ul>
-
-      <%# <h1>Share</h1> %>
-
-      <%# <ul class="delimited"> %>
-      <%#   <li> %>
-      <%#     Twitter %>
-      <%#   </li> %>
-      <%# </ul> %>
+      <%= render :partial => 'author' %>
+      <%= render :partial => 'actions' %>
+      <%= render :partial => 'info' %>
+      <%# <%= render :partial => 'share' %1> %>
     </div>
   </div>
 </section>