diff --git a/app/src/main/java/eu/ottop/yamlauncher/BatteryReceiver.kt b/app/src/main/java/eu/ottop/yamlauncher/BatteryReceiver.kt
index 4871e18..4915ab5 100644
--- a/app/src/main/java/eu/ottop/yamlauncher/BatteryReceiver.kt
+++ b/app/src/main/java/eu/ottop/yamlauncher/BatteryReceiver.kt
@@ -5,21 +5,22 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.os.BatteryManager
-import android.widget.TextView
+import android.widget.TextClock
 
-class BatteryReceiver(private val textView: TextView) : BroadcastReceiver() {
+class BatteryReceiver(private val dateText: TextClock) : BroadcastReceiver() {
 
     override fun onReceive(context: Context?, intent: Intent?) {
         intent?.let {
             val level = it.getIntExtra(BatteryManager.EXTRA_LEVEL, -1)
             val scale = it.getIntExtra(BatteryManager.EXTRA_SCALE, -1)
             val batteryPct = level * 100 / scale.toFloat()
-            textView.text = "${batteryPct.toInt()}%"
+            dateText.format12Hour = "dd MMM yyyy | ${batteryPct.toInt()}%"
+            dateText.format24Hour = "dd MMM yyyy | ${batteryPct.toInt()}%"
         }
     }
 
     companion object {
-        fun register(context: Context, textView: TextView): BatteryReceiver {
+        fun register(context: Context, textView: TextClock): BatteryReceiver {
             val receiver = BatteryReceiver(textView)
             val filter = IntentFilter(Intent.ACTION_BATTERY_CHANGED)
             context.registerReceiver(receiver, filter)
diff --git a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt
index cc427a2..7621425 100644
--- a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt
+++ b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt
@@ -20,6 +20,7 @@ import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import android.widget.LinearLayout
+import android.widget.TextClock
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
@@ -55,7 +56,7 @@ class MainActivity : AppCompatActivity(), AppMenuAdapter.OnItemClickListener, Ap
     val cameraIntent = Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE)
     val phoneIntent = Intent(Intent.ACTION_DIAL)
     private lateinit var batteryReceiver: BatteryReceiver
-    private lateinit var batteryTextView: TextView
+    private lateinit var dateText: TextClock
 
     private var appActionMenu = AppActionMenu()
     private val sharedPreferenceManager = SharedPreferenceManager()
@@ -82,10 +83,9 @@ class MainActivity : AppCompatActivity(), AppMenuAdapter.OnItemClickListener, Ap
 
         setupApps()
 
+        val dateText = findViewById<TextClock>(R.id.text_date)
 
-        batteryTextView = findViewById(R.id.battery_charge)
-
-        batteryReceiver = BatteryReceiver.register(this, batteryTextView)
+        batteryReceiver = BatteryReceiver.register(this, dateText)
 
         binding.homeView.setOnTouchListener { _, event ->
             gestureDetector.onTouchEvent(event)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5624b6d..c864dc0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_view"
     android:layout_width="match_parent"
@@ -79,46 +80,42 @@
         android:orientation="vertical"
         android:visibility="visible">
 
-        <TextClock
-            android:id="@+id/text_clock"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="32dp"
-            android:layout_marginTop="30dp"
-            android:fontFamily="@null"
-            android:format12Hour="hh:mm a"
-            android:format24Hour="HH:mm"
-            android:textAlignment="textStart"
-            android:textAppearance="@android:style/TextAppearance.DeviceDefault"
-            android:textColor="#F3F3F3"
-            android:textSize="68sp" />
+            android:layout_height="wrap_content">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="37dp"
-            android:orientation="horizontal">
+            <TextClock
+                android:id="@+id/text_clock"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="32dp"
+                android:layout_marginStart="32dp"
+                android:layout_marginTop="40dp"
+                android:fontFamily="@null"
+                android:format12Hour="hh:mm a"
+                android:format24Hour="HH:mm"
+                android:textAlignment="textStart"
+                android:textAppearance="@android:style/TextAppearance.DeviceDefault"
+                android:textColor="#F3F3F3"
+                android:textSize="68sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <TextClock
                 android:id="@+id/text_date"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@null"
-                android:format12Hour="dd MMM yyyy | "
-                android:format24Hour="dd MMM yyyy | "
+                android:format12Hour="dd MMM yyyy"
+                android:format24Hour="dd MMM yyyy"
                 android:textAlignment="textStart"
                 android:textAppearance="@android:style/TextAppearance.DeviceDefault"
                 android:textColor="#F3F3F3"
-                android:textSize="20sp" />
+                android:textSize="20sp"
+                app:layout_constraintStart_toStartOf="@+id/text_clock"
+                app:layout_constraintTop_toBottomOf="@+id/text_clock" />
 
-            <TextView
-                android:id="@+id/battery_charge"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="@android:style/TextAppearance.DeviceDefault"
-                android:textColor="#F3F3F3"
-                android:textSize="20sp" />
-        </LinearLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <Space
             android:layout_width="match_parent"