diff --git a/.idea/misc.xml b/.idea/misc.xml
index ba8bff91..66e0ae37 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,23 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/Documents/MSc CSE/OneDrive - epfl.ch/EPFL/Software Devlopment Project/RockPaperScissors/app/src/main/res/drawable/ic_arrow_drop_down_black_24dp.xml" value="0.2225" />
+        <entry key="..\:/Documents/MSc CSE/OneDrive - epfl.ch/EPFL/Software Devlopment Project/RockPaperScissors/app/src/main/res/drawable/ic_baseline_leaderboard_24.xml" value="0.216" />
+        <entry key="..\:/Documents/MSc CSE/OneDrive - epfl.ch/EPFL/Software Devlopment Project/RockPaperScissors/app/src/main/res/drawable/side_nav_bar.xml" value="0.234" />
+        <entry key="..\:/Documents/MSc CSE/OneDrive - epfl.ch/EPFL/Software Devlopment Project/RockPaperScissors/app/src/main/res/drawable/spinner_background.xml" value="0.234" />
+        <entry key="..\:/Documents/MSc CSE/OneDrive - epfl.ch/EPFL/Software Devlopment Project/RockPaperScissors/app/src/main/res/layout/activity_main.xml" value="0.1" />
+        <entry key="..\:/Documents/MSc CSE/OneDrive - epfl.ch/EPFL/Software Devlopment Project/RockPaperScissors/app/src/main/res/layout/activity_match_detail.xml" value="0.1" />
+        <entry key="..\:/Documents/MSc CSE/OneDrive - epfl.ch/EPFL/Software Devlopment Project/RockPaperScissors/app/src/main/res/layout/app_bar_main.xml" value="0.21195652173913043" />
+        <entry key="..\:/Documents/MSc CSE/OneDrive - epfl.ch/EPFL/Software Devlopment Project/RockPaperScissors/app/src/main/res/layout/content_main.xml" value="0.21195652173913043" />
+        <entry key="..\:/Documents/MSc CSE/OneDrive - epfl.ch/EPFL/Software Devlopment Project/RockPaperScissors/app/src/main/res/layout/fragment_blank.xml" value="0.125" />
+        <entry key="..\:/Documents/MSc CSE/OneDrive - epfl.ch/EPFL/Software Devlopment Project/RockPaperScissors/app/src/main/res/layout/fragment_home.xml" value="0.125" />
+        <entry key="..\:/Documents/MSc CSE/OneDrive - epfl.ch/EPFL/Software Devlopment Project/RockPaperScissors/app/src/main/res/layout/fragment_leaderboard.xml" value="0.21195652173913043" />
+        <entry key="..\:/Documents/MSc CSE/OneDrive - epfl.ch/EPFL/Software Devlopment Project/RockPaperScissors/app/src/main/res/layout/fragment_match_details.xml" value="0.1" />
+        <entry key="..\:/Documents/MSc CSE/OneDrive - epfl.ch/EPFL/Software Devlopment Project/RockPaperScissors/app/src/main/res/layout/fragment_statistics.xml" value="0.2676348547717842" />
+        <entry key="..\:/Documents/MSc CSE/OneDrive - epfl.ch/EPFL/Software Devlopment Project/RockPaperScissors/app/src/main/res/layout/nav_header_main.xml" value="0.1" />
+        <entry key="..\:/Documents/MSc CSE/OneDrive - epfl.ch/EPFL/Software Devlopment Project/RockPaperScissors/app/src/main/res/menu/activity_main_drawer.xml" value="0.24114583333333334" />
+        <entry key="..\:/Documents/MSc CSE/OneDrive - epfl.ch/EPFL/Software Devlopment Project/RockPaperScissors/app/src/main/res/menu/main.xml" value="0.24114583333333334" />
+        <entry key="..\:/Documents/MSc CSE/OneDrive - epfl.ch/EPFL/Software Devlopment Project/RockPaperScissors/app/src/main/res/menu/main_activity.xml" value="0.24114583333333334" />
         <entry key="..\:/OneDrive/EPFL_8_Semester/SDP/RockPaperScissors/app/src/main/res/drawable/side_nav_bar.xml" value="0.246" />
         <entry key="..\:/OneDrive/EPFL_8_Semester/SDP/RockPaperScissors/app/src/main/res/layout/activity_main.xml" value="0.2857142857142857" />
         <entry key="..\:/OneDrive/EPFL_8_Semester/SDP/RockPaperScissors/app/src/main/res/layout/app_bar_main.xml" value="0.1" />
diff --git a/app/build.gradle b/app/build.gradle
index 310e7263..e4c55efa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,6 +53,7 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
     implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test:runner:1.4.0'
diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/StatisticsFragmentTest.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/StatisticsFragmentTest.kt
new file mode 100644
index 00000000..c9cc8d32
--- /dev/null
+++ b/app/src/androidTest/java/ch/epfl/sweng/rps/StatisticsFragmentTest.kt
@@ -0,0 +1,49 @@
+package ch.epfl.sweng.rps
+
+import android.view.Gravity
+
+import androidx.test.espresso.Espresso
+
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.contrib.DrawerActions
+import androidx.test.espresso.contrib.DrawerMatchers
+import androidx.test.espresso.contrib.NavigationViewActions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import org.hamcrest.CoreMatchers.containsString
+import org.junit.Rule
+import org.junit.Test
+
+
+class StatisticsFragmentTest {
+    @get:Rule
+    val testRule = ActivityScenarioRule(MainActivity::class.java)
+
+    @Test
+    fun opensStatisticFragmentTest() {
+        // Open Drawer to click on navigation.
+        Espresso.onView(ViewMatchers.withId(R.id.drawer_layout))
+            .check(ViewAssertions.matches(DrawerMatchers.isClosed(Gravity.LEFT))) // Left Drawer should be closed.
+            .perform(DrawerActions.open()) // Open Drawer
+
+        // Start the screen of your activity.
+        Espresso.onView(ViewMatchers.withId(R.id.nav_view))
+            .perform(NavigationViewActions.navigateTo(R.id.nav_statistics))
+
+        // Check that you Activity was opened.
+        Espresso.onView(ViewMatchers.withId(R.id.fragment_statistics))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView(ViewMatchers.isClickable())
+
+        Espresso.onView(withId(R.id.test_for_stats_row)).perform(click())
+
+        Espresso.onView(ViewMatchers.withId(R.id.fragment_match_details))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+
+        }
+    }
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f451dc96..919dac23 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,25 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ch.epfl.sweng.rps">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.RockPaperScissors">
-        <activity
-            android:name=".MainActivity"
-            android:exported="true"
-            android:label="@string/title_activity_main"
-            android:theme="@style/Theme.RockPaperScissors.NoActionBar">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="ch.epfl.sweng.rps">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.RockPaperScissors">
+
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:label="@string/title_activity_main"
+            android:theme="@style/Theme.RockPaperScissors.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/ch/epfl/sweng/rps/MainActivity.kt b/app/src/main/java/ch/epfl/sweng/rps/MainActivity.kt
index dbf8018a..f8766332 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/MainActivity.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/MainActivity.kt
@@ -2,16 +2,16 @@ package ch.epfl.sweng.rps
 
 import android.os.Bundle
 import android.view.Menu
-import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.navigation.NavigationView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.findNavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
-import androidx.drawerlayout.widget.DrawerLayout
-import androidx.appcompat.app.AppCompatActivity
 import ch.epfl.sweng.rps.databinding.ActivityMainBinding
+import com.google.android.material.navigation.NavigationView
+import com.google.android.material.snackbar.Snackbar
 
 class MainActivity : AppCompatActivity() {
 
@@ -54,4 +54,5 @@ class MainActivity : AppCompatActivity() {
         val navController = findNavController(R.id.nav_host_fragment_content_main)
         return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/epfl/sweng/rps/ui/statistics/MatchDetailsFragment.kt b/app/src/main/java/ch/epfl/sweng/rps/ui/statistics/MatchDetailsFragment.kt
new file mode 100644
index 00000000..23c02deb
--- /dev/null
+++ b/app/src/main/java/ch/epfl/sweng/rps/ui/statistics/MatchDetailsFragment.kt
@@ -0,0 +1,44 @@
+package ch.epfl.sweng.rps.ui.statistics
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import ch.epfl.sweng.rps.R
+
+// TODO: Rename parameter arguments, choose names that match
+// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+private const val ARG_PARAM1 = "param1"
+private const val ARG_PARAM2 = "param2"
+
+class MatchDetails : Fragment() {
+    // TODO: Rename and change types of parameters
+    private var param1: String? = null
+    private var param2: String? = null
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+
+        super.onCreate(savedInstanceState)
+        arguments?.let {
+            param1 = it.getString(ARG_PARAM1)
+            param2 = it.getString(ARG_PARAM2)
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        container?.removeAllViews()
+        val matchUuid = this.arguments?.getString("uuid")
+
+        // fetch data according uuid for match details
+        println(matchUuid)
+        return inflater.inflate(R.layout.fragment_match_details, container, false)
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ch/epfl/sweng/rps/ui/statistics/StatisticsFragment.kt b/app/src/main/java/ch/epfl/sweng/rps/ui/statistics/StatisticsFragment.kt
index c7e18398..ac6d3f36 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/ui/statistics/StatisticsFragment.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/ui/statistics/StatisticsFragment.kt
@@ -1,40 +1,128 @@
 package ch.epfl.sweng.rps.ui.statistics
 
+import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
+import android.widget.*
+import androidx.core.view.setPadding
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
+import ch.epfl.sweng.rps.R
 import ch.epfl.sweng.rps.databinding.FragmentStatisticsBinding
 
+
 class StatisticsFragment : Fragment() {
 
     private var _binding: FragmentStatisticsBinding? = null
 
-    // This property is only valid between onCreateView and
-    // onDestroyView.
-    private val binding get() = _binding!!
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        val homeViewModel =
-            ViewModelProvider(this).get(StatisticsViewModel::class.java)
+        val values = arrayOf(
+            "Mode Filter",
+            "3 Matches",
+            "5 Matches",
+            "12 Matches",
+        )
+        val newView = inflater.inflate(R.layout.fragment_statistics, container, false)
+        val modeSpinner = newView.findViewById(R.id.modeSelect) as Spinner
+        val adapter = ArrayAdapter(this.requireActivity(), android.R.layout.simple_spinner_item, values)
+        adapter.setDropDownViewResource(android.R.layout.simple_dropdown_item_1line)
+        modeSpinner.adapter = adapter
+        modeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parentView: AdapterView<*>?,
+                selectedItemView: View?,
+                position: Int,
+                id: Long
+            ) {
+                when (position) {
+                    //test for selector
+                    1 -> println("x == 1")
+                    2 -> println("x == 2")
+                    else -> { // Note the block
+                        println("x is neither 1 nor 2")
+                    }
+                }
 
-        _binding = FragmentStatisticsBinding.inflate(inflater, container, false)
-        val root: View = binding.root
+            }
 
-        val textView: TextView = binding.textStatistics
-        homeViewModel.text.observe(viewLifecycleOwner) {
-            textView.text = it
+            override fun onNothingSelected(parentView: AdapterView<*>?) {
+                // your code here
+            }
         }
-        return root
+        return newView
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        addPersonalStats(view,"b9d5384-9f1f-11ec-b909-0242ac120002","2022-03-09","test","12", "4:8")
+
     }
 
+
+
+
+    private fun addPersonalStats(view: View, uuid: String, date:String, opponent:String, mode:String, score: String ) {
+        val sizeInDp = 5
+        val statsTable = view.findViewById<TableLayout>(R.id.statsTable)
+        val row = TableRow(activity)
+        row.setBackgroundColor(
+            Color.parseColor("#F0F7F7"))
+        val scale = resources.displayMetrics.density
+        val dpAsPixels = (sizeInDp * scale + 0.5f)
+
+        row.id = R.id.test_for_stats_row
+        row.setPadding(dpAsPixels.toInt())
+        row.isClickable
+        row.tag = uuid
+        //only for test
+
+
+        row.setOnClickListener {
+            // add new fragment with communication
+            val matchDetailFragment = MatchDetails()
+            val bundle = Bundle()
+            val transaction = requireActivity().supportFragmentManager.beginTransaction()
+            bundle.putString("uuid",uuid)
+            matchDetailFragment.arguments =  bundle
+            transaction.replace(R.id.fragment_statistics,matchDetailFragment)
+            transaction.addToBackStack(null)
+            transaction.commit()
+
+        }
+
+        val params = TableRow.LayoutParams(
+            TableRow.LayoutParams.WRAP_CONTENT,
+            TableRow.LayoutParams.WRAP_CONTENT,
+            1f
+        )
+
+        val dateBlank = TextView(activity)
+        val opponentBlank = TextView(activity)
+        val modeBlank = TextView(activity)
+        val scoreBlank = TextView(activity)
+
+        dateBlank.text = date
+        opponentBlank.text = opponent
+        modeBlank.text = mode
+        scoreBlank.text = score
+
+        dateBlank.layoutParams = params
+        opponentBlank.layoutParams = params
+        modeBlank.layoutParams = params
+        scoreBlank.layoutParams = params
+
+        row.addView(dateBlank)
+        row.addView(opponentBlank)
+        row.addView(modeBlank)
+        row.addView(scoreBlank)
+        statsTable.addView(row)
+
+    }
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
diff --git a/app/src/main/java/ch/epfl/sweng/rps/ui/statistics/StatisticsViewModel.kt b/app/src/main/java/ch/epfl/sweng/rps/ui/statistics/StatisticsViewModel.kt
index 3fd15bfc..fa4018aa 100644
--- a/app/src/main/java/ch/epfl/sweng/rps/ui/statistics/StatisticsViewModel.kt
+++ b/app/src/main/java/ch/epfl/sweng/rps/ui/statistics/StatisticsViewModel.kt
@@ -5,9 +5,4 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 
 class StatisticsViewModel : ViewModel() {
-
-    private val _text = MutableLiveData<String>().apply {
-        value = "This is Statistics Fragment"
-    }
-    val text: LiveData<String> = _text
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrow_drop_down_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_drop_down_black_24dp.xml
new file mode 100644
index 00000000..5d8920b2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_drop_down_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7,10l5,5 5,-5z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/spinner_background.xml b/app/src/main/res/drawable/spinner_background.xml
new file mode 100644
index 00000000..d3aa0a7d
--- /dev/null
+++ b/app/src/main/res/drawable/spinner_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item><layer-list>
+        <item>
+            <shape>
+                <stroke
+                    android:width="2dp"
+                    android:color="#515151" />
+            </shape>
+        </item>
+    </layer-list></item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 6c7dd7ca..a762ab90 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -22,4 +22,4 @@
         android:fitsSystemWindows="true"
         app:headerLayout="@layout/nav_header_main"
         app:menu="@menu/activity_main_drawer" />
-</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_match_detail.xml b/app/src/main/res/layout/activity_match_detail.xml
new file mode 100644
index 00000000..4c8a6cd3
--- /dev/null
+++ b/app/src/main/res/layout/activity_match_detail.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginTop="10dp"
+    android:paddingLeft="5dp"
+    android:paddingRight="5dp"
+    android:id="@+id/matchDetailTable"
+    tools:context=".ui.statistics.MatchDetails">
+
+    <TextView
+        android:id="@+id/txt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/match_detail"
+        android:textSize="20dp"
+        android:textStyle="bold">
+
+    </TextView>
+
+
+    <TableRow
+        android:background="#51B435"
+        android:padding="10dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/player" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/opponent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/outcome" />
+    </TableRow>
+
+    <TableRow
+        android:background="#F0F7F7"
+        android:padding="5dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5"
+            android:text="1" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="✋" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="👊" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="🏆" />
+    </TableRow>
+
+    <TableRow
+        android:background="#F0F7F7"
+        android:padding="5dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5"
+            android:text="2" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="👊" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="✌" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="😞" />
+
+    </TableRow>
+
+</TableLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_blank.xml b/app/src/main/res/layout/fragment_blank.xml
new file mode 100644
index 00000000..cb70cb6e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_blank.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.statistics.BlankFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_match_details.xml b/app/src/main/res/layout/fragment_match_details.xml
new file mode 100644
index 00000000..9db861a7
--- /dev/null
+++ b/app/src/main/res/layout/fragment_match_details.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/fragment_match_details"
+    tools:context=".ui.statistics.MatchDetails">
+
+    <TableLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="10dp"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:id="@+id/matchDetailTable"
+        tools:context=".ui.statistics.MatchDetails"
+        tools:ignore="UselessParent">
+
+        <TextView
+            android:id="@+id/txt"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/match_detail"
+            android:textSize="20dp"
+            android:textStyle="bold">
+
+        </TextView>
+
+
+        <TableRow
+            android:background="#51B435"
+            android:padding="10dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="Player" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="Opponent" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="Outcome" />
+        </TableRow>
+
+        <TableRow
+            android:background="#F0F7F7"
+            android:padding="5dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5"
+                android:text="1" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="✋" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="👊" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="🏆" />
+        </TableRow>
+
+        <TableRow
+            android:background="#F0F7F7"
+            android:padding="5dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5"
+                android:text="2" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="👊" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="✌" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="😞" />
+
+        </TableRow>
+
+    </TableLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_statistics.xml b/app/src/main/res/layout/fragment_statistics.xml
index 61e08c83..40e25b7d 100644
--- a/app/src/main/res/layout/fragment_statistics.xml
+++ b/app/src/main/res/layout/fragment_statistics.xml
@@ -1,24 +1,79 @@
 <?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"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/fragment_statistics">
+    android:id="@+id/fragment_statistics"
+    tools:context=".ui.statistics.MatchDetails">
 
+    <RelativeLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="horizontal"
+        android:background="#FFFFFF"
 
+        >
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/personal_match_statistics"
+            android:textSize="20dp"
+            android:textStyle="bold">
+        </TextView>
 
-    <TextView
-        android:id="@+id/text_statistics"
+
+        <Spinner
+            android:layout_alignParentRight="true"
+            android:id="@+id/modeSelect"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:minHeight="32dp"
+            android:spinnerMode="dropdown"
+            style="@style/Widget.AppCompat.DropDownItem.Spinner"
+            >
+        </Spinner>
+
+    </RelativeLayout>
+
+    <TableLayout
+        android:id="@+id/statsTable"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:textAlignment="center"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:layout_height="match_parent"
+        android:layout_marginTop="30dp"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        tools:context=".ui.statistics.StatisticsFragment"
+        tools:ignore="UselessParent">
+        <TableRow
+            android:background="#51B435"
+            android:padding="10dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/date" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/opponent" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/mode" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/score" />
+        </TableRow>
+
+
+    </TableLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7cd45bbb..00b0df00 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,4 +11,15 @@
     <string name="menu_home">Play</string>
     <string name="menu_leaderboard">Leaderboard</string>
     <string name="menu_statistics">Statistics</string>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="personal_match_statistics">Personal Match Statistics</string>
+    <string name="date">Date</string>
+    <string name="mode">Mode</string>
+    <string name="score">Score</string>
+    <string name="match_detail">Match Detail</string>
+    <string name="player">Player</string>
+    <string name="opponent">Opponent</string>
+    <string name="outcome">Outcome</string>
+    <item name="test_for_stats_row" type="id"/>
 </resources>
\ No newline at end of file