diff --git a/src/app/build.gradle.kts b/src/app/build.gradle.kts
index 3b954c0..c08b1b1 100644
--- a/src/app/build.gradle.kts
+++ b/src/app/build.gradle.kts
@@ -13,7 +13,7 @@ android {
         minSdk = 24
         targetSdk = 34
         versionCode = 8
-        versionName = "4.4"
+        versionName = "5"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -36,7 +36,12 @@ android {
     }
     buildFeatures {
         viewBinding = true
+        compose = true
     }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.0"
+    }
+
 }
 
 dependencies {
@@ -58,5 +63,7 @@ dependencies {
     implementation("androidx.datastore:datastore-preferences-rxjava2:1.0.0")
     implementation("androidx.datastore:datastore-preferences-rxjava3:1.0.0")
     implementation("com.google.android.play:core-ktx:1.8.1")
+    implementation("androidx.compose.material3:material3:1.0.1")
+    implementation("androidx.compose.material3:material3-window-size-class:1.0.1")
 
 }
\ No newline at end of file
diff --git a/src/app/src/main/java/com/helloyanis/rucoycalculator/MainActivity.kt b/src/app/src/main/java/com/helloyanis/rucoycalculator/MainActivity.kt
index 542490b..bf9bf36 100644
--- a/src/app/src/main/java/com/helloyanis/rucoycalculator/MainActivity.kt
+++ b/src/app/src/main/java/com/helloyanis/rucoycalculator/MainActivity.kt
@@ -12,6 +12,7 @@ import androidx.navigation.findNavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
+import com.google.android.material.color.DynamicColors
 import com.helloyanis.rucoycalculator.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
@@ -22,6 +23,7 @@ class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        DynamicColors.applyToActivitiesIfAvailable(this.application)
         val repositoryUrl = "https://api.github.com/repos/helloyanis/rucoy-calculator"
         //GitHubReleaseChecker(this, repositoryUrl).execute()
         binding = ActivityMainBinding.inflate(layoutInflater)
diff --git a/src/app/src/main/java/com/helloyanis/rucoycalculator/ui/skull/SkullFragment.kt b/src/app/src/main/java/com/helloyanis/rucoycalculator/ui/skull/SkullFragment.kt
index e4a08b6..a8385bc 100644
--- a/src/app/src/main/java/com/helloyanis/rucoycalculator/ui/skull/SkullFragment.kt
+++ b/src/app/src/main/java/com/helloyanis/rucoycalculator/ui/skull/SkullFragment.kt
@@ -21,6 +21,7 @@ import com.helloyanis.rucoycalculator.MainActivity
 import com.helloyanis.rucoycalculator.MainActivity.Companion.dataStore
 import com.helloyanis.rucoycalculator.R
 import com.helloyanis.rucoycalculator.databinding.SkullBinding
+import com.helloyanis.rucoycalculator.ui.train.Formulas
 import kotlinx.coroutines.launch
 
 
@@ -102,30 +103,50 @@ class SkullFragment : Fragment() {
                 preferences[BASE_LEVEL_KEY] = baseLevelValue
             }
         }
-        val str1 = if((double*150).toString().substringAfter(".").length==1){
-            (double*150).toString().substringBefore(".")
-        }else {
-            (double*150).toString()
-        }
-        binding.root.findViewById<TextView>(R.id.yellowskullvalue).text = str1 + "G needed"
-        val str2 = if((150*4*double).toString().substringAfter(".").length==1){
-            (150*4*double).toString().substringBefore(".")
-        }else {
-            (150*4*double).toString()
-        }
-        binding.root.findViewById<TextView>(R.id.orangeskullvalue).text = str2 + "G needed"
-        val str3 = if((150*13*double).toString().substringAfter(".").length==1){
-            (150*13*double).toString().substringBefore(".")
-        }else {
-            (150*13*double).toString()
-        }
-        binding.root.findViewById<TextView>(R.id.redskullvalue).text = str3 + "G needed"
-        val str4 = if((double*50).toString().substringAfter(".").length==1){
-            (((4-3)*(4-3))*double*4050).toString().substringBefore(".")
-        }else {
-            (150*40*double).toString()
-        }
-        binding.root.findViewById<TextView>(R.id.blackskullvalue).text = str4 + "G needed"
+        binding.root.findViewById<TextView>(R.id.mainstat).text =  "❤️ "+String.format(
+            "%,.0f",
+            100+double*15
+        ) + " HP\n🪄" +  String.format(
+            "%,.0f",
+            100+double*20
+        )+ " MP\n💪 Level " + String.format("%,.0f", double) + " is at " + String.format("%,.0f", Formulas.exp_Calc(double)) + " exp!\n" +
+                "✨ You need " + String.format("%,.0f", (Formulas.exp_Calc(double + 1) - Formulas.exp_Calc(double))) + " experience to reach level " + String.format("%,.0f", double + 1) + "!"
+
+        binding.root.findViewById<TextView>(R.id.whiteskullvalue).text =  String.format(
+            "%,.0f",
+            double*150
+        ) + "G needed\n" +  String.format(
+            "%,.0f",
+            double*50
+        )+ "G lost from death by player."
+        binding.root.findViewById<TextView>(R.id.yellowskullvalue).text =  String.format(
+            "%,.0f",
+            double*150
+        ) + "G needed\n" +  String.format(
+            "%,.0f",
+            double*150
+        )+ "G lost from death by player."
+        binding.root.findViewById<TextView>(R.id.orangeskullvalue).text =  String.format(
+            "%,.0f",
+            double*600
+        ) + "G needed\n" +  String.format(
+            "%,.0f",
+            double*450
+        )+ "G lost from death by player."
+        binding.root.findViewById<TextView>(R.id.redskullvalue).text =  String.format(
+            "%,.0f",
+            double*1950
+        ) + "G needed\n" +  String.format(
+            "%,.0f",
+            double*1350
+        )+ "G lost from death by player."
+        binding.root.findViewById<TextView>(R.id.blackskullvalue).text =  String.format(
+            "%,.0f",
+            double*6000
+        ) + "G needed\n" +  String.format(
+            "%,.0f",
+            double*4050
+        )+ "G lost from death by player."
 
     }
 }
diff --git a/src/app/src/main/java/com/helloyanis/rucoycalculator/ui/train/TrainFragment.kt b/src/app/src/main/java/com/helloyanis/rucoycalculator/ui/train/TrainFragment.kt
index 23962cd..fef8d85 100644
--- a/src/app/src/main/java/com/helloyanis/rucoycalculator/ui/train/TrainFragment.kt
+++ b/src/app/src/main/java/com/helloyanis/rucoycalculator/ui/train/TrainFragment.kt
@@ -243,11 +243,11 @@ class TrainFragment : Fragment() {
 
     private fun updateoutput(){
         binding.root.findViewById<TextView>(R.id.str0).text = ""
-        binding.root.findViewById<TextView>(R.id.str1).text = ""
-        binding.root.findViewById<TextView>(R.id.str2).text = ""
-        binding.root.findViewById<TextView>(R.id.str3).text = ""
-        binding.root.findViewById<TextView>(R.id.str4).text = ""
-        binding.root.findViewById<TextView>(R.id.str5).text = ""
+        //binding.root.findViewById<TextView>(R.id.str1).text = ""
+        //binding.root.findViewById<TextView>(R.id.str2).text = ""
+        //binding.root.findViewById<TextView>(R.id.str3).text = ""
+        //binding.root.findViewById<TextView>(R.id.str4).text = ""
+        //binding.root.findViewById<TextView>(R.id.str5).text = ""
         val baseLevelValue = binding.root.findViewById<EditText>(R.id.baselevel).text.toString()
         val statValue = binding.root.findViewById<EditText>(R.id.stat).text.toString()
         val weaponAtkValue = binding.root.findViewById<EditText>(R.id.weaponatk).text.toString()
@@ -338,11 +338,6 @@ class TrainFragment : Fragment() {
         val max_raw_crit_damage: Double = max_raw_crit_damage_Calc(max_raw_damage)
         var accuracy = 0.0
         var str0=""
-        var str1=""
-        var str2=""
-        var str3=""
-        var str4=""
-        var str5=""
 
         //An index variable for mobs[]
 
@@ -409,7 +404,7 @@ class TrainFragment : Fragment() {
             }!
                 
                 """.trimIndent()
-            str3 = """
+            str0+= """
                 ${
                 "⏱️ Average time to kill " + mobs.get(pos + 1).mob_name /*+ mobs.get(pos + 1)
                     .getEmoji_code()*/
@@ -443,34 +438,34 @@ class TrainFragment : Fragment() {
                 newpos
             )
             if (new_max_damage >= 1 && !checked) { //if you can already deal damage to the next mob
-                str5 =
+                str0+=
                     "💥 You can deal " + new_max_damage.toInt() + " max damage to " + mobs.get(
                         newpos
-                    ).mob_name /*+ mobs.get(newpos).getEmoji_code()*/ + "!" //part of output
+                    ).mob_name /*+ mobs.get(newpos).getEmoji_code()*/ + "!\n" //part of output
                 alrdealdamage = true
             } else if (new_max_damage > 1 && !alrdealdamage && !dealdamage) { //if you cant deal damage to the next mob yet, you can deal damage in a certain amount of stats!
-                str5 =
+                str0 +=
                     "💥 You can deal " + new_max_damage.toInt() + " max damage to " + mobs.get(
                         newpos
                     ).mob_name /*+ mobs.get(newpos)
-                        .getEmoji_code()*/ + " in " + statadd + " stats!" //part of output
+                        .getEmoji_code()*/ + " in " + statadd + " stats!\n" //part of output
                 dealdamage = true
             }
             checked = true
             statadd++
         }
         if (checknextmob) {
-            str1 =
+            str0+=
                 """${"🔥 Max. Damage: " + max_damage.toInt() + " " /*+ */} Tickrate: ${tickrate.toInt()} / 3600
 """
-            str2 = """
+            str0 += """
                 ${
                 "⏱️ Average time to kill " + mobs.get(pos).mob_name /*+ mobs.get(pos)
                     .getEmoji_code()*/
             }: ${time.toInt() / 60} min. ${time.toInt() % 60} sec.
                 
                 """.trimIndent()
-            str4 = """
+            str0 += """
                 ${
                 "💪 You need $statadd stats to train effectively on " + mobs.get(newpos)
                     .mob_name /*+ mobs.get(newpos).getEmoji_code()*/
@@ -478,10 +473,10 @@ class TrainFragment : Fragment() {
                 
                 """.trimIndent()
         } else {
-            str1 =
+            str0 +=
                 """${"⏬ Min. Damage (Auto): " + min_damage.toInt() + " " /*+ slime_lord_emoji*/} ⏫ Max. Damage (Auto): ${max_damage.toInt()}
 """
-            str2 = """
+            str0 += """
                 ${
                 "⏱️ Average time to kill " + mobs.get(pos).mob_name /*+ mobs.get(pos)
                     .getEmoji_code()*/
@@ -490,23 +485,9 @@ class TrainFragment : Fragment() {
                 """.trimIndent()
         }
         binding.root.findViewById<TextView>(R.id.str0).text = str0
-        binding.root.findViewById<TextView>(R.id.str1).text = str1
-        binding.root.findViewById<TextView>(R.id.str2).text = str2
-        binding.root.findViewById<TextView>(R.id.str3).text = str3
-        binding.root.findViewById<TextView>(R.id.str4).text = str4
-        binding.root.findViewById<TextView>(R.id.str5).text = str5
     }
     private fun ptrain(){
-        val str0: String // You can power train effectively on...
-
-        val str1: String // Max Damage... Tickrate...
-
-        val str2: String // Average time to kill...
-
-        var str3 = "" // You need... stats to train effectively on...
-
-        var str4 = "" // You can deal... max damage to...
-
+        var str0: String // You can power train effectively on...
         var classEmoji = ""
 
         val stat1 = binding.root.findViewById<EditText>(R.id.stat).text.toString().toDouble()
@@ -619,11 +600,11 @@ class TrainFragment : Fragment() {
                 newpos
             )
             if (new_max_damage >= 1 && !checked) { //if you can already deal damage to the next mob
-                str4 =
+                str0 +=
                     "💥 You can deal " + new_max_damage.toInt() + " max damage to " + mobs[newpos].mob_name /*+ mobs[newpos].getEmoji_code()*/ + "!" //part of output
                 alrdealdamage = true
             } else if (new_max_damage > 1 && !alrdealdamage && !dealdamage) { //if you cant deal damage to the next mob yet, you can deal damage in a certain amount of stats!
-                str4 =
+                str0 +=
                     "🔥 You can deal " + new_max_damage.toInt() + " max damage to " + mobs[newpos].mob_name /*+ mobs[newpos].getEmoji_code()*/ + " in " + statadd + " stats!" //part of output
                 dealdamage = true
             }
@@ -635,35 +616,30 @@ class TrainFragment : Fragment() {
 
         //Building remaining Strings
         if (checknextmob) {
-            str1 =
+            str0 +=
                 """${"⏫Max. Damage: " + max_damage.toInt() + " • "} 💫 Tickrate: ${powertickrate.toInt()} / ${maxtickrate.toInt()}
 """
-            str2 =
+            str0 +=
                 """
         ${"⏱️ Average time to kill " + mobs[pos].mob_name /*+ mobs[pos].getEmoji_code()*/}: ${time.toInt() / 60} min. ${time.toInt() % 60} sec.
         
         """.trimIndent()
-            str3 =
+            str0 +=
                 """
         ${"⏏️ You need " + statadd + " stats to power train effectively on " + mobs[newpos].mob_name /*+ mobs[newpos].getEmoji_code()*/}!
         
         """.trimIndent()
         } else {
-            str1 =
+            str0 +=
                 """${"⏬ Min. Damage (Auto): " + min_damage.toInt() + " • "} ⏫ Max. Damage (Auto): ${max_damage.toInt()}
 """
-            str2 =
+            str0 +=
                 """
         ${"⏱️ Average time to kill " + mobs[pos].mob_name /*+ mobs[pos].getEmoji_code()*/}: ${time.toInt() / 60} min. ${time.toInt() % 60} sec.
         
         """.trimIndent()
         }
         binding.root.findViewById<TextView>(R.id.str0).text = str0
-        binding.root.findViewById<TextView>(R.id.str1).text = str1
-        binding.root.findViewById<TextView>(R.id.str2).text = str2
-        binding.root.findViewById<TextView>(R.id.str3).text = str3
-        binding.root.findViewById<TextView>(R.id.str4).text = str4
-        binding.root.findViewById<TextView>(R.id.str5).text = ""
     }
 
     @SuppressLint("SetTextI18n")
diff --git a/src/app/src/main/java/com/helloyanis/rucoycalculator/ui/train/TrainViewModel.kt b/src/app/src/main/java/com/helloyanis/rucoycalculator/ui/train/TrainViewModel.kt
index 1c2c503..322aaea 100644
--- a/src/app/src/main/java/com/helloyanis/rucoycalculator/ui/train/TrainViewModel.kt
+++ b/src/app/src/main/java/com/helloyanis/rucoycalculator/ui/train/TrainViewModel.kt
@@ -1,6 +1,7 @@
 package com.helloyanis.rucoycalculator.ui.train
 
 import androidx.lifecycle.ViewModel
+import kotlin.math.pow
 
 class TrainViewModel : ViewModel() {
 
@@ -115,7 +116,7 @@ object Formulas {
     }
 
     fun exp_Calc(base: Double): Double {
-        return Math.pow(base, base / 1000 + 3)
+        return base.pow(base / 1000 + 3)
     }
 
     fun stat0to54_Calc(stat: Double): Double {
diff --git a/src/app/src/main/res/drawable/stat_info.xml b/src/app/src/main/res/drawable/stat_info.xml
new file mode 100644
index 0000000..974b2ec
--- /dev/null
+++ b/src/app/src/main/res/drawable/stat_info.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M80,760L80,680L480,680L480,760L80,760ZM80,560L80,480L280,480L280,560L80,560ZM80,360L80,280L280,280L280,360L80,360ZM824,760L670,606Q646,623 617.5,631.5Q589,640 560,640Q477,640 418.5,581.5Q360,523 360,440Q360,357 418.5,298.5Q477,240 560,240Q643,240 701.5,298.5Q760,357 760,440Q760,469 751.5,497.5Q743,526 726,550L880,704L824,760ZM560,560Q610,560 645,525Q680,490 680,440Q680,390 645,355Q610,320 560,320Q510,320 475,355Q440,390 440,440Q440,490 475,525Q510,560 560,560Z"/>
+</vector>
diff --git a/src/app/src/main/res/layout/skull.xml b/src/app/src/main/res/layout/skull.xml
index 99ff261..c1b6fa1 100644
--- a/src/app/src/main/res/layout/skull.xml
+++ b/src/app/src/main/res/layout/skull.xml
@@ -5,94 +5,139 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".MainActivity">
-<androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.skull.SkullFragment">
-
-    <EditText
-        android:id="@+id/baselevelskull"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:ems="10"
-        android:hint="@string/base_level"
-        android:inputType="number"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/yellowskullvalue"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="TextView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/baselevelskull" />
-
-    <ImageView
-        android:id="@+id/redskullimage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/skull_red"
-        app:layout_constraintBottom_toBottomOf="@+id/redskullvalue"
-        app:layout_constraintEnd_toStartOf="@+id/redskullvalue"
-        app:layout_constraintTop_toTopOf="@+id/redskullvalue" />
-
-    <TextView
-        android:id="@+id/redskullvalue"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="TextView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/orangeskullvalue" />
-
-    <ImageView
-        android:id="@+id/blackskullimage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/skull_black"
-        app:layout_constraintBottom_toBottomOf="@+id/blackskullvalue"
-        app:layout_constraintEnd_toStartOf="@+id/blackskullvalue"
-        app:layout_constraintTop_toBottomOf="@+id/redskullvalue" />
-
-    <TextView
-        android:id="@+id/blackskullvalue"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="TextView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/redskullvalue" />
-
-    <TextView
-        android:id="@+id/orangeskullvalue"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="TextView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/yellowskullvalue" />
-
-    <ImageView
-        android:id="@+id/yellowskullimage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/skull_yellow"
-        app:layout_constraintBottom_toBottomOf="@+id/yellowskullvalue"
-        app:layout_constraintEnd_toStartOf="@+id/yellowskullvalue"
-        app:layout_constraintTop_toTopOf="@+id/yellowskullvalue" />
-
-    <ImageView
-        android:id="@+id/orangeskullimage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/skull_orange"
-        app:layout_constraintBottom_toTopOf="@+id/redskullvalue"
-        app:layout_constraintEnd_toStartOf="@+id/orangeskullvalue"
-        app:layout_constraintTop_toBottomOf="@+id/yellowskullvalue" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".ui.skull.SkullFragment">
+
+        <EditText
+            android:id="@+id/baselevelskull"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:hint="@string/base_level"
+            android:inputType="number"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/baselevelskulllabel" />
+
+        <TextView
+            android:id="@+id/yellowskullvalue"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="8dp"
+            android:text="TextView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/whiteskullvalue" />
+
+        <ImageView
+            android:id="@+id/redskullimage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/skull_red"
+            app:layout_constraintBottom_toBottomOf="@+id/redskullvalue"
+            app:layout_constraintEnd_toStartOf="@+id/redskullvalue"
+            app:layout_constraintTop_toTopOf="@+id/redskullvalue" />
+
+        <TextView
+            android:id="@+id/redskullvalue"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="8dp"
+            android:text="TextView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/orangeskullvalue" />
+
+        <ImageView
+            android:id="@+id/blackskullimage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/skull_black"
+            app:layout_constraintBottom_toBottomOf="@+id/blackskullvalue"
+            app:layout_constraintEnd_toStartOf="@+id/blackskullvalue"
+            app:layout_constraintTop_toBottomOf="@+id/redskullvalue" />
+
+        <TextView
+            android:id="@+id/blackskullvalue"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="8dp"
+            android:text="TextView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/redskullvalue" />
+
+        <TextView
+            android:id="@+id/orangeskullvalue"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="8dp"
+            android:text="TextView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/yellowskullvalue" />
+
+        <ImageView
+            android:id="@+id/yellowskullimage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/skull_yellow"
+            app:layout_constraintBottom_toBottomOf="@+id/yellowskullvalue"
+            app:layout_constraintEnd_toStartOf="@+id/yellowskullvalue"
+            app:layout_constraintTop_toTopOf="@+id/yellowskullvalue" />
+
+        <ImageView
+            android:id="@+id/orangeskullimage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/skull_orange"
+            app:layout_constraintBottom_toTopOf="@+id/redskullvalue"
+            app:layout_constraintEnd_toStartOf="@+id/orangeskullvalue"
+            app:layout_constraintTop_toBottomOf="@+id/yellowskullvalue" />
+
+        <ImageView
+            android:id="@+id/whiteskullimage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="@+id/whiteskullvalue"
+            app:layout_constraintEnd_toStartOf="@+id/whiteskullvalue"
+            app:layout_constraintTop_toTopOf="@+id/whiteskullvalue"
+            app:srcCompat="@drawable/skull_white" />
+
+        <TextView
+            android:id="@+id/whiteskullvalue"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="8dp"
+            android:text="TextView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/mainstat" />
+
+        <TextView
+            android:id="@+id/mainstat"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TextView"
+            app:layout_constraintTop_toBottomOf="@+id/baselevelskull"
+            tools:layout_editor_absoluteX="182dp" />
+
+        <TextView
+            android:id="@+id/baselevelskulllabel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/base_level"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/src/app/src/main/res/layout/train.xml b/src/app/src/main/res/layout/train.xml
index d5c9ce9..48de749 100644
--- a/src/app/src/main/res/layout/train.xml
+++ b/src/app/src/main/res/layout/train.xml
@@ -17,47 +17,7 @@
             android:layout_height="wrap_content"
             android:text="TextView"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/trainstylespinner" />
-
-        <TextView
-            android:id="@+id/str1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="TextView"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/str0" />
-
-        <TextView
-            android:id="@+id/str4"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="TextView"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/str3" />
-
-        <TextView
-            android:id="@+id/str5"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="TextView"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/str4" />
-
-        <TextView
-            android:id="@+id/str2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="TextView"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/str5" />
-
-        <TextView
-            android:id="@+id/str3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="TextView"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/str1" />
+            app:layout_constraintTop_toBottomOf="@+id/classspinner" />
 
         <EditText
             android:id="@+id/baselevel"
@@ -67,8 +27,8 @@
             android:hint="@string/base_level"
             android:inputType="number"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/baselevellabel"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/baselevellabel" />
 
         <EditText
             android:id="@+id/stat"
@@ -79,8 +39,8 @@
             android:hint="@string/stat_level"
             android:inputType="number"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/statlabel"
-            app:layout_constraintTop_toBottomOf="@+id/hours" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/statlabel" />
 
         <EditText
             android:id="@+id/hours"
@@ -92,8 +52,8 @@
             android:inputType="number"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/hourslabel"
-            app:layout_constraintTop_toBottomOf="@+id/baselevel"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/hourslabel"
             tools:visibility="visible" />
 
         <EditText
@@ -106,8 +66,8 @@
             android:imeOptions="actionDone"
             android:inputType="number"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/weaponatklabel"
-            app:layout_constraintTop_toBottomOf="@+id/statgoal" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/weaponatklabel" />
 
         <EditText
             android:id="@+id/tick"
@@ -119,8 +79,8 @@
             android:inputType="number"
             android:text="4"
             android:visibility="gone"
-            app:layout_constraintStart_toEndOf="@+id/ticklabel"
-            app:layout_constraintTop_toBottomOf="@+id/weaponatk"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ticklabel"
             tools:visibility="visible" />
 
         <EditText
@@ -134,8 +94,8 @@
             android:inputType="number"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/statgoallabel"
-            app:layout_constraintTop_toBottomOf="@+id/stat"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/statgoallabel"
             tools:visibility="visible" />
 
         <Spinner
@@ -144,17 +104,21 @@
             android:layout_height="wrap_content"
             android:entries="@array/classes_array"
             android:spinnerMode="dialog"
-            app:layout_constraintStart_toEndOf="@+id/trainstylespinner"
-            app:layout_constraintTop_toTopOf="@+id/trainstylespinner" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tickhelp" />
 
         <Spinner
             android:id="@+id/trainstylespinner"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
             android:entries="@array/train_methods_array"
             android:spinnerMode="dialog"
+            android:theme="@style/Theme.RucoyCalculator"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tick" />
+            app:layout_constraintTop_toBottomOf="@+id/divider2"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <Button
             android:id="@+id/tickhelp"
@@ -172,19 +136,18 @@
             android:id="@+id/baselevellabel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
             android:text="@string/base_level"
-            app:layout_constraintBottom_toBottomOf="@+id/baselevel"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/baselevel" />
+            app:layout_constraintTop_toBottomOf="@+id/trainstylespinner" />
 
         <TextView
             android:id="@+id/statlabel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/stat_level"
-            app:layout_constraintBottom_toBottomOf="@+id/stat"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/stat" />
+            app:layout_constraintTop_toBottomOf="@+id/hours" />
 
         <TextView
             android:id="@+id/hourslabel"
@@ -192,9 +155,8 @@
             android:layout_height="wrap_content"
             android:text="@string/hours"
             android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@+id/hours"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/hours"
+            app:layout_constraintTop_toBottomOf="@+id/baselevel"
             tools:visibility="visible" />
 
         <TextView
@@ -203,9 +165,8 @@
             android:layout_height="wrap_content"
             android:text="@string/stat_goal"
             android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@+id/statgoal"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/statgoal"
+            app:layout_constraintTop_toBottomOf="@+id/stat"
             tools:visibility="visible" />
 
         <TextView
@@ -214,9 +175,8 @@
             android:layout_height="wrap_content"
             android:text="@string/weapon_atk"
             android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@+id/weaponatk"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/weaponatk"
+            app:layout_constraintTop_toBottomOf="@+id/statgoal"
             tools:visibility="visible" />
 
         <TextView
@@ -225,10 +185,26 @@
             android:layout_height="wrap_content"
             android:text="@string/tickrate"
             android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@+id/tick"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/tick"
+            app:layout_constraintTop_toBottomOf="@+id/weaponatk"
             tools:visibility="visible" />
 
+        <View
+            android:id="@+id/divider"
+            android:layout_width="409dp"
+            android:layout_height="1dp"
+            android:background="?android:attr/listDivider"
+            app:layout_constraintBottom_toTopOf="@+id/baselevellabel"
+            app:layout_constraintTop_toBottomOf="@+id/trainstylespinner"
+            tools:layout_editor_absoluteX="1dp" />
+
+        <View
+            android:id="@+id/divider2"
+            android:layout_width="409dp"
+            android:layout_height="1dp"
+            android:background="?android:attr/listDivider"
+            tools:layout_editor_absoluteX="1dp"
+            tools:layout_editor_absoluteY="58dp" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/src/app/src/main/res/menu/bottom_nav_menu.xml b/src/app/src/main/res/menu/bottom_nav_menu.xml
index 2a8c25d..7c8780d 100644
--- a/src/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/src/app/src/main/res/menu/bottom_nav_menu.xml
@@ -8,7 +8,7 @@
 
     <item
         android:id="@+id/navigation_skull"
-        android:icon="@drawable/skull"
+        android:icon="@drawable/stat_info"
         android:title="@string/title_skull" />
 
 
diff --git a/src/app/src/main/res/values-night-v31/themes.xml b/src/app/src/main/res/values-night-v31/themes.xml
new file mode 100644
index 0000000..5af54b0
--- /dev/null
+++ b/src/app/src/main/res/values-night-v31/themes.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.RucoyCalculator" parent="Theme.Material3.DayNight">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@android:color/system_accent1_400</item>
+        <item name="colorPrimaryVariant">@android:color/system_accent1_500</item>
+        <item name="colorOnPrimary">@android:color/system_accent1_50</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
\ No newline at end of file
diff --git a/src/app/src/main/res/values-night/themes.xml b/src/app/src/main/res/values-night/themes.xml
index df95bf3..ce43b59 100644
--- a/src/app/src/main/res/values-night/themes.xml
+++ b/src/app/src/main/res/values-night/themes.xml
@@ -1,8 +1,8 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.RucoyCalculator" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.RucoyCalculator" parent="Theme.Material3.DayNight">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
+        <item name="colorPrimary">@android:color/system_accent1_400</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
         <item name="colorOnPrimary">@color/black</item>
         <!-- Secondary brand color. -->
diff --git a/src/app/src/main/res/values-v31/themes.xml b/src/app/src/main/res/values-v31/themes.xml
new file mode 100644
index 0000000..4374982
--- /dev/null
+++ b/src/app/src/main/res/values-v31/themes.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.RucoyCalculator" parent="Theme.Material3.DayNight">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@android:color/system_accent1_200</item>
+        <item name="colorPrimaryVariant">@android:color/system_accent1_300</item>
+        <item name="colorOnPrimary">@android:color/system_accent1_900</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
\ No newline at end of file
diff --git a/src/app/src/main/res/values/strings.xml b/src/app/src/main/res/values/strings.xml
index f7b9c9c..dcaf267 100644
--- a/src/app/src/main/res/values/strings.xml
+++ b/src/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="title_train">Train</string>
     <string name="title_ptrain">Power train</string>
     <string name="title_credits">Credits</string>
-    <string name="title_skull">Skull</string>
+    <string name="title_skull">Stat info</string>
     <string name="base_level">Base level</string>
     <string name="stat_level">Stat level (with buffs)</string>
     <string name="weapon_atk">Weapon attack</string>
diff --git a/src/app/src/main/res/values/themes.xml b/src/app/src/main/res/values/themes.xml
index eec72c4..8739aa9 100644
--- a/src/app/src/main/res/values/themes.xml
+++ b/src/app/src/main/res/values/themes.xml
@@ -1,8 +1,8 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.RucoyCalculator" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.RucoyCalculator" parent="Theme.Material3.DayNight">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
+        <item name="colorPrimary">@android:color/system_accent1_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
diff --git a/src/gradle/libs.versions.toml b/src/gradle/libs.versions.toml
index 43fc356..8f5fed5 100644
--- a/src/gradle/libs.versions.toml
+++ b/src/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.1.1"
+agp = "8.1.2"
 org-jetbrains-kotlin-android = "1.9.0"
 core-ktx = "1.12.0"
 junit = "4.13.2"