diff --git a/app/views/projects/deploy_keys/index.html.haml b/app/views/projects/deploy_keys/index.html.haml
index fe84763..90d8610 100644
--- a/app/views/projects/deploy_keys/index.html.haml
+++ b/app/views/projects/deploy_keys/index.html.haml
@@ -12,7 +12,7 @@
 %hr.clearfix
 
 .row
-  .col-md-5.enabled-keys
+  .col-md-6.enabled-keys
     %h5
       %strong.cgreen Enabled deploy keys
       for this project
@@ -21,7 +21,7 @@
       - if @enabled_keys.blank?
         .light-well
           %p.nothing_here_message Create a #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add an existing one
-  .col-md-5.available-keys
+  .col-md-6.available-keys
     %h5
       %strong Deploy keys
       from projects available to you
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index a0c95e0..997bdbe 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -46,8 +46,9 @@
             .form-group
               = f.label :issues_enabled, "Issues", class: 'control-label'
               .col-sm-10
-                = f.check_box :issues_enabled
-                %span.descr Lightweight issue tracking system for this project
+                .checkbox
+                  = f.check_box :issues_enabled
+                  %span.descr Lightweight issue tracking system for this project
 
             - if Project.issues_tracker.values.count > 1
               .form-group
@@ -56,31 +57,35 @@
 
               .form-group
                 = f.label :issues_tracker_id, "Project name or id in issues tracker", class: 'control-label'
-                .col-sm-10= f.text_field :issues_tracker_id, disabled: !@project.can_have_issues_tracker_id?
+                .col-sm-10= f.text_field :issues_tracker_id, disabled: !@project.can_have_issues_tracker_id?, class: 'form-control'
 
             .form-group
               = f.label :merge_requests_enabled, "Merge Requests", class: 'control-label'
               .col-sm-10
-                = f.check_box :merge_requests_enabled
-                %span.descr Submit changes to be merged upstream.
+                .checkbox
+                  = f.check_box :merge_requests_enabled
+                  %span.descr Submit changes to be merged upstream.
 
             .form-group
               = f.label :wiki_enabled, "Wiki", class: 'control-label'
               .col-sm-10
-                = f.check_box :wiki_enabled
-                %span.descr Pages for project documentation
+                .checkbox
+                  = f.check_box :wiki_enabled
+                  %span.descr Pages for project documentation
 
             .form-group
               = f.label :wall_enabled, "Wall", class: 'control-label'
               .col-sm-10
-                = f.check_box :wall_enabled
-                %span.descr Simple chat system for broadcasting inside project
+                .checkbox
+                  = f.check_box :wall_enabled
+                  %span.descr Simple chat system for broadcasting inside project
 
             .form-group
               = f.label :snippets_enabled, "Snippets", class: 'control-label'
               .col-sm-10
-                = f.check_box :snippets_enabled
-                %span.descr Share code pastes with others out of git repository
+                .checkbox
+                  = f.check_box :snippets_enabled
+                  %span.descr Share code pastes with others out of git repository
 
 
           .form-actions
diff --git a/app/views/projects/team_members/import.html.haml b/app/views/projects/team_members/import.html.haml
index ca7b32d..d3b516e 100644
--- a/app/views/projects/team_members/import.html.haml
+++ b/app/views/projects/team_members/import.html.haml
@@ -3,9 +3,9 @@
 %p.light
   Only project members will be imported. Group members will be skipped.
 %hr
-= form_tag apply_import_project_team_members_path(@project), method: 'post' do
-  .padded
-    = label_tag :source_project_id, "Project"
+= form_tag apply_import_project_team_members_path(@project), method: 'post', class: 'form-horizontal' do
+  .form-group
+    = label_tag :source_project_id, "Project", class: 'control-label'
     .col-sm-10= select_tag(:source_project_id, options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace), prompt: "Select project", class: "chosen lg", required: true)
 
   .form-actions
--
libgit2 0.21.2