diff --git a/.cursor/skills/add-tabs-to-page/SKILL.md b/.cursor/skills/add-tabs-to-page/SKILL.md
index 89ab768..86f2bc9 100644
--- a/.cursor/skills/add-tabs-to-page/SKILL.md
+++ b/.cursor/skills/add-tabs-to-page/SKILL.md
@@ -125,7 +125,7 @@ Date pickers use `"type": "DATE_PICKER_WIDGET2"`, `"dateFormat": "YYYY-MM-DD HH:
 ### 4. Create queries for each tab
 
 Follow the **add-query-to-table** skill. Each query's `metadata.json` must have:
-- `"pageId"`: the page name (e.g. `"Pending POs - All"`)
+- `"pageId"`: the page name (e.g. `"Pending POs"`)
 - `"gitSyncId"`: use the same 24-char hex prefix as the page, with a unique UUID suffix
 - `"runBehaviour": "AUTOMATIC"`
 
@@ -212,4 +212,4 @@ When merging separate pages into one tabbed page:
 | Widget-in-tab parent | Canvas `widgetId` for that tab |
 | `defaultTab` | Tab **label** (not tab ID) |
 | `tabsObj` keys | `tab1`, `tab2`, `tab3`, ... |
-| Existing examples | `Sales - Units Shipped`, `Pending POs - All` |
+| Existing examples | `Sales - Units Shipped`, `Pending POs` |
diff --git a/application.json b/application.json
index 1de2e8b..c1eb87e 100644
--- a/application.json
+++ b/application.json
@@ -42,7 +42,7 @@
       "isDefault": false
     },
     {
-      "id": "Pending POs - All",
+      "id": "Pending POs",
       "isDefault": false
     }
   ],
diff --git a/pages/Pending POs - All/Pending POs - All.json b/pages/Pending POs/Pending POs.json
similarity index 96%
rename from pages/Pending POs - All/Pending POs - All.json
rename to pages/Pending POs/Pending POs.json
index 1537bff..41f4255 100644
--- a/pages/Pending POs - All/Pending POs - All.json	
+++ b/pages/Pending POs/Pending POs.json	
@@ -27,7 +27,7 @@
         }
       }
     ],
-    "name": "Pending POs - All",
+    "name": "Pending POs",
     "slug": "pending-pos-all"
   }
 }
diff --git a/pages/Pending POs - All/queries/pending_pos_all/metadata.json b/pages/Pending POs/queries/pending_pos_all/metadata.json
similarity index 98%
rename from pages/Pending POs - All/queries/pending_pos_all/metadata.json
rename to pages/Pending POs/queries/pending_pos_all/metadata.json
index 776ad4f..35b19a2 100644
--- a/pages/Pending POs - All/queries/pending_pos_all/metadata.json	
+++ b/pages/Pending POs/queries/pending_pos_all/metadata.json	
@@ -1,6 +1,6 @@
 {
   "gitSyncId": "3c80e1fdb2304c28beaba450_db5d4d8c-ed8e-49e7-a147-e5ebe833f6bc",
-  "id": "Pending POs - All_pending_pos_all",
+  "id": "Pending POs_pending_pos_all",
   "pluginId": "postgres-plugin",
   "pluginType": "DB",
   "unpublishedAction": {
@@ -24,7 +24,7 @@
     },
     "dynamicBindingPathList": [],
     "name": "pending_pos_all",
-    "pageId": "Pending POs - All",
+    "pageId": "Pending POs",
     "runBehaviour": "AUTOMATIC",
     "userSetOnLoad": false
   }
diff --git a/pages/Pending POs - All/queries/pending_pos_all/pending_pos_all.txt b/pages/Pending POs/queries/pending_pos_all/pending_pos_all.txt
similarity index 100%
rename from pages/Pending POs - All/queries/pending_pos_all/pending_pos_all.txt
rename to pages/Pending POs/queries/pending_pos_all/pending_pos_all.txt
diff --git a/pages/Pending POs - All/queries/pending_pos_alx_pending/metadata.json b/pages/Pending POs/queries/pending_pos_alx_pending/metadata.json
similarity index 90%
rename from pages/Pending POs - All/queries/pending_pos_alx_pending/metadata.json
rename to pages/Pending POs/queries/pending_pos_alx_pending/metadata.json
index 63f2281..5dfcf61 100644
--- a/pages/Pending POs - All/queries/pending_pos_alx_pending/metadata.json	
+++ b/pages/Pending POs/queries/pending_pos_alx_pending/metadata.json	
@@ -1,6 +1,6 @@
 {
   "gitSyncId": "3c80e1fdb2304c28beaba450_9c5cb3e8-3419-484f-bffa-e79e23768bfe",
-  "id": "Pending POs - All_pending_pos_alx_pending",
+  "id": "Pending POs_pending_pos_alx_pending",
   "pluginId": "postgres-plugin",
   "pluginType": "DB",
   "unpublishedAction": {
@@ -24,7 +24,7 @@
     },
     "dynamicBindingPathList": [],
     "name": "pending_pos_alx_pending",
-    "pageId": "Pending POs - All",
+    "pageId": "Pending POs",
     "runBehaviour": "AUTOMATIC",
     "userSetOnLoad": false
   }
diff --git a/pages/Pending POs - All/queries/pending_pos_alx_pending/pending_pos_alx_pending.txt b/pages/Pending POs/queries/pending_pos_alx_pending/pending_pos_alx_pending.txt
similarity index 100%
rename from pages/Pending POs - All/queries/pending_pos_alx_pending/pending_pos_alx_pending.txt
rename to pages/Pending POs/queries/pending_pos_alx_pending/pending_pos_alx_pending.txt
diff --git a/pages/Pending POs - All/queries/pending_pos_ml_pending/metadata.json b/pages/Pending POs/queries/pending_pos_ml_pending/metadata.json
similarity index 90%
rename from pages/Pending POs - All/queries/pending_pos_ml_pending/metadata.json
rename to pages/Pending POs/queries/pending_pos_ml_pending/metadata.json
index e215137..37e8148 100644
--- a/pages/Pending POs - All/queries/pending_pos_ml_pending/metadata.json	
+++ b/pages/Pending POs/queries/pending_pos_ml_pending/metadata.json	
@@ -1,6 +1,6 @@
 {
   "gitSyncId": "3c80e1fdb2304c28beaba450_1cad4bf5-17c0-4be7-b37a-4bfd4c61ddd4",
-  "id": "Pending POs - All_pending_pos_ml_pending",
+  "id": "Pending POs_pending_pos_ml_pending",
   "pluginId": "postgres-plugin",
   "pluginType": "DB",
   "unpublishedAction": {
@@ -24,7 +24,7 @@
     },
     "dynamicBindingPathList": [],
     "name": "pending_pos_ml_pending",
-    "pageId": "Pending POs - All",
+    "pageId": "Pending POs",
     "runBehaviour": "AUTOMATIC",
     "userSetOnLoad": false
   }
diff --git a/pages/Pending POs - All/queries/pending_pos_ml_pending/pending_pos_ml_pending.txt b/pages/Pending POs/queries/pending_pos_ml_pending/pending_pos_ml_pending.txt
similarity index 100%
rename from pages/Pending POs - All/queries/pending_pos_ml_pending/pending_pos_ml_pending.txt
rename to pages/Pending POs/queries/pending_pos_ml_pending/pending_pos_ml_pending.txt
diff --git a/pages/Pending POs - All/queries/pending_pos_slx_pending/metadata.json b/pages/Pending POs/queries/pending_pos_slx_pending/metadata.json
similarity index 90%
rename from pages/Pending POs - All/queries/pending_pos_slx_pending/metadata.json
rename to pages/Pending POs/queries/pending_pos_slx_pending/metadata.json
index 223d1b7..97b5e91 100644
--- a/pages/Pending POs - All/queries/pending_pos_slx_pending/metadata.json	
+++ b/pages/Pending POs/queries/pending_pos_slx_pending/metadata.json	
@@ -1,6 +1,6 @@
 {
   "gitSyncId": "3c80e1fdb2304c28beaba450_de156d2b-c302-4b7b-bc7d-6e150866194f",
-  "id": "Pending POs - All_pending_pos_slx_pending",
+  "id": "Pending POs_pending_pos_slx_pending",
   "pluginId": "postgres-plugin",
   "pluginType": "DB",
   "unpublishedAction": {
@@ -24,7 +24,7 @@
     },
     "dynamicBindingPathList": [],
     "name": "pending_pos_slx_pending",
-    "pageId": "Pending POs - All",
+    "pageId": "Pending POs",
     "runBehaviour": "AUTOMATIC",
     "userSetOnLoad": false
   }
diff --git a/pages/Pending POs - All/queries/pending_pos_slx_pending/pending_pos_slx_pending.txt b/pages/Pending POs/queries/pending_pos_slx_pending/pending_pos_slx_pending.txt
similarity index 100%
rename from pages/Pending POs - All/queries/pending_pos_slx_pending/pending_pos_slx_pending.txt
rename to pages/Pending POs/queries/pending_pos_slx_pending/pending_pos_slx_pending.txt
diff --git a/pages/Pending POs - All/queries/pending_pos_sr_pending/metadata.json b/pages/Pending POs/queries/pending_pos_sr_pending/metadata.json
similarity index 98%
rename from pages/Pending POs - All/queries/pending_pos_sr_pending/metadata.json
rename to pages/Pending POs/queries/pending_pos_sr_pending/metadata.json
index 2fa7f4d..a05afc9 100644
--- a/pages/Pending POs - All/queries/pending_pos_sr_pending/metadata.json	
+++ b/pages/Pending POs/queries/pending_pos_sr_pending/metadata.json	
@@ -1,6 +1,6 @@
 {
   "gitSyncId": "3c80e1fdb2304c28beaba450_2861a2ed-a204-4ad6-89e9-3165332e6bce",
-  "id": "Pending POs - All_pending_pos_sr_pending",
+  "id": "Pending POs_pending_pos_sr_pending",
   "pluginId": "postgres-plugin",
   "pluginType": "DB",
   "unpublishedAction": {
@@ -24,7 +24,7 @@
     },
     "dynamicBindingPathList": [],
     "name": "pending_pos_sr_pending",
-    "pageId": "Pending POs - All",
+    "pageId": "Pending POs",
     "runBehaviour": "AUTOMATIC",
     "userSetOnLoad": false
   }
diff --git a/pages/Pending POs - All/queries/pending_pos_sr_pending/pending_pos_sr_pending.txt b/pages/Pending POs/queries/pending_pos_sr_pending/pending_pos_sr_pending.txt
similarity index 100%
rename from pages/Pending POs - All/queries/pending_pos_sr_pending/pending_pos_sr_pending.txt
rename to pages/Pending POs/queries/pending_pos_sr_pending/pending_pos_sr_pending.txt
diff --git a/pages/Pending POs - All/widgets/Container1/Button1.json b/pages/Pending POs/widgets/Container1/Button1.json
similarity index 100%
rename from pages/Pending POs - All/widgets/Container1/Button1.json
rename to pages/Pending POs/widgets/Container1/Button1.json
diff --git a/pages/Pending POs - All/widgets/Container1/Button1Copy.json b/pages/Pending POs/widgets/Container1/Button1Copy.json
similarity index 100%
rename from pages/Pending POs - All/widgets/Container1/Button1Copy.json
rename to pages/Pending POs/widgets/Container1/Button1Copy.json
diff --git a/pages/Pending POs - All/widgets/Container1/Button1Copy2.json b/pages/Pending POs/widgets/Container1/Button1Copy2.json
similarity index 100%
rename from pages/Pending POs - All/widgets/Container1/Button1Copy2.json
rename to pages/Pending POs/widgets/Container1/Button1Copy2.json
diff --git a/pages/Pending POs - All/widgets/Container1/Button2All.json b/pages/Pending POs/widgets/Container1/Button2All.json
similarity index 93%
rename from pages/Pending POs - All/widgets/Container1/Button2All.json
rename to pages/Pending POs/widgets/Container1/Button2All.json
index d937adb..27f08bd 100644
--- a/pages/Pending POs - All/widgets/Container1/Button2All.json	
+++ b/pages/Pending POs/widgets/Container1/Button2All.json	
@@ -28,7 +28,7 @@
   "mobileRightColumn": 16,
   "mobileTopRow": 22,
   "needsErrorInfo": false,
-  "onClick": "{{navigateTo('Pending POs - All', {}, 'SAME_WINDOW');}}",
+  "onClick": "{{navigateTo('Pending POs', {}, 'SAME_WINDOW');}}",
   "originalBottomRow": 26,
   "originalTopRow": 22,
   "parentColumnSpace": 3.841796875,
diff --git a/pages/Pending POs - All/widgets/Container1/Container1.json b/pages/Pending POs/widgets/Container1/Container1.json
similarity index 100%
rename from pages/Pending POs - All/widgets/Container1/Container1.json
rename to pages/Pending POs/widgets/Container1/Container1.json
diff --git a/pages/Pending POs - All/widgets/Container1/Text1.json b/pages/Pending POs/widgets/Container1/Text1.json
similarity index 100%
rename from pages/Pending POs - All/widgets/Container1/Text1.json
rename to pages/Pending POs/widgets/Container1/Text1.json
diff --git a/pages/Pending POs - All/widgets/Container1/Text2.json b/pages/Pending POs/widgets/Container1/Text2.json
similarity index 100%
rename from pages/Pending POs - All/widgets/Container1/Text2.json
rename to pages/Pending POs/widgets/Container1/Text2.json
diff --git a/pages/Pending POs - All/widgets/Heading.json b/pages/Pending POs/widgets/Heading.json
similarity index 97%
rename from pages/Pending POs - All/widgets/Heading.json
rename to pages/Pending POs/widgets/Heading.json
index c21d934..2b5cc4a 100644
--- a/pages/Pending POs - All/widgets/Heading.json	
+++ b/pages/Pending POs/widgets/Heading.json	
@@ -40,7 +40,7 @@
   "responsiveBehavior": "fill",
   "rightColumn": 64,
   "shouldTruncate": false,
-  "text": "Pending POs - All",
+  "text": "Pending POs",
   "textAlign": "LEFT",
   "textColor": "#231F20",
   "topRow": 0,
diff --git a/pages/Pending POs - All/widgets/Tabs1/TableALx.json b/pages/Pending POs/widgets/Tabs1/TableALx.json
similarity index 100%
rename from pages/Pending POs - All/widgets/Tabs1/TableALx.json
rename to pages/Pending POs/widgets/Tabs1/TableALx.json
diff --git a/pages/Pending POs - All/widgets/Tabs1/TableAll.json b/pages/Pending POs/widgets/Tabs1/TableAll.json
similarity index 100%
rename from pages/Pending POs - All/widgets/Tabs1/TableAll.json
rename to pages/Pending POs/widgets/Tabs1/TableAll.json
diff --git a/pages/Pending POs - All/widgets/Tabs1/TableML.json b/pages/Pending POs/widgets/Tabs1/TableML.json
similarity index 100%
rename from pages/Pending POs - All/widgets/Tabs1/TableML.json
rename to pages/Pending POs/widgets/Tabs1/TableML.json
diff --git a/pages/Pending POs - All/widgets/Tabs1/TableSLx.json b/pages/Pending POs/widgets/Tabs1/TableSLx.json
similarity index 100%
rename from pages/Pending POs - All/widgets/Tabs1/TableSLx.json
rename to pages/Pending POs/widgets/Tabs1/TableSLx.json
diff --git a/pages/Pending POs - All/widgets/Tabs1/TableSR.json b/pages/Pending POs/widgets/Tabs1/TableSR.json
similarity index 100%
rename from pages/Pending POs - All/widgets/Tabs1/TableSR.json
rename to pages/Pending POs/widgets/Tabs1/TableSR.json
diff --git a/pages/Pending POs - All/widgets/Tabs1/Tabs1.json b/pages/Pending POs/widgets/Tabs1/Tabs1.json
similarity index 100%
rename from pages/Pending POs - All/widgets/Tabs1/Tabs1.json
rename to pages/Pending POs/widgets/Tabs1/Tabs1.json
diff --git a/pages/Sales - Capacity Planning/widgets/Container1/Button2All.json b/pages/Sales - Capacity Planning/widgets/Container1/Button2All.json
index e34147d..36a14a1 100644
--- a/pages/Sales - Capacity Planning/widgets/Container1/Button2All.json	
+++ b/pages/Sales - Capacity Planning/widgets/Container1/Button2All.json	
@@ -24,7 +24,7 @@
   "mobileRightColumn": 16,
   "mobileTopRow": 22,
   "needsErrorInfo": false,
-  "onClick": "{{navigateTo('Pending POs - All', {}, 'SAME_WINDOW');}}",
+  "onClick": "{{navigateTo('Pending POs', {}, 'SAME_WINDOW');}}",
   "originalBottomRow": 26,
   "originalTopRow": 22,
   "parentColumnSpace": 3.841796875,
diff --git a/pages/Sales - Units Ordered/widgets/Container1/Button2All.json b/pages/Sales - Units Ordered/widgets/Container1/Button2All.json
index 81a04b0..96267fe 100644
--- a/pages/Sales - Units Ordered/widgets/Container1/Button2All.json	
+++ b/pages/Sales - Units Ordered/widgets/Container1/Button2All.json	
@@ -24,7 +24,7 @@
   "mobileRightColumn": 16,
   "mobileTopRow": 22,
   "needsErrorInfo": false,
-  "onClick": "{{navigateTo('Pending POs - All', {}, 'SAME_WINDOW');}}",
+  "onClick": "{{navigateTo('Pending POs', {}, 'SAME_WINDOW');}}",
   "originalBottomRow": 26,
   "originalTopRow": 22,
   "parentColumnSpace": 3.841796875,
diff --git a/pages/Sales - Units Shipped/widgets/Container1/Button2All.json b/pages/Sales - Units Shipped/widgets/Container1/Button2All.json
index cabb88f..6280a2d 100644
--- a/pages/Sales - Units Shipped/widgets/Container1/Button2All.json	
+++ b/pages/Sales - Units Shipped/widgets/Container1/Button2All.json	
@@ -24,7 +24,7 @@
   "mobileRightColumn": 16,
   "mobileTopRow": 22,
   "needsErrorInfo": false,
-  "onClick": "{{navigateTo('Pending POs - All', {}, 'SAME_WINDOW');}}",
+  "onClick": "{{navigateTo('Pending POs', {}, 'SAME_WINDOW');}}",
   "originalBottomRow": 26,
   "originalTopRow": 22,
   "parentColumnSpace": 3.841796875,