diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 9e79574..1cb7250 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
+    <targetSelectedWithDropDown>
       <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
+        <type value="QUICK_BOOT_TARGET" />
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
@@ -11,8 +11,8 @@
           </Key>
         </deviceKey>
       </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-11-22T07:34:23.403084Z" />
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2023-11-22T13:36:11.649662Z" />
     <targetsSelectedWithDialog>
       <Target>
         <type value="QUICK_BOOT_TARGET" />
diff --git a/app/src/main/java/com/app/simplitend/appblocking/FUAActivity.java b/app/src/main/java/com/app/simplitend/appblocking/FUAActivity.java
index 1bfa383..e8bf857 100644
--- a/app/src/main/java/com/app/simplitend/appblocking/FUAActivity.java
+++ b/app/src/main/java/com/app/simplitend/appblocking/FUAActivity.java
@@ -77,7 +77,7 @@ public class FUAActivity extends AppCompatActivity {
         all_apps_title = findViewById(R.id.all_app_tile);
         fua_sub_title = findViewById(R.id.fua_sub_title);
 
-        if (AppUtil.shouldShowFUADialog(this)){
+        if (AppUtil.shouldShowFUADialog(this) && isFromDashboard){
             FuaEduDialogBinding dialogBinding = FuaEduDialogBinding.inflate(getLayoutInflater());
             Dialog fuaDialog = new Dialog(this, R.style.BottomSheetDialog);
             fuaDialog.setContentView(dialogBinding.getRoot());
diff --git a/app/src/main/java/com/app/simplitend/apputils/BottomNotificationActivity.java b/app/src/main/java/com/app/simplitend/apputils/BottomNotificationActivity.java
index a7a975c..9803cc2 100644
--- a/app/src/main/java/com/app/simplitend/apputils/BottomNotificationActivity.java
+++ b/app/src/main/java/com/app/simplitend/apputils/BottomNotificationActivity.java
@@ -323,13 +323,13 @@ public class BottomNotificationActivity extends AppCompatActivity {
 
                 String refill_description = null;
 
-                title = "Medicines refill";
+                title = "Refill medication";
 
                 try {
                     ReminderResult reminder = (ReminderResult) intent.getSerializableExtra(REMINDER_EXTRA_KEY);
                     if (reminder != null) {
 
-                        body = reminder.medicine_name + " (" + reminder.dosage + " " + reminder.dosage_unit + ")";
+                        body = reminder.medicine_name;
 
                         if (reminder.medication_instruction == null) reminder.medication_instruction = "None";
                         refill_description = "Quantity to be refilled: " + reminder.medication_quantity;
diff --git a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/WelcomeFragment.java b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/WelcomeFragment.java
index 9a0792b..2070ca1 100644
--- a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/WelcomeFragment.java
+++ b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/WelcomeFragment.java
@@ -1,9 +1,12 @@
 package com.app.simplitend.welcome.welcomepatient.fragments;
 
 import android.os.Bundle;
+import android.util.DisplayMetrics;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -29,7 +32,7 @@ public class WelcomeFragment extends Fragment {
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         binding = WelcomeFragmentBinding.inflate(inflater, container, false);
 
-        initViews(savedInstanceState);
+        setUpDynamicTextSizes();
 
         clickEvents();
 
@@ -43,9 +46,28 @@ public class WelcomeFragment extends Fragment {
                 .popBackStack(R.id.welcomeFragment, false);
     }
 
-    // Initialize views
-    private void initViews(Bundle savedInstanceState) {
-        WelcomeViewModel wv = new ViewModelProvider(requireActivity()).get(WelcomeViewModel.class);
+    private void setUpDynamicTextSizes() {
+        // Calculate screen dimensions in pixels
+        DisplayMetrics displayMetrics = getResources().getDisplayMetrics();
+        int screenWidth = displayMetrics.widthPixels;
+        int screenHeight = displayMetrics.heightPixels;
+
+        // Calculate aspect ratio
+        float aspectRatio = (float) screenHeight / (float) screenWidth;
+
+        if (aspectRatio > 2.1){
+            // screen is taller
+            binding.title.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.welcome_title_tall));
+            binding.subTitle.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.welcome_sub_title_tall));
+        }else if (aspectRatio > 2){
+            // screen is normal size
+            binding.title.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.welcome_title_tall_medium));
+            binding.subTitle.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.welcome_sub_title_tall_medium));
+        }else {
+            // screen is smaller
+            binding.title.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.welcome_title_small));
+            binding.subTitle.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(R.dimen.welcome_sub_title_small));
+        }
     }
 
     // Register click events
diff --git a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/ContactListAdapter.java b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/ContactListAdapter.java
index 2187717..d6284d9 100644
--- a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/ContactListAdapter.java
+++ b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/ContactListAdapter.java
@@ -12,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.app.simplitend.R;
 import com.app.simplitend.databinding.ContactViewHolderBinding;
 import com.app.simplitend.welcome.welcomepatient.fragments.contacts.mvvm.Contact;
-import com.bumptech.glide.Glide;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/res/drawable/splash_screen.xml b/app/src/main/res/drawable/splash_screen.xml
index 0f3c47b..0f0bc37 100644
--- a/app/src/main/res/drawable/splash_screen.xml
+++ b/app/src/main/res/drawable/splash_screen.xml
@@ -5,8 +5,6 @@
         />
 
     <item android:drawable="@drawable/main_icon"
-        android:width="100dp"
-        android:height="100dp"
         android:gravity="center"
         />
 
diff --git a/app/src/main/res/layout/activity_caregiver_profile.xml b/app/src/main/res/layout/activity_caregiver_profile.xml
index bbfcd3a..e9ab9cd 100644
--- a/app/src/main/res/layout/activity_caregiver_profile.xml
+++ b/app/src/main/res/layout/activity_caregiver_profile.xml
@@ -287,6 +287,7 @@
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/change_pin"
+            android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
 
diff --git a/app/src/main/res/layout/contact_view_holder.xml b/app/src/main/res/layout/contact_view_holder.xml
index 3998311..e396168 100644
--- a/app/src/main/res/layout/contact_view_holder.xml
+++ b/app/src/main/res/layout/contact_view_holder.xml
@@ -25,7 +25,8 @@
             tools:text="A"
             android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
             android:fontFamily="@font/nunito_bold"
-            android:layout_margin="15dp"
+            android:layout_marginStart="15dp"
+            android:layout_marginVertical="15dp"
             android:textColor="@color/black"
 
             android:maxLength="1"
@@ -38,6 +39,7 @@
             android:layout_height="@dimen/_30sdp"
             android:src="@drawable/ic_user_filled"
             android:layout_marginVertical="5dp"
+            android:layout_marginStart="15dp"
             android:contentDescription="@string/onboard_image"
             />
 
diff --git a/app/src/main/res/layout/patient_dashboard_fragment.xml b/app/src/main/res/layout/patient_dashboard_fragment.xml
index 8a4819c..b8dd347 100644
--- a/app/src/main/res/layout/patient_dashboard_fragment.xml
+++ b/app/src/main/res/layout/patient_dashboard_fragment.xml
@@ -40,7 +40,7 @@
                     android:layout_height="wrap_content"
 
                     android:fontFamily="@font/nunito_bold"
-                    android:text="12 : 00 PM"
+                    tools:text="12 : 00 PM"
                     android:textColor="@color/white_bg"
                     android:textSize="@dimen/_22ssp" />
 
@@ -80,7 +80,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
 
-                android:text="Sunday"
+                tools:text="Sunday"
                 android:fontFamily="@font/nunito_regular"
                 android:textColor="@color/white_bg"
                 android:textSize="@dimen/_18ssp"
@@ -94,7 +94,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
 
-                android:text="April 4th, 2023"
+                tools:text="April 4th, 2023"
                 android:fontFamily="@font/nunito_regular"
                 android:textSize="@dimen/_18ssp"
                 android:textColor="@color/white_bg"
@@ -476,6 +476,6 @@
 
         android:textColor="@color/white_bg"
         app:backgroundTint="@color/color_primary_dark"
-        app:cornerRadius="25dp" />
+        app:cornerRadius="10dp" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/routine_fragment.xml b/app/src/main/res/layout/routine_fragment.xml
index 63ed7ce..de78005 100644
--- a/app/src/main/res/layout/routine_fragment.xml
+++ b/app/src/main/res/layout/routine_fragment.xml
@@ -34,7 +34,7 @@
             android:layout_below="@id/back_btn"
             android:layout_marginHorizontal="15dp"
             android:fontFamily="@font/nunito_medium"
-            android:text="@string/routine"
+            android:text="@string/activity"
             android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
 
             android:gravity="top"
diff --git a/app/src/main/res/layout/welcome_fragment.xml b/app/src/main/res/layout/welcome_fragment.xml
index 9527b10..cd85ae7 100644
--- a/app/src/main/res/layout/welcome_fragment.xml
+++ b/app/src/main/res/layout/welcome_fragment.xml
@@ -63,6 +63,7 @@
                 android:orientation="vertical">
 
                 <TextView
+                    android:id="@+id/title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
 
@@ -74,6 +75,7 @@
                     />
 
                 <TextView
+                    android:id="@+id/sub_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 461d546..6a8fa68 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -20,4 +20,12 @@
     <dimen name="cg_sub_title_tall_medium">@dimen/_16ssp</dimen>
     <dimen name="cg_sub_title_small">@dimen/_14ssp</dimen>
 
+    <dimen name="welcome_title_tall">@dimen/_23ssp</dimen>
+    <dimen name="welcome_title_tall_medium">@dimen/_21ssp</dimen>
+    <dimen name="welcome_title_small">@dimen/_17ssp</dimen>
+
+    <dimen name="welcome_sub_title_tall">@dimen/_20ssp</dimen>
+    <dimen name="welcome_sub_title_tall_medium">@dimen/_18ssp</dimen>
+    <dimen name="welcome_sub_title_small">@dimen/_14ssp</dimen>
+
 </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 d541d90..3363f6c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -202,7 +202,7 @@
     <string name="enter_allergies">Enter allergies</string>
     <string name="enter_diet_restriction">Enter diet restriction</string>
     <string name="add">Add</string>
-    <string name="routine">Activities</string>
+    <string name="activity">Activity</string>
     <string name="you_don_t_have_any_routines_reminder">You don\'t have any activities reminder.</string>
     <string name="add_routine">Add Activity</string>
     <string name="name_of_the_routine">Name of the Activity</string>