diff --git a/src/components/Questionnaire-pages/PatientInfoForm/PatientInfoForm.tsx b/src/components/Questionnaire-pages/PatientInfoForm/PatientInfoForm.tsx
index 187c760..c34f79b 100644
--- a/src/components/Questionnaire-pages/PatientInfoForm/PatientInfoForm.tsx
+++ b/src/components/Questionnaire-pages/PatientInfoForm/PatientInfoForm.tsx
@@ -72,7 +72,7 @@ interface PatientInfoFormProps {
   handleNext: () => void
 }
 
-const COUNTRIES = country.names()
+const COUNTRIES = country.names().sort()
 
 // Give the Info form the handleNext prop defined in the stepper
 const PatientInfoForm = ({ handleNext }: PatientInfoFormProps) => {
@@ -338,7 +338,6 @@ const PatientInfoForm = ({ handleNext }: PatientInfoFormProps) => {
                 >
                   <MenuItem value='true'>Yes</MenuItem>
                   <MenuItem value='false'>No</MenuItem>
-                  <MenuItem value='null'>Prefer not to say</MenuItem>
                 </Select>
                 {formErrors.gender_same_as_sex && <FormHelperText>{formErrors.gender_same_as_sex}</FormHelperText>}
               </FormControl>
diff --git a/src/views/home/Intro.tsx b/src/views/home/Intro.tsx
index ab3ffac..6f8c838 100644
--- a/src/views/home/Intro.tsx
+++ b/src/views/home/Intro.tsx
@@ -1,8 +1,15 @@
+'use client'
+
 import { Typography, Grid2, Box, Button } from '@mui/material'
 
+import { useSession } from 'next-auth/react'
+
 import RechartsRadarChart from '@/components/charts/recharts/RechartsRadarChart'
 
 const Intro = () => {
+  const { data: session } = useSession()
+  const role = session?.user.role
+
   return (
 
     // bg-backgroundPaper
@@ -93,7 +100,7 @@ const Intro = () => {
         may have.
       </Typography>
       <Box sx={{ display: 'flex', justifyContent: 'center', p: 10 }}>
-        <Button variant='contained' color='primary' href='/questionnaire'>
+        <Button variant='contained' color='primary' href={role === 'PATIENT' ? '/my-questionnaire' : '/questionnaire'}>
           Take The Test
         </Button>
       </Box>