diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index bb0e548..14a4534 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -14,7 +14,7 @@ moqui-elasticsearch (1.0.0), moqui-fop (1.0.0), and moqui-kie (1.0.0) tool
 components.
 
 This release includes various improvements from SimpleScreens and updates
-for the various changes in Moqui Framework 2.0.0.
+for the new features and improvements in Moqui Framework 2.0.0.
 
 TODO
 
diff --git a/screen/PopCommerceAdmin/dashboard.xml b/screen/PopCommerceAdmin/dashboard.xml
index 5c6b11c..472188f 100644
--- a/screen/PopCommerceAdmin/dashboard.xml
+++ b/screen/PopCommerceAdmin/dashboard.xml
@@ -33,8 +33,6 @@ along with this software (see the LICENSE.md file). If not, see
     </actions>
     <widgets>
         <container-row>
-
-
             <row-col md="2">
                 <label text="Operate" type="h3"/>
                 <container>
@@ -42,9 +40,9 @@ along with this software (see the LICENSE.md file). If not, see
                     <link text="Suppliers" url="../Supplier" link-type="anchor"/>
                 </container>
                 <container>
-                    <link url="../Order" link-type="anchor" parameter-map="[customerRoleTypeId:'OrgInternal']">
+                    <link url="../Order" link-type="anchor" parameter-map="[orderType:'Purchase']">
                         <image url="/popc/static/images/Purchasing.png" url-type="screen" style="invertible"/></link>
-                    <link text="Purchasing" url="../Order" link-type="anchor" parameter-map="[customerRoleTypeId:'OrgInternal']"/>
+                    <link text="Purchasing" url="../Order" link-type="anchor" parameter-map="[orderType:'Purchase']"/>
                 </container>
                 <container>
                     <link url="../Shipment" link-type="anchor" parameter-map="[parentShipmentType:'ShpTpIncoming']">
@@ -62,9 +60,9 @@ along with this software (see the LICENSE.md file). If not, see
                     <link text="Customers" url="../Customer" link-type="anchor"/>
                 </container>
                 <container>
-                    <link url="../Order" link-type="anchor" parameter-map="[vendorRoleTypeId:'OrgInternal']">
+                    <link url="../Order" link-type="anchor" parameter-map="[orderType:'Sales']">
                         <image url="/popc/static/images/Sales.png" url-type="screen" style="invertible"/></link>
-                    <link text="Sales" url="../Order" link-type="anchor" parameter-map="[vendorRoleTypeId:'OrgInternal']"/>
+                    <link text="Sales" url="../Order" link-type="anchor" parameter-map="[orderType:'Sales']"/>
                 </container>
                 <container>
                     <link url="../Picking" link-type="anchor">