diff --git a/app/src/main/java/hu/bme/kszk/kikerdezo/MainActivity.kt b/app/src/main/java/hu/bme/kszk/kikerdezo/MainActivity.kt
index 058b0deb4ac6402fcfeca36d6d8b6f464ca42d79..24cb7333807be5b07d1cb1dd09d4018068827087 100644
--- a/app/src/main/java/hu/bme/kszk/kikerdezo/MainActivity.kt
+++ b/app/src/main/java/hu/bme/kszk/kikerdezo/MainActivity.kt
@@ -245,7 +245,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun loadToDatabase(recivedQuestionData: QuestionData?) {
         thread{
-            AppDatabase.getInstanceQuestion(this).clearAllTables()
+            AppDatabase.getInstanceQuestion(this@MainActivity).clearAllTables()
             if (recivedQuestionData != null) {
                 if(recivedQuestionData.data != null) {
                     for (question in recivedQuestionData.data!!)
diff --git a/app/src/main/java/hu/bme/kszk/kikerdezo/QuestionListActivity.kt b/app/src/main/java/hu/bme/kszk/kikerdezo/QuestionListActivity.kt
index 82db4701f0b51a0586bc9c6d6011525e97223d92..f85ce2505f0383f751c8aefff519d79d0c07d54d 100644
--- a/app/src/main/java/hu/bme/kszk/kikerdezo/QuestionListActivity.kt
+++ b/app/src/main/java/hu/bme/kszk/kikerdezo/QuestionListActivity.kt
@@ -1,13 +1,18 @@
 package hu.bme.kszk.kikerdezo
 
 import android.os.Bundle
+import android.preference.PreferenceManager
 import android.provider.AlarmClock.EXTRA_MESSAGE
 import android.util.Log
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import hu.bme.kszk.kikerdezo.adapter.Adapter
 import hu.bme.kszk.kikerdezo.database.AppDatabase
+import hu.bme.kszk.kikerdezo.model.Result
+import java.text.SimpleDateFormat
+import java.util.*
 
 class QuestionListActivity : AppCompatActivity() {
     private lateinit var questionAdapter: Adapter
@@ -16,10 +21,10 @@ class QuestionListActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_question_list)
 
-        var b = intent.getIntExtra(EXTRA_MESSAGE, -1)
+        var labNum = intent.getIntExtra(EXTRA_MESSAGE, -1)
 
-        if(b != -1)
-            initRecyclerView(b)
+        if(labNum != -1)
+            initRecyclerView(labNum)
         else{
             Log.d("FAIL", "Could not get LAB number!");
             val text = "Nem tudtuk betolteni a labor szamat!"
@@ -28,14 +33,55 @@ class QuestionListActivity : AppCompatActivity() {
             val toast = Toast.makeText(applicationContext, text, duration)
             toast.show()
         }
+
+        val btnFinish =  findViewById<FloatingActionButton>(R.id.btnFinish)
+        btnFinish.setOnClickListener{
+            Log.d("VESZTETTEM", "nem nyomodott meg a finish gomb")
+            saveUserScore(labNum)
+        }
+
+    }
+
+    private fun saveUserScore(labNum: Int){
+        val rvMain: RecyclerView = findViewById(R.id.rvMain)
+        val itemCount = rvMain.adapter?.itemCount
+        val sp = PreferenceManager.getDefaultSharedPreferences(this)
+        var scoreCounter: Int = 0
+
+        val sdf = SimpleDateFormat("dd/M/yyyy hh:mm:ss")
+        val currentDate = sdf.format(Date())
+
+
+        if(itemCount!= null) {
+            for (i in 0 until itemCount!!){
+                val holder = rvMain.findViewHolderForAdapterPosition(i) as Adapter.QuestionViewHolder
+                if(holder.correct == holder.selected){
+                    scoreCounter += 1
+                }
+            }
+        }
+        var result = Result(
+            null,
+            labNum,
+            sp.getString("USERNAME", "PlayerOne").toString(),
+            scoreCounter,
+            currentDate
+        )
+        val dbThread = Thread {
+            AppDatabase.getInstanceResult(this@QuestionListActivity).resultsDao().insertResult(result)
+        }
+        dbThread.start()
+        finish()
     }
 
     private fun initRecyclerView(b: Int) {
         questionAdapter = Adapter(this)
         val rvMain: RecyclerView = findViewById(R.id.rvMain)
         rvMain.adapter = questionAdapter
-        AppDatabase.getInstanceQuestion(this).questionDao().getLabQuestion(b).observe(this, { questions ->
+
+        AppDatabase.getInstanceQuestion(this@QuestionListActivity).questionDao().getLabQuestion(b).observe(this, { questions ->
             questionAdapter.submitList(questions)
         })
+
     }
 }
diff --git a/app/src/main/java/hu/bme/kszk/kikerdezo/ResultsActivity.kt b/app/src/main/java/hu/bme/kszk/kikerdezo/ResultsActivity.kt
index 1b460271577f3f28e295e67cfef7c6d446afb0c5..053d713700c05b22801dc1cdd4915348a9f30dd4 100644
--- a/app/src/main/java/hu/bme/kszk/kikerdezo/ResultsActivity.kt
+++ b/app/src/main/java/hu/bme/kszk/kikerdezo/ResultsActivity.kt
@@ -52,7 +52,7 @@ class ResultsActivity : AppCompatActivity() {
         resAdapter = ResultAdapter(this)
         val rvResults: RecyclerView = findViewById(R.id.rvResults)
         rvResults.adapter = resAdapter
-        AppDatabase.getInstanceResult(this).resultsDao().getResults().observe(this, { results ->
+        AppDatabase.getInstanceResult(this@ResultsActivity).resultsDao().getResults().observe(this, { results ->
             resAdapter.submitList(results)
         })
     }
diff --git a/app/src/main/java/hu/bme/kszk/kikerdezo/adapter/QuestionAdapter.kt b/app/src/main/java/hu/bme/kszk/kikerdezo/adapter/QuestionAdapter.kt
index e110bed089eebb2fa63974d5cc4640a73d463fa2..fddfcb0454d6022c4949854e22d84e524661a824 100644
--- a/app/src/main/java/hu/bme/kszk/kikerdezo/adapter/QuestionAdapter.kt
+++ b/app/src/main/java/hu/bme/kszk/kikerdezo/adapter/QuestionAdapter.kt
@@ -14,18 +14,16 @@ import hu.bme.kszk.kikerdezo.R
 import hu.bme.kszk.kikerdezo.model.Question
 
 
-class Adapter(val context: Context) :
-    ListAdapter<Question, Adapter.QuestionViewHolder>(QuestionDiffCallback) {
+class Adapter(val context: Context) : ListAdapter<Question, Adapter.QuestionViewHolder>(QuestionDiffCallback) {
 
-    class QuestionViewHolder(itemView: View) :
-        RecyclerView.ViewHolder(itemView)  {
+    class QuestionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)  {
         private val questionText: TextView = itemView.findViewById(R.id.question)
         private val ans1: Button = itemView.findViewById(R.id.btnAns1)
         private val ans2: Button = itemView.findViewById(R.id.btnAns2)
         private val ans3: Button = itemView.findViewById(R.id.btnAns3)
         private val ans4: Button = itemView.findViewById(R.id.btnAns4)
-        private var correct:  Int =  0
-        private var selected: Int = -1
+        var correct:  Int =  0
+        var selected: Int = -1
 
         init{
             ans1.setOnClickListener{
@@ -71,8 +69,7 @@ class Adapter(val context: Context) :
             ans4.text = question.answer4
             questionText.text = question.questionText
         }
-
-        }
+    }
 
     // Create new views (invoked by the layout manager)
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) : QuestionViewHolder {
diff --git a/app/src/main/java/hu/bme/kszk/kikerdezo/adapter/ResultAdapter.kt b/app/src/main/java/hu/bme/kszk/kikerdezo/adapter/ResultAdapter.kt
index b9e6a7d17bf4de9a3e3a778a7ad06ca61b9632cc..7608b63eb29f3c1531c4865b451594d44f76aa03 100644
--- a/app/src/main/java/hu/bme/kszk/kikerdezo/adapter/ResultAdapter.kt
+++ b/app/src/main/java/hu/bme/kszk/kikerdezo/adapter/ResultAdapter.kt
@@ -19,23 +19,25 @@ class ResultAdapter(val context: Context) :
             private val score: TextView = itemView.findViewById(R.id.score)
             private val name:  TextView = itemView.findViewById(R.id.name)
             private val date:  TextView = itemView.findViewById(R.id.date)
+            private val labNum: TextView = itemView.findViewById(R.id.labNum)
                 init{
 
                 }
                 fun bind(result: Result){
                     score.text = result.score.toString()
                     name.text  = result.uname
-                    date.text  = result.date.toString()
+                    labNum.text = result.lab.toString()
+                    date.text  = result.date
                 }
             }
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) : ResultAdapter.ResultViewHolder {
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) : ResultViewHolder {
             // Create a new view, which defines the UI of the list item
             val view = LayoutInflater.from(parent.context)
                 .inflate(R.layout.result_item, parent, false)
 
-            return ResultAdapter.ResultViewHolder(view)
+            return ResultViewHolder(view)
         }
-        override fun onBindViewHolder(holder: ResultAdapter.ResultViewHolder, position: Int) {
+        override fun onBindViewHolder(holder: ResultViewHolder, position: Int) {
             val result = getItem(position)
             holder.bind(result)
         }
diff --git a/app/src/main/java/hu/bme/kszk/kikerdezo/database/AppDatabase.kt b/app/src/main/java/hu/bme/kszk/kikerdezo/database/AppDatabase.kt
index 4117c84eee002ae53436ed2bff2b5461a9816b9e..90dfa6511da159fcd30b73f6f3dcc8825640874e 100644
--- a/app/src/main/java/hu/bme/kszk/kikerdezo/database/AppDatabase.kt
+++ b/app/src/main/java/hu/bme/kszk/kikerdezo/database/AppDatabase.kt
@@ -5,36 +5,34 @@ import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import hu.bme.kszk.kikerdezo.model.Question
+import hu.bme.kszk.kikerdezo.model.Result
 
-@Database(entities = [Question::class], version = 1)
+@Database(entities = [Question::class, Result::class], version = 1)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun questionDao(): QuestionDao
     abstract fun resultsDao(): ResultDao
 
     companion object {
         private var INSTANCE: AppDatabase? = null
+        private var INSTANCE2: AppDatabase? = null
 
         fun getInstanceQuestion(context: Context): AppDatabase {
             if (INSTANCE == null) {
-                INSTANCE = Room.databaseBuilder(context.getApplicationContext(),
+                INSTANCE = Room.databaseBuilder(context.applicationContext,
                     AppDatabase::class.java, "question.db")
-                    .fallbackToDestructiveMigration()
+                    //.fallbackToDestructiveMigration()
                     .build()
             }
             return INSTANCE!!
         }
         fun getInstanceResult(context: Context): AppDatabase {
-            if (INSTANCE == null) {
-                INSTANCE = Room.databaseBuilder(context.getApplicationContext(),
+            if (INSTANCE2 == null) {
+                INSTANCE2 = Room.databaseBuilder(context.applicationContext,
                     AppDatabase::class.java, "result.db")
-                    .fallbackToDestructiveMigration()
+                    //.fallbackToDestructiveMigration()
                     .build()
             }
-            return INSTANCE!!
-        }
-
-        fun destroyInstance() {
-            INSTANCE = null
+            return INSTANCE2!!
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/hu/bme/kszk/kikerdezo/model/Result.kt b/app/src/main/java/hu/bme/kszk/kikerdezo/model/Result.kt
index 93802ef1678651453706ed6c2c377cfd53b02b1c..66b11c2176f43114f4b7ccc5590f2e6ac4b6a90f 100644
--- a/app/src/main/java/hu/bme/kszk/kikerdezo/model/Result.kt
+++ b/app/src/main/java/hu/bme/kszk/kikerdezo/model/Result.kt
@@ -7,8 +7,9 @@ import java.util.*
 
 @Entity(tableName = "result")
 data class Result(
-    @PrimaryKey(autoGenerate = true) var id: Int,
+    @PrimaryKey(autoGenerate = true) var id: Long?,
+    @ColumnInfo(name = "labor") var lab: Int,
     @ColumnInfo(name = "uname") var uname: String,
     @ColumnInfo(name = "score") var score: Int,
-    @ColumnInfo(name = "date")  var date: Date
+    @ColumnInfo(name = "date")  var date: String
     )
diff --git a/app/src/main/res/drawable-hdpi/baseline_check_circle_black_18.png b/app/src/main/res/drawable-hdpi/baseline_check_circle_black_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..03efef2e0679b3ca843c0134bb638515023c8e97
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_check_circle_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_check_circle_black_20.png b/app/src/main/res/drawable-hdpi/baseline_check_circle_black_20.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8d2f2d6e0038306bbc06db771e200597a2bf092
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_check_circle_black_20.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_check_circle_black_24.png b/app/src/main/res/drawable-hdpi/baseline_check_circle_black_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..172f2c34e36213ccd87183d007ea141e7ff80f31
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_check_circle_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_check_circle_black_36.png b/app/src/main/res/drawable-hdpi/baseline_check_circle_black_36.png
new file mode 100644
index 0000000000000000000000000000000000000000..5721d07bb773dad8e0ad7f6f46ed57640cc2d2ad
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_check_circle_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_check_circle_black_48.png b/app/src/main/res/drawable-hdpi/baseline_check_circle_black_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..22102305e0443a01e5e48212103fc5cd3f26d980
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_check_circle_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_check_circle_black_18.png b/app/src/main/res/drawable-mdpi/baseline_check_circle_black_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..5777459d288a8f2c87cbc5fc9774f9b3f415636d
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_check_circle_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_check_circle_black_20.png b/app/src/main/res/drawable-mdpi/baseline_check_circle_black_20.png
new file mode 100644
index 0000000000000000000000000000000000000000..59b69d347b839c218addb746b9bc9ec6d1952d4f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_check_circle_black_20.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_check_circle_black_24.png b/app/src/main/res/drawable-mdpi/baseline_check_circle_black_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..6724af52bc07d679dddfbd297393d88be770b175
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_check_circle_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_check_circle_black_36.png b/app/src/main/res/drawable-mdpi/baseline_check_circle_black_36.png
new file mode 100644
index 0000000000000000000000000000000000000000..172f2c34e36213ccd87183d007ea141e7ff80f31
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_check_circle_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_check_circle_black_48.png b/app/src/main/res/drawable-mdpi/baseline_check_circle_black_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c637df4c97b853aada110158b44ab335c990893
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_check_circle_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_check_circle_black_18.png b/app/src/main/res/drawable-xhdpi/baseline_check_circle_black_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..172f2c34e36213ccd87183d007ea141e7ff80f31
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_check_circle_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_check_circle_black_20.png b/app/src/main/res/drawable-xhdpi/baseline_check_circle_black_20.png
new file mode 100644
index 0000000000000000000000000000000000000000..632371315330afec284ce6d6cc2119922d0fe276
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_check_circle_black_20.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_check_circle_black_24.png b/app/src/main/res/drawable-xhdpi/baseline_check_circle_black_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c637df4c97b853aada110158b44ab335c990893
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_check_circle_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_check_circle_black_36.png b/app/src/main/res/drawable-xhdpi/baseline_check_circle_black_36.png
new file mode 100644
index 0000000000000000000000000000000000000000..22102305e0443a01e5e48212103fc5cd3f26d980
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_check_circle_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_check_circle_black_48.png b/app/src/main/res/drawable-xhdpi/baseline_check_circle_black_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..7add91a90616ff10f0f28380747f0adfed0462fd
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_check_circle_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_check_circle_black_18.png b/app/src/main/res/drawable-xxhdpi/baseline_check_circle_black_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..5721d07bb773dad8e0ad7f6f46ed57640cc2d2ad
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_check_circle_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_check_circle_black_20.png b/app/src/main/res/drawable-xxhdpi/baseline_check_circle_black_20.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c2edda870909941515b22bc90c828c74a8e3329
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_check_circle_black_20.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_check_circle_black_24.png b/app/src/main/res/drawable-xxhdpi/baseline_check_circle_black_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..22102305e0443a01e5e48212103fc5cd3f26d980
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_check_circle_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_check_circle_black_36.png b/app/src/main/res/drawable-xxhdpi/baseline_check_circle_black_36.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bdd13135491ab01747eeaa74e7683213aac1c52
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_check_circle_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_check_circle_black_48.png b/app/src/main/res/drawable-xxhdpi/baseline_check_circle_black_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bc1143a3620e1ba90b92604fd4fb65684fee922
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_check_circle_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_check_circle_black_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_check_circle_black_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..22102305e0443a01e5e48212103fc5cd3f26d980
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_check_circle_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_check_circle_black_20.png b/app/src/main/res/drawable-xxxhdpi/baseline_check_circle_black_20.png
new file mode 100644
index 0000000000000000000000000000000000000000..36b583576044db8da59a0f0a1b8a7aac09b30e68
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_check_circle_black_20.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_check_circle_black_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_check_circle_black_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..7add91a90616ff10f0f28380747f0adfed0462fd
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_check_circle_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_check_circle_black_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_check_circle_black_36.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bc1143a3620e1ba90b92604fd4fb65684fee922
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_check_circle_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_check_circle_black_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_check_circle_black_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..221b4dd910cb82c457ec1929cb20acb469aa9a9f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_check_circle_black_48.png differ
diff --git a/app/src/main/res/drawable/baseline_check_circle_24.xml b/app/src/main/res/drawable/baseline_check_circle_24.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5e111ca7d4e240eb80a8514876b60ff07031bdf8
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_check_circle_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_question_list.xml b/app/src/main/res/layout/activity_question_list.xml
index 2690cbfbfadfb08e755a65cb5b9c2504abb4e3a9..4da7888a7713ec0a5e49564f33ddf8e822859b84 100644
--- a/app/src/main/res/layout/activity_question_list.xml
+++ b/app/src/main/res/layout/activity_question_list.xml
@@ -20,13 +20,14 @@
 
         </androidx.recyclerview.widget.RecyclerView>
 
-        <Button
-            android:id="@+id/btnEnd"
-            android:layout_width="match_parent"
-            android:layout_height="119dp"
-            app:layout_anchor="@+id/btnEnd"
-            app:layout_anchorGravity="bottom|center"
-            tools:text="Vegeztem" />
     </LinearLayout>
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/btnFinish"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|bottom"
+        android:clickable="true"
+        app:srcCompat="@drawable/baseline_check_circle_24"/>
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/result_item.xml b/app/src/main/res/layout/result_item.xml
index f79b35347d1a112b576e96ef044bdec27e2ca866..189d450010a4e21ac4de36c36bd2643f108c1c22 100644
--- a/app/src/main/res/layout/result_item.xml
+++ b/app/src/main/res/layout/result_item.xml
@@ -7,39 +7,46 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        tools:ignore="MissingConstraints">
 
         <View
             android:id="@+id/divider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
             android:layout_weight="1"
             android:background="?android:attr/listDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="200dp"
+            android:layout_height="120sp"
             android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/score"
                 android:layout_width="50sp"
-                android:layout_height="150sp"
-                android:text="Score" />
+                android:layout_height="100sp"
+                android:text="@string/score" />
 
             <TextView
                 android:id="@+id/name"
-                android:layout_width="200sp"
-                android:layout_height="150sp"
-                android:text="name" />
+                android:layout_width="80sp"
+                android:layout_height="100sp"
+                android:text="@string/name" />
+
+            <TextView
+                android:layout_width="50sp"
+                android:layout_height="100sp"
+                android:text="@string/labnum"
+                android:id="@+id/labNum"/>
 
             <TextView
                 android:id="@+id/date"
-                android:layout_width="100sp"
-                android:layout_height="150sp"
+                android:layout_width="0dp"
+                android:layout_height="100sp"
                 android:layout_weight="1"
-                android:text="Date" />
+                android:text="@string/date" />
 
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6a01020638a20c0457287ccc61c86328b534676b..ca2011c31e1bbcab40e3268fd9880cd186940e77 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,4 +31,8 @@
     <string name="questiongoeshere">QuestionGoesHere</string>
     <string name="oke">Oke</string>
     <string name="kikerdezo">Kikerdezo</string>
+    <string name="date">Date</string>
+    <string name="labnum">labNum</string>
+    <string name="name">name</string>
+    <string name="score">Score</string>
 </resources>
\ No newline at end of file