diff --git a/public/assets/js/build-plugins/codeception.js b/public/assets/js/build-plugins/codeception.js
index 71ed55a7..8c517cca 100644
--- a/public/assets/js/build-plugins/codeception.js
+++ b/public/assets/js/build-plugins/codeception.js
@@ -5,7 +5,6 @@ var codeceptionPlugin = ActiveBuild.UiPlugin.extend({
     lastData: null,
     lastMeta: null,
     displayOnUpdate: false,
-    box: true,
     rendered: false,
 
     register: function() {
diff --git a/public/assets/js/build-plugins/phpspec.js b/public/assets/js/build-plugins/phpspec.js
index 8ddecf78..68c089ee 100644
--- a/public/assets/js/build-plugins/phpspec.js
+++ b/public/assets/js/build-plugins/phpspec.js
@@ -4,7 +4,6 @@ var phpspecPlugin = ActiveBuild.UiPlugin.extend({
     title: Lang.get('phpspec'),
     lastData: null,
     displayOnUpdate: false,
-    box: true,
     rendered: false,
 
     register: function() {
diff --git a/public/assets/js/build-plugins/phptallint.js b/public/assets/js/build-plugins/phptallint.js
index 3381af69..99c55120 100644
--- a/public/assets/js/build-plugins/phptallint.js
+++ b/public/assets/js/build-plugins/phptallint.js
@@ -3,7 +3,6 @@ var phptalPlugin = ActiveBuild.UiPlugin.extend({
     css: 'col-xs-12',
     title: 'PHPTAL Lint',
     lastData: null,
-    box: true,
     rendered: false,
 
     register: function() {
diff --git a/public/assets/js/build-plugins/phpunit.js b/public/assets/js/build-plugins/phpunit.js
index e345c4a0..d2885cf9 100644
--- a/public/assets/js/build-plugins/phpunit.js
+++ b/public/assets/js/build-plugins/phpunit.js
@@ -4,7 +4,6 @@ var phpunitPlugin = ActiveBuild.UiPlugin.extend({
     title: Lang.get('phpunit'),
     lastData: null,
     displayOnUpdate: false,
-    box: true,
     rendered: false,
     statusMap: {
         success : 'ok',
diff --git a/public/assets/js/build-plugins/summary.js b/public/assets/js/build-plugins/summary.js
index 7522c178..0d598d58 100644
--- a/public/assets/js/build-plugins/summary.js
+++ b/public/assets/js/build-plugins/summary.js
@@ -2,7 +2,6 @@ var SummaryPlugin = ActiveBuild.UiPlugin.extend({
     id: 'build-summary',
     css: 'col-xs-12',
     title: Lang.get('build-summary'),
-    box: true,
     statusLabels: [Lang.get('pending'), Lang.get('running'), Lang.get('success'), Lang.get('failed'), Lang.get('failed_allowed')],
     statusClasses: ['info', 'warning', 'success', 'danger', 'danger'],
 
diff --git a/public/assets/js/build.js b/public/assets/js/build.js
index 8636070f..38498edd 100644
--- a/public/assets/js/build.js
+++ b/public/assets/js/build.js
@@ -146,28 +146,25 @@ var Build = Class.extend({
             }
         }
 
-        $('#plugins').sortable({
-            handle: '.box-title',
-            connectWith: '#plugins',
-            update: self.storePluginOrder
-        });
-
         $(window).trigger({type: 'build-updated', queryData: self.buildData});
     },
 
     renderPlugin: function(plugin) {
         var output = plugin.render();
 
-        if (!plugin.box) {
-            output = $('<div class="box-body"></div>').append(output);
-        }
+        output = $('<div class="box-body"></div>').append(output);
 
         var container = $('<div></div>').addClass('ui-plugin ' + plugin.css).attr('id', plugin.id);
         var content = $('<div></div>').append(output);
         content.addClass('box');
 
         if (plugin.title) {
-            content.prepend('<div class="box-header"><h3 class="box-title">'+plugin.title+'</h3></div>');
+            content.prepend(
+                '<div class="box-header"><h3 class="box-title">'+plugin.title+'</h3>'+
+                '<div class="box-tools pull-right">'+
+                '<button type="button" class="btn btn-box-tool" data-widget="collapse" data-toggle="tooltip" title="Collapse">'+
+                '<i class="fa fa-minus"></i></button></div></div>'
+            );
         }
 
         container.append(content);
diff --git a/src/PHPCensor/View/Home/index.phtml b/src/PHPCensor/View/Home/index.phtml
index 381292ab..874414eb 100644
--- a/src/PHPCensor/View/Home/index.phtml
+++ b/src/PHPCensor/View/Home/index.phtml
@@ -14,6 +14,11 @@ use PHPCensor\Model\Build;
         <div class="box">
             <div class="box-header">
                 <h3 class="box-title"><?php print $group['title']; ?></h3>
+                <div class="box-tools pull-right">
+                    <button type="button" class="btn btn-box-tool" data-widget="collapse" data-toggle="tooltip" title="Collapse">
+                        <i class="fa fa-minus"></i>
+                    </button>
+                </div>
             </div>
 
             <div class="box-body">
diff --git a/src/PHPCensor/View/Project/view.phtml b/src/PHPCensor/View/Project/view.phtml
index b320cb8b..cfafe388 100644
--- a/src/PHPCensor/View/Project/view.phtml
+++ b/src/PHPCensor/View/Project/view.phtml
@@ -198,6 +198,11 @@
             <div class="box">
                 <div class="box-header">
                     <h4 class="box-title"><?= Lang::get('public_status_title'); ?></h4>
+                    <div class="box-tools pull-right">
+                        <button type="button" class="btn btn-box-tool" data-widget="collapse" data-toggle="tooltip" title="Collapse">
+                            <i class="fa fa-minus"></i>
+                        </button>
+                    </div>
                 </div>
 
                 <div class="box-body">
@@ -220,6 +225,11 @@
             <div class="box">
                 <div class="box-header">
                     <h4 class="box-title"><?php Lang::out('webhooks'); ?></h4>
+                    <div class="box-tools pull-right">
+                        <button type="button" class="btn btn-box-tool" data-widget="collapse" data-toggle="tooltip" title="Collapse">
+                            <i class="fa fa-minus"></i>
+                        </button>
+                    </div>
                 </div>
 
                 <div class="box-body">
@@ -250,7 +260,14 @@
 
         <?php if ($project->getSshPublicKey()): ?>
             <div class="box">
-                <div class="box-header"><h3 class="box-title"><?php Lang::out('public_key'); ?></h3></div>
+                <div class="box-header">
+                    <h3 class="box-title"><?php Lang::out('public_key'); ?></h3>
+                    <div class="box-tools pull-right">
+                        <button type="button" class="btn btn-box-tool" data-widget="collapse" data-toggle="tooltip" title="Collapse">
+                            <i class="fa fa-minus"></i>
+                        </button>
+                    </div>
+                </div>
                 <div class="box-body" style="word-break: break-all;"><?php print $project->getSshPublicKey(); ?></div>
             </div>
         <?php endif; ?>