diff --git a/app.py b/app.py
index 5311148..4417201 100755
--- a/app.py
+++ b/app.py
@@ -1197,6 +1197,7 @@ def index(path):
                            search_folders = folder_names,
                             title_short=app_config.get('TITLE_SHORT', 'Default Title'),
                             title_long=app_config.get('TITLE_LONG' , 'Default Title'),
+                            features=app_config.get('FEATURES', None),
                             og_title=og_title,
                             og_description=og_description,
                             admin_enabled=auth.is_admin()
diff --git a/templates/app.html b/templates/app.html
index e226bda..8729289 100644
--- a/templates/app.html
+++ b/templates/app.html
@@ -61,12 +61,14 @@
     </div>
     {% endif %}
     
+    {% if features %}
     <!-- Tab Navigation -->
     <nav class="main-tabs">
-      <button class="tab-button active" data-tab="browse">Audio/Photo</button>
-      <button class="tab-button" data-tab="messages">Nachrichten</button>
-      <button class="tab-button" data-tab="calendar">Kalender</button>
+      {% if "files"    in features %}<button class="tab-button active" data-tab="browse">Audio/Photo</button>{% endif %}
+      {% if "messages" in features %}<button class="tab-button" data-tab="messages">Nachrichten</button>{% endif %}
+      {% if "calendar" in features %}<button class="tab-button" data-tab="calendar">Kalender</button>{% endif %}
     </nav>
+    {% endif %}
     
     <!-- Browse Section -->
     <main id="browse-section" class="tab-content active">
diff --git a/templates/calendar_section.html b/templates/calendar_section.html
index 363ee9b..1d6b707 100644
--- a/templates/calendar_section.html
+++ b/templates/calendar_section.html
@@ -56,9 +56,8 @@
           {% if admin_enabled %}
           <div class="row g-3 mt-1" id="calendarRecurrenceRow">
             <div class="col-md-6">
-              <label for="calendarRepeatCount" class="form-label">Wöchentliche Wiederholung</label>
+              <label for="calendarRepeatCount" class="form-label">Anzahl Wiederholung (Wöchentlich)</label>
               <input type="number" class="form-control" id="calendarRepeatCount" min="1" max="52" step="1" value="1">
-              <div class="form-text">Legt einzelne wöchentliche Termine an (für Nachbearbeitung).</div>
             </div>
           </div>
           {% endif %}