diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php
index 7fe081fc..bbf36b6d 100644
--- a/includes/pages/guest_login.php
+++ b/includes/pages/guest_login.php
@@ -170,7 +170,7 @@ function guest_register() {
 		$html .= "<tr><td>" . Get_Text("makeuser_Engelart") . "</td><td align=\"left\">\n";
 		$html .= "<select name=\"Art\">\n";
 
-		$engel_types = sql_select("SELECT * FROM `EngelType` ORDER BY `NAME`");
+		$engel_types = sql_select("SELECT * FROM `AngelTypes` ORDER BY `NAME`");
 		foreach ($engel_types as $engel_type) {
 			$Name = $engel_type['Name'] . Get_Text("inc_schicht_engel");
 			$html .= "<option value=\"" . $Name . "\"";
diff --git a/includes/sys_menu.php b/includes/sys_menu.php
index 6a24deaf..a2f8c577 100644
--- a/includes/sys_menu.php
+++ b/includes/sys_menu.php
@@ -8,8 +8,22 @@ function make_navigation() {
 	global $privileges;
 	$menu_items = $privileges;
 	$menu_items[] = "faq";
+	$menu = "";
 
-	$menu = '<nav class="container"><h4>' . Get_Text('/') . '</h4><ul class="content">';
+	// Standard Navigation
+	$menu .= '<nav class="container"><h4>' . Get_Text('/') . '</h4><ul class="content">';
+	foreach ($menu_items as $item)
+		$menu .= '<li' . ($item == $p ? ' class="selected"' : '') . '><a href="' . page_link_to($item) . '">' . Get_Text($item) . '</a></li>';
+	$menu .= '</ul></nav>';
+
+	// Engel Navigation
+	$menu .= '<nav class="container"><h4>' . Get_Text('inc_schicht_engel') . '</h4><ul class="content">';
+	foreach ($menu_items as $item)
+		$menu .= '<li' . ($item == $p ? ' class="selected"' : '') . '><a href="' . page_link_to($item) . '">' . Get_Text($item) . '</a></li>';
+	$menu .= '</ul></nav>';
+
+	// Admin Navigation
+	$menu .= '<nav class="container"><h4>' . Get_Text('admin/') . '</h4><ul class="content">';
 	foreach ($menu_items as $item)
 		$menu .= '<li' . ($item == $p ? ' class="selected"' : '') . '><a href="' . page_link_to($item) . '">' . Get_Text($item) . '</a></li>';
 	$menu .= '</ul></nav>';