diff --git a/app/assets/javascripts/dashboard.js.coffee b/app/assets/javascripts/dashboard.js.coffee
index d2bd9e7..c4a0ccd 100644
--- a/app/assets/javascripts/dashboard.js.coffee
+++ b/app/assets/javascripts/dashboard.js.coffee
@@ -4,7 +4,7 @@ class Dashboard
 
     $(".dash-filter").keyup ->
       terms = $(this).val()
-      uiBox = $(this).parents('.ui-box').first()
+      uiBox = $(this).parents('.panel').first()
       if terms == "" || terms == undefined
         uiBox.find(".dash-list li").show()
       else
diff --git a/app/assets/stylesheets/generic/lists.scss b/app/assets/stylesheets/generic/lists.scss
index 9637680..2e3559f 100644
--- a/app/assets/stylesheets/generic/lists.scss
+++ b/app/assets/stylesheets/generic/lists.scss
@@ -72,6 +72,15 @@
       font-size: 14px;
       line-height: 18px;
     }
+
+    .row_title {
+      font-weight: 500;
+      color: #444;
+      &:hover {
+        color: #444;
+        text-decoration: underline;
+      }
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/generic/ui_box.scss b/app/assets/stylesheets/generic/ui_box.scss
index 7a977ea..461e8e2 100644
--- a/app/assets/stylesheets/generic/ui_box.scss
+++ b/app/assets/stylesheets/generic/ui_box.scss
@@ -106,15 +106,6 @@
     }
   }
 
-  .row_title {
-    font-weight: 500;
-    color: #444;
-    &:hover {
-      color: #444;
-      text-decoration: underline;
-    }
-  }
-
   .form-holder {
     padding-top: 20px;
     form {
diff --git a/app/assets/stylesheets/gl_bootstrap.scss b/app/assets/stylesheets/gl_bootstrap.scss
index 8676f07..15f08cc 100644
--- a/app/assets/stylesheets/gl_bootstrap.scss
+++ b/app/assets/stylesheets/gl_bootstrap.scss
@@ -221,3 +221,11 @@ ul.breadcrumb {
   position: relative;
   white-space: nowrap;
 }
+
+/**
+ * Add some extra stuff to panels
+ *
+ */
+.panel {
+
+}
diff --git a/app/views/admin/background_jobs/show.html.haml b/app/views/admin/background_jobs/show.html.haml
index dcb3bfc..c79d128 100644
--- a/app/views/admin/background_jobs/show.html.haml
+++ b/app/views/admin/background_jobs/show.html.haml
@@ -5,7 +5,7 @@
 
 .panel.panel-default
   .panel-heading Sidekiq running processes
-  .body
+  .panel-body
     - if @sidekiq_processes.empty?
       %h4.cred
         %i.icon-warning-sign
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index 2b7dbfa..183203a 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -48,7 +48,7 @@
     .panel.panel-default
       .panel-heading
         Add user(s) to the group:
-      .body.form-holder
+      .panel-body.form-holder
         %p.light
           Read more about project permissions
           %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 3fe188a..3f25eb7 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -78,7 +78,7 @@
     .panel.panel-default
       .panel-heading
         Transfer project
-      .body
+      .panel-body
         = form_for @project, url: transfer_admin_project_path(@project), method: :put, html: { class: 'form-horizontal' } do |f|
           .form-group
             = f.label :namespace_id, "Namespace", class: 'control-label'
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index e04b5ba..315da03 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -84,9 +84,9 @@
               .nothing-here-block This group has no projects yet
 
       .tab-pane#tab-remove
-        .panel.panel-default.panel.panel-default-danger
+        .panel.panel-default.panel.panel-danger
           .panel-heading Remove group
-          .body
+          .panel-body
             %p
               Removing group will cause all child projects and resources to be removed.
             %p
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 0a45f7e..4377502 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -6,7 +6,7 @@
         Project settings:
       %p.light Some settings, such as "Transfer Project", are hidden inside the danger area below
       %hr
-      .form-holder
+      .panel-body
         = form_for @project, remote: true, html: { class: "edit_project form-horizontal" } do |f|
           %fieldset
             .form-group.project_name_holder
@@ -106,13 +106,13 @@
 
       .js-toggle-content.hide
         - if can? current_user, :archive_project, @project
-          .panel.panel-default.panel.panel-default-danger
+          .panel.panel-default.panel.panel-danger
             .panel-heading
               - if @project.archived?
                 Unarchive project
               - else
                 Archive project
-            .body
+            .panel-body
               - if @project.archived?
                 %p
                   Unarchiving the project will mark its repository as active.
@@ -137,10 +137,10 @@
           .nothing-here-block Only the project owner can archive a project
 
         - if can?(current_user, :change_namespace, @project)
-          .panel.panel-default.panel.panel-default-danger
+          .panel.panel-default.panel.panel-danger
             .panel-heading Transfer project
             .errors-holder
-            .form-holder
+            .panel-body
               = form_for(@project, url: transfer_project_path(@project), method: :put, remote: true, html: { class: 'transfer-project form-horizontal' }) do |f|
                 .form-group
                   = f.label :namespace_id, class: 'control-label' do
@@ -157,10 +157,10 @@
         - else
           .nothing-here-block Only the project owner can transfer a project
 
-        .panel.panel-default.panel.panel-default-danger
+        .panel.panel-default.panel.panel-danger
           .panel-heading Rename repository
           .errors-holder
-          .form-holder
+          .panel-body
             = form_for(@project, html: { class: 'form-horizontal' }) do |f|
               .form-group
                 = f.label :path, class: 'control-label' do
@@ -177,9 +177,9 @@
                 = f.submit 'Rename', class: "btn btn-remove"
 
         - if can?(current_user, :remove_project, @project)
-          .panel.panel-default.panel.panel-default-danger
+          .panel.panel-default.panel.panel-danger
             .panel-heading Remove project
-            .body
+            .panel-body
               %p
                 Removing the project will delete its repository and all related resources including issues, merge requests etc.
                 %br
--
libgit2 0.21.2