diff --git a/install/static/certificate.js b/install/static/certificate.js
old mode 100644
new mode 100755
index f8e77dd4f..e81d3a784
--- a/install/static/certificate.js
+++ b/install/static/certificate.js
@@ -413,7 +413,9 @@ function certificate_status_widget(spec) {
 
         that.widget_create(container);
 
-        var table = $('<table/>').appendTo(container);
+        var table = $('<table/>', {
+            'class': 'certificate-status'
+        }).appendTo(container);
 
         var tr = $('<tr/>').appendTo(table);
 
@@ -434,12 +436,16 @@ function certificate_status_widget(spec) {
             'value': 'Get'
         }).appendTo(td);
 
+        td.append(' ');
+
         if (!that.is_selfsign()) {
             $('<input/>', {
                 'type': 'button',
                 'name': 'revoke',
                 'value': 'Revoke'
             }).appendTo(td);
+
+            td.append(' ');
         }
 
         $('<input/>', {
diff --git a/install/static/host.js b/install/static/host.js
index 2e82936be..76c5943cd 100644
--- a/install/static/host.js
+++ b/install/static/host.js
@@ -221,7 +221,9 @@ function host_provisioning_status_widget(spec) {
 
         that.widget_create(container);
 
-        var table = $('<table/>').appendTo(container);
+        var table = $('<table/>', {
+            'class': 'kerberos-key-status'
+        }).appendTo(container);
 
         var tr = $('<tr/>').appendTo(table);
 
@@ -262,12 +264,20 @@ function host_provisioning_status_widget(spec) {
 
         td = $('<td/>').appendTo(tr);
 
+        tr = $('<tr/>').appendTo(table);
+
+        td = $('<td/>').appendTo(tr);
+
+        td = $('<td/>').appendTo(tr);
+
         $('<input/>', {
             'type': 'text',
             'name': 'otp',
-            'size': 10
+            'class': 'otp'
         }).appendTo(td);
 
+        td = $('<td/>').appendTo(tr);
+
         $('<input/>', {
             'type': 'button',
             'name': 'enroll',
diff --git a/install/static/ipa.css b/install/static/ipa.css
index 0b64203e6..d94dbc75a 100644
--- a/install/static/ipa.css
+++ b/install/static/ipa.css
@@ -233,6 +233,10 @@ dl.entryattrs input {
     min-width: 27.5em;
 }
 
+dl.entryattrs input.otp {
+    min-width: 15em;
+    width: 98%;
+}
 
 span.attrhint {
     font-size: 8pt;
@@ -606,6 +610,13 @@ a.action-button-disabled {
 
 .strikethrough { text-decoration: line-through; }
 
+table.certificate-status {
+    line-height: 2;
+}
+
+table.kerberos-key-status {
+    line-height: 2;
+}
 
 .status-icon {
     width: 0.5em;
diff --git a/install/static/service.js b/install/static/service.js
index ad3a2fe67..62243c223 100644
--- a/install/static/service.js
+++ b/install/static/service.js
@@ -274,7 +274,9 @@ function service_provisioning_status_widget(spec) {
 
         that.widget_create(container);
 
-        var table = $('<table/>').appendTo(container);
+        var table = $('<table/>', {
+            'class': 'kerberos-key-status'
+        }).appendTo(container);
 
         var tr = $('<tr/>').appendTo(table);