diff --git a/src/RolemasterDb.App/wwwroot/app.css b/src/RolemasterDb.App/wwwroot/app.css
index b94ca86..12d5715 100644
--- a/src/RolemasterDb.App/wwwroot/app.css
+++ b/src/RolemasterDb.App/wwwroot/app.css
@@ -697,6 +697,10 @@ textarea {
 }
 
 .critical-editor-dialog {
+    --critical-editor-control-height: 3.15rem;
+    --critical-editor-label-height: 1.05rem;
+    --critical-editor-field-gap: 0.35rem;
+    --critical-editor-control-offset: calc(var(--critical-editor-label-height) + var(--critical-editor-field-gap));
     width: min(1100px, 100%);
     max-height: calc(100vh - 2.5rem);
     display: flex;
@@ -804,6 +808,15 @@ textarea {
     min-height: 8rem;
 }
 
+.critical-editor-dialog input.input-shell,
+.critical-editor-dialog select.input-shell {
+    height: var(--critical-editor-control-height);
+}
+
+.critical-editor-dialog .field-shell label {
+    line-height: var(--critical-editor-label-height);
+}
+
 .critical-editor-error {
     margin: 0;
     padding: 0.85rem 0.95rem;
@@ -827,7 +840,7 @@ textarea {
 
 .critical-editor-effect-row {
     display: flex;
-    align-items: center;
+    align-items: flex-start;
     justify-content: space-between;
     gap: 0.75rem;
     padding: 0.65rem 0.75rem;
@@ -845,11 +858,25 @@ textarea {
 }
 
 .critical-editor-effect-badge {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-height: var(--critical-editor-control-height);
     min-width: 0;
+    margin-top: var(--critical-editor-control-offset);
 }
 
 .critical-editor-effect-badge .affix-badge-list {
+    width: 100%;
     margin-top: 0;
+    align-items: center;
+    justify-content: center;
+}
+
+.critical-editor-effect-badge .affix-badge {
+    align-items: center;
+    justify-content: center;
+    text-align: center;
 }
 
 .critical-editor-effect-kind,
@@ -980,7 +1007,11 @@ textarea {
     border: none;
     background: transparent;
     color: var(--accent);
+    min-height: var(--critical-editor-control-height);
+    margin-top: var(--critical-editor-control-offset);
     padding: 0.2rem 0.1rem;
+    display: inline-flex;
+    align-items: center;
     white-space: nowrap;
 }