diff --git a/src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx b/src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx
index b58e7b1..499ae89 100644
--- a/src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx
+++ b/src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx
@@ -94,6 +94,7 @@ function AssignTaskPopout({ action, details, situation, familyDetails }) {
 
       for (let field in requiredFields) {
         if (requiredFields[field] == "") {
+          // let currencyErrMsg = field == "country" && "currency"
           setRequestStatus({
             loading: false,
             status: false,
@@ -154,8 +155,6 @@ function AssignTaskPopout({ action, details, situation, familyDetails }) {
       });
   };
 
-  console.log("state >>--<<", familyDetails);
-
   useEffect(() => {
     const reqData = {
       limit: 30,
@@ -365,58 +364,62 @@ function AssignTaskPopout({ action, details, situation, familyDetails }) {
               </div>
 
               {/* BTN */}
-              <div className="p-2 border-t-2 flex justify-end items-center gap-3">
+              <div className="py-2 px-4 border-t-2 flex justify-between items-center">
                 {/* error or success display */}
-                {requestStatus.message != "" &&
-                  (!requestStatus.status ? (
-                    <div
-                      className={`relative p-2 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px] self-start`}
-                    >
-                      {requestStatus.message}
-                    </div>
-                  ) : (
-                    requestStatus.status && (
+                <div className="w-auto h-auto flex items-center">
+                  {requestStatus.message != "" &&
+                    (!requestStatus.status ? (
                       <div
-                        className={`relative p-2 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                        className={`relative p-2 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px] self-start`}
                       >
                         {requestStatus.message}
                       </div>
-                    )
-                  ))}
+                    ) : (
+                      requestStatus.status && (
+                        <div
+                          className={`relative p-2 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                        >
+                          {requestStatus.message}
+                        </div>
+                      )
+                    ))}
+                </div>
 
                 {/* End of error or success display */}
-                <button
-                  disabled={requestStatus.loading}
-                  onClick={action}
-                  type="button"
-                  className="w-20 h-11 flex justify-center items-center border-gradient text-base rounded-full text-white cursor-pointer"
-                >
-                  <span className="text-gradient">Close</span>
-                </button>
-                <div className="">
-                  {requestStatus.loading ? (
-                    <LoadingSpinner color="sky-blue" size="8" />
-                  ) : taskType == "select" ? (
-                    <button
-                      type="button"
-                      disabled={requestStatus.loading}
-                      onClick={assignFamilyTask}
-                      className="px-1 w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white cursor-pointer"
-                    >
-                      Assign
-                    </button>
-                  ) : (
-                    <button
-                      type="button"
-                      disabled={requestStatus.loading}
-                      onClick={assignFamilyTask}
-                      className="px-1 w-40 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white cursor-pointer"
-                    >
-                      {`Assign to ${
-                        familyDetails?.firstname || details.firstName
-                      }`}
-                    </button>
-                  )}
+                <div className="w-auto h-auto flex items-center gap-3">
+                  <button
+                    disabled={requestStatus.loading}
+                    onClick={action}
+                    type="button"
+                    className="w-20 h-11 flex justify-center items-center border-gradient text-base rounded-full text-white cursor-pointer"
+                  >
+                    <span className="text-gradient">Close</span>
+                  </button>
+                  <div className="">
+                    {requestStatus.loading ? (
+                      <LoadingSpinner color="sky-blue" size="8" />
+                    ) : taskType == "select" ? (
+                      <button
+                        type="button"
+                        disabled={requestStatus.loading}
+                        onClick={assignFamilyTask}
+                        className="px-1 w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white cursor-pointer"
+                      >
+                        Assign
+                      </button>
+                    ) : (
+                      <button
+                        type="button"
+                        disabled={requestStatus.loading}
+                        onClick={assignFamilyTask}
+                        className="px-1 w-40 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white cursor-pointer"
+                      >
+                        {`Assign to ${
+                          familyDetails?.firstname || details?.firstName
+                        }`}
+                      </button>
+                    )}
+                  </div>
                 </div>
               </div>
             </>
diff --git a/src/components/FamilyPopup/SuggestTask.jsx b/src/components/FamilyPopup/SuggestTask.jsx
index 1a3cc22..99e89f4 100644
--- a/src/components/FamilyPopup/SuggestTask.jsx
+++ b/src/components/FamilyPopup/SuggestTask.jsx
@@ -16,7 +16,7 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
   });
   const [suggestedNextStep, setSuggestedNextStep] = useState("Send Task");
 
-  const switchNextStep = (value) => {
+  const switchNextStep = ({ target: value }) => {
     setSuggestedNextStep(value);
   };
 
@@ -52,7 +52,7 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
   const handleParentSuggestion = (values) => {
     if (suggestedNextStep == "Send Task") {
       let firstName = state?.firstname;
-      let family_uid = state?.family_uid
+      let family_uid = state?.family_uid;
       continuePopupData({ ...details, firstName, family_uid });
     }
     onClose();
@@ -176,7 +176,7 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
                     </div>
 
                     {/* Radio buttons for family */}
-                    {pathname === "/manage-family" && (
+                    {pathname === "/manage-family" ? (
                       <div className="h-[20px] w-full border-t dark:border-[#5356fb29] border-light-purple relative">
                         <div id="my-radio-group" className="sr-only">
                           Parent suggested next step
@@ -194,18 +194,21 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
                             <label
                               role="group"
                               key={idx}
-                              htmlFor="parent-suggested"
+                              htmlFor={`parent-suggested-${idx}`}
+                              className={`transition duration-150 ease-in-out parent-suggest`}
                             >
                               <input
                                 type="radio"
                                 name="parent-suggested"
                                 value={title}
-                                checked={title == suggestedNextStep}
+                                checked={suggestedNextStep === title}
                                 onChange={switchNextStep}
                                 className={`transition duration-150 ease-in-out parent-suggest`}
                               />
                               <span
-                                onClick={switchNextStep}
+                                onClick={() => setSuggestedNextStep(title)}
+                                id={`parent-suggested-${idx}`}
+                                name="parent-suggested"
                                 className={`ml-1 ${
                                   title == "Not Now"
                                     ? "text-red-500"
@@ -220,7 +223,7 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
                           ))}
                         </div>
                       </div>
-                    )}
+                    ) : null}
                   </div>
                 </div>