diff --git a/src-access-mgmt/main/default/profiles/Admin.profile-meta.xml b/src-access-mgmt/main/default/profiles/Admin.profile-meta.xml
index f26bd10b..3eb3db09 100644
--- a/src-access-mgmt/main/default/profiles/Admin.profile-meta.xml
+++ b/src-access-mgmt/main/default/profiles/Admin.profile-meta.xml
@@ -354,10 +354,13 @@
     <layoutAssignments>
         <layout>Asset-Units Page Layout</layout>
     </layoutAssignments>
-<layoutAssignments>
+    <layoutAssignments>
         <layout>Account-Residence Page Layout</layout>
         <recordType>Account.Residence</recordType>
     </layoutAssignments>
+    <layoutAssignments>
+        <layout>Address-Address Layout</layout>
+    </layoutAssignments>    
     <recordTypeVisibilities>
         <default>false</default>
         <recordType>Account.Registrant</recordType>
diff --git a/src-access-mgmt/main/default/profiles/EHIS Standard User.profile-meta.xml b/src-access-mgmt/main/default/profiles/EHIS Standard User.profile-meta.xml
index 69c19d35..d5d9bbcc 100644
--- a/src-access-mgmt/main/default/profiles/EHIS Standard User.profile-meta.xml	
+++ b/src-access-mgmt/main/default/profiles/EHIS Standard User.profile-meta.xml	
@@ -143,7 +143,10 @@
     <layoutAssignments> 
         <layout>Account-Residence Page Layout</layout>
         <recordType>Account.Residence</recordType>
-    </layoutAssignments>   
+    </layoutAssignments>
+    <layoutAssignments>
+        <layout>Address-Address Layout</layout>
+    </layoutAssignments>    
     <recordTypeVisibilities>
         <default>true</default>
         <personAccountDefault>true</personAccountDefault>
diff --git a/src-ui/main/default/applications/EHIS_Services.app-meta.xml b/src-ui/main/default/applications/EHIS_Services.app-meta.xml
index 06ad1863..c725c5d5 100644
--- a/src-ui/main/default/applications/EHIS_Services.app-meta.xml
+++ b/src-ui/main/default/applications/EHIS_Services.app-meta.xml
@@ -66,20 +66,22 @@
     </profileActionOverrides>
     <profileActionOverrides>
         <actionName>View</actionName>
-        <content>Business_License_Application_Record_Page</content>
+        <content>Registrant_Record_Page</content>
         <formFactor>Small</formFactor>
-        <pageOrSobjectType>BusinessLicenseApplication</pageOrSobjectType>
+        <pageOrSobjectType>Account</pageOrSobjectType>
+        <recordType>Account.Registrant</recordType>
         <type>Flexipage</type>
         <profile>EHIS Standard User</profile>
     </profileActionOverrides>
     <profileActionOverrides>
         <actionName>View</actionName>
-        <content>Business_License_Application_Record_Page</content>
+        <content>Registrant_Record_Page</content>
         <formFactor>Large</formFactor>
-        <pageOrSobjectType>BusinessLicenseApplication</pageOrSobjectType>
+        <pageOrSobjectType>Account</pageOrSobjectType>
+        <recordType>Account.Registrant</recordType>
         <type>Flexipage</type>
         <profile>EHIS Standard User</profile>
-    </profileActionOverrides>
+</profileActionOverrides>
     <profileActionOverrides>
         <actionName>View</actionName>
         <content>Business_License_Application_Record_Page</content>
@@ -95,7 +97,7 @@
         <pageOrSobjectType>BusinessLicenseApplication</pageOrSobjectType>
         <type>Flexipage</type>
         <profile>Admin</profile>
-    </profileActionOverrides>    
+    </profileActionOverrides>
     <profileActionOverrides>
         <actionName>View</actionName>
         <content>Registrant_Record_Page</content>
@@ -149,8 +151,8 @@
         <recordType>Account.Residence</recordType>
         <type>Flexipage</type>
         <profile>Admin</profile>
-    </profileActionOverrides>      
-    <profileActionOverrides>
+    </profileActionOverrides>
+        <profileActionOverrides>
         <actionName>View</actionName>
         <content>Contact_Record_Page</content>
         <formFactor>Small</formFactor>
@@ -186,7 +188,7 @@
         <type>Flexipage</type>
         <profile>EHIS Standard User</profile>
     </profileActionOverrides>
-    <tabs>standard-home</tabs>
+        <tabs>standard-home</tabs>
     <tabs>standard-Account</tabs>
     <tabs>standard-Contact</tabs>
     <tabs>standard-BusinessLicenseApplication</tabs>
diff --git a/src/main/default/objects/Account/recordTypes/Residence.recordType-meta.xml b/src/main/default/objects/Account/recordTypes/Residence.recordType-meta.xml
index 2a2eac1a..53ea714d 100644
--- a/src/main/default/objects/Account/recordTypes/Residence.recordType-meta.xml
+++ b/src/main/default/objects/Account/recordTypes/Residence.recordType-meta.xml
@@ -3,7 +3,7 @@
     <fullName>Residence</fullName>
     <active>true</active>
     <compactLayoutAssignment>Residence_Compact_Layout</compactLayoutAssignment>
-    <description>Used for Assisted Living Residence Class creation</description>
+    <description>Used for Assisted Living Residence Class creation.</description>
     <label>Residence</label>
     <picklistValues>
         <picklist>AccountSource</picklist>
@@ -48,6 +48,105 @@
             <default>false</default>
         </values>
     </picklistValues>
+    <picklistValues>
+        <picklist>Status__c</picklist>
+        <values>
+            <fullName>Application in Progress</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>Refused Application</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>PURR Application in Progress</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>CURR Application in Progress</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>Application closed</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>Application withdrawn</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>Registered Active</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>Registered Active with Conditions</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>Registered Active Registrant change</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>Registered Active Pending Renewal</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>Unregistered Active Pending Renewal</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>Cancelled</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>Suspended</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>Deregistered Owner Change</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>Deregistered Location Change</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>Deregistered Withdrawn</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>PURR</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>CURR Not in Compliance</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>CURR In Compliance</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>CURR SIU Referral</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>Not AL Licensed</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>Not AL Personal Dwelling</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>Not AL Independent Living</fullName>
+            <default>false</default>
+        </values>
+        <values>
+            <fullName>Not AL Sober Living or Supportive Housing</fullName>
+            <default>false</default>
+        </values>    
+    </picklistValues>
     <picklistValues>
         <picklist>ClassType__c</picklist>
         <values>