diff --git a/app/src/main/res/drawable/rounded_btn.xml b/app/src/main/res/drawable/rounded_btn.xml
index 09dce02..bb5d2f2 100644
--- a/app/src/main/res/drawable/rounded_btn.xml
+++ b/app/src/main/res/drawable/rounded_btn.xml
@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/bg_screen1" />
-    <corners android:bottomRightRadius="24dp"
-        android:bottomLeftRadius="24dp"
-        android:topRightRadius="24dp"
-        android:topLeftRadius="24dp"/>
+    <corners android:bottomRightRadius="@dimen/btn_radius"
+        android:bottomLeftRadius="@dimen/btn_radius"
+        android:topRightRadius="@dimen/btn_radius"
+        android:topLeftRadius="@dimen/btn_radius"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rounded_btn_disabled.xml b/app/src/main/res/drawable/rounded_btn_disabled.xml
index 89933d4..dbf8e5e 100644
--- a/app/src/main/res/drawable/rounded_btn_disabled.xml
+++ b/app/src/main/res/drawable/rounded_btn_disabled.xml
@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/grey" />
-    <corners android:bottomRightRadius="24dp"
-        android:bottomLeftRadius="24dp"
-        android:topRightRadius="24dp"
-        android:topLeftRadius="24dp"/>
+    <corners android:bottomRightRadius="@dimen/btn_radius"
+        android:bottomLeftRadius="@dimen/btn_radius"
+        android:topRightRadius="@dimen/btn_radius"
+        android:topLeftRadius="@dimen/btn_radius"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/custom_dialog_layout_two_button.xml b/app/src/main/res/layout/custom_dialog_layout_two_button.xml
index f735162..0495069 100644
--- a/app/src/main/res/layout/custom_dialog_layout_two_button.xml
+++ b/app/src/main/res/layout/custom_dialog_layout_two_button.xml
@@ -1,99 +1,113 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
     tools:ignore="MissingDefaultResource">
 
-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/materialCardView"
+        android:layout_width="368dp"
+        android:layout_height="237dp"
         android:layout_marginStart="12dp"
         android:layout_marginEnd="12dp"
         app:cardCornerRadius="11dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <com.google.android.material.imageview.ShapeableImageView
-            android:layout_width="61dp"
-            android:layout_height="61dp"
-            android:layout_gravity="center"
-            android:layout_marginTop="12dp"
-            android:background="@drawable/shadow_bg"
-            app:srcCompat="@drawable/ic_launcher_foreground" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@id/msg"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="22dp"
-            android:layout_marginTop="18dp"
-            android:layout_marginEnd="12dp"
             android:fontFamily="@font/opensans_semibold"
+            android:hints="@+id/msg"
             android:text="@string/app_name"
             android:textColor="@color/grey"
             android:textSize="15dp"
-            android:labelFor="@+id/msg"
-            tools:ignore="HardcodedText,SpUsage" />
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.057"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.347"
+            tools:ignore="HardcodedText,SpUsage"
+            tools:layout_conversion_absoluteHeight="21dp"
+            tools:layout_conversion_absoluteWidth="91dp" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@id/cpl"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="22dp"
-            android:layout_marginTop="18dp"
-            android:layout_marginEnd="12dp"
             android:fontFamily="@font/opensans_regular"
             android:text="@string/app_version"
             android:textColor="@color/grey"
             android:textSize="14dp"
-            tools:ignore="HardcodedText,SpUsage" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
+            android:labelFor="@+id/cpl"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.046"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="HardcodedText,SpUsage"
+            tools:layout_conversion_absoluteHeight="19dp"
+            tools:layout_conversion_absoluteWidth="24dp" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/notagreed"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="170dp"
-            android:layout_marginStart="30dp"
-            android:layout_marginBottom="38dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginBottom="16dp"
             android:background="@drawable/rounded_btn"
+            android:gravity="center"
+            android:maxLines="1"
+            android:minWidth="100dp"
+            android:paddingStart="25dp"
+            android:paddingEnd="25dp"
             android:text="@string/button_cancel"
-            android:textAlignment="center"
             android:textColor="@color/white"
-            android:textSize="16sp" />
-
-        <Space
-            android:layout_width="100dp"
-            android:layout_height="wrap_content" />
+            android:textSize="16sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/agreed"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:ignore="HardcodedText,SpUsage" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/agreed"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
-            android:layout_marginTop="170dp"
-            android:layout_marginBottom="38dp"
+            android:layout_marginEnd="16dp"
             android:background="@drawable/rounded_btn"
+            android:gravity="center"
+            android:maxLines="1"
+            android:minWidth="100dp"
+            android:paddingStart="25dp"
+            android:paddingEnd="25dp"
             android:text="@string/button_ok"
-            android:textAlignment="center"
             android:textColor="@color/white"
-            android:textSize="16sp" />
+            android:textSize="16sp"
+            app:layout_constraintBottom_toBottomOf="@+id/notagreed"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/notagreed"
+            app:layout_constraintVertical_bias="0.0"
+            tools:ignore="HardcodedText,SpUsage" />
+
+        <com.google.android.material.imageview.ShapeableImageView
+            android:id="@+id/shapeableImageView"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_marginTop="4dp"
+            android:background="@drawable/shadow_bg"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:layout_conversion_absoluteHeight="61dp"
+            tools:layout_conversion_absoluteWidth="61dp" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
 
-    </LinearLayout>
-    </com.google.android.material.card.MaterialCardView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/input_dialog.xml b/app/src/main/res/layout/input_dialog.xml
index 40633df..d12d688 100644
--- a/app/src/main/res/layout/input_dialog.xml
+++ b/app/src/main/res/layout/input_dialog.xml
@@ -14,6 +14,7 @@
         android:layout_marginTop="16dp"
         android:labelFor="@+id/cip13_input_dialog"
         android:background="@drawable/background_dialog"
+        android:contentDescription="@string/enter_cip_13"
         app:cardCornerRadius="25dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -65,9 +66,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="28dp"
+            android:autofillHints="cip13"
             android:ems="10"
             android:inputType="number"
-            android:labelFor="@id/startcip13"
+            android:hint="@string/enter_cip_13_here"
             android:minHeight="48dp"
             android:textAlignment="textStart"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index b11cd19..1636bc4 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -7,6 +7,7 @@
     <dimen name="fab_width">48dp</dimen>
     <!-- Default screen margins, per the Android Design guidelines. -->
 
+    <dimen name="btn_radius">5dp</dimen>
     <!-- Slide dimens -->
     <dimen name="dots_height">75dp</dimen>
     <dimen name="dots_margin_bottom">20dp</dimen>