diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 758cc80..adbef4c 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="deploymentTargetDropDown">
+    <runningDeviceTargetSelectedWithDropDown>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="SERIAL_NUMBER" />
+            <value value="RZCW41EJRPN" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2023-09-08T14:12:59.121177600Z" />
     <runningDeviceTargetsSelectedWithDialog>
       <Target>
         <type value="RUNNING_DEVICE_TARGET" />
diff --git a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/ContactAdminActivity.java b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/ContactAdminActivity.java
index 205c118..d3b5c39 100644
--- a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/ContactAdminActivity.java
+++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/ContactAdminActivity.java
@@ -1,12 +1,11 @@
 package com.ssb.simplitend.caregiverdashboard.activities;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.view.MotionEvent;
 
-import com.ssb.simplitend.R;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.ssb.simplitend.databinding.ActivityContactAdminBinding;
 
 public class ContactAdminActivity extends AppCompatActivity {
@@ -46,17 +45,6 @@ public class ContactAdminActivity extends AppCompatActivity {
             return false;
         });
 
-        binding.query.setOnTouchListener((v, event) -> {
-            if (binding.query.hasFocus()) {
-                v.getParent().requestDisallowInterceptTouchEvent(true);
-                if ((event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_SCROLL) {
-                    v.getParent().requestDisallowInterceptTouchEvent(false);
-                    return true;
-                }
-            }
-            return false;
-        });
-
     }
 
     private void clickEvents() {
diff --git a/app/src/main/java/com/ssb/simplitend/cg_subscription/CgSubscriptionActivity.java b/app/src/main/java/com/ssb/simplitend/cg_subscription/CgSubscriptionActivity.java
index 2c3359d..6c32715 100644
--- a/app/src/main/java/com/ssb/simplitend/cg_subscription/CgSubscriptionActivity.java
+++ b/app/src/main/java/com/ssb/simplitend/cg_subscription/CgSubscriptionActivity.java
@@ -2,13 +2,23 @@ package com.ssb.simplitend.cg_subscription;
 
 import android.app.ProgressDialog;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
 import android.util.Log;
+import android.view.View;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
+import com.google.firebase.crashlytics.internal.common.CrashlyticsCore;
+import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import com.ssb.simplitend.R;
 import com.ssb.simplitend.apputils.AppUtil;
 import com.ssb.simplitend.apputils.CaregiverDataCache;
@@ -90,6 +100,10 @@ public class CgSubscriptionActivity extends AppCompatActivity
             }
         });
 
+        binding.contactAdmin.setOnClickListener(view -> {
+            contactMail();
+        });
+
     }
 
     private void payForSubscription() {
@@ -170,6 +184,39 @@ public class CgSubscriptionActivity extends AppCompatActivity
         presenter.getSubscriptionPlans(token, this);
 
         paymentSheet = new PaymentSheet(this, this::onPaymentSheetResult);
+
+        try {
+            String description = getString(R.string.subscribe_description);
+            String contact_email = getString(R.string.contact_email);
+
+            // setting display text
+            SpannableString ss = new SpannableString(description);
+            ClickableSpan cs = new ClickableSpan() {
+                @Override
+                public void onClick(@NonNull View view) {
+                    contactMail();
+                }
+            };
+            int start_index = description.indexOf(contact_email);
+            ss.setSpan(cs, start_index, start_index + contact_email.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+
+            binding.description.setText(ss);
+            binding.description.setMovementMethod(LinkMovementMethod.getInstance());
+        } catch (Exception e) {
+            Log.e(TAG, "initViews: ", e);
+            binding.contactAdmin.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void contactMail() {
+        String contact_email = getString(R.string.contact_email);
+
+        Intent intent = new Intent(Intent.ACTION_SENDTO);
+        intent.setData(Uri.fromParts("mailto", contact_email, null));
+
+        if (intent.resolveActivity(getPackageManager()) != null) {
+            startActivity(intent);
+        }
     }
 
     // payment callback
diff --git a/app/src/main/java/com/ssb/simplitend/patientprofile/RegisterCompleteFragment.java b/app/src/main/java/com/ssb/simplitend/patientprofile/RegisterCompleteFragment.java
index 8453aa6..c3e9ed7 100644
--- a/app/src/main/java/com/ssb/simplitend/patientprofile/RegisterCompleteFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/patientprofile/RegisterCompleteFragment.java
@@ -1,6 +1,5 @@
 package com.ssb.simplitend.patientprofile;
 
-import android.animation.Animator;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
@@ -150,8 +149,10 @@ public class RegisterCompleteFragment extends Fragment implements ProfileContrac
                 gotoPatientDashBoard();
             }else{
                 AppUtil.showAlert(requireContext(),
-                        "Ask Caregiver to Subscribe",
-                        "Kindly ask CareGiver to complete SimpliTend subscription.",
+                        "Kindly ask Caregiver to complete SimpliTend subscription.",
+                        "Once your caregiver has completed the " +
+                                "subscription, you will be able to use the " +
+                                "application.",
                         "OK",
                         ((dialogInterface, i) -> {
 
@@ -159,8 +160,10 @@ public class RegisterCompleteFragment extends Fragment implements ProfileContrac
             }
         } else {
             AppUtil.showAlert(requireContext(),
-                    "Ask Caregiver to register",
-                    "Kindly ask CareGiver to complete registration.",
+                    "Kindly ask Caregiver to complete registration",
+                    "Once your caregiver has completed the " +
+                            "registration, you will be able to use the " +
+                            "application.",
                     "OK",
                     ((dialogInterface, i) -> {
 
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 5b4432a..0859317 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
@@ -144,6 +144,7 @@ public class AddReminderFragment extends Fragment implements CompoundButton.OnCh
         });
 
         binding.dosageDrop.setOnClickListener(v -> {
+            AppUtil.closeKeyboard(requireActivity());
             binding.dosageSpinner.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 43f228d..21ee699 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
@@ -99,6 +99,15 @@ public class ReminderAdapter extends RecyclerView.Adapter<ReminderAdapter.Remind
         public void setReminder(ReminderResult reminder, int position){
             binding.medName.setText(reminder.medicine_name);
 
+            String instruction;
+            if (reminder.medication_instruction == null || reminder.medication_instruction.trim().isEmpty()){
+                instruction = "None";
+            }else{
+                instruction = reminder.medication_instruction;
+            }
+
+            binding.instruction.setText(instruction);
+
             SimpleDateFormat input_sdf = new SimpleDateFormat("HH:mm:ss", Locale.getDefault());
             SimpleDateFormat output_sdf = new SimpleDateFormat("hh:mm a", Locale.getDefault());
 
@@ -163,27 +172,27 @@ public class ReminderAdapter extends RecyclerView.Adapter<ReminderAdapter.Remind
                     if (routine_calendar.get(Calendar.DAY_OF_MONTH) == selected_calendar.get(Calendar.DAY_OF_MONTH)){
                         // it is the same day on which routine is checked
                         // as routine done date is equal to selected_tab date
-                        binding.sideBar.setBackgroundTintList(AppCompatResources.getColorStateList(itemView.getContext(), R.color.color_primary));
-                        binding.card.setCardBackgroundColor(AppCompatResources.getColorStateList(itemView.getContext(), R.color.color_accent));
+                        binding.card.setCardBackgroundColor(AppCompatResources.getColorStateList(itemView.getContext(), R.color.color_primary));
+                        binding.innerCard.setBackgroundTintList(AppCompatResources.getColorStateList(itemView.getContext(), R.color.color_accent));
                         binding.done.setImageResource(R.drawable.ic_done_accent_2);
                     }else{
                         // item selected. un-selecting now
-                        binding.sideBar.setBackgroundTintList(null);
-                        binding.card.setCardBackgroundColor(AppCompatResources.getColorStateList(itemView.getContext(), R.color.white_bg));
+                        binding.card.setCardBackgroundColor(AppCompatResources.getColorStateList(itemView.getContext(), R.color.color_accent));
+                        binding.innerCard.setBackgroundTintList(AppCompatResources.getColorStateList(itemView.getContext(), R.color.white));
                         binding.done.setImageResource(R.drawable.ic_done_accent);
                     }
 
                 } catch (Exception e) {
                     Toast.makeText(itemView.getContext(), "Couldn't mark it done.", Toast.LENGTH_SHORT).show();
                     // item selected. un-selecting now
-                    binding.sideBar.setBackgroundTintList(null);
-                    binding.card.setCardBackgroundColor(AppCompatResources.getColorStateList(itemView.getContext(), R.color.white_bg));
+                    binding.card.setCardBackgroundColor(AppCompatResources.getColorStateList(itemView.getContext(), R.color.color_accent));
+                    binding.innerCard.setBackgroundTintList(AppCompatResources.getColorStateList(itemView.getContext(), R.color.white));
                     binding.done.setImageResource(R.drawable.ic_done_accent);
                 }
             }else{
                 // item selected. un-selecting now
-                binding.sideBar.setBackgroundTintList(null);
-                binding.card.setCardBackgroundColor(AppCompatResources.getColorStateList(itemView.getContext(), R.color.white_bg));
+                binding.card.setCardBackgroundColor(AppCompatResources.getColorStateList(itemView.getContext(), R.color.color_accent));
+                binding.innerCard.setBackgroundTintList(AppCompatResources.getColorStateList(itemView.getContext(), R.color.white));
                 binding.done.setImageResource(R.drawable.ic_done_accent);
             }
 
diff --git a/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java b/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java
index d638eba..a98e9e3 100644
--- a/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java
@@ -3,9 +3,7 @@ package com.ssb.simplitend.welcome.welcomepatient.fragments.contacts;
 import static com.ssb.simplitend.apputils.RetrofitHelper.CREATE_CONTACT;
 import static com.ssb.simplitend.apputils.RetrofitHelper.UPDATE_CONTACT;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.net.Uri;
@@ -14,7 +12,6 @@ import android.os.Handler;
 import android.text.InputFilter;
 import android.util.Log;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
@@ -92,6 +89,9 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
     // Remote contact list
     protected List<ContactListResponse> contactList;
 
+    private boolean isSosSet, current_contact_sos;
+    private String sos_contact_name;
+
     public CreateContactFragment() {
         // required empty const.
     }
@@ -147,8 +147,9 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
         loadRemoteContactList();
 
         binding.sosCheck.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            if (isChecked) {
-                contactViewModel.showSOSDecision(requireContext());
+            if (isChecked && !current_contact_sos) {
+                contactViewModel.showSOSDecision(requireContext(), isSosSet, sos_contact_name,
+                        binding.name.getText().toString());
             }
         });
 
@@ -341,35 +342,42 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
             binding.relationship.setText(getString(R.string.caregiver));
             binding.relationship.setEnabled(false);
 
+            //email is important
+            binding.emailTitle.setText(getString(R.string.email_address)); // with asterisk
+
             binding.caregiverCheckView.setVisibility(View.VISIBLE);
             this.mustBeeCaregiver = true;
             binding.caregiverCheck.setChecked(true);
         }
 
         // checking if there is any SOS contact already in list
-        boolean isSosSet = false;
+        isSosSet = false;
         int sos_contact_id = -1;
 
         for (ContactListResponse contact : contactList) {
             if (contact.is_sos_contact.equals("1")) {
                 isSosSet = true;
-                sos_contact_id = contact.contact_data.id;
+                if (contact.contact_data != null){
+                    sos_contact_id = contact.contact_data.id;
+                    sos_contact_name = contact.contact_data.first_name;
+                }
                 break;
             }
         }
 
+        current_contact_sos = false;
+
         if (isSosSet) {
-            binding.sosCheckView.setVisibility(View.GONE);
             binding.defaultSos.setVisibility(View.GONE);
 
             if (contactData != null && sos_contact_id != -1 && sos_contact_id == contactData.id) {
                 // current contact being edited is the SOS contact
                 // thus, sos switch can be edited
+                current_contact_sos = true;
                 binding.sosCheckView.setVisibility(View.VISIBLE);
             }
 
         } else {
-            binding.sosCheckView.setVisibility(View.VISIBLE);
             binding.defaultSos.setVisibility(View.VISIBLE);
         }
 
@@ -472,10 +480,11 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
             binding.sosCheck.setChecked(true);
         }
 
-        // if caregiver cannot change email and phone number
+        // if caregiver, cannot change email and phone number
         if (contactData.care_giver_data != null && contactData.care_giver_data.id != null) {
             binding.email.setClickable(false);
             binding.email.setFocusable(false);
+            binding.emailTitle.setText(getString(R.string.email_address));
 
             binding.caregiverCheck.setChecked(true);
             binding.caregiverCheck.setEnabled(false);
diff --git a/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/mvvm/AddContactAdapter.java b/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/mvvm/AddContactAdapter.java
index d61b3cc..31f14d7 100644
--- a/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/mvvm/AddContactAdapter.java
+++ b/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/mvvm/AddContactAdapter.java
@@ -92,15 +92,22 @@ public class AddContactAdapter extends ListAdapter<ContactData, AddContactAdapte
                 // no contact yet added
                 binding.addImeg.setVisibility(View.VISIBLE);
                 binding.imag.setVisibility(View.GONE);
+                binding.relationship.setVisibility(View.GONE);
 
                 binding.name.setText(itemView.getContext().getString(R.string.add_contact));
 
                 binding.card.setCardBackgroundColor(itemView.getContext().getColor(R.color.color_accent));
 
             }else{
-                // TODO: 17-07-2023 work on \" part of the string
                 binding.name.setText(contact.first_name);
 
+                if (contact.relationship != null && !contact.relationship.trim().isEmpty()){
+                    binding.relationship.setVisibility(View.VISIBLE);
+                    binding.relationship.setText(contact.relationship);
+                }else{
+                    binding.relationship.setVisibility(View.GONE);
+                }
+
                if (contact.contact_photo == null || contact.contact_photo.isEmpty()){
                    binding.addImeg.setVisibility(View.VISIBLE);
                    binding.imag.setVisibility(View.GONE);
diff --git a/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/mvvm/ContactViewModel.java b/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/mvvm/ContactViewModel.java
index 24596fb..a595fcf 100644
--- a/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/mvvm/ContactViewModel.java
+++ b/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/mvvm/ContactViewModel.java
@@ -26,10 +26,8 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.TreeMap;
 
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
@@ -128,7 +126,7 @@ public class ContactViewModel extends AndroidViewModel {
         if (gotoAddContactInterface != null) gotoAddContactInterface.gotoAddFragment(bsd);
     }
 
-    public void showSOSDecision(Context context) {
+    public void showSOSDecision(Context context, boolean isSosSet, String sos_contact_name, String current_name) {
 
         DecisionBottomsheetBinding binding = DecisionBottomsheetBinding.inflate(LayoutInflater.from(context));
 
@@ -136,7 +134,16 @@ public class ContactViewModel extends AndroidViewModel {
         bsd.setContentView(binding.getRoot());
         bsd.setCancelable(false);
 
-        binding.text.setText(context.getString(R.string.make_sos));
+        String title;
+
+        if (isSosSet && sos_contact_name != null){
+            title = "Are you sure you want to remove " + sos_contact_name + " as Sos? & add " + current_name +
+                    " as Sos?";
+        }else{
+            title = context.getString(R.string.make_sos);
+        }
+
+        binding.text.setText(title);
 
         binding.positiveBtn.setText(context.getString(R.string.yes));
         binding.negativeBtn.setText(context.getString(R.string.no));
diff --git a/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/register/LocationFragment.java b/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/register/LocationFragment.java
index feb584e..8f52958 100644
--- a/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/register/LocationFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/register/LocationFragment.java
@@ -8,6 +8,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.location.Address;
 import android.location.Geocoder;
 import android.location.Location;
@@ -21,6 +22,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.Toast;
 
@@ -112,6 +115,16 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback,
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         binding = LocationFragmentBinding.inflate(inflater, container, false);
 
+        try {
+            // setting height of mapview w.r.t screen size
+            int map_height = (int) (Resources.getSystem().getDisplayMetrics().heightPixels * 0.7f);
+            LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) binding.mapView.getLayoutParams();
+            layoutParams.height = map_height;
+            binding.mapView.setLayoutParams(layoutParams);
+        } catch (Exception e) {
+            // do nothing as default height is 350sdp
+        }
+
         viewModel = new ViewModelProvider(requireActivity()).get(WelcomeViewModel.class);
 
         initViews();
@@ -325,7 +338,9 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback,
 
         binding.search.setOnClickListener(v -> {
 
-            List<Place.Field> fields = Arrays.asList(Place.Field.ID, Place.Field.NAME, Place.Field.LAT_LNG);
+            List<Place.Field> fields = Arrays.asList(Place.Field.ID
+                    ,Place.Field.NAME,
+                    Place.Field.LAT_LNG, Place.Field.ADDRESS);
 
             Intent intent = new Autocomplete.IntentBuilder(AutocompleteActivityMode.OVERLAY, fields)
                     .build(requireContext());
@@ -445,7 +460,7 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback,
         googleMap.setOnMapClickListener(this);
 
         if (currentLocation != null) {
-            addMarker(currentLocation, "Selected location");
+            addMarker(currentLocation, null);
             googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(currentLocation, 14));
         }else{
             googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(40.75796541422796, -73.98557368665934), 14));
@@ -454,7 +469,7 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback,
 
     @Override
     public void onMapClick(@NonNull LatLng latLng) {
-        addMarker(latLng, "Selected location");
+        addMarker(latLng, null);
     }
 
     private void addMarker(LatLng latLng, String title) {
@@ -463,9 +478,7 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback,
         if (marker != null && marker.isVisible()) marker.remove();
         marker = null;
         marker = googleMap.addMarker(new MarkerOptions()
-                .position(latLng).draggable(false)
-                .title(title));
-
+                .position(latLng).draggable(false));
 
         try {
             // fetching address from the lag lng
@@ -477,7 +490,11 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback,
 
                 binding.zipCode.setText(address.getPostalCode());
 
-                if (address.getThoroughfare() == null || address.getThoroughfare().isEmpty()) {
+                if (title != null){
+                    if (marker != null) marker.setTitle(title);
+
+                    binding.street.setText(title);
+                }else if (address.getThoroughfare() == null || address.getThoroughfare().isEmpty()) {
                     binding.street.setText(null);
                 } else {
                     binding.street.setText(address.getThoroughfare());
@@ -523,6 +540,8 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback,
             // do nothing as we couldn't load the location from the lat lng
         }
 
+        binding.addressView.setVisibility(View.VISIBLE);
+
         binding.street.clearFocus();
         binding.scrollView.fullScroll(ScrollView.FOCUS_DOWN);
 
diff --git a/app/src/main/res/layout/activity_contact_admin.xml b/app/src/main/res/layout/activity_contact_admin.xml
index 0903aee..da1e157 100644
--- a/app/src/main/res/layout/activity_contact_admin.xml
+++ b/app/src/main/res/layout/activity_contact_admin.xml
@@ -71,44 +71,6 @@
             android:maxLines="1"
             />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/query_of_concern"
-            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"
-            />
-
-        <EditText
-            android:id="@+id/query"
-            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:hint="@string/enter_your_query_of_concern"
-            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:drawableStart="@drawable/ic_question"
-            android:drawablePadding="10dp"
-
-            android:inputType="textCapSentences|textMultiLine"
-
-            android:maxHeight="150dp"
-
-            />
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/add_contact_viewholder.xml b/app/src/main/res/layout/add_contact_viewholder.xml
index 955739e..7f92068 100644
--- a/app/src/main/res/layout/add_contact_viewholder.xml
+++ b/app/src/main/res/layout/add_contact_viewholder.xml
@@ -11,7 +11,7 @@
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/card"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="@dimen/_160sdp"
 
         app:cardBackgroundColor="@color/color_accent"
         app:cardElevation="0dp"
@@ -79,18 +79,34 @@
                 tools:text="Add contact"
                 android:fontFamily="@font/nunito_regular"
                 android:textColor="@color/black"
-                android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-
+                android:textSize="@dimen/_12ssp"
 
                 android:maxLines="2"
                 android:ellipsize="end"
-                android:maxEms="3"
                 android:textAlignment="center"
-
+                android:layout_marginHorizontal="15dp"
                 android:layout_marginTop="10dp"
 
                 />
 
+            <TextView
+                android:id="@+id/relationship"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+
+                tools:text="Caregiver"
+                android:fontFamily="@font/nunito_bold"
+                android:textColor="@color/black"
+                android:textSize="@dimen/_13ssp"
+
+                android:maxLines="1"
+                android:ellipsize="end"
+                android:textAlignment="center"
+                android:layout_marginHorizontal="15dp"
+
+                />
+
         </LinearLayout>
 
     </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/add_reminder_fragment.xml b/app/src/main/res/layout/add_reminder_fragment.xml
index 96258ee..ee98337 100644
--- a/app/src/main/res/layout/add_reminder_fragment.xml
+++ b/app/src/main/res/layout/add_reminder_fragment.xml
@@ -764,9 +764,10 @@
             android:drawablePadding="10dp"
 
             android:autofillHints="@null"
-            android:inputType="textMultiLine|textCapSentences"
+            android:inputType="textCapSentences"
 
             android:maxHeight="150dp"
+            android:maxLength="60"
 
             android:overScrollMode="always"
             android:scrollbarStyle="insideInset"
diff --git a/app/src/main/res/layout/cg_subscription_layout.xml b/app/src/main/res/layout/cg_subscription_layout.xml
index 7f814d4..3d16925 100644
--- a/app/src/main/res/layout/cg_subscription_layout.xml
+++ b/app/src/main/res/layout/cg_subscription_layout.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="@color/white"
     android:orientation="vertical">
 
@@ -311,16 +312,34 @@
                     </com.google.android.material.card.MaterialCardView>
 
                     <TextView
+                        android:id="@+id/contact_admin"
+                        android:visibility="gone"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+
+                        android:layout_marginHorizontal="15dp"
+                        android:layout_marginVertical="15dp"
+                        android:fontFamily="@font/nunito_regular"
+
+                        android:textColor="@color/color_primary_dark"
+                        android:textSize="@dimen/_12ssp"
+                        android:text="@string/contact_email"
+
+
+                        />
+
+                    <TextView
+                        android:id="@+id/description"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
 
                         android:layout_marginHorizontal="15dp"
                         android:layout_marginVertical="15dp"
                         android:fontFamily="@font/nunito_regular"
-                        android:text="Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book a galley of type and scrambled it to make a type specimen book a galley of type and scrambled it to make a type specimen book."
 
                         android:textColor="@color/black"
-                        android:textSize="@dimen/_12ssp"
+                        android:textSize="@dimen/_14ssp"
+                        tools:text="@string/subscribe_description"
 
                         />
 
diff --git a/app/src/main/res/layout/create_edit_contact_fragment.xml b/app/src/main/res/layout/create_edit_contact_fragment.xml
index efcd3b8..5241401 100644
--- a/app/src/main/res/layout/create_edit_contact_fragment.xml
+++ b/app/src/main/res/layout/create_edit_contact_fragment.xml
@@ -261,12 +261,13 @@
 <!--        </androidx.constraintlayout.widget.ConstraintLayout>-->
 
         <TextView
+            android:id="@+id/email_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="start"
             android:layout_marginHorizontal="15dp"
             android:fontFamily="@font/nunito_medium"
-            android:text="@string/email_address"
+            android:text="@string/email_address_"
             android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
             android:textColor="@color/black" />
 
diff --git a/app/src/main/res/layout/location_fragment.xml b/app/src/main/res/layout/location_fragment.xml
index ba7a6fb..c4c39e4 100644
--- a/app/src/main/res/layout/location_fragment.xml
+++ b/app/src/main/res/layout/location_fragment.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
     android:layout_height="match_parent"
@@ -11,6 +10,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:weightSum="10"
         android:orientation="vertical">
 
         <ImageView
@@ -30,7 +30,7 @@
             android:layout_height="wrap_content"
             android:text="@string/choose_on_map"
             android:fontFamily="@font/nunito_medium"
-            android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium"
+            android:textSize="@dimen/_18ssp"
             android:textColor="@color/black"
             android:layout_marginHorizontal="15dp"
             />
@@ -47,8 +47,9 @@
             />
 
         <RelativeLayout
+            android:id="@+id/map_view"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="@dimen/_350sdp"
 
             android:layout_marginHorizontal="15dp"
             android:layout_marginVertical="20dp"
@@ -57,13 +58,13 @@
             <androidx.fragment.app.FragmentContainerView
                 android:id="@+id/map_frag_cont"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/_350sdp"
+                android:layout_height="match_parent"
                 />
 
             <ImageView
                 android:id="@+id/trans_img"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/_350sdp"
+                android:layout_height="match_parent"
                 android:background="@android:color/transparent"
                 />
 
@@ -107,7 +108,8 @@
         </RelativeLayout>
 
         <LinearLayout
-            android:visibility="visible"
+            android:id="@+id/address_view"
+            android:visibility="invisible"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
diff --git a/app/src/main/res/layout/reminder_viewholder.xml b/app/src/main/res/layout/reminder_viewholder.xml
index 707b3b7..04fc91b 100644
--- a/app/src/main/res/layout/reminder_viewholder.xml
+++ b/app/src/main/res/layout/reminder_viewholder.xml
@@ -124,37 +124,29 @@
                 app:cardElevation="5dp"
                 android:layout_marginHorizontal="15dp"
                 android:layout_marginVertical="10dp"
-                app:cardBackgroundColor="@color/white_bg"
+                app:cardBackgroundColor="@color/color_accent"
                 >
 
                 <LinearLayout
+                    android:id="@+id/inner_card"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:weightSum="10"
+                    android:background="@color/white"
+                    android:layout_marginStart="15dp"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
-                    <View
-                        android:id="@+id/side_bar"
-                        android:layout_width="0dp"
-                        android:layout_height="100dp"
-
-                        android:layout_weight="0.5"
-
-                        android:background="@color/color_accent"
-                        android:backgroundTint="@null"
-                        />
-
                     <RelativeLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginHorizontal="15dp"
+                        android:layout_marginStart="15dp"
                         android:layout_weight="2">
 
                         <ImageView
                             android:id="@+id/med_img"
-                            android:layout_width="60dp"
-                            android:layout_height="60dp"
+                            android:layout_width="@dimen/_40sdp"
+                            android:layout_height="@dimen/_40sdp"
                             android:contentDescription="@string/medication_type"
 
                             android:layout_gravity="center_vertical"
@@ -170,6 +162,8 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="5.5"
+                        android:gravity="center_vertical"
+                        android:layout_marginVertical="10dp"
                         android:orientation="vertical">
 
                         <TextView
@@ -178,8 +172,8 @@
                             android:layout_height="wrap_content"
 
                             tools:text="Vitamin D3"
-                            android:fontFamily="@font/nunito_semibold"
-                            android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
+                            android:fontFamily="@font/nunito_bold"
+                            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                             android:textColor="@color/black"
 
                             android:maxLines="1"
@@ -190,7 +184,6 @@
                         <LinearLayout
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="10dp"
                             android:gravity="center_vertical"
                             android:baselineAligned="true"
                             android:orientation="horizontal">
@@ -202,7 +195,6 @@
 
                                 tools:text="2 : 00 pm"
                                 android:fontFamily="@font/nunito_regular"
-                                android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                                 android:textColor="#5B5B5B"
 
                                 android:maxLines="1"
@@ -217,7 +209,6 @@
 
                                 tools:text="2 capsules"
                                 android:fontFamily="@font/nunito_regular"
-                                android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
                                 android:textColor="#5B5B5B"
 
                                 android:layout_marginStart="15dp"
@@ -229,6 +220,34 @@
 
                         </LinearLayout>
 
+                        <TextView
+                            android:id="@+id/instruction_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+
+                            android:text="@string/instructions_title"
+                            android:fontFamily="@font/nunito_semibold"
+                            android:textColor="#000"
+                            android:layout_marginTop="5dp"
+
+                            android:ellipsize="end"
+
+                            />
+
+                        <TextView
+                            android:id="@+id/instruction"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+
+                            tools:text="This is very large instruction with lines greater than 2"
+                            android:fontFamily="@font/nunito_regular"
+                            android:textColor="#5B5B5B"
+
+                            android:maxLines="3"
+                            android:ellipsize="end"
+
+                            />
+
                     </LinearLayout>
 
                     <RelativeLayout
@@ -236,12 +255,13 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="2"
                         android:layout_marginHorizontal="5dp"
+                        android:layout_marginStart="5dp"
                         >
 
                         <ImageView
                             android:id="@+id/done"
-                            android:layout_width="50dp"
-                            android:layout_height="50dp"
+                            android:layout_width="@dimen/_40sdp"
+                            android:layout_height="@dimen/_40sdp"
 
                             app:srcCompat="@drawable/ic_done_accent"
                             android:contentDescription="@string/done"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index be5bd11..88f7766 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -16,7 +16,7 @@
         <item name="android:textCursorDrawable">@drawable/primary_cursor_drawable</item>
         <item name="android:windowBackground">@drawable/splash_screen</item>
 
-<!--        <item name="android:datePickerStyle">@style/myDatePickerStyle</item>-->
+        <item name="android:datePickerStyle">@style/myDatePickerStyle</item>
 
     </style>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 93d16e2..be3b46e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,7 +59,7 @@
     <string name="i_accept_terms_and_conditions">I accept terms and conditions</string>
     <string name="next">Next</string>
     <string name="choose_on_map">Find your address</string>
-    <string name="drag_the_map_and_choose_the_place">Drag the map and choose the place</string>
+    <string name="drag_the_map_and_choose_the_place">Enter your address in search bar</string>
     <string name="map_view">Map view</string>
     <string name="home_address">Confirm your Home address</string>
     <string name="enter_your_street">Enter your street</string>
@@ -392,5 +392,8 @@
     <string name="update">Update</string>
     <string name="patients_home_address">Patients Home Address</string>
     <string name="when_updating_a_password_it_s_essential_to_create_a_strong_unique_password">When updating a password, it\'s essential to create a strong, unique password.</string>
+    <string name="subscribe_description">Your credit card will be charged 24 hours before your subscription period expires. The subscription will automatically renew at the same price. You can cancel your subscription 7 days before the renewal date by sending an email to contact.us@simplitent.com</string>
+    <string name="contact_email">contact.us@simplitent.com</string>
+    <string name="instructions_title">Instructions:</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 30ced82..37283cf 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -15,19 +15,22 @@
         <item name="android:textCursorDrawable">@drawable/primary_cursor_drawable</item>
         <item name="android:windowBackground">@drawable/splash_screen</item>
 
-        <!--        <item name="android:datePickerStyle">@style/myDatePickerStyle</item>-->
+        <item name="android:datePickerStyle">@style/myDatePickerStyle</item>
 
     </style>
 
     // top corner rounded bottom sheet
+
     <style name="BottomSheetDialog" parent="Theme.Design.Light.BottomSheetDialog">
         <item name="bottomSheetStyle">@style/bottomSheetStyleWrapper</item>
     </style>
+
     <style name="bottomSheetStyleWrapper" parent="Widget.Design.BottomSheet.Modal">
         <item name="android:background">@android:color/transparent</item>
     </style>
 
     // date picker dialog theme
+
     <style name="myDatePickerStyle" parent="android:Widget.Material.DatePicker">
         <item name="android:datePickerMode">spinner</item>
     </style>