diff --git a/nummi/main/static/main/css/form.css b/nummi/main/static/main/css/form.css
index 440f13d..c39223c 100644
--- a/nummi/main/static/main/css/form.css
+++ b/nummi/main/static/main/css/form.css
@@ -7,7 +7,7 @@ form ul.errorlist {
 
 form {
   display: grid;
-  grid-gap: var(--gap);
+  gap: 0.5rem;
   grid-template-columns: repeat(auto-fill, 32rem);
   @media (width < 1024px) {
     grid-template-columns: 1fr;
@@ -15,7 +15,7 @@ form {
 
   .column {
     display: grid;
-    grid-gap: var(--gap);
+    gap: 0.5rem;
     border: 1px solid var(--gray);
     padding: var(--gap);
 
@@ -23,7 +23,7 @@ form {
       display: grid;
       grid-auto-columns: 1fr;
       grid-auto-flow: column;
-      grid-gap: inherit;
+      gap: inherit;
       padding: 0;
       margin: 0;
       border: none;
@@ -32,11 +32,25 @@ form {
     .field {
       display: grid;
       grid-auto-rows: min-content;
+      align-items: center;
       overflow: hidden;
+      column-gap: 0.5rem;
 
       &:has(> textarea) {
         grid-template-rows: min-content 1fr;
       }
+      &:has(input[type="checkbox"]) {
+        grid-template-columns: min-content 1fr;
+        > label {
+          font-size: inherit;
+          grid-row: 1;
+          grid-column: 2;
+        }
+        > input {
+          grid-row: 1;
+          grid-column: 1;
+        }
+      }
 
       > label {
         font-size: 0.8rem;
@@ -91,7 +105,7 @@ form {
     display: grid;
     grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr));
     grid-auto-rows: 1fr;
-    grid-gap: var(--gap);
+    gap: 0.5rem;
     align-items: center;
 
     input {
diff --git a/nummi/main/static/main/css/main.css b/nummi/main/static/main/css/main.css
index e0e880c..9181c72 100644
--- a/nummi/main/static/main/css/main.css
+++ b/nummi/main/static/main/css/main.css
@@ -373,6 +373,7 @@ ul.invoices {
   gap: 0.5rem;
   list-style: none;
   padding: 0;
+  margin: 0;
 
   li {
     display: grid;