diff --git a/Website/templates/base.html b/Website/templates/base.html
index 0b41683..8768076 100644
--- a/Website/templates/base.html
+++ b/Website/templates/base.html
@@ -7,20 +7,20 @@
     <meta name="mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-    <title>{% block title %}Digitale Schulverwaltung{% endblock %}</title>
+    <title>{% block title %}Digitale Inventarverwaltung für Schulen{% endblock %}</title>
     {# Basic SEO meta tags, can be overridden per-template by setting `meta_description` #}
     <meta name="description" content="{{ meta_description|default('Invario — Lehrmittel-, Inventar- und Ausleihverwaltung für Schulen. Sicher, einfach, nachvollziehbar.') }}">
     <meta name="robots" content="index, follow">
     <link rel="canonical" href="{{ request.url_root.rstrip('/') }}{{ request.path }}">
     <!-- OpenGraph / Twitter -->
     <meta property="og:site_name" content="Invario">
-    <meta property="og:title" content="{{ meta_title|default('Digitale Schulverwaltung') }}">
+    <meta property="og:title" content="{{ meta_title|default('Digitale Inventarverwaltung für Schulen') }}">
     <meta property="og:description" content="{{ meta_description|default('Invario — Lehrmittel-, Inventar- und Ausleihverwaltung für Schulen. Sicher, einfach, nachvollziehbar.') }}">
     <meta property="og:type" content="website">
     <meta property="og:url" content="{{ request.url_root.rstrip('/') }}{{ request.path }}">
     <meta property="og:image" content="{{ url_for('static', filename='images/logo-1.jpeg') }}">
     <meta name="twitter:card" content="summary_large_image">
-    <meta name="twitter:title" content="{{ meta_title|default('Digitale Schulverwaltung') }}">
+    <meta name="twitter:title" content="{{ meta_title|default('Digitale Inventarverwaltung für Schulen') }}">
     <meta name="twitter:description" content="{{ meta_description|default('Invario — Lehrmittel-, Inventar- und Ausleihverwaltung für Schulen. Sicher, einfach, nachvollziehbar.') }}">
     <meta name="twitter:image" content="{{ url_for('static', filename='images/logo-1.jpeg') }}">
     {% block head %}
@@ -520,19 +520,19 @@
                 <a href="{{ url_for('dienstleistungen') }}">Für Schulen</a>
                 <a href="{{ url_for('preise') }}">Preise</a>
                 <a href="{{ url_for('kontakt') }}">Kontakt</a>
-                {% if 'username' in session %}
-                    <a class="nav-user-link" href="{{ url_for('my_invoices') }}">Meine Rechnungen</a>
-                    <a class="nav-user-link" href="{{ url_for('my_instance_management') }}">Meine Instanz</a>
-                    <a class="nav-user-link" href="{{ url_for('user_chat') }}">Chat mit Admin</a>
-                    <a class="nav-user-link" href="{{ url_for('user_tickets') }}">Support Tickets</a>
-                    <a class="nav-user-link" href="{{ url_for('logout') }}">Abmelden</a>
-                {% elif session.get('is_admin') %}
+                {% if session.get('is_admin') %}
                     <a class="nav-user-link" href="{{ url_for('admin_invoices') }}">Rechnungsverwaltung</a>
                     <a class="nav-user-link" href="{{ url_for('admin_blog') }}">Blog verwalten</a>
                     <a class="nav-user-link" href="{{ url_for('admin_team') }}">Team Cards</a>
                     <a class="nav-user-link" href="{{ url_for('admin_chats') }}">Admin-Chat</a>
                     <a class="nav-user-link" href="{{ url_for('admin_tickets') }}">Support-Center</a>
                     <a class="nav-user-link" href="{{ url_for('admin_system_tools') }}">System-Tools</a>
+                {% elif 'username' in session %}
+                    <a class="nav-user-link" href="{{ url_for('my_invoices') }}">Meine Rechnungen</a>
+                    <a class="nav-user-link" href="{{ url_for('my_instance_management') }}">Meine Instanz</a>
+                    <a class="nav-user-link" href="{{ url_for('user_chat') }}">Chat mit Admin</a>
+                    <a class="nav-user-link" href="{{ url_for('user_tickets') }}">Support Tickets</a>
+                    <a class="nav-user-link" href="{{ url_for('logout') }}">Abmelden</a>
                 {% else %}
                     <a class="nav-mobile-action nav-btn primary" href="{{ url_for('login') }}">Login</a>
                     <a class="nav-mobile-action nav-btn" href="{{ url_for('register') }}">Registrieren</a>