diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 8189629..821c147 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -48,6 +48,7 @@
 */
 
 @import "pages/news";
+@import "pages/categories";
 @import "pages/contests";
 @import "pages/forums";
 @import "pages/teams";
diff --git a/app/assets/stylesheets/pages/_categories.scss b/app/assets/stylesheets/pages/_categories.scss
new file mode 100644
index 0000000..af41e0d
--- /dev/null
+++ b/app/assets/stylesheets/pages/_categories.scss
@@ -0,0 +1,18 @@
+/*
+  Categories List
+*/
+
+.categories {
+
+  table.categories {
+
+    .actions {
+      width: 20%;
+      text-align: right;
+
+      i {
+        margin-left: em(5);
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 9b4afbc..0fc8be0 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -30,6 +30,8 @@ class CategoriesController < ApplicationController
       @category.update_attribute :sort, @category.id
       flash[:notice] = t(:articles_category)
       redirect_to :categories
+    else
+      render action: :new
     end
   end
 
diff --git a/app/views/categories/edit.html.erb b/app/views/categories/edit.html.erb
index 6cfdf34..b3a31f9 100644
--- a/app/views/categories/edit.html.erb
+++ b/app/views/categories/edit.html.erb
@@ -1,21 +1,14 @@
-<h1>Editing category</h1>
+<h1>Editing Category</h1>
 
-<%= form_for @category do |f| %>
-  <div id="error_explanation">
-    <ul>
-      <% @category.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-    </ul>
-  </div>
+<%= form_for @category, html: { class: 'square' } do |f| %>
+  <%= render 'shared/errors', messages: @category.errors.full_messages %>
 
-  <p>
-    <%= f.label :name %><br />
+  <div class="fields horizontal">
+    <%= f.label :name %>
     <%= f.text_field :name %>
-  </p>
-  <p>
-    <%= f.submit 'Update' %>
-  </p>
+  </div>
+    
+  <div class="controls">
+    <%= f.submit 'Update Category' %>
+  </div>
 <% end %>
-
-<%= link_to 'Back', categories_path %>
\ No newline at end of file
diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb
index 83e4b1f..f580ee4 100644
--- a/app/views/categories/index.html.erb
+++ b/app/views/categories/index.html.erb
@@ -1,29 +1,30 @@
-<h1>Listing categories</h1>
+<div class="categories">
+  <h1 class="title">Listing Categories</h1>
 
-<% Category.new.domains.each do |key, domain| %>
-  <h3 class="center">
-    <%= h domain %>
-  </h3>
+  <% Category.new.domains.each do |key, domain| %>
+    <h3 class="title"><%=h domain %></h3>
 
-  <table class="data">
-    <tr>
-      <th width="70%">Name</th>
-      <th width="30%">Options</th>
-    </tr>
-    <% @categories.each do |category| %>
-      <% if category.domain == key %>
-        <tr>
-          <td><%= h category.name %></td>
-          <td>
-            <%= link_to 'Edit', edit_category_path(category) %>
-            <%= link_to 'Up', :controller => :categories, :action => "up", :id => category.id %>
-            <%= link_to 'Down', :controller => :categories, :action => "down", :id => category.id %>
-            <%= link_to 'Delete', category, :confirm => 'Are you sure?', :method => :delete %>
-          </td>
-        </tr>
+    <table class="categories striped">
+      <tr>
+        <th class="name">Name</th>
+        <th class="actions"></th>
+      </tr>
+      <% @categories.each do |category| %>
+        <% if category.domain == key %>
+          <tr>
+            <td><%=h category.name %></td>
+            <td class="actions">
+              <%= link_to icon('chevron-up'), controller: :categories, action: "up", id: category.id %>
+              <%= link_to icon('chevron-down'), controller: :categories, action: "down", id: category.id %>
+              <%= link_to icon('pencil'), edit_category_path(category) %>
+              <%= link_to icon('times'), category, :confirm => 'Are you sure?', :method => :delete %>
+            </td>
+          </tr>
+        <% end %>
       <% end %>
-    <% end %>
-  </table>
-<% end %>
+    </table>
+  <% end %>
 
-<%= link_to 'New category', new_category_path %>
\ No newline at end of file
+  <%= link_to 'New Category', new_category_path, class: 'button' %>
+</div>
+  
\ No newline at end of file
diff --git a/app/views/categories/new.html.erb b/app/views/categories/new.html.erb
index f37f2c0..0ec56ff 100644
--- a/app/views/categories/new.html.erb
+++ b/app/views/categories/new.html.erb
@@ -1,27 +1,17 @@
 <h1>New Category</h1>
 
-<div class="wide box">
-  <%= form_for(@category) do |f| %>
-    <div id="error_explanation">
-      <ul>
-        <% @category.errors.full_messages.each do |msg| %>
-          <li><%= msg %></li>
-        <% end %>
-      </ul>
-    </div>
+<%= form_for(@category, html: { class: 'square' }) do |f| %>
+  <%= render 'shared/errors', messages: @category.errors.full_messages %>
 
-    <p>
-      <%= f.label :name %><br />
-      <%= f.text_field :name %>
-    </p>
-    <p>
-      <%= f.label :domain %><br />
-      <%= f.select :domain, @category.domains.invert %>
-    </p>
-    <p>
-      <%= f.submit 'Create' %>
-    </p>
-  <% end %>
-</div>
-
-<%= link_to 'Back', categories_path %>
+  <div class="fields horizontal">
+    <%= f.label :name %>
+    <%= f.text_field :name %>
+  </div>
+  <div class="fields horizontal">
+    <%= f.label :domain %>
+    <%= f.select :domain, @category.domains.invert %>
+  </div>
+  <div class="controls">
+    <%= f.submit 'Create Category' %>
+  </div>
+<% end %>