diff --git a/apps/backend/src/foodManufacturers/dtos/update-manufacturer-application.dto.ts b/apps/backend/src/foodManufacturers/dtos/update-manufacturer-application.dto.ts
index 58d7f70fa..a1078bdd0 100644
--- a/apps/backend/src/foodManufacturers/dtos/update-manufacturer-application.dto.ts
+++ b/apps/backend/src/foodManufacturers/dtos/update-manufacturer-application.dto.ts
@@ -26,7 +26,10 @@ export class UpdateFoodManufacturerApplicationDto {
   secondaryContactLastName?: string;
 
   @IsOptional()
-  @IsEmail()
+  @IsEmail(
+    {},
+    { message: 'Secondary contact email must be a valid email address.' },
+  )
   @IsNotEmpty()
   @MaxLength(255)
   secondaryContactEmail?: string;
diff --git a/apps/backend/src/foodManufacturers/manufacturers.controller.spec.ts b/apps/backend/src/foodManufacturers/manufacturers.controller.spec.ts
index 204d32bd3..bc86024a5 100644
--- a/apps/backend/src/foodManufacturers/manufacturers.controller.spec.ts
+++ b/apps/backend/src/foodManufacturers/manufacturers.controller.spec.ts
@@ -246,4 +246,23 @@ describe('FoodManufacturersController', () => {
       expect(mockManufacturersService.deny).toHaveBeenCalledWith(1);
     });
   });
+
+  describe('getCurrentUserFoodManufacturerId', () => {
+    it('returns foodManufacturerId for authenticated user', async () => {
+      const req = { user: { id: 1 } };
+      const manufacturer: Partial<FoodManufacturer> = {
+        foodManufacturerId: 10,
+      };
+      mockManufacturersService.findByUserId.mockResolvedValueOnce(
+        manufacturer as FoodManufacturer,
+      );
+
+      const result = await controller.getCurrentUserFoodManufacturerId(
+        req as AuthenticatedRequest,
+      );
+
+      expect(result).toEqual(10);
+      expect(mockManufacturersService.findByUserId).toHaveBeenCalledWith(1);
+    });
+  });
 });
diff --git a/apps/backend/src/foodManufacturers/manufacturers.controller.ts b/apps/backend/src/foodManufacturers/manufacturers.controller.ts
index 198fcf412..8f2b352f3 100644
--- a/apps/backend/src/foodManufacturers/manufacturers.controller.ts
+++ b/apps/backend/src/foodManufacturers/manufacturers.controller.ts
@@ -30,6 +30,17 @@ export class FoodManufacturersController {
     return this.foodManufacturersService.getPendingManufacturers();
   }
 
+  @Roles(Role.FOODMANUFACTURER)
+  @Get('/my-id')
+  async getCurrentUserFoodManufacturerId(
+    @Req() req: AuthenticatedRequest,
+  ): Promise<number> {
+    const manufacturer = await this.foodManufacturersService.findByUserId(
+      req.user.id,
+    );
+    return manufacturer.foodManufacturerId;
+  }
+
   @Get('/:foodManufacturerId')
   async getFoodManufacturer(
     @Param('foodManufacturerId', ParseIntPipe) foodManufacturerId: number,
diff --git a/apps/backend/src/foodManufacturers/manufacturers.service.spec.ts b/apps/backend/src/foodManufacturers/manufacturers.service.spec.ts
index 12997849e..4cd5c221a 100644
--- a/apps/backend/src/foodManufacturers/manufacturers.service.spec.ts
+++ b/apps/backend/src/foodManufacturers/manufacturers.service.spec.ts
@@ -531,6 +531,21 @@ describe('FoodManufacturersService', () => {
     });
   });
 
+  describe('findByUserId', () => {
+    it('findByUserId success', async () => {
+      const manufacturer = await service.findOne(1);
+      const userId = manufacturer.foodManufacturerRepresentative.id;
+      const result = await service.findByUserId(userId);
+      expect(result.foodManufacturerId).toBe(1);
+    });
+
+    it('findByUserId with non-existent user throws NotFoundException', async () => {
+      await expect(service.findByUserId(9999)).rejects.toThrow(
+        new NotFoundException('Food Manufacturer for User 9999 not found'),
+      );
+    });
+  });
+
   describe('getStats', () => {
     it('returns proper stats for manufacturer', async () => {
       const manufacturerId = 1;
diff --git a/apps/backend/src/foodManufacturers/manufacturers.service.ts b/apps/backend/src/foodManufacturers/manufacturers.service.ts
index f3fae07d7..cd04726a0 100644
--- a/apps/backend/src/foodManufacturers/manufacturers.service.ts
+++ b/apps/backend/src/foodManufacturers/manufacturers.service.ts
@@ -57,6 +57,21 @@ export class FoodManufacturersService {
     return foodManufacturer;
   }
 
+  async findByUserId(userId: number): Promise<FoodManufacturer> {
+    validateId(userId, 'User');
+
+    const manufacturer = await this.repo.findOne({
+      where: { foodManufacturerRepresentative: { id: userId } },
+    });
+
+    if (!manufacturer) {
+      throw new NotFoundException(
+        `Food Manufacturer for User ${userId} not found`,
+      );
+    }
+    return manufacturer;
+  }
+
   async getFMDonations(
     foodManufacturerId: number,
     currentUserId: number,
diff --git a/apps/backend/src/pantries/dtos/update-pantry-application.dto.ts b/apps/backend/src/pantries/dtos/update-pantry-application.dto.ts
index efb1d9f6b..a5325e1ff 100644
--- a/apps/backend/src/pantries/dtos/update-pantry-application.dto.ts
+++ b/apps/backend/src/pantries/dtos/update-pantry-application.dto.ts
@@ -33,7 +33,10 @@ export class UpdatePantryApplicationDto {
   secondaryContactLastName?: string;
 
   @IsOptional()
-  @IsEmail()
+  @IsEmail(
+    {},
+    { message: 'Secondary contact email must be a valid email address.' },
+  )
   @IsNotEmpty()
   @MaxLength(255)
   secondaryContactEmail?: string;
@@ -42,7 +45,7 @@ export class UpdatePantryApplicationDto {
   @IsString()
   @IsPhoneNumber('US', {
     message:
-      'secondaryContactPhone must be a valid phone number (make sure all the digits are correct)',
+      'Secondary contact phone must be a valid phone number (make sure all the digits are correct)',
   })
   @IsNotEmpty()
   secondaryContactPhone?: string;
@@ -132,6 +135,15 @@ export class UpdatePantryApplicationDto {
   @MaxLength(255, { each: true })
   restrictions?: string[];
 
+  @IsBoolean()
+  @IsOptional()
+  acceptFoodDeliveries?: boolean;
+
+  @IsOptional()
+  @IsString()
+  @IsNotEmpty()
+  deliveryWindowInstructions?: string;
+
   @IsEnum(RefrigeratedDonation)
   @IsOptional()
   refrigeratedDonation?: RefrigeratedDonation;
@@ -140,6 +152,10 @@ export class UpdatePantryApplicationDto {
   @IsOptional()
   reserveFoodForAllergic?: ReserveFoodForAllergic;
 
+  @IsOptional()
+  @IsString()
+  reservationExplanation?: string | null;
+
   @IsBoolean()
   @IsOptional()
   dedicatedAllergyFriendly?: boolean;
diff --git a/apps/backend/src/pantries/pantries.controller.ts b/apps/backend/src/pantries/pantries.controller.ts
index ae038ea23..e6d04f282 100644
--- a/apps/backend/src/pantries/pantries.controller.ts
+++ b/apps/backend/src/pantries/pantries.controller.ts
@@ -368,7 +368,7 @@ export class PantriesController {
   }
 
   @Roles(Role.PANTRY)
-  @Patch('/:pantryId/update')
+  @Patch('/:pantryId/application')
   async updatePantryApplication(
     @Req() req: AuthenticatedRequest,
     @Param('pantryId', ParseIntPipe) pantryId: number,
diff --git a/apps/frontend/src/api/apiClient.ts b/apps/frontend/src/api/apiClient.ts
index 26ef842ae..ffed2ae0d 100644
--- a/apps/frontend/src/api/apiClient.ts
+++ b/apps/frontend/src/api/apiClient.ts
@@ -31,6 +31,8 @@ import {
   TotalStats,
   CreateDonationDto,
   UpdateProfileFields,
+  UpdatePantryApplicationDto,
+  UpdateFoodManufacturerApplicationDto,
   MatchingManufacturersDto,
   MatchingItemsDto,
   CreateOrderDto,
@@ -379,6 +381,15 @@ export class ApiClient {
     });
   }
 
+  public async updatePantryApplicationData(
+    pantryId: number,
+    data: UpdatePantryApplicationDto,
+  ): Promise<Pantry> {
+    return this.axiosInstance
+      .patch(`/api/pantries/${pantryId}/application`, data)
+      .then((response) => response.data);
+  }
+
   public async createOrder(
     dto: CreateOrderDto,
   ): Promise<OrderWithoutRelations> {
@@ -436,6 +447,21 @@ export class ApiClient {
       .then((response) => response.data);
   }
 
+  public async getCurrentUserFoodManufacturerId(): Promise<number> {
+    return this.axiosInstance
+      .get('/api/manufacturers/my-id')
+      .then((response) => response.data);
+  }
+
+  public async updateFoodManufacturerApplicationData(
+    manufacturerId: number,
+    data: UpdateFoodManufacturerApplicationDto,
+  ): Promise<FoodManufacturer> {
+    return this.axiosInstance
+      .patch(`/api/manufacturers/${manufacturerId}/application`, data)
+      .then((response) => response.data);
+  }
+
   public async getMe(): Promise<User> {
     return this.axiosInstance
       .get('/api/users/me')
diff --git a/apps/frontend/src/components/editableComponents.tsx b/apps/frontend/src/components/editableComponents.tsx
new file mode 100644
index 000000000..464bddaa6
--- /dev/null
+++ b/apps/frontend/src/components/editableComponents.tsx
@@ -0,0 +1,377 @@
+import React from 'react';
+import {
+  Box,
+  Text,
+  Input,
+  Textarea,
+  RadioGroup,
+  Stack,
+  NativeSelect,
+  NativeSelectIndicator,
+  Menu,
+  Button,
+  Grid,
+} from '@chakra-ui/react';
+import { ChevronDownIcon } from 'lucide-react';
+import { TagGroup } from '@components/forms/tagGroup';
+
+export const fieldHeaderStyles = {
+  fontSize: '14px',
+  color: 'neutral.800',
+  fontWeight: 600,
+  mb: 1,
+};
+
+export const fieldContentStyles = {
+  fontSize: '14px',
+  color: 'neutral.800',
+};
+
+export const sectionLabelStyles = {
+  fontSize: '16px',
+  fontWeight: 600,
+  fontFamily: 'inter',
+  color: 'neutral.800',
+  mb: 8,
+};
+
+export const inputStyles = {
+  borderColor: 'neutral.100',
+  color: 'neutral.600',
+  size: 'sm' as const,
+};
+
+interface SectionProps {
+  title: string;
+  children: React.ReactNode;
+}
+export const Section: React.FC<SectionProps> = ({ title, children }) => (
+  <Box>
+    <Text {...sectionLabelStyles}>{title}</Text>
+    {children}
+  </Box>
+);
+
+interface FieldProps {
+  label: string;
+  value?: string | null;
+  fallback?: string;
+}
+export const Field: React.FC<FieldProps> = ({
+  label,
+  value,
+  fallback = '-',
+}) => (
+  <Box mb={14}>
+    <Text {...fieldHeaderStyles}>{label}</Text>
+    <Text {...fieldContentStyles}>{value || fallback}</Text>
+  </Box>
+);
+
+interface EditFieldProps {
+  label: string;
+  name: string;
+  value: string;
+  onChange: (v: string) => void;
+  textarea?: boolean;
+  helperText?: string;
+  required?: boolean;
+}
+export const EditField: React.FC<EditFieldProps> = ({
+  label,
+  name,
+  value,
+  onChange,
+  textarea,
+  helperText,
+  required,
+}) => (
+  <Box mb={6}>
+    <Text {...fieldHeaderStyles} mb={2}>
+      {label}
+      {required && (
+        <Text as="span" color="red" ml="1">
+          *
+        </Text>
+      )}
+    </Text>
+    {textarea ? (
+      <Textarea
+        name={name}
+        value={value}
+        onChange={(e) => onChange(e.target.value)}
+        {...inputStyles}
+        color="neutral.800"
+        autoresize
+        placeholder="-"
+      />
+    ) : (
+      <Input
+        name={name}
+        value={value}
+        onChange={(e) => onChange(e.target.value)}
+        {...inputStyles}
+      />
+    )}
+    {helperText && (
+      <Text fontSize="13px" color="neutral.600" mt={1}>
+        {helperText}
+      </Text>
+    )}
+  </Box>
+);
+
+interface EditRadioProps {
+  label: string;
+  name: string;
+  value: string;
+  options: string[];
+  onChange: (v: string) => void;
+  helperText?: string;
+  required?: boolean;
+}
+export const EditRadio: React.FC<EditRadioProps> = ({
+  label,
+  name,
+  value,
+  options,
+  onChange,
+  helperText,
+  required,
+}) => (
+  <Box mb={6}>
+    <Text {...fieldHeaderStyles} mb={helperText ? 1 : 2}>
+      {label}
+      {required && (
+        <Text as="span" color="red" ml="1">
+          *
+        </Text>
+      )}
+    </Text>
+    {helperText && (
+      <Text fontSize="13px" color="neutral.600" mb={2}>
+        {helperText}
+      </Text>
+    )}
+    <RadioGroup.Root
+      name={name}
+      value={value}
+      variant="solid"
+      colorPalette="neutral"
+      onValueChange={(e: { value: string }) => onChange(e.value)}
+    >
+      <Stack>
+        {options.map((opt) => (
+          <RadioGroup.Item key={opt} value={opt}>
+            <RadioGroup.ItemHiddenInput />
+            <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }}>
+              <RadioGroup.ItemIndicator
+                border="1px solid"
+                borderColor="neutral.100"
+              />
+            </RadioGroup.ItemControl>
+            <RadioGroup.ItemText color="neutral.700" textStyle="p2">
+              {opt}
+            </RadioGroup.ItemText>
+          </RadioGroup.Item>
+        ))}
+      </Stack>
+    </RadioGroup.Root>
+  </Box>
+);
+
+interface EditSelectProps {
+  label: string;
+  name: string;
+  value: string;
+  options: string[];
+  onChange: (v: string) => void;
+  helperText?: string;
+  required?: boolean;
+  placeholder?: string;
+}
+export const EditSelect: React.FC<EditSelectProps> = ({
+  label,
+  name,
+  value,
+  options,
+  onChange,
+  helperText,
+  required,
+  placeholder,
+}) => (
+  <Box mb={6}>
+    <Text {...fieldHeaderStyles} mb={2}>
+      {label}
+      {required && (
+        <Text as="span" color="red" ml="1">
+          *
+        </Text>
+      )}
+    </Text>
+    <NativeSelect.Root borderColor="neutral.100">
+      <NativeSelect.Field
+        name={name}
+        value={value}
+        onChange={(e) => onChange(e.target.value)}
+        {...inputStyles}
+      >
+        <option value="">{placeholder ?? 'Select an option'}</option>
+        {options.map((opt) => (
+          <option key={opt} value={opt}>
+            {opt}
+          </option>
+        ))}
+      </NativeSelect.Field>
+      <NativeSelectIndicator />
+    </NativeSelect.Root>
+    {helperText && (
+      <Text fontSize="13px" color="neutral.600" mt={1}>
+        {helperText}
+      </Text>
+    )}
+  </Box>
+);
+
+interface EditMultiSelectProps {
+  label: string;
+  value: string[];
+  options: string[];
+  onChange: (v: string[]) => void;
+  triggerLabel?: string;
+  helperText?: string;
+  required?: boolean;
+}
+export const EditMultiSelect: React.FC<EditMultiSelectProps> = ({
+  label,
+  value,
+  options,
+  onChange,
+  triggerLabel,
+  helperText,
+  required,
+}) => (
+  <Box mb={6}>
+    <Text {...fieldHeaderStyles} mb={2}>
+      {label}
+      {required && (
+        <Text as="span" color="red" ml="1">
+          *
+        </Text>
+      )}
+    </Text>
+    <Menu.Root closeOnSelect={false} colorPalette="neutral">
+      <Menu.Trigger asChild>
+        <Button
+          pl={3}
+          pr={2}
+          w="full"
+          bgColor="white"
+          color="neutral.800"
+          borderColor="neutral.100"
+          justifyContent="space-between"
+          textStyle="p2"
+          size="sm"
+          borderWidth="1px"
+          borderStyle="solid"
+        >
+          {value.length > 0 ? `Select more` : triggerLabel ?? 'Select options'}
+          <ChevronDownIcon />
+        </Button>
+      </Menu.Trigger>
+      <Menu.Positioner w="full">
+        <Menu.Content maxH="400px" overflowY="auto">
+          {options.map((opt) => (
+            <Menu.CheckboxItem
+              key={opt}
+              checked={value.includes(opt)}
+              onCheckedChange={(checked: boolean) =>
+                onChange(
+                  checked ? [...value, opt] : value.filter((i) => i !== opt),
+                )
+              }
+              display="flex"
+              alignItems="center"
+            >
+              <Box
+                position="absolute"
+                left={1}
+                ml={0.5}
+                w={5}
+                h={5}
+                borderWidth="1px"
+                borderRadius="4px"
+                borderColor="neutral.200"
+              />
+              <Menu.ItemIndicator />
+              <Text
+                ml={0.5}
+                color="neutral.800"
+                fontWeight={500}
+                fontFamily="Inter"
+              >
+                {opt}
+              </Text>
+            </Menu.CheckboxItem>
+          ))}
+        </Menu.Content>
+      </Menu.Positioner>
+    </Menu.Root>
+    {value.length > 0 && (
+      <TagGroup
+        values={value}
+        onRemove={(v) => onChange(value.filter((i) => i !== v))}
+        blueVariant
+      />
+    )}
+    {helperText && (
+      <Text fontSize="13px" color="neutral.600" mt={1}>
+        {helperText}
+      </Text>
+    )}
+  </Box>
+);
+
+const ADDRESS_FIELDS = [
+  { suffix: 'Line1', label: 'Address Line 1' },
+  { suffix: 'Line2', label: 'Address Line 2' },
+  { suffix: 'City', label: 'City/Town' },
+  { suffix: 'State', label: 'State/Region/Province' },
+  { suffix: 'Zip', label: 'Zip/Postal Code' },
+  { suffix: 'Country', label: 'Country' },
+];
+
+interface EditAddressSectionProps {
+  title: string;
+  prefix: string;
+  form: { [key: string]: string | boolean | string[] };
+  onChange: (name: string, value: string) => void;
+  requiredSuffixes: string[];
+}
+
+export const EditAddressSection: React.FC<EditAddressSectionProps> = ({
+  title,
+  prefix,
+  form,
+  onChange,
+  requiredSuffixes,
+}) => {
+  const str = (key: string) => (form[key] as string) ?? '';
+  return (
+    <Box mb={6}>
+      <Text {...sectionLabelStyles}>{title}</Text>
+      <Grid templateColumns="repeat(2, 1fr)" columnGap={6}>
+        {ADDRESS_FIELDS.map(({ suffix, label }) => (
+          <EditField
+            key={suffix}
+            label={label}
+            name={`${prefix}${suffix}`}
+            value={str(`${prefix}${suffix}`)}
+            onChange={(v) => onChange(`${prefix}${suffix}`, v)}
+            required={requiredSuffixes.includes(suffix)}
+          />
+        ))}
+      </Grid>
+    </Box>
+  );
+};
diff --git a/apps/frontend/src/components/forms/editableFMApplication.tsx b/apps/frontend/src/components/forms/editableFMApplication.tsx
new file mode 100644
index 000000000..bb9b60cab
--- /dev/null
+++ b/apps/frontend/src/components/forms/editableFMApplication.tsx
@@ -0,0 +1,530 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import {
+  Box,
+  Grid,
+  Text,
+  HStack,
+  VStack,
+  Center,
+  Button,
+} from '@chakra-ui/react';
+import axios from 'axios';
+import { AuthError } from 'aws-amplify/auth';
+import ApiClient from '@api/apiClient';
+import {
+  FoodManufacturer,
+  UpdateFoodManufacturerApplicationDto,
+} from '../../types/types';
+import {
+  Allergen,
+  DonateWastedFood,
+  ManufacturerAttribute,
+} from '../../types/manufacturerEnums';
+import { formatPhone } from '@utils/utils';
+import { TagGroup } from '@components/forms/tagGroup';
+import { USPhoneInput } from '@components/forms/usPhoneInput';
+import {
+  fieldHeaderStyles,
+  fieldContentStyles,
+  sectionLabelStyles,
+  Section,
+  Field,
+  EditField,
+  EditRadio,
+  EditSelect,
+  EditMultiSelect,
+} from '@components/editableComponents';
+
+const allergenOptions = Object.values(Allergen);
+const donateWastedFoodOptions = Object.values(DonateWastedFood);
+const manufacturerAttributeOptions = Object.values(ManufacturerAttribute);
+
+type FormState = {
+  secondaryContactFirstName: string;
+  secondaryContactLastName: string;
+  secondaryContactEmail: string;
+  secondaryContactPhone: string;
+  foodManufacturerName: string;
+  foodManufacturerWebsite: string;
+  unlistedProductAllergens: string[];
+  facilityFreeAllergens: string[];
+  productsGlutenFree: string;
+  productsContainSulfites: string;
+  productsSustainableExplanation: string;
+  inKindDonations: string;
+  donateWastedFood: string;
+  manufacturerAttribute: string;
+  additionalComments: string;
+  newsletterSubscription: string;
+};
+
+function buildFormState(app: FoodManufacturer): FormState {
+  return {
+    secondaryContactFirstName: app.secondaryContactFirstName ?? '',
+    secondaryContactLastName: app.secondaryContactLastName ?? '',
+    secondaryContactEmail: app.secondaryContactEmail ?? '',
+    secondaryContactPhone: app.secondaryContactPhone ?? '',
+    foodManufacturerName: app.foodManufacturerName ?? '',
+    foodManufacturerWebsite: app.foodManufacturerWebsite ?? '',
+    unlistedProductAllergens: app.unlistedProductAllergens ?? [],
+    facilityFreeAllergens: app.facilityFreeAllergens ?? [],
+    productsGlutenFree: app.productsGlutenFree ? 'Yes, always' : 'No',
+    productsContainSulfites: app.productsContainSulfites ? 'Yes' : 'No',
+    productsSustainableExplanation: app.productsSustainableExplanation ?? '',
+    inKindDonations: app.inKindDonations ? 'Yes' : 'No',
+    donateWastedFood: app.donateWastedFood ?? '',
+    manufacturerAttribute: app.manufacturerAttribute ?? '',
+    additionalComments: app.additionalComments ?? '',
+    newsletterSubscription:
+      app.newsletterSubscription != null
+        ? app.newsletterSubscription
+          ? 'Yes'
+          : 'No'
+        : '',
+  };
+}
+
+function validateRequired(form: FormState): boolean {
+  return (
+    !!form.foodManufacturerName.trim() &&
+    !!form.foodManufacturerWebsite.trim() &&
+    form.unlistedProductAllergens.length > 0 &&
+    form.facilityFreeAllergens.length > 0 &&
+    !!form.productsGlutenFree &&
+    !!form.productsContainSulfites &&
+    !!form.productsSustainableExplanation.trim() &&
+    !!form.inKindDonations &&
+    !!form.donateWastedFood
+  );
+}
+
+interface EditableFMApplicationProps {
+  isEditing: boolean;
+  onEditingChange: (v: boolean) => void;
+}
+
+const EditableFMApplication: React.FC<EditableFMApplicationProps> = ({
+  isEditing,
+  onEditingChange,
+}) => {
+  const [application, setApplication] = useState<FoodManufacturer | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  const [isSaving, setIsSaving] = useState(false);
+  const [form, setForm] = useState<FormState | null>(null);
+
+  const fetchApplication = useCallback(async () => {
+    try {
+      const manufacturerId = await ApiClient.getCurrentUserFoodManufacturerId();
+      if (manufacturerId) {
+        const data = await ApiClient.getFoodManufacturer(manufacturerId);
+        setApplication(data);
+        setForm(buildFormState(data));
+      }
+    } catch {
+      setError('Could not load application details. Please try again later.');
+    }
+  }, []);
+
+  useEffect(() => {
+    fetchApplication();
+  }, [fetchApplication]);
+
+  useEffect(() => {
+    if (!isEditing && application) setForm(buildFormState(application));
+  }, [isEditing, application]);
+
+  const setField = (name: string, value: string) =>
+    setForm((prev) => (prev ? { ...prev, [name]: value } : prev));
+
+  const handleCancel = () => {
+    if (application) setForm(buildFormState(application));
+    onEditingChange(false);
+  };
+
+  const handleSave = async () => {
+    if (!form || !application) return;
+
+    if (!validateRequired(form)) {
+      setError('Please complete all required fields before saving.');
+      return;
+    }
+
+    setIsSaving(true);
+    setError(null);
+    try {
+      const formData: UpdateFoodManufacturerApplicationDto = {
+        secondaryContactFirstName: form.secondaryContactFirstName || undefined,
+        secondaryContactLastName: form.secondaryContactLastName || undefined,
+        secondaryContactEmail: form.secondaryContactEmail || undefined,
+        secondaryContactPhone: form.secondaryContactPhone || undefined,
+        foodManufacturerName: form.foodManufacturerName || undefined,
+        foodManufacturerWebsite: form.foodManufacturerWebsite || undefined,
+        unlistedProductAllergens: form.unlistedProductAllergens as Allergen[],
+        facilityFreeAllergens: form.facilityFreeAllergens as Allergen[],
+        productsGlutenFree: form.productsGlutenFree === 'Yes, always',
+        productsContainSulfites: form.productsContainSulfites === 'Yes',
+        productsSustainableExplanation:
+          form.productsSustainableExplanation || undefined,
+        inKindDonations: form.inKindDonations === 'Yes',
+        donateWastedFood:
+          (form.donateWastedFood as DonateWastedFood) || undefined,
+        manufacturerAttribute:
+          (form.manufacturerAttribute as ManufacturerAttribute) || undefined,
+        additionalComments: form.additionalComments || undefined,
+        newsletterSubscription: form.newsletterSubscription
+          ? form.newsletterSubscription === 'Yes'
+          : undefined,
+      };
+      const updated = await ApiClient.updateFoodManufacturerApplicationData(
+        application.foodManufacturerId,
+        formData,
+      );
+      const updatedWithRelations = {
+        ...application,
+        ...updated,
+        foodManufacturerRepresentative:
+          application.foodManufacturerRepresentative,
+        donations: application.donations,
+      };
+      setApplication(updatedWithRelations);
+      setForm(buildFormState(updatedWithRelations));
+      onEditingChange(false);
+    } catch (err) {
+      if (axios.isAxiosError(err)) {
+        const status = err.response?.status;
+        if (status === 400) {
+          const messages = err.response?.data?.message;
+          setError(
+            Array.isArray(messages)
+              ? messages.join(' ')
+              : 'Invalid input. Please check your entries and try again.',
+          );
+        } else if (status === 403) {
+          setError('You do not have permission to edit this profile.');
+        } else if (status === 404) {
+          setError('This manufacturer profile could not be found.');
+        } else if (status === 500) {
+          setError('A server error occurred while saving. Please try again.');
+        } else {
+          setError('Failed to save changes. Please try again.');
+        }
+      } else if (err instanceof AuthError) {
+        setError(
+          'Your session may have expired. Please refresh or log in again.',
+        );
+      }
+    } finally {
+      setIsSaving(false);
+    }
+  };
+
+  if (!application || !form) {
+    return (
+      <Center py={16}>
+        <Text textStyle="p2" color="neutral.500">
+          {error ?? 'Application not found.'}
+        </Text>
+      </Center>
+    );
+  }
+
+  // Read-only view
+  if (!isEditing) {
+    return (
+      <VStack align="stretch" gap={4}>
+        <Section title="Secondary Point of Contact">
+          <Grid templateColumns="repeat(2, 1fr)" columnGap={6}>
+            <Field
+              label="First Name"
+              value={application.secondaryContactFirstName}
+            />
+            <Field
+              label="Last Name"
+              value={application.secondaryContactLastName}
+            />
+            <Field
+              label="Email Address"
+              value={application.secondaryContactEmail}
+            />
+            <Field
+              label="Phone Number"
+              value={formatPhone(application.secondaryContactPhone)}
+            />
+          </Grid>
+        </Section>
+
+        <Section title="Company Information">
+          <Grid templateColumns="repeat(2, 1fr)" columnGap={6}>
+            <Field
+              label="Company Name"
+              value={application.foodManufacturerName}
+            />
+            <Field
+              label="Company Website"
+              value={application.foodManufacturerWebsite}
+            />
+          </Grid>
+        </Section>
+
+        <Section title="Product Details">
+          <Box mb={14}>
+            <Text {...fieldHeaderStyles}>
+              Allergens not listed in product ingredients
+            </Text>
+            {application.unlistedProductAllergens?.length ? (
+              <TagGroup values={application.unlistedProductAllergens} />
+            ) : (
+              <Text {...fieldContentStyles}>-</Text>
+            )}
+          </Box>
+          <Box mb={14}>
+            <Text {...fieldHeaderStyles}>
+              Allergens that facilities are free from
+            </Text>
+            {application.facilityFreeAllergens?.length ? (
+              <TagGroup values={application.facilityFreeAllergens} />
+            ) : (
+              <Text {...fieldContentStyles}>-</Text>
+            )}
+          </Box>
+          <Grid templateColumns="repeat(2, 1fr)" columnGap={6}>
+            <Field
+              label="Are products certified gluten-free"
+              value={application.productsGlutenFree ? 'Yes, always' : 'No'}
+            />
+            <Field
+              label="Does product contain sulfites?"
+              value={application.productsContainSulfites ? 'Yes' : 'No'}
+            />
+            <Field
+              label="Provides in-kind food donations"
+              value={application.inKindDonations ? 'Yes' : 'No'}
+            />
+            <Field
+              label="Donates food-rescue"
+              value={application.donateWastedFood}
+            />
+          </Grid>
+          <Field
+            label="Are your products sustainable or environmentally conscious?"
+            value={application.productsSustainableExplanation}
+          />
+          <Field
+            label="Food Manufacturer is"
+            value={application.manufacturerAttribute}
+          />
+          <Field
+            label="Additional Information"
+            value={application.additionalComments}
+          />
+          <Field
+            label="Subscribed to Newsletter"
+            value={
+              application.newsletterSubscription != null
+                ? application.newsletterSubscription
+                  ? 'Yes'
+                  : 'No'
+                : undefined
+            }
+          />
+        </Section>
+      </VStack>
+    );
+  } else {
+    // Editing view
+    return (
+      <VStack align="stretch" gap={2}>
+        <Box mb={4}>
+          <Text {...sectionLabelStyles}>Secondary Point of Contact</Text>
+          <Grid templateColumns="repeat(2, 1fr)" columnGap={6}>
+            <EditField
+              label="First Name"
+              name="secondaryContactFirstName"
+              value={form.secondaryContactFirstName}
+              onChange={(v) => setField('secondaryContactFirstName', v)}
+            />
+            <EditField
+              label="Last Name"
+              name="secondaryContactLastName"
+              value={form.secondaryContactLastName}
+              onChange={(v) => setField('secondaryContactLastName', v)}
+            />
+            <EditField
+              label="Email Address"
+              name="secondaryContactEmail"
+              value={form.secondaryContactEmail}
+              onChange={(v) => setField('secondaryContactEmail', v)}
+            />
+            <Box mb={6}>
+              <Text {...fieldHeaderStyles} mb={2}>
+                Phone Number
+              </Text>
+              <USPhoneInput
+                value={form.secondaryContactPhone}
+                onChange={(v) => setField('secondaryContactPhone', v)}
+                allowEmpty
+                inputProps={{
+                  name: 'secondaryContactPhone',
+                  borderColor: 'neutral.100',
+                  color: 'neutral.600',
+                  size: 'sm',
+                }}
+              />
+            </Box>
+          </Grid>
+        </Box>
+
+        <Box mb={4}>
+          <Text {...sectionLabelStyles}>Company Information</Text>
+          <Grid templateColumns="repeat(2, 1fr)" columnGap={6}>
+            <EditField
+              label="Company Name"
+              name="foodManufacturerName"
+              value={form.foodManufacturerName}
+              onChange={(v) => setField('foodManufacturerName', v)}
+              required
+            />
+            <EditField
+              label="Company Website"
+              name="foodManufacturerWebsite"
+              value={form.foodManufacturerWebsite}
+              onChange={(v) => setField('foodManufacturerWebsite', v)}
+              required
+            />
+          </Grid>
+        </Box>
+
+        <Text {...sectionLabelStyles}>Product Details</Text>
+
+        <EditMultiSelect
+          label="Allergens not listed in product ingredients"
+          value={form.unlistedProductAllergens}
+          options={allergenOptions}
+          onChange={(v) =>
+            setForm((prev) =>
+              prev ? { ...prev, unlistedProductAllergens: v } : prev,
+            )
+          }
+          triggerLabel="Select allergens"
+          required
+        />
+
+        <EditMultiSelect
+          label="Allergens that facilities are free from"
+          value={form.facilityFreeAllergens}
+          options={allergenOptions}
+          onChange={(v) =>
+            setForm((prev) =>
+              prev ? { ...prev, facilityFreeAllergens: v } : prev,
+            )
+          }
+          triggerLabel="Select allergens"
+          required
+        />
+
+        <EditRadio
+          label="Are products certified gluten-free"
+          name="productsGlutenFree"
+          value={form.productsGlutenFree}
+          options={['Yes, always', 'No']}
+          onChange={(v) => setField('productsGlutenFree', v)}
+          required
+        />
+
+        <EditRadio
+          label="Does product contain sulfites?"
+          name="productsContainSulfites"
+          value={form.productsContainSulfites}
+          options={['Yes', 'No']}
+          onChange={(v) => setField('productsContainSulfites', v)}
+          required
+        />
+
+        <EditRadio
+          label="Provides in-kind food donations"
+          name="inKindDonations"
+          value={form.inKindDonations}
+          options={['Yes', 'No']}
+          onChange={(v) => setField('inKindDonations', v)}
+          required
+        />
+
+        <EditRadio
+          label="Donates food-rescue"
+          name="donateWastedFood"
+          value={form.donateWastedFood}
+          options={donateWastedFoodOptions}
+          onChange={(v) => setField('donateWastedFood', v)}
+          required
+        />
+
+        <EditField
+          label="Are your products sustainable or environmentally conscious?"
+          name="productsSustainableExplanation"
+          value={form.productsSustainableExplanation}
+          onChange={(v) => setField('productsSustainableExplanation', v)}
+          textarea
+          required
+        />
+
+        <EditSelect
+          label="Food Manufacturer is"
+          name="manufacturerAttribute"
+          value={form.manufacturerAttribute}
+          options={manufacturerAttributeOptions}
+          onChange={(v) => setField('manufacturerAttribute', v)}
+        />
+
+        <EditField
+          label="Additional Information"
+          name="additionalComments"
+          value={form.additionalComments}
+          onChange={(v) => setField('additionalComments', v)}
+          textarea
+        />
+
+        <EditRadio
+          label="Subscribed to Newsletter"
+          name="newsletterSubscription"
+          value={form.newsletterSubscription}
+          options={['Yes', 'No']}
+          onChange={(v) => setField('newsletterSubscription', v)}
+        />
+
+        {error && (
+          <Text color="red" fontSize="14px" mb={2}>
+            {error}
+          </Text>
+        )}
+
+        <HStack justify="flex-end" gap={3} mt={6}>
+          <Button
+            variant="outline"
+            size="sm"
+            color="neutral.800"
+            onClick={handleCancel}
+            disabled={isSaving}
+            borderColor="neutral.200"
+            fontWeight={600}
+          >
+            Cancel
+          </Button>
+          <Button
+            color="white"
+            bg="blue.hover"
+            variant="solid"
+            size="sm"
+            px={7}
+            onClick={handleSave}
+            loading={isSaving}
+            fontWeight={600}
+          >
+            Save Changes
+          </Button>
+        </HStack>
+      </VStack>
+    );
+  }
+};
+
+export default EditableFMApplication;
diff --git a/apps/frontend/src/components/forms/editablePantryApplication.tsx b/apps/frontend/src/components/forms/editablePantryApplication.tsx
new file mode 100644
index 000000000..8fb74e023
--- /dev/null
+++ b/apps/frontend/src/components/forms/editablePantryApplication.tsx
@@ -0,0 +1,775 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import {
+  Box,
+  Grid,
+  GridItem,
+  Text,
+  HStack,
+  VStack,
+  Center,
+  Button,
+} from '@chakra-ui/react';
+import axios from 'axios';
+import ApiClient from '@api/apiClient';
+import { PantryWithUser, UpdatePantryApplicationDto } from '../../types/types';
+import {
+  Activity,
+  RefrigeratedDonation,
+  ReserveFoodForAllergic,
+  ClientVisitFrequency,
+  AllergensConfidence,
+  ServeAllergicChildren,
+} from '../../types/pantryEnums';
+import { formatPhone } from '@utils/utils';
+import { TagGroup } from '@components/forms/tagGroup';
+import { USPhoneInput } from '@components/forms/usPhoneInput';
+import { dietaryRestrictionOptions } from '@components/forms/pantryApplicationForm';
+import {
+  fieldHeaderStyles,
+  fieldContentStyles,
+  sectionLabelStyles,
+  Section,
+  Field,
+  EditField,
+  EditRadio,
+  EditSelect,
+  EditMultiSelect,
+  EditAddressSection,
+} from '@components/editableComponents';
+import { AuthError } from 'aws-amplify/auth';
+
+const allergenClientOptions = [
+  '< 10',
+  '10 to 20',
+  '20 to 50',
+  '50 to 100',
+  '> 100',
+  "I'm not sure",
+  'I have an exact number',
+];
+
+interface AddressSectionProps {
+  title: string;
+  line1?: string | null;
+  line2?: string | null;
+  city?: string | null;
+  state?: string | null;
+  zip?: string | null;
+  country?: string | null;
+}
+const AddressSection: React.FC<AddressSectionProps> = ({
+  title,
+  line1,
+  line2,
+  city,
+  state,
+  zip,
+  country,
+}) => (
+  <Section title={title}>
+    <Grid templateColumns="repeat(2, 1fr)" columnGap={6}>
+      <Field label="Address Line 1" value={line1} />
+      <Field label="Address Line 2" value={line2} />
+      <Field label="City/Town" value={city} />
+      <Field label="State/Region/Province" value={state} />
+      <Field label="Zip/Postal Code" value={zip} />
+      <Field
+        label="Country"
+        value={
+          country === 'US' ? 'United States of America' : country ?? undefined
+        }
+      />
+    </Grid>
+  </Section>
+);
+
+type FormState = {
+  secondaryContactFirstName: string;
+  secondaryContactLastName: string;
+  secondaryContactEmail: string;
+  secondaryContactPhone: string;
+  shipmentLine1: string;
+  shipmentLine2: string;
+  shipmentCity: string;
+  shipmentState: string;
+  shipmentZip: string;
+  shipmentCountry: string;
+  mailingLine1: string;
+  mailingLine2: string;
+  mailingCity: string;
+  mailingState: string;
+  mailingZip: string;
+  mailingCountry: string;
+  acceptFoodDeliveries: string;
+  deliveryWindowInstructions: string;
+  restrictions: string[];
+  allergenClients: string;
+  allergenClientsExact: string;
+  refrigeratedDonation: string;
+  reserveFoodForAllergic: string;
+  reservationExplanation: string;
+  dedicatedAllergyFriendly: string;
+  clientVisitFrequency: string;
+  identifyAllergensConfidence: string;
+  serveAllergicChildren: string;
+  activities: string[];
+  activitiesComments: string;
+  itemsInStock: string;
+  needMoreOptions: string;
+  newsletterSubscription: string;
+};
+
+function buildFormState(app: PantryWithUser): FormState {
+  // If allergenClients is not one of the dropdown options it was entered as an exact number
+  const storedAllergenClients = app.allergenClients ?? '';
+  const isStandardAllergenOption = allergenClientOptions.includes(
+    storedAllergenClients,
+  );
+  return {
+    secondaryContactFirstName: app.secondaryContactFirstName ?? '',
+    secondaryContactLastName: app.secondaryContactLastName ?? '',
+    secondaryContactEmail: app.secondaryContactEmail ?? '',
+    secondaryContactPhone: app.secondaryContactPhone ?? '',
+    shipmentLine1: app.shipmentAddressLine1 ?? '',
+    shipmentLine2: app.shipmentAddressLine2 ?? '',
+    shipmentCity: app.shipmentAddressCity ?? '',
+    shipmentState: app.shipmentAddressState ?? '',
+    shipmentZip: app.shipmentAddressZip ?? '',
+    shipmentCountry: app.shipmentAddressCountry ?? '',
+    mailingLine1: app.mailingAddressLine1 ?? '',
+    mailingLine2: app.mailingAddressLine2 ?? '',
+    mailingCity: app.mailingAddressCity ?? '',
+    mailingState: app.mailingAddressState ?? '',
+    mailingZip: app.mailingAddressZip ?? '',
+    mailingCountry: app.mailingAddressCountry ?? '',
+    acceptFoodDeliveries: app.acceptFoodDeliveries ? 'Yes' : 'No',
+    deliveryWindowInstructions: app.deliveryWindowInstructions ?? '',
+    restrictions: app.restrictions ?? [],
+    allergenClients: isStandardAllergenOption
+      ? storedAllergenClients
+      : 'I have an exact number',
+    allergenClientsExact: isStandardAllergenOption ? '' : storedAllergenClients,
+    refrigeratedDonation: app.refrigeratedDonation ?? '',
+    reserveFoodForAllergic: app.reserveFoodForAllergic ?? '',
+    reservationExplanation: app.reservationExplanation ?? '',
+    dedicatedAllergyFriendly: app.dedicatedAllergyFriendly ? 'Yes' : 'No',
+    clientVisitFrequency: app.clientVisitFrequency ?? '',
+    identifyAllergensConfidence: app.identifyAllergensConfidence ?? '',
+    serveAllergicChildren: app.serveAllergicChildren ?? '',
+    activities: app.activities ?? [],
+    activitiesComments: app.activitiesComments ?? '',
+    itemsInStock: app.itemsInStock ?? '',
+    needMoreOptions: app.needMoreOptions ?? '',
+    newsletterSubscription:
+      app.newsletterSubscription != null
+        ? app.newsletterSubscription
+          ? 'Yes'
+          : 'No'
+        : '',
+  };
+}
+
+function validateRequired(form: FormState): boolean {
+  return (
+    !!form.shipmentLine1.trim() &&
+    !!form.shipmentCity.trim() &&
+    !!form.shipmentState.trim() &&
+    !!form.shipmentZip.trim() &&
+    !!form.mailingLine1.trim() &&
+    !!form.mailingCity.trim() &&
+    !!form.mailingState.trim() &&
+    !!form.mailingZip.trim() &&
+    !!form.acceptFoodDeliveries &&
+    !!form.allergenClients &&
+    !(
+      form.allergenClients === 'I have an exact number' &&
+      !form.allergenClientsExact.trim()
+    ) &&
+    form.restrictions.length > 0 &&
+    !!form.refrigeratedDonation &&
+    !!form.dedicatedAllergyFriendly &&
+    !!form.reserveFoodForAllergic &&
+    !(
+      (form.reserveFoodForAllergic === ReserveFoodForAllergic.YES ||
+        form.reserveFoodForAllergic === ReserveFoodForAllergic.SOME) &&
+      !form.reservationExplanation.trim()
+    ) &&
+    form.activities.length > 0 &&
+    !(
+      form.activities.includes(Activity.SOMETHING_ELSE) &&
+      !form.activitiesComments.trim()
+    ) &&
+    !!form.itemsInStock.trim() &&
+    !!form.needMoreOptions.trim()
+  );
+}
+
+interface EditablePantryApplicationProps {
+  isEditing: boolean;
+  onEditingChange: (v: boolean) => void;
+}
+
+const EditablePantryApplication: React.FC<EditablePantryApplicationProps> = ({
+  isEditing,
+  onEditingChange,
+}) => {
+  const [application, setApplication] = useState<PantryWithUser | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  const [isSaving, setIsSaving] = useState(false);
+  const [form, setForm] = useState<FormState | null>(null);
+
+  const fetchApplication = useCallback(async () => {
+    try {
+      const pantryId = await ApiClient.getCurrentUserPantryId();
+      if (pantryId) {
+        const data = await ApiClient.getPantry(pantryId);
+        setApplication(data);
+        setForm(buildFormState(data));
+      }
+    } catch {
+      setError('Could not load application details. Please try again later.');
+    }
+  }, []);
+
+  useEffect(() => {
+    fetchApplication();
+  }, [fetchApplication]);
+
+  useEffect(() => {
+    if (!isEditing && application) setForm(buildFormState(application));
+  }, [isEditing, application]);
+
+  const setField = (name: string, value: string) =>
+    setForm((prev) => (prev ? { ...prev, [name]: value } : prev));
+
+  const handleCancel = () => {
+    if (application) setForm(buildFormState(application));
+    onEditingChange(false);
+  };
+
+  const handleSave = async () => {
+    if (!form || !application) return;
+
+    if (!validateRequired(form)) {
+      setError('Please complete all required fields before saving.');
+      return;
+    }
+
+    setIsSaving(true);
+    setError(null);
+    try {
+      const formData: UpdatePantryApplicationDto = {
+        secondaryContactFirstName: form.secondaryContactFirstName || undefined,
+        secondaryContactLastName: form.secondaryContactLastName || undefined,
+        secondaryContactEmail: form.secondaryContactEmail || undefined,
+        secondaryContactPhone: form.secondaryContactPhone || undefined,
+        shipmentAddressLine1: form.shipmentLine1 || undefined,
+        shipmentAddressLine2: form.shipmentLine2 || undefined,
+        shipmentAddressCity: form.shipmentCity || undefined,
+        shipmentAddressState: form.shipmentState || undefined,
+        shipmentAddressZip: form.shipmentZip || undefined,
+        shipmentAddressCountry: form.shipmentCountry || undefined,
+        mailingAddressLine1: form.mailingLine1 || undefined,
+        mailingAddressLine2: form.mailingLine2 || undefined,
+        mailingAddressCity: form.mailingCity || undefined,
+        mailingAddressState: form.mailingState || undefined,
+        mailingAddressZip: form.mailingZip || undefined,
+        mailingAddressCountry: form.mailingCountry || undefined,
+        acceptFoodDeliveries: form.acceptFoodDeliveries === 'Yes',
+        deliveryWindowInstructions:
+          form.deliveryWindowInstructions || undefined,
+        allergenClients:
+          form.allergenClients === 'I have an exact number'
+            ? form.allergenClientsExact || undefined
+            : form.allergenClients || undefined,
+        restrictions: form.restrictions,
+        refrigeratedDonation:
+          (form.refrigeratedDonation as RefrigeratedDonation) || undefined,
+        dedicatedAllergyFriendly: form.dedicatedAllergyFriendly === 'Yes',
+        reserveFoodForAllergic:
+          (form.reserveFoodForAllergic as ReserveFoodForAllergic) || undefined,
+        reservationExplanation:
+          form.reserveFoodForAllergic === ReserveFoodForAllergic.YES ||
+          form.reserveFoodForAllergic === ReserveFoodForAllergic.SOME
+            ? form.reservationExplanation || null
+            : null,
+        clientVisitFrequency:
+          (form.clientVisitFrequency as ClientVisitFrequency) || undefined,
+        identifyAllergensConfidence:
+          (form.identifyAllergensConfidence as AllergensConfidence) ||
+          undefined,
+        serveAllergicChildren:
+          (form.serveAllergicChildren as ServeAllergicChildren) || undefined,
+        activities: form.activities as Activity[],
+        activitiesComments: form.activitiesComments || undefined,
+        itemsInStock: form.itemsInStock || undefined,
+        needMoreOptions: form.needMoreOptions || undefined,
+        newsletterSubscription: form.newsletterSubscription === 'Yes',
+      };
+      const updated = await ApiClient.updatePantryApplicationData(
+        application.pantryId,
+        formData,
+      );
+      const updatedWithUser: PantryWithUser = {
+        ...application,
+        ...updated,
+        pantryUser: application.pantryUser,
+      };
+      setApplication(updatedWithUser);
+      setForm(buildFormState(updatedWithUser));
+      onEditingChange(false);
+    } catch (err) {
+      if (axios.isAxiosError(err)) {
+        const status = err.response?.status;
+        if (status === 400) {
+          const messages = err.response?.data?.message;
+          setError(
+            Array.isArray(messages)
+              ? messages.join(' ')
+              : 'Invalid input. Please check your entries and try again.',
+          );
+        } else if (status === 403) {
+          setError('You do not have permission to edit this profile.');
+        } else if (status === 404) {
+          setError('This pantry profile could not be found.');
+        } else if (status === 500) {
+          setError('A server error occurred while saving. Please try again.');
+        } else {
+          setError('Failed to save changes. Please try again.');
+        }
+      } else if (err instanceof AuthError) {
+        setError(
+          'Your session may have expired. Please refresh or log in again.',
+        );
+      }
+    } finally {
+      setIsSaving(false);
+    }
+  };
+
+  if (!application || !form) {
+    return (
+      <Center py={16}>
+        <Text textStyle="p2" color="neutral.500">
+          {error ?? 'Application not found.'}
+        </Text>
+      </Center>
+    );
+  }
+
+  // Read-only view
+  if (!isEditing) {
+    return (
+      <VStack align="stretch" gap={4}>
+        <Section title="Secondary Point of Contact">
+          <Grid templateColumns="repeat(2, 1fr)" columnGap={6}>
+            <Field
+              label="First Name"
+              value={application.secondaryContactFirstName}
+            />
+            <Field
+              label="Last Name"
+              value={application.secondaryContactLastName}
+            />
+            <Field
+              label="Email Address"
+              value={application.secondaryContactEmail}
+            />
+            <Field
+              label="Phone Number"
+              value={formatPhone(application.secondaryContactPhone)}
+            />
+          </Grid>
+        </Section>
+
+        <Section title="Shipping Address">
+          <Grid templateColumns="repeat(2, 1fr)" columnGap={6}>
+            <Field
+              label="Address Line 1"
+              value={application.shipmentAddressLine1}
+            />
+            <Field
+              label="Address Line 2"
+              value={application.shipmentAddressLine2}
+            />
+            <Field label="City/Town" value={application.shipmentAddressCity} />
+            <Field
+              label="State/Region/Province"
+              value={application.shipmentAddressState}
+            />
+            <Field
+              label="Zip/Postal Code"
+              value={application.shipmentAddressZip}
+            />
+            <Field
+              label="Country"
+              value={
+                application.shipmentAddressCountry === 'US'
+                  ? 'United States of America'
+                  : application.shipmentAddressCountry ?? undefined
+              }
+            />
+          </Grid>
+          <Field
+            label="Accepts Food Deliveries Mon–Fri?"
+            value={application.acceptFoodDeliveries ? 'Yes' : 'No'}
+          />
+          <Field
+            label="Delivery Window Restrictions"
+            value={application.deliveryWindowInstructions}
+          />
+        </Section>
+
+        <AddressSection
+          title="Mailing Address"
+          line1={application.mailingAddressLine1}
+          line2={application.mailingAddressLine2}
+          city={application.mailingAddressCity}
+          state={application.mailingAddressState}
+          zip={application.mailingAddressZip}
+          country={application.mailingAddressCountry}
+        />
+
+        <Section title="Pantry Details">
+          <Box mb={10}>
+            <Text {...fieldHeaderStyles}>Food Allergies and Restrictions</Text>
+            {application.restrictions?.length ? (
+              <TagGroup values={application.restrictions} />
+            ) : (
+              <Text {...fieldContentStyles}>-</Text>
+            )}
+          </Box>
+
+          <Grid templateColumns="repeat(2, 1fr)" columnGap={6}>
+            <Field
+              label="Approximate # of Clients"
+              value={application.allergenClients}
+            />
+            <Field
+              label="Accepts Refrigerated Donations?"
+              value={application.refrigeratedDonation}
+            />
+            <Field
+              label="Willing to Reserve Food for Allergen-Avoidant Individuals?"
+              value={application.reserveFoodForAllergic}
+            />
+            <Field
+              label="Dedicated Section for Allergy-Friendly Items?"
+              value={application.dedicatedAllergyFriendly ? 'Yes' : 'No'}
+            />
+            <GridItem colSpan={2}>
+              <Field
+                label="Justification"
+                value={application.reservationExplanation}
+              />
+            </GridItem>
+            <Field
+              label="How Often Do Allergen-Avoidant Clients Visit?"
+              value={application.clientVisitFrequency}
+            />
+            <Field
+              label="Confident in Identifying the Top 9 Allergens?"
+              value={application.identifyAllergensConfidence}
+            />
+            <Field
+              label="Serves Allergen-Avoidant Children?"
+              value={application.serveAllergicChildren}
+            />
+          </Grid>
+
+          <Box mb={10}>
+            <Text {...fieldHeaderStyles}>Activities with SSF</Text>
+            {application.activities?.length ? (
+              <TagGroup values={application.activities} />
+            ) : (
+              <Text {...fieldContentStyles}>-</Text>
+            )}
+          </Box>
+
+          <Field
+            label="Comments/Concerns"
+            value={application.activitiesComments}
+          />
+          <Field
+            label="Allergen-free Items in Stock"
+            value={application.itemsInStock}
+          />
+          <Field label="Client Requests" value={application.needMoreOptions} />
+          <Field
+            label="Subscribed to Newsletter"
+            value={
+              application.newsletterSubscription != null
+                ? application.newsletterSubscription
+                  ? 'Yes'
+                  : 'No'
+                : undefined
+            }
+          />
+        </Section>
+      </VStack>
+    );
+  } else {
+    // Editing view
+    return (
+      <VStack align="stretch" gap={2}>
+        <Box mb={4}>
+          <Text {...sectionLabelStyles}>Secondary Point of Contact</Text>
+          <Grid templateColumns="repeat(2, 1fr)" columnGap={6}>
+            <EditField
+              label="First Name"
+              name="secondaryContactFirstName"
+              value={form.secondaryContactFirstName}
+              onChange={(v) => setField('secondaryContactFirstName', v)}
+            />
+            <EditField
+              label="Last Name"
+              name="secondaryContactLastName"
+              value={form.secondaryContactLastName}
+              onChange={(v) => setField('secondaryContactLastName', v)}
+            />
+            <EditField
+              label="Email Address"
+              name="secondaryContactEmail"
+              value={form.secondaryContactEmail}
+              onChange={(v) => setField('secondaryContactEmail', v)}
+            />
+            <Box mb={6}>
+              <Text {...fieldHeaderStyles} mb={2}>
+                Phone Number
+              </Text>
+              <USPhoneInput
+                value={form.secondaryContactPhone}
+                onChange={(v) => setField('secondaryContactPhone', v)}
+                allowEmpty
+                inputProps={{
+                  name: 'secondaryContactPhone',
+                  borderColor: 'neutral.100',
+                  color: 'neutral.600',
+                  size: 'sm',
+                }}
+              />
+            </Box>
+          </Grid>
+        </Box>
+
+        <EditAddressSection
+          title="Shipping Address"
+          prefix="shipment"
+          form={form}
+          onChange={setField}
+          requiredSuffixes={['Line1', 'City', 'State', 'Zip']}
+        />
+
+        <EditRadio
+          label="Would your pantry be able to accept food deliveries during standard business hours Mon-Fri?"
+          name="acceptFoodDeliveries"
+          value={form.acceptFoodDeliveries}
+          options={['Yes', 'No']}
+          onChange={(v) => setField('acceptFoodDeliveries', v)}
+          required
+        />
+
+        <EditField
+          label="Please note any delivery window restrictions."
+          name="deliveryWindowInstructions"
+          value={form.deliveryWindowInstructions}
+          onChange={(v) => setField('deliveryWindowInstructions', v)}
+          textarea
+        />
+
+        <EditAddressSection
+          title="Mailing Address"
+          prefix="mailing"
+          form={form}
+          onChange={setField}
+          requiredSuffixes={['Line1', 'City', 'State', 'Zip']}
+        />
+
+        <Text {...sectionLabelStyles}>Pantry Details</Text>
+
+        <EditSelect
+          label="Approximately how many allergen-avoidant clients does your pantry serve?"
+          name="allergenClients"
+          value={form.allergenClients}
+          options={allergenClientOptions}
+          onChange={(v) => setField('allergenClients', v)}
+          required
+        />
+
+        {form.allergenClients === 'I have an exact number' && (
+          <EditField
+            label="Please provide the exact number, if known"
+            name="allergenClientsExact"
+            value={form.allergenClientsExact}
+            onChange={(v) => setField('allergenClientsExact', v)}
+            required
+          />
+        )}
+
+        <EditMultiSelect
+          label="Which food allergies or other medical dietary restrictions do clients at your pantry report?"
+          value={form.restrictions}
+          options={dietaryRestrictionOptions}
+          onChange={(v) =>
+            setForm((prev) => (prev ? { ...prev, restrictions: v } : prev))
+          }
+          triggerLabel="Select restrictions"
+          required
+        />
+
+        <EditRadio
+          label="Would you be able to accept frozen donations that require refrigeration or freezing?"
+          name="refrigeratedDonation"
+          value={form.refrigeratedDonation}
+          options={Object.values(RefrigeratedDonation)}
+          onChange={(v) => setField('refrigeratedDonation', v)}
+          required
+        />
+
+        <EditRadio
+          label="Do you have a dedicated shelf or section of your pantry for allergy-friendly items?"
+          name="dedicatedAllergyFriendly"
+          value={form.dedicatedAllergyFriendly}
+          options={['Yes', 'No']}
+          onChange={(v) => setField('dedicatedAllergyFriendly', v)}
+          required
+        />
+
+        <EditRadio
+          label="Are you willing to reserve our food shipments for allergen-avoidant individuals?"
+          name="reserveFoodForAllergic"
+          value={form.reserveFoodForAllergic}
+          options={Object.values(ReserveFoodForAllergic)}
+          helperText="For example, grouping allergen-friendly items on a separate shelf or in separate bins and encouraging non-allergic clients to save these items for clients who do not have other safe food options."
+          onChange={(v) => setField('reserveFoodForAllergic', v)}
+          required
+        />
+
+        {(form.reserveFoodForAllergic === ReserveFoodForAllergic.YES ||
+          form.reserveFoodForAllergic === ReserveFoodForAllergic.SOME) && (
+          <EditField
+            label={
+              form.reserveFoodForAllergic === ReserveFoodForAllergic.YES
+                ? 'How would you work to ensure that allergen-friendly foods are distributed to clients with food allergies or other adverse reactions to foods?'
+                : 'Please explain why you selected "Some."'
+            }
+            name="reservationExplanation"
+            value={form.reservationExplanation}
+            onChange={(v) => setField('reservationExplanation', v)}
+            textarea
+            required
+          />
+        )}
+
+        <EditSelect
+          label="How often do allergen-avoidant clients visit your food pantry?"
+          name="clientVisitFrequency"
+          value={form.clientVisitFrequency}
+          options={Object.values(ClientVisitFrequency)}
+          onChange={(v) => setField('clientVisitFrequency', v)}
+        />
+
+        <EditSelect
+          label="Are you confident in identifying the top 9 allergens in an ingredient list?"
+          name="identifyAllergensConfidence"
+          value={form.identifyAllergensConfidence}
+          options={Object.values(AllergensConfidence)}
+          helperText="The top 9 allergens are milk, egg, peanut, tree nuts, wheat, soy, fish, shellfish, and sesame."
+          onChange={(v) => setField('identifyAllergensConfidence', v)}
+        />
+
+        <EditSelect
+          label="Do you serve allergen-avoidant or food-allergic children at your pantry?"
+          name="serveAllergicChildren"
+          value={form.serveAllergicChildren}
+          options={Object.values(ServeAllergicChildren)}
+          helperText='"Children" is defined as any individual under the age of 18 either living independently or as part of a household.'
+          onChange={(v) => setField('serveAllergicChildren', v)}
+        />
+
+        <EditMultiSelect
+          label="What activities are you open to doing with SSF?"
+          value={form.activities}
+          options={Object.values(Activity)}
+          onChange={(v) =>
+            setForm((prev) => (prev ? { ...prev, activities: v } : prev))
+          }
+          triggerLabel="Select activities"
+          helperText="Food donations are one part of being a partner pantry. The following are additional ways to help us better support you! Please select all that apply."
+          required
+        />
+
+        <EditField
+          label="Please list any comments/concerns related to the previous question."
+          name="activitiesComments"
+          value={form.activitiesComments}
+          onChange={(v) => setField('activitiesComments', v)}
+          textarea
+          required={form.activities.includes(Activity.SOMETHING_ELSE)}
+          helperText='If you answered "Something Else," please elaborate.'
+        />
+
+        <EditField
+          label="What types of allergen-free items, if any, do you currently have in stock?"
+          name="itemsInStock"
+          value={form.itemsInStock}
+          onChange={(v) => setField('itemsInStock', v)}
+          textarea
+          required
+          helperText="For example, gluten-free breads, sunflower seed butters, nondairy beverages, etc."
+        />
+
+        <EditField
+          label="Do allergen-avoidant clients at your pantry ever request a greater variety of items or not have enough options? Please explain."
+          name="needMoreOptions"
+          value={form.needMoreOptions}
+          onChange={(v) => setField('needMoreOptions', v)}
+          textarea
+          required
+        />
+
+        <EditRadio
+          label="Would you like to subscribe to our quarterly newsletter?"
+          name="newsletterSubscription"
+          value={form.newsletterSubscription}
+          options={['Yes', 'No']}
+          onChange={(v) => setField('newsletterSubscription', v)}
+        />
+
+        {error && (
+          <Text color="red" fontSize="14px" mb={2}>
+            {error}
+          </Text>
+        )}
+
+        <HStack justify="flex-end" gap={3} mt={6}>
+          <Button
+            variant="outline"
+            size="sm"
+            color="neutral.800"
+            onClick={handleCancel}
+            disabled={isSaving}
+            borderColor="neutral.200"
+            fontWeight={600}
+          >
+            Cancel
+          </Button>
+          <Button
+            color="white"
+            bg="blue.hover"
+            variant="solid"
+            size="sm"
+            px={7}
+            onClick={handleSave}
+            loading={isSaving}
+            fontWeight={600}
+          >
+            Save Changes
+          </Button>
+        </HStack>
+      </VStack>
+    );
+  }
+};
+
+export default EditablePantryApplication;
diff --git a/apps/frontend/src/components/forms/pantryApplicationForm.tsx b/apps/frontend/src/components/forms/pantryApplicationForm.tsx
index c833fe3f6..f580de481 100644
--- a/apps/frontend/src/components/forms/pantryApplicationForm.tsx
+++ b/apps/frontend/src/components/forms/pantryApplicationForm.tsx
@@ -33,13 +33,13 @@ import { TagGroup } from './tagGroup';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../../hooks/alert';
 
-const otherRestrictionsOptions: string[] = [
+export const otherRestrictionsOptions: string[] = [
   'Other allergy (e.g., yeast, sunflower, etc.)',
   'Other allergic illness (e.g., eosinophilic esophagitis, FPIES, oral allergy syndrome)',
   'Other dietary restriction',
 ];
 
-const dietaryRestrictionOptions = [
+export const dietaryRestrictionOptions = [
   'Egg allergy',
   'Fish allergy',
   'Milk allergy',
@@ -57,7 +57,7 @@ const dietaryRestrictionOptions = [
   'Unsure',
 ];
 
-const activityOptions = [
+export const activityOptions = [
   'Create a labeled, allergy-friendly shelf or shelves',
   'Provide clients and staff/volunteers with educational pamphlets',
   "Use a spreadsheet to track clients' medical dietary needs and distribution of SSF items per month",
diff --git a/apps/frontend/src/components/forms/pantryApplicationModal.tsx b/apps/frontend/src/components/forms/pantryApplicationModal.tsx
index 369492227..76e8c85a7 100644
--- a/apps/frontend/src/components/forms/pantryApplicationModal.tsx
+++ b/apps/frontend/src/components/forms/pantryApplicationModal.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { Button, Dialog, Grid, GridItem, Text } from '@chakra-ui/react';
 import { PantryWithUser } from 'types/types';
+import { formatPhone } from '@utils/utils';
 
 interface PantryApplicationModalProps {
   pantry: PantryWithUser;
@@ -46,7 +47,7 @@ const PantryApplicationModal: React.FC<PantryApplicationModalProps> = ({
                 <GridItem>
                   <Text fontWeight="bold">Phone</Text>
                 </GridItem>
-                <GridItem>{pantryUser.phone}</GridItem>
+                <GridItem>{formatPhone(pantryUser.phone)}</GridItem>
               </Grid>
             ) : (
               <Text>No user details available.</Text>
diff --git a/apps/frontend/src/components/forms/profileAccountInfo.tsx b/apps/frontend/src/components/forms/profileAccountInfo.tsx
index d842367e2..60f45107f 100644
--- a/apps/frontend/src/components/forms/profileAccountInfo.tsx
+++ b/apps/frontend/src/components/forms/profileAccountInfo.tsx
@@ -9,7 +9,10 @@ import {
   Tabs,
 } from '@chakra-ui/react';
 import { Pencil } from 'lucide-react';
-import { UpdateProfileFields, User } from 'types/types';
+import { Role, UpdateProfileFields, User } from '../../types/types';
+import { formatPhone } from '@utils/utils';
+import EditablePantryApplication from '@components/forms/editablePantryApplication';
+import EditableFMApplication from '@components/forms/editableFMApplication';
 
 interface ProfileAccountInfoProps {
   profile: User;
@@ -21,10 +24,12 @@ type ProfileFieldProps =
   | {
       label: string;
       value: string;
+      displayValue?: string;
     }
   | {
       label: string;
       value: string;
+      displayValue?: string;
       name: string;
       isEditing: boolean;
       onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
@@ -51,10 +56,11 @@ const ProfileField: React.FC<ProfileFieldProps> = (props) => (
         borderRadius="md"
         width="3/4"
         color="neutral.600"
+        borderColor="neutral.100"
       />
     ) : (
       <Text color="neutral.800" textStyle="p2">
-        {props.value}
+        {props.displayValue ?? props.value}
       </Text>
     )}
   </Box>
@@ -66,10 +72,22 @@ const ProfileAccountInfo: React.FC<ProfileAccountInfoProps> = ({
   onSave,
 }) => {
   const { firstName, lastName, email, phone } = profile;
+  const [activeTab, setActiveTab] = useState('Account');
   const [isEditing, setIsEditing] = useState(false);
+  const [isEditingApplication, setIsEditingApplication] = useState(false);
   const [isSaving, setIsSaving] = useState(false);
   const [form, setForm] = useState({ firstName, lastName, phone });
 
+  const isCurrentlyEditing =
+    activeTab === 'Account' ? isEditing : isEditingApplication;
+  const toggleCurrentEditing = () => {
+    if (activeTab === 'Account') {
+      setIsEditing((e) => !e);
+    } else {
+      setIsEditingApplication((e) => !e);
+    }
+  };
+
   useEffect(() => {
     setForm({ firstName, lastName, phone });
   }, [firstName, lastName, phone]);
@@ -108,11 +126,11 @@ const ProfileAccountInfo: React.FC<ProfileAccountInfoProps> = ({
       cursor="pointer"
       pb={2}
       _hover={{ color: 'neutral.900' }}
-      onClick={() => setIsEditing((e) => !e)}
+      onClick={toggleCurrentEditing}
     >
       <Pencil size={14} />
       <Text fontWeight={600} fontFamily="ibm">
-        {isEditing ? 'Editing' : 'Edit'}
+        {isCurrentlyEditing ? 'Editing' : 'Edit'}
       </Text>
     </HStack>
   );
@@ -139,6 +157,7 @@ const ProfileAccountInfo: React.FC<ProfileAccountInfoProps> = ({
           label="Phone Number"
           name="phone"
           value={form.phone}
+          displayValue={formatPhone(form.phone) ?? form.phone}
           isEditing={isEditing}
           onChange={handleChange}
         />
@@ -176,7 +195,12 @@ const ProfileAccountInfo: React.FC<ProfileAccountInfoProps> = ({
 
   if (showTabs) {
     return (
-      <Tabs.Root defaultValue="Account" variant="line" mx={2}>
+      <Tabs.Root
+        defaultValue="Account"
+        variant="line"
+        mx={2}
+        onValueChange={(e: { value: string }) => setActiveTab(e.value)}
+      >
         <HStack justify="space-between" mb={8}>
           <Tabs.List>
             <Tabs.Trigger
@@ -205,10 +229,17 @@ const ProfileAccountInfo: React.FC<ProfileAccountInfoProps> = ({
 
         <Tabs.Content value="Account">{fields}</Tabs.Content>
         <Tabs.Content value="Application">
-          {/* TODO: add application tab content */}
-          <Box color="neutral.700" fontSize="sm">
-            Application details coming soon.
-          </Box>
+          {profile.role === Role.FOODMANUFACTURER ? (
+            <EditableFMApplication
+              isEditing={isEditingApplication}
+              onEditingChange={setIsEditingApplication}
+            />
+          ) : (
+            <EditablePantryApplication
+              isEditing={isEditingApplication}
+              onEditingChange={setIsEditingApplication}
+            />
+          )}
         </Tabs.Content>
       </Tabs.Root>
     );
diff --git a/apps/frontend/src/components/forms/profileLeftPanel.tsx b/apps/frontend/src/components/forms/profileLeftPanel.tsx
index be89cc5a9..bbaa830a9 100644
--- a/apps/frontend/src/components/forms/profileLeftPanel.tsx
+++ b/apps/frontend/src/components/forms/profileLeftPanel.tsx
@@ -22,7 +22,7 @@ const ProfileLeftPanel: React.FC<ProfileLeftPanelProps> = ({
   const [alertState, setAlertMessage] = useAlert();
 
   return (
-    <VStack alignItems="center" mt={8} mb={6} p={10}>
+    <VStack alignItems="center" mt="2vw" mb="1.5vw" p="2.5vw">
       {alertState && (
         <FloatingAlert
           key={alertState.id}
@@ -32,16 +32,16 @@ const ProfileLeftPanel: React.FC<ProfileLeftPanelProps> = ({
         />
       )}
       <Box
-        w={24}
-        h={24}
+        w="6vw"
+        h="6vw"
         borderRadius="full"
         bg={avatarBg}
         display="flex"
         alignItems="center"
         justifyContent="center"
-        mb={4}
+        mb="1vw"
       >
-        <Text color="neutral.50" fontSize="32px">
+        <Text color="neutral.50" fontSize="2vw">
           {initials}
         </Text>
       </Box>
@@ -50,27 +50,36 @@ const ProfileLeftPanel: React.FC<ProfileLeftPanelProps> = ({
         <Text
           fontFamily="ibm"
           fontWeight="semibold"
-          fontSize="20px"
+          fontSize="1.25vw"
           textAlign="center"
           mb={0}
         >
           {name}
         </Text>
 
-        <Text textStyle="p2" textAlign="center">
+        <Text
+          fontFamily="inter"
+          fontWeight="400"
+          fontSize="1vw"
+          textAlign="center"
+        >
           {roleLabel}
         </Text>
       </VStack>
 
       <Button
-        mt={24}
-        px={8}
+        mt="6vw"
+        style={{
+          padding: '0.5vw 2vw',
+          fontSize: '0.875vw',
+          height: 'auto',
+          minHeight: 'auto',
+        }}
         bg="red"
-        size="sm"
         color="white.core"
         onClick={onOpen}
       >
-        <LockKeyhole />
+        <LockKeyhole style={{ width: '1vw', height: '1vw' }} />
         Change Password
       </Button>
 
diff --git a/apps/frontend/src/components/forms/tagGroup.tsx b/apps/frontend/src/components/forms/tagGroup.tsx
index cd3f10227..bde9121a0 100644
--- a/apps/frontend/src/components/forms/tagGroup.tsx
+++ b/apps/frontend/src/components/forms/tagGroup.tsx
@@ -26,11 +26,12 @@ export const TagGroup: React.FC<TagGroupProps> = ({
           fontWeight={blueVariant ? 400 : 500}
           color="neutral.800"
         >
-          <Tag.Label>{value}</Tag.Label>
+          <Tag.Label color="neutral.800">{value}</Tag.Label>
           {onRemove && (
             <Tag.EndElement ml={4}>
               <Tag.CloseTrigger
                 onClick={() => onRemove(value)}
+                color="neutral.800"
                 style={{ cursor: 'pointer' }}
               />
             </Tag.EndElement>
diff --git a/apps/frontend/src/containers/pantryDashboard.tsx b/apps/frontend/src/containers/pantryDashboard.tsx
index 37aa458dc..95595aa6b 100644
--- a/apps/frontend/src/containers/pantryDashboard.tsx
+++ b/apps/frontend/src/containers/pantryDashboard.tsx
@@ -13,6 +13,7 @@ import {
 import { MenuIcon } from 'lucide-react';
 import React, { useEffect, useState } from 'react';
 import { PantryWithUser } from 'types/types';
+import { formatPhone } from '@utils/utils';
 import ApiClient from '@api/apiClient';
 
 const PantryDashboard: React.FC = () => {
@@ -125,7 +126,7 @@ const PantryDashboard: React.FC = () => {
             Name: {pantry?.pantryUser?.firstName} {pantry?.pantryUser?.lastName}
           </Text>
           <Text>Email: {pantry?.pantryUser?.email}</Text>
-          <Text>Phone: {pantry?.pantryUser?.phone}</Text>
+          <Text>Phone: {formatPhone(pantry?.pantryUser?.phone)}</Text>
         </CardBody>
       </Card.Root>
 
diff --git a/apps/frontend/src/containers/profilePage.tsx b/apps/frontend/src/containers/profilePage.tsx
index 5fea648bd..2079f7167 100644
--- a/apps/frontend/src/containers/profilePage.tsx
+++ b/apps/frontend/src/containers/profilePage.tsx
@@ -18,6 +18,7 @@ const ROLE_CONFIG: Record<Role, { label: string; avatarBg: string }> = {
 
 const ProfilePage: React.FC = () => {
   const [profile, setProfile] = useState<User | null>(null);
+  const [orgName, setOrgName] = useState<string | null>(null);
   const [isLoading, setIsLoading] = useState(true);
   const [alertState, setAlertMessage] = useAlert();
 
@@ -26,6 +27,24 @@ const ProfilePage: React.FC = () => {
       try {
         const user: User = await ApiClient.getMe();
         setProfile(user);
+        if (user.role === Role.PANTRY) {
+          try {
+            const pantryId = await ApiClient.getCurrentUserPantryId();
+            const pantry = await ApiClient.getPantry(pantryId);
+            setOrgName(pantry.pantryName);
+          } catch {
+            setAlertMessage('Failed to fetch pantry data.');
+          }
+        } else if (user.role === Role.FOODMANUFACTURER) {
+          try {
+            const foodManufacturerId =
+              await ApiClient.getCurrentUserFoodManufacturerId();
+            const fm = await ApiClient.getFoodManufacturer(foodManufacturerId);
+            setOrgName(fm.foodManufacturerName);
+          } catch {
+            setAlertMessage('Failed to fetch food manufacturer data.');
+          }
+        }
       } catch {
         setAlertMessage('Authentication error. Please log in and try again.');
       } finally {
@@ -106,9 +125,9 @@ const ProfilePage: React.FC = () => {
         w="100%"
         bg="neutral.50"
       >
-        <Box flexShrink={0}>
+        <Box minW={0} flexShrink={1}>
           <ProfileLeftPanel
-            name={`${firstName} ${lastName}`}
+            name={orgName ?? `${firstName} ${lastName}`}
             roleLabel={config.label}
             initials={getInitials(firstName, lastName)}
             avatarBg={config.avatarBg}
diff --git a/apps/frontend/src/types/types.ts b/apps/frontend/src/types/types.ts
index b8755fd04..20318879c 100644
--- a/apps/frontend/src/types/types.ts
+++ b/apps/frontend/src/types/types.ts
@@ -105,6 +105,41 @@ export interface PantryApplicationDto {
   newsletterSubscription?: string;
 }
 
+export interface UpdatePantryApplicationDto {
+  secondaryContactFirstName?: string;
+  secondaryContactLastName?: string;
+  secondaryContactEmail?: string;
+  secondaryContactPhone?: string;
+  shipmentAddressLine1?: string;
+  shipmentAddressLine2?: string;
+  shipmentAddressCity?: string;
+  shipmentAddressState?: string;
+  shipmentAddressZip?: string;
+  shipmentAddressCountry?: string;
+  mailingAddressLine1?: string;
+  mailingAddressLine2?: string;
+  mailingAddressCity?: string;
+  mailingAddressState?: string;
+  mailingAddressZip?: string;
+  mailingAddressCountry?: string;
+  acceptFoodDeliveries?: boolean;
+  deliveryWindowInstructions?: string;
+  allergenClients?: string;
+  restrictions?: string[];
+  refrigeratedDonation?: RefrigeratedDonation;
+  dedicatedAllergyFriendly?: boolean;
+  reserveFoodForAllergic?: ReserveFoodForAllergic;
+  reservationExplanation?: string | null;
+  clientVisitFrequency?: ClientVisitFrequency;
+  identifyAllergensConfidence?: AllergensConfidence;
+  serveAllergicChildren?: ServeAllergicChildren;
+  activities?: Activity[];
+  activitiesComments?: string;
+  itemsInStock?: string;
+  needMoreOptions?: string;
+  newsletterSubscription?: boolean;
+}
+
 export enum DonationStatus {
   MATCHED = 'matched',
   AVAILABLE = 'available',
@@ -345,6 +380,25 @@ export interface FoodManufacturerWithoutRelations {
   dateApplied: string;
 }
 
+export interface UpdateFoodManufacturerApplicationDto {
+  secondaryContactFirstName?: string;
+  secondaryContactLastName?: string;
+  secondaryContactEmail?: string;
+  secondaryContactPhone?: string;
+  foodManufacturerName?: string;
+  foodManufacturerWebsite?: string;
+  unlistedProductAllergens?: Allergen[];
+  facilityFreeAllergens?: Allergen[];
+  productsGlutenFree?: boolean;
+  productsContainSulfites?: boolean;
+  productsSustainableExplanation?: string;
+  inKindDonations?: boolean;
+  donateWastedFood?: DonateWastedFood;
+  manufacturerAttribute?: ManufacturerAttribute;
+  additionalComments?: string;
+  newsletterSubscription?: boolean;
+}
+
 export interface ManufacturerApplicationDto {
   foodManufacturerName: string;
   foodManufacturerWebsite: string;
diff --git a/apps/frontend/src/utils/utils.ts b/apps/frontend/src/utils/utils.ts
index 29491e6c1..4fa59c2b5 100644
--- a/apps/frontend/src/utils/utils.ts
+++ b/apps/frontend/src/utils/utils.ts
@@ -26,7 +26,8 @@ export const DONATION_STATUS_COLORS: Record<DonationStatus, [string, string]> =
 
 export const formatPhone = (phone?: string | null) => {
   if (!phone) return null;
-  const digits = phone.replace(/\D/g, '');
+  let digits = phone.replace(/\D/g, '');
+  if (digits.length === 11 && digits.startsWith('1')) digits = digits.slice(1);
   if (digits.length === 10) {
     return `${digits.slice(0, 3)}-${digits.slice(3, 6)}-${digits.slice(6)}`;
   }