diff --git a/api/templates/layout/default.hbs b/api/templates/layout/default.hbs
index df1838ad..0eb968f8 100644
--- a/api/templates/layout/default.hbs
+++ b/api/templates/layout/default.hbs
@@ -177,11 +177,22 @@
       }
 
       /* Form inputs and scaffolding */
-      .input-scaffold {
+      .input-scaffold,
+      .toggle-scaffold {
         position: relative;
         display: block;
         width: 100%;
-        padding: 16px;
+        padding: 12px 16px;
+      }
+
+      .input-scaffold label,
+      .toggle-scaffold label {
+        display: flex;
+        flex-direction: row;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+        align-items: center;
+        width: 100%;
       }
 
       .input-scaffold__label {
@@ -192,6 +203,11 @@
         margin-bottom: 6px;
       }
 
+      .toggle-scaffold__label {
+        font-size: 16px;
+        font-weight: bold;
+      }
+
       .input-scaffold__input {
         display: block;
         width: 100%;
@@ -205,6 +221,10 @@
         appearance: none;
       }
 
+      .toggle-scaffold__input {
+        margin-right: 8px;
+      }
+
       .input-scaffold__validation {
         margin-top: 8px;
       }
@@ -219,13 +239,20 @@
       }
 
       /* Alerts */
+      .alerts {
+        margin: 8px;
+      }
+
       .alert {
         width: 100%;
         height: auto;
         padding: 16px;
         font-weight: bold;
         border-radius: 4px;
-        margin-bottom: 16px;
+      }
+
+      .alert + .alert {
+        margin-top: 8px;
       }
 
       .alert--error {