diff --git a/app/views/admin_panel/_signup_welcome_screen.html.erb b/app/views/admin_panel/_signup_welcome_screen.html.erb
index 6c1cb7b..0855ebb 100644
--- a/app/views/admin_panel/_signup_welcome_screen.html.erb
+++ b/app/views/admin_panel/_signup_welcome_screen.html.erb
@@ -5,7 +5,7 @@
 
 <p>
 <div class='description'>
-  <%= _('If this content is left blank, the following page will be displayed to the user.') %><br/><br/>
+  <%= _('If this content is left blank, the following page will be displayed to the user:') %><br/><br/>
 </div>
 <p>
 <%= render :file => 'home/welcome' %>
diff --git a/app/views/templates/index.html.erb b/app/views/templates/index.html.erb
index 2556c74..f88ff57 100644
--- a/app/views/templates/index.html.erb
+++ b/app/views/templates/index.html.erb
@@ -10,14 +10,27 @@
   <div class='template-kind'>
     <h2><%= title %></h2>
     <%= button :add, _('New...'), {:action => "create_#{kind}_template"}, :title => _("Create a new template for %s") % title.downcase %>
-    <ul>
+    <table class='actions'>
+      <tr>
+        <th><%= _('Template') %></th>
+        <th><%= _('Actions') %></th>
+      </tr>
       <% templates.each do |template| %>
-        <li>
-          <%= image_tag "icons-app/#{kind}-icon.png" %>
-          <%= link_to(template.name, {:controller => 'profile_editor', :profile => template.identifier}, :title => _('Edit template "%s"') % template.name ) %>
-        </li>
+        <tr>
+          <td>
+            <%#= image_tag "icons-app/#{kind}-icon.png" %>
+            <%= link_to(template.name, {:controller => 'profile_editor', :profile => template.identifier}, :title => _('Edit template "%s"') % template.name ) %>
+          </td>
+          <td>
+            <%= button_without_text 'edit', _('Edit settings'), {:controller => 'profile_editor', :profile => template.identifier, :action => 'edit'} %>
+            <%= button_without_text 'welcome-page', _('Edit welcome page'), {:controller => 'profile_editor', :profile => template.identifier, :action => 'welcome_page'} %>
+            <%= button_without_text 'blocks', _('Edit sideblocks'), {:controller => 'profile_design', :profile => template.identifier, :action => 'index'} %>
+            <%= button_without_text 'appearance', _('Edit appearance'), {:controller => 'profile_themes', :profile => template.identifier, :action => 'index'} %>
+            <%= button_without_text 'header-footer', _('Edit header/footer'), {:controller => 'profile_editor', :profile => template.identifier, :action => 'header_footer'} %>
+          </td>
+        </tr>
       <% end %>
-    </ul>
+    </table>
   </div>
 <% end %>
 
diff --git a/public/designs/icons/tango/mod/16x16/mimetypes/appearance.png b/public/designs/icons/tango/mod/16x16/mimetypes/appearance.png
new file mode 100644
index 0000000..864a3de
Binary files /dev/null and b/public/designs/icons/tango/mod/16x16/mimetypes/appearance.png differ
diff --git a/public/designs/icons/tango/mod/16x16/mimetypes/blocks.png b/public/designs/icons/tango/mod/16x16/mimetypes/blocks.png
new file mode 100644
index 0000000..43378d9
Binary files /dev/null and b/public/designs/icons/tango/mod/16x16/mimetypes/blocks.png differ
diff --git a/public/designs/icons/tango/mod/16x16/mimetypes/header-footer.png b/public/designs/icons/tango/mod/16x16/mimetypes/header-footer.png
new file mode 100644
index 0000000..b256492
Binary files /dev/null and b/public/designs/icons/tango/mod/16x16/mimetypes/header-footer.png differ
diff --git a/public/designs/icons/tango/mod/16x16/mimetypes/welcome-page.png b/public/designs/icons/tango/mod/16x16/mimetypes/welcome-page.png
new file mode 100644
index 0000000..7127329
Binary files /dev/null and b/public/designs/icons/tango/mod/16x16/mimetypes/welcome-page.png differ
diff --git a/public/designs/icons/tango/style.css b/public/designs/icons/tango/style.css
index fa15e5f..968f2df 100644
--- a/public/designs/icons/tango/style.css
+++ b/public/designs/icons/tango/style.css
@@ -85,6 +85,10 @@
 .icon-application-vnd-oasis-opendocument-text         { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png) }
 .icon-application-vnd-oasis-opendocument-spreadsheet  { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png) }
 .icon-application-vnd-oasis-opendocument-presentation { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png) }
+.icon-welcome-page   { background-image: url(mod/16x16/mimetypes/welcome-page.png) }
+.icon-blocks         { background-image: url(mod/16x16/mimetypes/blocks.png) }
+.icon-header-footer  { background-image: url(mod/16x16/mimetypes/header-footer.png) }
+.icon-appearance     { background-image: url(Tango/16x16/apps/preferences-desktop-wallpaper.png) }
 
 .icon-media-pause  { background-image: url(Tango/16x16/actions/media-playback-pause.png) }
 .icon-media-play   { background-image: url(Tango/16x16/actions/media-playback-start.png) }
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 4262f68..1cc7e26 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -118,8 +118,30 @@ a img {
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
 }
-/*********************************************************/
 
+table.actions {
+  table-layout: fixed;
+  width: 100%;
+}
+
+table.actions img {
+  width: 16px;
+  height: 16px;
+}
+
+table.actions a.icon {
+  display: block;
+  border: none;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+table.actions td:last-child {
+  text-align: center;
+}
+
+/*********************************************************/
 
 #spinner {
   z-index: 10;
--
libgit2 0.21.2