diff --git a/app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt b/app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt
index 1f2604143..bd960c4ad 100644
--- a/app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt
+++ b/app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt
@@ -1,16 +1,12 @@
 package ch.sdp.vibester.fragment
 
-import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.os.Environment
 import android.text.Editable
-import android.util.Log
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
 import android.widget.*
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
@@ -26,6 +22,7 @@ import ch.sdp.vibester.api.LastfmMethod
 import ch.sdp.vibester.api.LastfmUri
 import ch.sdp.vibester.database.AppPreferences
 import ch.sdp.vibester.helper.GameManager
+import ch.sdp.vibester.helper.ViewModel
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.gson.Gson
 import dagger.hilt.android.AndroidEntryPoint
@@ -37,7 +34,7 @@ import retrofit2.Response
 * Game Setup fragment with a button in the bottom navigation.
 */
 @AndroidEntryPoint
-class GameSetupFragment : Fragment(), View.OnClickListener, AdapterView.OnItemSelectedListener {
+class GameSetupFragment : Fragment(R.layout.fragment_layout_game_setup), AdapterView.OnItemSelectedListener {
     var difficulty = R.string.GameSetup_easy.toString()
     var game = "local_buzzer"
     var gameSize = R.string.one.toString()
@@ -45,70 +42,77 @@ class GameSetupFragment : Fragment(), View.OnClickListener, AdapterView.OnItemSe
     lateinit var gameManager: GameManager
     // TODO: OFFLINE
     private var hasInternet: Boolean = true
-    var viewfrag: View? = null
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        viewfrag = inflater.inflate(R.layout.fragment_game_setup, container, false)
-        return viewfrag!!.rootView
-    }
+    private var vmGameSetup = ViewModel()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val ctx = view.context
-
-        view.findViewById<Button>(R.id.offline_game_button).setOnClickListener(this)
-        view.findViewById<Button>(R.id.local_buzzer_game_button).setOnClickListener(this)
-        view.findViewById<Button>(R.id.local_typing_game_button).setOnClickListener(this)
-        view.findViewById<Button>(R.id.local_lyrics_game_button).setOnClickListener(this)
-        view.findViewById<Button>(R.id.online_buzzer_game_button).setOnClickListener(this)
-        view.findViewById<Button>(R.id.kpopButton).setOnClickListener(this)
-        view.findViewById<Button>(R.id.rockButton).setOnClickListener(this)
-        view.findViewById<Button>(R.id.btsButton).setOnClickListener(this)
-        view.findViewById<Button>(R.id.topTracksButton).setOnClickListener(this)
-        view.findViewById<Button>(R.id.imagDragonsButton).setOnClickListener(this)
-        view.findViewById<Button>(R.id.billieEilishButton).setOnClickListener(this)
-        view.findViewById<Button>(R.id.difficulty_proceed).setOnClickListener(this)
-        view.findViewById<Button>(R.id.game_setup_has_internet).setOnClickListener(this)
-        updateInternet(view.findViewById<Button>(R.id.game_setup_has_internet))
-
-        searchArtistEditable = view.findViewById<EditText>(R.id.searchArtist).text
-        view.findViewById<Button>(R.id.validateSearch).setOnClickListener(this)
-
-        setReturnBtnListener(view)
-        setSpinnerListener(view, ctx, R.id.difficulty_spinner, R.array.difficulties_name)
-        setSpinnerListener(view, ctx, R.id.size_spinner, R.array.game_size_options)
+
+        vmGameSetup.view = view
+        vmGameSetup.ctx = view.context
+
+        setGenreListeners()
+        setGameModeListeners()
+
+        vmGameSetup.view.findViewById<Button>(R.id.difficulty_proceed).setOnClickListener{ proceedGame() }
+        vmGameSetup.view.findViewById<Button>(R.id.game_setup_has_internet).setOnClickListener { updateInternet(vmGameSetup.view.findViewById(R.id.game_setup_has_internet)) }
+
+        updateInternet(vmGameSetup.view.findViewById<Button>(R.id.game_setup_has_internet))
+        searchArtistEditable = vmGameSetup.view.findViewById<EditText>(R.id.searchArtist).text
+
+        setReturnBtnListener()
+        setSpinnerListener(R.id.difficulty_spinner, R.array.difficulties_name)
+        setSpinnerListener(R.id.size_spinner, R.array.game_size_options)
     }
 
     override fun onResume() {
         super.onResume()
-        updateInternet(viewfrag!!.findViewById<Button>(R.id.game_setup_has_internet))
+        updateInternet(vmGameSetup.view.findViewById<Button>(R.id.game_setup_has_internet))
+    }
+
+    private fun setGenreListeners(){
+        vmGameSetup.view.findViewById<Button>(R.id.offline_game_button).setOnClickListener { chooseGame("local_buzzer", GameManager(), true) }
+        vmGameSetup.view.findViewById<Button>(R.id.kpopButton).setOnClickListener { chooseGenre(method = LastfmMethod.BY_TAG.method, tag = "kpop", mode = R.string.kpop) }
+        vmGameSetup.view.findViewById<Button>(R.id.rockButton).setOnClickListener { chooseGenre(method = LastfmMethod.BY_TAG.method, tag = "rock", mode = R.string.rock) }
+        vmGameSetup.view.findViewById<Button>(R.id.btsButton).setOnClickListener { chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "BTS", mode = R.string.gameGenre_bts) }
+        vmGameSetup.view.findViewById<Button>(R.id.topTracksButton).setOnClickListener { chooseGenre(method = LastfmMethod.BY_CHART.method, mode = R.string.top_tracks) }
+        vmGameSetup.view.findViewById<Button>(R.id.imagDragonsButton).setOnClickListener{ chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "Imagine Dragons", mode = R.string.gameGenre_imagine_dragons) }
+        vmGameSetup.view.findViewById<Button>(R.id.billieEilishButton).setOnClickListener { chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "Billie Eilish", mode = R.string.gameGenre_billie_eilish) }
+        vmGameSetup.view.findViewById<Button>(R.id.validateSearch).setOnClickListener{ chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = searchArtistEditable.toString(), mode = R.string.gameGenre_byArtistSearch) }
     }
 
+    private fun setGameModeListeners() {
+        vmGameSetup.view.findViewById<Button>(R.id.local_buzzer_game_button)
+            .setOnClickListener { chooseGame("local_buzzer", GameManager()) }
+        vmGameSetup.view.findViewById<Button>(R.id.local_typing_game_button)
+            .setOnClickListener { chooseGame("local_typing", GameManager()) }
+        vmGameSetup.view.findViewById<Button>(R.id.local_lyrics_game_button)
+            .setOnClickListener{ chooseGame("local_lyrics", GameManager()) }
+        vmGameSetup.view.findViewById<Button>(R.id.online_buzzer_game_button)
+            .setOnClickListener { switchToGameNoParameters(ChoosePartyRoomActivity()) }
+    }
 
-    private fun setReturnBtnListener(view:View) {
-        view.findViewById<FloatingActionButton>(R.id.gameSetup_returnToMain).setOnClickListener {
-            if (view.findViewById<LinearLayout>(R.id.genrePerScoreboard).visibility == View.VISIBLE) {
-                toggleViewsVisibility(goneView = view.findViewById<LinearLayout>(R.id.genrePerScoreboard),
-                    visibleView = view.findViewById<LinearLayout>(R.id.chooseGame))
-            } else if (view.findViewById<RelativeLayout>(R.id.chooseSetting).visibility == View.VISIBLE) {
-                toggleViewsVisibility(goneView = view.findViewById<RelativeLayout>(R.id.chooseSetting),
-                    visibleView = view.findViewById<LinearLayout>(R.id.genrePerScoreboard))
+
+    private fun setReturnBtnListener() {
+        vmGameSetup.view.findViewById<FloatingActionButton>(R.id.gameSetup_returnToMain).setOnClickListener {
+            if (vmGameSetup.view.findViewById<LinearLayout>(R.id.genrePerScoreboard).visibility == VISIBLE) {
+                toggleViewsVisibility(goneView = vmGameSetup.view.findViewById<LinearLayout>(R.id.genrePerScoreboard),
+                    visibleView = vmGameSetup.view.findViewById<LinearLayout>(R.id.chooseGame))
+            } else if (vmGameSetup.view.findViewById<RelativeLayout>(R.id.chooseSetting).visibility == VISIBLE) {
+                toggleViewsVisibility(goneView = vmGameSetup.view.findViewById<RelativeLayout>(R.id.chooseSetting),
+                    visibleView = vmGameSetup.view.findViewById<LinearLayout>(R.id.genrePerScoreboard))
             }
         }
     }
 
     private fun toggleViewsVisibility(goneView: View, visibleView:View) {
-        goneView.visibility = View.GONE
-        visibleView.visibility = View.VISIBLE
+        goneView.visibility = GONE
+        visibleView.visibility = VISIBLE
     }
 
-    private fun setSpinnerListener(view: View, ctx: Context, spinnerId: Int, resourceId: Int) {
-        val spinner: Spinner = view.findViewById(spinnerId)
+    private fun setSpinnerListener(spinnerId: Int, resourceId: Int) {
+        val spinner: Spinner = vmGameSetup.view.findViewById(spinnerId)
         val adapter = ArrayAdapter.createFromResource(
-            ctx, resourceId, android.R.layout.simple_spinner_item
+            vmGameSetup.ctx, resourceId, android.R.layout.simple_spinner_item
         )
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         spinner.adapter = adapter
@@ -190,7 +194,8 @@ class GameSetupFragment : Fragment(), View.OnClickListener, AdapterView.OnItemSe
         call.enqueue(object : Callback<Any> {
             override fun onFailure(call: Call<Any>, t: Throwable?) {}
             override fun onResponse(call: Call<Any>, response: Response<Any>) {
-                val external = context?.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
+
+                val external = vmGameSetup.ctx.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
                 if (external != null) {
                     gameManager.setOffline(external, !playOffline)
                 }
@@ -248,28 +253,6 @@ class GameSetupFragment : Fragment(), View.OnClickListener, AdapterView.OnItemSe
         }
     }
 
-    override fun onClick(v: View?) {
-        when(v!!.id) {
-            R.id.local_buzzer_game_button -> chooseGame("local_buzzer", GameManager())
-            R.id.local_typing_game_button -> chooseGame("local_typing", GameManager())
-            R.id.local_lyrics_game_button -> chooseGame("local_lyrics", GameManager())
-            R.id.online_buzzer_game_button -> switchToGameNoParameters(ChoosePartyRoomActivity())
-            R.id.offline_game_button -> chooseGame("local_buzzer", GameManager(), true)
-
-            R.id.btsButton -> chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "BTS", mode = R.string.gameGenre_bts)
-            R.id.kpopButton -> chooseGenre(method = LastfmMethod.BY_TAG.method, tag = "kpop", mode = R.string.kpop)
-            R.id.imagDragonsButton -> chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "Imagine Dragons", mode = R.string.gameGenre_imagine_dragons)
-            R.id.rockButton-> chooseGenre(method = LastfmMethod.BY_TAG.method, tag = "rock", mode = R.string.rock)
-            R.id.topTracksButton -> chooseGenre(method = LastfmMethod.BY_CHART.method, mode = R.string.top_tracks)
-            R.id.billieEilishButton -> chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "Billie Eilish", mode = R.string.gameGenre_billie_eilish)
-
-            R.id.validateSearch -> chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = searchArtistEditable.toString(), mode = R.string.gameGenre_byArtistSearch)
-
-            R.id.difficulty_proceed -> proceedGame()
-
-            R.id.game_setup_has_internet -> updateInternet(v.findViewById(R.id.game_setup_has_internet))
-        }
-    }
 
     /**
      * Switches between Internet On and Internet Off when the view button is pressed.
@@ -277,26 +260,26 @@ class GameSetupFragment : Fragment(), View.OnClickListener, AdapterView.OnItemSe
      */
     private fun updateInternet(view: View) {
         val btn: Button = view as Button
-        val isConncted = InternetState.getInternetStatus(requireContext())
+        val isConncted = InternetState.getInternetStatus(vmGameSetup.ctx)
         if (isConncted) {
             hasInternet = true
             btn.text = getString(R.string.GameSetup_internetSwitchOn)
-            btn.setBackgroundColor(requireContext().getColor(R.color.maximum_yellow_red))
+            btn.setBackgroundColor(vmGameSetup.ctx.getColor(R.color.maximum_yellow_red))
 
-            viewfrag!!.findViewById<LinearLayout>(R.id.horilayer_multi).visibility = VISIBLE
-            viewfrag!!.findViewById<LinearLayout>(R.id.horilayer_single).visibility = VISIBLE
-            viewfrag!!.findViewById<TextView>(R.id.singleplayer_game_txt).visibility = VISIBLE
-            viewfrag!!.findViewById<TextView>(R.id.multiplayer_game_txt).visibility = VISIBLE
+            vmGameSetup.view.findViewById<LinearLayout>(R.id.horilayer_multi).visibility = VISIBLE
+            vmGameSetup.view.findViewById<LinearLayout>(R.id.horilayer_single).visibility = VISIBLE
+            vmGameSetup.view.findViewById<TextView>(R.id.singleplayer_game_txt).visibility = VISIBLE
+            vmGameSetup.view.findViewById<TextView>(R.id.multiplayer_game_txt).visibility = VISIBLE
 
         } else {
             hasInternet = false
             btn.text = getString(R.string.GameSetup_internetSwitchOff)
-            btn.setBackgroundColor(requireContext().getColor(R.color.light_coral))
+            btn.setBackgroundColor(vmGameSetup.ctx.getColor(R.color.light_coral))
 
-            viewfrag!!.findViewById<LinearLayout>(R.id.horilayer_multi).visibility = GONE
-            viewfrag!!.findViewById<LinearLayout>(R.id.horilayer_single).visibility = GONE
-            viewfrag!!.findViewById<TextView>(R.id.singleplayer_game_txt).visibility = GONE
-            viewfrag!!.findViewById<TextView>(R.id.multiplayer_game_txt).visibility = GONE
+            vmGameSetup.view.findViewById<LinearLayout>(R.id.horilayer_multi).visibility = GONE
+            vmGameSetup.view.findViewById<LinearLayout>(R.id.horilayer_single).visibility = GONE
+            vmGameSetup.view.findViewById<TextView>(R.id.singleplayer_game_txt).visibility = GONE
+            vmGameSetup.view.findViewById<TextView>(R.id.multiplayer_game_txt).visibility = GONE
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt b/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt
index b63b44903..7ec4bdcb4 100644
--- a/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt
+++ b/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt
@@ -1,15 +1,12 @@
 package ch.sdp.vibester.fragment
 
 import android.content.ContentValues
-import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
 import android.widget.Button
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.widget.NestedScrollView
@@ -20,6 +17,8 @@ import ch.sdp.vibester.R
 import ch.sdp.vibester.activity.profile.PublicProfileActivity
 import ch.sdp.vibester.database.Database
 import ch.sdp.vibester.database.ImageGetter
+import ch.sdp.vibester.helper.IntentSwitcher
+import ch.sdp.vibester.helper.ViewModel
 import ch.sdp.vibester.user.OnItemClickListener
 import ch.sdp.vibester.user.User
 import ch.sdp.vibester.user.UserScoreboardAdapter
@@ -31,68 +30,59 @@ import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class ScoreBoardFragment : Fragment(), OnItemClickListener {
+class ScoreBoardFragment : Fragment(R.layout.fragment_layout_scoreboard), OnItemClickListener {
     private val dbRef: DatabaseReference = Database.get().getReference("users")
     private var players: MutableList<User> = mutableListOf()
     private var userScoreboardAdapter: UserScoreboardAdapter? = null
     private var genre: String = ""
-    private var testView: View? = null
-
+    private var vmScoreBoard = ViewModel()
     @Inject
     lateinit var imageGetter: ImageGetter
 
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_scoreboard, container, false).rootView
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val ctx = view.context
-
-        testView = view
-
-        view.findViewById<Button>(R.id.scoreboard_kpopButton).setOnClickListener { setGenreListeners(view, "Kpop") }
-        view.findViewById<Button>(R.id.scoreboard_rockButton).setOnClickListener {setGenreListeners(view, "Rock") }
-        view.findViewById<Button>(R.id.scoreboard_btsButton).setOnClickListener { setGenreListeners(view, "BTS") }
-        view.findViewById<Button>(R.id.scoreboard_topTracksButton).setOnClickListener{ setGenreListeners(view, "top tracks") }
-        view.findViewById<Button>(R.id.scoreboard_imagDragonsButton).setOnClickListener{ setGenreListeners(view, "Imagine Dragons") }
-        view.findViewById<Button>(R.id.scoreboard_billieEilishButton).setOnClickListener { setGenreListeners(view, "Billie Eillish") }
-        setupRecycleView(view, ctx)
+        vmScoreBoard.view = view
+        vmScoreBoard.ctx = view.context
+
+        view.findViewById<Button>(R.id.scoreboard_kpopButton).setOnClickListener { setGenreListeners("Kpop") }
+        view.findViewById<Button>(R.id.scoreboard_rockButton).setOnClickListener {setGenreListeners("Rock") }
+        view.findViewById<Button>(R.id.scoreboard_btsButton).setOnClickListener { setGenreListeners("BTS") }
+        view.findViewById<Button>(R.id.scoreboard_topTracksButton).setOnClickListener{ setGenreListeners("top tracks") }
+        view.findViewById<Button>(R.id.scoreboard_imagDragonsButton).setOnClickListener{ setGenreListeners("Imagine Dragons") }
+        view.findViewById<Button>(R.id.scoreboard_billieEilishButton).setOnClickListener { setGenreListeners("Billie Eillish") }
+        setupRecycleView()
     }
 
-    private fun selectScoreboard(view: View) {
+    private fun selectScoreboard() {
         val sortedBy = "scores/$genre"
 
-        view.findViewById<ConstraintLayout>(R.id.genrePerScoreboard).visibility = GONE
-        view.findViewById<NestedScrollView>(R.id.scoreboard_content_scrolling).visibility = VISIBLE
+        vmScoreBoard.view.findViewById<ConstraintLayout>(R.id.genrePerScoreboard).visibility = GONE
+        vmScoreBoard.view.findViewById<NestedScrollView>(R.id.scoreboard_content_scrolling).visibility = VISIBLE
 
-        loadPlayersSortedBy(sortedBy, view)
+        loadPlayersSortedBy(sortedBy)
     }
 
-    private fun setupRecycleView(view:View, context: Context) {
-        view.findViewById<RecyclerView>(R.id.recycler_view).apply {
-            layoutManager = LinearLayoutManager(context)
+    private fun setupRecycleView() {
+        vmScoreBoard.view.findViewById<RecyclerView>(R.id.recycler_view).apply {
+            layoutManager = LinearLayoutManager(vmScoreBoard.ctx)
             adapter = UserScoreboardAdapter(players, genre, this@ScoreBoardFragment, imageGetter)
             setHasFixedSize(true)
         }
     }
 
-    private fun loadPlayersSortedBy(genre: String, view: View) {
+    private fun loadPlayersSortedBy(genre: String) {
         dbRef.orderByChild(genre)
             .addValueEventListener(object : ValueEventListener {
             override fun onDataChange(snapshots: DataSnapshot) {
                 for (snapshot in snapshots.children) {
                     val player: User? = snapshot.getValue(User::class.java)
                     if (player != null) {
-                        (players as? ArrayList<User>)?.add(player)
+                        (players as ArrayList<User>).add(player)
                     }
                 }
                 players = replaceRankingByScore(players)
                 players = players.sortedByDescending { it.ranking } as MutableList<User>
-                showPlayersPosition(players, view)
+                showPlayersPosition(players)
             }
 
             override fun onCancelled(error: DatabaseError) {
@@ -111,9 +101,9 @@ class ScoreBoardFragment : Fragment(), OnItemClickListener {
     }
 
 
-    private fun showPlayersPosition(players: MutableList<User>, view: View) {
+    private fun showPlayersPosition(players: MutableList<User>) {
         userScoreboardAdapter = UserScoreboardAdapter(players, genre, this, imageGetter)
-        view.findViewById<RecyclerView>(R.id.recycler_view)!!.adapter = userScoreboardAdapter
+        vmScoreBoard.view.findViewById<RecyclerView>(R.id.recycler_view).adapter = userScoreboardAdapter
     }
 
     /**
@@ -121,14 +111,13 @@ class ScoreBoardFragment : Fragment(), OnItemClickListener {
      * go to the profile of the player at index position
      */
     override fun onItemClick(position: Int) {
-        val intent = Intent(requireActivity(), PublicProfileActivity::class.java)
-        intent.putExtra("UserId", players[position].uid)
-        intent.putExtra("ScoresOrFollowing", R.string.profile_scores.toString() )
-        startActivity(intent)
+        IntentSwitcher.switch(vmScoreBoard.ctx,
+            PublicProfileActivity::class.java,
+            mapOf(Pair("UserId", players[position].uid), Pair("ScoresOrFollowing", R.string.profile_scores.toString())))
     }
 
-    private fun setGenreListeners(view: View, genre: String){
+    private fun setGenreListeners(genre: String){
         this.genre = genre
-        selectScoreboard(view)
+        selectScoreboard()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/fragment/SearchUserFragment.kt b/app/src/main/java/ch/sdp/vibester/fragment/SearchUserFragment.kt
index 509971bc2..29134f1b7 100644
--- a/app/src/main/java/ch/sdp/vibester/fragment/SearchUserFragment.kt
+++ b/app/src/main/java/ch/sdp/vibester/fragment/SearchUserFragment.kt
@@ -4,9 +4,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.EditText
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -17,6 +15,8 @@ import ch.sdp.vibester.activity.profile.PublicProfileActivity
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.database.ImageGetter
+import ch.sdp.vibester.helper.IntentSwitcher
+import ch.sdp.vibester.helper.ViewModel
 import ch.sdp.vibester.user.OnItemClickListener
 import ch.sdp.vibester.user.User
 
@@ -29,7 +29,7 @@ import javax.inject.Inject
  * Search for users based on their usernames.
  */
 @AndroidEntryPoint
-class SearchUserFragment : Fragment(R.layout.fragment_search_user), OnItemClickListener {
+class SearchUserFragment : Fragment(R.layout.fragment_layout_search_user), OnItemClickListener {
 
     @Inject
     lateinit var usersRepo: DataGetter
@@ -40,6 +40,8 @@ class SearchUserFragment : Fragment(R.layout.fragment_search_user), OnItemClickL
     @Inject
     lateinit var authenticator: FireBaseAuthenticator
 
+    private val vmSearchUser = ViewModel()
+
     var users = arrayListOf<User>()
     lateinit var userProfileAdapter: UserProfileAdapter
 
@@ -49,24 +51,23 @@ class SearchUserFragment : Fragment(R.layout.fragment_search_user), OnItemClickL
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        vmSearchUser.view = view
+        vmSearchUser.ctx = view.context
 
-        setUpRecycleView(view)
-
-        searchEditText = view.findViewById(R.id.searchUserET)
+        setUpRecycleView()
+        searchEditText = vmSearchUser.view.findViewById(R.id.searchUserET)
         searchForUsers("")
 
-        setScanBtnListener(view)
+        setScanBtnListener()
 
         setSearchFieldListener()
     }
 
-    private fun setScanBtnListener(view: View) {
-        val buttonScan: FloatingActionButton = view.findViewById(R.id.searchUser_scanning)
+    private fun setScanBtnListener() {
+        val buttonScan: FloatingActionButton = vmSearchUser.view.findViewById(R.id.searchUser_scanning)
 
         buttonScan.setOnClickListener {
-            val qrIntent = Intent(requireActivity(), QrScanningActivity::class.java)
-            qrIntent.putExtra("uidList", uidList)
-            startActivity(qrIntent)
+            IntentSwitcher.switch(vmSearchUser.ctx, QrScanningActivity::class.java, mapOf(Pair("uidList", uidList)))
         }
     }
 
@@ -80,8 +81,8 @@ class SearchUserFragment : Fragment(R.layout.fragment_search_user), OnItemClickL
         })
     }
 
-    private fun setUpRecycleView(view: View) {
-        view.findViewById<RecyclerView>(R.id.searchList).apply {
+    private fun setUpRecycleView() {
+        vmSearchUser.view.findViewById<RecyclerView>(R.id.searchList).apply {
             layoutManager = LinearLayoutManager(context)
             userProfileAdapter = UserProfileAdapter(users, authenticator, usersRepo, imageGetter, this@SearchUserFragment)
             adapter = userProfileAdapter
@@ -113,10 +114,8 @@ class SearchUserFragment : Fragment(R.layout.fragment_search_user), OnItemClickL
     }
 
     override fun onItemClick(position: Int) {
-        val intent = Intent(requireActivity(), PublicProfileActivity::class.java)
-        intent.putExtra("UserId", users[position].uid)
-        intent.putExtra("ScoresOrFollowing", R.string.profile_following.toString())
-        startActivity(intent)
+        val extras = mapOf(Pair("UserId", users[position].uid), Pair("ScoresOrFollowing", R.string.profile_following.toString()))
+        IntentSwitcher.switch(vmSearchUser.ctx,PublicProfileActivity::class.java, extras)
     }
 }
 
diff --git a/app/src/main/java/ch/sdp/vibester/helper/ViewModel.kt b/app/src/main/java/ch/sdp/vibester/helper/ViewModel.kt
new file mode 100644
index 000000000..188abd1c0
--- /dev/null
+++ b/app/src/main/java/ch/sdp/vibester/helper/ViewModel.kt
@@ -0,0 +1,12 @@
+package ch.sdp.vibester.helper
+
+import android.content.Context
+import android.view.View
+
+/**
+* Class to set/get view, activity, context for fragment
+*/
+class ViewModel {
+    lateinit var view: View
+    lateinit var ctx: Context
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
index e757f63e7..fbe7316f8 100644
--- a/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
+++ b/app/src/main/java/ch/sdp/vibester/user/ProfileFollowingAdapter.kt
@@ -7,6 +7,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import ch.sdp.vibester.R
+import ch.sdp.vibester.activity.profile.ProfileActivity
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.helper.AdapterHelper
@@ -15,7 +16,7 @@ import ch.sdp.vibester.helper.loadImg
 /**
  * Set friends in userProfile with profile photo and username in RecycleView.
  */
-class ProfileFollowingAdapter constructor(
+class ProfileFollowingAdapter(
     private val following: MutableList<User>,
     val dataGetter: DataGetter,
     authenticator: FireBaseAuthenticator,
diff --git a/app/src/main/res/layout/fragment_game_setup.xml b/app/src/main/res/layout/fragment_layout_game_setup.xml
similarity index 99%
rename from app/src/main/res/layout/fragment_game_setup.xml
rename to app/src/main/res/layout/fragment_layout_game_setup.xml
index 72faf0ecb..07b0b0f41 100644
--- a/app/src/main/res/layout/fragment_game_setup.xml
+++ b/app/src/main/res/layout/fragment_layout_game_setup.xml
@@ -4,8 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/floral_white"
-    android:noHistory="true"
-    android:id="@+id/fragment_game_setup">
+    android:noHistory="true">
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/gameSetup_returnToMain"
diff --git a/app/src/main/res/layout/fragment_scoreboard.xml b/app/src/main/res/layout/fragment_layout_scoreboard.xml
similarity index 94%
rename from app/src/main/res/layout/fragment_scoreboard.xml
rename to app/src/main/res/layout/fragment_layout_scoreboard.xml
index 32377dec8..1d23e4c48 100644
--- a/app/src/main/res/layout/fragment_scoreboard.xml
+++ b/app/src/main/res/layout/fragment_layout_scoreboard.xml
@@ -2,8 +2,7 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/fragment_scoreboard">
+    android:layout_height="match_parent">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
diff --git a/app/src/main/res/layout/fragment_search_user.xml b/app/src/main/res/layout/fragment_layout_search_user.xml
similarity index 96%
rename from app/src/main/res/layout/fragment_search_user.xml
rename to app/src/main/res/layout/fragment_layout_search_user.xml
index a28bfbf6a..626a60316 100644
--- a/app/src/main/res/layout/fragment_search_user.xml
+++ b/app/src/main/res/layout/fragment_layout_search_user.xml
@@ -3,8 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/fragment_search_user"
-    xmlns:tools="http://schemas.android.com/tools"
     android:background="@color/floral_white">
 
     <RelativeLayout
diff --git a/app/src/main/res/menu/bottom_menu.xml b/app/src/main/res/menu/bottom_menu.xml
index 92003b7ba..e7108e7a2 100644
--- a/app/src/main/res/menu/bottom_menu.xml
+++ b/app/src/main/res/menu/bottom_menu.xml
@@ -8,21 +8,20 @@
         android:icon="@drawable/profile_selector"
         />
 
-
     <item
-        android:id="@+id/gameSetupBtn"
+        android:id="@+id/fragment_game_setup"
         android:icon="@drawable/play_selector"
-        tools:ignore="MenuTitle"/>
+        tools:ignore="MenuTitle"
+        />
 
     <item
-        android:id="@+id/searchUserBtn"
-        android:title="Search"
+        android:id="@+id/fragment_search_user"
+        tools:ignore="MenuTitle"
         android:icon="@drawable/search_selector"
         />
 
-
     <item
-        android:id="@+id/scoreboardBtn"
+        android:id="@+id/fragment_scoreboard"
         tools:ignore="MenuTitle"
         android:icon="@drawable/scoreboard_selector"
         />
diff --git a/app/src/main/res/navigation/bottom_navigation.xml b/app/src/main/res/navigation/bottom_navigation.xml
index 361571b53..074062c4c 100644
--- a/app/src/main/res/navigation/bottom_navigation.xml
+++ b/app/src/main/res/navigation/bottom_navigation.xml
@@ -5,12 +5,19 @@
     android:id="@+id/bottom_nav"
     app:startDestination="@id/welcomeScreenBtn">
 
-    <fragment android:id="@+id/welcomeScreenBtn" android:name="ch.sdp.vibester.fragment.WelcomeScreenFragment"
-        android:label="fragment_home" tools:layout="@layout/fragment_welcome_screen"/>
-    <fragment android:id="@+id/gameSetupBtn" android:name="ch.sdp.vibester.fragment.GameSetupFragment"
-        android:label="fragment_settings" tools:layout="@layout/fragment_game_setup"/>
-    <fragment android:id="@+id/searchUserBtn" android:name="ch.sdp.vibester.fragment.SearchUserFragment"
-        android:label="fragment_search" tools:layout="@layout/fragment_search_user"/>
-    <fragment android:id="@+id/scoreboardBtn" android:name="ch.sdp.vibester.fragment.ScoreBoardFragment"
-        android:label="fragment_scoreboard" tools:layout="@layout/fragment_scoreboard"/>
+    <fragment android:id="@+id/welcomeScreenBtn"
+        android:name="ch.sdp.vibester.fragment.WelcomeScreenFragment"
+        tools:layout="@layout/fragment_welcome_screen"/>
+
+    <fragment android:id="@+id/fragment_game_setup"
+        android:name="ch.sdp.vibester.fragment.GameSetupFragment"
+        tools:layout="@layout/fragment_layout_game_setup"/>
+
+    <fragment android:id="@+id/fragment_search_user"
+        android:name="ch.sdp.vibester.fragment.SearchUserFragment"
+        tools:layout="@layout/fragment_layout_search_user"/>
+
+    <fragment android:id="@+id/fragment_scoreboard"
+        android:name="ch.sdp.vibester.fragment.ScoreBoardFragment"
+        tools:layout="@layout/fragment_layout_scoreboard"/>
 </navigation>
\ No newline at end of file