diff --git a/app/views/article_categories/_form.html.haml b/app/views/article_categories/_form.html.haml
index b0244b2f..630ad8af 100644
--- a/app/views/article_categories/_form.html.haml
+++ b/app/views/article_categories/_form.html.haml
@@ -1,4 +1,6 @@
 = simple_form_for @article_category do |f|
   = f.input :name
   = f.input :description
-  = f.submit
\ No newline at end of file
+  .form-actions
+    = f.submit class: 'btn'
+    = link_to 'oder abbrechen', article_categories_path
\ No newline at end of file
diff --git a/app/views/article_categories/index.html.haml b/app/views/article_categories/index.html.haml
index b907b87b..73f13d92 100644
--- a/app/views/article_categories/index.html.haml
+++ b/app/views/article_categories/index.html.haml
@@ -1,19 +1,17 @@
 - title "Artikelkategorien"
 
-.left_column{:style => "width:50em"}
-  .box_title
-    %h2 Artikelkategorien
-  .column_content#categories
-    %table
-      %tr
-        %th Name
-        %th Beschreibung
-        %th
-      - for article_category in ArticleCategory.all
-        %tr{:class => cycle("even","odd", :name => 'category')}[article_category]
-          %td= article_category.name
-          %td= article_category.description
-          %td
-            = link_to icon(:edit), edit_article_category_path(article_category)
-            = link_to icon(:delete), article_category, :method => :delete, :confirm => 'Are you sure?'
-    %p= link_to 'Neue Kategorie anlegen', new_article_category_path
+%p= link_to "Neue Kategorie anlegen", new_article_category_path, class: 'btn btn-primary'
+
+%table.table.table-striped
+  %tr
+    %th Name
+    %th Beschreibung
+    %th
+  - for article_category in ArticleCategory.all
+    %tr{:class => cycle("even","odd", :name => 'category')}[article_category]
+      %td= article_category.name
+      %td= article_category.description
+      %td
+        = link_to "Bearbeiten", edit_article_category_path(article_category), class: 'btn btn-mini'
+        = link_to "Löschen", article_category, :method => :delete, :confirm => 'Are you sure?',
+          class: 'btn btn-mini btn-danger'