diff --git a/web/snapshots/brass_web__endpoints__availability__get_new__tests__inner_produces_template_when_user_is_admin.snap b/web/snapshots/brass_web__endpoints__availability__get_new__tests__inner_produces_template_when_user_is_admin.snap
index 1d02c00a..45161b36 100644
--- a/web/snapshots/brass_web__endpoints__availability__get_new__tests__inner_produces_template_when_user_is_admin.snap
+++ b/web/snapshots/brass_web__endpoints__availability__get_new__tests__inner_produces_template_when_user_is_admin.snap
@@ -8,7 +8,7 @@ snapshot_kind: text
     
     <form hx-post="/availability/new" hx-target="body"
           hx-target-422="#error">
-      <h1 class="title">Neue Vefügbarkeit für Mittwoch, 01.01.2025</h1>
+      <h1 class="title">Neue Verfügbarkeit für Mittwoch, 01.01.2025</h1>
 
       <input type="hidden" name="startdate" value="2025-01-01">
       <input type="hidden" name="enddate" value="2025-01-01" id="enddate">
diff --git a/web/src/mail/notify_planned.rs b/web/src/mail/notify_planned.rs
index ca461913..a93f3bf4 100644
--- a/web/src/mail/notify_planned.rs
+++ b/web/src/mail/notify_planned.rs
@@ -10,7 +10,7 @@ use crate::{
     mail::Mailer,
     utils::{
         ApplicationError,
-        DateTimeFormat::{DayMonthYear, WeekdayDayMonthYear},
+        DateTimeFormat::{DayMonthYear, HourMinute, WeekdayDayMonthYear},
     },
 };
 
diff --git a/web/src/mail/snapshots/brass_web__mail__notify_planned__tests__build_mail_snapshot.snap b/web/src/mail/snapshots/brass_web__mail__notify_planned__tests__build_mail_snapshot.snap
index 23107874..c094ff46 100644
--- a/web/src/mail/snapshots/brass_web__mail__notify_planned__tests__build_mail_snapshot.snap
+++ b/web/src/mail/snapshots/brass_web__mail__notify_planned__tests__build_mail_snapshot.snap
@@ -24,8 +24,8 @@ du wurdest soeben f=C3=BCr die Veranstaltung Wave Gotik Treffen am Sonntag,=
 Hier die Infos zur Veranstaltung:
     - Name: Wave Gotik Treffen
     - Ort: agra Messe Leipzig
-    - Beginn: 2025-06-01 18:30:00
-    - Ende: 2025-06-02 04:00:00
+    - Beginn: 18:30 Uhr
+    - Ende: 04:00 Uhr
     - Kleidungsordnung: komplette PSA
     - Anmerkungen: Anfahrt Bereitstellungsraum =C3=BCber xyz...
 
@@ -45,9 +45,9 @@ ag, 01.06.2025 als Posten eingeteilt.</p>
 
 <ul>
     <li>Name: Wave Gotik Treffen</li>
-    <li>- Ort: agra Messe Leipzig</li>
-    <li>Beginn: 2025-06-01 18:30:00</li>
-    <li>Ende: 2025-06-02 04:00:00</li>
+    <li>Ort: agra Messe Leipzig</li>
+    <li>Beginn: 18:30 Uhr</li>
+    <li>Ende: 04:00 Uhr</li>
     <li>Kleidungsordnung: komplette PSA</li>
     <li>Anmerkungen: Anfahrt Bereitstellungsraum =C3=BCber xyz...</li>
 </ul>
diff --git a/web/templates/availability/new_or_edit.html b/web/templates/availability/new_or_edit.html
index 86d77d5c..90bf12d6 100644
--- a/web/templates/availability/new_or_edit.html
+++ b/web/templates/availability/new_or_edit.html
@@ -6,7 +6,7 @@
     {% let is_edit = id.is_some() %}
     <form hx-post="/availability/{% if is_edit %}edit/{{ id.unwrap() }}{% else %}new{% endif %}" hx-target="body"
           hx-target-422="#error">
-      <h1 class="title">{% if is_edit %}Bearbeite{% else %}Neue{% endif %} Vefügbarkeit für {{
+      <h1 class="title">{% if is_edit %}Bearbeite{% else %}Neue{% endif %} Verfügbarkeit für {{
         date|fmt_date(WeekdayDayMonthYear) }}</h1>
 
       <input type="hidden" name="startdate" value="{{ date }}">
diff --git a/web/templates/calendar.html b/web/templates/calendar.html
index 08ddeaba..b24607eb 100644
--- a/web/templates/calendar.html
+++ b/web/templates/calendar.html
@@ -274,12 +274,14 @@
         </div>
         {% if selected_area.is_none() || selected_area.unwrap() == user.area_id %}
         <div class="level-right">
+          {% if user.role == Role::Admin || user.role == Role::AreaManager %}
           <a class="button is-link is-outlined" href="/availability/new-other?date={{ date }}">
             <svg class="icon">
               <use href="/static/feather-sprite.svg#plus-circle" />
             </svg>
             <span>Neue Verfügbarkeit für anderen Nutzer</span>
           </a>
+          {% endif %}
           {% let btn_disabled = !user_can_create_availability %}
           <a class="button is-link is-light" href="/availability/new?date={{ date }}" {{
              btn_disabled|cond_show("disabled") }}>
diff --git a/web/templates/emails/notify_planned.html b/web/templates/emails/notify_planned.html
index e71684a9..9941ee3c 100644
--- a/web/templates/emails/notify_planned.html
+++ b/web/templates/emails/notify_planned.html
@@ -7,8 +7,8 @@
 <ul>
     <li>Name: {{ event.name }}</li>
     <li>Ort: {{ event.location.as_ref().unwrap().name }}</li>
-    <li>Beginn: {{ event.start }}</li>
-    <li>Ende: {{ event.end }}</li>
+    <li>Beginn: {{ event.start|fmt_datetime(HourMinute) }} Uhr</li>
+    <li>Ende: {{ event.end|fmt_datetime(HourMinute) }} Uhr</li>
     <li>Kleidungsordnung: {{ event.clothing.name }}</li>
     {% if let Some(note) = event.note %}<li>Anmerkungen: {{ note }}</li>{% endif %}
 </ul>
diff --git a/web/templates/emails/notify_planned.txt b/web/templates/emails/notify_planned.txt
index 3d873f2e..6a65f67b 100644
--- a/web/templates/emails/notify_planned.txt
+++ b/web/templates/emails/notify_planned.txt
@@ -5,8 +5,8 @@ du wurdest soeben für die Veranstaltung {{ event.name }} am {{ event.start|fmt_
 Hier die Infos zur Veranstaltung:
     - Name: {{ event.name }}
     - Ort: {{ event.location.as_ref().unwrap().name }}
-    - Beginn: {{ event.start }}
-    - Ende: {{ event.end }}
+    - Beginn: {{ event.start|fmt_datetime(HourMinute) }} Uhr
+    - Ende: {{ event.end|fmt_datetime(HourMinute) }} Uhr
     - Kleidungsordnung: {{ event.clothing.name }}
     {% if let Some(note) = event.note %}- Anmerkungen: {{ note }}{% endif %}
 
diff --git a/web/templates/location/overview.html b/web/templates/location/overview.html
index 06fbc580..a901b14d 100644
--- a/web/templates/location/overview.html
+++ b/web/templates/location/overview.html
@@ -40,6 +40,7 @@
             <h5 class="title is-5">Bereich {{ gl.0.name }}</h5>
           </div>
 
+          {% if user.role == Role::Admin %}
           <div class="level-item buttons are-small">
             <a class="button is-primary is-light" hx-boost="true" href="/area/edit/{{ gl.0.id }}">
               <svg class="icon">
@@ -53,6 +54,7 @@
               </svg>
             </button>
           </div>
+          {% endif %}
         </div>
       </div>