Index: applications/manufacturing/widget/manufacturing/BomScreens.xml
===================================================================
--- applications/manufacturing/widget/manufacturing/BomScreens.xml	(revision 1486308)
+++ applications/manufacturing/widget/manufacturing/BomScreens.xml	(working copy)
@@ -20,29 +20,7 @@
 
 <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
-    <screen name="CommonBomDecorator">
-        <section>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>
-                            <!-- do check for MANUFACTURING, _VIEW permission -->
-                            <condition>
-                                <if-has-permission permission="MANUFACTURING" action="_VIEW"/>
-                            </condition>
-                            <widgets>
-                                <include-menu name="BomTabBar" location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
-                                <decorator-section-include name="body"/>
-                            </widgets>
-                            <fail-widgets>
-                                <label style="h3">${uiLabelMap.ManufacturingViewPermissionError}</label>
-                            </fail-widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
+    
     <screen name="EditProductBom">
         <section>
             <actions>
@@ -55,7 +33,7 @@
                 <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/bom/EditProductBom.groovy"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonBomDecorator">
+                <decorator-screen name="CommonBomDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://manufacturing/webapp/manufacturing/bom/EditProductBom.ftl"/></html>
@@ -81,7 +59,7 @@
                 </entity-condition>
             </actions>
             <widgets>
-                <decorator-screen name="CommonBomDecorator">
+                <decorator-screen name="CommonBomDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet id="EditProductManufacturingRulePanel" title="${uiLabelMap.PageTitleEditProductManufacturingRules}" collapsible="true">
                             <include-form name="UpdateProductManufacturingRule" location="component://manufacturing/widget/manufacturing/BomForms.xml"/>
@@ -116,7 +94,7 @@
                 <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/bom/BomSimulation.groovy"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonBomDecorator">
+                <decorator-screen name="CommonBomDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.ManufacturingBomSimulation}">
                             <include-form name="RunBomSimulation" location="component://manufacturing/widget/manufacturing/BomForms.xml"/>
@@ -139,7 +117,7 @@
                 <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/bom/FindProductBom.groovy"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonBomDecorator">
+                <decorator-screen name="CommonBomDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
                             <decorator-section name="menu-bar">
Index: applications/manufacturing/widget/manufacturing/CommonScreens.xml
===================================================================
--- applications/manufacturing/widget/manufacturing/CommonScreens.xml	(revision 1486308)
+++ applications/manufacturing/widget/manufacturing/CommonScreens.xml	(working copy)
@@ -49,5 +49,143 @@
             </widgets>
         </section>
     </screen>
+    
+    <screen name="CommonBomDecorator">
+        <section>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <!-- do check for MANUFACTURING, _VIEW permission -->
+                            <condition>
+                                <if-has-permission permission="MANUFACTURING" action="_VIEW"/>
+                            </condition>
+                            <widgets>
+                                <include-menu name="BomTabBar" location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
+                                <decorator-section-include name="body"/>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.ManufacturingViewPermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="CommonJobshopDecorator">
+        <section>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <!-- do check for MANUFACTURING, _VIEW permission -->
+                            <condition>
+                                <if-has-permission permission="MANUFACTURING" action="_VIEW"/>
+                            </condition>
+                            <widgets>
+                                <section>
+                                    <condition>
+                                        <not><if-empty field="productionRun"/></not>
+                                    </condition>
+                                    <widgets>
+                                        <include-menu name="ProductionRunTabBar" location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
+                                    </widgets>
+                                </section>
+                                <container style="button-bar">
+                                    <link target="CreateProductionRun" text="${uiLabelMap.ManufacturingCreateProductionRun}" style="buttontext"/>
+                                </container>
+                                <container>
+                                    <label style="h1">[${uiLabelMap.CommonId} ${productionRunId}]</label>
+                                </container>
+                                <decorator-section-include name="body"/>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.ManufacturingViewPermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="CommonRoutingDecorator">
+        <section>
+            <actions>
+                <set field="workEffortId" from-field="parameters.workEffortId"/>
+                <entity-one entity-name="WorkEffort" value-field="routing"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <!-- do check for MANUFACTURING, _VIEW permission -->
+                            <condition>
+                                <if-has-permission permission="MANUFACTURING" action="_VIEW"/>
+                            </condition>
+                            <widgets>
+                                <section>
+                                    <condition>
+                                        <not><if-empty field="routing"/></not>
+                                    </condition>
+                                    <widgets>
+                                        <include-menu name="RoutingTabBar" location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
+                                    </widgets>
+                                </section>
+                                <container>
+                                    <label style="h1">[${uiLabelMap.CommonId} ${routing.workEffortId}] ${routing.workEffortName}</label>
+                                </container>
+                                <decorator-section-include name="body"/>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.ManufacturingViewPermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="CommonRoutingTaskDecorator">
+        <section>
+            <actions>
+                <set field="workEffortId" from-field="parameters.workEffortId"/>
+                <entity-one entity-name="WorkEffort" value-field="routingTask"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <!-- do check for MANUFACTURING, _VIEW permission -->
+                            <condition>
+                                <if-has-permission permission="MANUFACTURING" action="_VIEW"/>
+                            </condition>
+                            <widgets>
+                                <section>
+                                    <condition>
+                                        <not><if-empty field="routingTask"/></not>
+                                    </condition>
+                                    <widgets>
+                                        <include-menu name="RoutingTaskTabBar" location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
+                                    </widgets>
+                                </section>
+                                <container>
+                                    <label style="h1">[${uiLabelMap.CommonId} ${routingTask.workEffortId}] ${routingTask.workEffortName}</label>
+                                </container>
+                                <decorator-section-include name="body"/>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.ManufacturingViewPermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
 </screens>
 
Index: applications/manufacturing/widget/manufacturing/JobshopScreens.xml
===================================================================
--- applications/manufacturing/widget/manufacturing/JobshopScreens.xml	(revision 1486308)
+++ applications/manufacturing/widget/manufacturing/JobshopScreens.xml	(working copy)
@@ -20,42 +20,8 @@
 
 <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
-    <screen name="CommonJobshopDecorator">
-        <section>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>
-                            <!-- do check for MANUFACTURING, _VIEW permission -->
-                            <condition>
-                                <if-has-permission permission="MANUFACTURING" action="_VIEW"/>
-                            </condition>
-                            <widgets>
-                                <section>
-                                    <condition>
-                                        <not><if-empty field="productionRun"/></not>
-                                    </condition>
-                                    <widgets>
-                                        <include-menu name="ProductionRunTabBar" location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
-                                    </widgets>
-                                </section>
-                                <container>
-                                    <label style="h1">[${uiLabelMap.CommonId} ${productionRunId}]</label>
-                                </container>
-                                <container style="button-bar">
-                                    <link target="CreateProductionRun" text="${uiLabelMap.ManufacturingCreateProductionRun}" style="buttontext"/>
-                                </container>
-                                <decorator-section-include name="body"/>
-                            </widgets>
-                            <fail-widgets>
-                                <label style="h3">${uiLabelMap.ManufacturingViewPermissionError}</label>
-                            </fail-widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
+    
+    
     <screen name="CreateProductionRun">
         <section>
             <actions>
@@ -104,7 +70,7 @@
                 </entity-condition>
             </actions>
             <widgets>
-                <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
+                <decorator-screen name="CommonJobshopDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.ManufacturingProductionRunId} ${productionRunId}"  navigation-menu-name="ProductionRunStatusAction">
                             <include-menu name="ProductionRunStatusTabBar" location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
@@ -183,7 +149,7 @@
                 </entity-condition>
             </actions>
             <widgets>
-                <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
+                <decorator-screen name="CommonJobshopDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.ManufacturingProductionRunId} ${productionRunId}" navigation-menu-name="ProductionRunStatusAction">
                             <include-menu name="ProductionRunStatusTabBar" location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
@@ -324,7 +290,7 @@
                 </entity-condition>
             </actions>
             <widgets>
-                <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
+                <decorator-screen name="CommonJobshopDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.ManufacturingMandatoryWorkEfforts}">
                             <include-form name="mandatoryWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
@@ -357,7 +323,7 @@
                 <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunTasks.groovy"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
+                <decorator-screen name="CommonJobshopDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet id="EditProductionRunRoutingTaskPanel" title="${uiLabelMap.ManufacturingProductionRunTasks}" collapsible="true">
                             <include-form name="EditProductionRunRoutingTask" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
@@ -384,7 +350,7 @@
                 <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
+                <decorator-screen name="CommonJobshopDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.ManufacturingProductionRunComponents}">
                             <include-form name="AddProductionRunComponent" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
@@ -417,7 +383,7 @@
                 <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
+                <decorator-screen name="CommonJobshopDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.ManufacturingActualMaterials}">
                             <include-form name="IssueProductionRunComponent" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
@@ -446,7 +412,7 @@
                 <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
+                <decorator-screen name="CommonJobshopDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.ManufacturingTaskFixedAssets}">
                             <include-form name="AddProductionRunTaskFixedAsset" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
@@ -477,7 +443,7 @@
                 <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
+                <decorator-screen name="CommonJobshopDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
                             <widgets>
@@ -505,7 +471,7 @@
                 <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunContent.groovy"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
+                <decorator-screen name="CommonJobshopDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
                             <widgets>
@@ -530,16 +496,12 @@
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonJobshopDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
                             <widgets>
                                 <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
-                                    <decorator-section name="menu-bar">
-                                        <container style="button-bar">
-                                            <link target="CreateProductionRun" text="${uiLabelMap.ManufacturingCreateProductionRun}" style="buttontext create"/>
-                                        </container>
-                                    </decorator-section>
+                                    
                                     <decorator-section name="search-options">
                                         <include-form name="findProductionRun" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/>
                                     </decorator-section>
Index: applications/manufacturing/widget/manufacturing/RoutingScreens.xml
===================================================================
--- applications/manufacturing/widget/manufacturing/RoutingScreens.xml	(revision 1486308)
+++ applications/manufacturing/widget/manufacturing/RoutingScreens.xml	(working copy)
@@ -20,80 +20,7 @@
 
 <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
-    <screen name="CommonRoutingDecorator">
-        <section>
-            <actions>
-                <set field="workEffortId" from-field="parameters.workEffortId"/>
-                <entity-one entity-name="WorkEffort" value-field="routing"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>
-                            <!-- do check for MANUFACTURING, _VIEW permission -->
-                            <condition>
-                                <if-has-permission permission="MANUFACTURING" action="_VIEW"/>
-                            </condition>
-                            <widgets>
-                                <section>
-                                    <condition>
-                                        <not><if-empty field="routing"/></not>
-                                    </condition>
-                                    <widgets>
-                                        <include-menu name="RoutingTabBar" location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
-                                    </widgets>
-                                </section>
-                                <container>
-                                    <label style="h1">[${uiLabelMap.CommonId} ${routing.workEffortId}] ${routing.workEffortName}</label>
-                                </container>
-                                <decorator-section-include name="body"/>
-                            </widgets>
-                            <fail-widgets>
-                                <label style="h3">${uiLabelMap.ManufacturingViewPermissionError}</label>
-                            </fail-widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="CommonRoutingTaskDecorator">
-        <section>
-            <actions>
-                <set field="workEffortId" from-field="parameters.workEffortId"/>
-                <entity-one entity-name="WorkEffort" value-field="routingTask"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>
-                            <!-- do check for MANUFACTURING, _VIEW permission -->
-                            <condition>
-                                <if-has-permission permission="MANUFACTURING" action="_VIEW"/>
-                            </condition>
-                            <widgets>
-                                <section>
-                                    <condition>
-                                        <not><if-empty field="routingTask"/></not>
-                                    </condition>
-                                    <widgets>
-                                        <include-menu name="RoutingTaskTabBar" location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/>
-                                    </widgets>
-                                </section>
-                                <container>
-                                    <label style="h1">[${uiLabelMap.CommonId} ${routingTask.workEffortId}] ${routingTask.workEffortName}</label>
-                                </container>
-                                <decorator-section-include name="body"/>
-                            </widgets>
-                            <fail-widgets>
-                                <label style="h3">${uiLabelMap.ManufacturingViewPermissionError}</label>
-                            </fail-widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
+    
 
     <screen name="FindRouting">
         <section>
@@ -143,7 +70,7 @@
                 <entity-one entity-name="WorkEffort" value-field="routing"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonRoutingDecorator">
+                <decorator-screen name="CommonRoutingDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.PageTitleEditRouting}">
                             <container style="button-bar">
@@ -202,7 +129,7 @@
                 <entity-one entity-name="WorkEffort" value-field="routingTask"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonRoutingTaskDecorator">
+                <decorator-screen name="CommonRoutingTaskDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.PageTitleEditRoutingTask}">
                             <container style="button-bar">
@@ -229,7 +156,7 @@
                 </entity-and>
             </actions>
             <widgets>
-                <decorator-screen name="CommonRoutingTaskDecorator">
+                <decorator-screen name="CommonRoutingTaskDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet id="AddRoutingTaskCostPanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.ManufacturingRoutingTaskCosts}" collapsible="true">
                             <include-form name="AddRoutingTaskCost" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
@@ -254,7 +181,7 @@
                 </entity-and>
             </actions>
             <widgets>
-                <decorator-screen name="CommonRoutingTaskDecorator">
+                <decorator-screen name="CommonRoutingTaskDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.PageTitleListRoutingTaskRoutings}">
                             <include-form name="ListRoutingTaskRoutings" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
@@ -279,7 +206,7 @@
                 </entity-and>
             </actions>
             <widgets>
-                <decorator-screen name="CommonRoutingTaskDecorator">
+                <decorator-screen name="CommonRoutingTaskDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet id="EditRoutingTaskProductPanel" title="${uiLabelMap.PageTitleListRoutingTaskProducts}">
                             <link target="EditRoutingTaskProduct" text="${uiLabelMap.ManufacturingNewRoutingTaskProduct}" style="buttontext">
@@ -307,7 +234,7 @@
                 <entity-one entity-name="WorkEffortGoodStandard" value-field="routingProductLink" auto-field-map="true"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonRoutingTaskDecorator">
+                <decorator-screen name="CommonRoutingTaskDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.PageTitleEditRoutingTaskProduct}">
                             <include-form name="EditRoutingTaskProduct" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
@@ -334,7 +261,7 @@
                 </entity-and>
             </actions>
             <widgets>
-                <decorator-screen name="CommonRoutingDecorator">
+                <decorator-screen name="CommonRoutingDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.PageTitleEditRoutingTaskAssoc}">
                             <platform-specific>
@@ -368,7 +295,7 @@
                 <!--<script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditRoutingProductLink.groovy"/>-->
             </actions>
             <widgets>
-                <decorator-screen name="CommonRoutingDecorator">
+                <decorator-screen name="CommonRoutingDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet id="EditRoutingProductLinkPanel" title="${uiLabelMap.PageTitleEditRoutingProductLink}" collapsible="true">
                             <include-form name="EditRoutingProductLink" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
@@ -391,7 +318,7 @@
                 </entity-and>
             </actions>
             <widgets>
-                <decorator-screen name="CommonRoutingTaskDecorator">
+                <decorator-screen name="CommonRoutingTaskDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet id="EditRoutingTaskFixedAssetPanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.ManufacturingRoutingTasks} ${uiLabelMap.ManufacturingRoutingTaskFixedAssets}" collapsible="true">
                             <include-form name="EditRoutingTaskFixedAsset" location="component://manufacturing/widget/manufacturing/RoutingTaskForms.xml"/>
