diff --git a/public/locale/en.json b/public/locale/en.json
index 3b789e63ef3..a10c08c369a 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -347,6 +347,7 @@
   "add_skill": "Add Skill",
   "add_spoke": "Add Spoke Facility",
   "additional_information": "Additional Information",
+  "additional_instructions": "Additional Instructions",
   "address": "Address",
   "administer": "Administer",
   "administer_medicine": "Administer Medicine",
@@ -406,6 +407,7 @@
   "are_you_sure_want_to_remove": "Are you sure you want to remove {{name}} from the patient? This action cannot be undone",
   "ari": "ARI - Acute Respiratory illness",
   "arrived": "Arrived",
+  "as_needed_prn": "As Needed / PRN",
   "asset_class": "Asset Class",
   "asset_location": "Asset Location",
   "asset_name": "Asset Name",
@@ -1089,12 +1091,14 @@
   "information_source_user": "Hospital Staff",
   "inidcator_event": "Indicator Event",
   "instruction_on_titration": "Instruction on titration",
+  "instructions": "Instructions",
   "insurance__insurer_id": "Insurer ID",
   "insurance__insurer_name": "Insurer Name",
   "insurance__member_id": "Member ID",
   "insurance__policy_name": "Policy ID / Policy Name",
   "insurance_details_detail": "Include details of all the Insurance Policies held by the Patient for smooth insurance processing",
   "insurer_name_required": "Insurer Name is required",
+  "intent": "Intent",
   "international_mobile": "International Mobile",
   "invalid_asset_id_msg": "Oops! The asset ID you entered does not appear to be valid.",
   "invalid_date_format": "Invalid date format, expected {{format}}",
@@ -1241,6 +1245,7 @@
   "medicines_administered": "Medicine(s) administered",
   "medicines_administered_error": "Error administering medicine(s)",
   "member_id_required": "Member Id is required",
+  "method": "Method",
   "middleware_hostname": "Middleware Hostname",
   "middleware_hostname_example": "e.g. example.ohc.network",
   "middleware_hostname_sourced_from": "Middleware hostname sourced from {{ source }}",
@@ -1623,6 +1628,8 @@
   "remarks": "Remarks",
   "remarks_placeholder": "Enter remarks",
   "remove": "Remove",
+  "remove_medication": "Remove Medication",
+  "remove_medication_confirmation": "Are you sure you want to remove {{medication}}?",
   "remove_user": "Remove User",
   "remove_user_organization": "Remove User from Organization",
   "remove_user_warn": "Are you sure you want to remove {{firstName}} {{lastName}} from this organization? This action cannot be undone.",
@@ -1737,6 +1744,7 @@
   "search_icd11_placeholder": "Search for ICD-11 Diagnoses",
   "search_investigation_placeholder": "Search Investigation & Groups",
   "search_medication": "Search Medication",
+  "search_medications": "Search for medications to add",
   "search_patient_page_text": "Search for existing patients using their phone number or create a new patient record",
   "search_patients": "Search Patients",
   "search_resource": "Search Resource",
@@ -1745,6 +1753,7 @@
   "searching": "Searching...",
   "see_attachments": "See Attachments",
   "select": "Select",
+  "select_additional_instructions": "Select additional instructions",
   "select_all": "Select All",
   "select_date": "Select date",
   "select_department": "Select Department",
@@ -1753,19 +1762,25 @@
   "select_facility": "Select Facility",
   "select_facility_for_discharged_patients_warning": "Facility needs to be selected to view discharged patients.",
   "select_for_administration": "Select for Administration",
+  "select_frequency": "Select frequency",
   "select_groups": "Select Groups",
+  "select_intent": "Select intent",
   "select_investigation": "Select Investigations (all investigations will be selected by default)",
   "select_investigation_groups": "Select Investigation Groups",
   "select_investigations": "Select Investigations",
   "select_local_body": "Select Local Body",
+  "select_method": "Select method",
   "select_new_role": "Select New Role",
   "select_patient": "Select Patient",
   "select_policy": "Select an Insurance Policy",
   "select_policy_to_add_items": "Select a Policy to Add Items",
   "select_practitioner": "Select Practicioner",
+  "select_prn_reason": "Select reason for PRN",
   "select_register_patient": "Select/Register Patient",
   "select_role": "Select Role",
+  "select_route": "Select route",
   "select_seven_day_period": "Select a seven day period",
+  "select_site": "Select site",
   "select_skills": "Select and add some skills",
   "select_time": "Select time",
   "select_time_slot": "Select time slot",
@@ -1817,6 +1832,7 @@
   "showing_all_appointments": "Showing all appointments",
   "sign_in": "Sign in",
   "sign_out": "Sign out",
+  "site": "Site",
   "skill_add_error": "Error while adding skill",
   "skill_added_successfully": "Skill added successfully",
   "skills": "Skills",
@@ -1921,6 +1937,22 @@
   "unassign": "Unassign",
   "unconfirmed": "Unconfirmed",
   "unique_id": "Unique Id",
+  "unit_a": "Years",
+  "unit_ampule(s)": "Ampule(s)",
+  "unit_d": "Days",
+  "unit_drop(s)": "Drop(s)",
+  "unit_g": "g",
+  "unit_h": "Hours",
+  "unit_mcg": "mcg",
+  "unit_mg": "mg",
+  "unit_min": "Minutes",
+  "unit_ml": "ml",
+  "unit_mo": "Months",
+  "unit_ms": "Milliseconds",
+  "unit_s": "Seconds",
+  "unit_tsp": "Tsp",
+  "unit_unit(s)": "Unit(s)",
+  "unit_wk": "Weeks",
   "unknown": "Unknown",
   "unlink_asset_bed_and_presets": "Delete linked presets and unlink bed",
   "unlink_asset_bed_caution": "This action will also delete all presets that are associated to this camera and bed.",
diff --git a/src/components/Common/QuantityInput.tsx b/src/components/Common/QuantityInput.tsx
index e07bb303493..07d19dfba61 100644
--- a/src/components/Common/QuantityInput.tsx
+++ b/src/components/Common/QuantityInput.tsx
@@ -1,3 +1,5 @@
+import { t } from "i18next";
+
 import { Input } from "@/components/ui/input";
 import {
   Select,
@@ -18,6 +20,7 @@ interface Props<TUnit extends string> {
   units: readonly TUnit[];
   disabled?: boolean;
   placeholder?: string;
+  autoFocus?: boolean;
 }
 
 const QuantityInput = <TUnit extends string>({
@@ -26,6 +29,7 @@ const QuantityInput = <TUnit extends string>({
   onChange,
   disabled,
   placeholder,
+  autoFocus,
 }: Props<TUnit>) => {
   const handleChange = (update: Partial<QuantityValue<TUnit>>) => {
     onChange({ ...quantity, ...update });
@@ -44,6 +48,7 @@ const QuantityInput = <TUnit extends string>({
             value: e.target.value ? Number(e.target.value) : undefined,
           })
         }
+        autoFocus={autoFocus}
       />
       <Select
         disabled={disabled}
@@ -57,7 +62,7 @@ const QuantityInput = <TUnit extends string>({
         <SelectContent>
           {units.map((unit) => (
             <SelectItem key={unit} value={unit}>
-              {unit}
+              {t(`unit_${unit}`)}
             </SelectItem>
           ))}
         </SelectContent>
diff --git a/src/components/Medicine/MedicineAdministrationSheet/index.tsx b/src/components/Medicine/MedicineAdministrationSheet/index.tsx
index 0dad737cc9f..aa894b8d5c2 100644
--- a/src/components/Medicine/MedicineAdministrationSheet/index.tsx
+++ b/src/components/Medicine/MedicineAdministrationSheet/index.tsx
@@ -1,3 +1,4 @@
+import { t } from "i18next";
 import { Link } from "raviger";
 import { useState } from "react";
 
@@ -324,6 +325,14 @@ const PrescriptionEntry = ({
           </span>
         )}
       </div>
+      {instruction.timing?.repeat?.bounds_duration && (
+        <div className="mt-1 text-xs text-muted-foreground">
+          <span className="text-muted-foreground">{t("duration")}:</span>{" "}
+          {instruction.timing.repeat.bounds_duration.value}{" "}
+          {instruction.timing.repeat.bounds_duration.unit &&
+            t(`${instruction.timing.repeat.bounds_duration.unit}`)}
+        </div>
+      )}
 
       {/* Additional Instructions */}
       {additionalInstructions && additionalInstructions.length > 0 && (
diff --git a/src/components/Questionnaire/QuestionRenderer.tsx b/src/components/Questionnaire/QuestionRenderer.tsx
index 71b04cb0a77..0b01894b9cf 100644
--- a/src/components/Questionnaire/QuestionRenderer.tsx
+++ b/src/components/Questionnaire/QuestionRenderer.tsx
@@ -1,11 +1,21 @@
 import { useEffect, useRef } from "react";
 
+import { cn } from "@/lib/utils";
+
 import { QuestionValidationError } from "@/types/questionnaire/batch";
 import { QuestionnaireResponse } from "@/types/questionnaire/form";
-import { Question } from "@/types/questionnaire/question";
+import {
+  Question,
+  StructuredQuestionType,
+} from "@/types/questionnaire/question";
 
 import { QuestionGroup } from "./QuestionTypes/QuestionGroup";
 
+// Questions that should be rendered full width
+const FULL_WIDTH_QUESTION_TYPES: StructuredQuestionType[] = [
+  "medication_request",
+];
+
 interface QuestionRendererProps {
   questions: Question[];
   responses: QuestionnaireResponse[];
@@ -55,12 +65,20 @@ export function QuestionRenderer({
     onResponseChange(newResponses);
   };
 
+  const shouldBeFullWidth = (question: Question): boolean =>
+    question.type === "structured" &&
+    !!question.structured_type &&
+    FULL_WIDTH_QUESTION_TYPES.includes(question.structured_type);
+
   return (
     <div className="space-y-4">
       {questions.map((question) => (
         <div
           key={question.id}
           ref={(el) => (questionRefs.current[question.id] = el)}
+          className={cn(
+            shouldBeFullWidth(question) ? "md:w-auto" : "max-w-4xl",
+          )}
         >
           <QuestionGroup
             facilityId={facilityId}
diff --git a/src/components/Questionnaire/QuestionTypes/MedicationRequestQuestion.tsx b/src/components/Questionnaire/QuestionTypes/MedicationRequestQuestion.tsx
index ab52140001f..70f904f93da 100644
--- a/src/components/Questionnaire/QuestionTypes/MedicationRequestQuestion.tsx
+++ b/src/components/Questionnaire/QuestionTypes/MedicationRequestQuestion.tsx
@@ -1,9 +1,25 @@
 import { MinusCircledIcon } from "@radix-ui/react-icons";
-import React from "react";
+import { t } from "i18next";
+import React, { useState } from "react";
 
+import { cn } from "@/lib/utils";
+
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+} from "@/components/ui/alert-dialog";
 import { Button } from "@/components/ui/button";
-import { Checkbox } from "@/components/ui/checkbox";
-import { Input } from "@/components/ui/input";
+import {
+  Collapsible,
+  CollapsibleContent,
+  CollapsibleTrigger,
+} from "@/components/ui/collapsible";
 import { Label } from "@/components/ui/label";
 import {
   Select,
@@ -16,7 +32,11 @@ import {
 import { QuantityInput } from "@/components/Common/QuantityInput";
 import ValueSetSelect from "@/components/Questionnaire/ValueSetSelect";
 
+import { useIsMobile } from "@/hooks/use-mobile";
+
 import {
+  BOUNDS_DURATION_UNITS,
+  BoundsDuration,
   DOSAGE_UNITS,
   MEDICATION_REQUEST_INTENT,
   MedicationRequest,
@@ -50,6 +70,13 @@ export function MedicationRequestQuestion({
 }: MedicationRequestQuestionProps) {
   const medications =
     (questionnaireResponse.values?.[0]?.value as MedicationRequest[]) || [];
+  const [expandedMedicationIndex, setExpandedMedicationIndex] = useState<
+    number | null
+  >(null);
+  const [medicationToDelete, setMedicationToDelete] = useState<number | null>(
+    null,
+  );
+  const isMobile = useIsMobile();
 
   const handleAddMedication = (medication: Code) => {
     const newMedications: MedicationRequest[] = [
@@ -69,14 +96,24 @@ export function MedicationRequestQuestion({
         },
       ],
     });
+    setExpandedMedicationIndex(newMedications.length - 1);
   };
 
   const handleRemoveMedication = (index: number) => {
-    const newMedications = medications.filter((_, i) => i !== index);
+    setMedicationToDelete(index);
+  };
+
+  const confirmRemoveMedication = () => {
+    if (medicationToDelete === null) return;
+
+    const newMedications = medications.filter(
+      (_, i) => i !== medicationToDelete,
+    );
     updateQuestionnaireResponseCB({
       ...questionnaireResponse,
       values: [{ type: "medication_request", value: newMedications }],
     });
+    setMedicationToDelete(null);
   };
 
   const handleUpdateMedication = (
@@ -99,45 +136,199 @@ export function MedicationRequestQuestion({
   };
 
   return (
-    <>
-      {medications.length > 0 && (
-        <div className="rounded-lg border space-y-4">
-          <ul className="space-y-2 divide-y-2 divide-gray-200 divide-dashed">
-            {medications.map((medication, index) => (
-              <li key={index}>
-                <MedicationRequestItem
-                  medication={medication}
-                  disabled={disabled}
-                  onUpdate={(medication) =>
-                    handleUpdateMedication(index, medication)
-                  }
-                  onRemove={() => handleRemoveMedication(index)}
-                  index={index}
-                />
-              </li>
-            ))}
-          </ul>
-        </div>
-      )}
-      <ValueSetSelect
-        system="system-medication"
-        placeholder="Search for medications to add"
-        onSelect={handleAddMedication}
-        disabled={disabled}
-        searchPostFix=" clinical drug"
-      />
-    </>
+    <div className="space-y-4">
+      <AlertDialog
+        open={medicationToDelete !== null}
+        onOpenChange={(open) => !open && setMedicationToDelete(null)}
+      >
+        <AlertDialogContent>
+          <AlertDialogHeader>
+            <AlertDialogTitle>{t("remove_medication")}</AlertDialogTitle>
+            <AlertDialogDescription>
+              {t("remove_medication_confirmation", {
+                medication:
+                  medications[medicationToDelete!]?.medication?.display,
+              })}
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <AlertDialogFooter>
+            <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
+            <AlertDialogAction
+              onClick={confirmRemoveMedication}
+              className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+            >
+              {t("remove")}
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
+
+      <div className="md:overflow-x-auto w-auto">
+        {medications.length > 0 && (
+          <div className="min-w-fit">
+            <div
+              className={cn("max-w-[2144px] relative lg:border rounded-md", {
+                "bg-gray-50/50": isMobile,
+              })}
+            >
+              {/* Header - Only show on desktop */}
+              <div className="hidden lg:grid grid-cols-[280px,180px,170px,160px,300px,230px,180px,250px,180px,160px,48px] bg-gray-50 border-b text-sm font-medium text-gray-500">
+                <div className="font-semibold text-gray-600 p-3 border-r">
+                  {t("medicine")}
+                </div>
+                <div className="font-semibold text-gray-600 p-3 border-r">
+                  {t("dosage")}
+                </div>
+                <div className="font-semibold text-gray-600 p-3 border-r">
+                  {t("frequency")}
+                </div>
+                <div className="font-semibold text-gray-600 p-3 border-r">
+                  {t("duration")}
+                </div>
+                <div className="font-semibold text-gray-600 p-3 border-r">
+                  {t("instructions")}
+                </div>
+                <div className="font-semibold text-gray-600 p-3 border-r">
+                  {t("additional_instructions")}
+                </div>
+                <div className="font-semibold text-gray-600 p-3 border-r">
+                  {t("route")}
+                </div>
+                <div className="font-semibold text-gray-600 p-3 border-r">
+                  {t("site")}
+                </div>
+                <div className="font-semibold text-gray-600 p-3 border-r">
+                  {t("method")}
+                </div>
+                <div className="font-semibold text-gray-600 p-3 border-r">
+                  {t("intent")}
+                </div>
+                <div className="font-semibold text-gray-600 p-3 sticky right-0 bg-gray-50 shadow-[-12px_0_15px_-4px_rgba(0,0,0,0.15)] w-12" />
+              </div>
+
+              {/* Body */}
+              <div className={cn("bg-white", { "bg-transparent": isMobile })}>
+                {medications.map((medication, index) => (
+                  <React.Fragment key={index}>
+                    {isMobile ? (
+                      <Collapsible
+                        open={expandedMedicationIndex === index}
+                        onOpenChange={() => {
+                          setExpandedMedicationIndex(
+                            expandedMedicationIndex === index ? null : index,
+                          );
+                        }}
+                        className="border-b last:border-b-0"
+                      >
+                        <div
+                          className={cn(
+                            "flex items-center gap-2 px-2 py-0.5 rounded-md  shadow-sm text-sm",
+                            expandedMedicationIndex === index
+                              ? "bg-white"
+                              : "bg-gray-100",
+                          )}
+                        >
+                          <CollapsibleTrigger className="flex-1 text-left">
+                            <div className="font-medium text-gray-900">
+                              {medication.medication?.display}
+                            </div>
+                          </CollapsibleTrigger>
+                          <div className="flex items-center gap-1">
+                            {expandedMedicationIndex !== index && (
+                              <Button
+                                variant="ghost"
+                                size="icon"
+                                className="h-8 w-8 text-gray-500 hover:text-gray-900"
+                                onClick={(e) => {
+                                  e.stopPropagation();
+                                  setExpandedMedicationIndex(index);
+                                }}
+                                disabled={disabled}
+                              >
+                                <svg
+                                  width="15"
+                                  height="15"
+                                  viewBox="0 0 15 15"
+                                  fill="none"
+                                  xmlns="http://www.w3.org/2000/svg"
+                                  className="h-4 w-4"
+                                >
+                                  <path
+                                    d="M12.1464 1.14645C12.3417 0.951184 12.6583 0.951184 12.8535 1.14645L14.8535 3.14645C15.0488 3.34171 15.0488 3.65829 14.8535 3.85355L10.9109 7.79618C10.8349 7.87218 10.7471 7.93543 10.651 7.9835L6.72359 9.94721C6.53109 10.0435 6.29861 10.0057 6.14643 9.85355C5.99425 9.70137 5.95652 9.46889 6.05277 9.27639L8.01648 5.34897C8.06455 5.25283 8.1278 5.16507 8.2038 5.08907L12.1464 1.14645ZM12.5 2.20711L8.91091 5.79618L7.87266 7.87267L8.12731 8.12732L10.2038 7.08907L13.7929 3.5L12.5 2.20711ZM9.99998 2L8.99998 3H4.9C4.47171 3 4.18056 3.00039 3.95552 3.01877C3.73631 3.03668 3.62421 3.06915 3.54601 3.10899C3.35785 3.20487 3.20487 3.35785 3.10899 3.54601C3.06915 3.62421 3.03669 3.73631 3.01878 3.95552C3.00039 4.18056 3 4.47171 3 4.9V11.1C3 11.5283 3.00039 11.8194 3.01878 12.0445C3.03669 12.2637 3.06915 12.3758 3.10899 12.454C3.20487 12.6422 3.35785 12.7951 3.54601 12.891C3.62421 12.9309 3.73631 12.9633 3.95552 12.9812C4.18056 12.9996 4.47171 13 4.9 13H11.1C11.5283 13 11.8194 12.9996 12.0445 12.9812C12.2637 12.9633 12.3758 12.9309 12.454 12.891C12.6422 12.7951 12.7951 12.6422 12.891 12.454C12.9309 12.3758 12.9633 12.2637 12.9812 12.0445C12.9996 11.8194 13 11.5283 13 11.1V7.00002L12 8.00002V11.1V11.1207C12 11.5231 11.9995 11.7666 11.9862 11.9402C11.9735 12.1033 11.9514 12.1558 11.9397 12.1775C11.9092 12.2321 11.8321 12.3092 11.7775 12.3397C11.7557 12.3514 11.7033 12.3735 11.5402 12.3862C11.3666 12.3995 11.1231 12.4 10.7207 12.4H5.27924C4.87691 12.4 4.63338 12.3995 4.45981 12.3862C4.29672 12.3735 4.24424 12.3514 4.22252 12.3397C4.16792 12.3092 4.09077 12.2321 4.06028 12.1775C4.04858 12.1558 4.02644 12.1033 4.01375 11.9402C4.00045 11.7666 4 11.5231 4 11.1207V4.87924C4 4.47691 4.00045 4.23338 4.01375 4.05981C4.02644 3.89672 4.04858 3.84424 4.06028 3.82252C4.09077 3.76792 4.16792 3.69077 4.22252 3.66028C4.24424 3.64858 4.29672 3.62644 4.45981 3.61375C4.63338 3.60045 4.87691 3.6 5.27924 3.6H8.99998L9.99998 2Z"
+                                    fill="currentColor"
+                                    fillRule="evenodd"
+                                    clipRule="evenodd"
+                                  ></path>
+                                </svg>
+                              </Button>
+                            )}
+                            <Button
+                              variant="ghost"
+                              size="icon"
+                              className="h-8 w-8 text-gray-500 hover:text-gray-900"
+                              onClick={(e) => {
+                                e.stopPropagation();
+                                handleRemoveMedication(index);
+                              }}
+                              disabled={disabled}
+                            >
+                              <MinusCircledIcon className="h-4 w-4" />
+                            </Button>
+                          </div>
+                        </div>
+                        <CollapsibleContent>
+                          <div className="p-4 space-y-4 bg-white mx-2 mb-1 rounded-md shadow-sm">
+                            <MedicationRequestGridRow
+                              medication={medication}
+                              disabled={disabled}
+                              onUpdate={(updates) =>
+                                handleUpdateMedication(index, updates)
+                              }
+                              onRemove={() => handleRemoveMedication(index)}
+                            />
+                          </div>
+                        </CollapsibleContent>
+                      </Collapsible>
+                    ) : (
+                      <MedicationRequestGridRow
+                        medication={medication}
+                        disabled={disabled}
+                        onUpdate={(updates) =>
+                          handleUpdateMedication(index, updates)
+                        }
+                        onRemove={() => handleRemoveMedication(index)}
+                      />
+                    )}
+                  </React.Fragment>
+                ))}
+              </div>
+            </div>
+          </div>
+        )}
+      </div>
+      <div className="max-w-4xl">
+        <ValueSetSelect
+          system="system-medication"
+          placeholder={t("search_medications")}
+          onSelect={handleAddMedication}
+          disabled={disabled}
+          searchPostFix=" clinical drug"
+        />
+      </div>
+    </div>
   );
 }
 
-export const MedicationRequestItem: React.FC<{
+const MedicationRequestGridRow: React.FC<{
   medication: MedicationRequest;
   disabled?: boolean;
   onUpdate?: (medication: Partial<MedicationRequest>) => void;
   onRemove?: () => void;
-  index?: number;
-}> = ({ medication, disabled, onUpdate, onRemove, index = 0 }) => {
-  const dosageInstruction = medication.dosage_instruction[0];
+}> = ({ medication, disabled, onUpdate, onRemove }) => {
+  const dosageInstruction =
+    medication.dosage_instruction.length > 0
+      ? medication.dosage_instruction[0]
+      : undefined;
   const handleUpdateDosageInstruction = (
     updates: Partial<MedicationRequestDosageInstruction>,
   ) => {
@@ -146,203 +337,251 @@ export const MedicationRequestItem: React.FC<{
     });
   };
 
+  const [boundsDurationUnit, setBoundsDurationUnit] = useState<string>("d");
+
+  const as_needed_boolean = dosageInstruction?.as_needed_boolean;
+  const isFrequencySet = dosageInstruction?.timing?.repeat?.frequency;
   return (
-    <div className="p-3 justify-between group focus-within:ring-2 ring-gray-300 rounded-lg space-y-2">
-      <div className="flex items-center justify-between">
-        <h4 className="text-base font-semibold">
-          {index + 1}. {medication.medication?.display}
-        </h4>
-        <div className="flex items-center gap-2">
-          <div>
-            <Label className="sr-only">Intent</Label>
-            <Select
-              value={medication.intent}
-              onValueChange={(value: MedicationRequestIntent) =>
-                onUpdate?.({ intent: value })
+    <div className="grid grid-cols-1 lg:grid-cols-[280px,180px,170px,160px,300px,230px,180px,250px,180px,160px,48px] border-b hover:bg-gray-50/50">
+      {/* Medicine Name and Controls */}
+      <div className="lg:p-4 lg:px-2 lg:py-1 flex items-center justify-between lg:justify-start lg:col-span-1 lg:border-r font-medium overflow-hidden text-sm">
+        <span className="break-words line-clamp-2 hidden lg:block">
+          {medication.medication?.display}
+        </span>
+      </div>
+
+      {/* Main Fields */}
+      <div
+        className="grid gap-2
+       p-0 lg:contents"
+      >
+        {/* Dosage */}
+        <div className="lg:px-2 lg:py-1 lg:border-r overflow-hidden">
+          <Label className="mb-1.5 block text-sm lg:hidden">
+            {t("dosage")}
+          </Label>
+          <QuantityInput
+            units={DOSAGE_UNITS}
+            quantity={dosageInstruction?.dose_and_rate?.dose_quantity}
+            onChange={(value) =>
+              handleUpdateDosageInstruction({
+                dose_and_rate: { type: "ordered", dose_quantity: value },
+              })
+            }
+            disabled={disabled}
+            autoFocus={true}
+          />
+        </div>
+
+        {/* Frequency */}
+        <div className="lg:px-2 lg:py-1 lg:border-r overflow-hidden">
+          <Label className="mb-1.5 block text-sm lg:hidden">
+            {t("frequency")}
+          </Label>
+          <Select
+            value={
+              dosageInstruction?.as_needed_boolean
+                ? "PRN"
+                : reverseFrequencyOption(dosageInstruction?.timing)
+            }
+            onValueChange={(value) => {
+              if (value === "PRN") {
+                handleUpdateDosageInstruction({
+                  as_needed_boolean: true,
+                  timing: undefined,
+                });
+              } else {
+                handleUpdateDosageInstruction({
+                  as_needed_boolean: false,
+                  timing: {
+                    repeat: {
+                      ...dosageInstruction?.timing?.repeat,
+                      ...FREQUENCY_OPTIONS[
+                        value as keyof typeof FREQUENCY_OPTIONS
+                      ].timing.repeat,
+                    },
+                  },
+                });
               }
-              disabled={disabled}
-            >
-              <SelectTrigger className="capitalize">
-                <SelectValue placeholder="Select intent" />
-              </SelectTrigger>
-              <SelectContent>
-                {MEDICATION_REQUEST_INTENT.map((intent) => (
-                  <SelectItem
-                    key={intent}
-                    value={intent}
-                    className="capitalize"
-                  >
-                    {intent.replace(/_/g, " ")}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          </div>
-          {onRemove && (
-            <Button
-              variant="secondary"
-              size="icon"
-              onClick={onRemove}
-              disabled={disabled}
-            >
-              <MinusCircledIcon className="size-4" />
-            </Button>
-          )}
+            }}
+            disabled={disabled}
+          >
+            <SelectTrigger className="h-8 text-sm">
+              <SelectValue placeholder={t("select_frequency")} />
+            </SelectTrigger>
+            <SelectContent>
+              <SelectItem value="PRN">{t("as_needed_prn")}</SelectItem>
+              {Object.entries(FREQUENCY_OPTIONS).map(([key, option]) => (
+                <SelectItem key={key} value={key}>
+                  {option.display}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
         </div>
-      </div>
-      <div className="flex flex-col gap-4">
-        <div className="flex gap-2">
-          <div className="flex-1">
-            <Label className="mb-1 block text-sm font-medium">Dosage</Label>
-            <QuantityInput
-              units={DOSAGE_UNITS}
-              quantity={
-                medication.dosage_instruction[0]?.dose_and_rate?.dose_quantity
+
+        {/* Duration */}
+        <div className="lg:px-2 lg:py-1 lg:border-r overflow-hidden">
+          <Label className="mb-1.5 block text-sm lg:hidden">
+            {t("duration")}
+          </Label>
+          <QuantityInput
+            units={BOUNDS_DURATION_UNITS}
+            quantity={{
+              value: dosageInstruction?.timing?.repeat?.bounds_duration?.value,
+              unit:
+                dosageInstruction?.timing?.repeat?.bounds_duration?.unit ??
+                boundsDurationUnit,
+            }}
+            onChange={(value) => {
+              if (value?.unit) {
+                setBoundsDurationUnit(
+                  value?.unit as (typeof BOUNDS_DURATION_UNITS)[number],
+                );
               }
-              onChange={(value) =>
+              if (dosageInstruction?.timing?.repeat) {
+                let updatedBoundsDuration: BoundsDuration | undefined =
+                  undefined;
+                const updatedValue = value.value;
+                if (updatedValue === undefined || updatedValue === 0) {
+                  updatedBoundsDuration = undefined;
+                } else {
+                  updatedBoundsDuration = {
+                    value: updatedValue,
+                    unit: value?.unit as (typeof BOUNDS_DURATION_UNITS)[number],
+                  };
+                }
                 handleUpdateDosageInstruction({
-                  dose_and_rate: { type: "ordered", dose_quantity: value },
-                })
+                  timing: {
+                    ...dosageInstruction.timing,
+                    repeat: {
+                      ...dosageInstruction.timing.repeat,
+                      bounds_duration: updatedBoundsDuration,
+                    },
+                  },
+                });
               }
-              disabled={disabled}
-            />
-          </div>
-          <div className="flex-[2]">
-            <Label className="mb-1 block text-sm font-medium">Route</Label>
-            <ValueSetSelect
-              system="system-route"
-              value={medication.dosage_instruction[0]?.route}
-              onSelect={(route) => handleUpdateDosageInstruction({ route })}
-              placeholder="Select route"
-              disabled={disabled}
-            />
-          </div>
-          <div className="flex-1">
-            <Label className="mb-1 block text-sm font-medium pr-4">
-              Method
-            </Label>
-            <ValueSetSelect
-              system="system-administration-method"
-              value={medication.dosage_instruction[0]?.method}
-              onSelect={(method) => handleUpdateDosageInstruction({ method })}
-              placeholder="Select method"
-              disabled={disabled}
-              count={20}
-            />
-          </div>
+            }}
+            disabled={disabled || !isFrequencySet || as_needed_boolean}
+          />
         </div>
 
-        <div className="flex gap-2">
-          <div className="flex-1">
-            <Label className="mb-1 block text-sm font-medium pr-4">Site</Label>
-            <ValueSetSelect
-              system="system-body-site"
-              value={medication.dosage_instruction[0]?.site}
-              onSelect={(site) => handleUpdateDosageInstruction({ site })}
-              placeholder="Select site"
-              disabled={disabled}
-            />
-          </div>
+        {/* Instructions */}
+        <div className="lg:px-2 lg:py-1 lg:border-r overflow-hidden">
+          <Label className="mb-1.5 block text-sm lg:hidden">
+            {t("instructions")}
+          </Label>
+          <ValueSetSelect
+            system="system-as-needed-reason"
+            value={dosageInstruction?.as_needed_for}
+            onSelect={(reason) =>
+              handleUpdateDosageInstruction({ as_needed_for: reason })
+            }
+            placeholder={t("select_prn_reason")}
+            disabled={disabled || !dosageInstruction?.as_needed_boolean}
+            wrapTextForSmallScreen={true}
+          />
         </div>
 
-        <div className="flex items-center gap-2 mt-2">
-          <Checkbox
-            id={`prn-checkbox-${medication.medication?.code}`}
-            checked={
-              medication.dosage_instruction[0]?.as_needed_boolean ?? false
-            }
-            onCheckedChange={(checked) =>
+        {/* Additional Instructions */}
+        <div className="lg:px-2 lg:py-1 lg:border-r overflow-hidden">
+          <Label className="mb-1.5 block text-sm lg:hidden">
+            {t("additional_instructions")}
+          </Label>
+          <ValueSetSelect
+            system="system-additional-instruction"
+            value={dosageInstruction?.additional_instruction?.[0]}
+            onSelect={(instruction) =>
               handleUpdateDosageInstruction({
-                as_needed_boolean: !!checked,
-                as_needed_for: checked
-                  ? medication.dosage_instruction[0]?.as_needed_for
-                  : undefined,
+                additional_instruction: [instruction],
               })
             }
+            placeholder={t("select_additional_instructions")}
+            disabled={disabled}
+          />
+        </div>
+
+        {/* Route */}
+        <div className="lg:px-2 lg:py-1 lg:border-r overflow-hidden">
+          <Label className="mb-1.5 block text-sm lg:hidden">{t("route")}</Label>
+          <ValueSetSelect
+            system="system-route"
+            value={dosageInstruction?.route}
+            onSelect={(route) => handleUpdateDosageInstruction({ route })}
+            placeholder={t("select_route")}
             disabled={disabled}
           />
-          <Label htmlFor={`prn-checkbox-${medication.medication?.code}`}>
-            As Needed / PRN
+        </div>
+
+        {/* Site */}
+        <div className="lg:px-2 lg:py-1 lg:border-r overflow-hidden">
+          <Label className="mb-1.5 block text-sm lg:hidden">{t("site")}</Label>
+          <ValueSetSelect
+            system="system-body-site"
+            value={dosageInstruction?.site}
+            onSelect={(site) => handleUpdateDosageInstruction({ site })}
+            placeholder={t("select_site")}
+            disabled={disabled}
+            wrapTextForSmallScreen={true}
+          />
+        </div>
+
+        {/* Method */}
+        <div className="lg:px-2 lg:py-1 lg:border-r overflow-hidden">
+          <Label className="mb-1.5 block text-sm lg:hidden">
+            {t("method")}
           </Label>
+          <ValueSetSelect
+            system="system-administration-method"
+            value={dosageInstruction?.method}
+            onSelect={(method) => handleUpdateDosageInstruction({ method })}
+            placeholder={t("select_method")}
+            disabled={disabled}
+            count={20}
+          />
         </div>
 
-        {medication.dosage_instruction[0]?.as_needed_boolean ? (
-          <div className="flex gap-2">
-            <div className="flex-1">
-              <ValueSetSelect
-                system="system-as-needed-reason"
-                value={medication.dosage_instruction[0]?.as_needed_for}
-                onSelect={(reason) =>
-                  handleUpdateDosageInstruction({ as_needed_for: reason })
-                }
-                placeholder="Select reason or indicator for PRN"
-                disabled={disabled}
+        {/* Intent */}
+        <div className="lg:px-2 lg:py-1 lg:border-r overflow-hidden">
+          <Label className="mb-1.5 block text-sm lg:hidden">
+            {t("intent")}
+          </Label>
+          <Select
+            value={medication.intent}
+            onValueChange={(value: MedicationRequestIntent) =>
+              onUpdate?.({ intent: value })
+            }
+            disabled={disabled}
+          >
+            <SelectTrigger className="h-8 text-sm capitalize">
+              <SelectValue
+                className="capitalize"
+                placeholder={t("select_intent")}
               />
-            </div>
-          </div>
-        ) : (
-          <div className="flex gap-2">
-            <div className="flex-1">
-              <Label className="mb-1 block text-sm font-medium">
-                Frequency
-              </Label>
-              <Select
-                value={reverseFrequencyOption(dosageInstruction?.timing)}
-                onValueChange={(value: keyof typeof FREQUENCY_OPTIONS) =>
-                  handleUpdateDosageInstruction({
-                    timing: FREQUENCY_OPTIONS[value].timing,
-                  })
-                }
-                disabled={disabled}
-              >
-                <SelectTrigger className="capitalize">
-                  <SelectValue placeholder="Select frequency" />
-                </SelectTrigger>
-                <SelectContent>
-                  {Object.entries(FREQUENCY_OPTIONS).map(([key, option]) => (
-                    <SelectItem key={key} value={key}>
-                      {option.display}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            </div>
-            <div className="flex-1">
-              <Label className="mb-1 block text-sm font-medium">Days</Label>
-              <Input type="number" disabled={disabled} />
-            </div>
-          </div>
-        )}
+            </SelectTrigger>
+            <SelectContent>
+              {MEDICATION_REQUEST_INTENT.map((intent) => (
+                <SelectItem key={intent} value={intent} className="capitalize">
+                  {intent.replace(/_/g, " ")}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        </div>
 
-        <div className="flex gap-2">
-          <div className="flex-1">
-            <Label className="mb-1 block text-sm font-medium">
-              Additional Instructions
-            </Label>
-            <ValueSetSelect
-              system="system-additional-instruction"
-              value={
-                medication.dosage_instruction[0]?.additional_instruction?.[0]
-              }
-              onSelect={(additionalInstruction) =>
-                onUpdate?.({
-                  dosage_instruction: [
-                    {
-                      ...medication.dosage_instruction[0],
-                      additional_instruction: [additionalInstruction],
-                    },
-                  ],
-                })
-              }
-              disabled={disabled}
-            />
-          </div>
+        {/* Remove Button - Desktop */}
+        <div className="hidden lg:flex lg:px-2 lg:py-1 items-center justify-center sticky right-0 bg-white shadow-[-12px_0_15px_-4px_rgba(0,0,0,0.15)] w-12">
+          <Button
+            variant="ghost"
+            size="icon"
+            onClick={onRemove}
+            disabled={disabled}
+            className="h-8 w-8"
+          >
+            <MinusCircledIcon className="h-4 w-4 text-gray-400" />
+          </Button>
         </div>
       </div>
-
-      {/* <div className="font-mono text-xs whitespace-pre-wrap mt-8">
-        {JSON.stringify(medication, null, 2)}
-      </div> */}
     </div>
   );
 };
@@ -360,41 +599,73 @@ const reverseFrequencyOption = (
 
 // TODO: verify period_unit is correct
 const FREQUENCY_OPTIONS = {
-  BD: {
-    display: "Twice daily",
+  BID: {
+    display: "Two times a day",
     timing: { repeat: { frequency: 2, period: 1, period_unit: "d" } },
   },
-  HS: {
-    display: "Night only",
+  TID: {
+    display: "Three times a day",
+    timing: { repeat: { frequency: 3, period: 1, period_unit: "d" } },
+  },
+  QID: {
+    display: "Four times a day",
+    timing: { repeat: { frequency: 4, period: 1, period_unit: "d" } },
+  },
+  AM: {
+    display: "Every morning",
+    timing: { repeat: { frequency: 1, period: 1, period_unit: "d" } },
+  },
+  PM: {
+    display: "Every afternoon",
     timing: { repeat: { frequency: 1, period: 1, period_unit: "d" } },
   },
-  OD: {
-    display: "Once daily",
+  QD: {
+    display: "Every day",
     timing: { repeat: { frequency: 1, period: 1, period_unit: "d" } },
   },
+  QOD: {
+    display: "Every other day",
+    timing: { repeat: { frequency: 1, period: 2, period_unit: "d" } },
+  },
+  Q1H: {
+    display: "Every hour",
+    timing: { repeat: { frequency: 24, period: 1, period_unit: "d" } },
+  },
+  Q2H: {
+    display: "Every 2 hours",
+    timing: { repeat: { frequency: 12, period: 1, period_unit: "d" } },
+  },
+  Q3H: {
+    display: "Every 3 hours",
+    timing: { repeat: { frequency: 8, period: 1, period_unit: "d" } },
+  },
   Q4H: {
-    display: "4th hourly",
-    timing: { repeat: { frequency: 4, period: 1, period_unit: "h" } },
+    display: "Every 4 hours",
+    timing: { repeat: { frequency: 6, period: 1, period_unit: "d" } },
   },
-  QID: {
-    display: "6th hourly",
-    timing: { repeat: { frequency: 6, period: 1, period_unit: "h" } },
+  Q6H: {
+    display: "Every 6 hours",
+    timing: { repeat: { frequency: 4, period: 1, period_unit: "d" } },
   },
-  QOD: {
-    display: "Alternate day",
-    timing: { repeat: { frequency: 2, period: 1, period_unit: "d" } },
+  Q8H: {
+    display: "Every 8 hours",
+    timing: { repeat: { frequency: 3, period: 1, period_unit: "d" } },
+  },
+  BED: {
+    display: "At bedtime",
+    timing: { repeat: { frequency: 1, period: 1, period_unit: "d" } },
   },
-  QWK: {
-    display: "Once a week",
+  WK: {
+    display: "Weekly",
     timing: { repeat: { frequency: 1, period: 1, period_unit: "wk" } },
   },
-  STAT: {
-    display: "Imediately",
-    timing: { repeat: { frequency: 1, period: 1, period_unit: "s" } },
+  MO: {
+    display: "Monthly",
+    timing: { repeat: { frequency: 1, period: 1, period_unit: "mo" } },
   },
-  TID: {
-    display: "8th hourly",
-    timing: { repeat: { frequency: 8, period: 1, period_unit: "h" } },
+  STAT: {
+    display: "Immediately",
+    timing: { repeat: { frequency: 1, period: 1, period_unit: "s" } }, // One-time
   },
 } as const satisfies Record<
   string,
diff --git a/src/components/Questionnaire/QuestionTypes/QuestionInput.tsx b/src/components/Questionnaire/QuestionTypes/QuestionInput.tsx
index 0f09a72f62e..a356164711b 100644
--- a/src/components/Questionnaire/QuestionTypes/QuestionInput.tsx
+++ b/src/components/Questionnaire/QuestionTypes/QuestionInput.tsx
@@ -1,3 +1,5 @@
+import { cn } from "@/lib/utils";
+
 import CareIcon from "@/CAREUI/icons/CareIcon";
 
 import { Button } from "@/components/ui/button";
@@ -164,8 +166,14 @@ export function QuestionInput({
             );
 
           return (
-            <div key={index} className="mt-2 gap-2 flex items-end">
-              <div className="flex-1 space-y-1" data-question-id={question.id}>
+            <div
+              key={index}
+              className={cn("mt-2", removeButton && "gap-2 flex items-end")}
+            >
+              <div
+                className={cn("space-y-1", { "flex-1": removeButton })}
+                data-question-id={question.id}
+              >
                 {index === 0 && <QuestionLabel question={question} />}
                 {renderSingleInput(index)}
               </div>
diff --git a/src/components/Questionnaire/QuestionnaireForm.tsx b/src/components/Questionnaire/QuestionnaireForm.tsx
index 6c3256633fe..34e67e9eb02 100644
--- a/src/components/Questionnaire/QuestionnaireForm.tsx
+++ b/src/components/Questionnaire/QuestionnaireForm.tsx
@@ -296,14 +296,14 @@ export function QuestionnaireForm({
         formState={questionnaireForms}
         setFormState={setQuestionnaireForms}
       />
-      <div className="flex-1 overflow-y-auto max-w-3xl pb-8 space-y-2">
+      <div className="flex-1 overflow-y-auto w-full pb-8 space-y-2">
         {/* Questionnaire Forms */}
         {questionnaireForms.map((form, index) => (
           <div
             key={`${form.questionnaire.id}-${index}`}
-            className="border rounded-lg p-6 space-y-6"
+            className="rounded-lg py-6 px-4 space-y-6"
           >
-            <div className="flex justify-between items-center">
+            <div className="flex justify-between items-center max-w-4xl">
               <div className="space-y-1">
                 <h2 className="text-xl font-semibold">
                   {form.questionnaire.title}
@@ -373,7 +373,7 @@ export function QuestionnaireForm({
 
         {/* Search and Add Questionnaire */}
 
-        <div className="flex gap-4 items-center">
+        <div className="flex gap-4 items-center m-4 max-w-4xl">
           <QuestionnaireSearch
             subjectType={subjectType}
             onSelect={(selected) => {
@@ -400,7 +400,7 @@ export function QuestionnaireForm({
 
         {/* Submit and Cancel Buttons */}
         {questionnaireForms.length > 0 && (
-          <div className="flex justify-end gap-4 mt-4">
+          <div className="flex justify-end gap-4 mx-4 mt-4 max-w-4xl">
             <Button
               type="button"
               variant="outline"
@@ -431,7 +431,7 @@ export function QuestionnaireForm({
 
         {/* Add a Preview of the QuestionnaireForm */}
         {import.meta.env.DEV && (
-          <div className="p-4 space-y-6">
+          <div className="p-4 space-y-6 max-w-4xl">
             <h2 className="text-xl font-semibold">QuestionnaireForm</h2>
             <pre className="text-sm text-muted-foreground">
               {JSON.stringify(questionnaireForms, null, 2)}
diff --git a/src/components/Questionnaire/ValueSetSelect.tsx b/src/components/Questionnaire/ValueSetSelect.tsx
index 5a17f27009a..f193eba33f3 100644
--- a/src/components/Questionnaire/ValueSetSelect.tsx
+++ b/src/components/Questionnaire/ValueSetSelect.tsx
@@ -31,6 +31,7 @@ interface Props {
   disabled?: boolean;
   count?: number;
   searchPostFix?: string;
+  wrapTextForSmallScreen?: boolean;
 }
 
 export default function ValueSetSelect({
@@ -41,6 +42,7 @@ export default function ValueSetSelect({
   disabled,
   count = 10,
   searchPostFix = "",
+  wrapTextForSmallScreen = false,
 }: Props) {
   const { t } = useTranslation();
   const [open, setOpen] = useState(false);
@@ -67,7 +69,10 @@ export default function ValueSetSelect({
           variant="outline"
           role="combobox"
           className={cn(
-            "w-full justify-between truncate",
+            "w-full justify-between",
+            wrapTextForSmallScreen
+              ? "h-auto md:h-9 whitespace-normal text-left md:truncate"
+              : "truncate",
             !value?.display && "text-gray-400",
           )}
         >
diff --git a/src/types/emr/medicationRequest.ts b/src/types/emr/medicationRequest.ts
index 049a1af3117..5a528bb3ed7 100644
--- a/src/types/emr/medicationRequest.ts
+++ b/src/types/emr/medicationRequest.ts
@@ -13,6 +13,18 @@ export const DOSAGE_UNITS = [
   "unit(s)",
 ] as const;
 
+export const BOUNDS_DURATION_UNITS = [
+  // TODO: Are these smaller units required?
+  // "ms",
+  // "s,
+  // "min",
+  "h",
+  "d",
+  "wk",
+  "mo",
+  "a",
+] as const;
+
 export const MEDICATION_REQUEST_STATUS = [
   "active",
   "on-hold",
@@ -66,6 +78,11 @@ export interface DosageQuantity {
   unit?: (typeof DOSAGE_UNITS)[number];
 }
 
+export interface BoundsDuration {
+  value: number;
+  unit: (typeof BOUNDS_DURATION_UNITS)[number];
+}
+
 export interface DoseRange {
   low: DosageQuantity;
   high: DosageQuantity;
@@ -73,10 +90,10 @@ export interface DoseRange {
 
 export interface Timing {
   repeat?: {
-    frequency?: number;
+    frequency: number;
     period: number;
     period_unit: "s" | "min" | "h" | "d" | "wk" | "mo" | "a";
-    bounds_duration?: DosageQuantity;
+    bounds_duration?: BoundsDuration;
   };
   code?: Code;
 }