diff --git a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt
index 80ee83c..ccdc078 100644
--- a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt
+++ b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt
@@ -166,9 +166,9 @@ class MainActivity : AppCompatActivity(), AppMenuAdapter.OnItemClickListener, Ap
     }
 
     private fun handleListItems() {
-        for (i in findViewById<LinearLayout>(R.id.shortcuts).children) {
+        for (i in arrayOf(R.id.app1, R.id.app2, R.id.app3, R.id.app4, R.id.app5, R.id.app6, R.id.app7, R.id.app8)) {
 
-            val textView = i as TextView
+            val textView = findViewById<TextView>(i)
 
             unselectedSetup(textView)
 
@@ -177,7 +177,6 @@ class MainActivity : AppCompatActivity(), AppMenuAdapter.OnItemClickListener, Ap
             if (savedView?.get(1) != "e") {
                 selectedSetup(textView, savedView)
             }
-
         }
     }
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 10fde85..fd13bb3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -92,150 +92,190 @@
             android:textColor="#F3F3F3"
             android:textSize="70sp" />
 
-        <LinearLayout
-            android:id="@+id/shortcuts"
+        <Space
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_gravity="top"
-            android:layout_weight="1"
-            android:gravity="center_vertical"
-            android:orientation="vertical">
+            android:layout_weight="0.23" />
 
-            <TextView
-                android:id="@+id/app1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:autoSizeTextType="uniform"
-                android:clickable="false"
-                android:gravity="start"
-                android:paddingLeft="40dp"
-                android:paddingTop="20dp"
-                android:paddingRight="40dp"
-                android:paddingBottom="20dp"
-                android:text="@string/shortcut_default"
-                android:textAppearance="@android:style/TextAppearance.DeviceDefault"
-                android:textColor="#F3F3F3"
-                android:textSize="28sp"
-                android:visibility="visible" />
-
-            <TextView
-                android:id="@+id/app2"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:clickable="false"
-                android:gravity="start"
-                android:paddingLeft="40dp"
-                android:paddingTop="20dp"
-                android:paddingRight="40dp"
-                android:paddingBottom="20dp"
-                android:text="@string/shortcut_default"
-                android:textAppearance="@android:style/TextAppearance.DeviceDefault"
-                android:textColor="#F3F3F3"
-                android:textSize="28sp"
-                android:visibility="visible" />
-
-            <TextView
-                android:id="@+id/app3"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:clickable="false"
-                android:gravity="start"
-                android:paddingLeft="40dp"
-                android:paddingTop="20dp"
-                android:paddingRight="40dp"
-                android:paddingBottom="20dp"
-                android:text="@string/shortcut_default"
-                android:textAppearance="@android:style/TextAppearance.DeviceDefault"
-                android:textColor="#F3F3F3"
-                android:textSize="28sp"
-                android:visibility="visible" />
-
-            <TextView
-                android:id="@+id/app4"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:clickable="false"
-                android:gravity="start"
-                android:paddingLeft="40dp"
-                android:paddingTop="20dp"
-                android:paddingRight="40dp"
-                android:paddingBottom="20dp"
-                android:text="@string/shortcut_default"
-                android:textAppearance="@android:style/TextAppearance.DeviceDefault"
-                android:textColor="#F3F3F3"
-                android:textSize="28sp"
-                android:visibility="visible" />
-
-            <TextView
-                android:id="@+id/app5"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:clickable="false"
-                android:gravity="start"
-                android:paddingLeft="40dp"
-                android:paddingTop="20dp"
-                android:paddingRight="40dp"
-                android:paddingBottom="20dp"
-                android:text="@string/shortcut_default"
-                android:textAppearance="@android:style/TextAppearance.DeviceDefault"
-                android:textColor="#F3F3F3"
-                android:textSize="28sp"
-                android:visibility="gone" />
-
-            <TextView
-                android:id="@+id/app6"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:clickable="false"
-                android:gravity="start"
-                android:paddingLeft="40dp"
-                android:paddingTop="20dp"
-                android:paddingRight="40dp"
-                android:paddingBottom="20dp"
-                android:text="@string/shortcut_default"
-                android:textAppearance="@android:style/TextAppearance.DeviceDefault"
-                android:textColor="#F3F3F3"
-                android:textSize="28sp"
-                android:visibility="gone" />
-
-            <TextView
-                android:id="@+id/app7"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:clickable="false"
-                android:gravity="start"
-                android:paddingLeft="40dp"
-                android:paddingTop="20dp"
-                android:paddingRight="40dp"
-                android:paddingBottom="20dp"
-                android:text="@string/shortcut_default"
-                android:textAppearance="@android:style/TextAppearance.DeviceDefault"
-                android:textColor="#F3F3F3"
-                android:textSize="28sp"
-                android:visibility="gone" />
-
-            <TextView
-                android:id="@+id/app8"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:clickable="false"
-                android:gravity="start"
-                android:paddingLeft="40dp"
-                android:paddingTop="20dp"
-                android:paddingRight="40dp"
-                android:paddingBottom="20dp"
-                android:text="@string/shortcut_default"
-                android:textAppearance="@android:style/TextAppearance.DeviceDefault"
-                android:textColor="#F3F3F3"
-                android:textSize="28sp"
-                android:visibility="gone" />
-
-        </LinearLayout>
+        <TextView
+            android:id="@+id/app1"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.08"
+            android:autoSizeMaxTextSize="28sp"
+            android:autoSizeTextType="uniform"
+            android:clickable="false"
+            android:gravity="start"
+            android:paddingLeft="40dp"
+            android:paddingRight="40dp"
+            android:text="@string/shortcut_default"
+            android:textAppearance="@android:style/TextAppearance.DeviceDefault"
+            android:textColor="#F3F3F3"
+            android:visibility="visible" />
 
         <Space
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="0.15" />
+            android:layout_weight="0.01" />
+
+        <TextView
+            android:id="@+id/app2"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.08"
+            android:autoSizeMaxTextSize="28sp"
+            android:autoSizeTextType="uniform"
+            android:clickable="false"
+            android:gravity="start"
+            android:paddingLeft="40dp"
+            android:paddingRight="40dp"
+            android:text="@string/shortcut_default"
+            android:textAppearance="@android:style/TextAppearance.DeviceDefault"
+            android:textColor="#F3F3F3"
+            android:textSize="28sp"
+            android:visibility="visible" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.01" />
+
+        <TextView
+            android:id="@+id/app3"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.08"
+            android:autoSizeMaxTextSize="28sp"
+            android:autoSizeTextType="uniform"
+            android:clickable="false"
+            android:gravity="start"
+            android:paddingLeft="40dp"
+            android:paddingRight="40dp"
+            android:text="@string/shortcut_default"
+            android:textAppearance="@android:style/TextAppearance.DeviceDefault"
+            android:textColor="#F3F3F3"
+            android:textSize="28sp"
+            android:visibility="visible" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.01" />
+
+        <TextView
+            android:id="@+id/app4"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.08"
+            android:autoSizeMaxTextSize="28sp"
+            android:autoSizeTextType="uniform"
+            android:clickable="false"
+            android:gravity="start"
+            android:paddingLeft="40dp"
+            android:paddingRight="40dp"
+            android:text="@string/shortcut_default"
+            android:textAppearance="@android:style/TextAppearance.DeviceDefault"
+            android:textColor="#F3F3F3"
+            android:textSize="28sp"
+            android:visibility="visible" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.01"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/app5"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.08"
+            android:autoSizeMaxTextSize="28sp"
+            android:autoSizeTextType="uniform"
+            android:clickable="false"
+            android:gravity="start"
+            android:paddingLeft="40dp"
+            android:paddingRight="40dp"
+            android:text="@string/shortcut_default"
+            android:textAppearance="@android:style/TextAppearance.DeviceDefault"
+            android:textColor="#F3F3F3"
+            android:textSize="28sp"
+            android:visibility="gone" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.01"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/app6"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.08"
+            android:autoSizeMaxTextSize="28sp"
+            android:autoSizeTextType="uniform"
+            android:clickable="false"
+            android:gravity="start"
+            android:paddingLeft="40dp"
+            android:paddingRight="40dp"
+            android:text="@string/shortcut_default"
+            android:textAppearance="@android:style/TextAppearance.DeviceDefault"
+            android:textColor="#F3F3F3"
+            android:textSize="28sp"
+            android:visibility="gone" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.01"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/app7"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.08"
+            android:autoSizeMaxTextSize="28sp"
+            android:autoSizeTextType="uniform"
+            android:clickable="false"
+            android:gravity="start"
+            android:paddingLeft="40dp"
+            android:paddingRight="40dp"
+            android:text="@string/shortcut_default"
+            android:textAppearance="@android:style/TextAppearance.DeviceDefault"
+            android:textColor="#F3F3F3"
+            android:textSize="28sp"
+            android:visibility="gone" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.01"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/app8"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.08"
+            android:autoSizeMaxTextSize="28sp"
+            android:autoSizeTextType="uniform"
+            android:clickable="false"
+            android:gravity="start"
+            android:paddingLeft="40dp"
+            android:paddingRight="40dp"
+            android:text="@string/shortcut_default"
+            android:textAppearance="@android:style/TextAppearance.DeviceDefault"
+            android:textColor="#F3F3F3"
+            android:textSize="28sp"
+            android:visibility="gone" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.3"
+            android:visibility="visible" />
 
     </LinearLayout>