diff --git a/src/Routers/AppRouter.tsx b/src/Routers/AppRouter.tsx
index 2290d192f95..70261f45c54 100644
--- a/src/Routers/AppRouter.tsx
+++ b/src/Routers/AppRouter.tsx
@@ -105,7 +105,7 @@ export default function AppRouter() {
         )}
         <main
           id="pages"
-          className="flex flex-col flex-1 min-h-[calc(100svh-theme(spacing.4))] md:m-2 md:peer-data-[state=collapsed]:ml-0 border rounded-lg shadow bg-gray-50 focus:outline-none"
+          className="overflow-y-auto flex flex-col flex-1 min-h-[calc(100svh-theme(spacing.4))] md:m-2 md:peer-data-[state=collapsed]:ml-0 border rounded-lg shadow bg-gray-50 focus:outline-none"
         >
           <div className="relative z-10 flex h-16 bg-white shadow shrink-0 md:hidden">
             <div className="flex items-center">
diff --git a/src/components/Patient/EncounterQuestionnaire.tsx b/src/components/Patient/EncounterQuestionnaire.tsx
index 0a7eefe1804..d8d4afb297e 100644
--- a/src/components/Patient/EncounterQuestionnaire.tsx
+++ b/src/components/Patient/EncounterQuestionnaire.tsx
@@ -40,7 +40,7 @@ export default function EncounterQuestionnaire({
   });
   return (
     <Page title={t("questionnaire_one")}>
-      <div className="flex flex-col space-y-4 mt-4">
+      <div className="flex flex-col space-y-4 mt-4 overflow-y-auto">
         {encounter && (
           <div className="size-full rounded-lg border bg-white text-black shadow">
             <PatientInfoCard
diff --git a/src/components/Patient/PatientHome.tsx b/src/components/Patient/PatientHome.tsx
index 839cc637e2f..1d4cfb2b24c 100644
--- a/src/components/Patient/PatientHome.tsx
+++ b/src/components/Patient/PatientHome.tsx
@@ -74,7 +74,7 @@ export const PatientHome = (props: {
         </>
       }
     >
-      <div className="mt-3" data-testid="patient-dashboard">
+      <div className="mt-3 overflow-y-auto" data-testid="patient-dashboard">
         <div className="px-3 md:px-0">
           <div className="rounded-md bg-white p-3 shadow-sm">
             <div>
diff --git a/src/components/Questionnaire/QuestionTypes/DateTimeQuestion.tsx b/src/components/Questionnaire/QuestionTypes/DateTimeQuestion.tsx
index 4432477b82b..df327ed4d43 100644
--- a/src/components/Questionnaire/QuestionTypes/DateTimeQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/DateTimeQuestion.tsx
@@ -92,7 +92,7 @@ export function DateTimeQuestion({
   };
 
   return (
-    <div className="flex gap-2">
+    <div className="flex sm:gap-2 flex-wrap">
       <Popover>
         <PopoverTrigger asChild>
           <Button
@@ -119,7 +119,7 @@ export function DateTimeQuestion({
       </Popover>
       <Input
         type="time"
-        className="w-[150px]"
+        className="sm:w-[150px] border-t-0 sm:border-t"
         value={formatTime(currentValue)}
         onChange={handleTimeChange}
         disabled={disabled || !currentValue}
diff --git a/src/components/Questionnaire/QuestionnaireForm.tsx b/src/components/Questionnaire/QuestionnaireForm.tsx
index c59c96d07f1..a9e7538e781 100644
--- a/src/components/Questionnaire/QuestionnaireForm.tsx
+++ b/src/components/Questionnaire/QuestionnaireForm.tsx
@@ -535,7 +535,7 @@ export function QuestionnaireForm({
         <DebugPreview
           data={questionnaireForms}
           title="QuestionnaireForm"
-          className="p-4 space-y-6 max-w-4xl"
+          className="p-4 space-y-6 max-w-4xl m-2"
         />
       </div>
     </div>
diff --git a/src/components/Resource/ResourceDetails.tsx b/src/components/Resource/ResourceDetails.tsx
index 866f8deb4ab..21b5154f5ca 100644
--- a/src/components/Resource/ResourceDetails.tsx
+++ b/src/components/Resource/ResourceDetails.tsx
@@ -124,7 +124,7 @@ export default function ResourceDetails({
 
   return (
     <Page title={t("request_details")}>
-      <div className="mx-auto max-w-7xl space-y-6 p-4 md:p-6">
+      <div className="max-w-7xl space-y-6 p-4 md:p-6">
         {/* Action Buttons */}
         <div className="flex items-center justify-between">
           <div className="flex flex-wrap gap-2 w-full">