diff --git a/app/MyHyvesBookPlusStagram/app/build.gradle b/app/MyHyvesBookPlusStagram/app/build.gradle
index c86ed28..c93b672 100644
--- a/app/MyHyvesBookPlusStagram/app/build.gradle
+++ b/app/MyHyvesBookPlusStagram/app/build.gradle
@@ -29,10 +29,12 @@ dependencies {
     compile 'com.google.firebase:firebase-database:10.0.1'
     compile 'com.google.firebase:firebase-auth:10.0.1'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    compile 'com.android.support:support-v4:25.3.1'
     testCompile 'junit:junit:4.12'
 }
 
 
 
 
+
 apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/AndroidManifest.xml b/app/MyHyvesBookPlusStagram/app/src/main/AndroidManifest.xml
index ccf5e09..14b8e95 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/AndroidManifest.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/AndroidManifest.xml
@@ -12,8 +12,8 @@
         <activity
             android:name="nl.myhyvesbookplus.tagram.MainActivity"
             android:label="@string/app_name">
-
         </activity>
+
         <activity android:name="nl.myhyvesbookplus.tagram.LoginActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -21,6 +21,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/LoginActivity.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/LoginActivity.java
index f52026b..98b1a9d 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/LoginActivity.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/LoginActivity.java
@@ -5,7 +5,6 @@ import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
-import android.util.Patterns;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -20,18 +19,121 @@ import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.UserProfileChangeRequest;
 
 public class LoginActivity extends AppCompatActivity {
-
     public static final String TAG = "Login";
-    private FirebaseAuth mAuth;
+
+    /// Views ///
+
+    protected EditText emailField, usernameField, passwordField;
+    protected TextView passwordConfirmField, passwordConfirmLabel, usernameLabel;
+    protected Button registerButton, backToLoginButton, goToRegisterButton, logInButton;
+
+    protected FirebaseAuth mAuth;
+
+    /// Setup ///
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(nl.myhyvesbookplus.tagram.R.layout.activity_login);
         mAuth = FirebaseAuth.getInstance();
+
+        findViews();
     }
 
-    private void registerUser(String email, String password) {
+    protected void findViews() {
+        passwordConfirmLabel = (TextView) findViewById(R.id.confirm_password_label);
+        usernameLabel = (TextView) findViewById(R.id.username_label);
+
+        registerButton = (Button) findViewById(R.id.register_button);
+        backToLoginButton = (Button) findViewById(R.id.back_to_login_button);
+        goToRegisterButton = (Button) findViewById(R.id.go_to_register_button);
+        logInButton = (Button) findViewById(R.id.login_button);
+
+        passwordConfirmField = (EditText) findViewById(R.id.confirm_password_field);
+        usernameField = (EditText) findViewById(R.id.username);
+        passwordField = (EditText) findViewById(R.id.password);
+        emailField = (EditText) findViewById(R.id.email);
+    }
+
+    /// OnClick ///
+
+    public void logInOnClick(View view) {
+        mAuth.signOut(); // TODO: Remove this after login check is implemented.
+        String emailSting = emailField.getText().toString();
+        String passwordSting = passwordField.getText().toString();
+
+        logIn(emailSting, passwordSting);
+    }
+
+    public void registerOnClick(View view) {
+        Log.d(TAG, "registerOnClick: ");
+
+        if (passwordField.getText().toString().equals(passwordConfirmField.getText().toString())) {
+            registerUser(emailField.getText().toString(), passwordField.getText().toString());
+        } else {
+            Toast.makeText(LoginActivity.this, "Passwords do not match",
+                    Toast.LENGTH_SHORT).show();
+            Log.d(TAG, "registerOnClick: Passwords do not match");
+        }
+
+    }
+
+    /// UI-changes ///
+
+    public void goToRegisterOnClick(View view) {
+        passwordConfirmField.setVisibility(View.VISIBLE);
+        passwordConfirmLabel.setVisibility(View.VISIBLE);
+        registerButton.setVisibility(View.VISIBLE);
+        backToLoginButton.setVisibility(View.VISIBLE);
+        usernameField.setVisibility(View.VISIBLE);
+        usernameLabel.setVisibility(View.VISIBLE);
+
+        goToRegisterButton.setVisibility(View.GONE);
+        logInButton.setVisibility(View.GONE);
+    }
+
+    public void backToLoginOnClick(View view) {
+        passwordConfirmField.setVisibility(View.GONE);
+        passwordConfirmLabel.setVisibility(View.GONE);
+        registerButton.setVisibility(View.GONE);
+        backToLoginButton.setVisibility(View.GONE);
+        usernameField.setVisibility(View.GONE);
+        usernameLabel.setVisibility(View.GONE);
+
+        goToRegisterButton.setVisibility(View.VISIBLE);
+        logInButton.setVisibility(View.VISIBLE);
+    }
+
+    protected void goToMainScreen() {
+        Intent intent = new Intent(this, MainActivity.class);
+        startActivity(intent);
+    }
+
+    /// FireBase ///
+
+    protected void logIn(String emailSting, String passwordSting) {
+        mAuth.signInWithEmailAndPassword(emailSting, passwordSting)
+                .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
+                    @Override
+                    public void onComplete(@NonNull Task<AuthResult> task) {
+                        if (task.isSuccessful()) {
+                            // Sign in success, update UI with the signed-in user's information
+                            Log.d(TAG, "signInWithEmail:success");
+                            FirebaseUser user = mAuth.getCurrentUser();
+                            Log.d(TAG, "onComplete: isVerified " + user.isEmailVerified());
+                            user.isEmailVerified();
+                            goToMainScreen();
+                        } else {
+                            // If sign in fails, display a message to the user.
+                            Log.w(TAG, "signInWithEmail:failure", task.getException());
+                            Toast.makeText(LoginActivity.this, task.getException().getLocalizedMessage(),
+                                    Toast.LENGTH_SHORT).show();
+                        }
+                    }
+                });
+    }
+
+    protected void registerUser(String email, String password) {
         mAuth.createUserWithEmailAndPassword(email, password)
                 .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
                     @Override
@@ -45,137 +147,20 @@ public class LoginActivity extends AppCompatActivity {
                         } else {
                             // If sign in fails, display a message to the user.
                             Log.w(TAG, "createUserWithEmail:failure", task.getException());
-                            Toast.makeText(LoginActivity.this, "Authentication failed.",
-                                    Toast.LENGTH_SHORT).show();
-//                            updateUI(null);
-                        }
-
-                        // ...
-                    }
-                });
-    }
-
-    public void logInOnClick(View view) {
-        mAuth.signOut();
-        EditText email = (EditText) findViewById(R.id.email);
-        EditText password = (EditText) findViewById(R.id.password);
-        String emailSting = email.getText().toString();
-        String passwordSting = password.getText().toString();
-
-        mAuth.signInWithEmailAndPassword(emailSting, passwordSting)
-                .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
-            @Override
-            public void onComplete(@NonNull Task<AuthResult> task) {
-                if (task.isSuccessful()) {
-                    // Sign in success, update UI with the signed-in user's information
-                    Log.d(TAG, "signInWithEmail:success");
-                    FirebaseUser user = mAuth.getCurrentUser();
-                    Log.d(TAG, "onComplete: isVerified " + user.isEmailVerified());
-                    user.isEmailVerified();
-                    goToMainScreen();
-
-//                    updateUI(user);
-                } else {
-                    // If sign in fails, display a message to the user.
-                    Log.w(TAG, "signInWithEmail:failure", task.getException());
-                    Toast.makeText(LoginActivity.this, "Authentication failed.",
-                            Toast.LENGTH_SHORT).show();
-//                    updateUI(null);
-                }
-
-                // ...
-            }
-        });
-
-
-    }
-
-    public void registerOnClick(View view) {
-        // goto Register page.
-        Log.d(TAG, "registerOnClick: ");
-        EditText email = (EditText) findViewById(R.id.email);
-        EditText password = (EditText) findViewById(R.id.password);
-        EditText passwordConfirm = (EditText) findViewById(R.id.confirm_password_field);
-
-        if (Patterns.EMAIL_ADDRESS.matcher(email.getText().toString()).matches()) {
-            if (password.getText().toString().equals(passwordConfirm.getText().toString())) {
-                registerUser(email.getText().toString(), password.getText().toString());
-            } else {
-                Log.d(TAG, "registerOnClick: Passwords do not match");
-            }
-        } else {
-            Log.d(TAG, "registerOnClick: Not An Email-address");
-        }
-
-    }
-
-    public void goToRegisterOnClick(View view) {
-        EditText passwordConfirm = (EditText) findViewById(R.id.confirm_password_field);
-        TextView passwordConfirmLabel = (TextView) findViewById(R.id.confirm_password_label);
-        Button register = (Button) findViewById(R.id.register_button);
-        Button backToLogin = (Button) findViewById(R.id.back_to_login_button);
-        EditText username = (EditText) findViewById(R.id.username);
-        TextView usernameLabel = (TextView) findViewById(R.id.username_label);
-
-        passwordConfirm.setVisibility(View.VISIBLE);
-        passwordConfirmLabel.setVisibility(View.VISIBLE);
-        register.setVisibility(View.VISIBLE);
-        backToLogin.setVisibility(View.VISIBLE);
-        username.setVisibility(View.VISIBLE);
-        usernameLabel.setVisibility(View.VISIBLE);
-
-        Button goToRegister = (Button) findViewById(R.id.go_to_register_button);
-        Button logInButton = (Button) findViewById(R.id.login_button);
-
-        goToRegister.setVisibility(View.GONE);
-        logInButton.setVisibility(View.GONE);
-    }
-
-    public void backToLogin(View view) {
-        EditText passwordConfirm = (EditText) findViewById(R.id.confirm_password_field);
-        TextView passwordConfirmLabel = (TextView) findViewById(R.id.confirm_password_label);
-        Button register = (Button) findViewById(R.id.register_button);
-        Button backToLogin = (Button) findViewById(R.id.back_to_login_button);
-        EditText username = (EditText) findViewById(R.id.username);
-        TextView usernameLabel = (TextView) findViewById(R.id.username_label);
-
-        passwordConfirm.setVisibility(View.GONE);
-        passwordConfirmLabel.setVisibility(View.GONE);
-        register.setVisibility(View.GONE);
-        backToLogin.setVisibility(View.GONE);
-        username.setVisibility(View.GONE);
-        usernameLabel.setVisibility(View.GONE);
-
-        Button goToRegister = (Button) findViewById(R.id.go_to_register_button);
-        Button logInButton = (Button) findViewById(R.id.login_button);
-
-        goToRegister.setVisibility(View.VISIBLE);
-        logInButton.setVisibility(View.VISIBLE);
-    }
-
-    protected void sendConfirmEmail(FirebaseUser user) {
-        user.sendEmailVerification()
-                .addOnCompleteListener(new OnCompleteListener<Void>() {
-                    @Override
-                    public void onComplete(@NonNull Task<Void> task) {
-                        if (task.isSuccessful()) {
-                            Log.d(TAG, "Email sent.");
-//                            goToMainScreen();
+                            if (task.getException() != null) {
+                                Toast.makeText(LoginActivity.this, task.getException().getLocalizedMessage(),
+                                        Toast.LENGTH_SHORT).show();
+                            }
                         }
                     }
                 });
     }
 
-    protected void goToMainScreen() {
-        Intent intent = new Intent(this, MainActivity.class);
-        startActivity(intent);
-    }
-
     protected void updateUserInfo(final FirebaseUser user) {
-        EditText username = (EditText) findViewById(R.id.username);
         UserProfileChangeRequest request = new UserProfileChangeRequest.Builder()
-                .setDisplayName(username.getText().toString())
+                .setDisplayName(usernameField.getText().toString())
                 .build();
+
         user.updateProfile(request)
                 .addOnCompleteListener(new OnCompleteListener<Void>() {
                     @Override
@@ -187,4 +172,16 @@ public class LoginActivity extends AppCompatActivity {
                     }
                 });
     }
+
+    protected void sendConfirmEmail(FirebaseUser user) {
+        user.sendEmailVerification()
+                .addOnCompleteListener(new OnCompleteListener<Void>() {
+                    @Override
+                    public void onComplete(@NonNull Task<Void> task) {
+                        if (task.isSuccessful()) {
+                            Log.d(TAG, "Email sent.");
+                        }
+                    }
+                });
+    }
 }
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/activity_login.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/activity_login.xml
index 33d4bf4..2235670 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/activity_login.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/activity_login.xml
@@ -97,7 +97,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
-        android:onClick="backToLogin"
+        android:onClick="backToLoginOnClick"
         android:text="back to Login"
         android:visibility="gone" />
 
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
index fa48bbf..703a818 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
@@ -1,6 +1,9 @@
 <resources>
     <string name="app_name">MyHyvesBookPlusTagram</string>
-    <string name="title_home">Home</string>
-    <string name="title_dashboard">Dashboard</string>
-    <string name="title_notifications">Notifications</string>
+    <string name="title_home">Timeline</string>
+    <string name="title_dashboard">Camera</string>
+    <string name="title_notifications">Profile</string>
+
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>