diff --git a/app/plugins/CoreEnroller/src/Model/Table/BasicAttributeCollectorsTable.php b/app/plugins/CoreEnroller/src/Model/Table/BasicAttributeCollectorsTable.php
index cd0ac0766..bf30f8c14 100644
--- a/app/plugins/CoreEnroller/src/Model/Table/BasicAttributeCollectorsTable.php
+++ b/app/plugins/CoreEnroller/src/Model/Table/BasicAttributeCollectorsTable.php
@@ -48,6 +48,7 @@ class BasicAttributeCollectorsTable extends Table {
   use \App\Lib\Traits\PrimaryLinkTrait;
   use \App\Lib\Traits\TableMetaTrait;
   use \App\Lib\Traits\ValidationTrait;
+  use \App\Lib\Traits\LayoutTrait;
 
   /**
    * Perform Cake Model initialization.
diff --git a/app/resources/locales/en_US/enumeration.po b/app/resources/locales/en_US/enumeration.po
index 691a14338..95d1df691 100644
--- a/app/resources/locales/en_US/enumeration.po
+++ b/app/resources/locales/en_US/enumeration.po
@@ -556,8 +556,14 @@ msgstr "Street"
 msgid "RequiredAddressFieldsEnum.street,locality,state,postal_code"
 msgstr "Street, City, State, Postal Code"
 
-msgid "RequiredAddressFieldsEnum.street,locality,state,postal_code,country"
-msgstr "Street, City, State, Postal Code, Country"
+msgid "GroupedAddressFieldsEnum.street,room"
+msgstr "Street, Room"
+
+msgid "GroupedAddressFieldsEnum.city,locality"
+msgstr "City, Locality"
+
+msgid "GroupedAddressFieldsEnum.state,postal_code,country"
+msgstr "State, Postal Code, Country"
 
 msgid "RequiredNameFieldsEnum.given"
 msgstr "Given"