diff --git a/app/controllers/environment_admin/categories_controller.rb b/app/controllers/environment_admin/categories_controller.rb
index bf6ad00..10aa268 100644
--- a/app/controllers/environment_admin/categories_controller.rb
+++ b/app/controllers/environment_admin/categories_controller.rb
@@ -2,4 +2,41 @@ class CategoriesController < EnvironmentAdminController
   def index
     @categories = environment.top_level_categories
   end
+
+  # posts back
+  def new
+    @category = Category.new(params[:category])
+    @category.environment = environment
+    if params[:parent_id]
+      @category.parent = environment.categories.find(params[:parent_id])
+    end
+    if request.post?
+      begin
+        @category.save!
+        redirect_to :action => 'index'
+      rescue Exception => e
+        render :action => 'new'
+      end
+    end
+  end
+
+  # posts back
+  def edit
+    begin
+      @category = environment.categories.find(params[:id])
+      if request.post?
+        @category.update_attributes!(params[:category])
+        redirect_to :action => 'index'
+      end
+    rescue Exception => e
+      render :action => 'edit'
+    end
+  end
+
+  post_only :remove
+  def remove
+    environment.categories.find(params[:id]).destroy
+    redirect_to :action => 'index'
+  end
+
 end
diff --git a/app/views/categories/_category.rhtml b/app/views/categories/_category.rhtml
index 3c2202d..d56b8d4 100644
--- a/app/views/categories/_category.rhtml
+++ b/app/views/categories/_category.rhtml
@@ -1,12 +1,19 @@
 <li>
-<%= category.name %>
-<div>
-  <%= link_to _('Add subcategory'), :action => 'new', :parent => category %>
-  <%= link_to _('Remove'), { :action => 'remove', :id => category, }, :post => true, :confirm => (category.children.empty? ? (_('Are you sure you want to remove "%s"?') % category.name) : (_('Are you sure you want to remove "%s" and all its subcategories?') % category.name) ) %>
+<div class='treeitem'>
+  <%= category.name %>
+
+  <div>
+    <%= link_to _('Add subcategory'), :action => 'new', :parent_id => category %>
+    <%= link_to _('Edit'), :action => 'edit', :id => category %>
+    <%= link_to _('Remove'), { :action => 'remove', :id => category, }, :post => true, :confirm => (category.children.empty? ? (_('Are you sure you want to remove "%s"?') % category.name) : (_('Are you sure you want to remove "%s" and all its subcategories?') % category.name) ) %>
+  </div>
 </div>
-<% unless category.children.empty? %>
-  <ul>
-    <%= render :partial => 'category', :collection => category.children %>
-  </ul>
-<% end %>
+
+  <% unless category.children.empty? %>
+    <ul class='tree'>
+      <%= render :partial => 'category', :collection => category.children %>
+    </ul>
+  <% end %>
+
 </li>
+
diff --git a/app/views/categories/index.rhtml b/app/views/categories/index.rhtml
index 309e970..dc31d1f 100644
--- a/app/views/categories/index.rhtml
+++ b/app/views/categories/index.rhtml
@@ -1,6 +1,6 @@
 <h1><%= _('Categories') %></h1>
 
-<ul>
+<ul class='tree'>
   <%= render :partial => 'category', :collection => @categories %>
 </ul>
 
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 28cf8ec..9057780 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -73,3 +73,15 @@ text-decoration: none !important ;
   text-decoration: underline !important ;
 }
 
+ul.tree {
+  margin: 2px;
+  padding-left: 20px;
+}
+
+ul.tree li {
+  list-style: none;
+}
+
+ul.tree li div.treeitem:hover {
+  background: #f0f0f0;
+}
--
libgit2 0.21.2