diff --git a/src/styles/controls/settings-table.css b/src/styles/controls/settings-table.css
index a0170c3..61a20fd 100644
--- a/src/styles/controls/settings-table.css
+++ b/src/styles/controls/settings-table.css
@@ -42,10 +42,6 @@
     font-weight: normal;
 }
 
-.settings-table .wholeline {
-    display: block;
-}
-
 .settings-table .setting-value .form-group {
     margin-bottom: 0;
 }
diff --git a/src/styles/core/extend.css b/src/styles/core/extend.css
index 35c5254..ce4df17 100644
--- a/src/styles/core/extend.css
+++ b/src/styles/core/extend.css
@@ -48,6 +48,11 @@
     padding-left: 0;
 }
 
+.checkbox-compact {
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
 /* angular-dragula extend */
 .gu-mirror {
     cursor: grabbing;
diff --git a/src/views/status.html b/src/views/status.html
index 853f289..0a3c5f7 100644
--- a/src/views/status.html
+++ b/src/views/status.html
@@ -30,7 +30,12 @@
                 <span translate>Enabled Features</span>
             </div>
             <div class="setting-value col-sm-8">
-                <span class="wholeline" ng-repeat="feature in context.serverStatus.enabledFeatures" ng-bind="feature"></span>
+                <div class="checkbox checkbox-primary checkbox-compact" ng-repeat="feature in context.serverStatus.enabledFeatures">
+                    <input id="{{'feature_' + $index}}" type="checkbox" checked="checked" disabled="disabled"/>
+                    <label for="{{'feature_' + $index}}">
+                        <span ng-bind="feature"></span>
+                    </label>
+                </div>
             </div>
         </div>
         <div class="row ng-cloak" ng-if="context.serverStatus">