diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml
--- a/app/views/groups/index.html.haml
+++ b/app/views/groups/index.html.haml
@@ -9,15 +9,13 @@
       %th Description
       %th
       %th
-      %th
 
   %tbody
     - @groups.each do |group|
       %tr
         %td= group.name
         %td= group.description
-        %td= link_to 'Show', group, class: 'btn btn-default'
-        %td= link_to 'Edit', edit_group_path(group), class: 'btn btn-default'
+        %td= link_to 'View', group, class: 'btn btn-default'
         %td= link_to 'Destroy', group, :method => :delete, :data => { :confirm => 'Are you sure?' }, class: 'btn btn-danger'
 
 %br
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -1,5 +1,3 @@
-%p#notice= notice
-
 %p
   %b Name:
   = @group.name
@@ -13,55 +11,62 @@
 = link_to 'Back', groups_path
 
 .row
+  %h1 Group details
+.row
   .col-md-6
-    %h1 Users in this group
-
-    =form_tag add_user_group_path(@group), class: 'form-inline' do
-      .form-group
-        =label_tag :user_id, "User"
-        =select_tag :user_id, options_from_collection_for_select(User.all,'id','full_name'), class: 'select2'
-      =submit_tag "Add",class: 'btn btn-primary'
+    .panel.panel-default
+      .panel-heading
+        .panel-title Users in this group
+      .panel-body
+        =form_tag add_user_group_path(@group), class: 'form-inline' do
+          .form-group
+            =label_tag :user_id, "User"
+            =select_tag :user_id, options_from_collection_for_select(User.all,'id','full_name'), class: 'select2'
+          =submit_tag "Add",class: 'btn btn-primary'
 
 
-    %table.table.table-hover
-      %thead
-        %tr
-          %th Login
-          %th Full name
-          %th Remark
-          %th
+        %table.table.table-hover
+          %thead
+            %tr
+              %th Login
+              %th Full name
+              %th Remark
+              %th
 
-      %tbody
-        - @group.users.each do |user|
-          %tr
-            %td= user.login
-            %td= user.full_name
-            %td= user.remark
-            %td= link_to 'Remove', remove_user_group_path(@group,user), :method => :delete, :data => { :confirm => "Remove #{user.full_name}?" }, class: 'btn btn-danger'
+          %tbody
+            - @group.users.each do |user|
+              %tr
+                %td= user.login
+                %td= user.full_name
+                %td= user.remark
+                %td= link_to 'Remove', remove_user_group_path(@group,user), :method => :delete, :data => { :confirm => "Remove #{user.full_name}?" }, class: 'btn btn-danger'
   .col-md-6
-    %h1 Problems in this group
+    .panel.panel-default
+      .panel-heading
+        .panel-title Problems
+      .panel-body
 
-    =form_tag add_problem_group_path(@group), class: 'form-inline' do
-      .form-group
-        =label_tag :problem_id, "Problem"
-        =select_tag :problem_id, options_from_collection_for_select(Problem.all,'id','full_name'), class: 'select2'
-      =submit_tag "Add",class: 'btn btn-primary'
+        =form_tag add_problem_group_path(@group), class: 'form-inline' do
+          .form-group
+            =label_tag :problem_id, "Problem"
+            =select_tag :problem_id, options_from_collection_for_select(Problem.all,'id','full_name'), class: 'select2'
+          =submit_tag "Add",class: 'btn btn-primary'
 
 
-    %table.table.table-hover
-      %thead
-        %tr
-          %th name
-          %th Full name
-          %th Full score
-          %th
+        %table.table.table-hover
+          %thead
+            %tr
+              %th name
+              %th Full name
+              %th Full score
+              %th
 
-      %tbody
-        - @group.problems.each do |problem|
-          %tr
-            %td= problem.name
-            %td= problem.full_name
-            %td= problem.full_score
-            %td= link_to 'Remove', remove_problem_group_path(@group,problem), :method => :delete, :data => { :confirm => "Remove #{problem.full_name}?" }, class: 'btn btn-danger'
+          %tbody
+            - @group.problems.each do |problem|
+              %tr
+                %td= problem.name
+                %td= problem.full_name
+                %td= problem.full_score
+                %td= link_to 'Remove', remove_problem_group_path(@group,problem), :method => :delete, :data => { :confirm => "Remove #{problem.full_name}?" }, class: 'btn btn-danger'
 
 
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -47,6 +47,7 @@
                 = add_menu( 'Announcements', 'announcements', 'index')
                 = add_menu( 'Problems', 'problems', 'index')
                 = add_menu( 'Users', 'user_admin', 'index')
+                = add_menu( 'User Groups', 'groups', 'index')
                 = add_menu( 'Graders', 'graders', 'list')
                 = add_menu( 'Message ', 'messages', 'console')
                 %li.divider{role: 'separator'}
diff --git a/app/views/user_admin/_form.html.erb b/app/views/user_admin/_form.html.erb
deleted file mode 100644
--- a/app/views/user_admin/_form.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<%= error_messages_for 'user' %>
-
-<!--[form:user]-->
-<p><label for="user_name">Login</label><br/>
-<%= text_field 'user', 'login'  %></p>
-
-<p><label for="user_name">Full name</label><br/>
-<%= text_field 'user', 'full_name'  %></p>
-
-<p><label for="password">Password</label><br/>
-<%= password_field 'user', 'password'  %></p>
-
-<p><label for="password_confirmation">Password (confirm)</label><br/>
-<%= password_field 'user', 'password_confirmation'  %></p>
-
-<p><label for="user_email">E-mail</label><br/>
-<%= email_field 'user', 'email'  %></p>
-
-<p><label for="user_alias">Alias</label><br/>
-<%= text_field 'user', 'alias'  %></p>
-
-<p><label for="user_remark">Remark</label><br/>
-<%= text_field 'user', 'remark'  %></p>
-<!--[eoform:user]-->
-
diff --git a/app/views/user_admin/_form.html.haml b/app/views/user_admin/_form.html.haml
new file mode 100644
--- /dev/null
+++ b/app/views/user_admin/_form.html.haml
@@ -0,0 +1,31 @@
+= error_messages_for 'user'
+/ [form:user]
+.form-group
+  %label.col-md-2.control-label{for: :login} Login
+  .col-md-4
+    = text_field 'user', 'login', class: 'form-control'
+.form-group
+  %label.col-md-2.control-label{for: :full_name} Login
+  .col-md-4
+    = text_field 'user', 'full_name', class: 'form-control'
+.form-group
+  %label.col-md-2.control-label{for: :password} Password
+  .col-md-4
+    = password_field 'user', 'password', class: 'form-control'
+.form-group
+  %label.col-md-2.control-label{for: :password_confirmation} Password (confirm)
+  .col-md-4
+    = password_field 'user', 'password_confirmation', class: 'form-control'
+.form-group
+  %label.col-md-2.control-label{for: :email} E-mail
+  .col-md-4
+    = email_field 'user', 'email', class: 'form-control'
+.form-group
+  %label.col-md-2.control-label{for: :alias} Alias
+  .col-md-4
+    = text_field 'user', 'alias', class: 'form-control'
+.form-group
+  %label.col-md-2.control-label{for: :remark} Remark
+  .col-md-4
+    = text_field 'user', 'remark', class: 'form-control'
+/ [eoform:user]
diff --git a/app/views/user_admin/edit.html.haml b/app/views/user_admin/edit.html.haml
--- a/app/views/user_admin/edit.html.haml
+++ b/app/views/user_admin/edit.html.haml
@@ -1,9 +1,9 @@
 %h1 Editing user
 
-= form_tag :action => 'update', :id => @user do
+= form_tag( {:action => 'update', :id => @user}, {class: 'form-horizontal'}) do
   = error_messages_for 'user'
   = render partial: "form"
-  = submit_tag "Edit"
+  = submit_tag "Edit", class: 'btn btn-primary'
 
 
 = link_to 'Show', :action => 'show', :id => @user 
diff --git a/app/views/user_admin/show.html.erb b/app/views/user_admin/show.html.erb
--- a/app/views/user_admin/show.html.erb
+++ b/app/views/user_admin/show.html.erb
@@ -7,4 +7,4 @@
 <% end %>
 
 <%= link_to 'Edit', :action => 'edit', :id => @user %> |
-<%= link_to 'Back', :action => 'list' %>
+<%= link_to 'Back', :action => 'index' %>