diff --git a/backend/src/util/mapping/Mappings.js b/backend/src/util/mapping/Mappings.js
index a0ad7de9..36a8d5f9 100644
--- a/backend/src/util/mapping/Mappings.js
+++ b/backend/src/util/mapping/Mappings.js
@@ -187,6 +187,9 @@ const ApplicationMappings = [
   { back: 'ofm_gt_2mliability_insurance_coverage', front: 'liabilityInsuranceCoverage' },
   { back: 'ofm_economic_analysis_participation', front: 'economicAnalysisParticipation' },
   { back: 'ofm_operate_separate_bank_account', front: 'operateSeparateBankAccount' },
+  { back: 'ofm_month_to_month', front: 'monthToMonthRentLease' },
+  { back: 'ofm_costs_lease_start_date', front: 'rentLeaseStartDate' },
+  { back: 'ofm_costs_lease_end_date', front: 'rentLeaseEndDate' },
 ]
 
 const ApplicationProviderEmployeeMappings = [
diff --git a/frontend/src/components/applications/RentLeaseInformation.vue b/frontend/src/components/applications/RentLeaseInformation.vue
new file mode 100644
index 00000000..bf599402
--- /dev/null
+++ b/frontend/src/components/applications/RentLeaseInformation.vue
@@ -0,0 +1,103 @@
+<template>
+  <v-card class="my-4 px-6 pt-4 pb-6">
+    <h4>Rent/Lease Information</h4>
+    <p class="mt-2 mb-4">Please select the start and end date of your facility's rental or lease agreement.</p>
+    <v-card variant="outlined" class="pa-2">
+      <v-row no-gutters class="px-2">
+        <AppLabel class="pt-8">Rent/Lease Date Range:</AppLabel>
+        <v-row no-gutters class="mt-4">
+          <AppDateInput
+            id="start-date"
+            v-model="model.rentLeaseStartDate"
+            :rules="isMonthToMonthRentLease ? [] : [...rules.required, rules.MMDDYYYY]"
+            :disabled="readonly"
+            :hide-details="readonly || isMonthToMonthRentLease"
+            label="Start"
+            class="mx-3" />
+          <AppDateInput
+            id="end-date"
+            v-model="model.rentLeaseEndDate"
+            :rules="isMonthToMonthRentLease ? [] : [...rules.required, rules.MMDDYYYY, rules.validEndDate(model.rentLeaseStartDate)]"
+            :disabled="readonly"
+            :hide-details="readonly || isMonthToMonthRentLease"
+            label="End"
+            class="mx-3 mt-4 mt-sm-0" />
+        </v-row>
+      </v-row>
+      <v-checkbox
+        id="month-to-month-rent"
+        v-model="model.monthToMonthRentLease"
+        color="primary"
+        :true-value="YES_NO_CRM_MAPPING.YES"
+        :false-value="YES_NO_CRM_MAPPING.NO"
+        :disabled="readonly"
+        hide-details
+        class="mt-6">
+        <template #label>My facility's rent/lease is on a month-to-month basis.</template>
+      </v-checkbox>
+      <div id="arm-length" class="d-flex mt-2">
+        <v-checkbox v-model="model.armsLength" color="primary" :true-value="YES_NO_CHOICE_CRM_MAPPING.YES" :rules="rules.required" :disabled="readonly" :hide-details="readonly">
+          <template #label>I attest that the rent/lease agreement is at Arm's Length.</template>
+        </v-checkbox>
+        <v-tooltip content-class="tooltip" max-width="300px" text="Third-parties dealing with each other at arm's length are independent and unrelated to each other.">
+          <template #activator="{ props }">
+            <v-icon size="large" v-bind="props" class="ml-2 pt-7">mdi-information-slab-circle-outline</v-icon>
+          </template>
+        </v-tooltip>
+      </div>
+    </v-card>
+  </v-card>
+</template>
+
+<script>
+import AppDateInput from '@/components/ui/AppDateInput.vue'
+import AppLabel from '@/components/ui/AppLabel.vue'
+import { useApplicationsStore } from '@/stores/applications'
+import { mapState } from 'pinia'
+import rules from '@/utils/rules'
+import { YES_NO_CHOICE_CRM_MAPPING, YES_NO_CRM_MAPPING } from '@/utils/constants'
+
+export default {
+  components: { AppDateInput, AppLabel },
+  props: {
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  emits: ['update'],
+  data() {
+    return {
+      model: {},
+    }
+  },
+  computed: {
+    ...mapState(useApplicationsStore, ['currentApplication']),
+    isMonthToMonthRentLease() {
+      return this.model.monthToMonthRentLease === YES_NO_CRM_MAPPING.YES
+    },
+  },
+  watch: {
+    model: {
+      handler() {
+        this.model.rentLeaseStartDate = this.model.rentLeaseStartDate ? this.model.rentLeaseStartDate : null
+        this.model.rentLeaseEndDate = this.model.rentLeaseEndDate && this.model.rentLeaseEndDate > this.model.rentLeaseStartDate ? this.model.rentLeaseEndDate : null
+        this.model.armsLength = this.model.armsLength ? this.model.armsLength : null
+        this.$emit('update', this.model)
+      },
+      deep: true,
+    },
+  },
+  created() {
+    this.rules = rules
+    this.YES_NO_CHOICE_CRM_MAPPING = YES_NO_CHOICE_CRM_MAPPING
+    this.YES_NO_CRM_MAPPING = YES_NO_CRM_MAPPING
+    this.model = {
+      rentLeaseStartDate: this.currentApplication?.rentLeaseStartDate,
+      rentLeaseEndDate: this.currentApplication?.rentLeaseEndDate,
+      monthToMonthRentLease: this.currentApplication?.monthToMonthRentLease,
+      armsLength: this.currentApplication?.armsLength,
+    }
+  },
+}
+</script>
diff --git a/frontend/src/components/applications/YearlyFacilityCost.vue b/frontend/src/components/applications/YearlyFacilityCost.vue
index 63e06c05..ad18532b 100644
--- a/frontend/src/components/applications/YearlyFacilityCost.vue
+++ b/frontend/src/components/applications/YearlyFacilityCost.vue
@@ -1,15 +1,15 @@
 <template>
   <v-container fluid class="pa-0 my-8">
-    <AppLabel>Yearly Facility Cost</AppLabel>
+    <h4>Yearly Facility Cost</h4>
     <v-card class="my-2" variant="outlined">
       <!-- RENT/LEASE -->
       <v-row v-if="facilityType === FACILITY_TYPES.RENT_LEASE" no-gutters class="pt-4">
         <v-col cols="12" lg="6" class="px-4">
           <v-row no-gutters>
-            <v-col cols="6" xl="5" class="pt-2">
+            <v-col cols="12" sm="7" class="pt-2">
               <p>Rent/Lease</p>
             </v-col>
-            <v-col cols="6" xl="7" align="center" class="px-2">
+            <v-col cols="12" sm="5" align="center" class="px-sm-2">
               <AppNumberInput v-model.lazy="model.rentLeaseCost" :format="fieldNumberFormat" :disabled="readonly" prefix="$" maxlength="12" :rules="[rules.max(5000000)]"></AppNumberInput>
             </v-col>
           </v-row>
@@ -20,30 +20,30 @@
       <v-row v-if="facilityType === FACILITY_TYPES.OWNED_WITH_MORTGAGE" no-gutters class="mt-2 pt-2">
         <v-col cols="12" lg="6" class="px-4">
           <v-row no-gutters>
-            <v-col cols="6" xl="5" class="pt-2">
+            <v-col cols="12" sm="7" class="pt-2">
               <p>Mortgage</p>
             </v-col>
-            <v-col cols="6" xl="7" align="center" class="px-2">
+            <v-col cols="12" sm="5" align="center" class="px-sm-2">
               <AppNumberInput v-model.lazy="model.mortgageCost" :format="fieldNumberFormat" :disabled="readonly" prefix="$" maxlength="12" :rules="[rules.max(5000000)]"></AppNumberInput>
             </v-col>
           </v-row>
         </v-col>
         <v-col cols="12" lg="6" class="px-4">
           <v-row no-gutters>
-            <v-col cols="6" xl="5" class="pt-2">
+            <v-col cols="12" sm="7" class="pt-2">
               <p>Property/Municipal Tax</p>
             </v-col>
-            <v-col cols="6" xl="7" align="center" class="px-2">
+            <v-col cols="12" sm="5" align="center" class="px-sm-2">
               <AppNumberInput v-model.lazy="model.propertyTax" :format="fieldNumberFormat" :disabled="readonly" prefix="$" maxlength="12" :rules="[rules.max(5000000)]"></AppNumberInput>
             </v-col>
           </v-row>
         </v-col>
         <v-col cols="12" lg="6" class="px-4">
           <v-row no-gutters>
-            <v-col cols="6" xl="5" class="pt-2">
+            <v-col cols="12" sm="7" class="pt-2">
               <p>Strata Fees</p>
             </v-col>
-            <v-col cols="6" xl="7" align="center" class="px-2">
+            <v-col cols="12" sm="5" align="center" class="px-sm-2">
               <AppNumberInput v-model.lazy="model.strataFee" :format="fieldNumberFormat" :disabled="readonly" prefix="$" maxlength="12" :rules="[rules.max(5000000)]"></AppNumberInput>
             </v-col>
           </v-row>
@@ -54,20 +54,20 @@
       <v-row v-if="facilityType === FACILITY_TYPES.OWNED_WITHOUT_MORTGAGE" no-gutters class="mt-2 pt-2">
         <v-col cols="12" lg="6" class="px-4">
           <v-row no-gutters>
-            <v-col cols="6" xl="5" class="pt-2">
+            <v-col cols="12" sm="7" class="pt-2">
               <p>Property/Municipal Tax</p>
             </v-col>
-            <v-col cols="6" xl="7" align="center" class="px-2">
+            <v-col cols="12" sm="5" align="center" class="px-sm-2">
               <AppNumberInput v-model.lazy="model.propertyTax" :format="fieldNumberFormat" :disabled="readonly" prefix="$" maxlength="12" :rules="[rules.max(5000000)]"></AppNumberInput>
             </v-col>
           </v-row>
         </v-col>
         <v-col cols="12" lg="6" class="px-4">
           <v-row no-gutters>
-            <v-col cols="6" xl="5" class="pt-2">
+            <v-col cols="12" sm="7" class="pt-2">
               <p>Strata Fees</p>
             </v-col>
-            <v-col cols="6" xl="7" align="center" class="px-2">
+            <v-col cols="12" sm="5" align="center" class="px-sm-2">
               <AppNumberInput v-model.lazy="model.strataFee" :format="fieldNumberFormat" :disabled="readonly" prefix="$" maxlength="12" :rules="[rules.max(5000000)]"></AppNumberInput>
             </v-col>
           </v-row>
@@ -78,30 +78,30 @@
       <v-row v-if="facilityType === FACILITY_TYPES.PROVIDED_FREE_OF_CHARGE" no-gutters class="mt-2 pt-2">
         <v-col cols="12" lg="6" class="px-4">
           <v-row no-gutters>
-            <v-col cols="6" xl="5" class="pt-2">
+            <v-col cols="12" sm="7" class="pt-2">
               <p>Fee (If Applicable)</p>
             </v-col>
-            <v-col cols="6" xl="7" align="center" class="px-2">
+            <v-col cols="12" sm="5" align="center" class="px-sm-2">
               <AppNumberInput v-model.lazy="model.applicableFee" :format="fieldNumberFormat" :disabled="readonly" prefix="$" maxlength="12" :rules="[rules.max(5000000)]"></AppNumberInput>
             </v-col>
           </v-row>
         </v-col>
         <v-col cols="12" lg="6" class="px-4">
           <v-row no-gutters>
-            <v-col cols="6" xl="5" class="pt-2">
+            <v-col cols="12" sm="7" class="pt-2">
               <p>Property/Municipal Tax</p>
             </v-col>
-            <v-col cols="6" xl="7" align="center" class="px-2">
+            <v-col cols="12" sm="5" align="center" class="px-sm-2">
               <AppNumberInput v-model.lazy="model.propertyTax" :format="fieldNumberFormat" :disabled="readonly" prefix="$" maxlength="12" :rules="[rules.max(5000000)]"></AppNumberInput>
             </v-col>
           </v-row>
         </v-col>
         <v-col cols="12" lg="6" class="px-4">
           <v-row no-gutters>
-            <v-col cols="6" xl="5" class="pt-2">
+            <v-col cols="12" sm="7" class="pt-2">
               <p>Strata Fees</p>
             </v-col>
-            <v-col cols="6" xl="7" align="center" class="px-2">
+            <v-col cols="12" sm="5" align="center" class="px-sm-2">
               <AppNumberInput v-model.lazy="model.strataFee" :format="fieldNumberFormat" :disabled="readonly" prefix="$" maxlength="12" :rules="[rules.max(5000000)]"></AppNumberInput>
             </v-col>
           </v-row>
@@ -111,10 +111,10 @@
       <v-row no-gutters class="mt-2">
         <v-col cols="12" lg="6" class="px-4">
           <v-row no-gutters>
-            <v-col cols="6" xl="5" class="pt-2">
+            <v-col cols="12" sm="7" class="pt-2">
               <AppLabel>Total Yearly Costs</AppLabel>
             </v-col>
-            <v-col cols="6" xl="7" class="pl-6">
+            <v-col cols="12" sm="5" class="pl-sm-6">
               <AppNumberInput :value="totalYearlyCost" :format="totalNumberFormat" variant="plain" readonly class="totalYearlyCost"></AppNumberInput>
             </v-col>
           </v-row>
diff --git a/frontend/src/components/applications/YearlyOperatingCost.vue b/frontend/src/components/applications/YearlyOperatingCost.vue
index be37630f..3639cc9b 100644
--- a/frontend/src/components/applications/YearlyOperatingCost.vue
+++ b/frontend/src/components/applications/YearlyOperatingCost.vue
@@ -1,38 +1,38 @@
 <template>
   <v-container fluid class="pa-0">
-    <AppLabel>Yearly Operating Cost</AppLabel>
+    <h4>Yearly Operating Cost</h4>
     <v-card class="my-2" variant="outlined">
       <v-row no-gutters class="mt-2 pt-2">
         <v-col cols="12" lg="6" class="px-4">
           <v-row no-gutters>
-            <v-col cols="6" xl="5" class="pt-2">
+            <v-col cols="12" sm="7" class="pt-2">
               <p>
-                Insurance
-                <v-tooltip content-class="tooltip" text="Costs directly related to labour costs, property insurance, utilities and garbage disposal." max-width="300px">
-                  <template v-slot:activator="{ props }">
+                Maintenance and Minor Repairs
+                <v-tooltip content-class="tooltip" text="Costs directly related to third-party labour costs, property insurance, utilities and garbage disposal." max-width="300px">
+                  <template #activator="{ props }">
                     <v-icon size="large" v-bind="props">mdi-information-slab-circle-outline</v-icon>
                   </template>
                 </v-tooltip>
               </p>
             </v-col>
-            <v-col cols="6" xl="7" align="center" class="px-2">
+            <v-col cols="12" sm="5" align="center" class="px-sm-2">
               <AppNumberInput v-model.lazy="model.insuranceCost" :format="fieldNumberFormat" :disabled="readonly" prefix="$" maxlength="12" :rules="[rules.max(5000000)]"></AppNumberInput>
             </v-col>
           </v-row>
         </v-col>
         <v-col cols="12" lg="6" class="px-4">
           <v-row no-gutters>
-            <v-col cols="6" xl="5" class="pt-2">
+            <v-col cols="12" sm="7" class="pt-2">
               <p>
-                Upkeep and Labour
+                Upkeep
                 <v-tooltip content-class="tooltip" text="Costs may include garbage removal, recycling charges, applicable supplies." max-width="300px">
-                  <template v-slot:activator="{ props }">
+                  <template #activator="{ props }">
                     <v-icon size="large" v-bind="props">mdi-information-slab-circle-outline</v-icon>
                   </template>
                 </v-tooltip>
               </p>
             </v-col>
-            <v-col cols="6" xl="7" align="center" class="px-2">
+            <v-col cols="12" sm="5" align="center" class="px-sm-2">
               <AppNumberInput v-model.lazy="model.upkeepLabourCost" :format="fieldNumberFormat" :disabled="readonly" prefix="$" maxlength="12" :rules="[rules.max(5000000)]"></AppNumberInput>
             </v-col>
           </v-row>
@@ -41,34 +41,34 @@
       <v-row no-gutters class="mt-2">
         <v-col cols="12" lg="6" class="px-4">
           <v-row no-gutters>
-            <v-col cols="6" xl="5" class="pt-2">
+            <v-col cols="12" sm="7" class="pt-2">
               <p>
-                Utilities
-                <v-tooltip content-class="tooltip" text="Costs may include gas, electricity, water, phone, internet." max-width="300px">
-                  <template v-slot:activator="{ props }">
+                Office Furniture and Equipment
+                <v-tooltip content-class="tooltip" text="Costs may include laptops, tablets, cell phones used for the operation of the business, desks, chairs, tables." max-width="300px">
+                  <template #activator="{ props }">
                     <v-icon size="large" v-bind="props">mdi-information-slab-circle-outline</v-icon>
                   </template>
                 </v-tooltip>
               </p>
             </v-col>
-            <v-col cols="6" xl="7" align="center" class="px-2">
-              <AppNumberInput v-model.lazy="model.utilitiesCost" :format="fieldNumberFormat" :disabled="readonly" prefix="$" maxlength="12" :rules="[rules.max(5000000)]"></AppNumberInput>
+            <v-col cols="12" sm="5" align="center" class="px-sm-2">
+              <AppNumberInput v-model.lazy="model.furnitureEquipmentsCost" :format="fieldNumberFormat" :disabled="readonly" prefix="$" maxlength="12" :rules="[rules.max(5000000)]"></AppNumberInput>
             </v-col>
           </v-row>
         </v-col>
         <v-col cols="12" lg="6" class="px-4">
           <v-row no-gutters>
-            <v-col cols="6" xl="5" class="pt-2">
+            <v-col cols="12" sm="7" class="pt-2">
               <p>
-                Maintenance and Repairs
+                Facility Maintenance and Minor Improvements
                 <v-tooltip content-class="tooltip" text="Costs may include repairs, appliance/furniture replacement, snow removal." max-width="300px">
-                  <template v-slot:activator="{ props }">
+                  <template #activator="{ props }">
                     <v-icon size="large" v-bind="props">mdi-information-slab-circle-outline</v-icon>
                   </template>
                 </v-tooltip>
               </p>
             </v-col>
-            <v-col cols="6" xl="7" align="center" class="px-2">
+            <v-col cols="12" sm="5" align="center" class="px-sm-2">
               <AppNumberInput v-model.lazy="model.maintenanceRepairsCost" :format="fieldNumberFormat" :disabled="readonly" prefix="$" maxlength="12" :rules="[rules.max(5000000)]"></AppNumberInput>
             </v-col>
           </v-row>
@@ -77,35 +77,35 @@
       <v-row no-gutters class="mt-2">
         <v-col cols="12" lg="6" class="px-4">
           <v-row no-gutters>
-            <v-col cols="6" xl="5" class="pt-2">
+            <v-col cols="12" sm="7" class="pt-2">
               <p>
-                Furniture and Equipment
-                <v-tooltip content-class="tooltip" text="Costs may include laptops, tablets, cell phones used for the operation of the business, desks, chairs, tables." max-width="300px">
-                  <template v-slot:activator="{ props }">
+                Janitorial Services
+                <v-tooltip content-class="tooltip" text="Provided by arm's length third party." max-width="300px">
+                  <template #activator="{ props }">
                     <v-icon size="large" v-bind="props">mdi-information-slab-circle-outline</v-icon>
                   </template>
                 </v-tooltip>
               </p>
             </v-col>
-            <v-col cols="6" xl="7" align="center" class="px-2">
-              <AppNumberInput v-model.lazy="model.furnitureEquipmentsCost" :format="fieldNumberFormat" :disabled="readonly" prefix="$" maxlength="12" :rules="[rules.max(5000000)]"></AppNumberInput>
+            <v-col cols="12" sm="5" align="center" class="px-sm-2">
+              <AppNumberInput v-model.lazy="model.suppliesCost" :format="fieldNumberFormat" :disabled="readonly" prefix="$" maxlength="12" :rules="[rules.max(5000000)]"></AppNumberInput>
             </v-col>
           </v-row>
         </v-col>
         <v-col cols="12" lg="6" class="px-4">
           <v-row no-gutters>
-            <v-col cols="6" xl="5" class="pt-2">
+            <v-col cols="12" sm="7" class="pt-2">
               <p>
-                Supplies
-                <v-tooltip content-class="tooltip" text="Provided by arm’s length third party." max-width="300px">
-                  <template v-slot:activator="{ props }">
+                Utilities
+                <v-tooltip content-class="tooltip" text="Costs may include gas, electricity, water, phone, internet." max-width="300px">
+                  <template #activator="{ props }">
                     <v-icon size="large" v-bind="props">mdi-information-slab-circle-outline</v-icon>
                   </template>
                 </v-tooltip>
               </p>
             </v-col>
-            <v-col cols="6" xl="7" align="center" class="px-2">
-              <AppNumberInput v-model.lazy="model.suppliesCost" :format="fieldNumberFormat" :disabled="readonly" prefix="$" maxlength="12" :rules="[rules.max(5000000)]"></AppNumberInput>
+            <v-col cols="12" sm="5" align="center" class="px-sm-2">
+              <AppNumberInput v-model.lazy="model.utilitiesCost" :format="fieldNumberFormat" :disabled="readonly" prefix="$" maxlength="12" :rules="[rules.max(5000000)]"></AppNumberInput>
             </v-col>
           </v-row>
         </v-col>
@@ -113,10 +113,10 @@
       <v-row no-gutters class="mt-2">
         <v-col cols="12" lg="6" class="px-4">
           <v-row no-gutters>
-            <v-col cols="6" xl="5" class="pt-2">
+            <v-col cols="12" sm="7" class="pt-2">
               <AppLabel>Total Yearly Costs</AppLabel>
             </v-col>
-            <v-col cols="6" xl="7" class="pl-6">
+            <v-col cols="12" sm="5" class="pl-sm-6">
               <AppNumberInput :value="totalYearlyCost" :format="totalNumberFormat" variant="plain" readonly class="totalYearlyCost"></AppNumberInput>
             </v-col>
           </v-row>
diff --git a/frontend/src/components/applications/review/OperatingCostsSummary.vue b/frontend/src/components/applications/review/OperatingCostsSummary.vue
index e93fb6e8..e63b012c 100644
--- a/frontend/src/components/applications/review/OperatingCostsSummary.vue
+++ b/frontend/src/components/applications/review/OperatingCostsSummary.vue
@@ -7,25 +7,59 @@
     </AppMissingInfoError>
     <div v-else>
       <h4 class="mb-4 text-decoration-underline">Facility Type: {{ getFacilityTypeNameById(currentApplication?.facilityType) }}</h4>
-      <AppMissingInfoError
-        v-if="!readonly && isRentLease && currentApplication.armsLength !== YES_NO_CHOICE_CRM_MAPPING.YES"
-        :to="{ name: APPLICATION_ROUTES.OPERATING_COSTS, hash: '#arm-length', params: { applicationGuid: $route.params.applicationGuid } }">
-        {{ APPLICATION_ERROR_MESSAGES.ARM_LENGTH }}
-      </AppMissingInfoError>
-      <AppMissingInfoError
-        v-if="!readonly && totalOperationalCost === 0"
-        :to="{ name: APPLICATION_ROUTES.OPERATING_COSTS, hash: '#yearly-operating-cost', params: { applicationGuid: $route.params.applicationGuid } }">
-        {{ APPLICATION_ERROR_MESSAGES.OPERATIONAL_COST }}
-      </AppMissingInfoError>
-      <div v-else>
-        <YearlyOperatingCostSummary />
-        <YearlyFacilityCostSummary class="mt-4" />
+
+      <!-- RENT/LEASE INFORMATION -->
+      <div v-if="isRentLease" class="my-4">
+        <h4>Rent/Lease Information</h4>
+        <v-card class="my-1 px-4 py-1" variant="outlined">
+          <div>
+            <div>
+              <v-row v-if="currentApplication?.rentLeaseStartDate && currentApplication?.rentLeaseEndDate" no-gutters class="px-2 mt-4">
+                <AppLabel class="mr-2">Rent/Lease Date Range:</AppLabel>
+                <span>{{ format.formatDate(currentApplication?.rentLeaseStartDate) }} to {{ format.formatDate(currentApplication?.rentLeaseEndDate) }}</span>
+              </v-row>
+              <AppMissingInfoError
+                v-else-if="!readonly && currentApplication.monthToMonthRentLease !== 1"
+                :to="{ name: APPLICATION_ROUTES.OPERATING_COSTS, hash: '#rent-lease-info', params: { applicationGuid: $route.params.applicationGuid } }">
+                {{ APPLICATION_ERROR_MESSAGES.RENT_LEASE_DATE_RANGE }}
+              </AppMissingInfoError>
+            </div>
+            <v-checkbox v-if="currentApplication.monthToMonthRentLease" v-model="currentApplication.monthToMonthRentLease" :true-value="YES_NO_CHOICE_CRM_MAPPING.YES" disabled hide-details>
+              <template #label>My facility's rent/lease is on a month-to-month basis.</template>
+            </v-checkbox>
+          </div>
+          <div>
+            <AppMissingInfoError
+              v-if="!readonly && currentApplication.armsLength !== YES_NO_CHOICE_CRM_MAPPING.YES"
+              :to="{ name: APPLICATION_ROUTES.OPERATING_COSTS, hash: '#arm-length', params: { applicationGuid: $route.params.applicationGuid } }">
+              {{ APPLICATION_ERROR_MESSAGES.ARM_LENGTH }}
+            </AppMissingInfoError>
+            <v-checkbox v-else v-model="currentApplication.armsLength" :true-value="YES_NO_CHOICE_CRM_MAPPING.YES" disabled hide-details>
+              <template #label>I attest that the rent/lease agreement is at Arm's Length.</template>
+            </v-checkbox>
+          </div>
+        </v-card>
       </div>
+
+      <!-- OPERATING COST / FACILITY COST -->
+      <div>
+        <AppMissingInfoError
+          v-if="!readonly && totalOperationalCost === 0"
+          :to="{ name: APPLICATION_ROUTES.OPERATING_COSTS, hash: '#yearly-operating-cost', params: { applicationGuid: $route.params.applicationGuid } }">
+          {{ APPLICATION_ERROR_MESSAGES.OPERATIONAL_COST }}
+        </AppMissingInfoError>
+        <div v-else>
+          <YearlyOperatingCostSummary />
+          <YearlyFacilityCostSummary class="mt-4" />
+        </div>
+      </div>
+
+      <!-- UPLOAD DOCUMENTS -->
       <div class="mt-4">
         <h4>Uploaded Document(s)</h4>
         <v-card class="pa-3" variant="outlined">
           <v-card class="mt-2 mb-3 pa-3">
-            <AppDocumentUpload :readonly="true" :documentType="DOCUMENT_TYPES.INCOME_STATEMENT" :uploadedDocuments="documentsFinancialStatements">
+            <AppDocumentUpload :readonly="true" :document-type="DOCUMENT_TYPES.INCOME_STATEMENT" :uploaded-documents="documentsFinancialStatements">
               <AppMissingInfoError
                 v-if="!readonly && !documentsFinancialStatements.length"
                 :to="{ name: 'operating-costs', hash: '#financial-document-upload', params: { applicationGuid: $route.params.applicationGuid } }">
@@ -34,7 +68,7 @@
             </AppDocumentUpload>
           </v-card>
           <v-card class="pl-3">
-            <AppDocumentUpload class="pt-4 pa-3" :readonly="true" :documentType="DOCUMENT_TYPES.BALANCE_SHEET" :uploadedDocuments="documentsBalanceSheets">
+            <AppDocumentUpload class="pt-4 pa-3" :readonly="true" :document-type="DOCUMENT_TYPES.BALANCE_SHEET" :uploaded-documents="documentsBalanceSheets">
               <AppMissingInfoError
                 v-if="!readonly && !documentsBalanceSheets.length"
                 :to="{ name: 'operating-costs', hash: '#balance-sheet-document-upload', params: { applicationGuid: $route.params.applicationGuid } }">
@@ -43,7 +77,7 @@
             </AppDocumentUpload>
           </v-card>
           <v-card class="pl-3 mt-3 pt-0">
-            <AppDocumentUpload class="pt-4 pa-3" :readonly="true" :documentType="DOCUMENT_TYPES.SUPPORTING_DOCS" :uploadedDocuments="documentsSupporting">
+            <AppDocumentUpload class="pt-4 pa-3" :readonly="true" :document-type="DOCUMENT_TYPES.SUPPORTING_DOCS" :uploaded-documents="documentsSupporting">
               <AppMissingInfoError
                 v-if="!readonly && isRentLease && !documentsSupporting.length"
                 :to="{ name: 'operating-costs', hash: '#supporting-document-upload', params: { applicationGuid: $route.params.applicationGuid } }">
@@ -58,17 +92,19 @@
 </template>
 
 <script>
+import { mapState } from 'pinia'
 import AppDocumentUpload from '@/components/ui/AppDocumentUpload.vue'
+import AppLabel from '@/components/ui/AppLabel.vue'
 import AppMissingInfoError from '@/components/ui/AppMissingInfoError.vue'
 import YearlyOperatingCostSummary from '@/components/applications/review/YearlyOperatingCostSummary.vue'
 import YearlyFacilityCostSummary from '@/components/applications/review/YearlyFacilityCostSummary.vue'
 import { useAppStore } from '@/stores/app'
 import { useApplicationsStore } from '@/stores/applications'
-import { mapState } from 'pinia'
+import format from '@/utils/format'
 import { FACILITY_TYPES, APPLICATION_ERROR_MESSAGES, APPLICATION_ROUTES, DOCUMENT_TYPES, YES_NO_CHOICE_CRM_MAPPING } from '@/utils/constants'
 
 export default {
-  components: { AppMissingInfoError, YearlyOperatingCostSummary, YearlyFacilityCostSummary, AppDocumentUpload },
+  components: { AppLabel, AppMissingInfoError, YearlyOperatingCostSummary, YearlyFacilityCostSummary, AppDocumentUpload },
   props: {
     readonly: {
       type: Boolean,
@@ -102,6 +138,7 @@ export default {
   },
 
   created() {
+    this.format = format
     this.APPLICATION_ERROR_MESSAGES = APPLICATION_ERROR_MESSAGES
     this.APPLICATION_ROUTES = APPLICATION_ROUTES
     this.DOCUMENT_TYPES = DOCUMENT_TYPES
diff --git a/frontend/src/components/applications/review/YearlyFacilityCostSummary.vue b/frontend/src/components/applications/review/YearlyFacilityCostSummary.vue
index 5512cb19..1f14418e 100644
--- a/frontend/src/components/applications/review/YearlyFacilityCostSummary.vue
+++ b/frontend/src/components/applications/review/YearlyFacilityCostSummary.vue
@@ -6,12 +6,10 @@
       <v-row v-if="facilityType === FACILITY_TYPES.RENT_LEASE" no-gutters>
         <v-col cols="12" lg="6">
           <v-row no-gutters class="pa-1">
-            <v-col cols="6" xl="5">
+            <v-col cols="12" sm="7">
               <p>Rent/Lease</p>
             </v-col>
-            <v-col cols="6" xl="7" class="px-2">
-              {{ format.formatDecimalNumber(currentApplication?.rentLeaseCost) }}
-            </v-col>
+            <v-col cols="12" sm="5" class="px-sm-2">$ {{ format.formatDecimalNumber(currentApplication?.rentLeaseCost) }}</v-col>
           </v-row>
         </v-col>
       </v-row>
@@ -20,32 +18,26 @@
       <v-row v-if="facilityType === FACILITY_TYPES.OWNED_WITH_MORTGAGE" no-gutters>
         <v-col cols="12" lg="6">
           <v-row no-gutters class="pa-1">
-            <v-col cols="6" xl="5">
+            <v-col cols="12" sm="7">
               <p>Mortgage</p>
             </v-col>
-            <v-col cols="6" xl="7" class="px-2">
-              {{ format.formatDecimalNumber(currentApplication?.mortgageCost) }}
-            </v-col>
+            <v-col cols="12" sm="5" class="px-sm-2">$ {{ format.formatDecimalNumber(currentApplication?.mortgageCost) }}</v-col>
           </v-row>
         </v-col>
         <v-col cols="12" lg="6">
           <v-row no-gutters class="pa-1">
-            <v-col cols="6" xl="5">
+            <v-col cols="12" sm="7">
               <p>Property/Municipal Tax</p>
             </v-col>
-            <v-col cols="6" xl="7" class="px-2">
-              {{ format.formatDecimalNumber(currentApplication?.propertyTax) }}
-            </v-col>
+            <v-col cols="12" sm="5" class="px-sm-2">$ {{ format.formatDecimalNumber(currentApplication?.propertyTax) }}</v-col>
           </v-row>
         </v-col>
         <v-col cols="12" lg="6" class="pa-1">
           <v-row no-gutters>
-            <v-col cols="6" xl="5">
+            <v-col cols="12" sm="7">
               <p>Strata Fees</p>
             </v-col>
-            <v-col cols="6" xl="7" class="px-2">
-              {{ format.formatDecimalNumber(currentApplication?.strataFee) }}
-            </v-col>
+            <v-col cols="12" sm="5" class="px-sm-2">$ {{ format.formatDecimalNumber(currentApplication?.strataFee) }}</v-col>
           </v-row>
         </v-col>
       </v-row>
@@ -54,22 +46,18 @@
       <v-row v-if="facilityType === FACILITY_TYPES.OWNED_WITHOUT_MORTGAGE" no-gutters>
         <v-col cols="12" lg="6">
           <v-row no-gutters class="pa-1">
-            <v-col cols="6" xl="5">
+            <v-col cols="12" sm="7">
               <p>Property/Municipal Tax</p>
             </v-col>
-            <v-col cols="6" xl="7" class="px-2">
-              {{ format.formatDecimalNumber(currentApplication?.propertyTax) }}
-            </v-col>
+            <v-col cols="12" sm="5" class="px-sm-2">$ {{ format.formatDecimalNumber(currentApplication?.propertyTax) }}</v-col>
           </v-row>
         </v-col>
         <v-col cols="12" lg="6">
           <v-row no-gutters class="pa-1">
-            <v-col cols="6" xl="5">
+            <v-col cols="12" sm="7">
               <p>Strata Fees</p>
             </v-col>
-            <v-col cols="6" xl="7" class="px-2">
-              {{ format.formatDecimalNumber(currentApplication?.strataFee) }}
-            </v-col>
+            <v-col cols="12" sm="5" class="px-sm-2">$ {{ format.formatDecimalNumber(currentApplication?.strataFee) }}</v-col>
           </v-row>
         </v-col>
       </v-row>
@@ -78,32 +66,26 @@
       <v-row v-if="facilityType === FACILITY_TYPES.PROVIDED_FREE_OF_CHARGE" no-gutters>
         <v-col cols="12" lg="6">
           <v-row no-gutters class="pa-1">
-            <v-col cols="6" xl="5">
+            <v-col cols="12" sm="7">
               <p>Fee (If Applicable)</p>
             </v-col>
-            <v-col cols="6" xl="7" class="px-2">
-              {{ format.formatDecimalNumber(currentApplication?.applicableFee) }}
-            </v-col>
+            <v-col cols="12" sm="5" class="px-sm-2">$ {{ format.formatDecimalNumber(currentApplication?.applicableFee) }}</v-col>
           </v-row>
         </v-col>
         <v-col cols="12" lg="6">
           <v-row no-gutters class="pa-1">
-            <v-col cols="6" xl="5">
+            <v-col cols="12" sm="7">
               <p>Property/Municipal Tax</p>
             </v-col>
-            <v-col cols="6" xl="7" class="px-2">
-              {{ format.formatDecimalNumber(currentApplication?.propertyTax) }}
-            </v-col>
+            <v-col cols="12" sm="5" class="px-sm-2">$ {{ format.formatDecimalNumber(currentApplication?.propertyTax) }}</v-col>
           </v-row>
         </v-col>
         <v-col cols="12" lg="6">
           <v-row no-gutters class="pa-1">
-            <v-col cols="6" xl="5">
+            <v-col cols="12" sm="7">
               <p>Strata Fees</p>
             </v-col>
-            <v-col cols="6" xl="7" class="px-2">
-              {{ format.formatDecimalNumber(currentApplication?.strataFee) }}
-            </v-col>
+            <v-col cols="12" sm="5" class="px-sm-2">$ {{ format.formatDecimalNumber(currentApplication?.strataFee) }}</v-col>
           </v-row>
         </v-col>
       </v-row>
@@ -111,12 +93,10 @@
       <v-row no-gutters>
         <v-col cols="12" lg="6">
           <v-row no-gutters class="pa-1">
-            <v-col cols="6" xl="5">
+            <v-col cols="12" sm="7">
               <AppLabel>Total Yearly Costs</AppLabel>
             </v-col>
-            <v-col cols="6" xl="7" class="px-2 totalYearlyCost">
-              {{ format.formatDecimalNumber(currentApplication?.totalYearlyFacilityCosts) }}
-            </v-col>
+            <v-col cols="12" sm="5" class="px-sm-2 totalYearlyCost">$ {{ format.formatDecimalNumber(currentApplication?.totalYearlyFacilityCosts) }}</v-col>
           </v-row>
         </v-col>
       </v-row>
diff --git a/frontend/src/components/applications/review/YearlyOperatingCostSummary.vue b/frontend/src/components/applications/review/YearlyOperatingCostSummary.vue
index a595d1dc..7b5fb582 100644
--- a/frontend/src/components/applications/review/YearlyOperatingCostSummary.vue
+++ b/frontend/src/components/applications/review/YearlyOperatingCostSummary.vue
@@ -5,78 +5,64 @@
       <v-row no-gutters>
         <v-col cols="12" lg="6">
           <v-row no-gutters class="pa-1">
-            <v-col cols="6" xl="5">
-              <p>Insurance</p>
-            </v-col>
-            <v-col cols="6" xl="7" class="px-2">
-              {{ format.formatDecimalNumber(currentApplication?.insuranceCost) }}
+            <v-col cols="12" sm="7">
+              <p>Maintenance and Minor Repairs</p>
             </v-col>
+            <v-col cols="12" sm="5" class="px-sm-2">$ {{ format.formatDecimalNumber(currentApplication?.insuranceCost) }}</v-col>
           </v-row>
         </v-col>
         <v-col cols="12" lg="6">
           <v-row no-gutters class="pa-1">
-            <v-col cols="6" xl="5">
-              <p>Upkeep and Labour</p>
-            </v-col>
-            <v-col cols="6" xl="7" class="px-2">
-              {{ format.formatDecimalNumber(currentApplication?.upkeepLabourCost) }}
+            <v-col cols="12" sm="7">
+              <p>Upkeep</p>
             </v-col>
+            <v-col cols="12" sm="5" class="px-sm-2">$ {{ format.formatDecimalNumber(currentApplication?.upkeepLabourCost) }}</v-col>
           </v-row>
         </v-col>
       </v-row>
       <v-row no-gutters>
         <v-col cols="12" lg="6">
           <v-row no-gutters class="pa-1">
-            <v-col cols="6" xl="5">
-              <p>Utilities</p>
-            </v-col>
-            <v-col cols="6" xl="7" class="px-2">
-              {{ format.formatDecimalNumber(currentApplication?.utilitiesCost) }}
+            <v-col cols="12" sm="7">
+              <p>Office Furniture and Equipment</p>
             </v-col>
+            <v-col cols="12" sm="5" class="px-sm-2">$ {{ format.formatDecimalNumber(currentApplication?.furnitureEquipmentsCost) }}</v-col>
           </v-row>
         </v-col>
         <v-col cols="12" lg="6">
           <v-row no-gutters class="pa-1">
-            <v-col cols="6" xl="5">
-              <p>Maintenance and Repairs</p>
-            </v-col>
-            <v-col cols="6" xl="7" class="px-2">
-              {{ format.formatDecimalNumber(currentApplication?.maintenanceRepairsCost) }}
+            <v-col cols="12" sm="7">
+              <p>Facility Maintenance and Minor Improvements</p>
             </v-col>
+            <v-col cols="12" sm="5" class="px-sm-2">$ {{ format.formatDecimalNumber(currentApplication?.maintenanceRepairsCost) }}</v-col>
           </v-row>
         </v-col>
       </v-row>
       <v-row no-gutters>
         <v-col cols="12" lg="6">
           <v-row no-gutters class="pa-1">
-            <v-col cols="6" xl="5">
-              <p>Furniture and Equipment</p>
-            </v-col>
-            <v-col cols="6" xl="7" class="px-2">
-              {{ format.formatDecimalNumber(currentApplication?.furnitureEquipmentsCost) }}
+            <v-col cols="12" sm="7">
+              <p>Janitorial Services</p>
             </v-col>
+            <v-col cols="12" sm="5" class="px-sm-2">$ {{ format.formatDecimalNumber(currentApplication?.suppliesCost) }}</v-col>
           </v-row>
         </v-col>
         <v-col cols="12" lg="6">
           <v-row no-gutters class="pa-1">
-            <v-col cols="6" xl="5">
-              <p>Supplies</p>
-            </v-col>
-            <v-col cols="6" xl="7" class="px-2">
-              {{ format.formatDecimalNumber(currentApplication?.suppliesCost) }}
+            <v-col cols="12" sm="7">
+              <p>Utilities</p>
             </v-col>
+            <v-col cols="12" sm="5" class="px-sm-2">$ {{ format.formatDecimalNumber(currentApplication?.utilitiesCost) }}</v-col>
           </v-row>
         </v-col>
       </v-row>
       <v-row no-gutters>
         <v-col cols="12" lg="6">
           <v-row no-gutters class="pa-1">
-            <v-col cols="6" xl="5">
+            <v-col cols="12" sm="7">
               <AppLabel>Total Yearly Costs</AppLabel>
             </v-col>
-            <v-col cols="6" xl="7" class="px-2 total-yearly-cost">
-              {{ format.formatDecimalNumber(currentApplication?.totalYearlyOperatingCosts) }}
-            </v-col>
+            <v-col cols="12" sm="5" class="px-sm-2 total-yearly-cost">$ {{ format.formatDecimalNumber(currentApplication?.totalYearlyOperatingCosts) }}</v-col>
           </v-row>
         </v-col>
       </v-row>
diff --git a/frontend/src/stores/applications.js b/frontend/src/stores/applications.js
index 4343ab83..95cccafe 100644
--- a/frontend/src/stores/applications.js
+++ b/frontend/src/stores/applications.js
@@ -160,8 +160,12 @@ export const useApplicationsStore = defineStore('applications', {
       const isRequiredFinancialDocsUploaded = this.checkRequiredDocsExist(this.currentApplication, [DOCUMENT_TYPES.INCOME_STATEMENT, DOCUMENT_TYPES.BALANCE_SHEET])
       const isFacilityTypeRequiredDocsUploaded = !this.isRentLease(this.currentApplication) || this.checkRequiredDocsExist(this.currentApplication, [DOCUMENT_TYPES.SUPPORTING_DOCS])
       const areCostsPositive = this.currentApplication?.totalYearlyOperatingCosts + this.currentApplication?.totalYearlyFacilityCosts > 0
-      const isArmsLengthConfirmed = !this.isRentLease(this.currentApplication) || this.currentApplication?.armsLength === YES_NO_CHOICE_CRM_MAPPING.YES
-      return this.currentApplication?.facilityType && isArmsLengthConfirmed && isRequiredFinancialDocsUploaded && isFacilityTypeRequiredDocsUploaded && areCostsPositive
+      const isRentLeaseInformationComplete =
+        !this.isRentLease(this.currentApplication) ||
+        (this.currentApplication?.armsLength === YES_NO_CHOICE_CRM_MAPPING.YES &&
+          (this.currentApplication?.monthToMonthRentLease === YES_NO_CHOICE_CRM_MAPPING.YES ||
+            (this.currentApplication?.rentLeaseStartDate && this.currentApplication?.rentLeaseEndDate && this.currentApplication?.rentLeaseEndDate > this.currentApplication?.rentLeaseStartDate)))
+      return this.currentApplication?.facilityType && isRentLeaseInformationComplete && isRequiredFinancialDocsUploaded && isFacilityTypeRequiredDocsUploaded && areCostsPositive
     },
 
     checkRequiredDocsExist(application, requiredDocumentTypes) {
diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js
index 92754a0a..85d279eb 100644
--- a/frontend/src/utils/constants.js
+++ b/frontend/src/utils/constants.js
@@ -194,6 +194,7 @@ export const APPLICATION_ERROR_MESSAGES = Object.freeze({
   DOCUMENT_HA_REPORT_UPLOAD: 'Document upload of your most recent Health Authority compliance report required',
   FACILITY_TYPE: 'Facility type required',
   ARM_LENGTH: "Arm's Length agreement checkbox required",
+  RENT_LEASE_DATE_RANGE: 'Rent lease start and end dates required',
   OPERATIONAL_COST: 'Operating costs required -or- Facility costs required',
   STAFFING: 'Staffing information required',
   UNION: 'Union information required',
@@ -268,6 +269,11 @@ export const YES_NO_RADIO_GROUP_MAPPING = Object.freeze({
   NA: 2,
 })
 
+export const YES_NO_CRM_MAPPING = Object.freeze({
+  YES: 1,
+  NO: 0,
+})
+
 export const SUPPORTED_DOCUMENTS_MESSAGE = 'The maximum file size is 4MB for each document. Accepted file types are jpg, jpeg, heic, png, pdf, docx, doc, xls, and xlsx.'
 export const OFM_PROGRAM = 'OFM Program'
 
diff --git a/frontend/src/utils/format.js b/frontend/src/utils/format.js
index fef551b4..7c9cc658 100644
--- a/frontend/src/utils/format.js
+++ b/frontend/src/utils/format.js
@@ -2,11 +2,19 @@ import { isEmpty } from 'lodash'
 import moment from 'moment'
 import momentTZ from 'moment-timezone'
 
-import { BLANK_FIELD, TIME_ZONE } from '@/utils/constants'
+import { BLANK_FIELD, TIME_ZONE, YES_NO_RADIO_GROUP_MAPPING } from '@/utils/constants'
 
 function formatBooleanToYesNo(value) {
-  if (value == null) return ''
-  return value ? 'Yes' : 'No'
+  switch (value) {
+    case YES_NO_RADIO_GROUP_MAPPING.NO:
+      return 'No'
+    case YES_NO_RADIO_GROUP_MAPPING.YES:
+      return 'Yes'
+    case YES_NO_RADIO_GROUP_MAPPING.NA:
+      return 'N/A'
+    default:
+      return ''
+  }
 }
 
 function formatDate(date) {
diff --git a/frontend/src/views/applications/OperatingCostsView.vue b/frontend/src/views/applications/OperatingCostsView.vue
index 24ea94cc..f1f509c7 100644
--- a/frontend/src/views/applications/OperatingCostsView.vue
+++ b/frontend/src/views/applications/OperatingCostsView.vue
@@ -9,7 +9,7 @@
       <v-col cols="10" md="7" lg="5" xxl="3" class="mt-3">
         <v-select
           id="select-facility-types"
-          v-model="model.facilityType"
+          v-model="facilityType"
           :items="facilityTypes"
           :disabled="readonly"
           item-title="description"
@@ -28,24 +28,15 @@
       </v-col>
     </v-row>
 
-    <div v-if="model.facilityType" id="arm-length">
-      <!-- ARM LENGTH -->
-      <div v-if="isRentLease" class="arm-length">
-        <v-checkbox v-model="model.armsLength" color="primary" :true-value="YES_NO_CHOICE_CRM_MAPPING.YES" :rules="rules.required" :disabled="readonly" :hide-details="readonly">
-          <template #label>I attest that the rent/lease agreement is at Arm's Length.</template>
-        </v-checkbox>
-        <v-tooltip content-class="tooltip" max-width="300px" text="Third-parties dealing with each other at arm's length are independent and unrelated to each other.">
-          <template #activator="{ props }">
-            <v-icon size="large" v-bind="props" class="ml-2 pt-7">mdi-information-slab-circle-outline</v-icon>
-          </template>
-        </v-tooltip>
-      </div>
+    <div v-if="facilityType">
+      <!-- RENT/LEASE INFORMATION -->
+      <RentLeaseInformation v-if="isRentLease" id="rent-lease-info" @update="updateRentLeaseInfoModel" />
 
       <!-- OPERATING COST / FACILITY COST -->
       <v-card class="my-4 px-6 py-4">
         <AppMissingInfoError v-if="showErrorMessage && totalOperationalCost === 0">{{ APPLICATION_ERROR_MESSAGES.OPERATIONAL_COST }}</AppMissingInfoError>
-        <YearlyOperatingCost id="yearly-operating-cost" :readonly="readonly" @update="updateModel" />
-        <YearlyFacilityCost id="yearly-facility-cost" :readonly="readonly" :facility-type="model.facilityType" @update="updateModel" />
+        <YearlyOperatingCost id="yearly-operating-cost" :readonly="readonly" @update="updateCostsModel" />
+        <YearlyFacilityCost id="yearly-facility-cost" :readonly="readonly" :facility-type="facilityType" @update="updateCostsModel" />
       </v-card>
 
       <!-- UPLOAD DOCUMENTS -->
@@ -115,13 +106,14 @@ import { isEmpty } from 'lodash'
 import AppLabel from '@/components/ui/AppLabel.vue'
 import AppMissingInfoError from '@/components/ui/AppMissingInfoError.vue'
 import AppDocumentUpload from '@/components/ui/AppDocumentUpload.vue'
+import RentLeaseInformation from '@/components/applications/RentLeaseInformation.vue'
 import YearlyOperatingCost from '@/components/applications/YearlyOperatingCost.vue'
 import YearlyFacilityCost from '@/components/applications/YearlyFacilityCost.vue'
 import { FACILITY_TYPES, APPLICATION_ERROR_MESSAGES, APPLICATION_ROUTES, VIRUS_SCAN_ERROR_MESSAGE, DOCUMENT_TYPES, SUPPORTED_DOCUMENTS_MESSAGE, YES_NO_CHOICE_CRM_MAPPING } from '@/utils/constants'
 
 export default {
   name: 'OperatingCostsView',
-  components: { AppLabel, AppDocumentUpload, AppMissingInfoError, YearlyOperatingCost, YearlyFacilityCost },
+  components: { AppLabel, AppDocumentUpload, AppMissingInfoError, RentLeaseInformation, YearlyOperatingCost, YearlyFacilityCost },
   mixins: [alertMixin],
 
   async beforeRouteLeave(_to, _from, next) {
@@ -155,7 +147,9 @@ export default {
   data() {
     return {
       rules,
-      model: {},
+      facilityType: null,
+      costsModel: {},
+      rentLeaseInfoModel: {},
       financialStatement: {
         uploadedDocuments: [],
         documentsToUpload: [],
@@ -179,35 +173,30 @@ export default {
     ...mapState(useAppStore, ['facilityTypes']),
     ...mapState(useApplicationsStore, ['currentApplication', 'validation']),
     ...mapWritableState(useApplicationsStore, ['isOperatingCostsComplete']),
-    sanitizedModel() {
+    sanitizedCostsModel() {
       const sanitizedModel = {}
-      Object.keys(this.model)?.forEach((key) => {
-        if (key === 'facilityType' || Number(this.model[key]) <= 5000000) {
-          sanitizedModel[key] = this.model[key]
+      Object.keys(this.costsModel)?.forEach((key) => {
+        if (Number(this.costsModel[key]) <= 5000000) {
+          sanitizedModel[key] = this.costsModel[key]
         }
       })
-      if (this.isRentLease && !this.model?.armsLength) {
-        sanitizedModel.armsLength = null
-      }
       return sanitizedModel
     },
     isFormComplete() {
+      return this.facilityType && this.isRentLeaseInformationComplete && this.totalOperationalCost > 0 && this.isFinancialDocsUploaded && (!this.isRentLease || this.isSupportingDocsUploaded)
+    },
+    isRentLeaseInformationComplete() {
       return (
-        this.model.facilityType &&
-        (!this.isRentLease || this.model?.armsLength === YES_NO_CHOICE_CRM_MAPPING.YES) &&
-        this.totalOperationalCost > 0 &&
-        this.isFinancialDocsUploaded &&
-        (!this.isRentLease || this.isSupportingDocsUploaded)
+        !this.isRentLease ||
+        (this.rentLeaseInfoModel?.armsLength === YES_NO_CHOICE_CRM_MAPPING.YES &&
+          (this.rentLeaseInfoModel?.monthToMonthRentLease === YES_NO_CHOICE_CRM_MAPPING.YES || (this.rentLeaseInfoModel?.rentLeaseStartDate && this.rentLeaseInfoModel?.rentLeaseEndDate)))
       )
     },
     totalOperationalCost() {
-      const costsModel = Object.assign({}, this.model)
-      delete costsModel?.facilityType
-      delete costsModel?.armsLength
-      return Object.values(costsModel).reduce((total, cost) => total + Number(cost), 0)
+      return Object.values(this.costsModel).reduce((total, cost) => total + Number(cost), 0)
     },
     isRentLease() {
-      return this.model.facilityType === FACILITY_TYPES.RENT_LEASE
+      return this.facilityType === FACILITY_TYPES.RENT_LEASE
     },
     isFinancialDocsUploaded() {
       const isFinancialStatementUploaded = !isEmpty(this.financialStatement?.documentsToUpload) || !isEmpty(this.financialStatement?.uploadedDocuments)
@@ -227,7 +216,7 @@ export default {
       return !this.readonly && !this.processing && this.validation
     },
     facilityTypeTooltip() {
-      switch (this.model.facilityType) {
+      switch (this.facilityType) {
         case FACILITY_TYPES.RENT_LEASE:
           return 'If you rent or lease the child care facility, please enter the payment details.'
         case FACILITY_TYPES.OWNED_WITH_MORTGAGE:
@@ -268,8 +257,7 @@ export default {
 
   created() {
     this.$emit('process', false)
-    this.model.facilityType = this.currentApplication?.facilityType
-    this.model.armsLength = this.currentApplication?.armsLength
+    this.facilityType = this.currentApplication?.facilityType
     this.APPLICATION_ERROR_MESSAGES = APPLICATION_ERROR_MESSAGES
     this.DOCUMENT_TYPES = DOCUMENT_TYPES
     this.SUPPORTED_DOCUMENTS_MESSAGE = SUPPORTED_DOCUMENTS_MESSAGE
@@ -296,8 +284,13 @@ export default {
           const reload = await this.processDocuments()
           if (reload) reloadApplication = true
         }
-        if (ApplicationService.isApplicationUpdated(this.sanitizedModel)) {
-          await ApplicationService.updateApplication(this.$route.params.applicationGuid, this.sanitizedModel)
+        const payload = {
+          facilityType: this.facilityType,
+          ...this.rentLeaseInfoModel,
+          ...this.sanitizedCostsModel,
+        }
+        if (ApplicationService.isApplicationUpdated(payload)) {
+          await ApplicationService.updateApplication(this.$route.params.applicationGuid, payload)
           reloadApplication = true
         }
         if (reloadApplication) {
@@ -372,8 +365,16 @@ export default {
       }
     },
 
-    updateModel(updatedModel) {
-      Object.entries(updatedModel)?.forEach(([key, value]) => (this.model[key] = Number(value)))
+    updateRentLeaseInfoModel(updatedModel) {
+      const isEndDateAfterStartDate = updatedModel.rentLeaseEndDate > updatedModel.rentLeaseStartDate
+      this.rentLeaseInfoModel.rentLeaseStartDate = isEndDateAfterStartDate ? updatedModel?.rentLeaseStartDate : null
+      this.rentLeaseInfoModel.rentLeaseEndDate = isEndDateAfterStartDate ? updatedModel?.rentLeaseEndDate : null
+      this.rentLeaseInfoModel.monthToMonthRentLease = updatedModel?.monthToMonthRentLease
+      this.rentLeaseInfoModel.armsLength = updatedModel?.armsLength
+    },
+
+    updateCostsModel(updatedModel) {
+      Object.entries(updatedModel)?.forEach(([key, value]) => (this.costsModel[key] = Number(value)))
     },
 
     getUploadedDocuments(uploadedDocuments) {
@@ -384,8 +385,3 @@ export default {
   },
 }
 </script>
-<style scoped>
-.arm-length {
-  display: flex;
-}
-</style>