diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
index 7e4213430..2336bc2d8 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt
@@ -155,23 +155,6 @@ class AuthenticationActivityTest {
         onView(withId(R.id.email)).check(matches(withText("Password has to be at least 6 symbols")))
     }
 
-    @Test
-    fun derinTest() {
-        val a = FireBaseAuthenticator()
-
-        a.googleActivityResult(-1, -1, null)
-
-        onView(withId(R.id.email)).check(matches(withText("TextView")))
-    }
-
-    @Test
-    fun ardaTest() {
-        val a = FireBaseAuthenticator()
-
-        a.googleActivityResult(1000, -1, null)
-
-        onView(withId(R.id.email)).check(matches(withText("TextView")))
-    }
 
     @Test
     fun logInCorrect() {
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
index 04b282ca0..b77091310 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt
@@ -1,5 +1,7 @@
 package ch.sdp.vibester.activity
 
+import android.content.Intent
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.intent.Intents
@@ -9,6 +11,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import com.google.firebase.auth.FirebaseAuth
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.After
@@ -23,11 +26,8 @@ class WelcomeActivityTest {
     @get:Rule(order = 0)
     var hiltRule = HiltAndroidRule(this)
 
-
     @get:Rule(order = 1)
-    val testRule = ActivityScenarioRule(
-        WelcomeActivity::class.java
-    )
+    val testRule = ActivityScenarioRule(WelcomeActivity::class.java)
 
     @Before
     fun setUp() {
@@ -46,7 +46,15 @@ class WelcomeActivityTest {
     }
 
     @Test
-    fun checkIntentOnProfile() { 
+    fun checkIntentOnMyAccountLoggedOut() {
+        FirebaseAuth.getInstance().signOut()
+        onView(withId(R.id.welcome_profile)).perform(click())
+        intended(hasComponent(AuthenticationActivity::class.java.name))
+    }
+
+    @Test
+    fun checkIntentOnMyAccountLoggedIn() {
+        WelcomeActivity.setLoggedIn()
         onView(withId(R.id.welcome_profile)).perform(click())
         intended(hasComponent(ProfileActivity::class.java.name))
     }
@@ -57,12 +65,6 @@ class WelcomeActivityTest {
         intended(hasComponent(ScoreBoardActivity::class.java.name))
     }
 
-    @Test
-    fun checkIntentOnSettings() {
-        onView(withId(R.id.welcome_settings)).perform(click())
-        intended(hasComponent(AuthenticationActivity::class.java.name))
-    }
-
     @Test
     fun checkIntentOnDownload() {
         onView(withId(R.id.welcome_download)).perform(click())
diff --git a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
index c94312a2a..5e536672b 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/AuthenticationActivity.kt
@@ -10,11 +10,13 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
 import ch.sdp.vibester.auth.FireBaseAuthenticator
+import ch.sdp.vibester.helper.IntentSwitcher
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInClient
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.google.android.gms.tasks.Task
 import com.google.firebase.auth.AuthResult
+import com.google.firebase.auth.FirebaseAuth
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -33,7 +35,7 @@ class AuthenticationActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         requestWindowFeature(Window.FEATURE_NO_TITLE)
         supportActionBar?.hide()
-        setContentView(R.layout.activity_google_log_in)
+        setContentView(R.layout.activity_authentication)
 
         val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
             .requestEmail()
@@ -41,6 +43,7 @@ class AuthenticationActivity : AppCompatActivity() {
 
         googleSignInClient = GoogleSignIn.getClient(this, gso)
 
+
         val btCreateAcc = findViewById<Button>(R.id.createAcc)
         val btLogIn = findViewById<Button>(R.id.logIn)
         val googleSignIn = findViewById<Button>(R.id.googleBtn)
@@ -49,6 +52,8 @@ class AuthenticationActivity : AppCompatActivity() {
         val password = findViewById<EditText>(R.id.password)
         email = findViewById(R.id.email)
 
+
+
         btCreateAcc.setOnClickListener {
             authenticate(username.text.toString(), password.text.toString(), true)
         }
diff --git a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
index 0a2bfd309..0721dbe01 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ProfileActivity.kt
@@ -1,7 +1,9 @@
 package ch.sdp.vibester.activity
 
+import android.graphics.Bitmap
 import android.os.Bundle
 import android.text.InputType
+import android.util.Log
 import android.view.Window
 import android.widget.Button
 import android.widget.EditText
@@ -9,16 +11,21 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.graphics.drawable.toBitmap
 import ch.sdp.vibester.R
 import ch.sdp.vibester.api.BitmapGetterApi
 import ch.sdp.vibester.model.UserSharedPref
 import ch.sdp.vibester.database.UsersRepo
+import ch.sdp.vibester.helper.IntentSwitcher
 import ch.sdp.vibester.profile.UserProfile
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import com.google.firebase.auth.FirebaseAuth
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -35,11 +42,15 @@ class ProfileActivity : AppCompatActivity() {
 
         setContentView(R.layout.activity_profile)
 
-        setupProfile(UserSharedPref.getUser(this))
+        setupProfile(UserSharedPref.getUser(applicationContext))
 
         val editUsername = findViewById<Button>(R.id.editUser)
         val editHandle = findViewById<Button>(R.id.editHandle)
 
+        val logoutbutton = findViewById<Button>(R.id.logout)
+
+        val retToMain = findViewById<FloatingActionButton>(R.id.profile_returnToMain)
+
         editUsername.setOnClickListener {
             showGeneralDialog(R.id.username, "username")
         }
@@ -48,6 +59,15 @@ class ProfileActivity : AppCompatActivity() {
             showGeneralDialog(R.id.handle, "handle")
         }
 
+        retToMain.setOnClickListener{
+            IntentSwitcher.switchBackToWelcome(this)
+        }
+
+        logoutbutton.setOnClickListener{
+            FirebaseAuth.getInstance().signOut()
+            IntentSwitcher.switchBackToWelcome(this)
+        }
+
     }
 
     /**
@@ -105,24 +125,36 @@ class ProfileActivity : AppCompatActivity() {
 
 
     private fun setupProfile(user: UserProfile){
-        findViewById<TextView>(R.id.handle).text =  user.handle
-        findViewById<TextView>(R.id.username).text = user.username
-        findViewById<TextView>(R.id.totalGames).text = user.totalGames.toString()
-        findViewById<TextView>(R.id.correctSongs).text = user.correctSongs.toString()
-        findViewById<TextView>(R.id.bestScore).text = user.bestScore.toString()
-        findViewById<TextView>(R.id.ranking).text = user.ranking.toString()
+
+        // Currently assuming that empty username means no user !
+        if (user.username != ""){
+            findViewById<TextView>(R.id.username).text =  user.username
+            if (user.handle != ""){
+                findViewById<TextView>(R.id.handle).text =  user.handle
+            }
+            findViewById<TextView>(R.id.totalGames).text = user.totalGames.toString()
+            findViewById<TextView>(R.id.correctSongs).text = user.correctSongs.toString()
+            findViewById<TextView>(R.id.bestScore).text = user.bestScore.toString()
+            findViewById<TextView>(R.id.ranking).text = user.ranking.toString()
+        }
         CoroutineScope(Dispatchers.Main).launch {
             val task = async(Dispatchers.IO) {
                 try {
-                    val bit = BitmapGetterApi.download("https://" + user.image)
-                    bit.get()
+                    Log.e(getString(R.string.log_tag),user.image)
+                    val bit = BitmapGetterApi.download("https://raw.githubusercontent.com/Ashwinvalento/cartoon-avatar/master/lib/images/male/45.png")
+                    bit.get(10, TimeUnit.SECONDS)
                 }catch (e: Exception){
                     null
                 }
             }
             val bm = task.await()
-            findViewById<ImageView>(R.id.avatar).setImageBitmap(bm)
+
+            if(bm != null){
+                val avatar = findViewById<ImageView>(R.id.avatar)
+                avatar.setImageBitmap(Bitmap.createScaledBitmap(bm, 1000,1000, false))
+            }
         }
+
     }
 }
 
diff --git a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
index d6625710d..e57772121 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/WelcomeActivity.kt
@@ -8,26 +8,36 @@ import android.view.Window.FEATURE_NO_TITLE
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import ch.sdp.vibester.R
+import ch.sdp.vibester.auth.FireBaseAuthenticator
+import com.google.firebase.database.ktx.database
+import com.google.firebase.ktx.Firebase
 import ch.sdp.vibester.model.UserSharedPref
 
 class WelcomeActivity : AppCompatActivity() {
+
+    // For test purpose
+    companion object{
+        var testLoggedIn: Boolean = false
+
+        fun setLoggedIn(){
+            testLoggedIn = true
+        }
+
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         requestWindowFeature(FEATURE_NO_TITLE)
         supportActionBar?.hide()
         setContentView(R.layout.activity_welcome_screen)
 
-        val tv = findViewById<TextView>(R.id.user_status)
-        val username = UserSharedPref.getUser(this).username
-        if(username != "")
+        val userStatusTextValue = findViewById<TextView>(R.id.user_status)
+        if(FireBaseAuthenticator.isLoggedIn() ||  testLoggedIn)
         {
-            tv.text = "User: " + username
+            userStatusTextValue.text = "User: " + FireBaseAuthenticator.getCurrentUserMail()
         }
 
-        val currentEmail = UserSharedPref.getUser(this).email
-        if (currentEmail != null){
-            UserSharedPref.userReset(this, currentEmail)
-        }
+
     }
 
     private fun sendDirectIntent(arg: Class<*>?) {
@@ -40,17 +50,17 @@ class WelcomeActivity : AppCompatActivity() {
     }
 
     fun switchToProfile(view: View) {
-        sendDirectIntent(ProfileActivity::class.java)
+        if (FireBaseAuthenticator.isLoggedIn() || testLoggedIn){
+            sendDirectIntent(ProfileActivity::class.java)
+        }else{
+            sendDirectIntent(AuthenticationActivity::class.java)
+        }
     }
 
     fun switchToScoreboard(view: View) {
         sendDirectIntent(ScoreBoardActivity::class.java)
     }
 
-    fun switchToSettings(view: View) {
-        sendDirectIntent(AuthenticationActivity::class.java)
-    }
-
     fun switchToDownload(view: View) {
         sendDirectIntent(DownloadActivity::class.java)
     }
diff --git a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
index 19cf70097..ca797c939 100644
--- a/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
+++ b/app/src/main/java/ch/sdp/vibester/auth/FireBaseAuthenticator.kt
@@ -13,6 +13,27 @@ import dagger.hilt.android.scopes.ServiceScoped
 import javax.inject.Inject
 
 class FireBaseAuthenticator @Inject constructor() {
+    companion object{
+
+        /**
+         * API: return true if firebase authentication is logged in
+         */
+        fun isLoggedIn(): Boolean {
+            return !(FirebaseAuth.getInstance().currentUser == null)
+        }
+
+        /**
+         * API: return the mail of the user if logged in otherwise empty string
+         */
+        fun getCurrentUserMail(): String {
+            if (isLoggedIn()) {
+                return FirebaseAuth.getInstance().currentUser!!.email.toString()
+            } else {
+                return ""
+            }
+        }
+
+    }
 
     private val auth: FirebaseAuth = Firebase.auth
 
diff --git a/app/src/main/java/ch/sdp/vibester/database/UsersRepo.kt b/app/src/main/java/ch/sdp/vibester/database/UsersRepo.kt
index e8a52a902..c8c6eca87 100644
--- a/app/src/main/java/ch/sdp/vibester/database/UsersRepo.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/UsersRepo.kt
@@ -79,8 +79,6 @@ class UsersRepo @Inject constructor() {
                         if(dbContents.email == email) {
                             callback(dbContents)
                             break
-                        } else {
-                            callback(UserProfile())
                         }
                     }
                 }
diff --git a/app/src/main/res/layout/activity_authentication.xml b/app/src/main/res/layout/activity_authentication.xml
new file mode 100644
index 000000000..84ec7a43e
--- /dev/null
+++ b/app/src/main/res/layout/activity_authentication.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/floral_white"
+    tools:context=".activity.AuthenticationActivity">
+
+    <TextView
+        android:id="@+id/email"
+        android:layout_width="357dp"
+        android:layout_height="220dp"
+        android:layout_marginStart="27dp"
+        android:layout_marginTop="100dp"
+        android:layout_marginEnd="27dp"
+        android:fontFamily="monospace"
+        android:text="@string/authentication_noActionDoneYet"
+        android:textAlignment="center"
+        android:textColor="@color/black"
+        android:textSize="25sp"
+        app:layout_constraintBottom_toTopOf="@+id/scrollView2"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ScrollView
+        android:id="@+id/scrollView2"
+        android:layout_width="409dp"
+        android:layout_height="530dp"
+        android:layout_marginStart="1dp"
+        android:layout_marginEnd="1dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/email">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <Button
+                android:id="@+id/googleBtn"
+                android:layout_width="200dp"
+                android:layout_height="48dp"
+                android:backgroundTint="@color/cg_blue"
+                android:elevation="10dp"
+                android:stateListAnimator="@null"
+                android:text="@string/logInGoogle"
+                android:translationZ="10dp" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="75dp" />
+
+            <EditText
+                android:id="@+id/username"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:hint="email"
+                android:inputType="textPersonName"
+                tools:ignore="TouchTargetSizeCheck" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="18dp" />
+
+            <EditText
+                android:id="@+id/password"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:hint="password"
+                android:inputType="textPassword" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="18dp" />
+
+            <Button
+                android:id="@+id/createAcc"
+                android:layout_width="200dp"
+                android:layout_height="48dp"
+                android:backgroundTint="@color/cg_blue"
+                android:elevation="10dp"
+                android:stateListAnimator="@null"
+                android:text="@string/createAcc"
+                android:translationZ="10dp" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="15dp" />
+
+            <Button
+                android:id="@+id/logIn"
+                android:layout_width="200dp"
+                android:layout_height="48dp"
+
+                android:backgroundTint="@color/cg_blue"
+                android:elevation="10dp"
+                android:stateListAnimator="@null"
+                android:text="@string/logIn"
+                android:translationZ="10dp" />
+
+        </LinearLayout>
+    </ScrollView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_google_log_in.xml b/app/src/main/res/layout/activity_google_log_in.xml
deleted file mode 100644
index bd91d43c5..000000000
--- a/app/src/main/res/layout/activity_google_log_in.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/floral_white"
-    tools:context=".activity.AuthenticationActivity">
-
-    <Button
-        android:id="@+id/createAcc"
-        android:layout_width="200dp"
-        android:layout_height="48dp"
-        android:layout_marginTop="126dp"
-        android:text="@string/createAcc"
-        android:backgroundTint="@color/cg_blue"
-        android:elevation="10dp"
-        android:stateListAnimator="@null"
-        android:translationZ="10dp"
-        app:layout_constraintBottom_toTopOf="@+id/googleBtn"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/email"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="59dp"
-        android:layout_marginBottom="21dp"
-        android:fontFamily="monospace"
-        android:textColor="@color/black"
-        android:text="TextView"
-        android:textSize="25sp"
-        app:layout_constraintBottom_toTopOf="@+id/username"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/logIn" />
-
-    <EditText
-        android:id="@+id/username"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="31dp"
-        android:layout_marginBottom="19dp"
-        android:ems="10"
-        android:hint="email"
-        android:inputType="textPersonName"
-        app:layout_constraintBottom_toTopOf="@+id/password"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.497"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/email"
-        tools:ignore="TouchTargetSizeCheck" />
-
-    <EditText
-        android:id="@+id/password"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="19dp"
-        android:layout_marginBottom="175dp"
-        android:ems="10"
-        android:hint="password"
-        android:inputType="textPassword"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.497"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/username" />
-
-    <Button
-        android:id="@+id/logIn"
-        android:layout_width="200dp"
-        android:layout_height="48dp"
-        android:layout_marginTop="27dp"
-        android:text="@string/logIn"
-        android:backgroundTint="@color/cg_blue"
-        android:elevation="10dp"
-        android:stateListAnimator="@null"
-        android:translationZ="10dp"
-        app:layout_constraintBottom_toTopOf="@+id/email"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/googleBtn" />
-
-    <Button
-        android:id="@+id/googleBtn"
-        android:layout_width="200dp"
-        android:layout_height="48dp"
-        android:layout_marginTop="28dp"
-        android:text="@string/logInGoogle"
-        android:backgroundTint="@color/cg_blue"
-        android:elevation="10dp"
-        android:stateListAnimator="@null"
-        android:translationZ="10dp"
-        app:layout_constraintBottom_toTopOf="@+id/logIn"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.497"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/createAcc" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index 93457d6e8..d433b87f1 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -30,6 +30,7 @@
         android:layout_height="30dp"
         android:layout_marginTop="216dp"
         android:fontFamily="monospace"
+        android:text="@string/authentication_placeholderHandle"
         android:textAlignment="center"
         android:textColor="#000"
         android:textSize="16sp"
@@ -46,6 +47,7 @@
         android:layout_height="30dp"
         android:layout_marginBottom="109dp"
         android:fontFamily="monospace"
+        android:text="@string/authentication_placeholderUsername"
         android:textAlignment="center"
         android:textColor="#000"
         android:textSize="16sp"
@@ -56,6 +58,19 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/handle" />
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/profile_returnToMain"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:backgroundTint="@color/light_coral"
+        app:borderWidth="0dp"
+        android:clickable="true"
+        android:src="@android:drawable/ic_menu_revert"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
     <TableLayout
         android:id="@+id/profileStatistics"
         android:layout_width="wrap_content"
@@ -88,6 +103,7 @@
                 android:layout_height="match_parent"
                 android:fontFamily="monospace"
                 android:padding="18dip"
+                android:text="@string/authentication_placeholderEmptyScore"
                 android:textAlignment="viewEnd"
                 android:textColor="#000"
                 android:textSize="16sp" />
@@ -110,10 +126,13 @@
                 android:id="@+id/totalGames"
                 android:layout_width="147dp"
                 android:layout_height="wrap_content"
+                android:fontFamily="monospace"
                 android:padding="18dip"
+                android:text="@string/authentication_placeholderEmptyScore"
                 android:textAlignment="viewEnd"
                 android:textColor="#000"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                tools:text="@string/authentication_placeholderEmptyScore" />
         </TableRow>
 
         <TableRow
@@ -133,10 +152,13 @@
                 android:id="@+id/bestScore"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:fontFamily="monospace"
                 android:padding="18dip"
+                android:text="@string/authentication_placeholderEmptyScore"
                 android:textAlignment="viewEnd"
                 android:textColor="#000"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                tools:text="@string/authentication_placeholderEmptyScore" />
         </TableRow>
 
         <TableRow
@@ -156,10 +178,13 @@
                 android:id="@+id/correctSongs"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:fontFamily="monospace"
                 android:padding="18dip"
+                android:text="@string/authentication_placeholderEmptyScore"
                 android:textAlignment="viewEnd"
                 android:textColor="#000"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                tools:text="@string/authentication_placeholderEmptyScore" />
 
         </TableRow>
 
@@ -201,4 +226,19 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/username" />
 
+    <Button
+        android:id="@+id/logout"
+        android:layout_width="200dp"
+        android:layout_height="48dp"
+        android:layout_marginBottom="24dp"
+        android:backgroundTint="@color/cg_blue"
+        android:elevation="10dp"
+        android:stateListAnimator="@null"
+        android:text="logout"
+        android:translationZ="10dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.497"
+        app:layout_constraintStart_toStartOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_welcome_screen.xml b/app/src/main/res/layout/activity_welcome_screen.xml
index 3da539b22..18ef2d478 100644
--- a/app/src/main/res/layout/activity_welcome_screen.xml
+++ b/app/src/main/res/layout/activity_welcome_screen.xml
@@ -11,7 +11,7 @@
         android:id="@+id/vibester_welcome_logo"
         android:layout_width="190dp"
         android:layout_height="154dp"
-        android:layout_marginTop="70dp"
+        android:layout_marginTop="40dp"
         android:contentDescription="@string/app_logo"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -41,10 +41,10 @@
                 android:layout_marginTop="10dp"
                 android:backgroundTint="@color/cg_blue"
                 android:elevation="10dp"
+                android:onClick="switchToPlay"
                 android:stateListAnimator="@null"
+                android:text="@string/welcomeScreen_playAGame"
                 android:translationZ="10dp"
-                android:onClick="switchToPlay"
-                android:text="@string/play_a_game"
                 app:icon="@android:drawable/ic_media_play" />
 
             <Button
@@ -56,7 +56,7 @@
                 android:elevation="10dp"
                 android:onClick="switchToScoreboard"
                 android:stateListAnimator="@null"
-                android:text="@string/welcome_scoreboard"
+                android:text="@string/welcomeScreen_scoreboard"
                 android:translationZ="10dp"
                 app:icon="@android:drawable/ic_menu_share" />
 
@@ -69,7 +69,7 @@
                 android:elevation="10dp"
                 android:onClick="switchToProfile"
                 android:stateListAnimator="@null"
-                android:text="@string/profile"
+                android:text="@string/welcomeScreen_myAccount"
                 android:translationZ="10dp"
                 app:icon="@android:drawable/ic_menu_edit" />
 
@@ -86,6 +86,7 @@
                 android:visibility="gone"
                 app:icon="@android:drawable/stat_sys_headset" />
 
+            <!-- Currently disabled because don't have true settings activity -->
             <Button
                 android:id="@+id/welcome_settings"
                 android:layout_width="200dp"
@@ -93,11 +94,12 @@
                 android:layout_marginTop="10dp"
                 android:backgroundTint="@color/cg_blue"
                 android:elevation="10dp"
-                android:onClick="switchToSettings"
                 android:stateListAnimator="@null"
-                android:text="@string/settings"
+                android:text="@string/welcomeScreen_settings"
                 android:translationZ="10dp"
-                app:icon="@android:drawable/ic_menu_manage" />
+                app:icon="@android:drawable/ic_menu_manage"
+                android:enabled="false"
+                />
 
             <Button
                 android:id="@+id/welcome_download"
@@ -108,7 +110,7 @@
                 android:elevation="10dp"
                 android:onClick="switchToDownload"
                 android:stateListAnimator="@null"
-                android:text="@string/welcome_download"
+                android:text="@string/welcomeScreen_download"
                 android:translationZ="10dp"
                 app:icon="@android:drawable/stat_sys_download" />
 
@@ -127,7 +129,7 @@
 
             <Space
                 android:layout_width="match_parent"
-                android:layout_height="42dp" />
+                android:layout_height="21dp" />
 
             <TextView
                 android:id="@+id/user_status"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 15e744fd1..c01b30314 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,25 @@
 <resources>
+    <!-- Cleaned String-->
+    <!-- General -->
     <string name="app_name">Vibester</string>
+    <string name="log_tag">[VibesterLOG]</string>
+
+    <!-- Welcome Screen -->
+    <string name="welcomeScreen_playAGame">Play a game</string>
+    <string name="welcomeScreen_scoreboard">Scoreboard</string>
+    <string name="welcomeScreen_myAccount">My account</string>
+    <string name="welcomeScreen_settings">Settings</string>
+    <string name="welcomeScreen_download">Download</string>
+
+    <!-- Authentication -->
+    <string name="authentication_placeholderHandle">Placeholder Handle</string>
+    <string name="authentication_placeholderUsername">Placeholder Username</string>
+    <string name="authentication_placeholderEmptyScore">Error</string>
+    <string name="authentication_noActionDoneYet">Either log in with your google account or fill in credentials to create an account or log in</string>
+
+    <!-- OLD String-->
+
+
     <string name="greeting_txt">Greeting:</string>
     <string name="default_txtview_txt">empty text view</string>
     <string name="button_txt">Enter</string>