diff --git a/X_X04SA.json b/X_X04SA.json
index 4d97fcc..6df2e4a 100644
--- a/X_X04SA.json
+++ b/X_X04SA.json
@@ -14,18 +14,23 @@
         },
         {
             "type": "cmd",
-            "text": "Powder Diffractometer Overview",
+            "text": "1D Powder Diffraction",
             "command": "caqtdm -x -attach -noMsg X_X04SA_ES2_overview.ui"
         },
         {
             "type": "cmd",
-            "text": "Surface Diffractometer Overview",
+            "text": "2D Optical Tables",
+            "command": "caqtdm -x -attach -noMsg X_X04SA_OT_overview.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "3D Surface Diffraction",
             "command": "caqtdm -x -attach -noMsg X_X04SA_ES3_overview.ui"
         },
         {
             "type": "cmd",
             "text": "Operation Info Panel",
-            "command": "caqtdm -x -macro BL=X04SA SLS_OP_Info.ui"
+            "command": "caqtdm -x -macro BL=X04SA A_OP_Info_Panel.ui"
         },
         {
             "type": "menu",