diff --git a/verifit/src/main/java/com/example/verifit/ui/AddExerciseActivity.java b/verifit/src/main/java/com/example/verifit/ui/AddExerciseActivity.java
index 5db62ab..284902c 100755
--- a/verifit/src/main/java/com/example/verifit/ui/AddExerciseActivity.java
+++ b/verifit/src/main/java/com/example/verifit/ui/AddExerciseActivity.java
@@ -377,7 +377,7 @@ public void updateSet(Integer finalI, Integer finalJ, Double reps, Double weight
 
         // Let the user know I guess
         runOnUiThread(() -> {
-            showSnackbarMessage("Set Updated!");
+            showSnackbarMessage("Set Updated");
             updateTodaysExercises();
         });
 
@@ -406,7 +406,7 @@ public void updateViewAndShowMessage()
     {
         runOnUiThread(()->{
             updateTodaysExercises();
-            showSnackbarMessage("Set Added!");
+            showSnackbarMessage("Set Added");
         });
     }
 
diff --git a/verifit/src/main/java/com/example/verifit/ui/ChartsActivity.java b/verifit/src/main/java/com/example/verifit/ui/ChartsActivity.java
index af62038..de1d969 100755
--- a/verifit/src/main/java/com/example/verifit/ui/ChartsActivity.java
+++ b/verifit/src/main/java/com/example/verifit/ui/ChartsActivity.java
@@ -10,6 +10,7 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.ScrollView;
 
 import com.example.verifit.R;
 import com.github.mikephil.charting.animation.Easing;
@@ -64,6 +65,15 @@ public void onCreateStuff()
         bottomNavigationView.setSelectedItemId(R.id.charts);
         bottomNavigationView.setOnNavigationItemSelectedListener(this);
 
+        ScrollView scrollView = findViewById(R.id.scrollView);
+        if(MainActivity.dataStorage.getWorkoutDays().size() == 0){
+
+            scrollView.setVisibility(View.GONE);
+        }
+        else
+        {
+            scrollView.setVisibility(View.VISIBLE);
+        }
 
         barChartVolumes();
 
diff --git a/verifit/src/main/java/com/example/verifit/ui/MainActivity.java b/verifit/src/main/java/com/example/verifit/ui/MainActivity.java
index 3f2e2ab..ec875a5 100755
--- a/verifit/src/main/java/com/example/verifit/ui/MainActivity.java
+++ b/verifit/src/main/java/com/example/verifit/ui/MainActivity.java
@@ -306,7 +306,7 @@ else if(response.message().equals("Bad Gateway"))
             if(message.equals("verifit_rs_login"))
             {
                 SnackBarWithMessage snackBarWithMessage = new SnackBarWithMessage(MainActivity.this);
-                snackBarWithMessage.showSnackbar("Welcome back!");
+                snackBarWithMessage.showSnackbar("Welcome back");
             }
             else if(message.equals("verifit_rs_logout"))
             {
diff --git a/verifit/src/main/res/layout/activity_charts.xml b/verifit/src/main/res/layout/activity_charts.xml
index 9bc5bcf..0bc0c72 100755
--- a/verifit/src/main/res/layout/activity_charts.xml
+++ b/verifit/src/main/res/layout/activity_charts.xml
@@ -9,16 +9,18 @@
     tools:context=".ui.ChartsActivity">
 
     <ScrollView
+        android:id="@+id/scrollView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:visibility="visible">
 
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:animateLayoutChanges="true"
-        android:orientation="vertical"
-        android:scrollbars="vertical" >
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:animateLayoutChanges="true"
+            android:orientation="vertical"
+            android:scrollbars="vertical">
 
 
             <androidx.cardview.widget.CardView
@@ -26,12 +28,12 @@
                 style="@style/CardView.Light"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:layout_marginBottom="15dp"
-                app:cardCornerRadius="5dp"
                 android:layout_marginLeft="15dp"
+                android:layout_marginTop="15dp"
                 android:layout_marginRight="15dp"
+                android:layout_marginBottom="15dp"
                 android:backgroundTint="@color/custom_row"
+                app:cardCornerRadius="5dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
@@ -108,193 +110,186 @@
             </androidx.cardview.widget.CardView>
 
             <androidx.cardview.widget.CardView
-            android:id="@+id/cardview_diary3"
-            style="@style/CardView.Light"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:cardCornerRadius="5dp"
-            android:layout_marginBottom="15dp"
-            android:layout_marginLeft="15dp"
-            android:layout_marginRight="15dp"
-            android:backgroundTint="@color/custom_row">
-
-
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/non_expandable_layout3"
+                android:id="@+id/cardview_diary3"
+                style="@style/CardView.Light"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:layout_marginBottom="15dp"
+                android:backgroundTint="@color/custom_row"
+                app:cardCornerRadius="5dp">
 
 
-                <com.github.mikephil.charting.charts.PieChart
-                    android:id="@+id/pieChartBodyparts"
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/non_expandable_layout3"
                     android:layout_width="match_parent"
-                    android:layout_height="300dp"
-                    android:visibility="visible"
-                    app:layout_constraintTop_toBottomOf="@+id/view3">
-
-                </com.github.mikephil.charting.charts.PieChart>
+                    android:layout_height="wrap_content">
 
 
-                <TextView
-                    android:id="@+id/exercises2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="15dp"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginTop="10dp"
-                    android:text="Bodypart Breakdown"
-                    android:textColor="@color/core_black"
-                    android:textSize="26sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/description3"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="15dp"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginTop="2dp"
-                    android:text="See which bodyparts you focus on the most"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/exercises2" />
-
-                <View
-                    android:id="@+id/view3"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="30dp"
-                    android:background="@color/colorPrimary"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/exercises2" />
+                    <com.github.mikephil.charting.charts.PieChart
+                        android:id="@+id/pieChartBodyparts"
+                        android:layout_width="match_parent"
+                        android:layout_height="300dp"
+                        android:visibility="visible"
+                        app:layout_constraintTop_toBottomOf="@+id/view3">
 
+                    </com.github.mikephil.charting.charts.PieChart>
 
-                <ImageButton
-                    android:id="@+id/more_button3"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:layout_marginTop="25dp"
-                    android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
-                    android:background="@android:color/transparent"
-                    android:clickable="true"
-                    android:tint="@color/colorAccent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_more_vert_24px" />
 
+                    <TextView
+                        android:id="@+id/exercises2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="15dp"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginTop="10dp"
+                        android:text="Bodypart Breakdown"
+                        android:textColor="@color/core_black"
+                        android:textSize="26sp"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                    <TextView
+                        android:id="@+id/description3"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="15dp"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginTop="2dp"
+                        android:text="See which bodyparts you focus on the most"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/exercises2" />
 
+                    <View
+                        android:id="@+id/view3"
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_marginTop="30dp"
+                        android:background="@color/colorPrimary"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/exercises2" />
 
 
+                    <ImageButton
+                        android:id="@+id/more_button3"
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:layout_marginTop="25dp"
+                        android:layout_marginEnd="10dp"
+                        android:layout_marginRight="10dp"
+                        android:background="@android:color/transparent"
+                        android:clickable="true"
+                        android:tint="@color/colorAccent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:srcCompat="@drawable/ic_more_vert_24px" />
 
-        </androidx.cardview.widget.CardView>
 
-            <androidx.cardview.widget.CardView
-            android:id="@+id/cardview_diary4"
-            style="@style/CardView.Light"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:cardCornerRadius="5dp"
-            android:layout_marginBottom="15dp"
-            android:layout_marginLeft="15dp"
-            android:layout_marginRight="15dp"
-            android:backgroundTint="@color/custom_row">
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
 
+            </androidx.cardview.widget.CardView>
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/non_expandable_layout4"
+            <androidx.cardview.widget.CardView
+                android:id="@+id/cardview_diary4"
+                style="@style/CardView.Light"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:layout_marginBottom="15dp"
+                android:backgroundTint="@color/custom_row"
+                app:cardCornerRadius="5dp">
 
 
-                <com.github.mikephil.charting.charts.PieChart
-                    android:id="@+id/pieChartExercises"
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/non_expandable_layout4"
                     android:layout_width="match_parent"
-                    android:layout_height="300dp"
-                    android:visibility="visible"
-                    app:layout_constraintTop_toBottomOf="@+id/view4">
+                    android:layout_height="wrap_content">
 
-                </com.github.mikephil.charting.charts.PieChart>
 
+                    <com.github.mikephil.charting.charts.PieChart
+                        android:id="@+id/pieChartExercises"
+                        android:layout_width="match_parent"
+                        android:layout_height="300dp"
+                        android:visibility="visible"
+                        app:layout_constraintTop_toBottomOf="@+id/view4">
 
-                <TextView
-                    android:id="@+id/exercises3"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="15dp"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginTop="10dp"
-                    android:text="Exercise Breakdown"
-                    android:textColor="@color/core_black"
-                    android:textSize="26sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/description4"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="15dp"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginTop="2dp"
-                    android:text="See which exercises you focus on the most"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/exercises3" />
-
-                <View
-                    android:id="@+id/view4"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="30dp"
-                    android:background="@color/colorPrimary"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/exercises3" />
+                    </com.github.mikephil.charting.charts.PieChart>
 
 
-                <ImageButton
-                    android:id="@+id/more_button4"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:layout_marginTop="25dp"
-                    android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
-                    android:background="@android:color/transparent"
-                    android:clickable="true"
-                    android:tint="@color/colorAccent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_more_vert_24px" />
+                    <TextView
+                        android:id="@+id/exercises3"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="15dp"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginTop="10dp"
+                        android:text="Exercise Breakdown"
+                        android:textColor="@color/core_black"
+                        android:textSize="26sp"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
+                    <TextView
+                        android:id="@+id/description4"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="15dp"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginTop="2dp"
+                        android:text="See which exercises you focus on the most"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/exercises3" />
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                    <View
+                        android:id="@+id/view4"
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_marginTop="30dp"
+                        android:background="@color/colorPrimary"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/exercises3" />
+
+
+                    <ImageButton
+                        android:id="@+id/more_button4"
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:layout_marginTop="25dp"
+                        android:layout_marginEnd="10dp"
+                        android:layout_marginRight="10dp"
+                        android:background="@android:color/transparent"
+                        android:clickable="true"
+                        android:tint="@color/colorAccent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:srcCompat="@drawable/ic_more_vert_24px" />
 
 
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-        </androidx.cardview.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
             <androidx.cardview.widget.CardView
                 android:id="@+id/cardview_diary2"
                 style="@style/CardView.Light"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:cardCornerRadius="5dp"
-                android:layout_marginBottom="15dp"
                 android:layout_marginLeft="15dp"
                 android:layout_marginRight="15dp"
+                android:layout_marginBottom="15dp"
                 android:backgroundTint="@color/custom_row"
+                app:cardCornerRadius="5dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/cardview_viewpager">
 
 
-
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/non_expandable_layout2"
                     android:layout_width="match_parent"
@@ -365,96 +360,92 @@
             </androidx.cardview.widget.CardView>
 
             <androidx.cardview.widget.CardView
-            android:visibility="invisible"
-            android:id="@+id/cardview_padding"
-            style="@style/CardView.Light"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:cardCornerRadius="5dp"
-            android:layout_marginBottom="15dp"
-            android:layout_marginLeft="15dp"
-            android:layout_marginRight="15dp"
-            android:backgroundTint="@color/custom_row"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/cardview_viewpager">
-
-
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/non_expandable_layout5"
+                android:id="@+id/cardview_padding"
+                style="@style/CardView.Light"
                 android:layout_width="match_parent"
-                android:layout_height="40dp">
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:layout_marginBottom="15dp"
+                android:backgroundTint="@color/custom_row"
+                android:visibility="invisible"
+                app:cardCornerRadius="5dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@id/cardview_viewpager">
 
 
-                <com.github.mikephil.charting.charts.BarChart
-                    android:id="@+id/barChart1"
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/non_expandable_layout5"
                     android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:visibility="visible"
-                    app:layout_constraintTop_toBottomOf="@+id/view5">
+                    android:layout_height="40dp">
 
-                </com.github.mikephil.charting.charts.BarChart>
 
+                    <com.github.mikephil.charting.charts.BarChart
+                        android:id="@+id/barChart1"
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:visibility="visible"
+                        app:layout_constraintTop_toBottomOf="@+id/view5">
 
-                <TextView
-                    android:id="@+id/exercises1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="15dp"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginTop="10dp"
-                    android:text="Daily Volume"
-                    android:textColor="@color/core_black"
-                    android:textSize="26sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/description5"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="15dp"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginTop="2dp"
-                    android:text="Total volume performed in each workout"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/exercises1" />
-
-                <View
-                    android:id="@+id/view5"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="30dp"
-                    android:background="@color/colorPrimary"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/exercises1" />
+                    </com.github.mikephil.charting.charts.BarChart>
 
 
-                <ImageButton
-                    android:id="@+id/more_button5"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:layout_marginTop="25dp"
-                    android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
-                    android:background="@android:color/transparent"
-                    android:clickable="true"
-                    android:tint="@color/colorAccent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_more_vert_24px" />
+                    <TextView
+                        android:id="@+id/exercises1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="15dp"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginTop="10dp"
+                        android:text="Daily Volume"
+                        android:textColor="@color/core_black"
+                        android:textSize="26sp"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
+                    <TextView
+                        android:id="@+id/description5"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="15dp"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginTop="2dp"
+                        android:text="Total volume performed in each workout"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/exercises1" />
+
+                    <View
+                        android:id="@+id/view5"
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_marginTop="30dp"
+                        android:background="@color/colorPrimary"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/exercises1" />
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.cardview.widget.CardView>
 
+                    <ImageButton
+                        android:id="@+id/more_button5"
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:layout_marginTop="25dp"
+                        android:layout_marginEnd="10dp"
+                        android:layout_marginRight="10dp"
+                        android:background="@android:color/transparent"
+                        android:clickable="true"
+                        android:tint="@color/colorAccent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:srcCompat="@drawable/ic_more_vert_24px" />
 
 
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </androidx.cardview.widget.CardView>
 
 
-    </LinearLayout>
+        </LinearLayout>
 
 
     </ScrollView>