diff --git a/app/docker/components/host-view-panels/node-labels-table/node-labels-table.html b/app/docker/components/host-view-panels/node-labels-table/node-labels-table.html
index e26ec168c..4e2dff80b 100644
--- a/app/docker/components/host-view-panels/node-labels-table/node-labels-table.html
+++ b/app/docker/components/host-view-panels/node-labels-table/node-labels-table.html
@@ -2,32 +2,18 @@
   There are no labels for this node.
 </div>
 
-<table class="table" ng-if="$ctrl.labels.length">
-  <thead>
-    <tr>
-      <th>Label</th>
-      <th>Value</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr ng-repeat="label in $ctrl.labels">
-      <td>
-        <div class="input-group input-group-sm">
-          <span class="input-group-addon fit-text-size">Name</span>
-          <input type="text" class="form-control" ng-model="label.key" placeholder="e.g. com.example.foo" ng-change="$ctrl.updateLabel(label)" />
-        </div>
-      </td>
-      <td>
-        <div class="input-group input-group-sm">
-          <span class="input-group-addon fit-text-size">Value</span>
-          <input type="text" class="form-control" ng-model="label.value" placeholder="e.g. bar" ng-change="$ctrl.updateLabel(label)" />
-          <span class="input-group-btn">
-            <button class="btn btn-sm btn-danger" type="button" ng-click="$ctrl.removeLabel($index)">
-              <i class="fa fa-trash" aria-hidden="true"></i>
-            </button>
-          </span>
-        </div>
-      </td>
-    </tr>
-  </tbody>
-</table>
+<div class="col-sm-12 form-inline" style="padding: 0px;" ng-if="$ctrl.labels.length">
+  <div ng-repeat="label in $ctrl.labels" style="margin-top: 2px;">
+    <div class="input-group col-sm-5 input-group-sm">
+      <span class="input-group-addon">name</span>
+      <input type="text" class="form-control" ng-model="label.key" placeholder="e.g. com.example.foo" ng-change="$ctrl.updateLabel(label)" />
+    </div>
+    <div class="input-group col-sm-5 input-group-sm">
+      <span class="input-group-addon">value</span>
+      <input type="text" class="form-control" ng-model="label.value" placeholder="e.g. bar" ng-change="$ctrl.updateLabel(label)" />
+    </div>
+    <button class="btn btn-sm btn-danger" type="button" ng-click="$ctrl.removeLabel($index)">
+      <i class="fa fa-trash" aria-hidden="true"></i>
+    </button>
+  </div>
+</div>
diff --git a/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html
index 225d820e9..2a0cd5143 100644
--- a/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html
+++ b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html
@@ -45,7 +45,7 @@
               </td>
             </tr>
             <tr>
-              <td>
+              <td colspan="2">
                 <div class="btn-toolbar" role="toolbar">
                   <div class="btn-group" role="group">
                     <button type="button" class="btn btn-primary btn-sm" ng-disabled="!$ctrl.state.hasChanges" ng-click="$ctrl.saveChanges()">