diff --git a/src/main/resources/META-INF/resources/WEB-INF/layout/misctabs/ingshopkey.xhtml b/src/main/resources/META-INF/resources/WEB-INF/layout/misctabs/ingshopkey.xhtml
new file mode 100644
index 0000000..bbf75cc
--- /dev/null
+++ b/src/main/resources/META-INF/resources/WEB-INF/layout/misctabs/ingshopkey.xhtml
@@ -0,0 +1,121 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:h="http://xmlns.jcp.org/jsf/html"
+    xmlns:f="http://xmlns.jcp.org/jsf/core"
+    xmlns:ui="http://java.sun.com/jsf/facelets"
+    xmlns:p="http://primefaces.org/ui"
+>
+    <!-- === Edit ingkey/shopcat === -->
+    <h:form id="frmIsk1">
+        <p:dataTable id="tblShopcats"
+            style="width: 300px"
+            value="#{shoppingListBean.shopcatList}"
+            sortBy="#{item.shopcategory}" var="item"
+        >
+            <f:facet name="header">
+                <h:outputText
+                    value="Ingredient Keys/Shopping Categories" />
+            </f:facet>
+            <p:headerRow>
+                <p:column>
+                    <h:outputText id="ctlCatname"
+                        value="#{item.shopcategory}" />
+                </p:column>
+                <p:column style="width: 5em">
+                    <p:commandButton
+                        id="ctlEditCat" value="Rename"
+                        action="#{shoppingListBean.doEditShopcat(item.id)}"
+                        onclick="PF('dlgEditShopcat').show()"
+                        update="frmEscat:pnlData" />
+                </p:column>
+            </p:headerRow>
+            <p:column>
+                <h:outputText value="#{item.ingkey}"
+                    onclick="clickIngkeyName()" />
+            </p:column>
+            <p:column style="width: 5em">
+                <p:commandButton
+                    id="ctlEditIngkey" value="Move"
+                    action="#{shoppingListBean.doEditShopcat(item.id)}"
+                    onclick="PF('dlgEditIngkey').show()"
+                    update="frmIngkey:pnlData" />
+            </p:column>
+        </p:dataTable>
+    </h:form>
+    <!-- -->
+    <h:form id="frmEscat">
+        <p:dialog id="dlgEditShopcat"
+            widgetVar="dlgEditShopcat"
+            header="Edit/Rename Shopping Category"
+            closeOnEscape="true"
+        >
+            <p:panelGrid id="pnlData" columns="2"
+                styleClass="ui-panelgrid-blank"
+            >
+                <p:outputLabel for="@next"
+                    value="Shopping Category" />
+                <p:inputText id="ctlDlgShopcatName"
+                    label="Position" required="true"
+                    value="#{shoppingListBean.editShopcat.shopcategory}" />
+                <p:outputLabel for="@next"
+                    value="Position" />
+                <p:inputText
+                    id="ctlDlgShopcatPosition" type="number"
+                    required="true" size="3"
+                    value="#{shoppingListBean.editShopcat.position}" />
+            </p:panelGrid>
+            <p:panelGrid columns="2"
+                style="width: 100%"
+                styleClass="ui-panelgrid-blank"
+            >
+                <p:commandButton id="scDlgOK"
+                    value="OK" style="width: 6em"
+                    action="#{shoppingListBean.ajaxOnClickShopcat}"
+                    update="frmIsk1:tblShopcats"
+                    process="@this pnlData"
+                    oncomplete="PF('dlgEditShopcat').hide()" />
+                <p:commandButton id="scDlgCan"
+                    value="Cancel" style="width: 6em"
+                    onclick="PF('dlgEditShopcat').hide()" />
+            </p:panelGrid>
+        </p:dialog>
+    </h:form>
+    <!-- -->
+    <h:form id="frmIngkey">
+        <p:dialog id="dlgEditIngkey"
+            widgetVar="dlgEditIngkey"
+            header="Edit/Rename Shopping Category for Ingredient Key"
+            closeOnEscape="true"
+        >
+            <p:panelGrid id="pnlData" columns="2"
+                styleClass="ui-panelgrid-blank"
+            >
+                <p:outputLabel for="@next"
+                    value="Ingredient Key" />
+                <h:outputText
+                    id="ctlDlgIngKeyIngkey"
+                    value="#{shoppingListBean.editShopcat.ingkey}" />
+                <p:outputLabel for="@next"
+                    value="Shopping Category" />
+                <p:inputText
+                    id="ctlDlgIngkeyShopcatName" label="Position"
+                    required="true"
+                    value="#{shoppingListBean.editShopcat.shopcategory}" />
+            </p:panelGrid>
+            <p:panelGrid columns="2"
+                style="width: 100%"
+                styleClass="ui-panelgrid-blank"
+            >
+                <p:commandButton id="ingkDlgOK"
+                    value="OK" style="width: 6em"
+                    action="#{shoppingListBean.ajaxOnClickShopcatIngkey}"
+                    update="frmIsk1:tblShopcats"
+                    process="@this pnlData"
+                    oncomplete="PF('dlgEditIngkey').hide()" />
+                <p:commandButton id="ingkDlgCan"
+                    value="Cancel" style="width: 6em"
+                    onclick="PF('dlgEditIngkey').hide()" />
+            </p:panelGrid>
+        </p:dialog>
+    </h:form>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/META-INF/resources/shoppingList.xhtml b/src/main/resources/META-INF/resources/shoppingList.xhtml
index a63fc96..7be6e37 100644
--- a/src/main/resources/META-INF/resources/shoppingList.xhtml
+++ b/src/main/resources/META-INF/resources/shoppingList.xhtml
@@ -74,125 +74,8 @@
                 icon="ui-icon-home" ajax="false" immediate="true"
                 action="main.jsf"
             />
-            <p:dataTable id="tblShopcats" style="width: 300px"
-                value="#{shoppingListBean.shopcatList}"
-                sortBy="#{item.shopcategory}" var="item"
-            >
-                <f:facet name="header">
-                    <h:outputText
-                        value="Ingredient Keys/Shopping Categories"
-                    />
-                </f:facet>
-                <p:headerRow>
-                    <p:column>
-                        <h:outputText id="ctlCatname"
-                            value="#{item.shopcategory}"
-                        />
-                    </p:column>
-                    <p:column style="width: 5em">
-                        <p:commandButton id="ctlEditCat"
-                            value="Rename"
-                            action="#{shoppingListBean.doEditShopcat(item.id)}"
-                            onclick="PF('dlgEditShopcat').show()"
-                            update="frmEscat:pnlData"
-                        />
-                    </p:column>
-                </p:headerRow>
-                <p:column>
-                    <h:outputText value="#{item.ingkey}"
-                        onclick="clickIngkeyName()"
-                    />
-                </p:column>
-                <p:column style="width: 5em">
-                    <p:commandButton id="ctlEditIngkey"
-                        value="Move"
-                        action="#{shoppingListBean.doEditShopcat(item.id)}"
-                        onclick="PF('dlgEditIngkey').show()"
-                        update="frmIngkey:pnlData"
-                    />
-                </p:column>
-            </p:dataTable>
         </h:form>
         <!--  -->
-        <h:form id="frmEscat">
-            <p:dialog id="dlgEditShopcat"
-                widgetVar="dlgEditShopcat"
-                header="Edit/Rename Shopping Category"
-                closeOnEscape="true"
-            >
-                <p:panelGrid id="pnlData" columns="2"
-                    styleClass="ui-panelgrid-blank"
-                >
-                    <p:outputLabel for="@next"
-                        value="Shopping Category"
-                    />
-                    <p:inputText id="ctlDlgShopcatName"
-                        label="Position" required="true"
-                        value="#{shoppingListBean.editShopcat.shopcategory}"
-                    />
-                    <p:outputLabel for="@next" value="Position" />
-                    <p:inputText id="ctlDlgShopcatPosition"
-                        type="number" required="true" size="3"
-                        value="#{shoppingListBean.editShopcat.position}"
-                    />
-                </p:panelGrid>
-                <p:panelGrid columns="2" style="width: 100%"
-                    styleClass="ui-panelgrid-blank"
-                >
-                    <p:commandButton id="scDlgOK" value="OK"
-                        style="width: 6em"
-                        action="#{shoppingListBean.ajaxOnClickShopcat}"
-                        update="form1:tblShopcats"
-                        process="@this pnlData"
-                        oncomplete="PF('dlgEditShopcat').hide()"
-                    />
-                    <p:commandButton id="scDlgCan" value="Cancel"
-                        style="width: 6em"
-                        onclick="PF('dlgEditShopcat').hide()"
-                    />
-                </p:panelGrid>
-            </p:dialog>
-        </h:form>
-        <!--  -->
-        <h:form id="frmIngkey">
-            <p:dialog id="dlgEditIngkey"
-                widgetVar="dlgEditIngkey"
-                header="Edit/Rename Shopping Category for Ingredient Key"
-                closeOnEscape="true"
-            >
-                <p:panelGrid id="pnlData" columns="2"
-                    styleClass="ui-panelgrid-blank"
-                >
-                    <p:outputLabel for="@next"
-                        value="Ingredient Key"
-                    />
-                    <h:outputText id="ctlDlgIngKeyIngkey"
-                        value="#{shoppingListBean.editShopcat.ingkey}"
-                    />
-                    <p:outputLabel for="@next"
-                        value="Shopping Category"
-                    />
-                    <p:inputText id="ctlDlgIngkeyShopcatName"
-                        label="Position" required="true"
-                        value="#{shoppingListBean.editShopcat.shopcategory}"
-                    />
-                </p:panelGrid>
-                <p:panelGrid columns="2" style="width: 100%"
-                    styleClass="ui-panelgrid-blank"
-                >
-                    <p:commandButton id="ingkDlgOK" value="OK"
-                        style="width: 6em"
-                        action="#{shoppingListBean.ajaxOnClickShopcatIngkey}"
-                        update="form1:tblShopcats"
-                        process="@this pnlData"
-                        oncomplete="PF('dlgEditIngkey').hide()"
-                    />
-                    <p:commandButton id="ingkDlgCan"
-                        value="Cancel" style="width: 6em"
-                        onclick="PF('dlgEditIngkey').hide()"
-                    />
-                </p:panelGrid>
-            </p:dialog>
-        </h:form>
+        <ui:include src="/WEB-INF/layout/misctabs/ingshopkey.xhtml"/>
     </ui:define>
 </ui:composition>
\ No newline at end of file
