diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
index 5dfd535..c0bf213 100644
--- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java
+++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
@@ -341,7 +341,6 @@ public class MainActivity extends AppCompatActivity
         this.fragmentData = newData;
 
         invalidateOptionsMenu();
-        //TODO navigation selection
     }
 
     private void setOfflineBanner(boolean visible) {
@@ -356,7 +355,6 @@ public class MainActivity extends AppCompatActivity
             viewNoConnection.setVisibility(View.VISIBLE);
         else
             viewNoConnection.setVisibility(View.GONE);
-
     }
 
     private void setNavigationSelection() {
@@ -566,7 +564,7 @@ public class MainActivity extends AppCompatActivity
     }
 
     @Override
-    public void onNetworkResponse(NetworkResponse error) {
+    public void onKVVNetworkResponse(NetworkResponse error) {
         setRefreshFailedBanner(error != null);
     }
 }
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVListener.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVListener.java
index 72ffbce..402899f 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVListener.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVListener.java
@@ -16,5 +16,5 @@ public interface KVVListener {
 
     void onModuleListChange();
 
-    void onNetworkResponse(NetworkResponse error);
+    void onKVVNetworkResponse(NetworkResponse error);
 }
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/Login.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/Login.java
index b10473e..5f6d21d 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/Login.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/Login.java
@@ -31,7 +31,7 @@ public class Login extends HTTPService {
         this.mListener = listener;
     }
 
-    public void doOnlineLogin(String username, String password, NetworkCallback<LoginToken> callback, NetworkErrorCallback errorCallback) {
+    public void doOnlineLogin(@NotNull String username, @NotNull String password, NetworkCallback<LoginToken> callback, NetworkErrorCallback errorCallback) {
         if (mLoginPending) {
             errorCallback.onError(new NetworkError(100160, -1, "Login already pending!"));
         }
@@ -116,7 +116,7 @@ public class Login extends HTTPService {
         return isLoggedIn() && mOnlineMode;
     }
 
-    void testLoginToken(NetworkCallback<LoginToken> callback, NetworkErrorCallback errorCallback) {
+    void testLoginToken(@NotNull NetworkCallback<LoginToken> callback, @NotNull NetworkErrorCallback errorCallback) {
         if (mToken == null) {
             errorCallback.onError(new NetworkError(100173, -1, "Not logged in!"));
             return;
@@ -124,7 +124,7 @@ public class Login extends HTTPService {
         testLoginToken(mToken, callback, errorCallback);
     }
 
-    private void testLoginToken(@NotNull LoginToken token, NetworkCallback<LoginToken> callback, NetworkErrorCallback errorCallback) {
+    private void testLoginToken(@NotNull LoginToken token, @NotNull NetworkCallback<LoginToken> callback, @NotNull NetworkErrorCallback errorCallback) {
         get(String.format("https://kvv.imp.fu-berlin.de/direct/profile/%s.json", token.getUsername()), token.getCookies(), response -> {
             String body = response.getParsed();
             if (body == null) {
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/Modules.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/Modules.java
index eba21a5..8c8b54a 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/Modules.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/Modules.java
@@ -56,8 +56,8 @@ public class Modules {
     public ModulesList list() {
         if (mList == null) {
             mList = new ModulesList(mLogin, mListener, context);
-            mList.addErrorListener("Modules", error -> mListener.onNetworkResponse(error.networkResponse));
-            mList.addSuccessListener("Modules", success -> mListener.onNetworkResponse(null));
+            mList.addErrorListener("Modules", error -> mListener.onKVVNetworkResponse(error.networkResponse));
+            mList.addSuccessListener("Modules", success -> mListener.onKVVNetworkResponse(null));
         }
         return mList;
     }
@@ -68,8 +68,8 @@ public class Modules {
         Part o = mAddons.get(addon);
         if (o == null) {
             o = creatorInterface.create();
-            o.addErrorListener("Modules", error -> mListener.onNetworkResponse(error.networkResponse));
-            o.addSuccessListener("Modules", success -> mListener.onNetworkResponse(null));
+            o.addErrorListener("Modules", error -> mListener.onKVVNetworkResponse(error.networkResponse));
+            o.addSuccessListener("Modules", success -> mListener.onKVVNetworkResponse(null));
             mAddons.put(addon, o);
         }
         return o;
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesList.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesList.java
index c9f5129..cc5b8f9 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesList.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/ModulesList.java
@@ -126,7 +126,10 @@ public class ModulesList extends HTTPService {
                     mLogin.refreshLogin(success -> {
                         recv(callback, errorCallback, forceRefresh, retries-1);
                         mQueue.next();
-                    }, errorCallback);
+                    }, error1 -> {
+                        errorCallback.onError(error1);
+                        mQueue.next();
+                    });
                     return;
                 }
                 errorCallback.onError(error);
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/PartModules.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/PartModules.java
index 64cb4b8..0301135 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/PartModules.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/PartModules.java
@@ -36,8 +36,8 @@ abstract class PartModules<T> extends Part<Modules.Module> {
                     mLogin.refreshLogin(success -> {
                         recv(module, callback, errorCallback, forceRefresh, retries-1);
                         mQueue.next();
-                    }, error2 -> {
-                        errorCallback.onError(error2);
+                    }, error1 -> {
+                        errorCallback.onError(error1);
                         mQueue.next();
                     });
                     return;
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index bc69be7..08af5f2 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -80,5 +80,5 @@
     <string name="summer_semester">Sommersemester %1$d</string>
     <string name="lecturers">Dozenten</string>
     <string name="mail_icon">Mail Icon</string>
-    <string name="mail_default_text">Hallo %1$s, \n\nMit freundlichen Grüßen\n\nGesendet von der FUPlanner Android App</string>
+    <string name="mail_default_text">Hallo %1$s, \n\n\n\nMit freundlichen Grüßen\n\n\n\nGesendet von der FUPlanner Android App</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 e0f053e..9528137 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -88,5 +88,5 @@
     <string name="summer_semester">Summer Semester %1$d</string>
     <string name="lecturers">Lecturers</string>
     <string name="mail_icon">Mail Icon</string>
-    <string name="mail_default_text">Dear %1$s, \n\nYours sincerely\n\nSend by FUPlanner Android App</string>
+    <string name="mail_default_text">Dear %1$s, \n\n\n\nYours sincerely\n\n\n\nSend by FUPlanner Android App</string>
 </resources>