diff --git a/app/src/androidTest/java/ch/sdp/vibester/fragment/ScoreBoardFragmentTest.kt b/app/src/androidTest/java/ch/sdp/vibester/fragment/ScoreBoardFragmentTest.kt
index 2968ca0af..6a7673128 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/fragment/ScoreBoardFragmentTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/fragment/ScoreBoardFragmentTest.kt
@@ -1,7 +1,6 @@
 package ch.sdp.vibester.fragment
 
 import androidx.recyclerview.widget.RecyclerView
-import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -46,19 +45,19 @@ class ScoreBoardFragmentTest {
     @Test
     fun genreShouldDisappearAfterSelected() {
         onView(withId(R.id.genrePerScoreboard)).check(matches(isDisplayed()))
-        onView(withId(R.id.rockButton)).perform(click())
+        onView(withId(R.id.scoreboard_rockButton)).perform(click())
         onView(withId(R.id.genrePerScoreboard)).check(matches(not(isDisplayed())))
     }
 
     @Test
     fun rockBtnShouldSetUpRecycleView() {
-        onView(withId(R.id.rockButton)).perform(click())
+        onView(withId(R.id.scoreboard_rockButton)).perform(click())
         onView(withId(R.id.scoreboard_content_scrolling)).check(matches(isDisplayed()))
     }
 
     @Test
     fun clickOnItemShouldGoesToProfileAndDisplaysScores() {
-        onView(withId(R.id.rockButton)).perform(click())
+        onView(withId(R.id.scoreboard_rockButton)).perform(click())
 
         onView((withId(R.id.recycler_view)))
             .perform(
@@ -73,26 +72,26 @@ class ScoreBoardFragmentTest {
 
     @Test
     fun topBtnClick() {
-        onView(withId(R.id.topTracksButton)).perform(click())
+        onView(withId(R.id.scoreboard_topTracksButton)).perform(click())
     }
 
     @Test
     fun kpopBtnClick() {
-        onView(withId(R.id.kpopButton)).perform(click())
+        onView(withId(R.id.scoreboard_kpopButton)).perform(click())
     }
 
     @Test
     fun billieEilishButtonClick() {
-        onView(withId(R.id.billieEilishButton)).perform(click())
+        onView(withId(R.id.scoreboard_billieEilishButton)).perform(click())
     }
 
     @Test
     fun imagineDragonsButtonClick() {
-        onView(withId(R.id.imagDragonsButton)).perform(click())
+        onView(withId(R.id.scoreboard_imagDragonsButton)).perform(click())
     }
 
     @Test
     fun btsButtonClick() {
-        onView(withId(R.id.btsButton)).perform(click())
+        onView(withId(R.id.scoreboard_btsButton)).perform(click())
     }
 }
\ 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 21ebc5ade..401d4cc0d 100644
--- a/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt
+++ b/app/src/main/java/ch/sdp/vibester/fragment/ScoreBoardFragment.kt
@@ -43,12 +43,12 @@ class ScoreBoardFragment : Fragment(), OnItemClickListener, View.OnClickListener
         val view = inflater.inflate(R.layout.fragment_scoreboard, container, false)
         val ctx = inflater.context
 
-        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.scoreboard_kpopButton).setOnClickListener(this)
+        view.findViewById<Button>(R.id.scoreboard_rockButton).setOnClickListener(this)
+        view.findViewById<Button>(R.id.scoreboard_btsButton).setOnClickListener(this)
+        view.findViewById<Button>(R.id.scoreboard_topTracksButton).setOnClickListener(this)
+        view.findViewById<Button>(R.id.scoreboard_imagDragonsButton).setOnClickListener(this)
+        view.findViewById<Button>(R.id.scoreboard_billieEilishButton).setOnClickListener(this)
         setupRecycleView(view, ctx)
 
         return view
@@ -119,22 +119,22 @@ class ScoreBoardFragment : Fragment(), OnItemClickListener, View.OnClickListener
 
     override fun onClick(v: View?) {
             when(v!!.id) {
-                R.id.btsButton -> {
+                R.id.scoreboard_btsButton -> {
                     genre = "BTS"; selectScoreboard()
                 }
-                R.id.kpopButton -> {
+                R.id.scoreboard_kpopButton -> {
                     genre = "kpop"; selectScoreboard()
                 }
-                R.id.imagDragonsButton -> {
+                R.id.scoreboard_imagDragonsButton -> {
                     genre = "Imagine Dragons"; selectScoreboard()
                 }
-                R.id.billieEilishButton -> {
+                R.id.scoreboard_billieEilishButton -> {
                     genre = "Billie Eilish"; selectScoreboard()
                 }
-                R.id.rockButton -> {
+                R.id.scoreboard_rockButton -> {
                     genre = "rock";selectScoreboard()
                 }
-                R.id.topTracksButton -> {
+                R.id.scoreboard_topTracksButton -> {
                     genre = "top tracks";selectScoreboard()
                 }
 
diff --git a/app/src/main/res/layout/genre_for_scoreboard.xml b/app/src/main/res/layout/genre_for_scoreboard.xml
index 944065c1c..aff950041 100644
--- a/app/src/main/res/layout/genre_for_scoreboard.xml
+++ b/app/src/main/res/layout/genre_for_scoreboard.xml
@@ -26,7 +26,7 @@
             android:orientation="horizontal">
 
             <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/imagDragonsButton"
+                android:id="@+id/scoreboard_imagDragonsButton"
                 android:layout_width="170dp"
                 android:layout_height="130dp"
                 android:layout_weight="1"
@@ -45,7 +45,7 @@
                 android:layout_weight="1" />
 
             <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/billieEilishButton"
+                android:id="@+id/scoreboard_billieEilishButton"
                 android:layout_width="170dp"
                 android:layout_height="130dp"
                 android:layout_weight="1"
@@ -69,7 +69,7 @@
             android:orientation="horizontal">
 
             <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/rockButton"
+                android:id="@+id/scoreboard_rockButton"
                 android:layout_width="170sp"
                 android:layout_height="130sp"
                 android:layout_weight="1"
@@ -88,7 +88,7 @@
                 android:layout_weight="1" />
 
             <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/btsButton"
+                android:id="@+id/scoreboard_btsButton"
                 android:layout_width="170dp"
                 android:layout_height="130dp"
                 android:layout_weight="1"
@@ -112,7 +112,7 @@
             android:orientation="horizontal">
 
             <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/topTracksButton"
+                android:id="@+id/scoreboard_topTracksButton"
                 android:layout_width="170dp"
                 android:layout_height="130dp"
                 android:layout_weight="1"
@@ -131,7 +131,7 @@
                 android:layout_weight="1" />
 
             <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/kpopButton"
+                android:id="@+id/scoreboard_kpopButton"
                 android:layout_width="170dp"
                 android:layout_height="130dp"
                 android:layout_weight="1"