diff --git a/app/views/cms/view.rhtml b/app/views/cms/view.rhtml
index eabbe15..f3ab968 100644
--- a/app/views/cms/view.rhtml
+++ b/app/views/cms/view.rhtml
@@ -17,17 +17,16 @@
   <%= lightbox_button('new', _('New article'), :action => 'new', :parent_id => parent_id) %>
 <% end %>
 
-<table width='100%'>
+<table class='cms-articles'>
 
-  <%# folders %>
+  <%# header %>
   <tr>
-    <th colspan='2'>
-      <%= _('Folders') %>
-    </th>
+    <th><%= _('Name') %></th>
+    <th><%= _('Type') %></th>
+    <th><%= _('Actions') %></th>
   </tr>
-  <% if @folders.empty? %>
-    <tr><td colspan='2' align='center'><em><%= _('None') %></em></td></tr>
-  <% end %>
+
+  <%# folders %>
   <% for folder in @folders %>
     <tr>
       <td>
@@ -35,6 +34,9 @@
         <%= link_to folder.name, :action => 'view', :id => folder.id %>
       </td>
       <td>
+        <%= folder.class.short_description %>
+      </td>
+      <td>
         <%= link_to _('Properties'), :action => 'edit', :id => folder.id %>
         <%= link_to _('View'), folder.url %>
       </td>
@@ -42,11 +44,13 @@
   <% end %>
 
   <%# non-folder subitems %>
-  <tr>
-    <th colspan='2'>
-      <%= _('Articles') %>
-    </th>
-  </tr>
+  <% unless @folders.empty? %>
+    <tr>
+      <td colspan='3'>
+        &nbsp;
+      </td>
+    </tr>
+  <% end %>
   <% if @subitems.empty? %>
     <tr><td colspan='2' align='center'><em><%= _('None') %></em></td></tr>
   <% end %>
@@ -54,7 +58,10 @@
     <tr>
       <td>
         <%= image_tag(icon_for_article(item)) %>
-        <%= link_to item.name, :id => item.id %>
+        <%= link_to item.name, :action => 'edit', :id => item.id %>
+      </td>
+      <td>
+        <%= item.class.short_description %>
       </td>
       <td>
         <%= link_to _('Edit'), :action => 'edit', :id => item.id %>
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 25e5e0d..5fde6e1 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -217,6 +217,13 @@ th {
   font-weight: bold;
 }
 
+table.cms-articles {
+  width: 100%;
+}
+table.cms-articles th, table.cms-articles td {
+  border: 1px solid #e0e0e0;
+}
+
 /* for fields with auto-completion */
 div.auto-complete {
   background: #729FCF;
--
libgit2 0.21.2