diff --git a/screen/PopCommerceAdmin/Asset/AssetDetail.xml b/screen/PopCommerceAdmin/Asset/AssetDetail.xml
index a8dfe59..58a1c91 100644
--- a/screen/PopCommerceAdmin/Asset/AssetDetail.xml
+++ b/screen/PopCommerceAdmin/Asset/AssetDetail.xml
@@ -24,6 +24,7 @@ along with this software (see the LICENSE.md file). If not, see
     <transition name="findTransactionEntry"><default-response url="//${appRoot}/Accounting/Transaction/FindTransactionEntry"/></transition>
 
     <transition-include name="getPartyList" location="component://mantle-usl/template/party/PartyForms.xml"/>
+    <transition-include name="getProductList" location="component://PopCommerce/screen/PopCommerceAdmin/Catalog/Product/EditAssocs.xml"/>
 
     <actions>
         <service-call name="mantle.product.AssetServices.get#AssetDisplayInfo" in-map="context" out-map="context"/>
@@ -84,7 +85,7 @@ along with this software (see the LICENSE.md file). If not, see
                     <field name="acquireCostUomId"><default-field><display-entity entity-name="moqui.basic.Uom"/></default-field></field>
                     <field name="acquireCost"><default-field>
                         <text-line size="8"/>
-                        <link url="poDetail" text="PO #${asset.acquireOrderId?:'N/A'}" parameter-map="[orderId:asset.acquireOrderId]"
+                        <link url="orderDetail" text="PO #${asset.acquireOrderId?:'N/A'}" parameter-map="[orderId:asset.acquireOrderId]"
                               link-type="anchor" condition="asset.acquireOrderId"/>
                     </default-field></field>
                     <field name="salvageValue"><default-field><text-line size="8"/></default-field></field>
diff --git a/screen/PopCommerceAdmin/Catalog/Product/EditAssocs.xml b/screen/PopCommerceAdmin/Catalog/Product/EditAssocs.xml
index ac74b51..b73c7ce 100644
--- a/screen/PopCommerceAdmin/Catalog/Product/EditAssocs.xml
+++ b/screen/PopCommerceAdmin/Catalog/Product/EditAssocs.xml
@@ -17,7 +17,7 @@ along with this software (see the LICENSE.md file). If not, see
     <parameter name="productId" required="true"/>
 
     <transition name="editProduct"><default-response url="../EditProduct"/></transition>
-    <transition name="editFeatureGroup"><default-response url="."/></transition><!-- TODO: ../../FeatureGroup/EditFeatureGroup -->
+    <transition name="editFeatureGroup"><default-response url="../../FeatureGroup/EditFeatureGroup"/></transition>
 
     <transition name="getProductList">
         <actions>
diff --git a/screen/PopCommerceAdmin/Catalog/Product/FindProduct.xml b/screen/PopCommerceAdmin/Catalog/Product/FindProduct.xml
index 9b6571e..e219e0a 100644
--- a/screen/PopCommerceAdmin/Catalog/Product/FindProduct.xml
+++ b/screen/PopCommerceAdmin/Catalog/Product/FindProduct.xml
@@ -46,28 +46,32 @@ along with this software (see the LICENSE.md file). If not, see
             <field name="productTypeEnumId">
                 <header-field title="Product Type" show-order-by="true">
                     <widget-template-include location="component://webroot/template/screen/BasicWidgetTemplates.xml#enumDropDown">
-                        <set field="enumTypeId" value="ProductType"/><set field="allowEmpty" value="true"/></widget-template-include>
+                        <set field="enumTypeId" value="ProductType"/><set field="allowEmpty" value="true"/>
+                        <set field="style" value=" "/></widget-template-include>
                 </header-field>
                 <default-field><display-entity entity-name="moqui.basic.Enumeration"/></default-field>
             </field>
             <field name="productClassEnumId">
                 <header-field title="Product Class" show-order-by="true">
                     <widget-template-include location="component://webroot/template/screen/BasicWidgetTemplates.xml#enumDropDown">
-                        <set field="enumTypeId" value="ProductClass"/><set field="allowEmpty" value="true"/></widget-template-include>
+                        <set field="enumTypeId" value="ProductClass"/><set field="allowEmpty" value="true"/>
+                        <set field="style" value=" "/></widget-template-include>
                 </header-field>
                 <default-field><display-entity entity-name="moqui.basic.Enumeration"/></default-field>
             </field>
             <field name="assetTypeEnumId">
                 <header-field title="Asset Type" show-order-by="true">
                     <widget-template-include location="component://webroot/template/screen/BasicWidgetTemplates.xml#enumDropDown">
-                        <set field="enumTypeId" value="AssetType"/><set field="allowEmpty" value="true"/></widget-template-include>
+                        <set field="enumTypeId" value="AssetType"/><set field="allowEmpty" value="true"/>
+                        <set field="style" value=" "/></widget-template-include>
                 </header-field>
                 <default-field><display-entity entity-name="moqui.basic.Enumeration"/></default-field>
             </field>
             <field name="assetClassEnumId">
                 <header-field title="Asset Class" show-order-by="true">
                     <widget-template-include location="component://webroot/template/screen/BasicWidgetTemplates.xml#enumDropDown">
-                        <set field="enumTypeId" value="AssetClass"/><set field="allowEmpty" value="true"/></widget-template-include>
+                        <set field="enumTypeId" value="AssetClass"/><set field="allowEmpty" value="true"/>
+                        <set field="style" value=" "/></widget-template-include>
                 </header-field>
                 <default-field><display-entity entity-name="moqui.basic.Enumeration"/></default-field>
             </field>
diff --git a/screen/PopCommerceAdmin/Customer/EditCustomer.xml b/screen/PopCommerceAdmin/Customer/EditCustomer.xml
index 0106486..1ba27de 100644
--- a/screen/PopCommerceAdmin/Customer/EditCustomer.xml
+++ b/screen/PopCommerceAdmin/Customer/EditCustomer.xml
@@ -17,7 +17,7 @@ along with this software (see the LICENSE.md file). If not, see
 
     <parameter name="partyId" required="true"/>
 
-    <transition name="findOrder"><default-response url="."/></transition><!-- TODO ../../Order/FindOrder -->
+    <transition name="findOrder"><default-response url="../../Order/FindOrder"/></transition>
     <transition name="updateParty"><service-call name="mantle.party.PartyServices.update#PartyDetail"/>
         <default-response url="."/></transition>
 
@@ -55,7 +55,7 @@ along with this software (see the LICENSE.md file). If not, see
     <widgets>
         <container-row>
             <row-col lg="6">
-                <link url="findOrder" text="Orders" parameter-map="[vendorPartyId:partyId]"/>
+                <link url="findOrder" text="Orders" parameter-map="[customerPartyId:partyId]"/>
 
                 <section name="NonUserPerson" condition="party?.partyTypeEnumId == 'PtyPerson' &amp;&amp; !userAccount">
                     <actions>
diff --git a/screen/PopCommerceAdmin/Customer/FindCustomer.xml b/screen/PopCommerceAdmin/Customer/FindCustomer.xml
index e544a9e..f192021 100644
--- a/screen/PopCommerceAdmin/Customer/FindCustomer.xml
+++ b/screen/PopCommerceAdmin/Customer/FindCustomer.xml
@@ -17,7 +17,7 @@ along with this software (see the LICENSE.md file). If not, see
 
     <transition name="findCustomer"><default-response url="."/></transition>
     <transition name="editCustomer"><default-response url="../EditCustomer"/></transition>
-    <transition name="findOrder"><default-response url="."/></transition><!-- TODO ../../Order/FindOrder -->
+    <transition name="findOrder"><default-response url="../../Order/FindOrder"/></transition>
 
     <transition name="createPerson"><service-call name="mantle.party.PartyServices.create#Person"/>
         <default-response url="../EditCustomer"/></transition>
diff --git a/screen/PopCommerceAdmin/Facility/EditFacilityLocations.xml b/screen/PopCommerceAdmin/Facility/EditFacilityLocations.xml
index a37551d..e35808c 100644
--- a/screen/PopCommerceAdmin/Facility/EditFacilityLocations.xml
+++ b/screen/PopCommerceAdmin/Facility/EditFacilityLocations.xml
@@ -16,7 +16,7 @@ along with this software (see the LICENSE.md file). If not, see
 
     <parameter name="facilityId" required="true"/>
 
-    <transition name="findAsset"><default-response url="."/></transition><!-- TODO ../../Inventory/FindAsset -->
+    <transition name="findAsset"><default-response url="../../Asset/FindAsset"/></transition>
     <transition name="createFacilityLocation"><service-call name="mantle.facility.FacilityServices.create#FacilityLocation"/>
         <default-response url="."/></transition>
     <transition name="updateFacilityLocation"><service-call name="update#mantle.facility.FacilityLocation"/>
diff --git a/screen/PopCommerceAdmin/Picking/FindPicklist.xml b/screen/PopCommerceAdmin/Picking/FindPicklist.xml
index fb0580d..10cd12a 100644
--- a/screen/PopCommerceAdmin/Picking/FindPicklist.xml
+++ b/screen/PopCommerceAdmin/Picking/FindPicklist.xml
@@ -18,7 +18,7 @@ along with this software (see the LICENSE.md file). If not, see
         <default-response url="../PicklistDetail"/></transition>
     <transition name="shipmentDetail"><default-response url="../../Shipment/ShipmentDetail"/></transition>
     <transition name="picklistDetail"><default-response url="../PicklistDetail"/></transition>
-    <transition name="equipmentDetail"><default-response url="."/></transition><!-- TODO EquipmentDetail once implemented -->
+    <transition name="equipmentDetail"><default-response url="../../Asset/AssetDetail"/></transition>
 
     <actions>
         <entity-find entity-name="mantle.work.effort.WorkEffortShipmentLoadFind" list="picklistList">
diff --git a/screen/PopCommerceAdmin/Picking/PicklistDetail.xml b/screen/PopCommerceAdmin/Picking/PicklistDetail.xml
index 6fea76a..d95f6d0 100644
--- a/screen/PopCommerceAdmin/Picking/PicklistDetail.xml
+++ b/screen/PopCommerceAdmin/Picking/PicklistDetail.xml
@@ -25,7 +25,7 @@ along with this software (see the LICENSE.md file). If not, see
     <transition name="updateShipment"><service-call name="update#mantle.shipment.Shipment"/>
         <default-response url="."/></transition>
 
-    <transition name="equipmentDetail"><default-response url="."/></transition><!-- TODO EquipmentDetail once implemented -->
+    <transition name="equipmentDetail"><default-response url="../../Asset/AssetDetail"/></transition>
 
     <transition name="addAssetAssign"><service-call name="create#mantle.work.effort.WorkEffortAssetAssign"/>
         <default-response url="."/></transition>
diff --git a/screen/PopCommerceAdmin/Shipment/ShipmentDetail.xml b/screen/PopCommerceAdmin/Shipment/ShipmentDetail.xml
index 344e1f3..0d09cd3 100644
--- a/screen/PopCommerceAdmin/Shipment/ShipmentDetail.xml
+++ b/screen/PopCommerceAdmin/Shipment/ShipmentDetail.xml
@@ -45,7 +45,7 @@ along with this software (see the LICENSE.md file). If not, see
 
     <transition name="orderDetail"><default-response url="//PopcAdmin/Order/OrderDetail"/></transition>
     <transition name="editInvoice"><default-response url="//PopcAdmin/Accounting/EditInvoice"/></transition>
-    <transition name="assetDetail"><default-response url="."/></transition><!-- TODO once we have Asset screens -->
+    <transition name="assetDetail"><default-response url="//PopcAdmin/Asset/AssetDetail"/></transition>
 
     <transition name="createContent"><service-call name="mantle.shipment.ShipmentServices.create#ShipmentContent"/>
         <default-response url="."/></transition>
diff --git a/screen/PopCommerceAdmin/Supplier/EditSupplier.xml b/screen/PopCommerceAdmin/Supplier/EditSupplier.xml
index cebd1de..48721f8 100644
--- a/screen/PopCommerceAdmin/Supplier/EditSupplier.xml
+++ b/screen/PopCommerceAdmin/Supplier/EditSupplier.xml
@@ -16,7 +16,7 @@ along with this software (see the LICENSE.md file). If not, see
 
     <parameter name="partyId" required="true"/>
 
-    <transition name="findOrder"><default-response url="."/></transition><!-- TODO ../../Order/FindOrder -->
+    <transition name="findOrder"><default-response url="../../Order/FindOrder"/></transition>
     <transition name="updateParty"><service-call name="mantle.party.PartyServices.update#PartyDetail"/>
         <default-response url="."/></transition>
 
diff --git a/screen/PopCommerceAdmin/Supplier/FindSupplier.xml b/screen/PopCommerceAdmin/Supplier/FindSupplier.xml
index 8902fd0..62e50c3 100644
--- a/screen/PopCommerceAdmin/Supplier/FindSupplier.xml
+++ b/screen/PopCommerceAdmin/Supplier/FindSupplier.xml
@@ -16,7 +16,7 @@ along with this software (see the LICENSE.md file). If not, see
 
     <transition name="findSupplier"><default-response url="."/></transition>
     <transition name="editSupplier"><default-response url="../EditSupplier"/></transition>
-    <transition name="findOrder"><default-response url="."/></transition><!-- TODO ../../Order/FindOrder -->
+    <transition name="findOrder"><default-response url="../../Order/FindOrder"/></transition>
 
     <transition name="createPerson"><service-call name="mantle.party.PartyServices.create#Person"/>
         <default-response url="../EditSupplier"/></transition>