diff --git a/app/views/admin/teams/edit.html.haml b/app/views/admin/teams/edit.html.haml
index a48a369b3b9..0a3d993b132 100644
--- a/app/views/admin/teams/edit.html.haml
+++ b/app/views/admin/teams/edit.html.haml
@@ -10,7 +10,7 @@
     .input
       = f.text_field :name, placeholder: "Example Team", class: "xxlarge"
 
-  .clearfix.team_description_holder
+  .clearfix.team-description-holder
     = f.label :description, "Details"
     .input
       = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
diff --git a/app/views/admin/teams/new.html.haml b/app/views/admin/teams/new.html.haml
index a852b4cbbfa..1c90cb20c10 100644
--- a/app/views/admin/teams/new.html.haml
+++ b/app/views/admin/teams/new.html.haml
@@ -10,7 +10,7 @@
     .input
       = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
 
-  .clearfix.team_description_holder
+  .clearfix.team-description-holder
     = f.label :description, "Details"
     .input
       = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index 41ebf60698b..828a9b430c4 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -9,8 +9,15 @@
       Group name is
     .input
       = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
-       
-      = f.submit 'Save group', class: "btn btn-save"
+
+  .clearfix.group_description_holder
+    = f.label :description, "Details"
+    .input
+      = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
+
+  .form-actions
+    = f.submit 'Save group', class: "btn btn-save"
+
 %hr
 
 
diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml
index 73be474e278..9308e9a674d 100644
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -9,8 +9,16 @@
       Group name is
     .input
       = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
-       
-      = f.submit 'Create group', class: "btn btn-create"
+
+  .clearfix.group_description_holder
+    = f.label :description, "Details"
+    .input
+      = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
+
+  .form-actions
+    = f.submit 'Create group', class: "btn btn-primary"
+
+
   %hr
   .padded
     %ul
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index a140b401b9d..fe08e0b551a 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -1,3 +1,8 @@
+- if @group.description.present?
+  .description
+    = @group.description
+  %hr
+
 .projects
   .activities.span8
     = render "events/event_last_push", event: @last_push
diff --git a/app/views/teams/edit.html.haml b/app/views/teams/edit.html.haml
index 751fe94c654..5491993d5f4 100644
--- a/app/views/teams/edit.html.haml
+++ b/app/views/teams/edit.html.haml
@@ -12,13 +12,20 @@
         .input
           = f.text_field :name, placeholder: "Ex. OpenSource", class: "xlarge left"
 
+      .clearfix.team-description-holder
+        = f.label :description, "Details"
+        .input
+          = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
+
       .clearfix
         = f.label :path do
           Team path is
         .input
           = f.text_field :path, placeholder: "opensource", class: "xlarge left"
+
       .form-actions
-        = f.submit 'Save team changes', class: "btn btn-save"
+        = f.submit 'Save team changes', class: "btn btn-primary"
+        = link_to 'Delete team', team_path(@team), method: :delete, confirm: "You are shure?", class: "btn btn-remove pull-right"
   .span5
     .ui-box
       %h5.title Remove team
@@ -26,4 +33,3 @@
         %p
           Removed team can not be restored!
         = link_to 'Remove team', team_path(@team), method: :delete, confirm: "You are sure?", class: "btn btn-remove btn-small"
-
diff --git a/app/views/teams/new.html.haml b/app/views/teams/new.html.haml
index 7089f791558..332a6a558d8 100644
--- a/app/views/teams/new.html.haml
+++ b/app/views/teams/new.html.haml
@@ -9,8 +9,15 @@
       Team name is
     .input
       = f.text_field :name, placeholder: "Ex. Ruby Developers", class: "xxlarge left"
-       
-      = f.submit 'Create team', class: "btn btn-create"
+
+  .clearfix.team-description-holder
+    = f.label :description, "Details"
+    .input
+      = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
+
+  .form-actions
+    = f.submit 'Create team', class: "btn btn-create"
+
   %hr
   .padded
     %ul
diff --git a/app/views/teams/show.html.haml b/app/views/teams/show.html.haml
index d6e80e2a51e..eef13cbe76c 100644
--- a/app/views/teams/show.html.haml
+++ b/app/views/teams/show.html.haml
@@ -1,3 +1,8 @@
+- if @group.description.present?
+  .description
+    = @group.description
+  %hr
+
 .projects
   .activities.span8
     = link_to dashboard_path, class: 'btn btn-tiny' do