diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index 9c3281b6125..48defc4377d 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -114,39 +114,23 @@
 }
 
 .project-visibility-level-holder {
-  .controls {
-    padding-bottom: 9px;
-  }
+  .radio {
+    margin-bottom: 10px;
 
-  .controls {
-    input {
-      float: left;
+    i {
+      margin: 0 3px;
+      font-size: 20px;
     }
-    .descr {
-      display: block;
-      margin-left: 1.5em;
-      &.restricted {
-        color: #888;
-      }
 
-      label {
-        float: none;
-        padding: 0;
-        margin: 0;
-        text-align: left;
-      }
-    }
-    .info {
-      display: block;
-      margin-top: 5px;
-    }
-    strong {
+    .option-title {
+      font-weight: bold;
       display: inline-block;
-      width: 4em;
     }
-  }
-  i {
-    color: inherit;
+
+    .option-descr {
+      margin-left: 24px;
+      color: #666;
+    }
   }
 }
 
diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml
index 14b60687ed2..955a107e542 100644
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -1,19 +1,20 @@
-= form_for @group do |f|
+= form_for @group, html: { class: 'group-form form-horizontal' } do |f|
   - if @group.errors.any?
     .alert.alert-danger
       %span= @group.errors.full_messages.first
   .form-group
-    = f.label :name do
+    = f.label :name, class: 'control-label' do
       Group name
     .col-sm-10
-      = f.text_field :name, placeholder: "Ex. OpenSource", class: "form-control left"
+      = f.text_field :name, placeholder: "Ex. OpenSource", class: "form-control"
 
   .form-group.group-description-holder
-    = f.label :description, "Details"
+    = f.label :description, "Details", class: 'control-label'
     .col-sm-10
       = f.text_area :description, maxlength: 250, class: "form-control js-gfm-input", rows: 4
 
   .form-group
+    .col-sm-2
     .col-sm-10
       %ul
         %li A group is a collection of several projects
diff --git a/app/views/projects/_visibility_level.html.haml b/app/views/projects/_visibility_level.html.haml
index b708fb771c5..eb38fce0ecf 100644
--- a/app/views/projects/_visibility_level.html.haml
+++ b/app/views/projects/_visibility_level.html.haml
@@ -5,15 +5,15 @@
   .col-sm-10
     - if can_change_visibility_level
       - Gitlab::VisibilityLevel.values.each do |level|
-        .append-bottom-10
+        .radio
           - restricted = restricted_visibility_levels.include?(level)
           = f.radio_button :visibility_level, level, checked: (visibility_level == level), disabled: restricted
-          %span.descr{:class => ("restricted" if restricted)}
-            = label :project_visibility_level, level do
-              = visibility_level_icon(level)
-              %strong
-                = visibility_level_label(level)
-            .light.prepend-left-20= visibility_level_description(level)
+          = label :project_visibility_level, level do
+            = visibility_level_icon(level)
+            .option-title
+              = visibility_level_label(level)
+            .option-descr
+              = visibility_level_description(level)
       - unless restricted_visibility_levels.empty?
         .col-sm-10
           %span.info