diff --git a/App.js b/App.js
index 9cdcbee4e58fdcbd388504b8c36e7247a2422e0a..d31f8c0f2d939880ce6ce737cc0c71216ac88def 100755
--- a/App.js
+++ b/App.js
@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import { StyleSheet, View, Image } from "react-native";
+import { StyleSheet, View, Image, StatusBar } from "react-native";
 
 import Login from "./components/Login";
 
@@ -7,6 +7,7 @@ export default class App extends Component {
   render() {
     return (
       <View style={styles.container}>
+        <StatusBar backgroundColor="#1d1d1b" barStyle="light-content" />
         <View style={{ flex: 1, flexDirection: "column" }}>
           <View style={styles.logoContainer}>
             <Image
diff --git a/components/GameList.js b/components/GameList.js
index 4436a389d9a5c01e9ecff5b721381c13d392e48d..769844b5b90b7b8de812e11304c46c5512a2eccd 100644
--- a/components/GameList.js
+++ b/components/GameList.js
@@ -281,19 +281,20 @@ class GameList extends Component {
                 <Button
                   color="#424242"
                   onPress={() => {
-                    this.joinFaction();
                     this.setPopupVisible(!this.state.passwordPopupVisible);
                   }}
-                  title="Submit"
+                  title="Close"
                 />
               </View>
               <View style={styles.popupButton}>
                 <Button
                   color="#424242"
                   onPress={() => {
+                    this.joinFaction();
                     this.setPopupVisible(!this.state.passwordPopupVisible);
+                    this.setState({ factionPassword: "" });
                   }}
-                  title="Close"
+                  title="Submit"
                 />
               </View>
             </View>
diff --git a/components/Login.js b/components/Login.js
index 0449e863110b33e0df21780b5e1ef68933f974ab..6f23cb038a5775fe1cf4cd96765766eaeaf1fe58 100644
--- a/components/Login.js
+++ b/components/Login.js
@@ -7,7 +7,7 @@ import GameList from "./GameList";
 
 class Login extends Component {
   state = {
-    form: "", // Used for forms (login, register etc.)
+    form: "login", // Used for forms (login, register etc.)
     username: null,
     token: null
   };
@@ -70,23 +70,38 @@ class Login extends Component {
     return (
       <View className="container">
         <View className="navigation">
-          {!this.state.username && (
+          {this.state.form === "register" && (
+            <RegisterForm
+              view=""
+              handleState={this.handleState.bind(this)}
+              toggleView={this.toggleView.bind(this)}
+            />
+          )}
+          {this.state.form === "login" && (
+            <LoginForm
+              view=""
+              handleState={this.handleState.bind(this)}
+              toggleView={this.toggleView.bind(this)}
+            />
+          )}
+
+          {!this.state.username && this.state.form === "login" && (
             <View style={styles.buttonContainer}>
               <Button
                 color="#424242"
-                id="loginButton"
-                onPress={() => this.toggleView("login")}
-                title="Login"
+                id="registerButton"
+                onPress={() => this.toggleView("register")}
+                title="Register"
               />
             </View>
           )}
-          {!this.state.username && (
+          {!this.state.username && this.state.form === "register" && (
             <View style={styles.buttonContainer}>
               <Button
                 color="#424242"
-                id="registerButton"
-                onPress={() => this.toggleView("register")}
-                title="Register"
+                id="loginButton"
+                onPress={() => this.toggleView("login")}
+                title="Login"
               />
             </View>
           )}
@@ -104,20 +119,6 @@ class Login extends Component {
             </Fragment>
           )}
         </View>
-        {this.state.form === "register" && (
-          <RegisterForm
-            view=""
-            handleState={this.handleState.bind(this)}
-            toggleView={this.toggleView.bind(this)}
-          />
-        )}
-        {this.state.form === "login" && (
-          <LoginForm
-            view=""
-            handleState={this.handleState.bind(this)}
-            toggleView={this.toggleView.bind(this)}
-          />
-        )}
       </View>
     );
   }
diff --git a/components/LoginForm.js b/components/LoginForm.js
index 15877c419f19d1f1144be1fe2452d15f5b84c6ba..d6759fa2f4341562e37d1268ed859b8557615930 100644
--- a/components/LoginForm.js
+++ b/components/LoginForm.js
@@ -60,15 +60,6 @@ export class LoginForm extends React.Component {
   render() {
     return (
       <View className="fade-main">
-        <View className="sticky">
-          <Text
-            id="closeLoginFormX"
-            style={styles.close}
-            onPress={this.handleView}
-          >
-            ×
-          </Text>
-        </View>
         <View className="login">
           <Text style={styles.tooltipText}>Login</Text>
           <TextInput
@@ -105,15 +96,6 @@ export class LoginForm extends React.Component {
 }
 
 const styles = StyleSheet.create({
-  close: {
-    marginTop: 10,
-    marginLeft: 100,
-    marginRight: 100,
-    alignContent: "center",
-    fontSize: 40,
-    textAlign: "center",
-    backgroundColor: "#424242"
-  },
   textInput: {
     backgroundColor: "#424242",
     margin: 5
diff --git a/components/RegisterForm.js b/components/RegisterForm.js
index b7e83e289abb3d6bb07451ca179dcc78de51a445..1a1ca9e2d10eeaf547a9e3d242a9ed89f8761483 100644
--- a/components/RegisterForm.js
+++ b/components/RegisterForm.js
@@ -73,11 +73,6 @@ export class RegisterForm extends React.Component {
   render() {
     return (
       <View className="fade-main">
-        <View className="sticky">
-          <Text onPress={this.handleView} style={styles.close}>
-            ×
-          </Text>
-        </View>
         <View className="login">
           <Text style={styles.tooltipText}>Register New User</Text>
           <TextInput
@@ -119,15 +114,6 @@ export class RegisterForm extends React.Component {
 }
 
 const styles = StyleSheet.create({
-  close: {
-    marginTop: 10,
-    marginLeft: 100,
-    marginRight: 100,
-    alignContent: "center",
-    fontSize: 40,
-    textAlign: "center",
-    backgroundColor: "#424242"
-  },
   textInput: {
     backgroundColor: "#424242",
     margin: 5