diff --git a/app/views/cms/view.rhtml b/app/views/cms/view.rhtml
index 4341151..e6ff878 100644
--- a/app/views/cms/view.rhtml
+++ b/app/views/cms/view.rhtml
@@ -39,6 +39,7 @@
       <td>
         <%= link_to _('Properties'), :action => 'edit', :id => folder.id %>
         <%= link_to _('Public view'), folder.url %>
+        <%= link_to _('Delete'), { :action => 'destroy', :id => folder.id }, :method => :post, :confirm => _('Are you sure that you want to remove this folder? Note that all the items inside it will also be removed!') %>
       </td>
     </tr>
   <% end %>
@@ -51,9 +52,6 @@
       </td>
     </tr>
   <% end %>
-  <% if @subitems.empty? %>
-    <tr><td colspan='2' align='center'><em><%= _('None') %></em></td></tr>
-  <% end %>
   <% for item in @subitems %>
     <tr>
       <td>
@@ -66,9 +64,14 @@
       <td>
         <%= link_to _('Edit'), :action => 'edit', :id => item.id %>
         <%= link_to _('Public view'), item.url %>
+        <%= link_to _('Delete'), { :action => 'destroy', :id => item.id }, :method => :post, :confirm => _('Are you sure that you want to remove this item?') %>
       </td>
     </tr>
   <% end %>
 
+  <% if @subitems.empty? || @folders.empty? %>
+    <tr><td colspan='3' align='center'><em><%= _('None') %></em></td></tr>
+  <% end %>
+
 
 </table>
diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb
index 109a37a..af48392 100644
--- a/test/functional/cms_controller_test.rb
+++ b/test/functional/cms_controller_test.rb
@@ -150,6 +150,8 @@ class CmsControllerTest < Test::Unit::TestCase
     end
   end
 
+  should 'display'
+
   should 'be able to create a RSS feed' do
     login_as(profile.identifier)
     assert_difference RssFeed, :count do
--
libgit2 0.21.2