diff --git a/src/Dusken.js b/src/Dusken.js
index 9b6c015..a77d914 100644
--- a/src/Dusken.js
+++ b/src/Dusken.js
@@ -2,27 +2,20 @@ import React from 'react';
 import {connect} from "react-redux";
 import {TabNavigator, StackNavigator} from "react-navigation";
 
-import LoginScreen from "./screens/LoginScreen";
-import EventsScreen from "./screens/EventScreen";
-import EventDetailsScreen from "./screens/EventDetailsScreen";
 import AboutScreen from "./screens/AboutScreen";
+import EventDetailsScreen from "./screens/EventDetailsScreen";
+import EventListScreen from "./screens/EventListScreen";
+import LoginScreen from "./screens/LoginScreen";
 import MembershipScreen from "./screens/MembershipScreen";
-import Login from "./modules/login/Login";
-
 
+/* Navigation */
 const tabBarRoutes = {
-    // Login: { screen: LoginScreen },
-    Events: { screen: EventsScreen },
+    EventList: { screen: EventListScreen },
     Membership: { screen: MembershipScreen },
     About: { screen: AboutScreen },
 };
 
-const tabBarOptions = {
-    tabBarPosition: 'bottom',
-};
-
-/* Navigation */
-const tabNav = TabNavigator(tabBarRoutes, tabBarOptions);
+const tabNav = TabNavigator(tabBarRoutes, {tabBarPosition: 'bottom'});
 
 const DuskenContainer = StackNavigator({
     Root: { screen: tabNav },
diff --git a/src/screens/EventScreen.js b/src/screens/EventListScreen.js
similarity index 100%
rename from src/screens/EventScreen.js
rename to src/screens/EventListScreen.js
diff --git a/src/screens/LoginScreen.js b/src/screens/LoginScreen.js
index 7adfb17..9ee0aed 100644
--- a/src/screens/LoginScreen.js
+++ b/src/screens/LoginScreen.js
@@ -7,7 +7,8 @@ export default class LoginScreen extends Component {
     };
 
     onLogin = () => {
-        this.props.navigation.navigate('Membership');
+        // This works since LoginScreen is allways navigated to from MembershipScreen
+        this.props.navigation.goBack();
     };
 
     render() {