diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0a7de86..a27feb5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,9 +8,9 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+
         <activity
-            android:name=".logic.MainActivity"
-            android:label="@string/title_activity_main"
+            android:name=".activities.MainActivity"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -18,6 +18,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/schmitt_florian/schoolplanner/logic/MainActivity.java b/app/src/main/java/schmitt_florian/schoolplanner/activities/MainActivity.java
similarity index 90%
rename from app/src/main/java/schmitt_florian/schoolplanner/logic/MainActivity.java
rename to app/src/main/java/schmitt_florian/schoolplanner/activities/MainActivity.java
index af26d64..e0aebfd 100644
--- a/app/src/main/java/schmitt_florian/schoolplanner/logic/MainActivity.java
+++ b/app/src/main/java/schmitt_florian/schoolplanner/activities/MainActivity.java
@@ -1,16 +1,13 @@
-package schmitt_florian.schoolplanner.logic;
+package schmitt_florian.schoolplanner.activities;
 
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.view.View;
+import android.support.annotation.NonNull;
 import android.support.design.widget.NavigationView;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
-import android.view.Menu;
 import android.view.MenuItem;
 
 import schmitt_florian.schoolplanner.R;
@@ -26,7 +23,6 @@ protected void onCreate(Bundle savedInstanceState) {
         setSupportActionBar(toolbar);
 
 
-
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
                 this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
@@ -48,10 +44,9 @@ public void onBackPressed() {
     }
 
 
-
     @SuppressWarnings("StatementWithEmptyBody")
     @Override
-    public boolean onNavigationItemSelected(MenuItem item) {
+    public boolean onNavigationItemSelected(@NonNull MenuItem item) {
         // Handle navigation view item clicks here.
         int id = item.getItemId();
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a61d8a6..102cd6a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -18,8 +18,8 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:fitsSystemWindows="true"
         app:headerLayout="@layout/nav_header_main"
-        app:menu="@menu/activity_main_drawer" />
+        app:itemTextAppearance="@style/TextAppearance.AppCompat.Widget.ActionBar.Menu"
+        app:menu="@menu/menu_main_drawer" />
 
 </android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index b9cac16..d69eb15 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="schmitt_florian.schoolplanner.logic.MainActivity">
+    tools:context="schmitt_florian.schoolplanner.activities.MainActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
@@ -17,7 +17,7 @@
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay"
-            app:title="Schulplaner" />
+            app:title="@string/app_name" />
 
     </android.support.design.widget.AppBarLayout>
 
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 7234b81..1e2d4a6 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="schmitt_florian.schoolplanner.logic.MainActivity"
+    tools:context="schmitt_florian.schoolplanner.activities.MainActivity"
     tools:showIn="@layout/app_bar_main">
 
 </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 2ee94a3..fee757c 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="@dimen/nav_header_height"
     android:background="@drawable/side_nav_bar"
diff --git a/app/src/main/res/layout/switch_item.xml b/app/src/main/res/layout/switch_item.xml
deleted file mode 100644
index ee492c6..0000000
--- a/app/src/main/res/layout/switch_item.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Switch
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true" />
-</RelativeLayout>
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/menu_main_drawer.xml
similarity index 65%
rename from app/src/main/res/menu/activity_main_drawer.xml
rename to app/src/main/res/menu/menu_main_drawer.xml
index 24f3e0d..1fe1e4c 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/menu_main_drawer.xml
@@ -1,36 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <group android:checkableBehavior="single">
         <item
             android:id="@+id/nav_main"
             android:icon="@drawable/ic_main"
-            android:title="Startseite" />
+            android:title="@string/string_homepage" />
         <item
             android:id="@+id/nav_schedule"
             android:icon="@drawable/ic_schedule"
-            android:title="Stundenplan" />
+            android:title="@string/string_schedule" />
         <item
             android:id="@+id/nav_subjects"
             android:icon="@drawable/ic_subjects"
-            android:title="Fächer" />
+            android:title="@string/string_subjects" />
         <item
             android:id="@+id/nav_homework"
             android:icon="@drawable/ic_homework"
-            android:title="Hausaufgaben" />
+            android:title="@string/string_homework" />
         <item
             android:id="@+id/nav_exams"
             android:icon="@drawable/ic_exams"
-            android:title="Klausuren" />
+            android:title="@string/string_exams" />
         <item
             android:id="@+id/nav_credits"
             android:icon="@drawable/ic_credits"
-            android:title="Mitwirkende" />
+            android:title="@string/string_credits" />
         <item
             android:id="@+id/nav_settings"
             android:icon="@drawable/ic_settings"
-            android:title="Einstellungen" />
+            android:title="@string/string_settings" />
     </group>
 
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
new file mode 100644
index 0000000..ef92c5f
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Schulplanner</string>
+    <string name="string_credits">Mitwirkende</string>
+    <string name="string_exams">Klausuren</string>
+    <string name="string_homepage">Startseite</string>
+    <string name="string_homework">Hausaufgaben</string>
+    <string name="string_schedule">Stundenplan</string>
+    <string name="string_settings">Einstellungen</string>
+    <string name="string_subjects">Fächer</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5a22c83..86894f4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,9 +1,14 @@
 <resources>
-    <string name="app_name">Schoolplanner</string>
-    <string name="title_activity_main">MainActivity</string>
+    <string name="app_name">School Planner</string>
 
-    <string name="navigation_drawer_open">Open navigation drawer</string>
-    <string name="navigation_drawer_close">Close navigation drawer</string>
+    <string name="navigation_drawer_open" translatable="false">Open navigation drawer</string>
+    <string name="navigation_drawer_close" translatable="false">Close navigation drawer</string>
 
-    <string name="action_settings">Settings</string>
+    <string name="string_homepage">Home</string>
+    <string name="string_schedule">Schedule</string>
+    <string name="string_subjects">Subjects</string>
+    <string name="string_homework">Homework</string>
+    <string name="string_exams">Exams</string>
+    <string name="string_credits">Credits</string>
+    <string name="string_settings">Settings</string>
 </resources>