diff --git a/src/services/ui/src/components/BreadCrumb/BreadCrumb.tsx b/src/services/ui/src/components/BreadCrumb/BreadCrumb.tsx
index bbd3787738..ef3cb8bda4 100644
--- a/src/services/ui/src/components/BreadCrumb/BreadCrumb.tsx
+++ b/src/services/ui/src/components/BreadCrumb/BreadCrumb.tsx
@@ -61,7 +61,7 @@ export const BreadCrumb = ({
       {showSeperator && <span>{seperator}</span>}
 
       {active && (
-        <Link to={to} className="underline text-sky-600 hover:text-sky-800">
+        <Link to={to} className="underline text-sky-700 hover:text-sky-800">
           {children}
         </Link>
       )}
diff --git a/src/services/ui/src/components/Cards/OptionCard.test.tsx b/src/services/ui/src/components/Cards/OptionCard.test.tsx
index 78af99e2f4..62ae3f023a 100644
--- a/src/services/ui/src/components/Cards/OptionCard.test.tsx
+++ b/src/services/ui/src/components/Cards/OptionCard.test.tsx
@@ -49,11 +49,11 @@ describe("OptionCard Component System", () => {
       expect(innerWrapper.className.includes("bg-slate-100")).toBeTruthy();
       expect(innerWrapper.className.includes("bg-white")).toBeFalsy();
     });
-    test("title is rendered as an h3 and styled", () => {
+    test("title is rendered as an h2 and styled", () => {
       renderOptionCard(false);
-      const header = screen.getByRole("heading", { level: 3 });
+      const header = screen.getByRole("heading", { level: 2 });
       expect(header).toHaveTextContent("Test Card Title");
-      expect(header).toHaveClass("text-lg text-sky-600 font-bold my-2");
+      expect(header).toHaveClass("text-lg text-sky-700 font-bold my-2");
     });
     test("description is rendered", () => {
       renderOptionCard(false);
diff --git a/src/services/ui/src/components/Cards/OptionCard.tsx b/src/services/ui/src/components/Cards/OptionCard.tsx
index 6c4963d1f1..61d9fc23ab 100644
--- a/src/services/ui/src/components/Cards/OptionCard.tsx
+++ b/src/services/ui/src/components/Cards/OptionCard.tsx
@@ -45,10 +45,10 @@ export const OptionCard = ({
           } hover:bg-sky-100`}
         >
           <div>
-            <h3 className="text-lg text-sky-600 font-bold my-2">{title}</h3>
+            <h2 className="text-lg text-sky-700 font-bold my-2">{title}</h2>
             <p className="my-2 text-slate-600">{description}</p>
           </div>
-          <ChevronRight className="text-sky-600 w-8 h-8" />
+          <ChevronRight className="text-sky-700 w-8 h-8" />
         </div>
       </Link>
     </label>
diff --git a/src/services/ui/src/components/Inputs/form.tsx b/src/services/ui/src/components/Inputs/form.tsx
index f3ae142c85..9fb1c6aea4 100644
--- a/src/services/ui/src/components/Inputs/form.tsx
+++ b/src/services/ui/src/components/Inputs/form.tsx
@@ -95,7 +95,7 @@ const FormLabel = React.forwardRef<
   return (
     <Label
       ref={ref}
-      className={cn(error && "text-destructive", "font-bold", className)}
+      className={cn(error && "text-destructive", className)}
       htmlFor={formItemId}
       {...props}
     />
@@ -148,7 +148,8 @@ const FormMessage = React.forwardRef<
   React.HTMLAttributes<HTMLParagraphElement> & { className?: string }
 >(({ className, children, ...props }, ref) => {
   const { error, formMessageId } = useFormField();
-  const body = error ? String(error?.message) : children;
+  const body =
+    error && !Array.isArray(error) ? String(error?.message) : children;
 
   if (!body) {
     return null;
diff --git a/src/services/ui/src/components/Inputs/input.tsx b/src/services/ui/src/components/Inputs/input.tsx
index bcfd28827c..b674ae4695 100644
--- a/src/services/ui/src/components/Inputs/input.tsx
+++ b/src/services/ui/src/components/Inputs/input.tsx
@@ -1,26 +1,35 @@
 import * as React from "react";
-
 import { cn } from "@/lib/utils";
 
 export interface InputProps
-  extends React.InputHTMLAttributes<HTMLInputElement> {}
+  extends React.InputHTMLAttributes<HTMLInputElement> {
+  icon?: string;
+}
 
 const Input = React.forwardRef<HTMLInputElement, InputProps>(
-  ({ className, type, ...props }, ref) => {
+  ({ className, icon, ...props }, ref) => {
     return (
-      <input
-        type={type}
-        className={cn(
-          "flex h-9 w-full rounded-sm border border-black bg-transparent px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
-          className
+      <div className="relative">
+        {icon && (
+          <span className="absolute inset-y-0 left-0 flex items-center pl-2 text-gray-500">
+            {icon}
+          </span>
         )}
-        ref={ref}
-        id={props.name}
-        {...props}
-      />
+        <input
+          className={cn(
+            "flex h-9 w-full rounded-sm border border-black bg-transparent px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
+            icon && "pl-6",
+            className
+          )}
+          ref={ref}
+          id={props.name}
+          {...props}
+        />
+      </div>
     );
   }
 );
+
 Input.displayName = "Input";
 
 export { Input };
diff --git a/src/services/ui/src/components/Inputs/label.tsx b/src/services/ui/src/components/Inputs/label.tsx
index 7c9606448a..a851368006 100644
--- a/src/services/ui/src/components/Inputs/label.tsx
+++ b/src/services/ui/src/components/Inputs/label.tsx
@@ -5,7 +5,7 @@ import { cva, type VariantProps } from "class-variance-authority";
 import { cn } from "@/lib/utils";
 
 const labelVariants = cva(
-  "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+  "text-base leading-normal peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
 );
 
 const Label = React.forwardRef<
diff --git a/src/services/ui/src/components/Opensearch/Filtering/FilterableDateRange.tsx b/src/services/ui/src/components/Opensearch/Filtering/FilterableDateRange.tsx
index b33fb248a8..8123029ab9 100644
--- a/src/services/ui/src/components/Opensearch/Filtering/FilterableDateRange.tsx
+++ b/src/services/ui/src/components/Opensearch/Filtering/FilterableDateRange.tsx
@@ -1,10 +1,22 @@
-import { useState, useMemo, useEffect } from "react";
-import { format } from "date-fns";
+import { useState, useMemo } from "react";
+import {
+  format,
+  isAfter,
+  isBefore,
+  isValid,
+  parse,
+  startOfQuarter,
+  startOfMonth,
+  sub,
+  getYear,
+  endOfDay,
+  startOfDay,
+} from "date-fns";
 import { Calendar as CalendarIcon } from "lucide-react";
 import { DateRange } from "react-day-picker";
 
 import { cn } from "@/lib/utils";
-import { Button, Calendar } from "@/components/Inputs";
+import { Button, Calendar, Input } from "@/components/Inputs";
 import { Popover, PopoverContent, PopoverTrigger } from "@/components/Popover";
 import { OsRangeValue } from "shared-types";
 
@@ -19,23 +31,123 @@ type Props = Omit<
 
 export function FilterableDateRange({ value, onChange, ...props }: Props) {
   const [open, setOpen] = useState(false);
-  const [date, setDate] = useState<DateRange | undefined>({
+  const [selectedDate, setSelectedDate] = useState<DateRange | undefined>({
     from: value?.gte ? new Date(value?.gte) : undefined,
     to: value?.lte ? new Date(value?.lte) : undefined,
   });
+  const [fromValue, setFromValue] = useState<string>(
+    value?.gte ? format(new Date(value?.gte), "MM/dd/yyyy") : ""
+  );
+  const [toValue, setToValue] = useState<string>(
+    value?.lte ? format(new Date(value?.lte), "MM/dd/yyyy") : ""
+  );
 
   const handleClose = (updateOpen: boolean) => {
     setOpen(updateOpen);
   };
 
+  const checkSingleDateSelection = (
+    from: Date | undefined,
+    to: Date | undefined
+  ) => {
+    if (from && !to) {
+      const rangeObject = getDateRange(from, endOfDay(from));
+      onChange(rangeObject);
+      setFromValue(format(from, "MM/dd/yyyy"));
+    }
+  };
+
+  const onFromInput = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const minValidYear = 1960;
+    const input = e.target.value;
+
+    if (/^[0-9/]*$/.test(input)) {
+      setFromValue(e.target.value);
+      const date = parse(e.target.value, "MM/dd/yyyy", new Date());
+      if (
+        !isValid(date) ||
+        getYear(date) < minValidYear ||
+        isAfter(date, new Date())
+      ) {
+        return setSelectedDate({ from: undefined, to: selectedDate?.to });
+      }
+      if (selectedDate?.to && isAfter(date, selectedDate.to)) {
+        setSelectedDate({ from: date, to: undefined });
+        setToValue("");
+      } else {
+        setSelectedDate({ from: date, to: selectedDate?.to });
+        onChange({
+          gte: date.toISOString(),
+          lte: selectedDate?.to?.toISOString() || "",
+        });
+      }
+    }
+  };
+
+  const onToInput = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const minValidYear = 1960;
+    const inputValue = e.target.value;
+
+    if (/^[0-9/]*$/.test(inputValue)) {
+      setToValue(e.target.value);
+      const date = parse(inputValue, "MM/dd/yyyy", new Date());
+
+      if (
+        !isValid(date) ||
+        getYear(date) < minValidYear ||
+        isAfter(date, new Date())
+      ) {
+        return setSelectedDate({ from: selectedDate?.from, to: undefined });
+      }
+
+      if (selectedDate?.from && isBefore(date, selectedDate.from)) {
+        setSelectedDate({ from: undefined, to: selectedDate.from });
+        setFromValue("");
+      } else {
+        setSelectedDate({ from: selectedDate?.from, to: date });
+        onChange({
+          gte: selectedDate?.from?.toISOString() || "",
+          lte: endOfDay(date).toISOString(),
+        });
+      }
+    }
+  };
+
+  const getDateRange = (startDate: Date, endDate: Date): OsRangeValue => {
+    return {
+      gte: startDate.toISOString(),
+      lte: endDate.toISOString(),
+    };
+  };
+
+  const setPresetRange = (range: string) => {
+    const today = startOfDay(new Date());
+    let startDate = today;
+    if (range === "quarter") {
+      startDate = startOfQuarter(today);
+    } else if (range === "month") {
+      startDate = startOfMonth(today);
+    } else if (range === "week") {
+      startDate = sub(today, { days: 6 });
+    }
+
+    const rangeObject = getDateRange(startDate, endOfDay(today));
+    onChange(rangeObject);
+    setSelectedDate({ from: startDate, to: today });
+    setFromValue(format(startDate, "MM/dd/yyyy"));
+    setToValue(format(today, "MM/dd/yyyy"));
+  };
+
   const label = useMemo(() => {
-    const from = date?.from ? format(date.from, "LLL dd, y") : "";
-    const to = date?.to ? format(date.to, "LLL dd, y") : "";
+    const from = selectedDate?.from
+      ? format(selectedDate.from, "LLL dd, y")
+      : "";
+    const to = selectedDate?.to ? format(selectedDate.to, "LLL dd, y") : "";
 
     if (from && to) return `${from} - ${to}`;
     if (from) return `${from}`;
     return "Pick a date";
-  }, [date]);
+  }, [selectedDate]);
 
   return (
     <div className="flex items-center">
@@ -57,28 +169,66 @@ export function FilterableDateRange({ value, onChange, ...props }: Props) {
             disabled={[{ after: new Date() }]}
             initialFocus
             mode="range"
-            defaultMonth={date?.from}
-            selected={date}
+            defaultMonth={selectedDate?.from}
+            selected={selectedDate}
             numberOfMonths={2}
             className="bg-white"
             onSelect={(d) => {
-              setDate(d);
+              setSelectedDate(d);
               if (!!d?.from && !!d.to) {
                 onChange({
                   gte: d.from.toISOString(),
-                  lte: d.to.toISOString(),
+                  lte: endOfDay(d.to).toISOString(),
+                });
+                setFromValue(format(d.from, "MM/dd/yyyy"));
+                setToValue(format(d.to, "MM/dd/yyyy"));
+              } else if (!d?.from && !d?.to) {
+                onChange({
+                  gte: "",
+                  lte: "",
                 });
+                setFromValue("");
+                setToValue("");
+              } else {
+                checkSingleDateSelection(d.from, d.to);
               }
             }}
             {...props}
           />
+          <div className="flex flex-row gap-4 w-[320px] p-2 m-auto">
+            <Input
+              onChange={onFromInput}
+              value={fromValue}
+              placeholder="mm/dd/yyyy"
+              className="text-md"
+            />
+            <p>-</p>
+            <Input
+              onChange={onToInput}
+              value={toValue}
+              placeholder="mm/dd/yyyy"
+              className="text-md"
+            />
+          </div>
+          <div className="flex gap-4 p-2 ml-4">
+            <Button onClick={() => setPresetRange("today")}>Today</Button>
+            <Button onClick={() => setPresetRange("week")}>Last 7 Days</Button>
+            <Button onClick={() => setPresetRange("month")}>
+              Month To Date
+            </Button>
+            <Button onClick={() => setPresetRange("quarter")}>
+              Quarter To Date
+            </Button>
+          </div>
         </PopoverContent>
       </Popover>
       <Button
         className="text-white"
         onClick={() => {
-          setDate({ from: undefined, to: undefined });
+          setSelectedDate({ from: undefined, to: undefined });
           onChange({ gte: undefined, lte: undefined });
+          setToValue("");
+          setFromValue("");
         }}
       >
         Clear
diff --git a/src/services/ui/src/components/Opensearch/Filtering/consts.ts b/src/services/ui/src/components/Opensearch/Filtering/consts.ts
index c6da029d07..3ca849bc8b 100644
--- a/src/services/ui/src/components/Opensearch/Filtering/consts.ts
+++ b/src/services/ui/src/components/Opensearch/Filtering/consts.ts
@@ -29,7 +29,7 @@ export const FILTER_GROUPS = (
       value: [],
     },
     "planType.keyword": {
-      label: "Plan Type",
+      label: "Type",
       field: "planType.keyword",
       component: "multiCheck",
       prefix: "must",
@@ -61,7 +61,7 @@ export const FILTER_GROUPS = (
       value: { gte: undefined, lte: undefined },
     },
     raiReceivedDate: {
-      label: "RAI Response Date",
+      label: "Formal RAI Response",
       field: "raiReceivedDate",
       component: "dateRange",
       prefix: "must",
diff --git a/src/services/ui/src/components/Opensearch/Table/index.tsx b/src/services/ui/src/components/Opensearch/Table/index.tsx
index 2ff0fec041..a71f2b0586 100644
--- a/src/services/ui/src/components/Opensearch/Table/index.tsx
+++ b/src/services/ui/src/components/Opensearch/Table/index.tsx
@@ -32,7 +32,7 @@ export const OsTable: FC<{
   };
 
   return (
-    <UI.Table className="flex-1 border-[1px]">
+    <UI.Table className="flex-1 min-h-[calc(100vh-350px)]">
       <UI.TableHeader className="sticky top-0 bg-white">
         <UI.TableRow>
           <UI.TableHead
@@ -77,7 +77,16 @@ export const OsTable: FC<{
             <LoadingSpinner />
           </div>
         )}
-
+        {context.data && !context.data.hits.length && (
+          <UI.TableRow className="h-10">
+            <UI.TableCell className="flex">
+              <p className="font-medium whitespace-nowrap h-[20px]"> </p>
+              <p className="absolute right-[50%] top-[50%] translate-x-[50%] translate-y-[50%] font-medium text-lg text-gray-500">
+                No Results Found
+              </p>
+            </UI.TableCell>
+          </UI.TableRow>
+        )}
         {context.data?.hits.map((DAT) => (
           <UI.TableRow key={DAT._source.id}>
             <UI.TableCell className="fixed" />
diff --git a/src/services/ui/src/components/Opensearch/useOpensearch.ts b/src/services/ui/src/components/Opensearch/useOpensearch.ts
index 71d5e1ec38..db038b55d9 100644
--- a/src/services/ui/src/components/Opensearch/useOpensearch.ts
+++ b/src/services/ui/src/components/Opensearch/useOpensearch.ts
@@ -100,7 +100,7 @@ export const useOsAggregate = () => {
             field: "leadAnalystName.keyword",
             name: "leadAnalystName.keyword",
             type: "terms",
-            size: 300,
+            size: 1000,
           },
         ],
         filters: DEFAULT_FILTERS[props.queryKey[0]].filters || [],
diff --git a/src/services/ui/src/components/RHF/Document.tsx b/src/services/ui/src/components/RHF/Document.tsx
index 5c4b3baf96..accefd047f 100644
--- a/src/services/ui/src/components/RHF/Document.tsx
+++ b/src/services/ui/src/components/RHF/Document.tsx
@@ -12,7 +12,7 @@ export const RHFDocument = <TFieldValues extends FieldValues>(props: {
     <div>
       <div className="h-[5px] bg-gradient-to-r from-primary from-50% to-[#02bfe7] to-[66%] rounded-t"></div>
       <div className="py-4 px-8 border-2 border-t-0 mt-0">
-        <div className="my-5">
+        <div className="mb-3 mt-9">
           <FormLabel className="font-bold text-4xl px-8 font-serif">
             {props.document.header}
           </FormLabel>
diff --git a/src/services/ui/src/components/RHF/FieldArray.tsx b/src/services/ui/src/components/RHF/FieldArray.tsx
index 1a8445f9f6..1f5e2c59ef 100644
--- a/src/services/ui/src/components/RHF/FieldArray.tsx
+++ b/src/services/ui/src/components/RHF/FieldArray.tsx
@@ -17,12 +17,12 @@ export const RHFFieldArray = <TFields extends FieldValues>(
   });
 
   const onAppend = () => {
-    fieldArr.append(props.fields.reduce(slotInitializer, {}) as any);
+    fieldArr.append(props.fields.reduce(slotInitializer, {}) as never);
   };
 
   useEffect(() => {
     if (fieldArr.fields.length) return;
-    fieldArr.append(props.fields.reduce(slotInitializer, {}) as any);
+    fieldArr.append(props.fields.reduce(slotInitializer, {}) as never);
   }, []);
 
   return (
@@ -31,16 +31,20 @@ export const RHFFieldArray = <TFields extends FieldValues>(
         return (
           <div className="flex flex-row gap-3" key={FLD.id}>
             {props.fields.map((SLOT) => {
+              const prefix = `${props.name}.${index}.`;
+              const adjustedPrefix = (props.groupNamePrefix ?? "") + prefix;
+              const adjustedSlotName = prefix + SLOT.name;
               return (
                 <FormField
-                  key={`${SLOT.name}-${index}`}
+                  key={adjustedSlotName}
                   control={props.control}
-                  name={`${props.name}.${index}.${SLOT.name}` as any}
+                  name={adjustedSlotName as never}
                   {...(SLOT.rules && { rules: SLOT.rules })}
                   render={RHFSlot({
                     ...SLOT,
                     control: props.control,
-                    name: `${props.name}.${index}.${SLOT.name}`,
+                    name: adjustedSlotName,
+                    groupNamePrefix: adjustedPrefix,
                   })}
                 />
               );
diff --git a/src/services/ui/src/components/RHF/FieldGroup.tsx b/src/services/ui/src/components/RHF/FieldGroup.tsx
index d4c733c6a9..2c66018832 100644
--- a/src/services/ui/src/components/RHF/FieldGroup.tsx
+++ b/src/services/ui/src/components/RHF/FieldGroup.tsx
@@ -17,12 +17,12 @@ export const FieldGroup = <TFields extends FieldValues>(
   });
 
   const onAppend = () => {
-    fieldArr.append(props.fields.reduce(slotInitializer, {}) as any);
+    fieldArr.append(props.fields.reduce(slotInitializer, {}) as never);
   };
 
   useEffect(() => {
     if (fieldArr.fields.length) return;
-    fieldArr.append(props.fields.reduce(slotInitializer, {}) as any);
+    fieldArr.append(props.fields.reduce(slotInitializer, {}) as never);
   }, []);
 
   return (
@@ -31,16 +31,20 @@ export const FieldGroup = <TFields extends FieldValues>(
         return (
           <div className="flex flex-col gap-3" key={FLD.id}>
             {props.fields.map((SLOT) => {
+              const prefix = `${props.name}.${index}.`;
+              const adjustedPrefix = (props.groupNamePrefix ?? "") + prefix;
+              const adjustedSlotName = prefix + SLOT.name;
               return (
                 <FormField
-                  key={`${SLOT.name}-${index}`}
+                  key={adjustedSlotName}
                   control={props.control}
-                  name={`${props.name}.${index}.${SLOT.name}` as any}
+                  name={adjustedSlotName as never}
                   {...(SLOT.rules && { rules: SLOT.rules })}
                   render={RHFSlot({
                     ...SLOT,
                     control: props.control,
-                    name: `${props.name}.${index}.${SLOT.name}`,
+                    name: adjustedSlotName,
+                    groupNamePrefix: adjustedPrefix,
                   })}
                 />
               );
diff --git a/src/services/ui/src/components/RHF/FormGroup.tsx b/src/services/ui/src/components/RHF/FormGroup.tsx
index 897d9f52d2..d8dd32cb28 100644
--- a/src/services/ui/src/components/RHF/FormGroup.tsx
+++ b/src/services/ui/src/components/RHF/FormGroup.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/prop-types */
 import { Control, FieldValues } from "react-hook-form";
 import { FormLabel, FormField } from "../Inputs";
 import { DependencyWrapper } from "./dependencyWrapper";
@@ -8,6 +7,7 @@ import * as TRhf from "./types";
 export const RHFFormGroup = <TFieldValues extends FieldValues>(props: {
   form: TRhf.FormGroup;
   control: Control<TFieldValues>;
+  groupNamePrefix?: string;
 }) => {
   return (
     <DependencyWrapper {...props.form}>
@@ -24,9 +24,13 @@ export const RHFFormGroup = <TFieldValues extends FieldValues>(props: {
             <DependencyWrapper key={SLOT.name} {...SLOT}>
               <FormField
                 control={props.control}
-                name={SLOT.name as any}
+                name={((props.groupNamePrefix ?? "") + SLOT.name) as never}
                 {...(SLOT.rules && { rules: SLOT.rules })}
-                render={RHFSlot({ ...SLOT, control: props.control })}
+                render={RHFSlot({
+                  ...SLOT,
+                  control: props.control as Control,
+                  groupNamePrefix: props.groupNamePrefix,
+                })}
               />
             </DependencyWrapper>
           ))}
diff --git a/src/services/ui/src/components/RHF/Slot.tsx b/src/services/ui/src/components/RHF/Slot.tsx
index 37b240dc8d..53bcea7b7c 100644
--- a/src/services/ui/src/components/RHF/Slot.tsx
+++ b/src/services/ui/src/components/RHF/Slot.tsx
@@ -28,7 +28,8 @@ import { cn } from "@/lib";
 import { format } from "date-fns";
 import { RHFFieldArray } from "./FieldArray";
 import { FieldGroup } from "./FieldGroup";
-import type { RHFSlotProps, RHFComponentMap } from "./types";
+import type { RHFSlotProps, RHFComponentMap, FormGroup } from "./types";
+import { useEffect } from "react";
 
 export const RHFSlot = <
   TFieldValues extends FieldValues = FieldValues,
@@ -41,12 +42,20 @@ export const RHFSlot = <
   name,
   props,
   labelStyling,
+  groupNamePrefix,
   ...rest
 }: RHFSlotProps & { control: any }): ControllerProps<
   TFieldValues,
   TName
 >["render"] =>
   function Slot({ field }) {
+    // added to unregister/reset inputs when removed from dom
+    useEffect(() => {
+      return () => {
+        control.unregister(field.name);
+      };
+    }, []);
+
     return (
       <FormItem className="flex flex-col gap-1 py-2">
         {label && <FormLabel className={labelStyling}>{label}</FormLabel>}
@@ -87,7 +96,7 @@ export const RHFSlot = <
                       <SelectValue {...hops} />
                     </SelectTrigger>
                     <SelectContent className="overflow-auto max-h-60">
-                      {hops.options.map((OPT: any) => (
+                      {hops.options.map((OPT) => (
                         <SelectItem key={`OPT-${OPT.value}`} value={OPT.value}>
                           {OPT.label}
                         </SelectItem>
@@ -107,7 +116,7 @@ export const RHFSlot = <
                     defaultValue={field.value}
                     className="flex flex-col space-y-1"
                   >
-                    {hops.options.map((OPT: any) => {
+                    {hops.options.map((OPT) => {
                       return (
                         <div key={`OPT-${OPT.value}`} className="flex flex-col">
                           <div className="flex gap-2 items-center">
@@ -118,26 +127,30 @@ export const RHFSlot = <
                           </div>
                           {field.value === OPT.value &&
                             OPT.form &&
-                            OPT.form.map((FORM: any, index: any) => {
+                            OPT.form.map((FORM, index) => {
                               return (
                                 <div
                                   className="ml-[0.6rem] px-4 border-l-4 border-l-primary"
                                   key={`rhf-form-${index}-${FORM.description}`}
                                 >
-                                  <RHFFormGroup form={FORM} control={control} />
+                                  <RHFFormGroup
+                                    form={FORM}
+                                    control={control}
+                                    groupNamePrefix={groupNamePrefix}
+                                  />
                                 </div>
                               );
                             })}
                           {field.value === OPT.value &&
                             OPT.slots &&
-                            OPT.slots.map((SLOT: any, index: any) => (
+                            OPT.slots.map((SLOT, index) => (
                               <div
                                 className="ml-[0.6rem] px-4 border-l-4 border-l-primary"
                                 key={SLOT.name + index}
                               >
                                 <FormField
                                   control={control}
-                                  name={SLOT.name}
+                                  name={(groupNamePrefix ?? "") + SLOT.name}
                                   {...(SLOT.rules && { rules: SLOT.rules })}
                                   render={RHFSlot({ ...SLOT, control })}
                                 />
@@ -156,7 +169,7 @@ export const RHFSlot = <
                 const hops = props as RHFComponentMap["Checkbox"];
                 return (
                   <div className="flex flex-col gap-2">
-                    {hops.options.map((OPT: any) => (
+                    {hops.options.map((OPT) => (
                       <div key={`CHECK-${OPT.value}`}>
                         <Checkbox
                           label={OPT.label}
@@ -164,7 +177,7 @@ export const RHFSlot = <
                           onCheckedChange={(c) => {
                             const filtered =
                               field.value?.filter(
-                                (f: any) => f !== OPT.value
+                                (f: unknown) => f !== OPT.value
                               ) || [];
                             if (!c) return field.onChange(filtered);
                             field.onChange([...filtered, OPT.value]);
@@ -173,14 +186,14 @@ export const RHFSlot = <
                         {field.value?.includes(OPT.value) &&
                           !!OPT.slots &&
                           OPT.slots &&
-                          OPT.slots.map((SLOT: any, index: any) => (
+                          OPT.slots.map((SLOT, index) => (
                             <div
                               className="ml-[0.7rem] px-4 border-l-4 border-l-primary"
                               key={`rhf-form-${index}-${SLOT.name}`}
                             >
                               <FormField
                                 control={control}
-                                name={SLOT.name}
+                                name={(groupNamePrefix ?? "") + SLOT.name}
                                 {...(SLOT.rules && { rules: SLOT.rules })}
                                 render={RHFSlot({ ...SLOT, control })}
                               />
@@ -189,12 +202,16 @@ export const RHFSlot = <
 
                         {field.value?.includes(OPT.value) &&
                           !!OPT.form &&
-                          OPT.form.map((FORM: any) => (
+                          OPT.form.map((FORM: FormGroup) => (
                             <div
                               key={`CHECK-${OPT.value}-form-${FORM.description}`}
                               className="ml-[0.7rem] px-4 border-l-4 border-l-primary"
                             >
-                              <RHFFormGroup control={control} form={FORM} />
+                              <RHFFormGroup
+                                control={control}
+                                form={FORM}
+                                groupNamePrefix={groupNamePrefix}
+                              />
                             </div>
                           ))}
                       </div>
@@ -246,6 +263,7 @@ export const RHFSlot = <
                 control={control}
                 name={name}
                 fields={rest.fields ?? []}
+                groupNamePrefix={groupNamePrefix}
               />
             )}
 
@@ -255,6 +273,7 @@ export const RHFSlot = <
                 control={control}
                 name={name}
                 fields={rest.fields ?? []}
+                groupNamePrefix={groupNamePrefix}
                 {...(props as RHFComponentMap["FieldGroup"])}
               />
             )}
diff --git a/src/services/ui/src/components/RHF/types.ts b/src/services/ui/src/components/RHF/types.ts
index 6a9b51453c..44597d09b0 100644
--- a/src/services/ui/src/components/RHF/types.ts
+++ b/src/services/ui/src/components/RHF/types.ts
@@ -18,6 +18,7 @@ export type RHFSlotProps = {
   name: string;
   label?: ReactElement | string;
   labelStyling?: string;
+  groupNamePrefix?: string;
   description?: ReactElement | string;
   dependency?: DependencyRule;
   rules?: RegisterOptions;
@@ -35,7 +36,7 @@ export type RHFSlotProps = {
 
 export type RHFOption = {
   label: string;
-  value: any;
+  value: string;
   form?: FormGroup[];
   slots?: RHFSlotProps[];
 };
@@ -55,7 +56,7 @@ export type RHFComponentMap = {
   Checkbox: {
     options: RHFOption[];
   };
-  FieldArray: any;
+  FieldArray: unknown;
   FieldGroup: {
     appendText?: string;
     removeText?: string;
@@ -84,20 +85,22 @@ export type FieldArrayProps<
   T extends FieldValues,
   TFieldArrayName extends FieldArrayPath<T> = FieldArrayPath<T>
 > = {
-  control: Control<T, any>;
+  control: Control<T, unknown>;
   name: TFieldArrayName;
   fields: RHFSlotProps[];
+  groupNamePrefix?: string;
 };
 
 export type FieldGroupProps<
   T extends FieldValues,
   TFieldArrayName extends FieldArrayPath<T> = FieldArrayPath<T>
 > = {
-  control: Control<T, any>;
+  control: Control<T, unknown>;
   name: TFieldArrayName;
   fields: RHFSlotProps[];
   appendText?: string;
   removeText?: string;
+  groupNamePrefix?: string;
 };
 
 type ConditionRules =
diff --git a/src/services/ui/src/components/RHF/utils/initializer.ts b/src/services/ui/src/components/RHF/utils/initializer.ts
index 3d24633330..424c797907 100644
--- a/src/services/ui/src/components/RHF/utils/initializer.ts
+++ b/src/services/ui/src/components/RHF/utils/initializer.ts
@@ -1,6 +1,6 @@
 import * as T from "@/components/RHF/types";
 
-type GL = Record<string, any>;
+type GL = Record<string, unknown>;
 
 export const formGroupInitializer = (ACC: GL, FORM: T.FormGroup) => {
   FORM.slots.reduce(slotInitializer, ACC);
@@ -15,13 +15,7 @@ export const slotInitializer = (ACC: GL, SLOT: T.RHFSlotProps): GL => {
   };
 
   const fieldInitializer = (ACC1: GL, SLOT: T.RHFSlotProps): GL => {
-    if (SLOT.rhf === "FieldArray") {
-      return {
-        ...ACC1,
-        [SLOT.name]: [SLOT.fields?.reduce(fieldInitializer, {})],
-      };
-    }
-    if (SLOT.rhf === "FieldGroup") {
+    if (SLOT.rhf === "FieldArray" || SLOT.rhf === "FieldGroup") {
       return {
         ...ACC1,
         [SLOT.name]: [SLOT.fields?.reduce(fieldInitializer, {})],
@@ -31,37 +25,27 @@ export const slotInitializer = (ACC: GL, SLOT: T.RHFSlotProps): GL => {
     return { ...ACC1, ...slotInitializer(ACC1, SLOT) };
   };
 
-  if (SLOT.rhf === "Input") ACC[SLOT.name] = "";
-  if (SLOT.rhf === "Textarea") ACC[SLOT.name] = "";
-  if (SLOT.rhf === "Switch") ACC[SLOT.name] = false;
-  if (SLOT.rhf === "Radio") {
-    if (SLOT.props?.options) {
-      SLOT.props.options.forEach(optionReducer);
-      const [first] = SLOT.props.options;
-      ACC[SLOT.name] = first.value;
-    }
-  }
-
-  if (SLOT.rhf === "Select") {
-    if (SLOT.props?.options) {
-      SLOT.props.options.forEach(optionReducer);
-      const [first] = SLOT.props.options;
-      ACC[SLOT.name] = first.value;
-    }
-  }
-
-  if (SLOT.rhf === "Checkbox") {
-    if (SLOT.props?.options) {
-      SLOT.props.options.forEach(optionReducer);
+  switch (SLOT.rhf) {
+    case "Switch":
+      ACC[SLOT.name] = false;
+      break;
+    case "Radio":
+    case "Checkbox":
+      SLOT.props?.options.forEach(optionReducer);
       ACC[SLOT.name] = [];
-    }
+      break;
+    case "FieldArray":
+    case "FieldGroup":
+      ACC[SLOT.name] = [SLOT.fields?.reduce(fieldInitializer, {})];
+      break;
+    case "Input":
+    case "Select":
+    case "Textarea":
+    default:
+      ACC[SLOT.name] = "";
+      break;
   }
 
-  if (SLOT.rhf === "FieldArray")
-    ACC[SLOT.name] = [SLOT.fields?.reduce(fieldInitializer, {})];
-  if (SLOT.rhf === "FieldGroup")
-    ACC[SLOT.name] = [SLOT.fields?.reduce(fieldInitializer, {})];
-
   return ACC;
 };
 
@@ -69,5 +53,5 @@ export const documentInitializer = (document: T.Document) => {
   return document.sections.reduce((ACC, SEC) => {
     SEC.form.reduce(formGroupInitializer, ACC);
     return ACC;
-  }, {} as any);
+  }, {});
 };
diff --git a/src/services/ui/src/components/Table/index.tsx b/src/services/ui/src/components/Table/index.tsx
index ee0bb8a2e6..244c69ea18 100644
--- a/src/services/ui/src/components/Table/index.tsx
+++ b/src/services/ui/src/components/Table/index.tsx
@@ -9,7 +9,7 @@ const Table = React.forwardRef<
     className?: string;
   }
 >(({ className, ...props }, ref) => (
-  <div className="w-full overflow-auto">
+  <div className="w-full border-[1px] overflow-auto">
     <table
       ref={ref}
       className={cn("w-full caption-bottom text-sm", className)}
diff --git a/src/services/ui/src/pages/dashboard/Lists/spas/index.tsx b/src/services/ui/src/pages/dashboard/Lists/spas/index.tsx
index 61458a4b26..b0085e5c2a 100644
--- a/src/services/ui/src/pages/dashboard/Lists/spas/index.tsx
+++ b/src/services/ui/src/pages/dashboard/Lists/spas/index.tsx
@@ -15,12 +15,11 @@ export const SpasList = () => {
   const context = useOsContext();
   const params = useOsParams();
   if (context.error) return <ErrorAlert error={context.error} />;
-  console.log(user, "user from spas");
 
   const columns = TABLE_COLUMNS({ isCms: user?.isCms, user: user?.user });
 
   return (
-    <section className="flex flex-col h-[calc(100vh-250px)]">
+    <section className="flex flex-col h-[calc(100vh-230px)]">
       <OsFiltering />
       <OsTable columns={columns} />
       <Pagination
diff --git a/src/services/ui/src/pages/dashboard/Lists/waivers/index.tsx b/src/services/ui/src/pages/dashboard/Lists/waivers/index.tsx
index b517b88a81..30495fd7bc 100644
--- a/src/services/ui/src/pages/dashboard/Lists/waivers/index.tsx
+++ b/src/services/ui/src/pages/dashboard/Lists/waivers/index.tsx
@@ -20,7 +20,7 @@ export const WaiversList = () => {
   const columns = TABLE_COLUMNS({ isCms: user?.isCms, user: user?.user });
 
   return (
-    <section className="flex flex-col h-[calc(100vh-250px)]">
+    <section className="flex flex-col h-[calc(100vh-230px)]">
       <OsFiltering />
       <OsTable columns={columns} />
       <Pagination
diff --git a/src/services/ui/src/pages/dashboard/index.tsx b/src/services/ui/src/pages/dashboard/index.tsx
index 28fe78dc76..cbc1dedd1d 100644
--- a/src/services/ui/src/pages/dashboard/index.tsx
+++ b/src/services/ui/src/pages/dashboard/index.tsx
@@ -80,10 +80,10 @@ export const Dashboard = () => {
             >
               <TabsList>
                 <TabsTrigger value="spas" className="px-6 py-2">
-                  <h4 className="font-bold text-[1.3em]">SPAs</h4>
+                  <h2 className="font-bold text-[1.3em]">SPAs</h2>
                 </TabsTrigger>
                 <TabsTrigger value="waivers" className="px-6 py-2">
-                  <h4 className="font-bold text-[1.3em]">Waivers</h4>
+                  <h2 className="font-bold text-[1.3em]">Waivers</h2>
                 </TabsTrigger>
               </TabsList>
               <TabsContent value="spas">
diff --git a/src/services/ui/src/pages/form/index.tsx b/src/services/ui/src/pages/form/index.tsx
index 42b164a33f..82f524a512 100644
--- a/src/services/ui/src/pages/form/index.tsx
+++ b/src/services/ui/src/pages/form/index.tsx
@@ -82,7 +82,6 @@ export function ExampleForm() {
       console.log({ err });
     }
   );
-
   return (
     <div className="max-w-screen-xl mx-auto p-4 py-8 lg:px-8">
       <Form {...form}>
diff --git a/src/services/ui/src/pages/form/proto.tsx b/src/services/ui/src/pages/form/proto.tsx
index 552d375f6b..136cc534ae 100644
--- a/src/services/ui/src/pages/form/proto.tsx
+++ b/src/services/ui/src/pages/form/proto.tsx
@@ -1,7 +1,7 @@
 import { Document } from "@/components/RHF/types";
 
 export const ABP1: Document = {
-  header: "ABP 1: Alternative Benefit Plan Populations",
+  header: "ABP 1: Alternative Benefit Plan populations",
   sections: [
     {
       title: "Population identification",
@@ -15,35 +15,15 @@ export const ABP1: Document = {
               name: "alt_benefit_plan_population_name",
               label: "Alternative Benefit Plan population name",
               rules: {
-                required: "*Required",
-                maxLength: {
-                  value: 20,
-                  message: "Max 20 Characters",
-                },
+                required: "* Required",
               },
               props: { placeholder: "enter name" },
-              dependency: {
-                // example of a value changing field, with multi-conditions
-                conditions: [
-                  {
-                    name: "geographic_variation",
-                    type: "expectedValue",
-                    expectedValue: "by_region",
-                  },
-                  {
-                    name: "is_geographic_area",
-                    type: "expectedValue",
-                    expectedValue: "yes",
-                  },
-                ],
-                effect: { type: "setValue", newValue: "Ben" },
-              },
             },
           ],
         },
         {
           description:
-            "Identify eligibility groups that are included in the Alternative Benefit Plan's population, and which may contain individuals that meet any targeting criteria used to further define the population.",
+            "Identify eligibility groups that are included in the Alternative Benefit Plan's population and that may contain individuals that meet any targeting criteria used to further define the population.",
           slots: [
             {
               rhf: "FieldArray",
@@ -52,9 +32,12 @@ export const ABP1: Document = {
                 {
                   rhf: "Select",
                   name: "eligibility_group",
+                  rules: {
+                    required: "* Required",
+                  },
                   label: "Eligibility group",
                   props: {
-                    className: "w-[300px]",
+                    className: "min-w-[300px]",
                     options: [
                       {
                         label: "Parents and Other Caretaker Relatives",
@@ -306,6 +289,9 @@ export const ABP1: Document = {
                   rhf: "Select",
                   name: "mandatory_voluntary",
                   label: "Mandatory or voluntary",
+                  rules: {
+                    required: "* Required",
+                  },
                   props: {
                     className: "w-[200px]",
                     options: [
@@ -332,6 +318,9 @@ export const ABP1: Document = {
               rhf: "Select",
               name: "is_enrollment_available",
               label: "Alternative Benefit Plan population name",
+              rules: {
+                required: "* Required",
+              },
               props: {
                 className: "w-[150px]",
                 options: [
@@ -359,12 +348,15 @@ export const ABP1: Document = {
       },
       form: [
         {
-          description: "Targeting criteria (select all that apply):",
+          description: "Targeting criteria (select all that apply)",
           slots: [
             {
               rhf: "Checkbox",
               name: "target_criteria",
               label: "Mandatory or voluntary",
+              rules: {
+                required: "* Required",
+              },
               props: {
                 options: [
                   {
@@ -377,6 +369,9 @@ export const ABP1: Document = {
                           {
                             rhf: "Radio",
                             name: "income_target",
+                            rules: {
+                              required: "* Required",
+                            },
                             props: {
                               options: [
                                 {
@@ -400,6 +395,9 @@ export const ABP1: Document = {
                           {
                             rhf: "Radio",
                             name: "income_definition",
+                            rules: {
+                              required: "* Required",
+                            },
                             props: {
                               options: [
                                 {
@@ -409,6 +407,9 @@ export const ABP1: Document = {
                                     {
                                       rhf: "Radio",
                                       name: "income_definition_percentage",
+                                      rules: {
+                                        required: "* Required",
+                                      },
                                       props: {
                                         options: [
                                           {
@@ -417,6 +418,17 @@ export const ABP1: Document = {
                                             slots: [
                                               {
                                                 rhf: "Input",
+                                                props: {
+                                                  icon: "%",
+                                                },
+                                                rules: {
+                                                  pattern: {
+                                                    value: /^-?\d*\.?\d+$/,
+                                                    message:
+                                                      "Must be a percentage",
+                                                  },
+                                                  required: "* Required",
+                                                },
                                                 name: "federal_poverty_level_percentage",
                                                 label:
                                                   "Enter the Federal Poverty Level percentage",
@@ -433,6 +445,17 @@ export const ABP1: Document = {
                                                 name: "ssi_federal_benefit_percentage",
                                                 label:
                                                   "Enter the SSI Federal Benefit Rate percentage",
+                                                props: {
+                                                  icon: "%",
+                                                },
+                                                rules: {
+                                                  pattern: {
+                                                    value: /^-?\d*\.?\d+$/,
+                                                    message:
+                                                      "Must be a percentage",
+                                                  },
+                                                  required: "* Required",
+                                                },
                                               },
                                             ],
                                           },
@@ -445,11 +468,25 @@ export const ABP1: Document = {
                                                 name: "other_percentage",
                                                 label:
                                                   "Enter the Other percentage",
+                                                props: {
+                                                  icon: "%",
+                                                },
+                                                rules: {
+                                                  pattern: {
+                                                    value: /^-?\d*\.?\d+$/,
+                                                    message:
+                                                      "Must be a percentage",
+                                                  },
+                                                  required: "* Required",
+                                                },
                                               },
                                               {
                                                 rhf: "Textarea",
                                                 name: "other_describe",
                                                 label: "Describe:",
+                                                rules: {
+                                                  required: "* Required",
+                                                },
                                               },
                                             ],
                                           },
@@ -465,6 +502,9 @@ export const ABP1: Document = {
                                     {
                                       rhf: "Radio",
                                       name: "income_definition_specific",
+                                      rules: {
+                                        required: "* Required",
+                                      },
                                       props: {
                                         options: [
                                           {
@@ -487,6 +527,16 @@ export const ABP1: Document = {
                                                           className:
                                                             "w-[300px]",
                                                         },
+                                                        rules: {
+                                                          pattern: {
+                                                            value:
+                                                              /^\d*\.?\d+$/,
+                                                            message:
+                                                              "Must be a positive numerical value",
+                                                          },
+                                                          required:
+                                                            "* Required",
+                                                        },
                                                       },
                                                       {
                                                         rhf: "Input",
@@ -497,6 +547,17 @@ export const ABP1: Document = {
                                                             "w-[200px]",
                                                           placeholder:
                                                             "enter amount",
+                                                          icon: "$",
+                                                        },
+                                                        rules: {
+                                                          pattern: {
+                                                            value:
+                                                              /^\d*(?:\.\d{1,2})?$/,
+                                                            message:
+                                                              "Must be all numbers, no commas. e.g. 1234.56",
+                                                          },
+                                                          required:
+                                                            "* Required",
                                                         },
                                                       },
                                                     ],
@@ -504,33 +565,44 @@ export const ABP1: Document = {
                                                 ],
                                               },
                                               {
-                                                description:
-                                                  "Is there an additional incremental amount",
-                                                slots: [
-                                                  {
-                                                    rhf: "Switch",
-                                                    name: "is_incremental_amount",
-                                                  },
-                                                ],
-                                              },
-                                              {
-                                                description:
-                                                  "Enter incremental dollar amount",
-                                                //NOTE: Should this be a thing? It feels implied in the pdf
-                                                // dependency: {
-                                                //   conditions: [
-                                                //     {
-                                                //       type: "expectedValue",
-                                                //       name: "is_incremental_amount",
-                                                //       expectedValue: true,
-                                                //     },
-                                                //   ],
-                                                //   effect: { type: "show" },
-                                                // },
                                                 slots: [
                                                   {
-                                                    rhf: "Input",
-                                                    name: "doller_incremental_amount",
+                                                    rhf: "Checkbox",
+                                                    name: "is_incremental_amount_statewide_std",
+                                                    props: {
+                                                      options: [
+                                                        {
+                                                          label:
+                                                            "There is an additional incremental amount.",
+                                                          value: "yes",
+                                                          form: [
+                                                            {
+                                                              description:
+                                                                "Incremental dollar amount",
+                                                              slots: [
+                                                                {
+                                                                  rhf: "Input",
+                                                                  name: "dollar_incremental_amount_statewide_std",
+                                                                  props: {
+                                                                    icon: "$",
+                                                                  },
+                                                                  rules: {
+                                                                    pattern: {
+                                                                      value:
+                                                                        /^\d*(?:\.\d{1,2})?$/,
+                                                                      message:
+                                                                        "Must be all numbers, no commas. e.g. 1234.56",
+                                                                    },
+                                                                    required:
+                                                                      "* Required",
+                                                                  },
+                                                                },
+                                                              ],
+                                                            },
+                                                          ],
+                                                        },
+                                                      ],
+                                                    },
                                                   },
                                                 ],
                                               },
@@ -538,7 +610,7 @@ export const ABP1: Document = {
                                           },
                                           {
                                             label: "Standard Varies by region",
-                                            value: "region_standard", //
+                                            value: "region_standard",
                                             form: [
                                               {
                                                 slots: [
@@ -555,11 +627,19 @@ export const ABP1: Document = {
                                                         rhf: "Input",
                                                         name: "name_of_region",
                                                         label: "Region Name",
+                                                        rules: {
+                                                          required:
+                                                            "* Required",
+                                                        },
                                                       },
                                                       {
                                                         rhf: "Textarea",
                                                         name: "region_description",
                                                         label: "Description",
+                                                        rules: {
+                                                          required:
+                                                            "* Required",
+                                                        },
                                                       },
                                                       {
                                                         rhf: "FieldArray",
@@ -576,6 +656,16 @@ export const ABP1: Document = {
                                                               className:
                                                                 "w-[300px]",
                                                             },
+                                                            rules: {
+                                                              pattern: {
+                                                                value:
+                                                                  /^\d*\.?\d+$/,
+                                                                message:
+                                                                  "Must be a positive numerical value",
+                                                              },
+                                                              required:
+                                                                "* Required",
+                                                            },
                                                           },
                                                           {
                                                             rhf: "Input",
@@ -587,25 +677,59 @@ export const ABP1: Document = {
                                                                 "w-[200px]",
                                                               placeholder:
                                                                 "enter amount",
+                                                              icon: "$",
+                                                            },
+                                                            rules: {
+                                                              pattern: {
+                                                                value:
+                                                                  /^\d*(?:\.\d{1,2})?$/,
+                                                                message:
+                                                                  "Must be all numbers, no commas. e.g. 1234.56",
+                                                              },
+                                                              required:
+                                                                "* Required",
                                                             },
                                                           },
                                                         ],
                                                       },
                                                       {
-                                                        rhf: "Switch",
-                                                        label:
-                                                          "Is there an additional incremental amount?",
-                                                        labelStyling:
-                                                          "font-bold mb-2",
+                                                        rhf: "Checkbox",
                                                         name: "is_incremental_amount",
-                                                      },
-                                                      {
-                                                        rhf: "Input",
-                                                        label:
-                                                          "Enter incremental dollar amount:",
-                                                        labelStyling:
-                                                          "font-bold mb-2",
-                                                        name: "doller_incremental_amount",
+                                                        props: {
+                                                          options: [
+                                                            {
+                                                              label:
+                                                                "There is an additional incremental amount.",
+                                                              value: "yes",
+                                                              form: [
+                                                                {
+                                                                  description:
+                                                                    "Incremental dollar amount",
+                                                                  slots: [
+                                                                    {
+                                                                      rhf: "Input",
+                                                                      name: "dollar_incremental_amount",
+                                                                      props: {
+                                                                        icon: "$",
+                                                                      },
+                                                                      rules: {
+                                                                        pattern:
+                                                                          {
+                                                                            value:
+                                                                              /^\d*(?:\.\d{1,2})?$/,
+                                                                            message:
+                                                                              "Must be all numbers, no commas. e.g. 1234.56",
+                                                                          },
+                                                                        required:
+                                                                          "* Required",
+                                                                      },
+                                                                    },
+                                                                  ],
+                                                                },
+                                                              ],
+                                                            },
+                                                          ],
+                                                        },
                                                       },
                                                     ],
                                                   },
@@ -615,7 +739,7 @@ export const ABP1: Document = {
                                           },
                                           {
                                             label:
-                                              "standard varies by living arrangement",
+                                              "Standard varies by living arrangement",
                                             value: "living_standard",
 
                                             form: [
@@ -636,11 +760,19 @@ export const ABP1: Document = {
                                                         name: "name_of_living_arrangement",
                                                         label:
                                                           "Living Arrangement Name",
+                                                        rules: {
+                                                          required:
+                                                            "* Required",
+                                                        },
                                                       },
                                                       {
                                                         rhf: "Textarea",
                                                         name: "living_arrangement_description",
                                                         label: "Description",
+                                                        rules: {
+                                                          required:
+                                                            "* Required",
+                                                        },
                                                       },
                                                       {
                                                         rhf: "FieldArray",
@@ -657,6 +789,16 @@ export const ABP1: Document = {
                                                               className:
                                                                 "w-[300px]",
                                                             },
+                                                            rules: {
+                                                              pattern: {
+                                                                value:
+                                                                  /^\d*\.?\d+$/,
+                                                                message:
+                                                                  "Must be a positive numerical value",
+                                                              },
+                                                              required:
+                                                                "* Required",
+                                                            },
                                                           },
                                                           {
                                                             rhf: "Input",
@@ -668,25 +810,59 @@ export const ABP1: Document = {
                                                                 "w-[200px]",
                                                               placeholder:
                                                                 "enter amount",
+                                                              icon: "$",
+                                                            },
+                                                            rules: {
+                                                              pattern: {
+                                                                value:
+                                                                  /^\d*(?:\.\d{1,2})?$/,
+                                                                message:
+                                                                  "Must be all numbers, no commas. e.g. 1234.56",
+                                                              },
+                                                              required:
+                                                                "* Required",
                                                             },
                                                           },
                                                         ],
                                                       },
                                                       {
-                                                        rhf: "Switch",
-                                                        label:
-                                                          "Is there an additional incremental amount?",
-                                                        labelStyling:
-                                                          "font-bold mb-2",
+                                                        rhf: "Checkbox",
                                                         name: "is_incremental_amount",
-                                                      },
-                                                      {
-                                                        rhf: "Input",
-                                                        label:
-                                                          "Enter incremental dollar amount:",
-                                                        labelStyling:
-                                                          "font-bold mb-2",
-                                                        name: "doller_incremental_amount",
+                                                        props: {
+                                                          options: [
+                                                            {
+                                                              label:
+                                                                "There is an additional incremental amount.",
+                                                              value: "yes",
+                                                              form: [
+                                                                {
+                                                                  description:
+                                                                    "Incremental dollar amount",
+                                                                  slots: [
+                                                                    {
+                                                                      rhf: "Input",
+                                                                      name: "dollar_incremental_amount",
+                                                                      props: {
+                                                                        icon: "$",
+                                                                      },
+                                                                      rules: {
+                                                                        pattern:
+                                                                          {
+                                                                            value:
+                                                                              /^\d*(?:\.\d{1,2})?$/,
+                                                                            message:
+                                                                              "Must be all numbers, no commas. e.g. 1234.56",
+                                                                          },
+                                                                        required:
+                                                                          "* Required",
+                                                                      },
+                                                                    },
+                                                                  ],
+                                                                },
+                                                              ],
+                                                            },
+                                                          ],
+                                                        },
                                                       },
                                                     ],
                                                   },
@@ -696,7 +872,7 @@ export const ABP1: Document = {
                                           },
                                           {
                                             label:
-                                              "standard varies by some other way",
+                                              "Standard varies by some other way",
                                             value: "other_standard",
 
                                             form: [
@@ -714,11 +890,19 @@ export const ABP1: Document = {
                                                         rhf: "Input",
                                                         name: "name_of_group",
                                                         label: "Name",
+                                                        rules: {
+                                                          required:
+                                                            "* Required",
+                                                        },
                                                       },
                                                       {
                                                         rhf: "Textarea",
                                                         name: "group_description",
                                                         label: "Description",
+                                                        rules: {
+                                                          required:
+                                                            "* Required",
+                                                        },
                                                       },
                                                       {
                                                         rhf: "FieldArray",
@@ -735,6 +919,16 @@ export const ABP1: Document = {
                                                               className:
                                                                 "w-[300px]",
                                                             },
+                                                            rules: {
+                                                              pattern: {
+                                                                value:
+                                                                  /^\d*\.?\d+$/,
+                                                                message:
+                                                                  "Must be a positive numerical value",
+                                                              },
+                                                              required:
+                                                                "* Required",
+                                                            },
                                                           },
                                                           {
                                                             rhf: "Input",
@@ -746,25 +940,59 @@ export const ABP1: Document = {
                                                                 "w-[200px]",
                                                               placeholder:
                                                                 "enter amount",
+                                                              icon: "$",
+                                                            },
+                                                            rules: {
+                                                              pattern: {
+                                                                value:
+                                                                  /^\d*(?:\.\d{1,2})?$/,
+                                                                message:
+                                                                  "Must be all numbers, no commas. e.g. 1234.56",
+                                                              },
+                                                              required:
+                                                                "* Required",
                                                             },
                                                           },
                                                         ],
                                                       },
                                                       {
-                                                        rhf: "Switch",
-                                                        label:
-                                                          "Is there an additional incremental amount?",
-                                                        labelStyling:
-                                                          "font-bold mb-2",
+                                                        rhf: "Checkbox",
                                                         name: "is_incremental_amount",
-                                                      },
-                                                      {
-                                                        rhf: "Input",
-                                                        label:
-                                                          "Enter incremental dollar amount:",
-                                                        labelStyling:
-                                                          "font-bold mb-2",
-                                                        name: "doller_incremental_amount",
+                                                        props: {
+                                                          options: [
+                                                            {
+                                                              label:
+                                                                "There is an additional incremental amount.",
+                                                              value: "yes",
+                                                              form: [
+                                                                {
+                                                                  description:
+                                                                    "Incremental dollar amount",
+                                                                  slots: [
+                                                                    {
+                                                                      rhf: "Input",
+                                                                      name: "dollar_incremental_amount",
+                                                                      props: {
+                                                                        icon: "$",
+                                                                      },
+                                                                      rules: {
+                                                                        pattern:
+                                                                          {
+                                                                            value:
+                                                                              /^\d*(?:\.\d{1,2})?$/,
+                                                                            message:
+                                                                              "Must be all numbers, no commas. e.g. 1234.56",
+                                                                          },
+                                                                        required:
+                                                                          "* Required",
+                                                                      },
+                                                                    },
+                                                                  ],
+                                                                },
+                                                              ],
+                                                            },
+                                                          ],
+                                                        },
                                                       },
                                                     ],
                                                   },
@@ -791,6 +1019,9 @@ export const ABP1: Document = {
                       {
                         rhf: "Checkbox",
                         name: "health_conditions",
+                        rules: {
+                          required: "* Required",
+                        },
                         props: {
                           options: [
                             {
@@ -802,11 +1033,11 @@ export const ABP1: Document = {
                               value: "brain_injury",
                             },
                             {
-                              label: "HIV / AIDS",
+                              label: "HIV/AIDS",
                               value: "hiv_aids",
                             },
                             {
-                              label: "Medically Frail",
+                              label: "Medically frail",
                               value: "med_frail",
                             },
                             {
@@ -815,23 +1046,23 @@ export const ABP1: Document = {
                             },
                             { label: "Autism", value: "autism" },
                             {
-                              label: "Developmental Disability",
+                              label: "Developmental disability",
                               value: "dev_disability",
                             },
                             {
-                              label: "Intellectual Disability",
+                              label: "Intellectual disability",
                               value: "int_disability",
                             },
                             {
-                              label: "Mental Illness",
+                              label: "Mental illness",
                               value: "mental_illness",
                             },
                             {
-                              label: "Substance Use Disorder",
+                              label: "Substance use disorder",
                               value: "substance_use_dis",
                             },
                             { label: "Diabetes", value: "diabetes" },
-                            { label: "Heart Disease", value: "heart_dis" },
+                            { label: "Heart disease", value: "heart_dis" },
                             { label: "Asthma", value: "asthma" },
                             { label: "Obesity", value: "obesity" },
                             {
@@ -843,6 +1074,9 @@ export const ABP1: Document = {
                                   rhf: "Input",
                                   name: "other_description",
                                   label: "Describe",
+                                  rules: {
+                                    required: "* Required",
+                                  },
                                 },
                               ],
                             },
@@ -859,6 +1093,9 @@ export const ABP1: Document = {
                         rhf: "Input",
                         name: "other_targeting_criteria_description",
                         label: "Describe",
+                        rules: {
+                          required: "* Required",
+                        },
                       },
                     ],
                   },
@@ -874,7 +1111,7 @@ export const ABP1: Document = {
       form: [
         {
           description:
-            "Will the Alternative Benefit Plan population include individuals from the entire state or territory?",
+            "Will the Alternative Benefit Plan population include individuals from the entire state/territory?",
           slots: [
             {
               rhf: "Select",
@@ -886,11 +1123,14 @@ export const ABP1: Document = {
                   { label: "No", value: "no" },
                 ],
               },
+              rules: {
+                required: "* Required",
+              },
             },
           ],
         },
         {
-          description: "Select a method of geographic variation",
+          description: "Method of geographic variation",
           dependency: {
             conditions: [
               {
@@ -905,6 +1145,9 @@ export const ABP1: Document = {
             {
               rhf: "Radio",
               name: "geographic_variation",
+              rules: {
+                required: "* Required",
+              },
               props: {
                 options: [
                   {
@@ -912,11 +1155,14 @@ export const ABP1: Document = {
                     value: "by_county",
                     form: [
                       {
-                        description: "Specify Counties",
+                        description: "Specify counties",
                         slots: [
                           {
                             name: "specify_counties",
                             rhf: "Textarea",
+                            rules: {
+                              required: "* Required",
+                            },
                           },
                         ],
                       },
@@ -927,11 +1173,14 @@ export const ABP1: Document = {
                     value: "by_region",
                     form: [
                       {
-                        description: "Specify Regions",
+                        description: "Specify regions",
                         slots: [
                           {
                             name: "specify_regions",
                             rhf: "Textarea",
+                            rules: {
+                              required: "* Required",
+                            },
                           },
                         ],
                       },
@@ -942,11 +1191,14 @@ export const ABP1: Document = {
                     value: "by_city_town",
                     form: [
                       {
-                        description: "Specify Cities and Towns",
+                        description: "Specify cities and towns",
                         slots: [
                           {
                             name: "specify_cities_towns",
                             rhf: "Textarea",
+                            rules: {
+                              required: "* Required",
+                            },
                           },
                         ],
                       },
@@ -957,11 +1209,14 @@ export const ABP1: Document = {
                     value: "other",
                     form: [
                       {
-                        description: "Specify Other",
+                        description: "Specify other",
                         slots: [
                           {
                             name: "specify_other",
                             rhf: "Textarea",
+                            rules: {
+                              required: "* Required",
+                            },
                           },
                         ],
                       },
@@ -979,7 +1234,7 @@ export const ABP1: Document = {
       form: [
         {
           description:
-            "Other Information Related to Selection of the Section 1937 Coverage Option and the Base Benchmark Plan (optional):",
+            "Other information related to selection of the Section 1937 coverage option and the base benchmark plan (optional)",
           slots: [
             {
               name: "additional_information",
diff --git a/src/services/ui/src/router.tsx b/src/services/ui/src/router.tsx
index 2080c26073..fb8a90773f 100644
--- a/src/services/ui/src/router.tsx
+++ b/src/services/ui/src/router.tsx
@@ -68,6 +68,7 @@ export const router = createBrowserRouter([
       },
       { path: ROUTES.MEDICAID_NEW, element: <P.MedicaidForm /> },
       { path: ROUTES.ACTION, element: <P.ActionFormIndex /> },
+      { path: "/form", element: <P.ExampleForm /> },
     ],
     loader: rootLoader(queryClient),
   },