diff --git a/codbex-cities/codbex-cities.edm b/codbex-cities/codbex-cities.edm
index e71c68a..0ae64ff 100644
--- a/codbex-cities/codbex-cities.edm
+++ b/codbex-cities/codbex-cities.edm
@@ -1,6 +1,6 @@
 <model>
  <entities>
-  <entity name="City" dataName="CITY" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}CITY&quot;" dataQuery="" type="SETTING" title="City" caption="Manage entity City" description="Manage entity City" tooltip="City" icon="/services/web/resources/unicons/file.svg" menuKey="city" menuLabel="City" menuIndex="100" layoutType="" perspectiveName="Settings" perspectiveLabel="" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/copy.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" generateDefaultRoles="true" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" roleRead="codbex-cities.Cities.CityReadOnly" roleWrite="codbex-cities.Cities.CityFullAccess">
+  <entity name="City" dataName="CITY" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}CITY&quot;" dataQuery="" type="SETTING" title="City" caption="Manage entity City" description="Manage entity City" tooltip="City" icon="/services/web/resources/unicons/file.svg" menuKey="city" menuLabel="City" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/copy.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" generateDefaultRoles="true" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" roleRead="codbex-cities.Cities.CityReadOnly" roleWrite="codbex-cities.Cities.CityFullAccess">
     <property name="Id" description="" tooltip="" dataName="CITY_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
     <property name="Name" description="" tooltip="" dataName="CITY_NAME" dataType="VARCHAR" dataLength="100" dataNullable="false" isRequiredProperty="true" widgetType="TEXTBOX" widgetSize="" widgetLength="100" widgetIsMajor="true"></property>
     <property name="Country" description="" tooltip="" dataName="CITY_COUNTRY" dataType="INTEGER" dataNullable="false" isRequiredProperty="true" widgetType="DROPDOWN" widgetSize="" widgetLength="20" widgetIsMajor="true" widgetDropDownKey="Id" widgetDropDownValue="Name"></property>
@@ -20,5 +20,5 @@
  </perspectives>
  <navigations>
  </navigations>
- <mxGraphModel><root><mxCell id="0"/><mxCell id="1" parent="0"/><mxCell id="2" style="entity" parent="1" vertex="1"><Entity name="City" dataName="CITY" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}CITY&quot;" title="City" caption="Manage entity City" tooltip="City" menuLabel="City" perspectiveName="Settings" type="Entity" menuKey="city" disableGeneration="false" entityType="SETTING" description="Manage entity City" generateDefaultRoles="true" roleRead="codbex-cities.Cities.CityReadOnly" roleWrite="codbex-cities.Cities.CityFullAccess" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" as="value"><Array as="referenceProjections"/></Entity><mxGeometry x="430" y="110" width="200" height="106" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="3" parent="2" vertex="1" connectable="0"><Property name="Id" dataName="CITY_ID" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="4" parent="2" vertex="1" connectable="0"><Property name="Name" dataName="CITY_NAME" dataLength="100" dataPrecision="NaN" dataScale="NaN" widgetLength="100" isRequiredProperty="true" dataNotNull="true" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="0c344e88-1b04-f22f-4af0-fabbe9c15f70" parent="2" vertex="1" connectable="0"><Property name="Country" isRequiredProperty="true" dataName="CITY_COUNTRY" dataType="INTEGER" dataLength="0" dataNotNull="true" dataPrecision="NaN" dataScale="NaN" widgetType="DROPDOWN" widgetDropDownKey="Id" widgetDropDownValue="Name" as="value"/><mxGeometry y="80" width="200" height="26" as="geometry"/></mxCell><mxCell id="4574a292-44ba-2123-4c29-929b48dd1080" style="projection" parent="1" vertex="1" collapsed="1"><Entity name="Country" entityType="PROJECTION" dataName="COUNTRY" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}COUNTRY&quot;" title="Country" caption="Manage entity Country" tooltip="Country" menuLabel="Country" perspectiveName="Settings" perspectiveIcon="/services/web/resources/unicons/globe.svg" projectionReferencedModel="/workspace/codbex-countries/codbex-countries.model" projectionReferencedEntity="Country" type="Entity" menuKey="country" disableGeneration="false" description="Manage entity Country" as="value"/><mxGeometry x="120" y="150" width="200" height="28" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="0efc4814-7799-7c63-12c3-9ed7cfbdf555" style="projectionproperty" parent="4574a292-44ba-2123-4c29-929b48dd1080" vertex="1" connectable="0"><Property name="Id" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" dataAutoIncrement="true" dataLength="0" dataName="COUNTRY_ID" dataNullable="true" dataPrimaryKey="true" dataType="INTEGER" isCalculatedProperty="false" isRequiredProperty="false" widgetSize="" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="61748b78-0cb2-8744-dc5e-7d6333bfadc6" style="projectionproperty" parent="4574a292-44ba-2123-4c29-929b48dd1080" vertex="1" connectable="0"><Property name="Name" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" dataLength="255" dataName="COUNTRY_NAME" dataNullable="false" dataPrecision="NaN" dataScale="NaN" dataUnique="true" isCalculatedProperty="false" isRequiredProperty="false" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="a5e67c94-a1f5-646f-818a-a50b45c69acb" style="projectionproperty" parent="4574a292-44ba-2123-4c29-929b48dd1080" vertex="1" connectable="0"><Property name="Code2" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" dataLength="2" dataName="COUNTRY_CODE2" dataNullable="false" dataPrecision="NaN" dataScale="NaN" dataType="CHAR" dataUnique="true" isCalculatedProperty="false" isRequiredProperty="false" widgetSize="fd-col-md--2 fd-col--3" as="value"/><mxGeometry y="80" width="200" height="26" as="geometry"/></mxCell><mxCell id="40210708-4f08-a695-8cf8-1707e67ac84b" style="projectionproperty" parent="4574a292-44ba-2123-4c29-929b48dd1080" vertex="1" connectable="0"><Property name="Code3" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" dataLength="3" dataName="COUNTRY_CODE3" dataNullable="false" dataPrecision="NaN" dataScale="NaN" dataType="CHAR" dataUnique="true" isCalculatedProperty="false" isRequiredProperty="false" widgetSize="fd-col-md--2 fd-col--3" as="value"/><mxGeometry y="106" width="200" height="26" as="geometry"/></mxCell><mxCell id="f0465735-522c-2c88-48a3-cdd500c8c834" style="projectionproperty" parent="4574a292-44ba-2123-4c29-929b48dd1080" vertex="1" connectable="0"><Property name="Numeric" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" dataLength="3" dataName="COUNTRY_NUMERIC" dataNullable="false" dataPrecision="NaN" dataScale="NaN" dataType="CHAR" dataUnique="true" isCalculatedProperty="false" isRequiredProperty="false" widgetSize="fd-col-md--2 fd-col--3" as="value"/><mxGeometry y="132" width="200" height="26" as="geometry"/></mxCell><mxCell id="0bf6f751-0fc2-b5db-8b2f-1d1e96ec9c24" parent="1" source="0c344e88-1b04-f22f-4af0-fabbe9c15f70" target="0efc4814-7799-7c63-12c3-9ed7cfbdf555" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell></root></mxGraphModel>
+ <mxGraphModel><root><mxCell id="0"/><mxCell id="1" parent="0"/><mxCell id="2" style="entity" parent="1" vertex="1"><Entity name="City" dataName="CITY" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}CITY&quot;" title="City" caption="Manage entity City" tooltip="City" menuLabel="City" perspectiveName="Settings" type="Entity" menuKey="city" disableGeneration="false" entityType="SETTING" description="Manage entity City" generateDefaultRoles="true" roleRead="codbex-cities.Cities.CityReadOnly" roleWrite="codbex-cities.Cities.CityFullAccess" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" as="value"/><mxGeometry x="430" y="110" width="200" height="106" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="3" parent="2" vertex="1" connectable="0"><Property name="Id" dataName="CITY_ID" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="4" parent="2" vertex="1" connectable="0"><Property name="Name" dataName="CITY_NAME" dataLength="100" dataPrecision="NaN" dataScale="NaN" widgetLength="100" isRequiredProperty="true" dataNotNull="true" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="0c344e88-1b04-f22f-4af0-fabbe9c15f70" parent="2" vertex="1" connectable="0"><Property name="Country" isRequiredProperty="true" dataName="CITY_COUNTRY" dataType="INTEGER" dataLength="0" dataNotNull="true" dataPrecision="NaN" dataScale="NaN" widgetType="DROPDOWN" widgetDropDownKey="Id" widgetDropDownValue="Name" as="value"/><mxGeometry y="80" width="200" height="26" as="geometry"/></mxCell><mxCell id="4574a292-44ba-2123-4c29-929b48dd1080" style="projection" parent="1" vertex="1" collapsed="1"><Entity name="Country" entityType="PROJECTION" dataName="COUNTRY" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}COUNTRY&quot;" title="Country" caption="Manage entity Country" tooltip="Country" menuLabel="Country" perspectiveName="Settings" perspectiveIcon="/services/web/resources/unicons/globe.svg" projectionReferencedModel="/workspace/codbex-countries/codbex-countries.model" projectionReferencedEntity="Country" type="Entity" menuKey="country" disableGeneration="false" description="Manage entity Country" as="value"/><mxGeometry x="120" y="150" width="200" height="28" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="0efc4814-7799-7c63-12c3-9ed7cfbdf555" style="projectionproperty" parent="4574a292-44ba-2123-4c29-929b48dd1080" vertex="1" connectable="0"><Property name="Id" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" dataAutoIncrement="true" dataLength="0" dataName="COUNTRY_ID" dataNullable="true" dataPrimaryKey="true" dataType="INTEGER" isCalculatedProperty="false" isRequiredProperty="false" widgetSize="" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="61748b78-0cb2-8744-dc5e-7d6333bfadc6" style="projectionproperty" parent="4574a292-44ba-2123-4c29-929b48dd1080" vertex="1" connectable="0"><Property name="Name" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" dataLength="255" dataName="COUNTRY_NAME" dataNullable="false" dataPrecision="NaN" dataScale="NaN" dataUnique="true" isCalculatedProperty="false" isRequiredProperty="false" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="a5e67c94-a1f5-646f-818a-a50b45c69acb" style="projectionproperty" parent="4574a292-44ba-2123-4c29-929b48dd1080" vertex="1" connectable="0"><Property name="Code2" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" dataLength="2" dataName="COUNTRY_CODE2" dataNullable="false" dataPrecision="NaN" dataScale="NaN" dataType="CHAR" dataUnique="true" isCalculatedProperty="false" isRequiredProperty="false" widgetSize="fd-col-md--2 fd-col--3" as="value"/><mxGeometry y="80" width="200" height="26" as="geometry"/></mxCell><mxCell id="40210708-4f08-a695-8cf8-1707e67ac84b" style="projectionproperty" parent="4574a292-44ba-2123-4c29-929b48dd1080" vertex="1" connectable="0"><Property name="Code3" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" dataLength="3" dataName="COUNTRY_CODE3" dataNullable="false" dataPrecision="NaN" dataScale="NaN" dataType="CHAR" dataUnique="true" isCalculatedProperty="false" isRequiredProperty="false" widgetSize="fd-col-md--2 fd-col--3" as="value"/><mxGeometry y="106" width="200" height="26" as="geometry"/></mxCell><mxCell id="f0465735-522c-2c88-48a3-cdd500c8c834" style="projectionproperty" parent="4574a292-44ba-2123-4c29-929b48dd1080" vertex="1" connectable="0"><Property name="Numeric" calculatedPropertyExpressionCreate="" calculatedPropertyExpressionUpdate="" dataLength="3" dataName="COUNTRY_NUMERIC" dataNullable="false" dataPrecision="NaN" dataScale="NaN" dataType="CHAR" dataUnique="true" isCalculatedProperty="false" isRequiredProperty="false" widgetSize="fd-col-md--2 fd-col--3" as="value"/><mxGeometry y="132" width="200" height="26" as="geometry"/></mxCell><mxCell id="0bf6f751-0fc2-b5db-8b2f-1d1e96ec9c24" parent="1" source="0c344e88-1b04-f22f-4af0-fabbe9c15f70" target="0efc4814-7799-7c63-12c3-9ed7cfbdf555" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell></root></mxGraphModel>
 </model>
\ No newline at end of file
diff --git a/codbex-cities/codbex-cities.model b/codbex-cities/codbex-cities.model
index 3a4669c..576af86 100644
--- a/codbex-cities/codbex-cities.model
+++ b/codbex-cities/codbex-cities.model
@@ -61,14 +61,14 @@
                 "generateDefaultRoles": "true",
                 "generateReport": "false",
                 "icon": "/services/web/resources/unicons/file.svg",
-                "layoutType": "",
+                "layoutType": "MANAGE",
                 "menuIndex": "100",
                 "menuKey": "city",
                 "menuLabel": "City",
                 "name": "City",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/copy.svg",
-                "perspectiveLabel": "",
+                "perspectiveLabel": "Entities",
                 "perspectiveName": "Settings",
                 "perspectiveNavId": "",
                 "perspectiveOrder": "100",