diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ea59fd5..0774b88 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,7 +46,6 @@
         </activity>
         <activity
             android:name=".welcome.activities.WelcomeActivity"
-            android:configChanges="orientation"
             android:exported="true"
             android:screenOrientation="portrait">
             <intent-filter>
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 ec012d0..801c883 100644
--- a/app/src/main/java/com/ssb/simplitend/apputils/AppUtil.java
+++ b/app/src/main/java/com/ssb/simplitend/apputils/AppUtil.java
@@ -10,6 +10,7 @@ import android.os.Handler;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/com/ssb/simplitend/patientprofile/ProfileProgressFragment.java b/app/src/main/java/com/ssb/simplitend/patientprofile/ProfileProgressFragment.java
index 4d7ba84..5e1c396 100644
--- a/app/src/main/java/com/ssb/simplitend/patientprofile/ProfileProgressFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/patientprofile/ProfileProgressFragment.java
@@ -101,11 +101,8 @@ public class ProfileProgressFragment extends Fragment implements ProfileContract
                 Navigation.findNavController(v).navigate(R.id.action_profileProgressFragment_to_routineFragment)
         );
 
-        binding.skipToDashboard.setOnClickListener(v -> {
-            Intent intent = new Intent(requireActivity(), DashBoardActivity.class);
-            intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-            startActivity(intent);
-            requireActivity().finish();
+        binding.proceed.setOnClickListener(v -> {
+            Navigation.findNavController(v).navigate(R.id.action_profileProgressFragment_to_registerCompleteFragment);
         });
 
     }
diff --git a/app/src/main/java/com/ssb/simplitend/patientprofile/RegisterCompleteFragment.java b/app/src/main/java/com/ssb/simplitend/patientprofile/RegisterCompleteFragment.java
new file mode 100644
index 0000000..f35ea00
--- /dev/null
+++ b/app/src/main/java/com/ssb/simplitend/patientprofile/RegisterCompleteFragment.java
@@ -0,0 +1,72 @@
+package com.ssb.simplitend.patientprofile;
+
+import android.animation.Animator;
+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 com.daimajia.androidanimations.library.Techniques;
+import com.daimajia.androidanimations.library.YoYo;
+import com.ssb.simplitend.R;
+import com.ssb.simplitend.apputils.AppUtil;
+import com.ssb.simplitend.databinding.RegisterationDoneFragmentBinding;
+
+public class RegisterCompleteFragment extends Fragment {
+
+    public RegisterationDoneFragmentBinding binding;
+
+    public RegisterCompleteFragment(){
+        // required
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        binding = RegisterationDoneFragmentBinding.inflate(inflater, container, false);
+
+        binding.animIv.setAnimation(R.raw.done_anim_2);
+        binding.animIv.playAnimation();
+
+        binding.animIv.addAnimatorListener(new Animator.AnimatorListener() {
+            @Override
+            public void onAnimationStart(@NonNull Animator animator) {
+
+            }
+
+            @Override
+            public void onAnimationEnd(@NonNull Animator animator) {
+                binding.title.setText(getString(R.string.your_profile_is_100_complete));
+                YoYo.with(Techniques.FadeIn)
+                        .duration(100)
+                        .playOn(binding.title);
+            }
+
+            @Override
+            public void onAnimationCancel(@NonNull Animator animator) {
+
+            }
+
+            @Override
+            public void onAnimationRepeat(@NonNull Animator animator) {
+
+            }
+        });
+
+        binding.proceed.setOnClickListener(v -> {
+            AppUtil.showAlert(requireContext(),
+                    "Ask Caregiver to register",
+                    "Kindly ask CareGiver to complete registeration.",
+                    "OK",
+                    ((dialogInterface, i) -> {
+
+                    }), null, null);
+        });
+
+        return binding.getRoot();
+    }
+}
diff --git a/app/src/main/java/com/ssb/simplitend/patientprofile/medicalinfo/AddMedicalInfoFragment.java b/app/src/main/java/com/ssb/simplitend/patientprofile/medicalinfo/AddMedicalInfoFragment.java
index d235d46..f4a67d9 100644
--- a/app/src/main/java/com/ssb/simplitend/patientprofile/medicalinfo/AddMedicalInfoFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/patientprofile/medicalinfo/AddMedicalInfoFragment.java
@@ -180,9 +180,10 @@ public class AddMedicalInfoFragment extends Fragment implements
             binding.primaryDoc.setError("Required");
         }
 
-        if (binding.docContact.getText().toString().trim().isEmpty()){
+        if (binding.docContact.getText().toString().trim().isEmpty()
+                || binding.docContact.getText().toString().trim().length() < 10){
             allOkay = false;
-            binding.docContact.setError("Required");
+            binding.docContact.setError("Invalid");
         }
 
         if (binding.hospitalPref.getText().toString().trim().isEmpty()){
diff --git a/app/src/main/java/com/ssb/simplitend/patientprofile/medreminder/AddReminderFragment.java b/app/src/main/java/com/ssb/simplitend/patientprofile/medreminder/AddReminderFragment.java
index f8fefc5..2a7384f 100644
--- a/app/src/main/java/com/ssb/simplitend/patientprofile/medreminder/AddReminderFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/patientprofile/medreminder/AddReminderFragment.java
@@ -170,6 +170,8 @@ public class AddReminderFragment extends Fragment implements CompoundButton.OnCh
             // this intent is to update the reminder
             reminderResult.is_update = "1";
             reminderResult.patientRemainderId = reminder.id;
+
+            reminderResult.reminder_marked = reminder.reminder_marked;
         } else {
             reminderResult.is_update = "0";
         }
@@ -503,6 +505,8 @@ public class AddReminderFragment extends Fragment implements CompoundButton.OnCh
 
             });
 
+            dpd.getDatePicker().setMinDate(System.currentTimeMillis());
+
             dpd.show();
         }
 
diff --git a/app/src/main/java/com/ssb/simplitend/patientprofile/medreminder/mvvm/ReminderAdapter.java b/app/src/main/java/com/ssb/simplitend/patientprofile/medreminder/mvvm/ReminderAdapter.java
index 3d1da1f..882a354 100644
--- a/app/src/main/java/com/ssb/simplitend/patientprofile/medreminder/mvvm/ReminderAdapter.java
+++ b/app/src/main/java/com/ssb/simplitend/patientprofile/medreminder/mvvm/ReminderAdapter.java
@@ -13,7 +13,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.ssb.simplitend.R;
 import com.ssb.simplitend.databinding.ReminderViewholderBinding;
 import com.ssb.simplitend.patientprofile.medreminder.mvvm.models.ReminderResult;
-import com.ssb.simplitend.patientprofile.setuproutine.mvvm.RoutineAdapter;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -107,29 +106,22 @@ public class ReminderAdapter extends ListAdapter<ReminderResult, ReminderAdapter
             String quantity = reminder.medication_quantity + " capsules";
             binding.quantity.setText(quantity);
 
-            // static image
-            if (position == 0){
-                binding.medImg.setImageResource(R.drawable.img_med_type_1);
+            if (reminder.medication_type != null && reminder.medication_type.size() > 0) {
+                switch (reminder.medication_type.get(0).title){
+                    case "Capsule":
+                        binding.medImg.setImageResource(R.drawable.ic_capsules);
+                        break;
+                    case "Pill":
+                        binding.medImg.setImageResource(R.drawable.ic_pills);
+                        break;
+                    case "Drops":
+                        binding.medImg.setImageResource(R.drawable.ic_drops);
+                        break;
+                }
             }else{
-                binding.medImg.setImageResource(R.drawable.img_med_type_2);
+                binding.medImg.setImageResource(R.drawable.ic_capsules);
             }
 
-//            binding.done.setOnClickListener(v -> {
-//                if (selection_state[position]){
-//                    // item selected. un-selecting now
-//                    binding.sideBar.setBackgroundTintList(null);
-//                    binding.card.setCardBackgroundColor(AppCompatResources.getColorStateList(itemView.getContext(), R.color.white_bg));
-//                    binding.done.setImageResource(R.drawable.ic_done_accent);
-//                }else{
-//                    // item un-selected. selecting now
-//                    binding.sideBar.setBackgroundTintList(AppCompatResources.getColorStateList(itemView.getContext(), R.color.color_primary));
-//                    binding.card.setCardBackgroundColor(AppCompatResources.getColorStateList(itemView.getContext(), R.color.color_accent));
-//                    binding.done.setImageResource(R.drawable.ic_done_accent_2);
-//                }
-//
-//                selection_state[position] = !selection_state[position];
-//            });
-
             if (reminder.reminder_marked != null){
                 /*
                     This routine is done for some day.
diff --git a/app/src/main/java/com/ssb/simplitend/patientprofile/setuproutine/AddRoutineFragment.java b/app/src/main/java/com/ssb/simplitend/patientprofile/setuproutine/AddRoutineFragment.java
index a8aa538..d78bb02 100644
--- a/app/src/main/java/com/ssb/simplitend/patientprofile/setuproutine/AddRoutineFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/patientprofile/setuproutine/AddRoutineFragment.java
@@ -147,11 +147,38 @@ public class AddRoutineFragment extends Fragment implements CompoundButton.OnChe
 
         binding.startTime.setOnClickListener(v -> {
             AppUtil.closeKeyboard(requireActivity());
-            getTime(binding.startTime);
+            binding.startTime.setError(null);
+
+            Date selected_date = null;
+
+            if (!binding.startTime.getText().toString().trim().isEmpty()){
+                SimpleDateFormat sdf = new SimpleDateFormat("hh:mm a", Locale.getDefault());
+                try {
+                    selected_date = sdf.parse(binding.startTime.getText().toString().trim());
+                }catch (Exception e){
+                    // do nothing
+                }
+            }
+
+            getTime(binding.startTime, selected_date);
         });
+
         binding.endTime.setOnClickListener(v -> {
             AppUtil.closeKeyboard(requireActivity());
-            getTime(binding.endTime);
+            binding.endTime.setError(null);
+
+            Date selected_date = null;
+
+            if (!binding.endTime.getText().toString().trim().isEmpty()){
+                SimpleDateFormat sdf = new SimpleDateFormat("hh:mm a", Locale.getDefault());
+                try {
+                    selected_date = sdf.parse(binding.endTime.getText().toString().trim());
+                }catch (Exception e){
+                    // do nothing
+                }
+            }
+
+            getTime(binding.endTime, selected_date);
         });
 
         binding.addRoutine.setOnClickListener(v -> {
@@ -205,6 +232,7 @@ public class AddRoutineFragment extends Fragment implements CompoundButton.OnChe
             // this intent is to update the reminder
             routineDetails.is_update = 1;
             routineDetails.patientRoutineId = routine.id;
+            routineDetails.routine_marked = routine.routine_marked;
         } else {
             routineDetails.is_update = 0;
         }
@@ -241,6 +269,26 @@ public class AddRoutineFragment extends Fragment implements CompoundButton.OnChe
             binding.endTime.setError("Required");
         }
 
+        if (allOkay){
+            SimpleDateFormat sdf = new SimpleDateFormat("hh:mm a", Locale.getDefault());
+
+            try {
+                Date start_date = sdf.parse(binding.startTime.getText().toString().trim());
+                Date end_date = sdf.parse(binding.endTime.getText().toString().trim());
+
+                if (start_date == null || end_date == null) throw new Exception();
+
+                if (start_date.getTime() >= end_date.getTime()){
+                    Toast.makeText(requireContext(), "Emd time should be greater than start time.", Toast.LENGTH_SHORT).show();
+                    allOkay = false;
+                }
+
+            } catch (Exception e) {
+                // do nothing
+            }
+
+        }
+
         if (allOkay) {
             boolean anyOneSelected = false;
             for (int i = 0; i < week_state.length; i++) {
@@ -279,10 +327,14 @@ public class AddRoutineFragment extends Fragment implements CompoundButton.OnChe
 
     // 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) {
+    private void getTime(TextView textView, Date selected_date) {
 
         Calendar calendar = Calendar.getInstance(Locale.getDefault());
 
+        if (selected_date != null){
+            calendar.setTime(selected_date);
+        }
+
         TimePickerDialog tpd = new TimePickerDialog(requireContext(),
                 (view, hourOfDay, minute) -> {
 
diff --git a/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/AddContactFragment.java b/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/AddContactFragment.java
index 1fb78d7..4c9185f 100644
--- a/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/AddContactFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/AddContactFragment.java
@@ -1,6 +1,7 @@
 package com.ssb.simplitend.welcome.fragments.contacts;
 
 import static com.ssb.simplitend.welcome.fragments.contacts.ContactInfoFragment.CONTACT_DATA_KEY;
+import static com.ssb.simplitend.welcome.fragments.contacts.CreateContactFragment.TO_EDIT_KEY;
 
 import android.app.ProgressDialog;
 import android.os.Bundle;
@@ -121,8 +122,26 @@ public class AddContactFragment extends Fragment implements WelcomeContracts.Con
     public void onContactClick(ContactData contactData, int position) {
         if (contactData.id == -1){
             // a new contact should be added
-            Navigation.findNavController(binding.getRoot())
-                    .navigate(R.id.action_addContactFragment_to_contactListFragment);
+
+
+            AppUtil.showAlert(requireContext(),
+                    "Select contact",
+                    "Add from contacts or manually?",
+                    "Contacts",
+                    ((dialogInterface, i) -> {
+                        Navigation.findNavController(binding.getRoot())
+                                .navigate(R.id.action_addContactFragment_to_contactListFragment);
+                    }),
+                    "Manually",
+                    ((dialogInterface, i) -> {
+                        Bundle bundle = new Bundle();
+                        bundle.putSerializable(TO_EDIT_KEY, false);
+
+                        Navigation.findNavController(binding.getRoot())
+                                .navigate(R.id.action_addContactFragment_to_createContactFragment, bundle);
+                    })
+                    );
+
         }else{
             // show contact details
             Bundle bundle = new Bundle();
diff --git a/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/ContactInfoFragment.java b/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/ContactInfoFragment.java
index af7aad8..18a6ea9 100644
--- a/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/ContactInfoFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/ContactInfoFragment.java
@@ -83,7 +83,19 @@ public class ContactInfoFragment extends Fragment implements WelcomeContracts.De
         binding.name.setText(contactData.first_name);
         binding.phoneNumber.setText(contactData.phone_number);
         binding.email.setText(contactData.email_address);
-        binding.relationship.setText(contactData.relationship);
+
+        if (contactData.relationship == null || contactData.relationship.trim().isEmpty()){
+            binding.relationship.setVisibility(View.GONE);
+            binding.relationshipTag.setVisibility(View.GONE);
+        }
+
+        if (contactData.is_sos.equals("1")){
+            binding.relationship.setText(contactData.relationship + "( Emergency contact )");
+        }else{
+            binding.relationship.setText(contactData.relationship);
+        }
+
+
     }
 
     private void clickEvents() {
diff --git a/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/ContactListFragment.java b/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/ContactListFragment.java
index 054a51e..e382100 100644
--- a/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/ContactListFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/ContactListFragment.java
@@ -156,8 +156,6 @@ public class ContactListFragment extends Fragment {
         binding.contactRv.setLayoutManager(new LinearLayoutManager(requireContext()));
         binding.contactRv.setAdapter(contactListAdapter);
 
-        loadContacts();
-
         permissionLauncher = registerForActivityResult(new ActivityResultContracts.RequestPermission(),
                 granted -> {
                     if (granted) {
@@ -177,6 +175,8 @@ public class ContactListFragment extends Fragment {
 
                 });
 
+        loadContacts();
+
     }
 
     /*
diff --git a/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/CreateContactFragment.java b/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/CreateContactFragment.java
index 19c6d08..9d0611b 100644
--- a/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/CreateContactFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/welcome/fragments/contacts/CreateContactFragment.java
@@ -83,6 +83,9 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
 
     private ContactData contactData;
 
+    // Remote contact list
+    protected List<ContactListResponse> contactList;
+
     public CreateContactFragment() {
         // required empty const.
     }
@@ -323,9 +326,10 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
             binding.name.setError("Required");
         }
 
-        if (binding.phoneNumber.getText().toString().trim().isEmpty()) {
+        if (binding.phoneNumber.getText().toString().trim().isEmpty() ||
+                binding.phoneNumber.getText().toString().trim().length() < 10) {
             allOkay = false;
-            binding.phoneNumber.setError("Required");
+            binding.phoneNumber.setError("Invalid");
         } else if (!Patterns.PHONE.matcher(binding.phoneNumber.getText().toString()).matches()) {
             allOkay = false;
             binding.phoneNumber.setError("Invalid number");
@@ -347,6 +351,20 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
         return allOkay;
     }
 
+    private boolean phoneAlreadyAdded() {
+
+        for (ContactListResponse contact: contactList){
+            String contact_number = countryCodeList.get(binding.countryCodes.getSelectedIndex()) + " " +
+                    binding.phoneNumber.getText().toString();
+
+            if (contact.contact_data.phone_number.equals(contact_number)){
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     @Override
     public void gotoAddFragment(BottomSheetDialog bsd) {
         new Handler().postDelayed(() -> {
@@ -367,6 +385,9 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
     @Override
     public void onResponse(List<ContactListResponse> contactList) {
         Log.d(TAG, "onResponse: " + contactList);
+
+        this.contactList = contactList;
+
         if (contactList.size() == 0) {
             // there are no contacts in remote database
             // thus, this contact has to be a caregiver
@@ -376,6 +397,8 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
             binding.caregiverCheckView.setVisibility(View.VISIBLE);
             this.mustBeeCaregiver = true;
             binding.caregiverCheck.setChecked(true);
+        }else{
+            binding.caregiverCheckView.setVisibility(View.GONE);
         }
 
         // checking if there is any SOS contact already in list
diff --git a/app/src/main/java/com/ssb/simplitend/welcome/fragments/register/LocationFragment.java b/app/src/main/java/com/ssb/simplitend/welcome/fragments/register/LocationFragment.java
index 77c792e..36c8144 100644
--- a/app/src/main/java/com/ssb/simplitend/welcome/fragments/register/LocationFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/welcome/fragments/register/LocationFragment.java
@@ -10,11 +10,17 @@ import android.content.Intent;
 import android.location.Location;
 import android.location.LocationManager;
 import android.os.Bundle;
+import android.os.SystemClock;
 import android.provider.Settings;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.activity.result.ActivityResultLauncher;
@@ -112,6 +118,15 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback,
         return binding.getRoot();
     }
 
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (getActivity() != null) {
+            getActivity().getWindow()
+                    .setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+        }
+    }
+
     @Override
     public void onDestroyView() {
         super.onDestroyView();
@@ -124,6 +139,8 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback,
 
         loadCountriesAndStates();
 
+        inputFieldFocusManage();
+
         try {
             loadPatientAddressSavedState();
         } catch (Exception e) {
@@ -160,6 +177,17 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback,
 
     }
 
+    private void inputFieldFocusManage() {
+
+        binding.town.setOnEditorActionListener((textView, i, keyEvent) -> {
+            AppUtil.closeKeyboard(requireActivity());
+            binding.town.clearFocus();
+            binding.countrySpinner.show();
+            return true;
+        });
+
+    }
+
     // load data from watcher
     private void loadPatientAddressSavedState() throws Exception {
         PatientData patientData = viewModel.getPatientData();
@@ -461,15 +489,15 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback,
         binding.countrySpinner.setItems(countryList);
 
 
-
-        if (countryList.contains(UNITED_STATES)){
-            binding.countrySpinner.selectItemByIndex(countryList.indexOf(UNITED_STATES));
-
-            if (country_N_states_map.containsKey(UNITED_STATES))
-            {
-                binding.stateSpinner.setItems(country_N_states_map.get(UNITED_STATES));
-            }
-        }
+        // selecting United States country as by default
+//        if (countryList.contains(UNITED_STATES)){
+//            binding.countrySpinner.selectItemByIndex(countryList.indexOf(UNITED_STATES));
+//
+//            if (country_N_states_map.containsKey(UNITED_STATES))
+//            {
+//                binding.stateSpinner.setItems(country_N_states_map.get(UNITED_STATES));
+//            }
+//        }
 
         binding.stateSpinner.setDismissWhenNotifiedItemSelected(true);
         binding.countrySpinner.setDismissWhenNotifiedItemSelected(true);
@@ -493,10 +521,18 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback,
                 binding.stateSpinner.setItems(stateList);
                 binding.stateSpinner.clearSelectedItem();
             }
+
+            binding.stateSpinner.requestFocus();
         });
         
         binding.stateSpinner.setOnSpinnerItemSelectedListener((OnSpinnerItemSelectedListener<String>) (i, s, i1, t1) -> {
             binding.stateSpinner.setError(null);
+            binding.zipCode.requestFocus();
+
+            if (getActivity() != null) {
+                getActivity().getWindow()
+                        .setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+            }
         });
 
     }
diff --git a/app/src/main/java/com/ssb/simplitend/welcome/fragments/register/RegisterFragment.java b/app/src/main/java/com/ssb/simplitend/welcome/fragments/register/RegisterFragment.java
index 0cd3c45..fb61c4c 100644
--- a/app/src/main/java/com/ssb/simplitend/welcome/fragments/register/RegisterFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/welcome/fragments/register/RegisterFragment.java
@@ -6,17 +6,13 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.telephony.PhoneNumberFormattingTextWatcher;
-import android.telephony.PhoneNumberUtils;
-import android.text.Editable;
 import android.text.InputFilter;
-import android.text.Spanned;
-import android.text.TextWatcher;
 import android.util.Log;
 import android.util.Patterns;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -26,7 +22,6 @@ import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.navigation.Navigation;
 
-import com.google.i18n.phonenumbers.NumberParseException;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
 import com.google.i18n.phonenumbers.Phonenumber;
 import com.ssb.simplitend.R;
@@ -57,6 +52,8 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif
 
     private ProgressDialog progressDialog;
 
+    private DatePickerDialog datePickerDialog;
+
     public RegisterFragment() {
         // required empty const.
     }
@@ -75,10 +72,23 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif
         return binding.getRoot();
     }
 
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (getActivity() != null) {
+            getActivity().getWindow()
+                    .setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+        }
+    }
+
     private void initViews() {
 
         progressDialog = new ProgressDialog(requireContext());
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            datePickerDialog = new DatePickerDialog(requireContext());
+        }
+
         countryCodeList = viewModel.loadCountryCodeDropDown(requireContext());
 
         binding.countryCodes.setLifecycleOwner(this);
@@ -93,10 +103,23 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif
 
         loadPatientDataSavedState();
 
+        setFocusManager();
+
         setErrorRemovers();
 
     }
 
+    private void setFocusManager() {
+        binding.name.setOnEditorActionListener((textView, i, keyEvent) -> {
+            AppUtil.closeKeyboard(requireActivity());
+            binding.name.clearFocus();
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                pickDate();
+            }
+            return true;
+        });
+    }
+
     // This adds textChangeListener to all the EditTexts available to remove error if available
     private void setErrorRemovers() {
         new EditTextErrorRemover(
@@ -193,6 +216,7 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif
             binding.dob.setError(null);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 AppUtil.closeKeyboard(requireActivity());
+
                 pickDate();
             }
         });
@@ -244,8 +268,9 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif
             }
         }
 
-        if (binding.contactNumber.getText().toString().trim().isEmpty()) {
-            binding.contactNumber.setError("Required");
+        if (binding.contactNumber.getText().toString().trim().isEmpty() ||
+                binding.contactNumber.getText().toString().trim().length() <10) {
+            binding.contactNumber.setError("Invalid");
             allOkay = false;
         } else if (!Patterns.PHONE.matcher(binding.contactNumber.getText().toString()).matches()) {
             binding.contactNumber.setError("Invalid contact");
@@ -261,7 +286,14 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif
         }
 
         if (!binding.tncCheck.isChecked() && allOkay) {
-            Toast.makeText(requireContext(), "Please check terms and conditions to continue.", Toast.LENGTH_SHORT).show();
+            AppUtil.showAlert(requireContext(),
+                    "Accept terms and conditions",
+                    "Please check terms and conditions to continue.",
+                    "Ok",
+                    ((dialogInterface, i) -> {
+                        // do nothing
+                    }), null, null
+            );
             allOkay = false;
         }
 
@@ -306,7 +338,7 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif
     @RequiresApi(api = Build.VERSION_CODES.N)
     private void pickDate() {
 
-        DatePickerDialog datePickerDialog = new DatePickerDialog(requireContext());
+        if (datePickerDialog == null) return;
 
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) - 18);
@@ -314,6 +346,13 @@ public class RegisterFragment extends Fragment implements WelcomeContracts.Verif
 
         datePickerDialog.setOnDateSetListener((view, year, month, dayOfMonth) -> {
             setDOB(year, month, dayOfMonth);
+
+            binding.contactNumber.requestFocus();
+
+            if (getActivity() != null) {
+                getActivity().getWindow()
+                        .setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+            }
         });
 
         datePickerDialog.show();
diff --git a/app/src/main/res/drawable-hdpi/img_med_type_1.png b/app/src/main/res/drawable-hdpi/ic_capsules.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/img_med_type_1.png
rename to app/src/main/res/drawable-hdpi/ic_capsules.png
diff --git a/app/src/main/res/drawable-hdpi/img_med_type_2.png b/app/src/main/res/drawable-hdpi/ic_pills.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/img_med_type_2.png
rename to app/src/main/res/drawable-hdpi/ic_pills.png
diff --git a/app/src/main/res/drawable-ldpi/img_med_type_1.png b/app/src/main/res/drawable-ldpi/ic_capsules.png
similarity index 100%
rename from app/src/main/res/drawable-ldpi/img_med_type_1.png
rename to app/src/main/res/drawable-ldpi/ic_capsules.png
diff --git a/app/src/main/res/drawable-ldpi/img_med_type_2.png b/app/src/main/res/drawable-ldpi/ic_pills.png
similarity index 100%
rename from app/src/main/res/drawable-ldpi/img_med_type_2.png
rename to app/src/main/res/drawable-ldpi/ic_pills.png
diff --git a/app/src/main/res/drawable-mdpi/img_med_type_1.png b/app/src/main/res/drawable-mdpi/ic_capsules.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/img_med_type_1.png
rename to app/src/main/res/drawable-mdpi/ic_capsules.png
diff --git a/app/src/main/res/drawable-mdpi/img_med_type_2.png b/app/src/main/res/drawable-mdpi/ic_pills.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/img_med_type_2.png
rename to app/src/main/res/drawable-mdpi/ic_pills.png
diff --git a/app/src/main/res/drawable-tvdpi/img_med_type_1.png b/app/src/main/res/drawable-tvdpi/ic_capsules.png
similarity index 100%
rename from app/src/main/res/drawable-tvdpi/img_med_type_1.png
rename to app/src/main/res/drawable-tvdpi/ic_capsules.png
diff --git a/app/src/main/res/drawable-tvdpi/img_med_type_2.png b/app/src/main/res/drawable-tvdpi/ic_pills.png
similarity index 100%
rename from app/src/main/res/drawable-tvdpi/img_med_type_2.png
rename to app/src/main/res/drawable-tvdpi/ic_pills.png
diff --git a/app/src/main/res/drawable-xhdpi/img_med_type_1.png b/app/src/main/res/drawable-xhdpi/ic_capsules.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/img_med_type_1.png
rename to app/src/main/res/drawable-xhdpi/ic_capsules.png
diff --git a/app/src/main/res/drawable-xhdpi/img_med_type_2.png b/app/src/main/res/drawable-xhdpi/ic_pills.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/img_med_type_2.png
rename to app/src/main/res/drawable-xhdpi/ic_pills.png
diff --git a/app/src/main/res/drawable-xxhdpi/img_med_type_1.png b/app/src/main/res/drawable-xxhdpi/ic_capsules.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/img_med_type_1.png
rename to app/src/main/res/drawable-xxhdpi/ic_capsules.png
diff --git a/app/src/main/res/drawable-xxhdpi/img_med_type_2.png b/app/src/main/res/drawable-xxhdpi/ic_pills.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/img_med_type_2.png
rename to app/src/main/res/drawable-xxhdpi/ic_pills.png
diff --git a/app/src/main/res/drawable-xxxhdpi/img_med_type_1.png b/app/src/main/res/drawable-xxxhdpi/ic_capsules.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/img_med_type_1.png
rename to app/src/main/res/drawable-xxxhdpi/ic_capsules.png
diff --git a/app/src/main/res/drawable-xxxhdpi/img_med_type_2.png b/app/src/main/res/drawable-xxxhdpi/ic_pills.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/img_med_type_2.png
rename to app/src/main/res/drawable-xxxhdpi/ic_pills.png
diff --git a/app/src/main/res/drawable/ic_drops.png b/app/src/main/res/drawable/ic_drops.png
new file mode 100644
index 0000000..b16aaa0
Binary files /dev/null and b/app/src/main/res/drawable/ic_drops.png differ
diff --git a/app/src/main/res/drawable/ic_user_filled.png b/app/src/main/res/drawable/ic_user_filled.png
new file mode 100644
index 0000000..590b4b5
Binary files /dev/null and b/app/src/main/res/drawable/ic_user_filled.png differ
diff --git a/app/src/main/res/layout/contact_info_fragment.xml b/app/src/main/res/layout/contact_info_fragment.xml
index 3b88ba4..f0ca9fd 100644
--- a/app/src/main/res/layout/contact_info_fragment.xml
+++ b/app/src/main/res/layout/contact_info_fragment.xml
@@ -181,6 +181,7 @@
 
 
         <TextView
+            android:id="@+id/relationship_tag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
 
@@ -200,13 +201,12 @@
             android:layout_height="wrap_content"
 
             android:layout_marginHorizontal="15dp"
+            android:layout_marginBottom="25dp"
             android:fontFamily="@font/nunito_regular"
-            tools:text="@string/caregiver_emergency_contact"
             android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
             android:textColor="@color/black"
 
-            android:layout_marginBottom="25dp"
-            />
+            tools:text="@string/caregiver_emergency_contact" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/contact_view_holder.xml b/app/src/main/res/layout/contact_view_holder.xml
index ed33359..bcd3337 100644
--- a/app/src/main/res/layout/contact_view_holder.xml
+++ b/app/src/main/res/layout/contact_view_holder.xml
@@ -32,9 +32,9 @@
             android:id="@+id/image"
             android:layout_width="30dp"
             android:layout_height="30dp"
-            android:src="@drawable/ic_contact"
+            android:src="@drawable/ic_user_filled"
             android:contentDescription="@string/onboard_image"
-            />
+            app:tint="@color/color_primary" />
 
         <TextView
             android:id="@+id/name"
diff --git a/app/src/main/res/layout/location_fragment.xml b/app/src/main/res/layout/location_fragment.xml
index 88d217b..f1905c1 100644
--- a/app/src/main/res/layout/location_fragment.xml
+++ b/app/src/main/res/layout/location_fragment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/scroll_view"
     android:layout_width="match_parent"
@@ -337,4 +337,4 @@
 
     </LinearLayout>
 
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/profile_progress_fragment.xml b/app/src/main/res/layout/profile_progress_fragment.xml
index 9be5e7b..0a92c98 100644
--- a/app/src/main/res/layout/profile_progress_fragment.xml
+++ b/app/src/main/res/layout/profile_progress_fragment.xml
@@ -361,29 +361,25 @@
 
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/skip_to_dashboard"
-            android:layout_width="wrap_content"
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/proceed"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-
-            android:text="@string/skip_to_dashboard"
+            android:layout_marginStart="15dp"
+            android:layout_marginVertical="20dp"
+            android:text="@string/proceed"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            android:textAllCaps="false"
             android:fontFamily="@font/nunito_regular"
-            android:textSize="@dimen/_16ssp"
-            android:textColor="@android:color/black"
-
-            app:drawableEndCompat="@drawable/ic_right_kb"
-
-            android:gravity="center"
-            android:layout_gravity="end"
-
-            android:layout_marginVertical="25dp"
-
-            android:padding="5dp"
+            android:textColor="@color/white_bg"
+            android:paddingVertical="15dp"
+            app:backgroundTint="@color/color_primary"
+            app:cornerRadius="15dp"
 
+            android:drawableEnd="@drawable/ic_forward_error"
+            android:drawablePadding="15dp"
             />
 
-
-
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/registeration_done_fragment.xml b/app/src/main/res/layout/registeration_done_fragment.xml
new file mode 100644
index 0000000..fd38078
--- /dev/null
+++ b/app/src/main/res/layout/registeration_done_fragment.xml
@@ -0,0 +1,85 @@
+<?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"
+    android:overScrollMode="never">
+
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/proceed"
+
+        app:cardElevation="3dp"
+        app:cardCornerRadius="15dp"
+
+        android:layout_margin="15dp"
+
+        >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <com.airbnb.lottie.LottieAnimationView
+                android:id="@+id/anim_iv"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/_250sdp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginTop="40dp"
+                android:layout_marginBottom="15dp"
+                android:contentDescription="@string/thank_you" />
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/nunito_bold"
+                android:text="@string/your_setup_is_in_proceed"
+                android:layout_marginHorizontal="50dp"
+                android:textAlignment="center"
+                android:textSize="@dimen/_24ssp"
+                android:textColor="@color/black" />
+
+            <TextView
+                android:id="@+id/sub_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="25dp"
+                android:layout_marginHorizontal="15dp"
+                android:fontFamily="@font/nunito_regular"
+                android:text="@string/sync_with_caregiver_app_to_proceed"
+                android:textAlignment="center"
+                android:textSize="@dimen/_20ssp"
+                android:textColor="@color/black" />
+
+        </LinearLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/proceed"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="15dp"
+        android:layout_marginVertical="15dp"
+        android:layout_alignParentBottom="true"
+        android:text="@string/proceed"
+        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:drawablePadding="15dp"
+        />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/reminder_viewholder.xml b/app/src/main/res/layout/reminder_viewholder.xml
index 6c4c76b..707b3b7 100644
--- a/app/src/main/res/layout/reminder_viewholder.xml
+++ b/app/src/main/res/layout/reminder_viewholder.xml
@@ -159,7 +159,7 @@
 
                             android:layout_gravity="center_vertical"
 
-                            tools:srcCompat="@drawable/img_med_type_1"
+                            tools:srcCompat="@drawable/ic_capsules"
 
                             />
 
diff --git a/app/src/main/res/navigation/welcome_nav_graph.xml b/app/src/main/res/navigation/welcome_nav_graph.xml
index 7f08cfc..48399ec 100644
--- a/app/src/main/res/navigation/welcome_nav_graph.xml
+++ b/app/src/main/res/navigation/welcome_nav_graph.xml
@@ -2,7 +2,7 @@
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/welcome_nav_graph"
-    app:startDestination="@id/profileProgressFragment">
+    app:startDestination="@id/splashFragment">
 
     <fragment
         android:id="@+id/welcomeFragment"
@@ -82,7 +82,7 @@
         <action
             android:id="@+id/action_createPinFragment_to_thankYouFragment"
             app:destination="@id/thankYouFragment"
-            app:popUpTo="@id/splashFragment"
+            app:popUpTo="@+id/welcomeFragment"
             app:popUpToInclusive="true"
             />
     </fragment>
@@ -122,7 +122,10 @@
             app:destination="@id/contactInfoFragment" />
         <action
             android:id="@+id/action_addContactFragment_to_profileProgressFragment"
-            app:destination="@id/profileProgressFragment" />
+            app:destination="@id/profileProgressFragment"
+            app:popUpTo="@id/addContactFragment"
+            app:popUpToInclusive="true"
+            />
         <action
             android:id="@+id/action_addContactFragment_to_contactListFragment"
             app:destination="@id/contactListFragment"
@@ -165,6 +168,9 @@
         <action
             android:id="@+id/action_profileProgressFragment_to_addContactFragment"
             app:destination="@id/addContactFragment" />
+        <action
+            android:id="@+id/action_profileProgressFragment_to_registerCompleteFragment"
+            app:destination="@id/registerCompleteFragment" />
     </fragment>
     <fragment
         android:id="@+id/reminderFragment"
@@ -211,4 +217,8 @@
         android:id="@+id/addRoutineFragment"
         android:name="com.ssb.simplitend.patientprofile.setuproutine.AddRoutineFragment"
         android:label="AddRoutineFragment" />
+    <fragment
+        android:id="@+id/registerCompleteFragment"
+        android:name="com.ssb.simplitend.patientprofile.RegisterCompleteFragment"
+        android:label="RegisterCompleteFragment" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index c5b738e..6df073d 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -4,11 +4,11 @@
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/color_primary</item>
         <item name="colorPrimaryVariant">@color/color_accent</item>
-        <item name="colorOnPrimary">@color/black</item>
+        <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
+        <item name="colorSecondary">@color/color_primary</item>
+        <item name="colorSecondaryVariant">@color/color_accent</item>
+        <item name="colorOnSecondary">@color/color_accent</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor">@color/cg_dash_bg</item>
         <!-- Customize your theme here. -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8517b3f..da16524 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,9 +15,9 @@
     <string name="onboard_image">onboard_image</string>
     <string name="avoid_unwanted_phone_calls">Avoid unwanted phone calls!</string>
     <string name="continue_using_your_smartphone_without_the_annoying_robocalls_and_spam_text_messages">Continue using your Smartphone without the annoying robocalls and spam text messages.</string>
-    <string name="have_a_worry_nfree_stroll">Have a worry\nfree stroll!!</string>
-    <string name="get_direction_to_home_with_a_push_a_button_from_your_smartphone_home_screen">Get direction to home with a push a button from your smartphone home screen</string>
-    <string name="never_miss_a_med_or_forget_a_refill_again">Never miss a med or forget a refill again</string>
+    <string name="have_a_worry_nfree_stroll">Have a worry\nfree stroll!</string>
+    <string name="get_direction_to_home_with_a_push_a_button_from_your_smartphone_home_screen">Get direction to home with a push a button from your smartphone home screen.</string>
+    <string name="never_miss_a_med_or_forget_a_refill_again">Never miss a med or forget a refill again!</string>
     <string name="configure_medication_reminders_and_alerts_include_the_dosage_instructions_and_refill_date">Configure medication reminders and alerts. Include the dosage, instructions, and refill date.</string>
     <string name="register">Register</string>
     <string name="login">Login</string>
@@ -243,5 +243,8 @@
     <string name="faqs">FAQs</string>
     <string name="contact_admin">Contact admin</string>
     <string name="settings">Settings</string>
+    <string name="your_profile_is_100_complete">Your profile is 100% complete!</string>
+    <string name="sync_with_caregiver_app_to_proceed">Sync with Caregiver App to proceed.</string>
+    <string name="your_setup_is_in_proceed">Your setup is in proceed</string>
 
 </resources>
\ No newline at end of file