diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index 643fc9c..3324564 100755
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -2,6 +2,8 @@ class ForumsController < ApplicationController
   load_and_authorize_resource :category
   load_and_authorize_resource :forum, :through => :category, :shallow => true
   
+  before_filter :check_for_cancel
+
   def create
     if @forum.save
       flash[:notice] = "Forum was successfully created."
@@ -24,4 +26,10 @@ class ForumsController < ApplicationController
       redirect_to forums_url
     end
   end
-end
\ No newline at end of file
+
+  def check_for_cancel
+    if params[:commit] == 'cancel'
+      redirect_to @forum.nil? ? forum_path(@forum) : forums_path
+    end
+  end
+end
diff --git a/app/views/forums/_form.html.erb b/app/views/forums/_form.html.erb
index a3949fa..c5e49e3 100755
--- a/app/views/forums/_form.html.erb
+++ b/app/views/forums/_form.html.erb
@@ -8,51 +8,23 @@
       <% if @forum.errors.any? %>
         <% flash.now[:error] = @forum.errors.full_messages.join(', and ') %>
       <% end %>
-      <div class="fieldset">
-        <span class="label indent smaller">
-          <%= f.label :category_id %><br />
-          <small>(Required)</small>
-        </span>
-        <span class="input indent smaller">
-          <%= f.collection_select :category_id, Category.all, :id, :title %>
-        </span>
-        <div class="clear"></div>
-      </div>
-      <div class="fieldset">
-        <span class="label indent smaller">
-          <%= f.label :title %><br />
-          <small>(Required)</small>
-        </span>
-        <span class="input indent smaller"><%= f.text_field :title, :size => 75 %></span>
-        <div class="clear"></div>
-      </div>
-      <div class="fieldset">
-        <span class="label indent smaller">
-          <%= f.label :description %><br />
-          <small>(Required)</small>
-        </span>
-        <span class="input indent smaller"><%= f.text_area :description, :cols => 60, :rows => 5 %></span>
-        <div class="clear"></div>
-      </div>
-      <div class="fieldset">
-        <span class="label indent smaller">
-          <%= f.label :position %>
-        </span>
-        <span class="input indent smaller"><%= f.text_field :position %></span>
-        <div class="clear"></div>
-      </div>
-      <div class="fieldset">
-        <span class="label indent smaller"></span>
-        <span class="input indent smaller">
-          <%= f.check_box :state %>
-          <%= f.label :state %>
-        </span>
-        <div class="clear"></div>
-      </div>
+      <%= f.label :category_id %>
+      <%= f.collection_select :category_id, Category.all, :id, :title %>
+      <%= f.label :title %>
+      <%= f.text_field :title, :style => "width:98%" %>
+      <%= f.label :description %><br />
+      <%= f.text_area :description, :style => "width:98%", :rows => 5 %>
+      <%= f.label :position %>
+      <%= f.text_field :position %>
+      <br/>
+      <%= f.label :state %>
+      <%= f.check_box :state %>
     </div>
     <div class="module_footer">
       <div class="fieldset">
-        <span class="input"><%= f.submit "submit" %> or <%= link_to "cancel", @forum.nil? ? forum_path(@forum) : forums_path %></span>
+        <span class="input">
+          <%= f.submit "Submit", :class =>"btn btn-primary"%>  
+          <%= button_tag "Cancel", :confirm => 'Are you sure? Any changes will be lost.', :class => 'btn', :type => 'submit', :name => 'commit', :value => 'cancel' %>
         <div class="clear"></div>
       </div>
     </div>