diff --git a/app/views/content/display/attribute_value/_tags.html.erb b/app/views/content/display/attribute_value/_tags.html.erb
index aafb7c4f..81fcf41f 100644
--- a/app/views/content/display/attribute_value/_tags.html.erb
+++ b/app/views/content/display/attribute_value/_tags.html.erb
@@ -11,10 +11,10 @@
           slug: PageTagService.slug_for(tag)
         ) do
       %>
-        <span class="new badge <%= content.class.color %> left" data-badge-caption="<%= tag %>"></span>
+        <span class="new badge <%= raw_model.class.color %> left" data-badge-caption="<%= tag %>"></span>
       <% end %>
     <% else %>
-      <span class="new badge <%= content.class.color %> left" data-badge-caption="<%= tag %>"></span>
+      <span class="new badge <%= raw_model.class.color %> left" data-badge-caption="<%= tag %>"></span>
     <% end %>
   <% end %>
 </div>
\ No newline at end of file
diff --git a/app/views/content/list/_document_table.html.erb b/app/views/content/list/_document_table.html.erb
index 282b53b5..4bf40f97 100644
--- a/app/views/content/list/_document_table.html.erb
+++ b/app/views/content/list/_document_table.html.erb
@@ -181,18 +181,22 @@
                     last updated <%= time_ago_in_words document.updated_at %> ago
                   </li>
                 <% end %>
+                <li>
+                  <%= link_to document_document_revisions_path(document) do %>
+                    <i class="material-icons tiny" style="position: relative; top: 3px;">content_copy</i>
+                    View revision log
+                  <% end %>
+                </li>
+                <li>
+                  <%= link_to plaintext_document_path(document), target: '_blank' do %>
+                    <i class="material-icons tiny" style="position: relative; top: 3px;">title</i>
+                    View in plaintext
+                  <% end %>
+                </li>
               </ul>
-
-              <!--
-              <h5>Actions</h5>
-              <ul>
-                <li><%= link_to 'View Revision log', document_document_revisions_path(document) %><br /><br /></li>
-                <li><%= link_to 'View plaintext', plaintext_document_path(document) %></li>
-              </ul>
-              -->
             </div>
 
-            <div class="col s12 m12 l8" style="padding-right: 1em">
+            <div class="col s12 m12 l8" style="padding-right: 1em;">
               <% if current_user.can_update?(document) %>
                 <div class="content-field">
                   <h5>Document synopsis</h5>
@@ -260,13 +264,13 @@
           <% end %>
         <% end %>
         <% if current_user.can_update?(document) %>
-          <%= link_to edit_polymorphic_path(document), class: 'green white-text btn hoverable', target: document.is_a?(Document) ? '_new' : '_self' do %>
+          <%= link_to edit_polymorphic_path(document), class: 'green white-text btn hoverable', target: document.is_a?(Document) ? '_blank' : '_self' do %>
             <i class="material-icons left"><%= content_type.icon %></i>
             Edit
           <% end %>
         <% end %>
         <% if current_user.can_update?(document) %>
-          <%= link_to analysis_document_path(document), class: 'orange white-text btn left hoverable', target: document.is_a?(Document) ? '_new' : '_self' do %>
+          <%= link_to analysis_document_path(document), class: 'orange white-text btn left hoverable', target: document.is_a?(Document) ? '_blank' : '_self' do %>
             <i class="material-icons left">bar_chart</i>
             Analyze
           <% end %>
diff --git a/app/views/folders/_list.html.erb b/app/views/folders/_list.html.erb
index 0708df0b..aa734567 100644
--- a/app/views/folders/_list.html.erb
+++ b/app/views/folders/_list.html.erb
@@ -1,7 +1,7 @@
 <% if folders.any? %>
   <div class="row">
     <div class="col s12">
-      <div class="btn-group right" style="margin-top: 1.9em; margin-right: 0.2em;">
+      <div class="btn-group right" style="margin-top: 1em;">
         <%= link_to '#new-folder-modal', class: "btn right #{Folder.color} lighten-1 white-text modal-trigger" do %>
           <i class="material-icons left">create_new_folder</i>
           New folder