diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index 1269ac8a242f7cc51e201f578f8048871969a538..0866b43f71da1556da6b7c7b3c089dca771352a5 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -35,6 +35,7 @@
     .btn {
       padding:6px;
       margin-left:10px;
+      margin-bottom:8px;
     }
   }
 }
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml
index d34acffe9e66c37f054f14f575091b443d34ef3d..43288424e8ed47c81b7b81e1e72bfbf9504e7cd6 100644
--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@@ -5,7 +5,7 @@
     Read more about system hooks
     %strong #{link_to "here", help_system_hooks_path, class: "vlink"}
 
-= form_for @hook, as: :hook, url: admin_hooks_path do |f|
+= form_for @hook, as: :hook, url: admin_hooks_path, html: { class: 'form-inline' } do |f|
   -if @hook.errors.any?
     .alert-message.block-message.error
       - @hook.errors.full_messages.each do |msg|
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index 4512bb7e4934016974233a7af0438e3571c07b23..882b2ab5ff2765fccbf5f5ea2140a729343742ac 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -2,7 +2,7 @@
   Projects
   = link_to 'New Project', new_admin_project_path, class: "btn small right"
 %br
-= form_tag admin_projects_path, method: :get do 
+= form_tag admin_projects_path, method: :get, class: 'form-inline' do
   = text_field_tag :name, params[:name], class: "xlarge"
   = submit_tag "Search", class: "btn submit primary"
 
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index 5edca312cc5b155809302de4ebd23fd9548edbad..3d0272179c4489af33583a32fa820d5a6b817dc9 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -3,7 +3,7 @@
   = link_to 'New User', new_admin_user_path, class: "btn small right"
 %br
 
-= form_tag admin_users_path, method: :get do 
+= form_tag admin_users_path, method: :get, class: 'form-inline' do
   = text_field_tag :name, params[:name], class: "xlarge"
   = submit_tag "Search", class: "btn submit primary"
 %ul.nav.nav-pills
diff --git a/app/views/hooks/index.html.haml b/app/views/hooks/index.html.haml
index 4e15dc50ee8f3f22c6bdfd71482a930accb1050f..3d2a381e746c39cca8827b164cb347680ba9b792 100644
--- a/app/views/hooks/index.html.haml
+++ b/app/views/hooks/index.html.haml
@@ -8,7 +8,7 @@
       Read more about web hooks
       %strong #{link_to "here", help_web_hooks_path, class: "vlink"}
 
-= form_for [@project, @hook], as: :hook, url: project_hooks_path(@project) do |f|
+= form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f|
   -if @hook.errors.any?
     .alert-message.block-message.error
       - @hook.errors.full_messages.each do |msg|
diff --git a/app/views/search/show.html.haml b/app/views/search/show.html.haml
index ed9da1f0753ddd1bd1385f6a0dc7d1e722d3127c..9a0b47895884e04cfafe584e5778a3e7e86e5709 100644
--- a/app/views/search/show.html.haml
+++ b/app/views/search/show.html.haml
@@ -1,4 +1,4 @@
-= form_tag search_path, method: :get do |f|
+= form_tag search_path, method: :get, class: 'form-inline' do |f|
   .padded
     = label_tag :search do
       %strong Looking for