diff --git a/app/views/projects/edit_tree/show.html.haml b/app/views/projects/edit_tree/show.html.haml
index d141026d65b80a90de0d8f25525fa9ab3eecf326..10dae3c8ff0624a73e00e6b8a857b4c0c1e6c92e 100644
--- a/app/views/projects/edit_tree/show.html.haml
+++ b/app/views/projects/edit_tree/show.html.haml
@@ -19,7 +19,7 @@
       = label_tag 'commit_message', class: "control-label" do
         Commit message
       .col-sm-10
-        = text_area_tag 'commit_message', '', placeholder: "Update #{@blob.name}", required: true, rows: 3
+        = text_area_tag 'commit_message', '', placeholder: "Update #{@blob.name}", required: true, rows: 3, class: 'form-control'
     .form-actions
       = hidden_field_tag 'last_commit', @last_commit
       = hidden_field_tag 'content', '', id: "file-content"
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml
index 1d97479dc48cae0aaad00da4f409ad44443f1044..06d8660630dd4a89d1513a61569e1042ee252e2c 100644
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@@ -1,4 +1,4 @@
-= form_for [@project, @wiki], method: @wiki.persisted? ? :put : :post do |f|
+= form_for [@project, @wiki], method: @wiki.persisted? ? :put : :post, html: { class: 'form-horizontal' } do |f|
   -if @wiki.errors.any?
     #error_explanation
       %h2= "#{pluralize(@wiki.errors.count, "error")} prohibited this wiki from being saved:"
@@ -6,29 +6,30 @@
         - @wiki.errors.full_messages.each do |msg|
           %li= msg
 
-  .issue-box
-    %h3.title
-      .edit-wiki-header
-        = @wiki.title.titleize
-        = f.hidden_field :title, value: @wiki.title
-        = f.select :format, options_for_select(GollumWiki::MARKUPS, {selected: @wiki.format}), {}, class: "pull-right input-medium"
-        = f.label :format, class: "pull-right", style: "padding-right: 20px;"
-    .context
-      .col-sm-10
-        %span.cgray
-          Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
-          To link to a (new) page you can just type
-          %code [Link Title](page-slug)
-          \.
+  = f.hidden_field :title, value: @wiki.title
+  .form-group
+    = f.label :format, class: 'control-label'
+    .col-sm-10
+      = f.select :format, options_for_select(GollumWiki::MARKUPS, {selected: @wiki.format}), {}, class: "form-control"
+
+  .row
+    .col-sm-2
+    .col-sm-10
+      %p.cgray
+        Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
+        To link to a (new) page you can just type
+        %code [Link Title](page-slug)
+        \.
+
+  .form-group
+    = f.label :content, class: 'control-label'
+    .col-sm-10
+      = f.text_area :content, class: 'form-control js-gfm-input', rows: 18
+
+  .form-group
+    = f.label :commit_message, class: 'control-label'
+    .col-sm-10= f.text_field :message, class: 'form-control', rows: 18
 
-    .description
-      .form-group
-        = f.label :content
-        .col-sm-10= f.text_area :content, class: 'span8 js-gfm-input', rows: 18
-    .description
-      .form-group
-        = f.label :commit_message
-        .col-sm-10= f.text_field :message, class: 'span8', rows: 18
   .form-actions
     - if @wiki && @wiki.persisted?
       = f.submit 'Save changes', class: "btn-save btn"
diff --git a/app/views/projects/wikis/_nav.html.haml b/app/views/projects/wikis/_nav.html.haml
index 0a7e51e974c25b94906eeaf09340f5229b4686fa..5e5aa5170d6b8ff35115c374367c2767bb3a5b99 100644
--- a/app/views/projects/wikis/_nav.html.haml
+++ b/app/views/projects/wikis/_nav.html.haml
@@ -1,4 +1,4 @@
-%ul.nav.nav-tabs
+%ul.nav.nav-tabs.append-bottom-20
   = nav_link(html_options: {class: params[:id] == 'home' ? 'active' : '' }) do
     = link_to 'Home', project_wiki_path(@project, :home)
 
diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml
index 1400f2ec7875082338d92d6d6f044b31cacacc93..fccc9ae61fb86bfda5fe585c494b8076c13b982f 100644
--- a/app/views/projects/wikis/edit.html.haml
+++ b/app/views/projects/wikis/edit.html.haml
@@ -1,7 +1,9 @@
 = render 'nav'
 %h3.page-title
-  Editing page
-  = render 'main_links'
+  Editing -
+  %span.light #{@wiki.title.titleize}
+= render 'main_links'
+%hr
 = render 'form'
 
 .pull-right