diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 924a49c0d..ad7643a4d 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -253,3 +253,50 @@ body .profiler-results {
   cursor: pointer;
   font-weight: bold;
 }
+
+.btn {
+  display: inline-block;
+  padding: 0.75em 1.25em !important;
+  border-radius: 3px !important;
+  text-decoration: none;
+  box-shadow: inset 0 1px white;
+  transition: all 0.2s ease;
+
+  &:hover {
+    transition: all 0.2s ease;
+  }
+
+  &.btn-info {
+    background: #5bc0de;
+    border: 1px solid darken(#5bc0de, 25%);
+    box-shadow: inset 0 1px lighten(#5bc0de, 50%);
+  }
+
+  &.btn-primary {
+    background: #337ab7;
+    border: 1px solid darken(#337ab7, 25%);
+    box-shadow: inset 0 1px lighten(#337ab7, 50%);
+  }
+
+  &.btn-warning {
+    background: #f0ad4e;
+    border: 1px solid darken(#f0ad4e, 25%);
+    box-shadow: inset 0 1px lighten(#f0ad4e, 50%);
+  }
+
+  &.btn-success {
+    background: #5cb85c;
+    border: 1px solid darken(#5cb85c, 25%);
+    box-shadow: inset 0 1px lighten(#5cb85c, 50%);
+  }
+
+  &.btn-danger {
+    background: #d9534f;
+    border: 1px solid darken(#d9534f, 25%);
+    box-shadow: inset 0 1px lighten(#d9534f, 50%);
+  }
+
+  &.btn-sm {
+    padding: 0.45em 1em !important;
+  }
+}
diff --git a/app/views/flag_settings/dashboard.html.erb b/app/views/flag_settings/dashboard.html.erb
index bc3a40d45..a59ed9833 100644
--- a/app/views/flag_settings/dashboard.html.erb
+++ b/app/views/flag_settings/dashboard.html.erb
@@ -105,8 +105,11 @@
   </ul>
 
   <h5><strong>User views</strong></h5>
-  <%= form_tag url_for(:controller => :flag_conditions, :action => :user_overview), :method => 'GET' do %>
-    <%= select_tag 'user', options_for_select(User.all.map{|u| [u.try(:username), u.id]}), {:class => 'form-control selectpicker', 'data-live-search' => true, 'data-actions-box' => true, 'data-dropup-auto' => false} %><br/>
+  <%= form_tag url_for(:controller => :flag_conditions, :action => :user_overview), method: 'GET', class: 'form-inline' do %>
+    <div class="field">
+      <%= select_tag 'user', options_for_select(User.all.map{|u| [u.try(:username), u.id]}),
+                     { class: 'form-control selectpicker', 'data-live-search' => true, 'data-actions-box' => true, 'data-dropup-auto' => false} %>
+    </div><br/>
     <%= submit_tag 'View', :class => 'btn btn-primary' %>
   <% end %>
 <% end %>