diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 83ed3eb..9870330 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -23,68 +23,68 @@ Contact us at <joguitos+pluck@luca0n.com>.
 -->
 
 <androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context="io.github.trytonvanmeer.libretrivia.activities.MainActivity">
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical"
+	tools:context="io.github.trytonvanmeer.libretrivia.activities.MainActivity">
 
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true">
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:fillViewport="true">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/margin_default"
+			android:padding="@dimen/padding_default"
+			android:orientation="vertical"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintTop_toTopOf="parent">
 
-            <!-- Select Amount -->
-            <TextView
-                style="@style/TextLabel"
-                android:labelFor="@id/spinner_number"
-                android:text="@string/ui_amount" />
+			<!-- Select Amount -->
+			<TextView
+				style="@style/TextLabel"
+				android:labelFor="@id/spinner_number"
+				android:text="@string/ui_amount" />
 
-            <Spinner
-                android:id="@+id/spinner_number"
-                style="@style/Spinner" />
+			<Spinner
+				android:id="@+id/spinner_number"
+				style="@style/Spinner" />
 
-            <!-- Select Category Spinner -->
-            <TextView
-                style="@style/TextLabel"
-                android:labelFor="@id/spinner_category"
-                android:text="@string/ui_category" />
+			<!-- Select Category Spinner -->
+			<TextView
+				style="@style/TextLabel"
+				android:labelFor="@id/spinner_category"
+				android:text="@string/ui_category" />
 
-            <Spinner
-                android:id="@+id/spinner_category"
-                style="@style/Spinner" />
+			<Spinner
+				android:id="@+id/spinner_category"
+				style="@style/Spinner" />
 
-            <!-- Select Difficulty Spinner -->
-            <TextView
-                style="@style/TextLabel"
-                android:labelFor="@id/spinner_difficulty"
-                android:text="@string/ui_difficulty" />
+			<!-- Select Difficulty Spinner -->
+			<TextView
+				style="@style/TextLabel"
+				android:labelFor="@id/spinner_difficulty"
+				android:text="@string/ui_difficulty" />
 
-            <Spinner
-                android:id="@+id/spinner_difficulty"
-                style="@style/Spinner" />
+			<Spinner
+				android:id="@+id/spinner_difficulty"
+				style="@style/Spinner" />
 
-            <!-- Play Button -->
-            <Button
-                android:id="@+id/button_play"
-                style="@style/Button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="@string/ui_start_game"
-                android:textSize="24sp" />
+			<!-- Play Button -->
+			<Button
+				android:id="@+id/button_play"
+				style="@style/Button"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="16dp"
+				android:text="@string/ui_start_game"
+				android:textSize="24sp" />
 
-        </LinearLayout>
-    </ScrollView>
+		</LinearLayout>
+	</ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
new file mode 100644
index 0000000..c5af52c
--- /dev/null
+++ b/app/src/main/res/values/dimen.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<dimen name="margin_default">8dp</dimen>
+	<dimen name="padding_default">12dp</dimen>
+</resources>