diff --git a/crates/frontend/js-components/lib/edit-addressbook-form.ts b/crates/frontend/js-components/lib/edit-addressbook-form.ts
index 353ecd6..9a0dd21 100644
--- a/crates/frontend/js-components/lib/edit-addressbook-form.ts
+++ b/crates/frontend/js-components/lib/edit-addressbook-form.ts
@@ -30,7 +30,7 @@ export class EditAddressbookForm extends LitElement {
     return html`
       <button @click=${() => this.dialog.value.showModal()}>Edit addressbook</button>
       <dialog ${ref(this.dialog)}>
-        <h3>Create addressbook</h3>
+        <h3>Edit addressbook</h3>
         <form @submit=${this.submit} ${ref(this.form)}>
           <label>
             Displayname
diff --git a/crates/frontend/js-components/lib/edit-calendar-form.ts b/crates/frontend/js-components/lib/edit-calendar-form.ts
index 8beb395..33625e2 100644
--- a/crates/frontend/js-components/lib/edit-calendar-form.ts
+++ b/crates/frontend/js-components/lib/edit-calendar-form.ts
@@ -42,7 +42,7 @@ export class EditCalendarForm extends LitElement {
     return html`
       <button @click=${() => this.dialog.value.showModal()}>Edit calendar</button>
       <dialog ${ref(this.dialog)}>
-        <h3>Create calendar</h3>
+        <h3>Edit calendar</h3>
         <form @submit=${this.submit} ${ref(this.form)}>
           <label>
             Displayname
diff --git a/crates/frontend/public/assets/js/edit-addressbook-form.mjs b/crates/frontend/public/assets/js/edit-addressbook-form.mjs
index f5ab5e5..9418c07 100644
--- a/crates/frontend/public/assets/js/edit-addressbook-form.mjs
+++ b/crates/frontend/public/assets/js/edit-addressbook-form.mjs
@@ -29,7 +29,7 @@ let EditAddressbookForm = class extends i {
     return x`
       <button @click=${() => this.dialog.value.showModal()}>Edit addressbook</button>
       <dialog ${n(this.dialog)}>
-        <h3>Create addressbook</h3>
+        <h3>Edit addressbook</h3>
         <form @submit=${this.submit} ${n(this.form)}>
           <label>
             Displayname
diff --git a/crates/frontend/public/assets/js/edit-calendar-form.mjs b/crates/frontend/public/assets/js/edit-calendar-form.mjs
index e2e07cc..fdd8cbe 100644
--- a/crates/frontend/public/assets/js/edit-calendar-form.mjs
+++ b/crates/frontend/public/assets/js/edit-calendar-form.mjs
@@ -30,7 +30,7 @@ let EditCalendarForm = class extends i {
     return x`
       <button @click=${() => this.dialog.value.showModal()}>Edit calendar</button>
       <dialog ${n(this.dialog)}>
-        <h3>Create calendar</h3>
+        <h3>Edit calendar</h3>
         <form @submit=${this.submit} ${n(this.form)}>
           <label>
             Displayname
diff --git a/crates/frontend/public/assets/style.css b/crates/frontend/public/assets/style.css
index 979097d..9a4ca86 100644
--- a/crates/frontend/public/assets/style.css
+++ b/crates/frontend/public/assets/style.css
@@ -290,6 +290,7 @@ ul.collection-list {
       .color-chip {
         background: var(--color);
         grid-area: color-chip;
+        margin-left: 8px;
       }
 
       .actions {
@@ -346,6 +347,17 @@ select {
   }
 }
 
+form {
+
+  input[type="text"],
+  input[type="password"],
+  input[type="color"],
+  textarea,
+  select {
+    width: 100%;
+  }
+}
+
 svg.icon {
   stroke-width: 2px;
   color: var(--text-on-background-color);