diff --git a/src/css.html b/src/css.html
index e5bd700..92e7770 100644
--- a/src/css.html
+++ b/src/css.html
@@ -4,6 +4,16 @@
     background-color: darkseagreen;
   }
 
+  @media (min-width: 992px) {
+    .container {
+      border-radius: var(--bs-border-radius-lg) !important;
+    }
+  }
+
+  a {
+    color: #af58a7;
+  }
+
   .btn-custom {
     --bd-violet-bg: darkseagreen;
     --bd-violet-rgb: 112.520718, 44.062154, 249.437846;
@@ -11,17 +21,17 @@
     --bs-btn-font-weight: 600;
     --bs-btn-color: var(--bs-white);
     --bs-btn-bg: var(--bd-violet-bg);
-    --bs-btn-border-color: rgb(70, 70, 70);
+    --bs-btn-border-color: rgb(80, 80, 80);
     --bs-btn-hover-color: var(--bs-white);
     --bs-btn-hover-bg: rgb(157, 207, 157);
-    --bs-btn-hover-border-color: rgb(70, 70, 70);
+    --bs-btn-hover-border-color: rgb(80, 80, 80);
     --bs-btn-focus-shadow-rgb: var(--bd-violet-rgb);
     --bs-btn-active-color: var(--bs-btn-hover-color);
     --bs-btn-active-bg: rgb(124, 163, 124);
-    --bs-btn-active-border-color: rgb(70, 70, 70);
+    --bs-btn-active-border-color: rgb(80, 80, 80);
     --bs-btn-disabled-color: var(--bs-btn-hover-color);
     --bs-btn-disabled-bg: rgb(132, 142, 132);
-    --bs-btn-disabled-border-color: rgb(70, 70, 70);
+    --bs-btn-disabled-border-color: rgb(80, 80, 80);
   }
 
   .ferienpass-logo {
diff --git a/src/index.html b/src/index.html
index 5c3fac4..b58cfc9 100644
--- a/src/index.html
+++ b/src/index.html
@@ -11,7 +11,7 @@
     <img class="d-block mx-auto ferienpass-logo" src="https://booking.ferienpass-seeberg.ch/ferienpass-transparent.webp"
       alt="Logo Ferienpass Seeberg">
   </div>
-  <div class="container bg-body-tertiary px-lg-5 py-5 rounded-3 border border-secondary">
+  <div class="container bg-body-tertiary px-md-4 px-lg-5 py-5">
     <main>
       <form id="form" class="needs-validation" novalidate>
         <input type="hidden" id="origin" value="<?!= data.origin ?>" name="origin">
@@ -73,58 +73,62 @@ <h2 class="mb-3 display-6">🏸 Kursangebot
           <h2 class="mb-3 display-6">🗒️ Anmeldeinformationen</h2>
 
           <div class="col-sm-6">
-            <label for="firstName" class="form-label">Vorname</label>
-            <input type="text" class="form-control" id="firstName" name="firstName" placeholder="" value="" required="">
+            <label for="firstName" class="form-label">Vorname&ast;</label>
+            <input type="text" class="form-control border border-secondary" id="firstName" name="firstName"
+              placeholder="" value="" required="">
             <div class="invalid-feedback">
               Bitte Vorname angeben.
             </div>
           </div>
 
           <div class="col-sm-6">
-            <label for="lastName" class="form-label">Nachname</label>
-            <input type="text" class="form-control" id="lastName" name="lastName" placeholder="" value="" required="">
+            <label for="lastName" class="form-label">Nachname&ast;</label>
+            <input type="text" class="form-control border border-secondary" id="lastName" name="lastName" placeholder=""
+              value="" required="">
             <div class="invalid-feedback">
               Bitte Nachnamen angeben.
             </div>
           </div>
 
           <div class="col-sm-12">
-            <label for="address" class="form-label">Strasse und Hausnummer</label>
-            <input type="text" class="form-control" id="address" name="address" placeholder="" value="" required="">
+            <label for="address" class="form-label">Strasse und Hausnummer&ast;</label>
+            <input type="text" class="form-control border border-secondary" id="address" name="address" placeholder=""
+              value="" required="">
             <div class="invalid-feedback">
               Bitte Strasse und Hausnummer abgeben.
             </div>
           </div>
 
           <div class="col-sm-3">
-            <label for="zip" class="form-label">Postleitzahl</label>
-            <input type="text" class="form-control" id="zip" name="zip" pattern="[0-9]{4}" value="" placeholder=""
-              required="">
+            <label for="zip" class="form-label">Postleitzahl&ast;</label>
+            <input type="text" class="form-control border border-secondary" id="zip" name="zip" pattern="[0-9]{4}"
+              value="" placeholder="" required="">
             <div class="invalid-feedback">
               Bitte Postleitzahl angeben.
             </div>
           </div>
 
           <div class="col-sm-9">
-            <label for="city" class="form-label">Ort</label>
-            <input type="text" class="form-control" id="city" name="city" minlength="3" value="" placeholder=""
-              required="">
+            <label for="city" class="form-label">Ort&ast;</label>
+            <input type="text" class="form-control border border-secondary" id="city" name="city" minlength="3" value=""
+              placeholder="" required="">
             <div class="invalid-feedback">
               Bitte Wohnort abgeben.
             </div>
           </div>
 
           <div class="col-sm-3">
-            <label for="email" class="form-label">E-Mail</label>
-            <input type="email" class="form-control" id="email" name="email" value="" placeholder="" required="">
+            <label for="email" class="form-label">E-Mail&ast;</label>
+            <input type="email" class="form-control border border-secondary" id="email" name="email" value=""
+              placeholder="" required="">
             <div class="invalid-feedback">
               Bitte gib eine gültige E-Mail Adresse an.
             </div>
           </div>
 
           <div class="col-sm-3">
-            <label for="phone" class="form-label">Handynummer</label>
-            <input type="phone" class="form-control" id="phone" name="phone"
+            <label for="phone" class="form-label">Handynummer&ast;</label>
+            <input type="phone" class="form-control border border-secondary" id="phone" name="phone"
               pattern="[0-9]{3}[\s]?[0-9]{3}[\s]?[0-9]{2}[\s]?[0-9]{2}" value="" placeholder="" required="">
             <div class="invalid-feedback">
               Bitte gib eine gültige Telefonnummer im Format '079 999 99 99' an.
@@ -132,8 +136,8 @@ <h2 class="mb-3 display-6">🗒️ Anmeldeinformationen</h2>
           </div>
 
           <div class="col-sm-3">
-            <label for="grade" class="form-label">Klasse (2023/24)</label>
-            <select class="form-select" id="grade" name="grade" required="">
+            <label for="grade" class="form-label">Klasse (2023/24)&ast;</label>
+            <select class="form-select border border-secondary" id="grade" name="grade" required="">
               <option value="">Bitte Klasse angeben</option>
               <option value="1">1. Klasse</option>
               <option value="2">2. Klasse</option>
@@ -151,8 +155,9 @@ <h2 class="mb-3 display-6">🗒️ Anmeldeinformationen</h2>
           </div>
 
           <div class="col-sm-3">
-            <label for="birthday" class="form-label">Geburtsdatum</label>
-            <input type="date" class="form-control" id="birthday" name="birthday" value="" placeholder="" required="">
+            <label for="birthday" class="form-label">Geburtsdatum&ast;</label>
+            <input type="date" class="form-control border border-secondary" id="birthday" name="birthday" value=""
+              placeholder="" required="">
             <div class="invalid-feedback">
               Bitte gib ein gültiges Geburtsdatum an.
             </div>
@@ -194,7 +199,7 @@ <h2 class="mb-3 display-6">
 
           <div class="col-sm-6">
             <label for="volunteering" class="form-label">Art des Einsatzes (optional)</label>
-            <select class="form-select no-validate" id="volunteering" name="volunteering">
+            <select class="form-select no-validate border border-secondary" id="volunteering" name="volunteering">
               <option value="">Bitte Einsatzart auswählen</option>
               <option value="1">Festaufbau</option>
               <option value="2">Festbetrieb</option>
@@ -204,7 +209,8 @@ <h2 class="mb-3 display-6">
 
           <div class="col-sm-6">
             <label for="volunteer" class="form-label">Vor- und Nachname</label>
-            <input type="text" class="form-control no-validate" id="volunteer" name="volunteer" placeholder="">
+            <input type="text" class="form-control no-validate border border-secondary" id="volunteer" name="volunteer"
+              placeholder="">
           </div>
 
           <hr class="my-4">
@@ -270,8 +276,7 @@ <h2 class="mb-3 display-6">
   <footer class="my-5 pt-5 text-body-secondary text-center text-small">
     <p class="mb-1"><i class="bi bi-c-circle"></i> 2023 Ferienpass Seeberg</p>
     <p class="mb-1"><i class="bi bi-question-circle-fill"></i> Bei Problemen mit der Buchung sende uns eine
-      <a href="mailto:<?!= PropertiesService.getScriptProperties().getProperty('EMAIL_FROM_ADDRESS') ?>"
-        class="link-secondary">E-Mail</a>.
+      <a href="mailto:<?!= PropertiesService.getScriptProperties().getProperty('EMAIL_FROM_ADDRESS') ?>">E-Mail</a>.
     </p>
   </footer>
 
diff --git a/src/javascript.html b/src/javascript.html
index cfd3a1c..05986f7 100644
--- a/src/javascript.html
+++ b/src/javascript.html
@@ -32,11 +32,11 @@
     if (availableSeats <= 0) [badgeState, badgeText] = ['danger', 'Warteliste']
     else if (availableSeats <= 5) [badgeState, badgeText] = ['warning', 'wenige Plätze']
     return `
-    <br class="d-none d-lg-block">
+    <br class="d-none d-md-block">
     <p>
       <small class="d-none d-lg-block">
-        <i class="bi bi-people-fill"></i>&ensp;Max. Teilnehmerzahl: ${participantLimit}<br>
-        <i class="bi bi-pencil-square"></i>&ensp;Anzahl Anmeldungen: ${bookings}<br>
+        <i class="bi bi-people-fill"></i>&ensp;Anzahl Plätze: ${participantLimit}<br>
+        <i class="bi bi-pencil-square"></i>&ensp;Anmeldungen: ${bookings}<br>
         <i class="bi bi-check2-square"></i>&ensp;Freie Plätze: ${availableSeats}
       </small>
       <span class="badge text-bg-${badgeState} bg-${badgeState}">${badgeText}</span>
@@ -66,10 +66,10 @@
       <td>${id}</td>
       <td>
         <label for="event-${id}-input">${name}</label>
-        <p class="d-none d-lg-block"><small>${description}</small></p>
+        <p class="d-none d-md-block"><small>${description}</small></p>
       </td>
       <td>
-        <br class="d-none d-lg-block">
+        <br class="d-none d-md-block">
         <div id="event-${id}-details">
           <p style="white-space: nowrap;" data-search-meta="${gradeMetaData.join(' ')}"><small>
             <i class="bi bi-calendar"></i>&ensp;${day}, ${date}<br>
@@ -180,7 +180,7 @@ <h4 class="alert-heading">${head}</h4>
         .processForm([...new FormData(form).entries()])
     }
     else {
-      alert('warning', 'Fehlende Angaben in der Anmeldung', 'Bitte fülle alle Felder aus. Ich habe sie dir oben rot markiert.')
+      alert('warning', 'Fehlende Angaben in der Anmeldung', 'Es fehlen noch Angaben in der Anmeldung. Bitte überprüfe deine Angaben und versuche es erneut.')
       form.classList.add('was-validated')
     }
   }
diff --git a/src/status.html b/src/status.html
index 9ac9154..f242e35 100644
--- a/src/status.html
+++ b/src/status.html
@@ -11,7 +11,7 @@
     <img class="d-block mx-auto ferienpass-logo" src="https://booking.ferienpass-seeberg.ch/ferienpass-transparent.webp"
       alt="Logo Ferienpass Seeberg">
   </div>
-  <div class="container container-sm bg-body-tertiary px-lg-5 py-5 rounded-3 border border-secondary">
+  <div class="container container-sm bg-body-tertiary px-lg-5 py-5">
     <main>
       <div class="text-center">
         <h1 class="display-3">Deine gebuchten Kurse</h1>
diff --git a/src/success.html b/src/success.html
index b293b3c..072818a 100644
--- a/src/success.html
+++ b/src/success.html
@@ -11,7 +11,7 @@
     <img class="d-block mx-auto ferienpass-logo" src="https://booking.ferienpass-seeberg.ch/ferienpass-transparent.webp"
       alt="Logo Ferienpass Seeberg">
   </div>
-  <div class="container bg-body-tertiary px-lg-5 py-5 rounded-3 border border-secondary">
+  <div class="container bg-body-tertiary px-lg-5 py-5">
     <main>
       <div class="text-center">
         <h1 class="display-3">Deine Anmeldung war erfolgreich 🎉</h1>