diff --git a/lib/global-admin/addon/templates/-shibboleth-config.hbs b/lib/global-admin/addon/templates/-shibboleth-config.hbs
index 17c6284a5..b818137ad 100644
--- a/lib/global-admin/addon/templates/-shibboleth-config.hbs
+++ b/lib/global-admin/addon/templates/-shibboleth-config.hbs
@@ -14,18 +14,18 @@
   <hr />
   <div class="row">
     <div class="col span-6">
-        <label class="acc-label pb-5">{{t 'authPage.shibboleth.disabled.name.labelText'}}{{field-required}}</label>
-        {{input type="text" value=config.displayNameField classNames="form-control"}}
+      <label class="acc-label pb-5">{{t 'authPage.shibboleth.disabled.name.labelText'}}{{field-required}}</label>
+      {{input type="text" value=config.displayNameField classNames="form-control"}}
     </div>
     <div class="col span-6">
-        <label class="acc-label pb-5">{{t 'authPage.shibboleth.disabled.username.labelText'}}{{field-required}}</label>
-        {{input type="text" value=config.userNameField classNames="form-control"}}
+      <label class="acc-label pb-5">{{t 'authPage.shibboleth.disabled.username.labelText'}}{{field-required}}</label>
+      {{input type="text" value=config.userNameField classNames="form-control"}}
     </div>
-    </div>
-    <div class="row">
+  </div>
+  <div class="row">
     <div class="col span-6">
-        <label class="acc-label pb-5">{{t 'authPage.shibboleth.disabled.uid.labelText'}}{{field-required}}</label>
-        {{input type="text" value=config.uidField classNames="form-control"}}
+      <label class="acc-label pb-5">{{t 'authPage.shibboleth.disabled.uid.labelText'}}{{field-required}}</label>
+      {{input type="text" value=config.uidField classNames="form-control"}}
     </div>
     <div class="col span-6">
       <label class="acc-label pb-5">{{t 'authPage.shibboleth.disabled.groups.labelText'}}{{field-required}}</label>
@@ -37,10 +37,11 @@
       <div class="inline-form">
         <label class="acc-label pb-5">{{t 'inputCertificate.key.label'}}{{field-required}}</label>
         {{input-text-file
-          value=config.spKey
-          accept="text/*, .pem, .pkey, .key"
-          minHeight=60
-          placeholder="inputCertificate.key.placeholder"
+            value=config.spKey
+            accept="text/*, .pem, .pkey, .key"
+            minHeight=60
+            placeholder="inputCertificate.key.placeholder"
+            classNames="box"
         }}
       </div>
     </div>
@@ -48,10 +49,11 @@
       <div class="inline-form">
         <label class="acc-label pb-5">{{t 'inputCertificate.cert.label'}}{{field-required}}</label>
         {{input-text-file
-          accept="text/*, .pem, .crt"
-          value=config.spCert
-          minHeight=60
-          placeholder="inputCertificate.cert.placeholder"
+            accept="text/*, .pem, .crt"
+            value=config.spCert
+            minHeight=60
+            placeholder="inputCertificate.cert.placeholder"
+            classNames="box"
         }}
       </div>
     </div>
@@ -59,28 +61,29 @@
       <div class="inline-form">
         <label class="acc-label pb-5">{{t 'inputCertificate.metaXML.label'}}{{field-required}}</label>
         {{input-text-file
-          accept="text/xml"
-          value=config.idpMetadataContent
-          minHeight=60
-          placeholder="inputCertificate.metaXML.placeholder"
+            accept="text/xml"
+            value=config.idpMetadataContent
+            minHeight=60
+            placeholder="inputCertificate.metaXML.placeholder"
+            classNames="box"
         }}
       </div>
     </div>
   </div>
   <div class="row">
-      <div class="inline-form">
-        <label class="acc-label pb-5">&nbsp;</label>
-        <button class="btn bg-primary" style="display: block;margin: 0 auto;" {{action "save"}}>
-          {{#if saving}}
-            <i class="icon icon-spinner icon-spin"></i> {{t 'generic.saving'}}
-          {{else if saved}}
-            {{t 'generic.saved'}}
-          {{else}}
-            {{t 'generic.save'}}
-          {{/if}}
-        </button>
-      </div>
+    <div class="inline-form">
+      <label class="acc-label pb-5">&nbsp;</label>
+      <button class="btn bg-primary" style="display: block;margin: 0 auto;" {{action "save"}}>
+        {{#if saving}}
+          <i class="icon icon-spinner icon-spin"></i> {{t 'generic.saving'}}
+        {{else if saved}}
+          {{t 'generic.saved'}}
+        {{else}}
+          {{t 'generic.save'}}
+        {{/if}}
+      </button>
     </div>
+  </div>
 </section>
 <section class="box mt-30">
   <h3>{{t 'authPage.shibboleth.disabled.testAuth.header'}}</h3>
diff --git a/lib/shared/addon/components/cluster-driver/driver-googlegke/template.hbs b/lib/shared/addon/components/cluster-driver/driver-googlegke/template.hbs
index ac9302e88..bac4d43da 100644
--- a/lib/shared/addon/components/cluster-driver/driver-googlegke/template.hbs
+++ b/lib/shared/addon/components/cluster-driver/driver-googlegke/template.hbs
@@ -1,14 +1,15 @@
 {{#if (eq step 1)}}
   {{#input-text-file
-      label='clusterNew.googlegke.credential.label'
-      value=config.credential
-      accept="text/*, .json"
-      minHeight=60
-      canChangeName=false
-      nameRequired=true
-      placeholder="clusterNew.googlegke.credential.placeholder"
-      fileChosen=(action "clickNext")
-      as |section|
+       classNames="box"
+       label='clusterNew.googlegke.credential.label'
+       value=config.credential
+       accept="text/*, .json"
+       minHeight=60
+       canChangeName=false
+       nameRequired=true
+       placeholder="clusterNew.googlegke.credential.placeholder"
+       fileChosen=(action "clickNext")
+       as |section|
   }}
     {{#if (eq section 'description')}}
       <div class="row help">
@@ -21,20 +22,20 @@
 
   {{top-errors errors=errors}}
   {{save-cancel
-    createLabel="clusterNew.googlegke.checkServiceAccount"
-    savingLabel="clusterNew.googlegke.checkingServiceAccount"
-    save=(action "checkServiceAccount")
-    cancel=close
+      createLabel="clusterNew.googlegke.checkServiceAccount"
+      savingLabel="clusterNew.googlegke.checkingServiceAccount"
+      save=(action "checkServiceAccount")
+      cancel=close
   }}
 
 {{else}}
   {{#accordion-list showExpandAll=false as |al expandFn|}}
     {{#accordion-list-item
-      title=(t 'clusterNew.customize.title')
-      detail=(t 'clusterNew.customize.detail')
-      everExpanded=true
-      expandAll=al.expandAll
-      expand=(action expandFn)
+         title=(t 'clusterNew.customize.title')
+         detail=(t 'clusterNew.customize.detail')
+         everExpanded=true
+         expandAll=al.expandAll
+         expand=(action expandFn)
     }}
       <div class="row">
         <div class="col span-6">
@@ -70,12 +71,12 @@
     {{/accordion-list-item}}
 
     {{#accordion-list-item
-      title=(t 'clusterNew.nodes.title')
-      detail=(t 'clusterNew.nodes.detail')
-      showExpand=false
-      expandOnInit=true
-      expandAll=al.expandAll
-      expand=(action expandFn)
+         title=(t 'clusterNew.nodes.title')
+         detail=(t 'clusterNew.nodes.detail')
+         showExpand=false
+         expandOnInit=true
+         expandAll=al.expandAll
+         expand=(action expandFn)
     }}
       <div class="row">
         <div class="col span-6">
@@ -84,13 +85,13 @@
             {{config.zone}}
           {{else}}
             {{new-select
-              classNames="form-control"
-              optionValuePath="name"
-              optionLabelPath="name"
-              content=zoneChoices
-              value=config.zone
-              prompt="clusterNew.googlegke.zone.prompt"
-              localizedPrompt=true
+                classNames="form-control"
+                optionValuePath="name"
+                optionLabelPath="name"
+                content=zoneChoices
+                value=config.zone
+                prompt="clusterNew.googlegke.zone.prompt"
+                localizedPrompt=true
             }}
           {{/if}}
         </div>
@@ -122,12 +123,12 @@
         <div class="col span-6">
           <label class="acc-label">{{t 'clusterNew.googlegke.diskSizeGb.label'}}</label>
           <div class="input-group">
-          {{#if editing}}
-            {{config.diskSizeGb}}{{t 'generic.gigabyte'}}
-          {{else}}
-            {{input-number min=1 value=config.diskSizeGb}}
-            <span class="input-group-addon bg-default">{{t 'generic.gigabyte'}}</span>
-          {{/if}}
+            {{#if editing}}
+              {{config.diskSizeGb}}{{t 'generic.gigabyte'}}
+            {{else}}
+              {{input-number min=1 value=config.diskSizeGb}}
+              <span class="input-group-addon bg-default">{{t 'generic.gigabyte'}}</span>
+            {{/if}}
           </div>
         </div>
       </div>
diff --git a/lib/shared/addon/components/cru-certificate/template.hbs b/lib/shared/addon/components/cru-certificate/template.hbs
index 3606c89fa..1008b8dda 100644
--- a/lib/shared/addon/components/cru-certificate/template.hbs
+++ b/lib/shared/addon/components/cru-certificate/template.hbs
@@ -15,10 +15,10 @@
   {{/if}}
 {{else}}
   {{form-name-description
-    model=primaryResource
-    nameRequired=true
-    namePlaceholder="newSecret.name.placeholder"
-    descriptionPlaceholder="newSecret.description.placeholder"
+      model=primaryResource
+      nameRequired=true
+      namePlaceholder="newSecret.name.placeholder"
+      descriptionPlaceholder="newSecret.description.placeholder"
   }}
 {{/if}}
 
@@ -30,12 +30,13 @@
       <label class="acc-label pt-5">{{t 'newCertificate.key.label'}}{{#if isNew}}{{field-required}}{{/if}}</label>
     </div>
     {{input-text-file
-      value=model.key
-      canChangeName=false
-      accept="text/plain,.pem,.pkey,.key"
-      minHeight=60
-      placeholder="newCertificate.key.placeholder"
-      shouldChangeName=false
+        classNames="box"
+        value=model.key
+        canChangeName=false
+        accept="text/plain,.pem,.pkey,.key"
+        minHeight=60
+        placeholder="newCertificate.key.placeholder"
+        shouldChangeName=false
     }}
   </div>
 
@@ -47,13 +48,14 @@
       </span>
     </div>
     {{input-text-file
-      value=model.certs
-      multiple=true
-      canChangeName=false
-      accept="application/x-x509-ca-cert,text/plain,.pem,.crt"
-      minHeight=60
-      placeholder="newCertificate.cert.placeholder"
-      shouldChangeName=false
+        classNames="box"
+        value=model.certs
+        multiple=true
+        canChangeName=false
+        accept="application/x-x509-ca-cert,text/plain,.pem,.crt"
+        minHeight=60
+        placeholder="newCertificate.cert.placeholder"
+        shouldChangeName=false
     }}
   </div>
 </div>
diff --git a/lib/shared/addon/components/input-files/template.hbs b/lib/shared/addon/components/input-files/template.hbs
index 7ca3546b9..a2f61c334 100644
--- a/lib/shared/addon/components/input-files/template.hbs
+++ b/lib/shared/addon/components/input-files/template.hbs
@@ -19,18 +19,19 @@
 
 {{#each ary as |file|}}
   {{#input-text-file
-    accept=accept
-    classNames='mb-20'
-    name=file.name
-    inputName=true
-    namePlaceholder=namePlaceholder
-    canChangeName=true
-    shouldChangeName=(not file.uploaded)
-    canUpload=false
-    value=file.value
-    placeholder=valuePlaceholder
+       classNames="box"
+       accept=accept
+       classNames='mb-20'
+       name=file.name
+       inputName=true
+       namePlaceholder=namePlaceholder
+       canChangeName=true
+       shouldChangeName=(not file.uploaded)
+       canUpload=false
+       value=file.value
+       placeholder=valuePlaceholder
   }}
-  <button class="btn bg-primary" {{action "remove" file}}><i class="icon icon-minus"></i></button>
+    <button class="btn bg-primary" {{action "remove" file}}><i class="icon icon-minus"></i></button>
   {{/input-text-file}}
 {{/each}}
 
diff --git a/lib/shared/addon/components/save-cancel/component.js b/lib/shared/addon/components/save-cancel/component.js
index f857eb58a..cb955111c 100644
--- a/lib/shared/addon/components/save-cancel/component.js
+++ b/lib/shared/addon/components/save-cancel/component.js
@@ -4,23 +4,24 @@ import layout from './template';
 
 export default Component.extend({
   layout,
-  editing: null,
-  createLabel: 'saveCancel.create',
-  savingLabel: 'saveCancel.saving',
-  editLabel: 'saveCancel.edit',
-  cancelLabel: 'saveCancel.cancel',
-  saveDisabled: false,
-  cancelDisabled: false,
-  savedLabel: 'saveCancel.saved',
-  saveColor: 'bg-primary',
-  savedColor: 'bg-success',
-  cancelColor: 'bg-transparent',
-  forFooter: true,
-  classNames: ['text-center', 'pt-20'],
 
-  classNamesBindings: ['forFooter:footer-actions'],
-  saving: false,
-  saved: false,
+  classNames:         ['text-center', 'pt-20'],
+  classNamesBindings: ['forFooter: footer-actions'],
+
+  cancelColor:        'bg-transparent',
+  cancelDisabled:     false,
+  cancelLabel:        'saveCancel.cancel',
+  createLabel:        'saveCancel.create',
+  editLabel:          'saveCancel.edit',
+  editing:            null,
+  forFooter:          true,
+  saveColor:          'bg-primary',
+  saveDisabled:       false,
+  saved:              false,
+  savedColor:         'bg-success',
+  savedLabel:         'saveCancel.saved',
+  saving:             false,
+  savingLabel:        'saveCancel.saving',
 
   actions: {
     save() {