diff --git a/app/build.gradle b/app/build.gradle
index e037263..3fbb5bc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,12 +55,17 @@ dependencies {
     // dynamic text size
     implementation 'com.intuit.ssp:ssp-android:1.1.0'
 
+    // dynamic layout size
+    implementation 'com.intuit.sdp:sdp-android:1.1.0'
+
     // spinners
     implementation "com.github.skydoves:powerspinner:1.2.7"
 
     // cicle image view
     implementation 'de.hdodenhof:circleimageview:3.1.0'
 
+    implementation 'com.github.stfalcon-studio:Chatkit:0.4.1'
+
     implementation 'androidx.appcompat:appcompat:1.6.0'
     implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b4928f0..2636ab4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
 
     <application
         android:allowBackup="true"
@@ -14,12 +14,21 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.SimpliTend"
         tools:targetApi="31">
+        <activity
+            android:name=".careperson_dashboard.DashBoardActivityCP"
+            android:exported="true"
+            android:screenOrientation="portrait">
 
+            <meta-data
+                android:name="android.app.lib_name"
+                android:value="" />
+        </activity>
         <activity
             android:name=".welcome.activities.WelcomeActivity"
             android:configChanges="orientation"
-            android:screenOrientation="portrait"
-            android:exported="true">
+            android:exported="true"
+            android:screenOrientation="portrait">
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/ssb/simplitend/apputils/AppUtil.java b/app/src/main/java/com/ssb/simplitend/apputils/AppUtil.java
index 8b8dec8..c810101 100644
--- a/app/src/main/java/com/ssb/simplitend/apputils/AppUtil.java
+++ b/app/src/main/java/com/ssb/simplitend/apputils/AppUtil.java
@@ -40,7 +40,7 @@ public abstract class AppUtil {
 
         BottomSheetDialog bsd = new BottomSheetDialog(context, R.style.BottomSheetDialog);
         bsd.setContentView(binding.getRoot());
-        bsd.setCancelable(false);
+        bsd.setCancelable(true);
 
         binding.text.setText(decisionText);
 
diff --git a/app/src/main/java/com/ssb/simplitend/apputils/ProfileProgress.java b/app/src/main/java/com/ssb/simplitend/apputils/ProfileProgress.java
index b6ac127..0eb8b99 100644
--- a/app/src/main/java/com/ssb/simplitend/apputils/ProfileProgress.java
+++ b/app/src/main/java/com/ssb/simplitend/apputils/ProfileProgress.java
@@ -9,4 +9,6 @@ public class ProfileProgress {
 
     public static final boolean[] PROFILE_PROGRESS = {false, false, false, false};
 
+    public static boolean MEDICAL_INFO_ADDED = false;
+
 }
diff --git a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/DashBoardActivityCP.java b/app/src/main/java/com/ssb/simplitend/careperson_dashboard/DashBoardActivityCP.java
new file mode 100644
index 0000000..a5c507e
--- /dev/null
+++ b/app/src/main/java/com/ssb/simplitend/careperson_dashboard/DashBoardActivityCP.java
@@ -0,0 +1,16 @@
+package com.ssb.simplitend.careperson_dashboard;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+
+import com.ssb.simplitend.R;
+
+public class DashBoardActivityCP extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_dash_board_cp);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/ChatListAdapter.java b/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/ChatListAdapter.java
new file mode 100644
index 0000000..cc08d37
--- /dev/null
+++ b/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/ChatListAdapter.java
@@ -0,0 +1,64 @@
+package com.ssb.simplitend.careperson_dashboard.chats;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.ListAdapter;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.ssb.simplitend.careperson_dashboard.chats.mvvm.ChatItem;
+import com.ssb.simplitend.databinding.ChatCardViewholderBinding;
+
+public class ChatListAdapter extends ListAdapter<ChatItem, ChatListAdapter.ChatCardViewHolder> {
+
+    private static final DiffUtil.ItemCallback<ChatItem> DIFF_UTIL = new DiffUtil.ItemCallback<ChatItem>() {
+        @Override
+        public boolean areItemsTheSame(@NonNull ChatItem oldItem, @NonNull ChatItem newItem) {
+            // TODO: 11-07-2023
+            return false;
+        }
+
+        @Override
+        public boolean areContentsTheSame(@NonNull ChatItem oldItem, @NonNull ChatItem newItem) {
+            // TODO: 11-07-2023
+            return false;
+        }
+    };
+
+    public ChatListAdapter(){
+        super(DIFF_UTIL);
+    }
+
+    @NonNull
+    @Override
+    public ChatCardViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        ChatCardViewholderBinding binding = ChatCardViewholderBinding.inflate(LayoutInflater.from(parent.getContext()));
+        return new ChatCardViewHolder(binding);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ChatCardViewHolder holder, int position) {
+        holder.setData(getItem(position), position);
+    }
+
+    public static class ChatCardViewHolder extends RecyclerView.ViewHolder{
+
+        ChatCardViewholderBinding binding;
+
+        public ChatCardViewHolder(ChatCardViewholderBinding binding){
+            super(binding.getRoot());
+            this.binding = binding;
+        }
+
+        public void setData(ChatItem chatItem, int position){
+            binding.type.setText(chatItem.type);
+            binding.time.setText(chatItem.time);
+            binding.name.setText(chatItem.name);
+            binding.lastMsg.setText(chatItem.last_message);
+        }
+
+    }
+
+}
diff --git a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/ChatListFragment.java b/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/ChatListFragment.java
new file mode 100644
index 0000000..aa50dd0
--- /dev/null
+++ b/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/ChatListFragment.java
@@ -0,0 +1,62 @@
+package com.ssb.simplitend.careperson_dashboard.chats;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.navigation.Navigation;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.ssb.simplitend.R;
+import com.ssb.simplitend.apputils.AppUtil;
+import com.ssb.simplitend.careperson_dashboard.chats.mvvm.ChatListViewModel;
+import com.ssb.simplitend.databinding.ChatListFragmentBinding;
+
+public class ChatListFragment extends Fragment {
+
+    // view binding
+    protected ChatListFragmentBinding binding;
+
+    // view model
+    private ChatListViewModel viewModel;
+
+    public ChatListFragment(){
+        // required empty const.
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        binding = ChatListFragmentBinding.inflate(inflater, container, false);
+
+        initViews();
+
+        clickEvents();
+
+        return binding.getRoot();
+    }
+
+    private void initViews() {
+
+        viewModel = new ViewModelProvider(this).get(ChatListViewModel.class);
+
+        binding.chatsRv.setLayoutManager(new LinearLayoutManager(requireActivity()));
+        binding.chatsRv.setAdapter(viewModel.getChatListAdapter());
+
+        viewModel.getChatListAdapter().submitList(viewModel.getChatItemList());
+    }
+
+    private void clickEvents() {
+
+        binding.backBtn.setOnClickListener(v -> {
+            AppUtil.closeKeyboard(requireActivity());
+            Navigation.findNavController(v).popBackStack(R.id.CPDashboardFragment, false, true);
+        });
+
+    }
+}
diff --git a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/ChatItem.java b/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/ChatItem.java
new file mode 100644
index 0000000..4e17b74
--- /dev/null
+++ b/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/ChatItem.java
@@ -0,0 +1,16 @@
+package com.ssb.simplitend.careperson_dashboard.chats.mvvm;
+
+public class ChatItem {
+
+    public String type, name, time, last_message;
+
+    public ChatItem() {
+    }
+
+    public ChatItem(String type, String name, String time, String last_message) {
+        this.type = type;
+        this.name = name;
+        this.time = time;
+        this.last_message = last_message;
+    }
+}
diff --git a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/ChatListViewModel.java b/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/ChatListViewModel.java
new file mode 100644
index 0000000..d77ef92
--- /dev/null
+++ b/app/src/main/java/com/ssb/simplitend/careperson_dashboard/chats/mvvm/ChatListViewModel.java
@@ -0,0 +1,31 @@
+package com.ssb.simplitend.careperson_dashboard.chats.mvvm;
+
+import androidx.lifecycle.ViewModel;
+
+import com.ssb.simplitend.careperson_dashboard.chats.ChatListAdapter;
+
+import java.util.ArrayList;
+
+public class ChatListViewModel extends ViewModel {
+
+    private final ArrayList<ChatItem> chatItemList;
+    private final ChatListAdapter chatListAdapter;
+
+    public ChatListViewModel(){
+        this.chatListAdapter = new ChatListAdapter();
+
+        // static data
+        this.chatItemList = new ArrayList<>();
+
+        this.chatItemList.add(new ChatItem("Caregiver", "Akanksha surve", "09:00 am", "I hope you are doing alright"));
+        this.chatItemList.add(new ChatItem("Doctor", "Chaitali tatkare", "11:00 am", "How was your weekend?"));
+    }
+
+    public ChatListAdapter getChatListAdapter() {
+        return chatListAdapter;
+    }
+
+    public ArrayList<ChatItem> getChatItemList() {
+        return chatItemList;
+    }
+}
diff --git a/app/src/main/java/com/ssb/simplitend/careperson_dashboard/fragments/CPDashboardFragment.java b/app/src/main/java/com/ssb/simplitend/careperson_dashboard/fragments/CPDashboardFragment.java
new file mode 100644
index 0000000..532e4e8
--- /dev/null
+++ b/app/src/main/java/com/ssb/simplitend/careperson_dashboard/fragments/CPDashboardFragment.java
@@ -0,0 +1,40 @@
+package com.ssb.simplitend.careperson_dashboard.fragments;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.navigation.Navigation;
+
+import com.ssb.simplitend.R;
+import com.ssb.simplitend.databinding.CaregiverDashboardFragmentBinding;
+
+public class CPDashboardFragment extends Fragment {
+
+    // view binding
+    protected CaregiverDashboardFragmentBinding binding;
+
+    public CPDashboardFragment() {
+        // required
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        binding = CaregiverDashboardFragmentBinding.inflate(inflater, container, false);
+
+        clickEvents();
+
+        return binding.getRoot();
+    }
+
+    private void clickEvents() {
+        binding.chats.setOnClickListener(v ->
+                Navigation.findNavController(v).navigate(R.id.action_CPDashboardFragment_to_chatListFragment)
+        );
+    }
+}
diff --git a/app/src/main/java/com/ssb/simplitend/medicalinfo/AddMedicalInfoFragment.java b/app/src/main/java/com/ssb/simplitend/medicalinfo/AddMedicalInfoFragment.java
index ccb6920..10f261e 100644
--- a/app/src/main/java/com/ssb/simplitend/medicalinfo/AddMedicalInfoFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/medicalinfo/AddMedicalInfoFragment.java
@@ -8,7 +8,12 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import androidx.navigation.Navigation;
 
+import com.ssb.simplitend.R;
+import com.ssb.simplitend.apputils.AppUtil;
+import com.ssb.simplitend.apputils.ProfileProgress;
+import com.ssb.simplitend.medicalinfo.mvvm.MedicalInfo;
 import com.ssb.simplitend.databinding.AddMedicalInfoBinding;
 
 public class AddMedicalInfoFragment extends Fragment {
@@ -16,6 +21,9 @@ public class AddMedicalInfoFragment extends Fragment {
     // view binding
     protected AddMedicalInfoBinding binding;
 
+    private MedicalInfo medicalInfo;
+    public static final String MEDICAL_INFO_KEY = "medical_info";
+
     public AddMedicalInfoFragment(){
         // required empty const.
     }
@@ -25,6 +33,65 @@ public class AddMedicalInfoFragment extends Fragment {
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         binding = AddMedicalInfoBinding.inflate(inflater, container, false);
 
+        initViews();
+
+        clickEvents();
+
         return binding.getRoot();
     }
+
+    private void initViews() {
+        Bundle bundle = getArguments();
+
+        if (bundle != null){
+            medicalInfo = (MedicalInfo) bundle.getSerializable(MEDICAL_INFO_KEY);
+            if (medicalInfo != null){
+                binding.title.setText(getString(R.string.edit_medical_information));
+                setLayoutInfo();
+            }
+        }
+    }
+
+    private void setLayoutInfo() {
+        if (medicalInfo == null) return;
+
+        binding.diagnosis.setText(medicalInfo.diagnosis);
+        binding.primaryDoc.setText(medicalInfo.primary_doc);
+        binding.docContact.setText(medicalInfo.doc_contact);
+        binding.hospitalPref.setText(medicalInfo.hospital_pref);
+        binding.allergies.setText(medicalInfo.allergies);
+        binding.dietRestrict.setText(medicalInfo.diet_restriction);
+
+        binding.addBtn.setText(getString(R.string.save));
+    }
+
+    private void clickEvents() {
+
+        binding.backBtn.setOnClickListener(v -> Navigation.findNavController(v).popBackStack());
+
+        binding.addBtn.setOnClickListener(v -> {
+            ProfileProgress.MEDICAL_INFO_ADDED = true;
+
+            if (medicalInfo != null){
+                // save changes animation
+
+                AppUtil.showSOSDecision(requireContext(),
+                        getString(R.string.make_changes), getString(R.string.yes), getString(R.string.no),
+                        v2 -> {
+                            // yes click
+                            AppUtil.showAnimateDBS(requireContext(), getString(R.string.changes_successful),
+                                    R.raw.done_anim_primary, 3000,
+                                    v4 -> {
+                                        Navigation.findNavController(v).popBackStack();
+                                    });
+
+                        }, v3 -> {
+                            // no click
+                        });
+
+            }else{
+                Navigation.findNavController(v).popBackStack();
+            }
+        });
+    }
 }
diff --git a/app/src/main/java/com/ssb/simplitend/medicalinfo/MedicalInfoFragment.java b/app/src/main/java/com/ssb/simplitend/medicalinfo/MedicalInfoFragment.java
index acdc259..9703e7d 100644
--- a/app/src/main/java/com/ssb/simplitend/medicalinfo/MedicalInfoFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/medicalinfo/MedicalInfoFragment.java
@@ -1,5 +1,7 @@
 package com.ssb.simplitend.medicalinfo;
 
+import static com.ssb.simplitend.medicalinfo.AddMedicalInfoFragment.MEDICAL_INFO_KEY;
+
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,6 +13,8 @@ import androidx.fragment.app.Fragment;
 import androidx.navigation.Navigation;
 
 import com.ssb.simplitend.R;
+import com.ssb.simplitend.apputils.ProfileProgress;
+import com.ssb.simplitend.medicalinfo.mvvm.MedicalInfo;
 import com.ssb.simplitend.databinding.MedicalIntoFragmentBinding;
 
 public class MedicalInfoFragment extends Fragment {
@@ -27,18 +31,48 @@ public class MedicalInfoFragment extends Fragment {
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         binding = MedicalIntoFragmentBinding.inflate(inflater, container, false);
 
+        initViews();
+
         clickEvents();
 
         return binding.getRoot();
     }
 
+    private void initViews() {
+
+        if (ProfileProgress.MEDICAL_INFO_ADDED){
+            binding.medicalInfo.setVisibility(View.VISIBLE);
+            binding.noData.setVisibility(View.GONE);
+            binding.addMedInfo.setVisibility(View.GONE);
+        }else{
+            binding.noData.setVisibility(View.VISIBLE);
+            binding.medicalInfo.setVisibility(View.GONE);
+            binding.addMedInfo.setVisibility(View.VISIBLE);
+        }
+
+    }
+
     private void clickEvents() {
 
-        binding.addMedInfo.setOnClickListener(v ->
-        {
+        binding.backBtn.setOnClickListener(v -> Navigation.findNavController(v).popBackStack());
+
+        binding.addMedInfo.setOnClickListener(v -> {
             Navigation.findNavController(v).navigate(R.id.action_medicalInfoFragment_to_addMedicalInfoFragment);
         }
         );
 
+        binding.editBtn.setOnClickListener(v -> {
+
+            Bundle bundle = new Bundle();
+            MedicalInfo medicalInfo = new MedicalInfo("Cognitive impairment and memeory loss.",
+                    "Dr. Sandeep Kanojia", "+63456398456", "Baycrest Health Sciences",
+                    "Latex allergy", "Lorum ipsum dummy is simple dummy");
+            bundle.putSerializable(MEDICAL_INFO_KEY, medicalInfo);
+
+            Navigation.findNavController(v).navigate(R.id.action_medicalInfoFragment_to_addMedicalInfoFragment, bundle);
+        });
+
+        binding.done.setOnClickListener(v -> Navigation.findNavController(v).popBackStack());
+
     }
 }
diff --git a/app/src/main/java/com/ssb/simplitend/medicalinfo/mvvm/MedicalInfo.java b/app/src/main/java/com/ssb/simplitend/medicalinfo/mvvm/MedicalInfo.java
new file mode 100644
index 0000000..938dc36
--- /dev/null
+++ b/app/src/main/java/com/ssb/simplitend/medicalinfo/mvvm/MedicalInfo.java
@@ -0,0 +1,20 @@
+package com.ssb.simplitend.medicalinfo.mvvm;
+
+import java.io.Serializable;
+
+public class MedicalInfo implements Serializable {
+
+    public String diagnosis, primary_doc, doc_contact, hospital_pref
+            , allergies, diet_restriction;
+
+    public MedicalInfo() {}
+
+    public MedicalInfo(String diagnosis, String primary_doc, String doc_contact, String hospital_pref, String allergies, String diet_restriction) {
+        this.diagnosis = diagnosis;
+        this.primary_doc = primary_doc;
+        this.doc_contact = doc_contact;
+        this.hospital_pref = hospital_pref;
+        this.allergies = allergies;
+        this.diet_restriction = diet_restriction;
+    }
+}
diff --git a/app/src/main/java/com/ssb/simplitend/medreminder/AddReminderFragment.java b/app/src/main/java/com/ssb/simplitend/medreminder/AddReminderFragment.java
index 1d393e0..fbce9cb 100644
--- a/app/src/main/java/com/ssb/simplitend/medreminder/AddReminderFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/medreminder/AddReminderFragment.java
@@ -63,6 +63,8 @@ public class AddReminderFragment extends Fragment implements CompoundButton.OnCh
 
     private void clickEvents() {
 
+        binding.backBtn.setOnClickListener(v -> Navigation.findNavController(v).popBackStack());
+
         binding.getTime.setOnClickListener(v -> {
             AppUtil.closeKeyboard(requireActivity());
             getTime();
@@ -131,6 +133,8 @@ public class AddReminderFragment extends Fragment implements CompoundButton.OnCh
             binding.medicName.setText(reminder.dosage_name);
             binding.quantity.setText(reminder.quantity);
             binding.getTime.setText(reminder.time);
+
+            binding.addReminder.setText(getString(R.string.save_reminder));
         }
     }
 
diff --git a/app/src/main/java/com/ssb/simplitend/setuproutine/AddRoutineFragment.java b/app/src/main/java/com/ssb/simplitend/setuproutine/AddRoutineFragment.java
new file mode 100644
index 0000000..0b99cd6
--- /dev/null
+++ b/app/src/main/java/com/ssb/simplitend/setuproutine/AddRoutineFragment.java
@@ -0,0 +1,268 @@
+package com.ssb.simplitend.setuproutine;
+
+import android.annotation.SuppressLint;
+import android.app.TimePickerDialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.fragment.app.Fragment;
+import androidx.navigation.Navigation;
+
+import com.ssb.simplitend.R;
+import com.ssb.simplitend.apputils.AppUtil;
+import com.ssb.simplitend.databinding.AddRoutineFragmentBinding;
+import com.ssb.simplitend.setuproutine.mvvm.Routine;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Locale;
+
+public class AddRoutineFragment extends Fragment implements CompoundButton.OnCheckedChangeListener{
+
+    // view binding
+    protected AddRoutineFragmentBinding binding;
+
+    private boolean[] week_state;
+
+    public static final String ROUTINE_KEY = "routine_key";
+    private Routine routine;
+
+    public AddRoutineFragment() {
+        // required empty const.
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        binding = AddRoutineFragmentBinding.inflate(inflater, container, false);
+
+        initViews();
+
+        clickEvents();
+
+        return binding.getRoot();
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    private void initViews() {
+
+        Bundle bundle = getArguments();
+
+        if (bundle != null){
+            routine = (Routine) bundle.getSerializable(ROUTINE_KEY);
+            setLayoutDetails();
+        }
+
+        // scrolling instruction edit text
+        binding.routineDescription.setOnTouchListener((v, event) -> {
+            if (binding.routineDescription.hasFocus()) {
+                v.getParent().requestDisallowInterceptTouchEvent(true);
+                if ((event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_SCROLL) {
+                    v.getParent().requestDisallowInterceptTouchEvent(false);
+                    return true;
+                }
+            }
+            return false;
+        });
+
+        binding.everydayCheck.setOnCheckedChangeListener(this);
+
+    }
+
+    private void setLayoutDetails() {
+        if (routine == null) return;
+
+        binding.title.setText(getString(R.string.edit_routine));
+        binding.addRoutine.setText(getString(R.string.save));
+
+        binding.routineName.setText(routine.routine_name);
+        binding.routineDescription.setText(routine.routine_description);
+
+        binding.startTime.setText(routine.start_time_str);
+        binding.endTime.setText(routine.end_time_str);
+
+    }
+
+    private void clickEvents() {
+        binding.backBtn.setOnClickListener(v -> Navigation.findNavController(v).popBackStack());
+
+        binding.startTime.setOnClickListener(v -> getTime(binding.startTime));
+        binding.endTime.setOnClickListener(v -> getTime(binding.endTime));
+
+        binding.addRoutine.setOnClickListener(v -> {
+            if (routine == null){
+                Navigation.findNavController(v).popBackStack(R.id.routineFragment, false, true);
+            }else{
+                AppUtil.showSOSDecision(requireContext(), getString(R.string.make_changes),
+                        getString(R.string.yes), getString(R.string.no),
+                        v1 -> {
+                            // yes click
+                            AppUtil.showAnimateDBS(requireContext(),
+                                    getString(R.string.changes_successful), R.raw.done_anim_primary,
+                                    3000, v3 -> {
+                                        // here v3 is null
+                                        Navigation.findNavController(v).popBackStack(R.id.routineFragment, false, true);
+                                    });
+                        }, v2 -> {
+                            // no click
+                        });
+            }
+        });
+
+        setUpWeekSelection();
+
+    }
+
+    // set selection and un-selection of week day
+    private void setUpWeekSelection() {
+
+        week_state = new boolean[7];
+
+        // week day selections
+        binding.sun.setOnClickListener(v -> setSelectionState(0, week_state[0] = !week_state[0]));
+        binding.mon.setOnClickListener(v -> setSelectionState(1, week_state[1] = !week_state[1]));
+        binding.tue.setOnClickListener(v -> setSelectionState(2, week_state[2] = !week_state[2]));
+        binding.wed.setOnClickListener(v -> setSelectionState(3, week_state[3] = !week_state[3]));
+        binding.thu.setOnClickListener(v -> setSelectionState(4, week_state[4] = !week_state[4]));
+        binding.fri.setOnClickListener(v -> setSelectionState(5, week_state[5] = !week_state[5]));
+        binding.sat.setOnClickListener(v -> setSelectionState(6, week_state[6] = !week_state[6]));
+
+    }
+
+    // shows time picker and sets the time picked into @textview
+    // shows time picker to pick time and set to textview
+    private void getTime(TextView textView) {
+
+        Calendar calendar = Calendar.getInstance(Locale.getDefault());
+
+        TimePickerDialog tpd = new TimePickerDialog(requireContext(),
+                (view, hourOfDay, minute) -> {
+
+                    Calendar cal = Calendar.getInstance();
+                    cal.set(Calendar.HOUR_OF_DAY, hourOfDay);
+                    cal.set(Calendar.MINUTE, minute);
+
+                    SimpleDateFormat sdf = new SimpleDateFormat("hh:mm a", Locale.getDefault());
+
+                    String selected_time = sdf.format(cal.getTime());
+                    textView.setText(selected_time);
+
+                }, calendar.getTime().getHours(), calendar.getTime().getMinutes(), false);
+
+        tpd.show();
+
+    }
+
+    private void setSelectionState(int position, boolean selection) {
+        if (selection) {
+            // selection has to be made
+            switch (position) {
+                case 0:
+                    // sun
+                    binding.sun.setBackgroundTintList(AppCompatResources.getColorStateList(requireContext(), R.color.color_primary));
+                    binding.sun.setTextColor(AppCompatResources.getColorStateList(requireContext(), R.color.white_bg));
+                    break;
+                case 1:
+                    // mon
+                    binding.mon.setBackgroundTintList(AppCompatResources.getColorStateList(requireContext(), R.color.color_primary));
+                    binding.mon.setTextColor(AppCompatResources.getColorStateList(requireContext(), R.color.white_bg));
+                    break;
+                case 2:
+                    // tue
+                    binding.tue.setBackgroundTintList(AppCompatResources.getColorStateList(requireContext(), R.color.color_primary));
+                    binding.tue.setTextColor(AppCompatResources.getColorStateList(requireContext(), R.color.white_bg));
+                    break;
+                case 3:
+                    // wed
+                    binding.wed.setBackgroundTintList(AppCompatResources.getColorStateList(requireContext(), R.color.color_primary));
+                    binding.wed.setTextColor(AppCompatResources.getColorStateList(requireContext(), R.color.white_bg));
+                    break;
+                case 4:
+                    // thu
+                    binding.thu.setBackgroundTintList(AppCompatResources.getColorStateList(requireContext(), R.color.color_primary));
+                    binding.thu.setTextColor(AppCompatResources.getColorStateList(requireContext(), R.color.white_bg));
+                    break;
+                case 5:
+                    // fri
+                    binding.fri.setBackgroundTintList(AppCompatResources.getColorStateList(requireContext(), R.color.color_primary));
+                    binding.fri.setTextColor(AppCompatResources.getColorStateList(requireContext(), R.color.white_bg));
+                    break;
+                case 6:
+                    // sat
+                    binding.sat.setBackgroundTintList(AppCompatResources.getColorStateList(requireContext(), R.color.color_primary));
+                    binding.sat.setTextColor(AppCompatResources.getColorStateList(requireContext(), R.color.white_bg));
+                    break;
+            }
+        } else {
+            // un-selection has to be made
+            switch (position) {
+                case 0:
+                    // sun
+                    binding.sun.setBackgroundTintList(null);
+                    binding.sun.setTextColor(AppCompatResources.getColorStateList(requireContext(), R.color.black));
+                    break;
+                case 1:
+                    // mon
+                    binding.mon.setBackgroundTintList(null);
+                    binding.mon.setTextColor(AppCompatResources.getColorStateList(requireContext(), R.color.black));
+                    break;
+                case 2:
+                    // tue
+                    binding.tue.setBackgroundTintList(null);
+                    binding.tue.setTextColor(AppCompatResources.getColorStateList(requireContext(), R.color.black));
+                    break;
+                case 3:
+                    // wed
+                    binding.wed.setBackgroundTintList(null);
+                    binding.wed.setTextColor(AppCompatResources.getColorStateList(requireContext(), R.color.black));
+                    break;
+                case 4:
+                    // thu
+                    binding.thu.setBackgroundTintList(null);
+                    binding.thu.setTextColor(AppCompatResources.getColorStateList(requireContext(), R.color.black));
+                    break;
+                case 5:
+                    // fri
+                    binding.fri.setBackgroundTintList(null);
+                    binding.fri.setTextColor(AppCompatResources.getColorStateList(requireContext(), R.color.black));
+                    break;
+                case 6:
+                    // sat
+                    binding.sat.setBackgroundTintList(null);
+                    binding.sat.setTextColor(AppCompatResources.getColorStateList(requireContext(), R.color.black));
+                    break;
+            }
+        }
+
+        // checking if all days are selected or not
+        // thus, updating the Everyday switch accordingly
+        boolean isEveryDay = true;
+
+        for (int i = 0; i < 7; i++) {
+            if (!week_state[i]) {
+                // some day is not selected thus not everyday selection
+                isEveryDay = false;
+                break;
+            }
+        }
+
+        binding.everydayCheck.setOnCheckedChangeListener(null);
+        binding.everydayCheck.setChecked(isEveryDay);
+        binding.everydayCheck.setOnCheckedChangeListener(this);
+    }
+
+    @Override
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        for (int i = 0; i < 7; i++) {
+            setSelectionState(i, week_state[i] = isChecked);
+        }
+    }
+}
diff --git a/app/src/main/java/com/ssb/simplitend/setuproutine/RoutineFragment.java b/app/src/main/java/com/ssb/simplitend/setuproutine/RoutineFragment.java
new file mode 100644
index 0000000..ce64847
--- /dev/null
+++ b/app/src/main/java/com/ssb/simplitend/setuproutine/RoutineFragment.java
@@ -0,0 +1,225 @@
+package com.ssb.simplitend.setuproutine;
+
+import static com.ssb.simplitend.setuproutine.AddRoutineFragment.ROUTINE_KEY;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.navigation.Navigation;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.ssb.simplitend.R;
+import com.ssb.simplitend.apputils.AppUtil;
+import com.ssb.simplitend.databinding.RoutineFragmentBinding;
+import com.ssb.simplitend.setuproutine.mvvm.Routine;
+import com.ssb.simplitend.setuproutine.mvvm.RoutineAdapter;
+import com.ssb.simplitend.setuproutine.mvvm.RoutineViewModel;
+
+public class RoutineFragment extends Fragment implements RoutineAdapter.ClickListener, RoutineAdapter.DeleteClickListener {
+
+    // view binding
+    protected RoutineFragmentBinding binding;
+
+    // selection state for week days
+    /*
+        true -> date selected
+        false -> date unselected
+     */
+    private boolean[] selection_state;
+
+    private RoutineViewModel viewModel;
+
+    public RoutineFragment(){
+        // required empty const.
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        binding = RoutineFragmentBinding.inflate(inflater, container, false);
+
+        initViews();
+
+        clickEvents();
+
+        return binding.getRoot();
+    }
+
+    private void clickEvents() {
+        binding.backBtn.setOnClickListener(v -> Navigation.findNavController(v).popBackStack());
+
+        binding.addRoutine.setOnClickListener(v -> {
+            Navigation.findNavController(v).navigate(R.id.action_routineFragment_to_addRoutineFragment);
+        });
+
+        // date selections
+        binding.sun.setOnClickListener(v -> {
+            setSelectionState(0, selection_state[0] = !selection_state[0]);
+            loadRoutineList();
+        });
+        binding.mon.setOnClickListener(v -> {
+            setSelectionState(1, selection_state[1] = !selection_state[1]);
+            loadRoutineList();
+        });
+        binding.tue.setOnClickListener(v -> {
+            setSelectionState(2, selection_state[2] = !selection_state[2]);
+            loadRoutineList();
+        });
+        binding.wed.setOnClickListener(v -> {
+            setSelectionState(3, selection_state[3] = !selection_state[3]);
+            loadRoutineList();
+        });
+        binding.thu.setOnClickListener(v -> {
+            setSelectionState(4, selection_state[4] = !selection_state[4]);
+            loadRoutineList();
+        });
+        binding.fri.setOnClickListener(v -> {
+            setSelectionState(5, selection_state[5] = !selection_state[5]);
+            loadRoutineList();
+        });
+        binding.sat.setOnClickListener(v -> {
+            setSelectionState(6, selection_state[6] = !selection_state[6]);
+            loadRoutineList();
+        });
+
+    }
+
+    private void initViews() {
+        selection_state = new boolean[7];
+
+        viewModel = new ViewModelProvider(this).get(RoutineViewModel.class);
+    }
+
+    private void loadRoutineList() {
+        binding.noData.setVisibility(View.GONE);
+        binding.routineRv.setVisibility(View.VISIBLE);
+        binding.routineRv.setLayoutManager(new LinearLayoutManager(requireContext()));
+        binding.routineRv.setAdapter(viewModel.getRoutineAdapter());
+
+        viewModel.getRoutineAdapter().setDeleteClickListener(this);
+        viewModel.getRoutineAdapter().setClickListener(this);
+
+        viewModel.getRoutineAdapter().submitList(viewModel.getRoutines());
+    }
+
+    private void setSelectionState(int position, boolean selection){
+        if (selection){
+            switch (position){
+                case 0:
+                    // sun
+                    binding.sun.setBackgroundResource(R.drawable.seleted_item_primary);
+                    binding.sunT1.setTextColor(getResources().getColor(R.color.white_bg));
+                    binding.sunT2.setTextColor(getResources().getColor(R.color.white_bg));
+                    break;
+                case 1:
+                    // mon
+                    binding.mon.setBackgroundResource(R.drawable.seleted_item_primary);
+                    binding.monT1.setTextColor(getResources().getColor(R.color.white_bg));
+                    binding.monT2.setTextColor(getResources().getColor(R.color.white_bg));
+                    break;
+                case 2:
+                    // tue
+                    binding.tue.setBackgroundResource(R.drawable.seleted_item_primary);
+                    binding.tue1.setTextColor(getResources().getColor(R.color.white_bg));
+                    binding.tue2.setTextColor(getResources().getColor(R.color.white_bg));
+                    break;
+                case 3:
+                    // wed
+                    binding.wed.setBackgroundResource(R.drawable.seleted_item_primary);
+                    binding.wed1.setTextColor(getResources().getColor(R.color.white_bg));
+                    binding.wed2.setTextColor(getResources().getColor(R.color.white_bg));
+                    break;
+                case 4:
+                    // thu
+                    binding.thu.setBackgroundResource(R.drawable.seleted_item_primary);
+                    binding.thu1.setTextColor(getResources().getColor(R.color.white_bg));
+                    binding.thu2.setTextColor(getResources().getColor(R.color.white_bg));
+                    break;
+                case 5:
+                    // fri
+                    binding.fri.setBackgroundResource(R.drawable.seleted_item_primary);
+                    binding.fri1.setTextColor(getResources().getColor(R.color.white_bg));
+                    binding.fri2.setTextColor(getResources().getColor(R.color.white_bg));
+                    break;
+                case 6:
+                    // sat
+                    binding.sat.setBackgroundResource(R.drawable.seleted_item_primary);
+                    binding.sat1.setTextColor(getResources().getColor(R.color.white_bg));
+                    binding.sat2.setTextColor(getResources().getColor(R.color.white_bg));
+                    break;
+            }
+        }else{
+            switch (position){
+                case 0:
+                    // sun
+                    binding.sun.setBackgroundColor(getResources().getColor(R.color.white_bg));
+                    binding.sunT1.setTextColor(getResources().getColor(R.color.black));
+                    binding.sunT2.setTextColor(getResources().getColor(R.color.black));
+                    break;
+                case 1:
+                    // mon
+                    binding.mon.setBackgroundColor(getResources().getColor(R.color.white_bg));
+                    binding.monT1.setTextColor(getResources().getColor(R.color.black));
+                    binding.monT2.setTextColor(getResources().getColor(R.color.black));
+                    break;
+                case 2:
+                    // tue
+                    binding.tue.setBackgroundColor(getResources().getColor(R.color.white_bg));
+                    binding.tue1.setTextColor(getResources().getColor(R.color.black));
+                    binding.tue2.setTextColor(getResources().getColor(R.color.black));
+                    break;
+                case 3:
+                    // wed
+                    binding.wed.setBackgroundColor(getResources().getColor(R.color.white_bg));
+                    binding.wed1.setTextColor(getResources().getColor(R.color.black));
+                    binding.wed2.setTextColor(getResources().getColor(R.color.black));
+                    break;
+                case 4:
+                    // thu
+                    binding.thu.setBackgroundColor(getResources().getColor(R.color.white_bg));
+                    binding.thu1.setTextColor(getResources().getColor(R.color.black));
+                    binding.thu2.setTextColor(getResources().getColor(R.color.black));
+                    break;
+                case 5:
+                    // fri
+                    binding.fri.setBackgroundColor(getResources().getColor(R.color.white_bg));
+                    binding.fri1.setTextColor(getResources().getColor(R.color.black));
+                    binding.fri2.setTextColor(getResources().getColor(R.color.black));
+                    break;
+                case 6:
+                    // sat
+                    binding.sat.setBackgroundColor(getResources().getColor(R.color.white_bg));
+                    binding.sat1.setTextColor(getResources().getColor(R.color.black));
+                    binding.sat2.setTextColor(getResources().getColor(R.color.black));
+                    break;
+            }
+        }
+    }
+
+    @Override
+    public void onDelete(Routine routine, int position) {
+
+        AppUtil.showSOSDecision(requireContext(), getString(R.string.delete_med_routine),
+                getString(R.string.yes), getString(R.string.no),
+                v1-> {
+                    // yes click
+                }, v2 -> {
+                    // no click
+                });
+
+    }
+
+    @Override
+    public void onClick(Routine routine, int position) {
+        Bundle bundle = new Bundle();
+        bundle.putSerializable(ROUTINE_KEY, routine);
+
+        Navigation.findNavController(binding.getRoot()).navigate(R.id.action_routineFragment_to_addRoutineFragment, bundle);
+    }
+}
diff --git a/app/src/main/java/com/ssb/simplitend/setuproutine/mvvm/Routine.java b/app/src/main/java/com/ssb/simplitend/setuproutine/mvvm/Routine.java
new file mode 100644
index 0000000..434c9bd
--- /dev/null
+++ b/app/src/main/java/com/ssb/simplitend/setuproutine/mvvm/Routine.java
@@ -0,0 +1,17 @@
+package com.ssb.simplitend.setuproutine.mvvm;
+
+import java.io.Serializable;
+
+public class Routine implements Serializable {
+
+    public String routine_name, routine_description, start_time_str, end_time_str;
+
+    public Routine() {}
+
+    public Routine(String routine_name, String routine_description, String start_time_str, String end_time_str) {
+        this.routine_name = routine_name;
+        this.routine_description = routine_description;
+        this.start_time_str = start_time_str;
+        this.end_time_str = end_time_str;
+    }
+}
diff --git a/app/src/main/java/com/ssb/simplitend/setuproutine/mvvm/RoutineAdapter.java b/app/src/main/java/com/ssb/simplitend/setuproutine/mvvm/RoutineAdapter.java
new file mode 100644
index 0000000..7172714
--- /dev/null
+++ b/app/src/main/java/com/ssb/simplitend/setuproutine/mvvm/RoutineAdapter.java
@@ -0,0 +1,105 @@
+package com.ssb.simplitend.setuproutine.mvvm;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.ListAdapter;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.ssb.simplitend.databinding.RoutineViewholderBinding;
+
+public class RoutineAdapter extends ListAdapter<Routine, RoutineAdapter.RoutineViewHolder> {
+
+    private static final DiffUtil.ItemCallback<Routine> DIFF_UTIL = new DiffUtil.ItemCallback<Routine>() {
+        @Override
+        public boolean areItemsTheSame(@NonNull Routine oldItem, @NonNull Routine newItem) {
+            // TODO: 10-07-2023
+            return false;
+        }
+
+        @Override
+        public boolean areContentsTheSame(@NonNull Routine oldItem, @NonNull Routine newItem) {
+            // TODO: 10-07-2023
+            return false;
+        }
+    };
+
+    private DeleteClickListener deleteClickListener;
+    private ClickListener clickListener;
+
+    public RoutineAdapter(){
+        super(DIFF_UTIL);
+    }
+
+    public void setDeleteClickListener(DeleteClickListener deleteClickListener) {
+        this.deleteClickListener = deleteClickListener;
+    }
+
+    public void setClickListener(ClickListener clickListener) {
+        this.clickListener = clickListener;
+    }
+
+    @NonNull
+    @Override
+    public RoutineViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        RoutineViewholderBinding binding = RoutineViewholderBinding.inflate(LayoutInflater.from(parent.getContext()));
+        return new RoutineViewHolder(binding);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RoutineViewHolder holder, int position) {
+        holder.setData(getItem(position), position);
+
+        holder.binding.delete.setOnClickListener(v -> {
+            if (deleteClickListener != null) deleteClickListener.onDelete(getItem(position), position);
+        });
+
+        holder.binding.card.setOnClickListener(v -> {
+            if (clickListener != null) clickListener.onClick(getItem(position), position);
+        });
+
+    }
+
+    public static class RoutineViewHolder extends RecyclerView.ViewHolder{
+
+        RoutineViewholderBinding binding;
+
+        public RoutineViewHolder(RoutineViewholderBinding binding){
+            super(binding.getRoot());
+            this.binding = binding;
+        }
+
+        public void setData(Routine routine, int position){
+
+            binding.routineName.setText(routine.routine_name);
+            binding.description.setText(routine.routine_description);
+
+            String time_slot = routine.start_time_str + " - " + routine.end_time_str;
+            binding.timeSlot.setText(time_slot);
+
+            // static
+            String start_slot = routine.start_time_str.substring(0, 2) + " " + routine.start_time_str.substring(routine.start_time_str.length()-2);
+            binding.startTimeStatic.setText(start_slot);
+
+            String end_slot = routine.end_time_str.substring(0, 2) + " " + routine.end_time_str.substring(routine.end_time_str.length()-2);
+            binding.endTimeStatic.setText(end_slot);
+
+        }
+
+    }
+
+    // interfaces
+
+    @FunctionalInterface
+    public interface DeleteClickListener{
+        void onDelete(Routine routine, int position);
+    }
+
+    @FunctionalInterface
+    public interface ClickListener{
+        void onClick(Routine routine, int position);
+    }
+
+}
diff --git a/app/src/main/java/com/ssb/simplitend/setuproutine/mvvm/RoutineViewModel.java b/app/src/main/java/com/ssb/simplitend/setuproutine/mvvm/RoutineViewModel.java
new file mode 100644
index 0000000..2ee98f2
--- /dev/null
+++ b/app/src/main/java/com/ssb/simplitend/setuproutine/mvvm/RoutineViewModel.java
@@ -0,0 +1,28 @@
+package com.ssb.simplitend.setuproutine.mvvm;
+
+import androidx.lifecycle.ViewModel;
+
+import java.util.ArrayList;
+
+public class RoutineViewModel extends ViewModel {
+
+    private final ArrayList<Routine> routines;
+    private final RoutineAdapter routineAdapter;
+
+    public RoutineViewModel(){
+        this.routineAdapter = new RoutineAdapter();
+
+        // init static data in routine list
+        this.routines = new ArrayList<>();
+        routines.add(new Routine("Doctor appointment", "Meet your heart specialist Abraham at 4:00 pm", "07 : 00 AM", "09 : 00 AM"));
+        routines.add(new Routine("Take medicines", "Lorem Ipsum is simply dummy.", "11 : 00 AM", "12 : 00 PM"));
+    }
+
+    public RoutineAdapter getRoutineAdapter() {
+        return routineAdapter;
+    }
+
+    public ArrayList<Routine> getRoutines() {
+        return routines;
+    }
+}
diff --git a/app/src/main/java/com/ssb/simplitend/userprofile/ProfileProgressFragment.java b/app/src/main/java/com/ssb/simplitend/userprofile/ProfileProgressFragment.java
index 31c8df6..df43e4e 100644
--- a/app/src/main/java/com/ssb/simplitend/userprofile/ProfileProgressFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/userprofile/ProfileProgressFragment.java
@@ -1,5 +1,6 @@
 package com.ssb.simplitend.userprofile;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,6 +12,7 @@ import androidx.fragment.app.Fragment;
 import androidx.navigation.Navigation;
 
 import com.ssb.simplitend.R;
+import com.ssb.simplitend.careperson_dashboard.DashBoardActivityCP;
 import com.ssb.simplitend.databinding.ProfileProgressFragmentBinding;
 
 public class ProfileProgressFragment extends Fragment {
@@ -47,5 +49,16 @@ public class ProfileProgressFragment extends Fragment {
                 Navigation.findNavController(v).navigate(R.id.action_profileProgressFragment_to_medicalInfoFragment)
         );
 
+        binding.setUpRoutine.setOnClickListener(v ->
+                Navigation.findNavController(v).navigate(R.id.action_profileProgressFragment_to_routineFragment)
+        );
+
+        binding.skipToDashboard.setOnClickListener(v -> {
+            Intent intent = new Intent(requireActivity(), DashBoardActivityCP.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+            startActivity(intent);
+            requireActivity().finish();
+        });
+
     }
 }
diff --git a/app/src/main/res/drawable-hdpi/img_apps.png b/app/src/main/res/drawable-hdpi/img_apps.png
new file mode 100644
index 0000000..6af6572
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_apps.png differ
diff --git a/app/src/main/res/drawable-hdpi/img_chats.png b/app/src/main/res/drawable-hdpi/img_chats.png
new file mode 100644
index 0000000..751fc31
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_chats.png differ
diff --git a/app/src/main/res/drawable-hdpi/img_directions.png b/app/src/main/res/drawable-hdpi/img_directions.png
new file mode 100644
index 0000000..41b922c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_directions.png differ
diff --git a/app/src/main/res/drawable-ldpi/img_apps.png b/app/src/main/res/drawable-ldpi/img_apps.png
new file mode 100644
index 0000000..243b2a3
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_apps.png differ
diff --git a/app/src/main/res/drawable-ldpi/img_chats.png b/app/src/main/res/drawable-ldpi/img_chats.png
new file mode 100644
index 0000000..3eb128e
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_chats.png differ
diff --git a/app/src/main/res/drawable-ldpi/img_directions.png b/app/src/main/res/drawable-ldpi/img_directions.png
new file mode 100644
index 0000000..e901de2
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_directions.png differ
diff --git a/app/src/main/res/drawable-mdpi/img_apps.png b/app/src/main/res/drawable-mdpi/img_apps.png
new file mode 100644
index 0000000..142caa5
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_apps.png differ
diff --git a/app/src/main/res/drawable-mdpi/img_chats.png b/app/src/main/res/drawable-mdpi/img_chats.png
new file mode 100644
index 0000000..03bb988
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_chats.png differ
diff --git a/app/src/main/res/drawable-mdpi/img_directions.png b/app/src/main/res/drawable-mdpi/img_directions.png
new file mode 100644
index 0000000..f895c89
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_directions.png differ
diff --git a/app/src/main/res/drawable-tvdpi/img_apps.png b/app/src/main/res/drawable-tvdpi/img_apps.png
new file mode 100644
index 0000000..5fffc77
Binary files /dev/null and b/app/src/main/res/drawable-tvdpi/img_apps.png differ
diff --git a/app/src/main/res/drawable-tvdpi/img_chats.png b/app/src/main/res/drawable-tvdpi/img_chats.png
new file mode 100644
index 0000000..74b3171
Binary files /dev/null and b/app/src/main/res/drawable-tvdpi/img_chats.png differ
diff --git a/app/src/main/res/drawable-tvdpi/img_directions.png b/app/src/main/res/drawable-tvdpi/img_directions.png
new file mode 100644
index 0000000..751462b
Binary files /dev/null and b/app/src/main/res/drawable-tvdpi/img_directions.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_apps.png b/app/src/main/res/drawable-xhdpi/img_apps.png
new file mode 100644
index 0000000..fd53690
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_apps.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_chats.png b/app/src/main/res/drawable-xhdpi/img_chats.png
new file mode 100644
index 0000000..b3f537e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_chats.png differ
diff --git a/app/src/main/res/drawable-xhdpi/img_directions.png b/app/src/main/res/drawable-xhdpi/img_directions.png
new file mode 100644
index 0000000..9bff6e9
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_directions.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_apps.png b/app/src/main/res/drawable-xxhdpi/img_apps.png
new file mode 100644
index 0000000..a6a121b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_apps.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_chats.png b/app/src/main/res/drawable-xxhdpi/img_chats.png
new file mode 100644
index 0000000..fa8bc15
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_chats.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/img_directions.png b/app/src/main/res/drawable-xxhdpi/img_directions.png
new file mode 100644
index 0000000..bc483ed
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_directions.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_apps.png b/app/src/main/res/drawable-xxxhdpi/img_apps.png
new file mode 100644
index 0000000..d978c3e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_apps.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_chats.png b/app/src/main/res/drawable-xxxhdpi/img_chats.png
new file mode 100644
index 0000000..69c50b3
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_chats.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/img_directions.png b/app/src/main/res/drawable-xxxhdpi/img_directions.png
new file mode 100644
index 0000000..0412e4f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_directions.png differ
diff --git a/app/src/main/res/drawable/ic_allergies_outline.xml b/app/src/main/res/drawable/ic_allergies_outline.xml
new file mode 100644
index 0000000..fb982e1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_allergies_outline.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M19.878,9.547a0.908,0.908 0,0 0,-1.459 -0.148h-2.388a6,6 0,0 0,-0.509 -1.88l2.08,-1.211a0.887,0.887 0,0 0,1.06 -0.406,0.908 0.908,0 1,0 -1.671,-0.639l-2.077,1.211a6.1,6.1 0,0 0,-1.374 -1.375l1.211,-2.077h0a0.924,0.924 0,1 0,-1.063 -0.608l-1.211,2.074h0a6,6 0,0 0,-1.865 -0.509L10.612,1.585a0.908,0.908 0,1 0,-1.211 0v2.389a6,6 0,0 0,-1.88 0.509L6.313,2.409a0.924,0.924 0,1 0,-1.048 0.606l1.211,2.077h0a6.1,6.1 0,0 0,-1.374 1.375l-2.077,-1.211h0a0.921,0.921 0,1 0,-0.605 1.063l2.074,1.211h0a6,6 0,0 0,-0.509 1.865h-2.388a0.919,0.919 0,1 0,0 1.211h2.388a6,6 0,0 0,0.509 1.88L2.413,13.697a0.918,0.918 0,1 0,0.605 1.048l2.077,-1.211h0a6.1,6.1 0,0 0,1.374 1.375l-1.211,2.077h0a0.921,0.921 0,1 0,1.063 0.606l1.211,-2.074h0a6,6 0,0 0,1.865 0.509v2.389a0.908,0.908 0,1 0,1.211 0v-2.389a6,6 0,0 0,1.88 -0.509l1.211,2.074a0.924,0.924 0,1 0,1.048 -0.606l-1.211,-2.077h0a6.1,6.1 0,0 0,1.374 -1.375l2.077,1.211h0a0.921,0.921 0,1 0,0.605 -1.063l-2.074,-1.211h0a6,6 0,0 0,0.509 -1.865h2.394a0.905,0.905 0,0 0,1.453 -1.063ZM10.006,14.847a4.845,4.845 0,1 1,3.425 -1.419A4.842,4.842 0,0 1,10.006 14.847Z"
+      android:fillColor="#5b5b5b"/>
+  <path
+      android:pathData="M13.69,8.95a1.129,1.129 0,1 1,-1.129 -1.129,1.129 1.129,0 0,1 1.129,1.129"
+      android:fillColor="#5b5b5b"/>
+  <path
+      android:pathData="M10.384,8.95a1.129,1.129 0,1 1,-1.129 -1.129,1.129 1.129,0 0,1 1.129,1.129"
+      android:fillColor="#5b5b5b"/>
+  <path
+      android:pathData="M8.581,11.351a1.129,1.129 0,1 1,-1.129 -1.129,1.129 1.129,0 0,1 1.129,1.129"
+      android:fillColor="#5b5b5b"/>
+  <path
+      android:pathData="M11.875,13.009a0.968,0.968 0,1 1,-0.968 -0.968,0.968 0.968,0 0,1 0.968,0.968"
+      android:fillColor="#5b5b5b"/>
+  <path
+      android:pathData="M13.98,11.204a0.968,0.968 0,1 1,-0.968 -0.968,0.968 0.968,0 0,1 0.968,0.968"
+      android:fillColor="#5b5b5b"/>
+  <path
+      android:pathData="M11.875,6.691a0.968,0.968 0,1 1,-0.968 -0.968,0.968 0.968,0 0,1 0.968,0.968"
+      android:fillColor="#5b5b5b"/>
+  <path
+      android:pathData="M7.666,9.097a0.968,0.968 0,1 1,-0.968 -0.968,0.968 0.968,0 0,1 0.968,0.968"
+      android:fillColor="#5b5b5b"/>
+  <path
+      android:pathData="M11.576,10.904a0.968,0.968 0,1 1,-0.968 -0.968,0.968 0.968,0 0,1 0.968,0.968"
+      android:fillColor="#5b5b5b"/>
+  <path
+      android:pathData="M9.77,13.309a0.968,0.968 0,1 1,-0.968 -0.968,0.968 0.968,0 0,1 0.968,0.968"
+      android:fillColor="#5b5b5b"/>
+  <path
+      android:pathData="M9.172,6.992a0.968,0.968 0,1 1,-0.968 -0.968,0.968 0.968,0 0,1 0.968,0.968"
+      android:fillColor="#5b5b5b"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_allergy.xml b/app/src/main/res/drawable/ic_allergy.xml
new file mode 100644
index 0000000..d91e57d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_allergy.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/ic_user_outline_bg"/>
+
+    <item android:drawable="@drawable/ic_allergies_outline"
+        android:gravity="center"
+        />
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
new file mode 100644
index 0000000..fbe509b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="19dp"
+    android:height="19dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+  <path
+      android:pathData="M18.5,9.5a9,9 0,1 1,-9 -9A9,9 0,0 1,18.5 9.5Z"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#323232"/>
+  <path
+      android:pathData="M6.192,9.512l1.855,1.855h0a0.5,0.5 0,0 0,0.7 0h0L12.807,7.307"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#323232"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_close_outline.xml b/app/src/main/res/drawable/ic_close_outline.xml
new file mode 100644
index 0000000..a0077f7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_close_outline.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="30dp"
+    android:tint="@color/color_accent"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/color_accent"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_close_primary.xml b/app/src/main/res/drawable/ic_close_primary.xml
new file mode 100644
index 0000000..79fb17a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_close_primary.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/primary_bg"/>
+
+    <item android:drawable="@drawable/ic_close_outline"
+        android:gravity="center"
+        />
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_color_accent_bar.xml b/app/src/main/res/drawable/ic_color_accent_bar.xml
new file mode 100644
index 0000000..f4bc798
--- /dev/null
+++ b/app/src/main/res/drawable/ic_color_accent_bar.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="163dp"
+    android:viewportWidth="30"
+    android:viewportHeight="163">
+  <path
+      android:pathData="M19,6h2a0,0 0,0 1,0 0L21,151a0,0 0,0 1,0 0L19,151A10,10 0,0 1,9 141L9,16A10,10 0,0 1,19 6Z"
+      android:fillColor="#aee0ff"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_dashboard_cp.xml b/app/src/main/res/drawable/ic_dashboard_cp.xml
new file mode 100644
index 0000000..4209579
--- /dev/null
+++ b/app/src/main/res/drawable/ic_dashboard_cp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/color_primary"
+        />
+
+    <corners android:bottomLeftRadius="40dp"
+        android:bottomRightRadius="40dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_description.xml b/app/src/main/res/drawable/ic_description.xml
new file mode 100644
index 0000000..520f5a6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_description.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/ic_user_outline_bg"/>
+
+    <item android:drawable="@drawable/ic_description_outline"
+        android:gravity="center"
+        />
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_description_outline.xml b/app/src/main/res/drawable/ic_description_outline.xml
new file mode 100644
index 0000000..061782a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_description_outline.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="20dp"
+    android:viewportWidth="18"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M12.168,0L0,0L0,20L18,20L18,5.724ZM16.641,6.276v0.057L11.547,6.333v-5h0.058ZM1.358,18.667L1.358,1.333h8.83v6.333h6.453v11Z"
+      android:fillColor="#5b5b5b"/>
+  <path
+      android:pathData="M4,12.358h9.462v1h-9.462z"
+      android:fillColor="#5b5b5b"/>
+  <path
+      android:pathData="M4,15.21h9.462v1h-9.462z"
+      android:fillColor="#5b5b5b"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_diagnosis.xml b/app/src/main/res/drawable/ic_diagnosis.xml
new file mode 100644
index 0000000..01a898c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_diagnosis.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/ic_user_outline_bg"/>
+
+    <item android:drawable="@drawable/ic_diagnosis_outline"
+        android:gravity="center"
+        />
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_diagnosis_outline.xml b/app/src/main/res/drawable/ic_diagnosis_outline.xml
new file mode 100644
index 0000000..19d0436
--- /dev/null
+++ b/app/src/main/res/drawable/ic_diagnosis_outline.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="20dp"
+    android:viewportWidth="22"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M20.432,-0a1.589,1.589 0,0 1,1.111 0.451,1.522 1.522,0 0,1 0.46,1.088v12.692a1.522,1.522 0,0 1,-0.46 1.088,1.588 1.588,0 0,1 -1.111,0.451h-8.839v3.077h9.821a0.577,0.577 0,1 1,0 1.154L0.589,20.001a0.577,0.577 0,1 1,0 -1.154h9.821L10.41,15.77h-8.839a1.588,1.588 0,0 1,-1.111 -0.451,1.522 1.522,0 0,1 -0.46,-1.088L0,1.539a1.522,1.522 0,0 1,0.46 -1.088,1.589 1.589,0 0,1 1.111,-0.451ZM4.532,6.462 L3.676,8.147h0a0.6,0.6 0,0 1,-0.526 0.316h-1.964v5.769a0.381,0.381 0,0 0,0.115 0.272,0.4 0.4,0 0,0 0.278,0.113L20.432,14.617a0.4,0.4 0,0 0,0.278 -0.113,0.381 0.381,0 0,0 0.115,-0.272v-5.769L9.432,8.463a0.579,0.579 0,0 1,-0.409 -0.162l-0.9,-0.877 -1.273,3.731h0a0.593,0.593 0,0 1,-1.124 0ZM20.432,1.154L1.571,1.154a0.389,0.389 0,0 0,-0.393 0.385v5.769h1.571l1.406,-2.761a0.594,0.594 0,0 1,1.092 0.108l1.076,4.231 0.974,-2.731a0.584,0.584 0,0 1,0.418 -0.375,0.6 0.6,0 0,1 0.548,0.144l1.4,1.369L20.822,7.293v-5.754a0.381,0.381 0,0 0,-0.115 -0.272,0.4 0.4,0 0,0 -0.278,-0.113Z"
+      android:fillColor="#5b5b5b"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_diet_rest.xml b/app/src/main/res/drawable/ic_diet_rest.xml
new file mode 100644
index 0000000..720e3b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_diet_rest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/ic_user_outline_bg"/>
+
+    <item android:drawable="@drawable/ic_diet_rest_outline"
+        android:gravity="center"
+        />
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_diet_rest_outline.xml b/app/src/main/res/drawable/ic_diet_rest_outline.xml
new file mode 100644
index 0000000..ca087f0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_diet_rest_outline.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M15.128,-0a1.1,1.1 0,0 1,1.111 1.083v9.481a2.783,2.783 0,0 1,2.654 0.644,4.317 4.317,0 0,1 0.713,4.738 10.319,10.319 0,0 1,-1.4 2.394,4.773 4.773,0 0,1 -3.688,1.659h-0.035A4.876,4.876 0,0 1,11.068 18.683c-0.012,0 -0.023,0.006 -0.035,0.006h-9.926a1.1,1.1 0,0 1,-1.111 -1.083L-0.004,4.789l0.006,-0.029a0.584,0.584 0,0 1,0.023 -0.108,0.1 0.1,0 0,1 0.012,-0.04 0.437,0.437 0,0 1,0.082 -0.12l4.484,-4.367a0.5,0.5 0,0 1,0.123 -0.08,0.273 0.273,0 0,1 0.041,-0.017 0.347,0.347 0,0 1,0.105 -0.023l0.029,-0.006ZM11.977,11.288a1.835,1.835 0,0 0,-1.292 0.5,3.536 3.536,0 0,0 -0.538,3.831 8.844,8.844 0,0 0,1.286 2.212,3.974 3.974,0 0,0 3.069,1.334h0.029a3.915,3.915 0,0 0,3.034 -1.351,9.171 9.171,0 0,0 1.28,-2.206 3.524,3.524 0,0 0,-0.52 -3.808,2.185 2.185,0 0,0 -2.572,-0.194c-0.123,0.057 -0.234,0.114 -0.339,0.165a2.13,2.13 0,0 1,-0.912 0.314h-0.012a2.221,2.221 0,0 1,-0.9 -0.314c-0.105,-0.051 -0.216,-0.108 -0.339,-0.165a3.067,3.067 0,0 0,-1.274 -0.319ZM15.134,0.823h-9.8v3.29a1.1,1.1 0,0 1,-1.111 1.083L0.848,5.196L0.848,17.6a0.286,0.286 0,0 0,0.269 0.268h9.3a11.028,11.028 0,0 1,-1.04 -1.921,4.359 4.359,0 0,1 0.731,-4.743 2.966,2.966 0,0 1,3.507 -0.336c0.129,0.057 0.251,0.12 0.362,0.177a0.15,0.15 0,0 0,0.041 0.023,2.016 2.016,0 0,0 -1.023,-1.465 0.406,0.406 0,0 1,-0.175 -0.553,0.422 0.422,0 0,1 0.567,-0.171 2.87,2.87 0,0 1,1.491 2.241c0.053,-0.029 0.1,-0.051 0.146,-0.074 0.111,-0.057 0.234,-0.12 0.362,-0.177 0.006,-0.006 0.012,-0.006 0.018,-0.011L15.404,1.084a0.265,0.265 0,0 0,-0.269 -0.262ZM7.903,12.066a0.411,0.411 0,1 1,0 0.821h-4.711a0.411,0.411 0,1 1,0 -0.821ZM7.938,10.213a0.411,0.411 0,1 1,0 0.821h-4.711a0.411,0.411 0,1 1,0 -0.821ZM7.979,8.36a0.411,0.411 0,1 1,0 0.821h-4.717a0.411,0.411 0,1 1,0 -0.821ZM12.731,6.507a0.411,0.411 0,1 1,0 0.821h-9.411a0.411,0.411 0,1 1,0 -0.821ZM12.725,4.654a0.411,0.411 0,1 1,0 0.821L6.868,5.475a0.411,0.411 0,1 1,0 -0.821ZM4.489,1.404 L1.444,4.374h2.777a0.265,0.265 0,0 0,0.269 -0.262Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_doc_contact.xml b/app/src/main/res/drawable/ic_doc_contact.xml
new file mode 100644
index 0000000..7fe78d4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_doc_contact.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/ic_user_outline_bg"/>
+
+    <item android:drawable="@drawable/ic_doc_contact_outline"
+        android:gravity="center"
+        />
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_doc_contact_outline.xml b/app/src/main/res/drawable/ic_doc_contact_outline.xml
new file mode 100644
index 0000000..bf01dfc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_doc_contact_outline.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20.301dp"
+    android:height="20.433dp"
+    android:viewportWidth="20.301"
+    android:viewportHeight="20.433">
+  <path
+      android:pathData="M13.938,1.984a3.312,3.312 0,0 1,1.644 6.165,4.269 4.269,0 0,1 3.053,1.529 5.793,5.793 0,0 0,-0.671 -7.317,5.654 5.654,0 0,0 -8.052,0 5.8,5.8 0,0 0,-0.671 7.318,4.264 4.264,0 0,1 3.053,-1.531 3.325,3.325 0,0 1,-0.67 -5.2,3.25 3.25,0 0,1 2.315,-0.969ZM18.314,10.107a3.741,3.741 0,0 0,-2.941 -1.439h-2.869a3.739,3.739 0,0 0,-2.941 1.44A5.774,5.774 0,0 0,10.822 11.243a0.261,0.261 0,0 1,0.131 0.258L10.822,12.768l0.92,-0.9a0.255,0.255 0,0 1,0.254 -0.035,5.666 5.666,0 0,0 6.322,-1.728ZM15.886,3.324a2.736,2.736 0,0 0,-3.895 0,2.8 2.8,0 0,0 0,3.932 2.733,2.733 0,0 0,3.895 0A2.8,2.8 0,0 0,15.886 3.324ZM11.961,12.377 L10.67,13.64a0.26,0.26 0,0 1,-0.447 -0.208l0.2,-1.831a6.316,6.316 0,0 1,-0.877 -9.613,6.171 6.171,0 0,1 8.787,0 6.321,6.321 0,0 1,0 8.875,6.173 6.173,0 0,1 -6.372,1.513ZM13.048,17.654 L13.342,17.192a0.176,0.176 0,0 0,-0.051 -0.238l-3.52,-2.285a0.171,0.171 0,0 0,-0.235 0.052l-0.293,0.461a0.176,0.176 0,0 0,0.05 0.238l3.52,2.285a0.172,0.172 0,0 0,0.235 -0.051ZM13.778,17.476 L13.485,17.937a0.687,0.687 0,0 1,-0.758 0.3c-1.822,2.632 -4.85,2.259 -7.325,0.657a11.365,11.365 0,0 1,-2.5 -2.231,11.975 11.975,0 0,1 -2.608,-4.513 4.108,4.108 0,0 1,1.81 -4.589,0.7 0.7,0 0,1 0.266,-0.848l0.458,-0.3a0.683,0.683 0,0 1,0.951 0.209l2.254,3.541a0.7,0.7 0,0 1,-0.212 0.985l-0.443,0.288a0.681,0.681 0,0 1,-0.508 0.1,1.363 1.363,0 0,0 -0.514,1.225 4.118,4.118 0,0 0,1.287 1.972,4.439 4.439,0 0,0 1.907,1.383c0.419,0.084 0.793,-0.111 1.185,-0.611a0.7,0.7 0,0 1,0.071 -0.6l0.293,-0.462a0.687,0.687 0,0 1,0.952 -0.209l3.52,2.287a0.7,0.7 0,0 1,0.208 0.962ZM12.271,17.976 L9.078,15.903a1.611,1.611 0,0 1,-1.632 0.724,4.846 4.846,0 0,1 -2.174,-1.531 4.557,4.557 0,0 1,-1.429 -2.258,1.8 1.8,0 0,1 0.587,-1.6l0,-0.007L2.374,8.009a3.619,3.619 0,0 0,-1.578 4.019,11.517 11.517,0 0,0 2.5,4.3 8.786,8.786 0,0 0,5.507 3.292,3.69 3.69,0 0,0 3.469,-1.636ZM3.106,6.853 L2.648,7.153a0.175,0.175 0,0 0,-0.05 0.238l2.263,3.556a0.171,0.171 0,0 0,0.235 0.051l0.456,-0.3a0.175,0.175 0,0 0,0.051 -0.238L3.342,6.909a0.172,0.172 0,0 0,-0.235 -0.052Z"
+      android:strokeWidth="0.3"
+      android:fillColor="#5b5b5b"
+      android:strokeColor="#5b5b5b"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_home_nav_up.xml b/app/src/main/res/drawable/ic_home_nav_up.xml
new file mode 100644
index 0000000..7d31b3f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_nav_up.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="25dp"
+    android:viewportWidth="28"
+    android:viewportHeight="25">
+  <path
+      android:pathData="M26.832,12.683a1.1,1.1 0,0 1,-0.712 -0.266L14.71,2.808a1.092,1.092 0,0 0,-1.425 0L1.88,12.417a1.1,1.1 0,0 1,-1.636 -0.23,1.345 1.345,0 0,1 0.211,-1.783L11.861,0.795a3.273,3.273 0,0 1,4.277 0l11.409,9.609a1.352,1.352 0,0 1,0.211 1.783A1.14,1.14 0,0 1,26.832 12.683Z"
+      android:fillColor="#131313"/>
+  <path
+      android:pathData="M22,25h-16a3.438,3.438 0,0 1,-3.455 -3.414v-8.474a1.146,1.146 0,0 1,2.292 0v8.474a1.158,1.158 0,0 0,1.162 1.149h16a1.158,1.158 0,0 0,1.162 -1.149v-8.474a1.146,1.146 0,0 1,2.292 0v8.474A3.442,3.442 0,0 1,22 25Z"
+      android:fillColor="#131313"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_hosp.xml b/app/src/main/res/drawable/ic_hosp.xml
new file mode 100644
index 0000000..4a82d0a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_hosp.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/ic_user_outline_bg"/>
+
+    <item android:drawable="@drawable/ic_hosp_outline"
+        android:gravity="center"
+        />
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_hosp_outline.xml b/app/src/main/res/drawable/ic_hosp_outline.xml
new file mode 100644
index 0000000..6c31fba
--- /dev/null
+++ b/app/src/main/res/drawable/ic_hosp_outline.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="23.094dp"
+    android:height="17.282dp"
+    android:viewportWidth="23.094"
+    android:viewportHeight="17.282">
+  <path
+      android:pathData="M22.518,5.311h-6.736L15.782,0.577a0.592,0.592 0,0 0,-0.577 -0.577h-7.313a0.592,0.592 0,0 0,-0.577 0.577v4.773h-6.736a0.592,0.592 0,0 0,-0.577 0.577v10.777a0.592,0.592 0,0 0,0.577 0.577h21.939a0.592,0.592 0,0 0,0.577 -0.577L23.095,5.928a0.6,0.6 0,0 0,-0.577 -0.616ZM7.318,16.089h-6.158L1.16,14.738h4.157a0.577,0.577 0,1 0,0 -1.154h-4.157v-1.732h4.157a0.577,0.577 0,1 0,0 -1.154h-4.157v-1.732h4.157a0.577,0.577 0,1 0,0 -1.154h-4.157v-1.347h6.159ZM12.318,15.934h-1.539v-5h1.539ZM14.628,5.888v10.2h-1.155v-5.735a0.592,0.592 0,0 0,-0.577 -0.577L10.204,9.776a0.592,0.592 0,0 0,-0.577 0.577v5.735h-1.155L8.472,1.154h6.159ZM21.941,7.813L17.784,7.813a0.577,0.577 0,1 0,0 1.154h4.157v1.732L17.784,10.699a0.577,0.577 0,1 0,0 1.154h4.157v1.732L17.784,13.585a0.577,0.577 0,1 0,0 1.154h4.157v1.347h-6.158v-9.623h6.159ZM9.547,4.038a0.592,0.592 0,0 1,0.577 -0.577h0.847v-0.847a0.577,0.577 0,1 1,1.154 0v0.847h0.847a0.577,0.577 0,0 1,0 1.154h-0.847v0.847a0.577,0.577 0,1 1,-1.154 0v-0.847h-0.847A0.592,0.592 0,0 1,9.547 4.038Z"
+      android:fillColor="#5b5b5b"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml
new file mode 100644
index 0000000..0cb66a2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notification.xml
@@ -0,0 +1,44 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="34.016dp"
+    android:height="37dp"
+    android:viewportWidth="34.016"
+    android:viewportHeight="37">
+  <path
+      android:pathData="M14.242,4.112a9.9,9.9 0,0 0,-9.866 9.921L4.376,18.812A7.935,7.935 0,0 1,3.442 22.218L1.552,25.376a3.179,3.179 0,0 0,1.776 4.845,34.221 34.221,0 0,0 21.82,0 3.317,3.317 0,0 0,1.776 -4.845l-1.891,-3.158a8.154,8.154 0,0 1,-0.921 -3.406L24.112,14.033A9.923,9.923 0,0 0,14.242 4.112Z"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#fff"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M17.443,4.112a7.987,7.987 0,0 0,-1.68 -0.494,8.527 8.527,0 0,0 -4.8,0.494c0.508,-1.828 1.768,-3.112 3.238,-3.112S16.935,2.284 17.443,4.112Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#fff"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M19.952,31.913c0,2.248 -2.363,4.087 -5.25,4.087a6.1,6.1 0,0 1,-3.71 -1.2A3.712,3.712 0,0 1,9.453 31.913"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#fff"/>
+  <path
+      android:pathData="M33.016,26.452A7.2,7.2 0,1 1,25.807 19.252,7.2 7.2,0 0,1 33.016,26.452Z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M33.016,26.452A7.2,7.2 0,1 1,25.807 19.252,7.322 7.322,0 0,1 30.907,21.362 7.047,7.047 0,0 1,33.016 26.452Z"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ea3829"/>
+  <path
+      android:pathData="M25.811,23.216v4.1"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ea3829"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M25.811,29.66v-0.009"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ea3829"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_plus_sign.xml b/app/src/main/res/drawable/ic_plus_sign.xml
index 89633bb..a9503fd 100644
--- a/app/src/main/res/drawable/ic_plus_sign.xml
+++ b/app/src/main/res/drawable/ic_plus_sign.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#000000"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_routine.xml b/app/src/main/res/drawable/ic_routine.xml
new file mode 100644
index 0000000..cb26641
--- /dev/null
+++ b/app/src/main/res/drawable/ic_routine.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/ic_user_outline_bg"/>
+
+    <item android:drawable="@drawable/ic_routine_outline"
+        android:gravity="center"
+        />
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_routine_img.xml b/app/src/main/res/drawable/ic_routine_img.xml
new file mode 100644
index 0000000..fab8b15
--- /dev/null
+++ b/app/src/main/res/drawable/ic_routine_img.xml
@@ -0,0 +1,397 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="152dp"
+    android:height="148.43dp"
+    android:viewportWidth="152"
+    android:viewportHeight="148.43">
+  <path
+      android:pathData="M16.53,113.02c-17.85,-20.89 -11.59,-51.85 -0.97,-61.23s27.48,-14.54 36.51,-25.5S71.51,7.48 90.52,13.13s18.73,20.35 24.44,29.44 31.14,14.17 29.69,37.5 -17.59,23.29 -24.95,29.04 -18.97,32.89 -42.21,33.17C49,142.63 31.63,130.69 16.53,113.02Z"
+      android:fillColor="#ebf3fc"/>
+  <path
+      android:pathData="M80.84,0.5l-1.01,3.5a11.5,11.5 0,0 0,-2.61 1.06L74,3.29l-2.88,2.85 1.79,3.18a11.05,11.05 0,0 0,-1.08 2.58L68.29,12.89v4.03l3.55,0.99a11.19,11.19 0,0 0,1.08 2.58l-1.79,3.18 2.88,2.85 3.23,-1.77a11.56,11.56 0,0 0,2.61 1.06l1.01,3.5h4.09l1.01,-3.5a11.5,11.5 0,0 0,2.61 -1.06l3.23,1.77 2.88,-2.85 -1.79,-3.18a11.05,11.05 0,0 0,1.08 -2.58l3.55,-0.99L97.49,12.89l-3.55,-0.99a11.19,11.19 0,0 0,-1.08 -2.58l1.79,-3.18L91.77,3.29l-3.23,1.77a11.56,11.56 0,0 0,-2.61 -1.06l-1.01,-3.5h-4.09ZM82.88,7.38a7.53,7.53 0,1 1,-7.63 7.53A7.6,7.6 0,0 1,82.89 7.38Z"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#c9e0fb"/>
+  <path
+      android:pathData="M140.43,66.22l-0.67,2.33a7.59,7.59 0,0 0,-1.74 0.71l-2.14,-1.18 -1.92,1.89 1.2,2.12a7.51,7.51 0,0 0,-0.72 1.72l-2.36,0.66v2.68l2.36,0.66a7.36,7.36 0,0 0,0.72 1.72l-1.2,2.12 1.92,1.89 2.14,-1.18a7.6,7.6 0,0 0,1.74 0.71l0.67,2.33h2.72l0.67,-2.33a7.6,7.6 0,0 0,1.74 -0.71l2.14,1.18 1.92,-1.89 -1.2,-2.12a7.51,7.51 0,0 0,0.72 -1.72l2.36,-0.66L151.5,74.47l-2.36,-0.66a7.36,7.36 0,0 0,-0.72 -1.72l1.2,-2.12 -1.92,-1.89 -2.14,1.18a7.59,7.59 0,0 0,-1.74 -0.71l-0.67,-2.33ZM141.79,70.8a5.01,5.01 0,1 1,-5.07 5.01A5.05,5.05 0,0 1,141.79 70.8Z"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#c9e0fb"/>
+  <path
+      android:pathData="M18.65,72.09l-1.45,5.06a16.55,16.55 0,0 0,-3.78 1.54l-4.66,-2.56 -4.17,4.11 2.6,4.6a16.16,16.16 0,0 0,-1.56 3.73L0.5,90.01v5.83l5.13,1.44A16.16,16.16 0,0 0,7.18 101.01l-2.6,4.6 4.17,4.11L13.42,107.17a16.56,16.56 0,0 0,3.78 1.54l1.45,5.06h5.91l1.45,-5.06a16.56,16.56 0,0 0,3.78 -1.54l4.66,2.56 4.17,-4.11 -2.6,-4.6a16.16,16.16 0,0 0,1.56 -3.73l5.13,-1.44v-5.83L37.58,88.58a16.16,16.16 0,0 0,-1.56 -3.73l2.6,-4.6 -4.17,-4.11 -4.66,2.56a16.55,16.55 0,0 0,-3.78 -1.54l-1.45,-5.06ZM21.6,82.04a10.89,10.89 0,1 1,-11.03 10.89A10.98,10.98 0,0 1,21.6 82.04Z"
+      android:strokeAlpha="0.3"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#c9e0fb"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12.59,25.52l42.09,-5.43l5.9,45.74l-42.09,5.43z"
+      android:fillColor="#eef"/>
+  <path
+      android:pathData="M11.31,15.55l42.09,-5.43l1.29,9.97l-42.09,5.43z"
+      android:fillColor="#005f9a"/>
+  <path
+      android:pathData="M6.86,26.26l5.73,-0.74l5.9,45.74l-5.73,0.74z"
+      android:fillColor="#91c4fb"/>
+  <path
+      android:pathData="M5.58,16.29l5.73,-0.74l1.29,9.97l-5.73,0.74z"
+      android:fillColor="#033250"/>
+  <path
+      android:pathData="M15.84,28.38l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M23.48,27.39l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M31.11,26.41l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M38.74,25.42l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M46.38,24.44l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M17.12,38.24l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M24.75,37.26l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M32.38,36.28l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M40.02,35.29l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M47.65,34.31l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M18.39,48.12l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M26.03,47.14l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M33.66,46.15l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M41.29,45.16l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M48.92,44.18l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M19.66,57.99l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M27.3,57l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M34.93,56.02l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M42.56,55.04l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M50.19,54.05l6.43,-0.83l1.13,8.73l-6.43,0.83z"
+      android:fillColor="#fefffd"/>
+  <path
+      android:pathData="M8.96,15.86l-0.37,-2.83a3.24,3.24 0,0 1,2.8 -3.63l1.97,-0.25a3.24,3.24 0,0 1,3.63 2.8l0.63,4.88a3.24,3.24 0,0 1,-2.8 3.63h0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="4.03"
+      android:fillColor="#00000000"
+      android:strokeColor="#002a44"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M14.57,15.13 L14.21,12.29a3.24,3.24 0,0 1,2.8 -3.63l1.97,-0.25a3.24,3.24 0,0 1,3.63 2.8l0.63,4.88a3.24,3.24 0,0 1,-2.8 3.63h0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="4.03"
+      android:fillColor="#00000000"
+      android:strokeColor="#002a44"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M20.19,14.41l-0.37,-2.83a3.24,3.24 0,0 1,2.8 -3.63l1.97,-0.25a3.24,3.24 0,0 1,3.63 2.8l0.63,4.88a3.24,3.24 0,0 1,-2.8 3.63h0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="4.03"
+      android:fillColor="#00000000"
+      android:strokeColor="#002a44"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M25.81,13.68l-0.37,-2.83a3.24,3.24 0,0 1,2.8 -3.63l1.97,-0.25a3.24,3.24 0,0 1,3.63 2.8l0.63,4.88A3.24,3.24 0,0 1,31.67 18.27h0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="4.03"
+      android:fillColor="#00000000"
+      android:strokeColor="#002a44"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M31.42,12.96 L31.06,10.12A3.24,3.24 0,0 1,33.86 6.49l1.97,-0.25a3.24,3.24 0,0 1,3.63 2.8l0.63,4.88a3.24,3.24 0,0 1,-2.8 3.63h0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="4.03"
+      android:fillColor="#00000000"
+      android:strokeColor="#002a44"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M37.04,12.23l-0.37,-2.83a3.24,3.24 0,0 1,2.8 -3.63l1.97,-0.25a3.24,3.24 0,0 1,3.63 2.8l0.63,4.88a3.24,3.24 0,0 1,-2.8 3.63h0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="4.03"
+      android:fillColor="#00000000"
+      android:strokeColor="#002a44"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M42.65,11.51l-0.37,-2.83a3.24,3.24 0,0 1,2.8 -3.63l1.97,-0.25a3.24,3.24 0,0 1,3.63 2.8l0.63,4.88a3.24,3.24 0,0 1,-2.8 3.63h0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="4.03"
+      android:fillColor="#00000000"
+      android:strokeColor="#002a44"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M21.27,73.85a51.4,51.44 0,1 0,102.8 0a51.4,51.44 0,1 0,-102.8 0z"
+      android:fillColor="#033250"/>
+  <path
+      android:pathData="M23.69,73.85a51.4,51.44 0,1 0,102.8 0a51.4,51.44 0,1 0,-102.8 0z"
+      android:fillColor="#005f9a"/>
+  <path
+      android:pathData="M83.1,99.25c9.27,-3.75 17.69,-9.97 23.15,-18.36 6.34,-9.74 8.26,-21.55 7.7,-33.3a46.9,46.9 0,0 0,-79.42 49.83C49.58,104.54 67.62,105.5 83.1,99.25Z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M113.96,47.59c0.56,11.75 -1.36,23.56 -7.7,33.3 -5.46,8.39 -13.88,14.61 -23.15,18.36 -15.48,6.25 -33.52,5.29 -48.57,-1.83A46.9,46.9 0,1 0,113.96 47.59Z"
+      android:fillColor="#eef"/>
+  <path
+      android:pathData="M74.59,74.46l-22.08,-19.68 23.1,18.47Z"
+      android:fillColor="#32338c"/>
+  <path
+      android:pathData="M75.97,73.3l10.19,37.41L74.21,74.41Z"
+      android:fillColor="#32338c"/>
+  <path
+      android:pathData="M75.09,73.85m-3.48,0a3.48,3.48 0,1 1,6.95 0a3.48,3.48 0,1 1,-6.95 0"
+      android:fillColor="#005f9a"/>
+  <path
+      android:pathData="M75.09,26.92L75.09,36.9"
+      android:strokeLineJoin="round"
+      android:strokeWidth="3.88"
+      android:fillColor="#00000000"
+      android:strokeColor="#005f9a"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M75.09,110.81L75.09,120.78"
+      android:strokeLineJoin="round"
+      android:strokeWidth="3.88"
+      android:fillColor="#00000000"
+      android:strokeColor="#005f9a"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M121.98,73.85L112.01,73.85"
+      android:strokeLineJoin="round"
+      android:strokeWidth="3.88"
+      android:fillColor="#00000000"
+      android:strokeColor="#005f9a"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M38.18,73.85L28.2,73.85"
+      android:strokeLineJoin="round"
+      android:strokeWidth="3.88"
+      android:fillColor="#00000000"
+      android:strokeColor="#005f9a"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M35.52,48.69L43.94,54.04"
+      android:strokeLineJoin="round"
+      android:strokeWidth="3.88"
+      android:fillColor="#00000000"
+      android:strokeColor="#005f9a"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M106.25,93.67L114.66,99.02"
+      android:strokeLineJoin="round"
+      android:strokeWidth="3.88"
+      android:fillColor="#00000000"
+      android:strokeColor="#005f9a"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M100.23,34.24L94.88,42.66"
+      android:strokeLineJoin="round"
+      android:strokeWidth="3.88"
+      android:fillColor="#00000000"
+      android:strokeColor="#005f9a"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M55.3,105.04L49.95,113.47"
+      android:strokeLineJoin="round"
+      android:strokeWidth="3.88"
+      android:fillColor="#00000000"
+      android:strokeColor="#005f9a"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M114.66,48.69L106.25,54.04"
+      android:strokeLineJoin="round"
+      android:strokeWidth="3.88"
+      android:fillColor="#00000000"
+      android:strokeColor="#005f9a"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M43.94,93.67L35.52,99.02"
+      android:strokeLineJoin="round"
+      android:strokeWidth="3.88"
+      android:fillColor="#00000000"
+      android:strokeColor="#005f9a"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M49.95,34.24L55.3,42.66"
+      android:strokeLineJoin="round"
+      android:strokeWidth="3.88"
+      android:fillColor="#00000000"
+      android:strokeColor="#005f9a"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M94.88,105.04L100.23,113.47"
+      android:strokeLineJoin="round"
+      android:strokeWidth="3.88"
+      android:fillColor="#00000000"
+      android:strokeColor="#005f9a"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M3.89,116.5l45.29,-17.16l9.43,24.89l-45.29,17.16z"
+      android:fillColor="#46a1ff"/>
+  <path
+      android:pathData="M31.26,120.36 L3.9,116.49l28.48,6.81L49.19,99.33Z"
+      android:fillColor="#1b87f6"/>
+  <path
+      android:pathData="M98.57,83.82l42.22,9.97l-12.86,54.47l-42.22,-9.97z"
+      android:fillColor="#32338c"/>
+  <path
+      android:pathData="M99.36,84l42.22,9.97l-12.86,54.47l-42.22,-9.97z"
+      android:fillColor="#91c4fb"/>
+  <path
+      android:pathData="M101.57,90.08l35.31,8.33l-10.86,46.03l-35.31,-8.33z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M115.51,81.71l12.64,2.98a3.78,3.78 58.28,0 1,2.81 4.54L130.47,91.35L110.47,86.63L110.97,84.52A3.78,3.78 58.28,0 1,115.51 81.71Z"
+      android:fillColor="#32338c"/>
+  <path
+      android:pathData="M109.96,99.22a3.49,3.49 0,1 1,-2.6 -4.2A3.49,3.49 0,0 1,109.96 99.22Z"
+      android:fillColor="#eeeefe"/>
+  <path
+      android:pathData="M104.93,96.94l1.46,2.36 4.19,-2.59"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#46a1ff"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M113.36,97.79L132.58,102.32"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#91c4fb"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M112.86,99.91L132.08,104.44"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#91c4fb"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M112.36,102.03L131.57,106.57"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#91c4fb"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M107.41,110.03a3.49,3.49 0,1 1,-2.6 -4.2A3.49,3.49 0,0 1,107.41 110.03Z"
+      android:fillColor="#eeeefe"/>
+  <path
+      android:pathData="M102.38,107.75l1.46,2.36 4.19,-2.59"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#46a1ff"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M110.81,108.59L130.03,113.13"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#91c4fb"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M110.31,110.72L129.53,115.25"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#91c4fb"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M109.81,112.84L129.02,117.38"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#91c4fb"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M104.86,120.84a3.49,3.49 0,1 1,-2.6 -4.2A3.49,3.49 0,0 1,104.86 120.84Z"
+      android:fillColor="#eeeefe"/>
+  <path
+      android:pathData="M99.83,118.56l1.46,2.36 4.19,-2.59"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#46a1ff"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M108.26,119.4L127.48,123.94"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#91c4fb"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M107.76,121.52L126.98,126.06"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#91c4fb"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M107.26,123.65L126.47,128.18"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#91c4fb"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M105.96,85.56L134.97,92.41L134.57,94.1a1.53,1.53 58.28,0 1,-1.84 1.14L106.7,89.09A1.53,1.53 58.28,0 1,105.56 87.25L105.96,85.56Z"
+      android:fillColor="#91c4fb"/>
+  <path
+      android:pathData="M102.38,131.66a3.49,3.49 0,1 1,-2.6 -4.2A3.49,3.49 0,0 1,102.38 131.66Z"
+      android:fillColor="#eeeefe"/>
+  <path
+      android:pathData="M97.36,129.38l1.46,2.36 4.19,-2.59"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#46a1ff"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M105.79,130.23L125,134.76"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#91c4fb"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M105.29,132.35L124.5,136.89"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#91c4fb"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M104.78,134.47L124,139.01"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#91c4fb"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_routine_outline.xml b/app/src/main/res/drawable/ic_routine_outline.xml
new file mode 100644
index 0000000..0e071ea
--- /dev/null
+++ b/app/src/main/res/drawable/ic_routine_outline.xml
@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="21dp"
+    android:height="21.256dp"
+    android:viewportWidth="21"
+    android:viewportHeight="21.256">
+  <path
+      android:pathData="M12.317,19.419L1.471,19.419a0.975,0.975 0,0 1,-0.971 -0.955L0.5,2.919a0.971,0.971 0,0 1,0.971 -0.971L17.003,1.948a0.971,0.971 0,0 1,0.971 0.971v8.733"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#5b5b5b"/>
+  <path
+      android:pathData="M0.5,6.238L17.974,6.238"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#5b5b5b"/>
+  <path
+      android:pathData="M4.442,1.949L4.442,0"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#5b5b5b"/>
+  <path
+      android:pathData="M13.783,1.949L13.783,0"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#5b5b5b"/>
+  <path
+      android:pathData="M15.654,15.91m-4.846,0a4.846,4.846 0,1 1,9.692 0a4.846,4.846 0,1 1,-9.692 0"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#5b5b5b"/>
+  <path
+      android:pathData="M15.654,12.503v3.556l1.7,1.3"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#5b5b5b"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_stethoscope.xml b/app/src/main/res/drawable/ic_stethoscope.xml
new file mode 100644
index 0000000..2c4196e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_stethoscope.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/ic_user_outline_bg"/>
+
+    <item android:drawable="@drawable/ic_stethoscope_outline"
+        android:gravity="center"
+        />
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_stethoscope_outline.xml b/app/src/main/res/drawable/ic_stethoscope_outline.xml
new file mode 100644
index 0000000..e379096
--- /dev/null
+++ b/app/src/main/res/drawable/ic_stethoscope_outline.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20.504dp"
+    android:height="20.5dp"
+    android:viewportWidth="20.504"
+    android:viewportHeight="20.5">
+  <path
+      android:pathData="M6.091,11.398h-1.047a3.85,3.85 0,0 1,-3.809 -3.227l-0.954,-5.727a1.884,1.884 0,0 1,1.859 -2.194h0.076a0.438,0.438 0,1 1,0 0.875h-0.076a1.009,1.009 0,0 0,-1 1.175l0.955,5.727a2.977,2.977 0,0 0,2.946 2.5h1.047a2.977,2.977 0,0 0,2.946 -2.5l0.954,-5.727a1.009,1.009 0,0 0,-1 -1.175,0.438 0.438,0 0,1 0,-0.875h0a1.884,1.884 0,0 1,1.859 2.194l-0.954,5.727a3.849,3.849 0,0 1,-3.809 3.227Z"
+      android:strokeWidth="0.5"
+      android:fillColor="#5b5b5b"
+      android:strokeColor="#5b5b5b"/>
+  <path
+      android:pathData="M9.545,17.685a3.866,3.866 0,0 1,-3.862 -3.862L5.683,10.399h0.875v3.424a2.987,2.987 0,0 0,5.973 0v-0.856a3.006,3.006 0,1 1,6.011 0v3.424h-0.875v-3.424a2.131,2.131 0,1 0,-4.261 0v0.856A3.866,3.866 0,0 1,9.545 17.685Z"
+      android:strokeWidth="0.5"
+      android:fillColor="#5b5b5b"
+      android:strokeColor="#5b5b5b"/>
+  <path
+      android:pathData="M18.105,20.25a2.15,2.15 0,1 1,2.15 -2.15A2.152,2.152 0,0 1,18.105 20.25ZM18.105,16.826a1.275,1.275 0,1 0,1.275 1.275A1.276,1.276 0,0 0,18.105 16.826Z"
+      android:strokeWidth="0.5"
+      android:fillColor="#5b5b5b"
+      android:strokeColor="#5b5b5b"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_dash_board_cp.xml b/app/src/main/res/layout/activity_dash_board_cp.xml
new file mode 100644
index 0000000..e30cbe8
--- /dev/null
+++ b/app/src/main/res/layout/activity_dash_board_cp.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white_bg"
+    tools:context=".careperson_dashboard.DashBoardActivityCP">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragmentContainerView"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:defaultNavHost="true"
+        app:navGraph="@navigation/cp_dashboard_graph" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/add_contact_fragment.xml b/app/src/main/res/layout/add_contact_fragment.xml
index b72629e..83b956d 100644
--- a/app/src/main/res/layout/add_contact_fragment.xml
+++ b/app/src/main/res/layout/add_contact_fragment.xml
@@ -48,6 +48,9 @@
 
             android:drawableStart="@drawable/ic_search_outline"
             android:drawablePadding="10dp"
+
+            android:autofillHints="name"
+            android:inputType="textPersonName"
             />
 
         <TextView
diff --git a/app/src/main/res/layout/add_medical_info.xml b/app/src/main/res/layout/add_medical_info.xml
index 69729a9..ff89a47 100644
--- a/app/src/main/res/layout/add_medical_info.xml
+++ b/app/src/main/res/layout/add_medical_info.xml
@@ -22,6 +22,7 @@
             android:layout_margin="15dp"/>
 
         <TextView
+            android:id="@+id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/add_medical_information"
@@ -44,6 +45,7 @@
             />
 
         <EditText
+            android:id="@+id/diagnosis"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@drawable/edit_text_bg_2"
@@ -59,7 +61,7 @@
             android:paddingVertical="15dp"
             android:padding="10dp"
 
-            android:drawableStart="@drawable/ic_user"
+            android:drawableStart="@drawable/ic_diagnosis"
             android:drawablePadding="10dp"
 
             android:autofillHints="name"
@@ -80,6 +82,7 @@
             />
 
         <EditText
+            android:id="@+id/primary_doc"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@drawable/edit_text_bg_2"
@@ -95,7 +98,7 @@
             android:paddingVertical="15dp"
             android:padding="10dp"
 
-            android:drawableStart="@drawable/ic_user"
+            android:drawableStart="@drawable/ic_stethoscope"
             android:drawablePadding="10dp"
 
             android:autofillHints="name"
@@ -116,6 +119,7 @@
             />
 
         <EditText
+            android:id="@+id/doc_contact"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@drawable/edit_text_bg_2"
@@ -131,7 +135,7 @@
             android:paddingVertical="15dp"
             android:padding="10dp"
 
-            android:drawableStart="@drawable/ic_user"
+            android:drawableStart="@drawable/ic_doc_contact"
             android:drawablePadding="10dp"
 
             android:autofillHints="phone"
@@ -152,6 +156,7 @@
             />
 
         <EditText
+            android:id="@+id/hospital_pref"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@drawable/edit_text_bg_2"
@@ -167,7 +172,7 @@
             android:paddingVertical="15dp"
             android:padding="10dp"
 
-            android:drawableStart="@drawable/ic_user"
+            android:drawableStart="@drawable/ic_hosp"
             android:drawablePadding="10dp"
 
             android:autofillHints="name"
@@ -188,6 +193,7 @@
             />
 
         <EditText
+            android:id="@+id/allergies"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@drawable/edit_text_bg_2"
@@ -203,7 +209,7 @@
             android:paddingVertical="15dp"
             android:padding="10dp"
 
-            android:drawableStart="@drawable/ic_user"
+            android:drawableStart="@drawable/ic_allergy"
             android:drawablePadding="10dp"
 
             android:autofillHints="name"
@@ -224,6 +230,7 @@
             />
 
         <EditText
+            android:id="@+id/diet_restrict"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@drawable/edit_text_bg_2"
@@ -239,7 +246,7 @@
             android:paddingVertical="15dp"
             android:padding="10dp"
 
-            android:drawableStart="@drawable/ic_user"
+            android:drawableStart="@drawable/ic_diet_rest"
             android:drawablePadding="10dp"
 
             android:autofillHints="name"
diff --git a/app/src/main/res/layout/add_routine_fragment.xml b/app/src/main/res/layout/add_routine_fragment.xml
new file mode 100644
index 0000000..4df64d6
--- /dev/null
+++ b/app/src/main/res/layout/add_routine_fragment.xml
@@ -0,0 +1,402 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+
+    android:background="@color/white_bg"
+    android:overScrollMode="never">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/back_btn"
+            android:layout_width="35sp"
+            android:layout_height="35sp"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="15dp"
+            android:layout_marginEnd="15dp"
+            android:layout_marginBottom="15dp"
+            android:contentDescription="@string/back_button"
+            android:padding="5dp"
+            android:src="@drawable/arrow_back" />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:layout_marginHorizontal="15dp"
+            android:fontFamily="@font/nunito_medium"
+            android:text="@string/add_routine"
+            android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
+
+            android:textColor="@color/black"
+
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginTop="35sp"
+            android:fontFamily="@font/nunito_medium"
+            android:text="@string/name_of_the_routine"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            android:textColor="@color/black" />
+
+        <EditText
+            android:id="@+id/routine_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginVertical="10dp"
+            android:autofillHints="name"
+
+            android:background="@drawable/edit_text_bg_2"
+            android:drawableStart="@drawable/ic_routine"
+            android:drawablePadding="10dp"
+            android:fontFamily="@font/nunito_regular"
+            android:hint="@string/enter_routine_name"
+
+            android:inputType="text|none"
+            android:padding="10dp"
+
+            android:paddingVertical="15dp"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+            android:textColor="@color/black"
+            android:textColorHint="@android:color/darker_gray"
+
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginTop="15dp"
+            android:fontFamily="@font/nunito_medium"
+            android:text="@string/routine_description"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            android:textColor="@color/black" />
+
+        <EditText
+            android:id="@+id/routine_description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginVertical="10dp"
+            android:autofillHints="name"
+
+            android:background="@drawable/edit_text_bg_2"
+            android:drawableStart="@drawable/ic_description"
+            android:drawablePadding="10dp"
+
+            android:fontFamily="@font/nunito_regular"
+            android:hint="@string/enter_description"
+
+            android:inputType="textMultiLine|textCapSentences"
+            android:padding="10dp"
+
+            android:paddingVertical="15dp"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+            android:textColor="@color/black"
+            android:textColorHint="@android:color/darker_gray"
+
+            android:maxHeight="150dp"
+
+            android:overScrollMode="never"
+            android:scrollbars="vertical"
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/frequency"
+            android:fontFamily="@font/nunito_medium"
+            android:textColor="@color/black"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            android:layout_gravity="start"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginTop="15dp"
+            />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginTop="10dp"
+            android:weightSum="10"
+            android:gravity="center_vertical"
+            >
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="7"
+                android:text="@string/everyday"
+                android:fontFamily="@font/nunito_medium"
+                android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                android:textColor="@color/black"/>
+
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/everyday_check"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                android:layout_gravity="center_vertical"
+                app:switchMinWidth="60dp"
+                app:track="@drawable/switch_track_1"
+                app:thumbTint="@color/color_primary"
+                app:showText="false"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:orientation="horizontal"
+
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginVertical="5dp"
+            android:paddingVertical="5dp"
+
+            android:baselineAligned="false"
+
+            android:gravity="center_vertical"
+
+            android:weightSum="7">
+
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1">
+
+                <TextView
+                    android:id="@+id/sun"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:layout_centerInParent="true"
+
+                    android:background="@drawable/ic_user_outline_bg"
+                    android:fontFamily="@font/nunito_regular"
+
+                    android:gravity="center"
+                    android:text="@string/s"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+
+                android:layout_weight="1">
+
+                <TextView
+                    android:id="@+id/mon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:layout_centerInParent="true"
+                    android:background="@drawable/ic_user_outline_bg"
+
+                    android:fontFamily="@font/nunito_regular"
+                    android:gravity="center"
+
+                    android:text="@string/m"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+
+                android:layout_weight="1">
+
+                <TextView
+                    android:id="@+id/tue"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:layout_centerInParent="true"
+                    android:background="@drawable/ic_user_outline_bg"
+                    android:fontFamily="@font/nunito_regular"
+
+                    android:gravity="center"
+                    android:text="@string/t"
+
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+
+                android:layout_weight="1">
+
+                <TextView
+                    android:id="@+id/wed"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:layout_centerInParent="true"
+
+                    android:background="@drawable/ic_user_outline_bg"
+                    android:fontFamily="@font/nunito_regular"
+
+                    android:gravity="center"
+                    android:text="@string/w"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+
+                android:layout_weight="1">
+
+                <TextView
+                    android:id="@+id/thu"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:layout_centerInParent="true"
+                    android:background="@drawable/ic_user_outline_bg"
+                    android:fontFamily="@font/nunito_regular"
+
+                    android:gravity="center"
+                    android:text="@string/t"
+
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+
+                android:layout_weight="1">
+
+                <TextView
+                    android:id="@+id/fri"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:layout_centerInParent="true"
+                    android:background="@drawable/ic_user_outline_bg"
+                    android:fontFamily="@font/nunito_regular"
+
+                    android:gravity="center"
+                    android:text="@string/f"
+
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+
+                android:layout_weight="1">
+
+                <TextView
+                    android:id="@+id/sat"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:layout_centerInParent="true"
+                    android:background="@drawable/ic_user_outline_bg"
+                    android:fontFamily="@font/nunito_regular"
+
+                    android:gravity="center"
+                    android:text="@string/s"
+
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
+
+            </RelativeLayout>
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/start_time"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:background="@drawable/edit_text_bg_2"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginVertical="10dp"
+
+            android:gravity="center_vertical"
+
+            android:hint="@string/enter_start_time"
+            android:fontFamily="@font/nunito_regular"
+            android:textColor="@color/black"
+            android:textColorHint="@android:color/darker_gray"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+            android:paddingVertical="15dp"
+            android:padding="10dp"
+
+            android:drawablePadding="10dp"
+
+            app:drawableStartCompat="@drawable/ic_clock" />
+
+        <TextView
+            android:id="@+id/end_time"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:background="@drawable/edit_text_bg_2"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginVertical="10dp"
+
+            android:gravity="center_vertical"
+
+            android:hint="@string/enter_end_time"
+            android:fontFamily="@font/nunito_regular"
+            android:textColor="@color/black"
+            android:textColorHint="@android:color/darker_gray"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+            android:paddingVertical="15dp"
+            android:padding="10dp"
+
+            android:drawablePadding="10dp"
+
+            app:drawableStartCompat="@drawable/ic_clock" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/add_routine"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginVertical="35dp"
+            android:text="@string/add"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            android:textAllCaps="false"
+            android:fontFamily="@font/nunito_regular"
+            android:textColor="@color/white_bg"
+            android:paddingVertical="15dp"
+            app:backgroundTint="@color/color_primary"
+            app:cornerRadius="15dp"
+            />
+
+    </LinearLayout>
+
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/caregiver_dashboard_fragment.xml b/app/src/main/res/layout/caregiver_dashboard_fragment.xml
new file mode 100644
index 0000000..8b1d131
--- /dev/null
+++ b/app/src/main/res/layout/caregiver_dashboard_fragment.xml
@@ -0,0 +1,465 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@color/white_bg">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:weightSum="10"
+        android:orientation="vertical">
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="4"
+
+            android:background="@drawable/ic_dashboard_cp"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:weightSum="10">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:orientation="vertical"
+            android:layout_weight="4.5"
+            android:weightSum="10"
+            >
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:orientation="vertical"
+                android:layout_weight="5.5">
+
+                <RelativeLayout
+                    android:id="@+id/head"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="15dp"
+                    android:layout_marginTop="25dp"
+                    >
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+
+                        android:text="12 : 00 PM"
+                        android:fontFamily="@font/nunito_bold"
+                        android:textColor="@color/white_bg"
+                        android:textSize="@dimen/_22ssp"
+                        android:layout_centerVertical="true"
+                        />
+
+                    <de.hdodenhof.circleimageview.CircleImageView
+                        android:id="@+id/profile"
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+
+                        android:src="@drawable/static_3"
+
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerVertical="true"
+
+                        app:civ_border_color="@color/white_bg"
+                        app:civ_border_width="1dp"
+
+                        android:elevation="5dp"
+
+                        />
+
+                    <ImageView
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:contentDescription="@string/notification"
+
+                        app:srcCompat="@drawable/ic_notification"
+                        android:layout_centerVertical="true"
+
+                        android:layout_toStartOf="@id/profile"
+                        android:layout_marginHorizontal="15dp"
+
+                        />
+
+                </RelativeLayout>
+
+                <TextView
+                    android:id="@+id/day_of_week"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:text="Sunday"
+                    android:fontFamily="@font/nunito_regular"
+                    android:textColor="@color/white_bg"
+                    android:textSize="@dimen/_18ssp"
+
+                    android:layout_marginHorizontal="15dp"
+
+                    />
+
+                <TextView
+                    android:id="@+id/date"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:text="April 4th, 2023"
+                    android:fontFamily="@font/nunito_regular"
+                    android:textSize="@dimen/_18ssp"
+                    android:textColor="@color/white_bg"
+
+                    android:layout_marginHorizontal="15dp"
+
+                    android:layout_marginBottom="5dp"
+
+                    />
+
+            </LinearLayout>
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="4.5"
+
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginTop="5dp"
+
+                app:cardBackgroundColor="@color/color_accent"
+                >
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:padding="15dp"
+                    >
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+
+                        android:text="You should take yours medicines in 2 : 24"
+                        android:fontFamily="@font/nunito_semibold"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/_16ssp"
+
+                        android:maxLines="2"
+                        android:ellipsize="end"
+
+                        />
+
+                    <TextView
+                        android:id="@+id/dosage_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+
+                        android:text="Vitamin D3"
+                        android:fontFamily="@font/nunito_medium"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/_14ssp"
+
+                        android:layout_alignParentBottom="true"
+
+                        android:maxLines="1"
+                        android:maxEms="5"
+                        android:ellipsize="end"
+
+                        />
+
+                    <TextView
+                        android:id="@+id/dosage_quantity"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+
+                        android:text="2 capsules"
+                        android:fontFamily="@font/nunito_medium"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/_14ssp"
+
+                        android:layout_alignParentBottom="true"
+                        android:layout_toEndOf="@id/dosage_name"
+                        android:layout_marginStart="15dp"
+
+                        android:maxLines="1"
+                        android:maxEms="5"
+                        android:ellipsize="end"
+
+                        />
+
+                    <ImageView
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:contentDescription="@string/close"
+
+                        app:srcCompat="@drawable/ic_close_primary"
+
+                        android:layout_alignParentBottom="true"
+                        android:layout_alignParentEnd="true"
+
+                        />
+
+                </RelativeLayout>
+
+            </com.google.android.material.card.MaterialCardView>
+
+        </LinearLayout>
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:overScrollMode="never"
+            android:layout_weight="4.5">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                >
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:weightSum="10"
+                    android:orientation="horizontal">
+
+                    <com.google.android.material.card.MaterialCardView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="5"
+
+                        app:strokeColor="@color/color_accent"
+                        app:strokeWidth="0.5dp"
+                        app:cardCornerRadius="5dp"
+                        app:cardElevation="1dp"
+
+                        android:layout_marginStart="15dp"
+                        android:layout_marginEnd="10dp"
+                        android:layout_marginTop="25dp"
+                        android:layout_marginBottom="10dp"
+
+                        >
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:layout_margin="15dp"
+                            android:gravity="center">
+
+                            <ImageView
+                                android:layout_width="80dp"
+                                android:layout_height="80dp"
+                                android:contentDescription="@string/calls"
+
+                                app:srcCompat="@drawable/img_doc_contact"/>
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+
+                                android:text="@string/calls"
+                                android:fontFamily="@font/nunito_regular"
+                                android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
+                                android:textColor="@color/black"
+
+                                android:layout_marginTop="5dp"
+
+                                />
+
+                        </LinearLayout>
+
+                    </com.google.android.material.card.MaterialCardView>
+
+                    <com.google.android.material.card.MaterialCardView
+                        android:id="@+id/chats"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="5"
+
+                        app:strokeColor="@color/color_accent"
+                        app:strokeWidth="0.5dp"
+                        app:cardCornerRadius="5dp"
+                        app:cardElevation="1dp"
+
+                        android:layout_marginStart="10dp"
+                        android:layout_marginEnd="15dp"
+
+                        android:layout_marginTop="25dp"
+                        android:layout_marginBottom="10dp"
+
+                        >
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:layout_marginVertical="15dp"
+                            android:gravity="center">
+
+                            <ImageView
+                                android:layout_width="80dp"
+                                android:layout_height="80dp"
+                                android:contentDescription="@string/chats"
+
+                                app:srcCompat="@drawable/img_chats"/>
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+
+                                android:text="@string/chats"
+                                android:fontFamily="@font/nunito_regular"
+                                android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
+                                android:textColor="@color/black"
+
+                                android:layout_marginTop="5dp"
+
+                                />
+
+                        </LinearLayout>
+
+                    </com.google.android.material.card.MaterialCardView>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:weightSum="10"
+                    android:orientation="horizontal">
+
+                    <com.google.android.material.card.MaterialCardView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="5"
+
+                        app:strokeColor="@color/color_accent"
+                        app:strokeWidth="0.5dp"
+                        app:cardCornerRadius="5dp"
+                        app:cardElevation="1dp"
+
+                        android:layout_marginStart="15dp"
+                        android:layout_marginEnd="10dp"
+                        android:layout_marginVertical="10dp"
+
+                        >
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:layout_marginVertical="15dp"
+                            android:gravity="center">
+
+                            <ImageView
+                                android:layout_width="80dp"
+                                android:layout_height="80dp"
+                                android:contentDescription="@string/apps"
+
+                                app:srcCompat="@drawable/img_apps"/>
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+
+                                android:text="@string/apps"
+                                android:fontFamily="@font/nunito_regular"
+                                android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
+                                android:textColor="@color/black"
+
+                                android:layout_marginTop="5dp"
+
+                                />
+
+                        </LinearLayout>
+
+                    </com.google.android.material.card.MaterialCardView>
+
+                    <com.google.android.material.card.MaterialCardView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="5"
+
+                        app:strokeColor="@color/color_accent"
+                        app:strokeWidth="0.5dp"
+                        app:cardCornerRadius="5dp"
+                        app:cardElevation="1dp"
+
+                        android:layout_marginStart="10dp"
+                        android:layout_marginEnd="15dp"
+                        android:layout_marginVertical="10dp"
+                        >
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:layout_marginVertical="15dp"
+                            android:gravity="center">
+
+                            <ImageView
+                                android:layout_width="80dp"
+                                android:layout_height="80dp"
+                                android:contentDescription="@string/direction"
+
+                                app:srcCompat="@drawable/img_directions"/>
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+
+                                android:text="@string/direction"
+                                android:fontFamily="@font/nunito_regular"
+                                android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
+                                android:textColor="@color/black"
+
+                                android:layout_marginTop="5dp"
+
+                                />
+
+                        </LinearLayout>
+
+                    </com.google.android.material.card.MaterialCardView>
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </ScrollView>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/next_btn"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+
+                android:layout_marginHorizontal="15dp"
+                android:text="@string/sos"
+                android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                android:textAllCaps="true"
+                android:fontFamily="@font/nunito_regular"
+                android:textColor="@color/white_bg"
+                app:backgroundTint="@color/color_primary"
+                app:cornerRadius="15dp"
+
+                android:paddingVertical="15dp"
+                android:layout_centerInParent="true"
+
+                />
+
+        </RelativeLayout>
+
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_card_viewholder.xml b/app/src/main/res/layout/chat_card_viewholder.xml
new file mode 100644
index 0000000..454593f
--- /dev/null
+++ b/app/src/main/res/layout/chat_card_viewholder.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@color/white_bg">
+
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+
+        app:strokeColor="@color/color_accent"
+        app:strokeWidth="@dimen/_1sdp"
+
+        android:layout_marginHorizontal="15dp"
+        android:layout_marginVertical="10dp"
+
+        app:cardCornerRadius="@dimen/_5sdp"
+
+        app:rippleColor="@color/color_accent"
+
+        app:cardElevation="5dp"
+
+        >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            >
+
+            <de.hdodenhof.circleimageview.CircleImageView
+                android:id="@+id/image"
+                android:layout_width="@dimen/_60sdp"
+                android:layout_height="@dimen/_60sdp"
+
+                android:layout_marginStart="@dimen/_15sdp"
+                android:layout_marginTop="@dimen/_15sdp"
+                android:layout_marginEnd="@dimen/_15sdp"
+                android:layout_marginBottom="@dimen/_15sdp"
+                android:src="@drawable/static_3" />
+
+            <TextView
+                android:id="@+id/type"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+
+                tools:text="Caregiver"
+                android:fontFamily="@font/nunito_regular"
+                android:textSize="@dimen/_14ssp"
+                android:textColor="@android:color/darker_gray"
+
+                android:layout_toEndOf="@id/image"
+                android:layout_alignTop="@id/image"
+                android:layout_toStartOf="@id/time"
+
+                android:maxLines="1"
+                android:ellipsize="end"
+
+                />
+
+            <TextView
+                android:id="@+id/time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
+                tools:text="09:00 am"
+                android:fontFamily="@font/nunito_regular"
+                android:textSize="@dimen/_14ssp"
+                android:textColor="@color/black"
+
+                android:layout_alignParentEnd="true"
+
+                android:layout_alignTop="@id/image"
+                android:layout_marginHorizontal="@dimen/_15sdp"
+
+                />
+
+            <TextView
+                android:id="@+id/name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+
+                tools:text="Aditya Gaikwad"
+                android:fontFamily="@font/nunito_semibold"
+                android:textSize="@dimen/_16ssp"
+                android:textColor="@color/black"
+
+                android:layout_toEndOf="@id/image"
+                android:layout_below="@id/type"
+
+                android:maxLines="1"
+                android:ellipsize="end"
+
+                />
+
+            <TextView
+                android:id="@+id/last_msg"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+
+                tools:text="This is the last message I have sent"
+                android:fontFamily="@font/nunito_regular"
+                android:textSize="@dimen/_14ssp"
+                android:textColor="@color/black"
+
+                android:layout_toEndOf="@id/image"
+                android:layout_below="@id/name"
+
+                android:maxLines="1"
+                android:ellipsize="end"
+
+                android:layout_marginTop="@dimen/_1sdp"
+
+                />
+
+        </RelativeLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_list_fragment.xml b/app/src/main/res/layout/chat_list_fragment.xml
new file mode 100644
index 0000000..3d6fe5f
--- /dev/null
+++ b/app/src/main/res/layout/chat_list_fragment.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white_bg">
+
+    <ImageView
+        android:id="@+id/back_btn"
+        android:layout_width="35sp"
+        android:layout_height="35sp"
+        android:contentDescription="@string/back_button"
+        android:padding="5dp"
+        app:srcCompat="@drawable/ic_home_nav_up"
+        android:layout_marginVertical="25dp"
+        android:layout_marginHorizontal="15dp"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/chats"
+        android:fontFamily="@font/nunito_medium"
+        android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium"
+        android:textColor="@color/black"
+        android:layout_marginHorizontal="15dp"
+        />
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="15dp"
+        android:background="@drawable/edit_text_bg"
+
+        android:paddingVertical="15dp"
+        android:paddingHorizontal="10dp"
+        android:layout_marginTop="15dp"
+
+        android:hint="@string/search_chats"
+        android:textColor="@color/black"
+        android:textColorHint="@android:color/darker_gray"
+
+        android:fontFamily="@font/nunito_regular"
+
+        android:drawableStart="@drawable/ic_search_outline"
+        android:drawablePadding="10dp"
+
+        android:autofillHints="name"
+        android:inputType="textPersonName"
+        android:imeOptions="actionDone"
+        />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/chats_rv"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginVertical="15dp"
+        android:overScrollMode="never"
+        />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/medical_into_fragment.xml b/app/src/main/res/layout/medical_into_fragment.xml
index 44b21a4..5415c9d 100644
--- a/app/src/main/res/layout/medical_into_fragment.xml
+++ b/app/src/main/res/layout/medical_into_fragment.xml
@@ -53,52 +53,59 @@
 
         />
 
-    <LinearLayout
-        android:id="@+id/no_data"
-        android:visibility="visible"
-        android:layout_width="wrap_content"
+    <ScrollView
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:gravity="center"
-        android:orientation="vertical">
+        android:overScrollMode="never">
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="300dp"
-            android:contentDescription="@string/medical_information"
-
-            app:srcCompat="@drawable/ic_medic_info" />
-
-        <TextView
+        <LinearLayout
+            android:id="@+id/no_data"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="visible">
 
-            android:layout_marginHorizontal="25dp"
-            android:fontFamily="@font/nunito_semibold"
-            android:text="@string/you_don_t_have_any_medical_information"
-            android:textAlignment="center"
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="300dp"
+                android:contentDescription="@string/medical_information"
 
-            android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
+                app:srcCompat="@drawable/ic_medic_info" />
 
-            android:textColor="@color/black" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+                android:layout_marginHorizontal="25dp"
+                android:fontFamily="@font/nunito_semibold"
+                android:text="@string/you_don_t_have_any_medical_information"
+                android:textAlignment="center"
 
-            android:layout_marginHorizontal="15dp"
-            android:layout_marginTop="5dp"
-            android:fontFamily="@font/nunito_regular"
-            android:text="@string/please_click_on_add_button_to_add"
+                android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
 
-            android:textAlignment="center"
+                android:textColor="@color/black" />
 
-            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-            android:textColor="@color/black"
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
 
-            />
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginTop="5dp"
+                android:fontFamily="@font/nunito_regular"
+                android:text="@string/please_click_on_add_button_to_add"
 
-    </LinearLayout>
+                android:textAlignment="center"
+
+                android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                android:textColor="@color/black"
+
+                />
+
+        </LinearLayout>
+
+    </ScrollView>
 
     <ScrollView
         android:id="@+id/medical_info"
@@ -583,8 +590,8 @@
 
     <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/add_med_info"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
 
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
@@ -595,9 +602,10 @@
 
         android:backgroundTint="@color/color_primary"
         android:elevation="5dp"
-        android:src="@drawable/ic_plus_sign"
+        app:srcCompat="@drawable/ic_plus_sign"
+
+        app:contentPadding="10dp"
 
-        app:contentPadding="15dp"
         app:tint="@color/white_bg"
 
         />
diff --git a/app/src/main/res/layout/profile_progress_fragment.xml b/app/src/main/res/layout/profile_progress_fragment.xml
index 9748c29..496d7df 100644
--- a/app/src/main/res/layout/profile_progress_fragment.xml
+++ b/app/src/main/res/layout/profile_progress_fragment.xml
@@ -11,6 +11,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingEnd="15dp"
         android:orientation="vertical">
 
         <TextView
@@ -254,6 +255,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/set_up_routine"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
@@ -270,7 +272,7 @@
                 android:orientation="vertical">
 
                 <ImageView
-                    android:id="@+id/setup_routine"
+                    android:id="@+id/setup_routine_img"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
 
@@ -359,6 +361,7 @@
         </LinearLayout>
 
         <TextView
+            android:id="@+id/skip_to_dashboard"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
 
diff --git a/app/src/main/res/layout/reminders_fragment.xml b/app/src/main/res/layout/reminders_fragment.xml
index 307326c..4020a23 100644
--- a/app/src/main/res/layout/reminders_fragment.xml
+++ b/app/src/main/res/layout/reminders_fragment.xml
@@ -468,65 +468,73 @@
 
             />
 
-        <LinearLayout
-            android:id="@+id/no_data"
-            android:layout_width="wrap_content"
+        <ScrollView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/divider"
 
             android:layout_centerHorizontal="true"
-
-            android:layout_marginTop="25dp"
-            android:gravity="center_horizontal"
-            android:orientation="vertical">
-
-            <ImageView
-                android:id="@+id/img"
-                android:layout_width="100dp"
-                android:layout_height="100dp"
-                android:contentDescription="@string/medication_reminder"
-
-                android:src="@drawable/medicinie_img" />
+            android:overScrollMode="never"
+            >
 
             <LinearLayout
+                android:id="@+id/no_data"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="30dp"
 
-                android:layout_marginVertical="25dp"
+                android:layout_marginTop="25dp"
+                android:gravity="center_horizontal"
                 android:orientation="vertical">
 
-                <TextView
+                <ImageView
+                    android:id="@+id/img"
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    android:contentDescription="@string/medication_reminder"
+
+                    android:src="@drawable/medicinie_img" />
+
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="30dp"
 
-                    android:layout_gravity="center_horizontal"
-                    android:fontFamily="@font/nunito_semibold"
-                    android:text="@string/you_don_t_have_any_medication_reminder"
-                    android:textAlignment="center"
-                    android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
+                    android:layout_marginVertical="25dp"
+                    android:orientation="vertical">
 
-                    android:textColor="@color/black"
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
 
-                    />
+                        android:layout_gravity="center_horizontal"
+                        android:fontFamily="@font/nunito_semibold"
+                        android:text="@string/you_don_t_have_any_medication_reminder"
+                        android:textAlignment="center"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                        android:textColor="@color/black"
 
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginVertical="15dp"
-                    android:fontFamily="@font/nunito_regular"
-                    android:text="@string/please_click_on_add_button_to_add_medication_reminder"
-                    android:textAlignment="center"
+                        />
 
-                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
 
-                    android:textColor="#5B5B5B" />
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginVertical="15dp"
+                        android:fontFamily="@font/nunito_regular"
+                        android:text="@string/please_click_on_add_button_to_add_medication_reminder"
+                        android:textAlignment="center"
+
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+                        android:textColor="#5B5B5B" />
+
+                </LinearLayout>
 
             </LinearLayout>
 
-        </LinearLayout>
+        </ScrollView>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/reminders_rv"
@@ -542,8 +550,8 @@
 
         <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/add_reminder"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
 
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
@@ -554,9 +562,9 @@
 
             android:backgroundTint="@color/color_primary"
             android:elevation="5dp"
-            android:src="@drawable/ic_plus_sign"
+            app:srcCompat="@drawable/ic_plus_sign"
 
-            app:contentPadding="15dp"
+            app:contentPadding="10dp"
 
             app:tint="@color/white_bg"
 
diff --git a/app/src/main/res/layout/routine_fragment.xml b/app/src/main/res/layout/routine_fragment.xml
new file mode 100644
index 0000000..a3c8c4d
--- /dev/null
+++ b/app/src/main/res/layout/routine_fragment.xml
@@ -0,0 +1,581 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white_bg"
+    android:overScrollMode="never">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/done"
+        >
+
+        <ImageView
+            android:id="@+id/back_btn"
+            android:layout_width="35sp"
+            android:layout_height="35sp"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="15dp"
+            android:layout_marginEnd="15dp"
+            android:layout_marginBottom="15dp"
+            android:contentDescription="@string/back_button"
+            android:padding="5dp"
+            android:src="@drawable/arrow_back" />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:layout_below="@id/back_btn"
+            android:layout_marginHorizontal="15dp"
+            android:fontFamily="@font/nunito_medium"
+            android:text="@string/routine"
+            android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
+
+            android:gravity="top"
+
+            android:textColor="@color/black"
+
+            />
+
+        <TextView
+            android:id="@+id/today_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/title"
+
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginTop="15dp"
+            android:fontFamily="@font/nunito_semibold"
+            android:text="@string/march_16"
+
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            android:textColor="@color/black"
+
+            />
+
+        <LinearLayout
+            android:id="@+id/dates"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/today_date"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginVertical="15dp"
+            android:orientation="horizontal"
+            android:baselineAligned="false"
+            android:weightSum="7">
+
+            <LinearLayout
+                android:id="@+id/sun"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_weight="1"
+                android:background="@drawable/round_corners"
+                android:gravity="center_horizontal"
+
+                android:orientation="vertical"
+
+                android:paddingVertical="15dp">
+
+                <TextView
+                    android:id="@+id/sun_t1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:fontFamily="@font/nunito_regular"
+                    android:text="@string/sun"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                    android:textColor="@color/black"
+
+                    />
+
+                <TextView
+                    android:id="@+id/sun_t2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:layout_marginVertical="5dp"
+                    android:fontFamily="@font/nunito_semibold"
+                    android:text="12"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+                    android:textColor="@color/black"
+
+                    />
+
+                <ImageView
+                    android:layout_width="5dp"
+                    android:layout_height="5dp"
+
+                    android:src="@drawable/ic_white_dot"
+
+                    app:tint="@color/white_bg" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/mon"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginHorizontal="5dp"
+                android:layout_weight="1"
+                android:background="@drawable/round_corners"
+
+                android:gravity="center_horizontal"
+
+                android:orientation="vertical"
+
+                android:paddingVertical="15dp"
+
+                >
+
+                <TextView
+                    android:id="@+id/mon_t1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:fontFamily="@font/nunito_regular"
+                    android:text="@string/mon"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                    android:textColor="@color/black"
+
+                    />
+
+                <TextView
+                    android:id="@+id/mon_t2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:layout_marginVertical="5dp"
+                    android:fontFamily="@font/nunito_semibold"
+                    android:text="12"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+                    android:textColor="@color/black"
+
+                    />
+
+                <ImageView
+                    android:layout_width="5dp"
+                    android:layout_height="5dp"
+
+                    android:src="@drawable/ic_white_dot"
+
+                    app:tint="@color/white_bg" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/tue"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginEnd="5dp"
+                android:layout_weight="1"
+                android:background="@drawable/round_corners"
+
+                android:gravity="center_horizontal"
+
+                android:orientation="vertical"
+
+                android:paddingVertical="15dp"
+
+                >
+
+                <TextView
+                    android:id="@+id/tue_1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:fontFamily="@font/nunito_regular"
+                    android:text="@string/tue"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                    android:textColor="@color/black"
+
+                    />
+
+                <TextView
+                    android:id="@+id/tue_2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:layout_marginVertical="5dp"
+                    android:fontFamily="@font/nunito_semibold"
+                    android:text="12"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+                    android:textColor="@color/black"
+
+                    />
+
+                <ImageView
+                    android:layout_width="5dp"
+                    android:layout_height="5dp"
+
+                    android:src="@drawable/ic_white_dot"
+
+                    app:tint="@color/white_bg" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/wed"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginEnd="5dp"
+                android:layout_weight="1"
+                android:background="@drawable/round_corners"
+
+                android:gravity="center_horizontal"
+
+                android:orientation="vertical"
+
+                android:paddingVertical="15dp"
+
+                >
+
+                <TextView
+                    android:id="@+id/wed_1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:fontFamily="@font/nunito_regular"
+                    android:text="@string/wed"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                    android:textColor="@color/black"
+
+                    />
+
+                <TextView
+                    android:id="@+id/wed_2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:layout_marginVertical="5dp"
+                    android:fontFamily="@font/nunito_semibold"
+                    android:text="12"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+                    android:textColor="@color/black"
+
+                    />
+
+                <ImageView
+                    android:layout_width="5dp"
+                    android:layout_height="5dp"
+
+                    android:src="@drawable/ic_white_dot"
+
+                    app:tint="@color/white_bg" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/thu"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginEnd="5dp"
+                android:layout_weight="1"
+                android:background="@drawable/round_corners"
+
+                android:gravity="center_horizontal"
+
+                android:orientation="vertical"
+
+                android:paddingVertical="15dp"
+
+                >
+
+                <TextView
+                    android:id="@+id/thu_1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:fontFamily="@font/nunito_regular"
+                    android:text="@string/thu"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                    android:textColor="@color/black"
+
+                    />
+
+                <TextView
+                    android:id="@+id/thu_2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:layout_marginVertical="5dp"
+                    android:fontFamily="@font/nunito_semibold"
+                    android:text="12"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+                    android:textColor="@color/black"
+
+                    />
+
+                <ImageView
+                    android:layout_width="5dp"
+                    android:layout_height="5dp"
+
+                    android:src="@drawable/ic_white_dot"
+
+                    app:tint="@color/white_bg" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/fri"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginEnd="5dp"
+                android:layout_weight="1"
+                android:background="@drawable/round_corners"
+
+                android:gravity="center_horizontal"
+
+                android:orientation="vertical"
+
+                android:paddingVertical="15dp"
+
+                >
+
+                <TextView
+                    android:id="@+id/fri_1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:fontFamily="@font/nunito_regular"
+                    android:text="@string/fri"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                    android:textColor="@color/black"
+
+                    />
+
+                <TextView
+                    android:id="@+id/fri_2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:layout_marginVertical="5dp"
+                    android:fontFamily="@font/nunito_semibold"
+                    android:text="12"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+                    android:textColor="@color/black"
+
+                    />
+
+                <ImageView
+                    android:layout_width="5dp"
+                    android:layout_height="5dp"
+
+                    android:src="@drawable/ic_white_dot"
+
+                    app:tint="@color/white_bg" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/sat"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_weight="1"
+                android:background="@drawable/round_corners"
+                android:gravity="center_horizontal"
+
+                android:orientation="vertical"
+
+                android:paddingVertical="15dp"
+
+                >
+
+                <TextView
+                    android:id="@+id/sat_1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:fontFamily="@font/nunito_regular"
+                    android:text="@string/sat"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                    android:textColor="@color/black"
+
+                    />
+
+                <TextView
+                    android:id="@+id/sat_2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:layout_marginVertical="5dp"
+                    android:fontFamily="@font/nunito_semibold"
+                    android:text="12"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+                    android:textColor="@color/black"
+
+                    />
+
+                <ImageView
+                    android:layout_width="5dp"
+                    android:layout_height="5dp"
+
+                    android:src="@drawable/ic_white_dot"
+
+                    app:tint="@color/white_bg" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <View
+            android:id="@+id/divider"
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+
+            android:layout_below="@id/dates"
+
+            android:layout_centerHorizontal="true"
+
+            android:layout_marginHorizontal="25dp"
+
+            android:background="@android:color/darker_gray"
+
+            />
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:layout_below="@id/divider"
+            android:layout_centerHorizontal="true"
+
+            android:overScrollMode="never">
+
+            <LinearLayout
+                android:id="@+id/no_data"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
+                android:layout_marginTop="25dp"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:id="@+id/img"
+                    android:layout_width="150dp"
+                    android:layout_height="150dp"
+                    android:contentDescription="@string/medication_reminder"
+
+                    android:src="@drawable/ic_routine_img" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="30dp"
+
+                    android:layout_marginVertical="25dp"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+
+                        android:layout_gravity="center_horizontal"
+                        android:fontFamily="@font/nunito_semibold"
+                        android:text="@string/you_don_t_have_any_routines_reminder"
+                        android:textAlignment="center"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
+
+                        android:textColor="@color/black"
+
+                        />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginVertical="15dp"
+                        android:fontFamily="@font/nunito_regular"
+                        android:text="@string/please_click_on_add_button_to_add_routine_reminder"
+                        android:textAlignment="center"
+
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+
+                        android:textColor="#5B5B5B" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </ScrollView>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/routine_rv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+
+            android:layout_below="@id/divider"
+            android:layout_marginTop="25dp"
+            android:layout_marginBottom="15dp"
+            android:overScrollMode="never"
+            android:visibility="gone"
+            />
+
+        <com.google.android.material.imageview.ShapeableImageView
+            android:id="@+id/add_routine"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginHorizontal="25dp"
+
+            android:layout_marginBottom="30dp"
+            android:background="@drawable/round_corners"
+
+            android:backgroundTint="@color/color_primary"
+            android:elevation="5dp"
+            app:srcCompat="@drawable/ic_plus_sign"
+
+            app:contentPadding="10dp"
+
+            app:tint="@color/white_bg"
+
+            />
+
+    </RelativeLayout>
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/done"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="15dp"
+        android:layout_marginBottom="15dp"
+        android:text="@string/done_btn"
+        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+        android:textAllCaps="false"
+        android:fontFamily="@font/nunito_regular"
+        android:textColor="@color/white_bg"
+
+        android:paddingVertical="15dp"
+
+        app:backgroundTint="@color/color_primary"
+        app:cornerRadius="15dp"
+
+        android:drawableEnd="@drawable/ic_forward_error"
+        android:drawableTint="@color/white"
+
+        android:layout_alignParentBottom="true"
+        />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/routine_viewholder.xml b/app/src/main/res/layout/routine_viewholder.xml
new file mode 100644
index 0000000..9d91953
--- /dev/null
+++ b/app/src/main/res/layout/routine_viewholder.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@color/white_bg">
+
+    <TextView
+        android:id="@+id/start_time_static"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+
+        tools:text="7 AM"
+        android:fontFamily="@font/nunito_regular"
+        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+        android:textColor="#131313"
+
+        android:layout_marginStart="15dp"
+        android:layout_marginVertical="15dp"
+
+        />
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/card"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+
+        android:layout_toEndOf="@id/start_time_static"
+
+        android:layout_marginVertical="15dp"
+        android:layout_marginHorizontal="15dp"
+
+        app:cardCornerRadius="15dp"
+        app:cardElevation="5dp"
+        app:cardBackgroundColor="@color/color_accent"
+        >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white_bg"
+            android:layout_marginStart="15dp"
+            >
+
+            <LinearLayout
+                android:id="@+id/ll"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginVertical="15dp"
+                android:layout_marginStart="15dp"
+                android:weightSum="10">
+
+                <TextView
+                    android:id="@+id/routine_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="9"
+
+                    tools:text="Doctors appointment bla bla bla blaaa blabla lbal bla"
+                    android:fontFamily="@font/nunito_bold"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
+                    android:textColor="@color/black"
+
+                    android:maxLines="2"
+                    android:ellipsize="end"
+
+                    />
+
+                <ImageView
+                    android:id="@+id/delete"
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:layout_weight="1"
+                    android:contentDescription="@string/delete"
+
+                    app:srcCompat="@drawable/ic_delete_2"
+                    app:tint="@color/black"
+
+                    android:padding="5dp"
+
+                    />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
+                tools:text="Meet your heart specialist Abraham at 4:00 pm"
+                android:fontFamily="@font/nunito_regular"
+                android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                android:textColor="@color/black"
+
+                android:layout_below="@id/ll"
+
+                android:layout_marginHorizontal="15dp"
+
+                />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginVertical="15dp"
+                android:layout_marginStart="15dp"
+                android:layout_below="@id/description"
+                android:gravity="bottom"
+                android:weightSum="10">
+
+                <TextView
+                    android:id="@+id/time_slot"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="9"
+
+                    tools:text="7 : 00 AM - 9 : 00 AM"
+                    android:fontFamily="@font/nunito_regular"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                    android:textColor="@color/black"
+
+                    android:maxLines="1"
+                    android:ellipsize="end"
+
+                    />
+
+                <ImageView
+                    android:id="@+id/check"
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:layout_weight="1"
+                    android:contentDescription="@string/delete"
+
+                    app:srcCompat="@drawable/ic_check"
+                    app:tint="@color/black"
+
+                    android:padding="5dp"
+
+                    />
+
+            </LinearLayout>
+
+        </RelativeLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+    <TextView
+        android:id="@+id/end_time_static"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+
+        tools:text="7 AM"
+        android:fontFamily="@font/nunito_regular"
+        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+        android:textColor="#131313"
+
+        android:layout_marginStart="15dp"
+        android:layout_marginBottom="15dp"
+
+        android:layout_alignParentBottom="true"
+
+        />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/thank_you_fragment.xml b/app/src/main/res/layout/thank_you_fragment.xml
index a9c3619..672f951 100644
--- a/app/src/main/res/layout/thank_you_fragment.xml
+++ b/app/src/main/res/layout/thank_you_fragment.xml
@@ -28,7 +28,8 @@
             android:layout_width="match_parent"
             android:layout_height="250dp"
             android:layout_gravity="center_horizontal"
-            android:layout_marginVertical="40dp"
+            android:layout_marginTop="25dp"
+            android:layout_marginBottom="15dp"
             android:layout_marginHorizontal="15dp"
             android:contentDescription="@string/thank_you"/>
 
@@ -50,7 +51,7 @@
             android:textAlignment="center"
             android:fontFamily="@font/nunito_regular"
             android:layout_marginBottom="25dp"
-            android:layout_marginTop="15dp"/>
+            android:layout_marginTop="5dp"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/navigation/cp_dashboard_graph.xml b/app/src/main/res/navigation/cp_dashboard_graph.xml
new file mode 100644
index 0000000..e5f0eda
--- /dev/null
+++ b/app/src/main/res/navigation/cp_dashboard_graph.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cp_dashboard_graph"
+    app:startDestination="@id/CPDashboardFragment">
+
+    <fragment
+        android:id="@+id/CPDashboardFragment"
+        android:name="com.ssb.simplitend.careperson_dashboard.fragments.CPDashboardFragment"
+        android:label="CPDashboardFragment" >
+        <action
+            android:id="@+id/action_CPDashboardFragment_to_chatListFragment"
+            app:destination="@id/chatListFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/chatListFragment"
+        android:name="com.ssb.simplitend.careperson_dashboard.chats.ChatListFragment"
+        android:label="ChatListFragment" />
+</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/welcome_nav_graph.xml b/app/src/main/res/navigation/welcome_nav_graph.xml
index 9332e88..b0da61a 100644
--- a/app/src/main/res/navigation/welcome_nav_graph.xml
+++ b/app/src/main/res/navigation/welcome_nav_graph.xml
@@ -152,6 +152,9 @@
         <action
             android:id="@+id/action_profileProgressFragment_to_medicalInfoFragment"
             app:destination="@id/medicalInfoFragment" />
+        <action
+            android:id="@+id/action_profileProgressFragment_to_routineFragment"
+            app:destination="@id/routineFragment" />
     </fragment>
     <fragment
         android:id="@+id/reminderFragment"
@@ -186,4 +189,16 @@
         android:id="@+id/addMedicalInfoFragment"
         android:name="com.ssb.simplitend.medicalinfo.AddMedicalInfoFragment"
         android:label="AddMedicalInfoFragment" />
+    <fragment
+        android:id="@+id/routineFragment"
+        android:name="com.ssb.simplitend.setuproutine.RoutineFragment"
+        android:label="RoutineFragment" >
+        <action
+            android:id="@+id/action_routineFragment_to_addRoutineFragment"
+            app:destination="@id/addRoutineFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/addRoutineFragment"
+        android:name="com.ssb.simplitend.setuproutine.AddRoutineFragment"
+        android:label="AddRoutineFragment" />
 </navigation>
\ 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 56df7ea..6a26e99 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
     <string name="app_name">SimpliTend</string>
     <string name="welcome_to_nsimplitend">Welcome to\nSimpliTend</string>
-    <string name="welcome_msg">Caring for a loved one may be overwhelming.... Let our app assist you!</string>
+    <string name="welcome_msg">Caring for a loved one may be overwhelming....\nLet our app assist you!</string>
     <string name="logo_bg">logo_bg</string>
     <string name="welcome_illustration">welcome_illustration</string>
     <string name="next_btn">next_btn</string>
@@ -125,6 +125,7 @@
     <string name="continue_and_complete_profile">You can continue and complete the profile.</string>
     <string name="you_don_t_have_any_medication_reminder">You don\'t have any medication reminder.</string>
     <string name="please_click_on_add_button_to_add_medication_reminder">Please click on add button to add medication reminder</string>
+    <string name="please_click_on_add_button_to_add_routine_reminder">Please click on add button to add routines reminder</string>
     <string name="todo">TODO</string>
     <string name="march_16">March, 16</string>
 
@@ -138,6 +139,7 @@
     <string name="enter_temporary_pin">Enter temporary pin</string>
     <string name="caring_for_a_loved_one_may_be_overwhelming_let_our_app_assist_you">Caring for a loved one may be overwhelming.... Let our app assist you!</string>
     <string name="add_reminder">Add reminder</string>
+    <string name="save_reminder">Save reminder</string>
     <string name="medicine_name">Medicine name</string>
     <string name="enter_your_medicine_name">Enter your medicine name</string>
     <string name="mg">Mg</string>
@@ -167,6 +169,7 @@
 
     <string name="delete_med_reminder">Are you sure you want to delete the medication reminder?</string>
     <string name="edit_reminder">Edit reminder</string>
+    <string name="edit_routine">Edit routine</string>
     <string name="done_btn">Done</string>
     <string name="you_don_t_have_any_medical_information">You don\'t have any medical information</string>
     <string name="please_click_on_add_button_to_add">Please click on add button to add medical information</string>
@@ -182,6 +185,7 @@
     <string name="diet_restriction">Diet Restriction</string>
     <string name="random_description_lorum_ipsum_with_short_description">Random description lorum ipsum with short description</string>
     <string name="add_medical_information">Add medical information</string>
+    <string name="edit_medical_information">Edit medical information</string>
     <string name="enter_diagnosis">Enter diagnosis</string>
     <string name="enter_primary_doctor_number">Enter primary doctor number</string>
     <string name="enter_contact_number">Enter contact number</string>
@@ -189,5 +193,24 @@
     <string name="enter_allergies">Enter allergies</string>
     <string name="enter_diet_restriction">Enter diet restriction</string>
     <string name="add">Add</string>
+    <string name="routine">Routine</string>
+    <string name="you_don_t_have_any_routines_reminder">You don\'t have any routines reminder.</string>
+    <string name="add_routine">Add routine</string>
+    <string name="name_of_the_routine">Name of the Routine</string>
+    <string name="enter_routine_name">Enter routine name</string>
+    <string name="routine_description">Routine description</string>
+    <string name="enter_description">Enter description</string>
+    <string name="enter_start_time">Enter start time</string>
+    <string name="enter_end_time">Enter end time</string>
+    <string name="bar">bar</string>
+    <string name="delete_med_routine">Are you sure you want to delete the Medication routine?</string>
+    <string name="notification">notification</string>
+    <string name="close">close</string>
+    <string name="calls">Calls</string>
+    <string name="chats">Chats</string>
+    <string name="apps">Apps</string>
+    <string name="direction">Direction</string>
+    <string name="sos">sos</string>
+    <string name="search_chats">Search chats</string>
 
 </resources>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 3e927b1..92b9117 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,5 @@ android.useAndroidX=true
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.enableJetifier=true
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index bc9b461..73d12d8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,6 +10,8 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven { url 'https://jitpack.io' }
+        jcenter()
     }
 }
 rootProject.name = "SimpliTend"