diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
index 0ec8d7b..809ac7b 100644
--- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java
+++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
@@ -16,6 +16,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.widget.TextView;
 
 import java.util.Calendar;
 import java.util.Iterator;
@@ -136,11 +137,13 @@ public class MainActivity extends AppCompatActivity
         FragmentTransaction fragmentTransaction;
         switch (id) {
             case R.id.nav_modules:
+                setTitle(R.string.courses);
                 fragmentTransaction = fragmentManager.beginTransaction();
                 fragmentTransaction.replace(R.id.fragcontainer, ModulesFragment.newInstance());
                 fragmentTransaction.commit();
                 break;
             case R.id.nav_schedule:
+                setTitle(R.string.schedule);
                 fragmentTransaction = fragmentManager.beginTransaction();
                 fragmentTransaction.replace(R.id.fragcontainer, ScheduleFragment.newInstance());
                 fragmentTransaction.commit();
@@ -209,6 +212,7 @@ public class MainActivity extends AppCompatActivity
     }
 
     private void toLogoutState() {
+        setTitle(R.string.log_in);
         FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
         fragmentTransaction.replace(R.id.fragcontainer, LoginFragment.newInstance());
         fragmentTransaction.commit();
@@ -217,12 +221,19 @@ public class MainActivity extends AppCompatActivity
         View header = mNavigationView.getHeaderView(0);
         header.findViewById(R.id.imageView).setVisibility(View.GONE);
         header.findViewById(R.id.login_name).setVisibility(View.GONE);
-        header.findViewById(R.id.login_page).setVisibility(View.VISIBLE);
+        header.findViewById(R.id.btn_login_page).setVisibility(View.VISIBLE);
+        header.findViewById(R.id.btn_login_page).setOnClickListener(v -> {
+            DrawerLayout drawer = findViewById(R.id.drawer_layout);
+            if (drawer.isDrawerOpen(GravityCompat.START)) {
+                drawer.closeDrawer(GravityCompat.START);
+            }
+        });
         mNavigationView.getMenu().clear();
         mNavigationView.inflateMenu(R.menu.activity_main_drawer);
     }
 
     private void toLoginState(String username) {
+        setTitle(R.string.courses);
         FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
         fragmentTransaction.replace(R.id.fragcontainer, ModulesFragment.newInstance());
         fragmentTransaction.commit();
@@ -231,7 +242,8 @@ public class MainActivity extends AppCompatActivity
         View header = mNavigationView.getHeaderView(0);
         header.findViewById(R.id.imageView).setVisibility(View.VISIBLE);
         header.findViewById(R.id.login_name).setVisibility(View.VISIBLE);
-        header.findViewById(R.id.login_page).setVisibility(View.GONE);
+        ((TextView) header.findViewById(R.id.login_name)).setText(username);
+        header.findViewById(R.id.btn_login_page).setVisibility(View.GONE);
         mNavigationView.getMenu().clear();
         mNavigationView.inflateMenu(R.menu.activity_main_drawer_login);
         mNavigationView.setCheckedItem(R.id.nav_modules);
@@ -269,8 +281,8 @@ public class MainActivity extends AppCompatActivity
     @Override
     public void onModulesFragmentInteraction(final int itemPosition) {
         log.d("Item clicked", itemPosition);
-        //getKVV().getModuleList(success -> log.d(success.get(itemPosition).title), error -> log.e(error));
-
+        setTitle(R.string.courses);
+        getKVV().getModuleList(success -> setTitle(success.get(itemPosition).title), error -> log.e(error));
         FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
         fragmentTransaction.replace(R.id.fragcontainer, ModDetailFragment.newInstance(itemPosition));
         fragmentTransaction.commit();
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 1176a0a..2c10a22 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -14,7 +14,7 @@
     android:theme="@style/ThemeOverlay.AppCompat.Dark">
 
     <Button
-        android:id="@+id/login_page"
+        android:id="@+id/btn_login_page"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         style="@style/Widget.AppCompat.Button.Colored"
diff --git a/app/src/main/res/menu/activity_main_drawer_login.xml b/app/src/main/res/menu/activity_main_drawer_login.xml
index 92832cd..226aaea 100644
--- a/app/src/main/res/menu/activity_main_drawer_login.xml
+++ b/app/src/main/res/menu/activity_main_drawer_login.xml
@@ -10,7 +10,7 @@
         <item
             android:id="@+id/nav_modules"
             android:icon="@drawable/ic_apps"
-            android:title="@string/events"
+            android:title="@string/courses"
             android:orderInCategory="100" />
         <item
             android:id="@+id/nav_dining"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c3d2c0a..d05a8fb 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -9,7 +9,7 @@
     <string name="announcements_count">Ankündigungen (%1$d)</string>
     <string name="cd_ic_launcher">App-Symbol</string>
     <string name="schedule">Stundenplan</string>
-    <string name="events">Kurse</string>
+    <string name="courses">Kurse</string>
     <string name="canteen_plan">Mensaplan</string>
     <string name="settings">Einstellungen</string>
     <string name="options">Optionen</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ba83c86..00b78b4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,7 +14,7 @@
     <string name="announcements_count">Announcements (%1$d)</string>
     <string name="cd_ic_launcher">App Icon</string>
     <string name="schedule">Schedule</string>
-    <string name="events">Courses</string>
+    <string name="courses">Courses</string>
     <string name="canteen_plan">Canteen Plan</string>
     <string name="settings">Settings</string>
     <string name="options">Options</string>