diff --git a/docs/index.html b/docs/index.html
index 9c03302..d2d3538 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -78,7 +78,7 @@
         </div>
       </fieldset>
 
-      <section class="align-right">
+      <section class="field-row align-right">
         <button>OK</button>
         <button>Cancel</button>
       </section>
diff --git a/style.css b/style.css
index d06d1ff..a16aed9 100644
--- a/style.css
+++ b/style.css
@@ -149,12 +149,8 @@ button:focus {
   margin-top: var(--element-spacing);
 }
 
-section.align-right {
-  text-align: right;
-}
-
-section * + * {
-  margin-left: var(--grouped-element-spacing);
+.align-right {
+  justify-content: flex-end;
 }
 
 fieldset {
@@ -162,6 +158,7 @@ fieldset {
   box-shadow: var(--border-sunken-outer), var(--border-raised-inner);
   padding: calc(2 * var(--border-width) + var(--element-spacing));
   padding-block-start: var(--element-spacing);
+  margin: 0;
 }
 
 legend {