diff --git a/.gitignore b/.gitignore
index aa724b7..a630cb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@
 .externalNativeBuild
 .cxx
 local.properties
+/app/src/androidTest/java/com/example/hiptips/
+/app/src/test/java/com/example/hiptips/
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 417dab2..6162ddd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f27c54d..b2e2da7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,10 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
-        <entry key="..\:/Users/lilre/AndroidStudioProjects/HipTips/app/src/main/res/layout/activity_main.xml" value="0.3333333333333333" />
+        <entry key="..\:/Users/lilre/AndroidStudioProjects/HipTips/app/src/main/res/drawable/ic_launcher_background.xml" value="0.1945" />
+        <entry key="..\:/Users/lilre/AndroidStudioProjects/HipTips/app/src/main/res/drawable/ic_launcher_foreground.xml" value="0.1945" />
+        <entry key="..\:/Users/lilre/AndroidStudioProjects/HipTips/app/src/main/res/layout/activity_main.xml" value="0.22" />
+        <entry key="..\:/Users/lilre/AndroidStudioProjects/HipTips/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.1945" />
       </map>
     </option>
   </component>
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 0000000..4625749
Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ
diff --git a/app/src/main/java/com/example/hiptips/MainActivity.java b/app/src/main/java/com/example/hiptips/MainActivity.java
index 59f62b6..b1f9fda 100644
--- a/app/src/main/java/com/example/hiptips/MainActivity.java
+++ b/app/src/main/java/com/example/hiptips/MainActivity.java
@@ -12,20 +12,20 @@
 
 
 public class MainActivity extends AppCompatActivity {
+    //Setting up Variables to be initialized later on.
     SeekBar tipSlider;
     TextView tipPercent;
     TextView tipAmount;
     TextView totalAmount;
     EditText priceInput;
+    TextView qualityText;
 
 
     //The onCreate method fires when the application starts up
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        //This line is just telling our program what content to show on screen.
-        //In this case R. stands for resource. So were looking in Resources/Layout/ for activity_main
-        //in res/layout we have the matching .xml file
+        //setContentView just takes a layout, and tells the program what to show.
         setContentView(R.layout.activity_main);
 
         //Initializing variables for all of our labels/inputs
@@ -34,17 +34,26 @@ protected void onCreate(Bundle savedInstanceState) {
         tipAmount = findViewById(R.id.tvTip_Amount);
         totalAmount = findViewById(R.id.tvTotal_Amount);
         priceInput = findViewById(R.id.tvPrice_Input);
+        qualityText = findViewById(R.id.qualityText);
 
         //Gives us a number format for the labels.
+        //Since its dollars, were formatting things with 0.00
         NumberFormat dollarFormat = new DecimalFormat("#0.00");
 
+        //We take the SeekBar and and give it a change listener so our program is always listening
+        //for any changes.
         tipSlider.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
             @Override
             public void onProgressChanged(SeekBar seekBar, int i, boolean b) {
                 //Just takes the tipPercent. and sets the text to % + i.
                 //i = whatever the slider is on.
+
+                //This just takes i and sets it as the percent text, also adds % at the end.
                 tipPercent.setText(i + "%");
+                //We then update the tip label
                 UpdateTipLabel(i);
+                //Finally we update the quality label.
+                UpdateQualityLabel(i);
             }
             @Override
             public void onStartTrackingTouch(SeekBar seekBar) {
@@ -65,11 +74,11 @@ public void UpdateTipLabel(Integer percent) {
                 else {
                     //We parse the user input to a double so they can input decimals.
                     Float price = Float.parseFloat(inputValue);
-                    //We then divide our percent variable which we get passed into this function from the slider
-                    //We must do 100.0 here or it will try to divide an int and a double.
-                    //This would result in it being 0 until it reaches 100/100 because Ints dont have decimal places.
+                    //The equation is simple. We take the %(the current place of the slider)
+                    //and multiply it by the price the user inputs. then divide by 100.
                     Float rawResult = (percent*price)/100;
-                    //Setting a String variable with the proper dollar format.
+                    //This is taking our raw result, which can have a lot of decimal places.
+                    //And uses our dollar format that we setup on line 41
                     String formattedResult = "$"+dollarFormat.format(rawResult);
                     //Finally we put our formatted result in a string to be written to the screen.
                     tipAmount.setText(formattedResult);
@@ -79,11 +88,81 @@ public void UpdateTipLabel(Integer percent) {
             }
 
             public void UpdateTotalLabel(Float rawResult, Float price) {
+                //To update the total we just add the price and rawResult from UpdateTipLabel.
                 Float rawTotal = rawResult + price;
+                //Then we format the rawResult with our dollarformat.
                 String formattedTotal = "$"+dollarFormat.format(rawTotal);
-
+                //Finally we just update the text to the proper textview.
                 totalAmount.setText(formattedTotal);
             }
+
+            public void UpdateQualityLabel(Integer i) {
+
+                switch(i) {
+                    case 0:
+                        qualityText.setText("");
+                        break;
+                    case 1:
+                        qualityText.setText(R.string.qual_bad);
+                        qualityText.setTextColor(getResources().getColor(R.color.qual_0));
+                        break;
+                    case 3:
+                        qualityText.setTextColor(getResources().getColor(R.color.qual_3));
+                        break;
+                    case 5:
+                        qualityText.setText(R.string.qual_bad_better);
+                        qualityText.setTextColor(getResources().getColor(R.color.qual_5));
+                        break;
+                    case 7:
+                        qualityText.setTextColor(getResources().getColor(R.color.qual_7));
+                        break;
+                    case 9:
+                        qualityText.setText(R.string.qual_fine);
+                        qualityText.setTextColor(getResources().getColor(R.color.qual_9));
+                        break;
+                    case 11:
+                        qualityText.setTextColor(getResources().getColor(R.color.qual_11));
+                        break;
+                    case 12:
+                        qualityText.setTextColor(getResources().getColor(R.color.qual_12));
+                        break;
+                    case 13:
+                        qualityText.setTextColor(getResources().getColor(R.color.qual_13));
+                        break;
+                    case 14:
+                        qualityText.setTextColor(getResources().getColor(R.color.qual_14));
+                        break;
+                    case 15:
+                        qualityText.setText(R.string.qual_average);
+                        qualityText.setTextColor(getResources().getColor(R.color.qual_15));
+                        break;
+                    case 18:
+                        qualityText.setText(R.string.qual_good);
+                        qualityText.setTextColor(getResources().getColor(R.color.qual_18));
+                        break;
+                    case 25:
+                        qualityText.setText(R.string.qual_great);
+                        qualityText.setTextColor(getResources().getColor(R.color.qual_25));
+                        break;
+                    case 30:
+                        qualityText.setText(R.string.qual_insane);
+                        qualityText.setTextColor(getResources().getColor(R.color.qual_30));
+                        break;
+                    case 40:
+                        qualityText.setTextColor(getResources().getColor(R.color.qual_40));
+                        break;
+                    case 50:
+                        qualityText.setText(R.string.qual_wow);
+                        qualityText.setTextColor(getResources().getColor(R.color.qual_50));
+                        break;
+                    case 70:
+                        qualityText.setTextColor(getResources().getColor(R.color.qual_70));
+                        break;
+                    case 90:
+                        qualityText.setTextColor(getResources().getColor(R.color.qual_90));
+                        break;
+                }
+            }
         });
 
     }
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d1..0000000
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000..9dd5b47
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108"
+    android:tint="#FDFCFC">
+  <group android:scaleX="2.543795"
+      android:scaleY="2.543795"
+      android:translateX="24.887678"
+      android:translateY="23.474459">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11.8,10.9c-2.27,-0.59 -3,-1.2 -3,-2.15 0,-1.09 1.01,-1.85 2.7,-1.85 1.78,0 2.44,0.85 2.5,2.1h2.21c-0.07,-1.72 -1.12,-3.3 -3.21,-3.81V3h-3v2.16c-1.94,0.42 -3.5,1.68 -3.5,3.61 0,2.31 1.91,3.46 4.7,4.13 2.5,0.6 3,1.48 3,2.41 0,0.69 -0.49,1.79 -2.7,1.79 -2.06,0 -2.87,-0.92 -2.98,-2.1h-2.2c0.12,2.19 1.76,3.42 3.68,3.83V21h3v-2.15c1.95,-0.37 3.5,-1.5 3.5,-3.55 0,-2.84 -2.43,-3.81 -4.7,-4.4z"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 14577f2..910c132 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,117 +1,294 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<ScrollView 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:context=".MainActivity">
-
-
-    <!-- Left Handed Labels -->
-    <TextView
-        android:id="@+id/tvPrice_Label"
-        android:layout_width="wrap_content"
-        android:layout_height="22dp"
-        android:layout_marginStart="35dp"
-        android:layout_marginTop="60dp"
-        android:fontFamily="monospace"
-        android:text="@string/price_label"
-        android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        android:textSize="16sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tvTipPercent_Label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="65dp"
-        android:fontFamily="monospace"
-        android:text="@string/percent_label"
-        android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="@+id/tvPrice_Label"
-        app:layout_constraintTop_toBottomOf="@+id/tvPrice_Label" />
-
-    <TextView
-        android:id="@+id/tvTip_Label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="60dp"
-        android:fontFamily="monospace"
-        android:text="@string/tip_label"
-        android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        android:textSize="16sp"
-        app:layout_constraintEnd_toEndOf="@+id/tvTipPercent_Label"
-        app:layout_constraintTop_toBottomOf="@+id/tvTipPercent_Label" />
-
-    <TextView
-        android:id="@+id/tvTotal_Label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="60dp"
-        android:fontFamily="monospace"
-        android:text="@string/total_label"
-        android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        android:textSize="16sp"
-        app:layout_constraintEnd_toEndOf="@+id/tvTip_Label"
-        app:layout_constraintTop_toBottomOf="@+id/tvTip_Label" />
-
-    <!-- Right Handed Labels -->
-
-    <EditText
-        android:id="@+id/tvPrice_Input"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
-        android:autofillHints=""
-        android:editable="true"
-        android:ems="10"
-        android:hint="@string/price_hint"
-        android:inputType="numberDecimal"
-        android:textColorHint="#78909C"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="@+id/tvPrice_Label"
-        app:layout_constraintStart_toEndOf="@+id/tvPrice_Label"
-        app:layout_constraintTop_toTopOf="@+id/tvPrice_Label" />
-
-    <SeekBar
-        android:id="@+id/seekTipPercent_Slider"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="105dp"
-        app:layout_constraintBottom_toBottomOf="@+id/tvTipPercent_Label"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/tvTipPercent_Label"
-        app:layout_constraintTop_toTopOf="@+id/tvTipPercent_Label" />
-
-    <TextView
-        android:id="@+id/tvTip_Amount"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/tvTip_Label"
-        app:layout_constraintStart_toEndOf="@+id/tvTip_Label"
-        app:layout_constraintTop_toTopOf="@+id/tvTip_Label"
-        tools:text="@string/tip_amount" />
-
-    <TextView
-        android:id="@+id/tvTotal_Amount"
-        android:layout_width="wrap_content"
+    android:background="@color/primary"
+    tools:layout_editor_absoluteX="1dp"
+    tools:layout_editor_absoluteY="257dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/tvTotal_Label"
-        app:layout_constraintStart_toEndOf="@+id/tvTotal_Label"
-        app:layout_constraintTop_toTopOf="@+id/tvTotal_Label"
-        tools:text="@string/total_amount" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:isScrollContainer="true"
+        tools:context=".MainActivity">
+
+
+        <!-- Left Handed Labels -->
+        <View
+            android:id="@+id/DividerColorPrice"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:background="?android:attr/listDivider"
+            app:layout_constraintBottom_toTopOf="@+id/dividerInvisBetweenPricePercent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/dividerInvisTopPercent" />
+
+        <View
+            android:id="@+id/dividerInvisTopPercent"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="1dp"
+            android:layout_marginTop="25dp"
+            android:layout_marginEnd="1dp"
+            android:layout_marginBottom="25dp"
+            app:layout_constraintBottom_toTopOf="@+id/tvPrice_Label"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <View
+            android:id="@+id/dividerInvisBetweenTipTotal"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="1dp"
+            android:layout_marginTop="25dp"
+            android:layout_marginEnd="1dp"
+            android:layout_marginBottom="25dp"
+            app:layout_constraintBottom_toTopOf="@+id/tvTotal_Label"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvTip_Label" />
+
+        <View
+            android:id="@+id/dividerInvisBetweenTotalNone"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="1dp"
+            android:layout_marginTop="25dp"
+            android:layout_marginEnd="2dp"
+            android:layout_marginBottom="25dp"
+            app:layout_constraintBottom_toTopOf="@+id/qualityText"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvTotal_Label" />
+
+        <View
+            android:id="@+id/dividerInvisBetweenTipPercent"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="1dp"
+            android:layout_marginTop="25dp"
+            android:layout_marginEnd="1dp"
+            android:layout_marginBottom="25dp"
+            app:layout_constraintBottom_toTopOf="@+id/tvTip_Label"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvTipPercent_Label" />
+
+        <View
+            android:id="@+id/dividerInvisBetweenPricePercent"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="1dp"
+            android:layout_marginTop="25dp"
+            android:layout_marginEnd="1dp"
+            android:layout_marginBottom="25dp"
+            app:layout_constraintBottom_toTopOf="@+id/tvTipPercent_Label"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvPrice_Label" />
+
+        <View
+            android:id="@+id/dividerColorPercent"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="1dp"
+            android:layout_marginEnd="1dp"
+            android:background="?android:attr/listDivider"
+            app:layout_constraintBottom_toTopOf="@+id/dividerInvisBetweenTipPercent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/dividerInvisBetweenPricePercent" />
+
+        <View
+            android:id="@+id/dividerColorTotal"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="1dp"
+            android:layout_marginEnd="1dp"
+            android:background="?android:attr/listDivider"
+            app:layout_constraintBottom_toTopOf="@+id/dividerInvisBetweenTotalNone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/dividerInvisBetweenTipTotal" />
+
+        <View
+            android:id="@+id/dividerColorTip"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="1dp"
+            android:layout_marginEnd="1dp"
+            android:background="?android:attr/listDivider"
+            app:layout_constraintBottom_toTopOf="@+id/dividerInvisBetweenTipTotal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/dividerInvisBetweenTipPercent" />
+
+        <View
+            android:id="@+id/dividerColorQuality"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="1dp"
+            android:layout_marginEnd="1dp"
+            android:background="?android:attr/listDivider"
+            app:layout_constraintBottom_toTopOf="@+id/dividerInvisBottom"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/dividerInvisBetweenTotalNone" />
+
+        <View
+            android:id="@+id/dividerInvisBottom"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="2dp"
+            android:layout_marginTop="25dp"
+            android:layout_marginEnd="1dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/qualityText" />
+
+        <TextView
+            android:id="@+id/tvPrice_Label"
+            android:layout_width="wrap_content"
+            android:layout_height="22dp"
+            android:layout_marginStart="35dp"
+            android:layout_marginTop="60dp"
+            android:fontFamily="monospace"
+            android:text="@string/price_label"
+            android:textAlignment="center"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="TextContrastCheck" />
+
+        <TextView
+            android:id="@+id/tvTipPercent_Label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="60dp"
+            android:fontFamily="monospace"
+            android:text="@string/percent_label"
+            android:textAlignment="center"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="@+id/tvPrice_Label"
+            app:layout_constraintTop_toBottomOf="@+id/tvPrice_Label"
+            tools:ignore="TextContrastCheck" />
+
+        <TextView
+            android:id="@+id/tvTip_Label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="60dp"
+            android:fontFamily="monospace"
+            android:text="@string/tip_label"
+            android:textAlignment="center"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="@+id/tvTipPercent_Label"
+            app:layout_constraintTop_toBottomOf="@+id/tvTipPercent_Label"
+            tools:ignore="TextContrastCheck" />
+
+        <!-- Right Handed Labels -->
+
+        <TextView
+            android:id="@+id/tvTotal_Label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="60dp"
+            android:fontFamily="monospace"
+            android:text="@string/total_label"
+            android:textAlignment="center"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="@+id/tvTip_Label"
+            app:layout_constraintTop_toBottomOf="@+id/tvTip_Label"
+            tools:ignore="TextContrastCheck" />
+
+        <EditText
+            android:id="@+id/tvPrice_Input"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="20dp"
+            android:autofillHints=""
+            android:ems="10"
+            android:hint="@string/price_hint"
+            android:inputType="numberDecimal"
+            android:textColorHint="@color/white"
+            android:textSize="20sp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvPrice_Label"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toEndOf="@+id/tvPrice_Label"
+            app:layout_constraintTop_toTopOf="@+id/tvPrice_Label"
+            tools:ignore="TextContrastCheck,TextContrastCheck" />
+
+        <SeekBar
+            android:id="@+id/seekTipPercent_Slider"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="70dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tvTipPercent_Label"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/tvTipPercent_Label"
+            app:layout_constraintTop_toTopOf="@+id/tvTipPercent_Label" />
+
+        <TextView
+            android:id="@+id/tvTip_Amount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:textColor="@color/white"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@+id/tvTip_Label"
+            app:layout_constraintStart_toEndOf="@+id/tvTip_Label"
+            app:layout_constraintTop_toTopOf="@+id/tvTip_Label"
+            tools:ignore="TextContrastCheck,TextContrastCheck"
+            tools:text="@string/tip_amount" />
+
+        <TextView
+            android:id="@+id/tvTotal_Amount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:textColor="@color/white"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@+id/tvTotal_Label"
+            app:layout_constraintStart_toEndOf="@+id/tvTotal_Label"
+            app:layout_constraintTop_toTopOf="@+id/tvTotal_Label"
+            tools:ignore="TextContrastCheck"
+            tools:text="@string/total_amount" />
+
+        <TextView
+            android:id="@+id/qualityText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="60dp"
+            android:textColor="@color/white"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvTotal_Label"
+            tools:ignore="TextContrastCheck"
+            tools:text="@string/qual_none" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index eca70cf..0000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index eca70cf..0000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..f4dc0d7
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..5a4292a
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..f42ac64
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3f827a6
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..fda1f1e
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..dfe7b22
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..ca4cd49
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..bdcff40
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f50..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..acd4c52
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index aa7d642..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..7ef1187
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9126ae3..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 9b9697c..0ac446c 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -2,15 +2,15 @@
     <!-- Base application theme. -->
     <style name="Theme.HipTips" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
+        <item name="colorPrimary">@color/primary_night</item>
+        <item name="colorPrimaryVariant">@color/primary_night_variant</item>
+        <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
+        <item name="colorSecondary">@color/secondary</item>
+        <item name="colorSecondaryVariant">@color/secondary_variant</item>
+        <item name="colorOnSecondary">@color/white</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..283f028 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,10 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+
+    <color name="primary">#27ae60</color>
+    <color name="primary_variant">#2ecc71</color>
+
+    <color name="primary_night">#34495e</color>
+    <color name="primary_night_variant">#2c3e50</color>
+
+    <color name="secondary">#95a5a6</color>
+    <color name="secondary_variant">#7f8c8d</color>
+
+    <!-- Colors for Quality Text -->
+    <color name="qual_0">#ff0000</color>
+    <color name="qual_3">#FF2A00</color>
+    <color name="qual_5">#FF5500</color>
+    <color name="qual_7">#FF8000</color>
+    <color name="qual_9">#FFAA00</color>
+    <color name="qual_11">#FFD500</color>
+    <color name="qual_12">#FFFF00</color>
+    <color name="qual_13">#D4FF00</color>
+    <color name="qual_14">#AAFF00</color>
+    <color name="qual_15">#2BFF00</color>
+    <color name="qual_18">#26E600</color>
+    <color name="qual_25">#22CC00</color>
+    <color name="qual_30">#1E9500</color>
+    <color name="qual_40">#1A9900</color>
+    <color name="qual_50">#158000</color>
+    <color name="qual_70">#116600</color>
+    <color name="qual_90">#0D4D00</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/intergers.xml b/app/src/main/res/values/ic_launcher_background.xml
similarity index 52%
rename from app/src/main/res/values/intergers.xml
rename to app/src/main/res/values/ic_launcher_background.xml
index 0406182..31969a0 100644
--- a/app/src/main/res/values/intergers.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <integer name="percent">0</integer>
+    <color name="ic_launcher_background">#246016</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5432584..7971f33 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,10 +1,29 @@
 <resources>
     <string name="app_name">Always Tip</string>
+    <!-- Label Strings -->
     <string name="price_label">Price</string>
-    <string name="price_hint">Price of meal/service</string>
-    <string name="percent_label"></string>
-    <string name="tip_label">Tip</string>
+    <string name="percent_label">0%</string>
+    <string name="tip_label">Tip:</string>
+    <string name="total_label">Total:</string>
+
+    <!-- Strings for right side of labels that are dynamically updated -->
+    <string name="price_hint">Enter Meal Price</string>
+    <string name="percent_header">Tip Percent</string>
     <string name="tip_amount">0</string>
-    <string name="total_label">Total</string>
     <string name="total_amount">0</string>
+
+    <!-- Strings for Quality Text -->
+    <string name="qual_text">None</string>
+
+    <string name="qual_none">None</string>
+    <string name="qual_bad">Bad</string>
+    <string name="qual_bad_better">Getting Better</string>
+    <string name="qual_fine">Fine</string>
+    <string name="qual_average">Average</string>
+    <string name="qual_good_average">Above Average</string>
+    <string name="qual_good">Good</string>
+    <string name="qual_great">Great</string>
+    <string name="qual_fantastic">Fantastic</string>
+    <string name="qual_insane">Insane</string>
+    <string name="qual_wow">WOW</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 018f2ad..d3345d4 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,15 +2,15 @@
     <!-- Base application theme. -->
     <style name="Theme.HipTips" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryVariant">@color/primary_variant</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
+        <item name="colorSecondary">@color/secondary</item>
+        <item name="colorSecondaryVariant">@color/secondary_variant</item>
+        <item name="colorOnSecondary">@color/white</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
 </resources>
\ No newline at end of file