diff --git a/changelog b/changelog
index dd71608..5856621 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,7 @@
     <ul>
         <li>Google- und Bing-Verifizierung nun auch im Plugin möglich</li>
         <li>Neue Nutzerrollen</li>
+        <li>Update in Menüstruktur</li>
     </ul>
 
 <h4>Version 4.3.7</h4>
diff --git a/includes/frontend-functions.php b/includes/frontend-functions.php
index 0d53ac9..60b858c 100644
--- a/includes/frontend-functions.php
+++ b/includes/frontend-functions.php
@@ -67,12 +67,12 @@ function bdp_add_menu_mein_lv() {
         3
     );
 
-    add_submenu_page($mainSlug,
+    /*add_submenu_page($mainSlug,
         'calendar_settings',
         'Kalender-Einstellungen',
         'manage_options',
         $moduleLoad . 'calendar'
-    );
+    );*/
 
     add_submenu_page($mainSlug,
         'calendar_settings',
diff --git a/includes/setup.php b/includes/setup.php
index 2ded9b0..d0b2a0c 100644
--- a/includes/setup.php
+++ b/includes/setup.php
@@ -24,6 +24,7 @@ require_once (BDP_LV_PLUGIN_DIR . '/modules/seo/seo.php');
 require_once (BDP_LV_PLUGIN_DIR . '/modules/calendar/calendar.php');
 require_once (BDP_LV_PLUGIN_DIR . '/includes/frontend-functions.php');
 
+require_once (BDP_LV_PLUGIN_DIR . '/modules/calendar/Views/settings-form.php');
 require_once (BDP_LV_PLUGIN_DIR . '/modules/security/security.php');
 
 function kompass_admin_init()
diff --git a/lang/bdp-kompass_de_DE.po b/lang/bdp-kompass_de_DE.po
index 82c1ec4..c21fd3c 100644
--- a/lang/bdp-kompass_de_DE.po
+++ b/lang/bdp-kompass_de_DE.po
@@ -1,6 +1,12 @@
 msgid "kompass"
 msgstr "kompass"
 
+msgid "Calendar settings"
+msgstr "Kalender-Einstellungen"
+
+msgid "Calendar URL"
+msgstr "Kalender-Adresse"
+
 msgid "SEO-Options"
 msgstr "Suchmaschinen-Einstellungen"
 
diff --git a/modules/KompassSettings/Controllers/SettingsPage.php b/modules/KompassSettings/Controllers/SettingsPage.php
index 3566b5e..5923617 100644
--- a/modules/KompassSettings/Controllers/SettingsPage.php
+++ b/modules/KompassSettings/Controllers/SettingsPage.php
@@ -7,7 +7,8 @@ class SettingsPage
 {
     public function __construct()
     {
-        add_options_page(BDP_LV_PLUGIN_SLUG . '-kompass',
+        add_options_page(
+	        __('kompass', BDP_LV_PLUGIN_SLUG) . ' - ' . __('Settings', BDP_LV_PLUGIN_SLUG),
             __('kompass', BDP_LV_PLUGIN_SLUG) . ' - ' . __('Settings', BDP_LV_PLUGIN_SLUG),
             'manage_options',
             BDP_LV_PLUGIN_SLUG . '-Kompass-settings',
@@ -22,6 +23,9 @@ class SettingsPage
         if (isset($_REQUEST['update_options']) && $_REQUEST['update_options'] == true) {
             switch ($tab) {
                 case 'tab1':
+	                update_option('bdp_calendar_categories', json_encode($_POST['category']));
+	                update_option('bdp_calendar_source_url', $_POST['ical_url']);
+	                $showMessage = __('The settings were saved.', BDP_LV_PLUGIN_SLUG);
                     break;
 
                 case 'tab2':
@@ -53,9 +57,10 @@ class SettingsPage
                 switch ($tab) {
                     case 'tab1':
                         echo '<form action="admin.php?page=bdp-kompass-Kompass-settings&tab=tab1" method="post">';
-                        do_settings_sections(BDP_LV_PLUGIN_SLUG . '-seo-settings');
-                        submit_button();
-	                    echo '<input type="hidden" name="tab" value="tab4" />';
+	                    do_settings_sections(BDP_LV_PLUGIN_SLUG . '-calendar-settings');
+                        require_once BDP_LV_PLUGIN_DIR . '/modules/calendar/Views/categories-partial.php';
+	                    echo '<input type="hidden" name="tab" value="tab1" />';
+	                    submit_button();
                         echo '</form>';
                         break;
                     case 'tab2':
diff --git a/modules/LimitLoginAttempts/Controllers/OptionsPage.php b/modules/LimitLoginAttempts/Controllers/OptionsPage.php
index f4ae80b..73e5e3e 100644
--- a/modules/LimitLoginAttempts/Controllers/OptionsPage.php
+++ b/modules/LimitLoginAttempts/Controllers/OptionsPage.php
@@ -6,7 +6,8 @@ class OptionsPage
 {
     public function __construct()
     {
-        add_options_page(BDP_LV_PLUGIN_SLUG . '-limit-login-attempts',
+        add_options_page(
+	        __('Login-Protection', BDP_LV_PLUGIN_SLUG),
             __('Login-Protection', BDP_LV_PLUGIN_SLUG),
             'manage_options',
             BDP_LV_PLUGIN_SLUG . '-limit-login-attempts',
diff --git a/modules/calendar/Views/categories-partial.php b/modules/calendar/Views/categories-partial.php
new file mode 100644
index 0000000..7934d68
--- /dev/null
+++ b/modules/calendar/Views/categories-partial.php
@@ -0,0 +1,66 @@
+<?php
+$categories =  get_option('bdp_calendar_categories', null);
+if (null !== $categories) {
+	$categories = json_decode($categories, true);
+} else {
+	$categories = [
+		'yellow' => 'Meute',
+		'blue'  => 'Sippe',
+		'red' => 'Runde',
+		'green' => 'Stammesführung',
+		'fuchsia' => '',
+		'orange' => ''
+	];
+}
+?>
+
+
+<table class="form-table">
+    <tr>
+        <th style="width: 200px" scope="row"></th>
+        <th></th>
+        <td style="width: 50px;"></td>
+        <td></td>
+    </tr>
+	<tr>
+		<th style="width: 210px;" scope="row">Gelb:</th>
+		<th><input type="text" name="category[yellow]" value="<?php echo $categories['yellow']; ?>" /></th>
+		<td style="width: 50px;" class="bdp_cal_event_yellow"></td>
+
+	</tr>
+
+	<tr>
+        <th style="width: 210px;" scope="row">Blau:</th>
+		<th><input type="text" name="category[blue]" value="<?php echo $categories['blue']; ?>" /></th>
+		<td class="bdp_cal_event_blue"></td>
+	</tr>
+
+	<tr>
+        <th style="width: 210px;" scope="row">Rot:</th>
+		<th><input type="text" name="category[red]" value="<?php echo $categories['red']; ?>" /></th>
+		<td class="bdp_cal_event_red"></td>
+	</tr>
+
+	<tr>
+        <th style="width: 210px;" scope="row">Grün:</th>
+		<th><input type="text" name="category[green]" value="<?php echo $categories['green']; ?>" /></th>
+		<td class="bdp_cal_event_green"></td>
+	</tr>
+
+	<tr>
+        <th style="width: 210px;" scope="row">Fuchsia:</th>
+		<th><input type="text" name="category[fuchsia]" value="<?php echo $categories['fuchsia']; ?>" /></th>
+		<td class="bdp_cal_event_fuchsia"></td>
+	</tr>
+
+	<tr>
+        <th style="width: 210px;" scope="row">Orange:</th>
+		<th><input type="text" name="category[orange]" value="<?php echo $categories['orange']; ?>" /></th>
+		<td class="bdp_cal_event_orange"></td>
+	</tr>
+	<tr>
+        <th style="width: 210px;" scope="row">Grau:</th>
+		<th>Standard</th>
+		<td class="bdp_cal_event_grey"></td>
+	</tr>
+</table>
\ No newline at end of file
diff --git a/modules/calendar/Views/settings-form.php b/modules/calendar/Views/settings-form.php
new file mode 100644
index 0000000..34d117b
--- /dev/null
+++ b/modules/calendar/Views/settings-form.php
@@ -0,0 +1,18 @@
+<?php
+
+add_settings_section(
+	'custom_settings_section',
+	__('Calendar settings', BDP_LV_PLUGIN_SLUG),
+	'custom_settings_section_callback',
+	BDP_LV_PLUGIN_SLUG . '-calendar-settings'
+);
+
+$seo_settings_page = BDP_LV_PLUGIN_SLUG . '-calendar-settings';
+
+add_settings_field(
+	'kompass_cal_1',
+	__('Calendar URL', BDP_LV_PLUGIN_SLUG),
+	'_kompass_limit_logins_settings_callback',
+	$seo_settings_page,
+	'custom_settings_section',
+	['setting' => 'bdp_calendar_source_url', 'style' => 'width: 1024px']);
diff --git a/modules/calendar/internal/index.php b/modules/calendar/internal/index.php
deleted file mode 100644
index 1e77c22..0000000
--- a/modules/calendar/internal/index.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-echo '<h1>Kalender-Einstellungen</h1>';
-if (isset($_POST['submit'])) {
-    echo '<div id="bdp_success">Die Einstellungen wurden gespeichert.</div>';
-    update_option('bdp_calendar_categories', json_encode($_POST['category']));
-    update_option('bdp_calendar_source_url', $_POST['ical_url']);
-}
-
-$categories =  get_option('bdp_calendar_categories', null);
-if (null !== $categories) {
-    $categories = json_decode($categories, true);
-} else {
-    $categories = [
-        'yellow' => 'Meute',
-        'blue'  => 'Sippe',
-        'red' => 'Runde',
-        'green' => 'Stammesführung',
-        'fuchsia' => '',
-        'orange' => ''
-    ];
-}
-?>
-<form method="post" action="admin.php?page=bdp-kompass%2Fmodules%2Findex.php&loadmodule=calendar">
-        <fieldset class="bdp_cal_inner">
-            <legend>Datenabfrage</legend>
-
-            <table>
-                <tr style="vertical-align: top;">
-                    <td>Kalender-URL:</td>
-                    <td><input class="long_text" type="text" name="ical_url" id="ical_url" required
-                               value = "<?php echo get_option('bdp_calendar_source_url', ''); ?>"
-                        ><br />
-                        <label style="font-weight: normal; color: #a0a0a0; font-style: italic">
-                            Bitte gib hier die URL zur .ics - Datei eures Kalenbders im Wiki ein.
-                        </label>
-                    </td>
-                </tr>
-            </table>
-        </fieldset>
-
-        <fieldset class="bdp_cal_inner">
-            <legend>Labels</legend>
-            <table>
-                <tr>
-                    <td>Gelb:</td>
-                    <td><input type="text" name="category[yellow]" value="<?php echo $categories['yellow']; ?>" /></td>
-                    <td class="bdp_cal_event_yellow"></td>
-                </tr>
-
-                <tr>
-                    <td>Blau:</td>
-                    <td><input type="text" name="category[blue]" value="<?php echo $categories['blue']; ?>" /></td>
-                    <td class="bdp_cal_event_blue"></td>
-                </tr>
-
-                <tr>
-                    <td>Rot:</td>
-                    <td><input type="text" name="category[red]" value="<?php echo $categories['red']; ?>" /></td>
-                    <td class="bdp_cal_event_red"></td>
-                </tr>
-
-                <tr>
-                    <td>Grün:</td>
-                    <td><input type="text" name="category[green]" value="<?php echo $categories['green']; ?>" /></td>
-                    <td class="bdp_cal_event_green"></td>
-                </tr>
-
-                <tr>
-                    <td>Fuchsia:</td>
-                    <td><input type="text" name="category[fuchsia]" value="<?php echo $categories['fuchsia']; ?>" /></td>
-                    <td class="bdp_cal_event_fuchsia"></td>
-                </tr>
-
-                <tr>
-                    <td>Orange:</td>
-                    <td><input type="text" name="category[orange]" value="<?php echo $categories['orange']; ?>" /></td>
-                    <td class="bdp_cal_event_orange"></td>
-                </tr>
-                <tr>
-                    <td>Grau:</td>
-                    <td>Standard</td>
-                    <td class="bdp_cal_event_grey"></td>
-                </tr>
-            </table>
-    <input class="button" type="submit" name="submit" value="Einstellungen speichern">
-</form>