diff --git a/deploy/runtime/startup.lk b/deploy/runtime/startup.lk
index c7539c0f79..99db39d579 100644
--- a/deploy/runtime/startup.lk
+++ b/deploy/runtime/startup.lk
@@ -2733,13 +2733,15 @@ addpage( [[ 'Wind Farm Costs']], { 'sidebar'='Wind Installation Costs', 'help'='
 addpage( [[ 'Operating Costs' ]], {'sidebar' = 'Wind Operating Costs', 'help'='oc_operating', 'bin_name'='Wind'} );
 //fuel cell
 addpage( [[ 'Fuel Cell']], {'sidebar'='Fuel Cell', 'help'='fuelcell_fuel_cell', 'bin_name'='FuelCell'});
+//addpage( [[{'name'='Fuel Cell Dispatch Fixed Output', 'caption'='Fixed Output'}], [{'name'='Fuel Cell Dispatch Follow Load', 'caption'='Load Following'}], [{'name'='Fuel Cell Dispatch Manual', 'caption'='Manual'}], [{'name'='Fuel Cell Dispatch Input', 'caption'='Input Dispatch'}]], { 'sidebar'='Fuel Cell Dispatch', 'help'='fuelcell_dispatch', 'exclusive_var' = 'fuelcell_dispatch_excl', 'exclusive_header_pages' = ['Fuel Cell Dispatch'], 'exclusive_tabs'=true, 'exclusive_hide'=true} );
+addpage( [[{'name'='AA Empty', 'caption'='Fixed Output'}], [{'name'='AA Empty', 'caption'='Load Following'}], [{'name'='AA Empty', 'caption'='Manual'}], [{'name'='AA Empty', 'caption'='Input Dispatch'}]], { 'sidebar'='Fuel Cell Dispatch', 'help'='fuelcell_dispatch', 'exclusive_var' = 'fuelcell_dispatch_excl', 'exclusive_header_pages' = ['Fuel Cell Dispatch'], 'exclusive_tabs'=true, 'exclusive_hide'=true, 'bin_name'='FuelCell'} );
 addpage( [[ 'Fuel Cell Costs Hybrid' ]], { 'sidebar'='Fuel Cell Installation Costs', 'help'='cc_fuel_cell', 'bin_name'='FuelCell' } );
 addpage( [[ 'Operating Costs Fuel Cell Hybrid' ]], { 'sidebar'='Fuel Cell Operating Costs', 'help'='oc_fuel_cell', 'bin_name'='FuelCell' } );
 // battery
 setup_pages_battery_cell_and_system(false, false); // No REopt and FOM
 setup_pages_battery_life();
-addpage( [[ {'name'='Battery Dispatch Automated FOM', 'caption'='Automated'} ], [ {'name'='Battery Dispatch Custom Time Series', 'caption'='Custom Time Series'} ], [{'name'='Fuel Cell Dispatch Manual', 'caption'='Manual'}]], { 'sidebar'='Dispatch', 'help'='fuelcell_dispatch', 'exclusive_var' = 'batt_dispatch_excl', 'exclusive_header_pages' = ['Fuel Cell Dispatch', 'Battery Dispatch Common', 'Battery Dispatch Standalone Options FOM'], 'exclusive_tabs'=true, 'exclusive_hide'=true} );
-addpage( [[ 'Standalone Battery Costs', 'Battery Enable' ]], { 'sidebar'='Battery Installation Costs', 'help'='cc_standalone_battery', 'bin_name'='Battery' } );
+addpage( [[ {'name'='Battery Dispatch Automated FOM', 'caption'='Automated'} ], [ {'name'='Battery Dispatch Custom Time Series', 'caption'='Custom Time Series'} ], [ {'name'='Fuel Cell Dispatch Manual', 'caption'='Manual'} ]], { 'sidebar'='Battery Dispatch', 'help'='fuelcell_dispatch', 'exclusive_var' = 'batt_dispatch_excl', 'exclusive_header_pages' = ['Battery Dispatch Common', 'Battery Dispatch Standalone Options FOM'], 'exclusive_tabs'=true, 'exclusive_hide'=true, 'bin_name'='Battery'} );
+addpage( [[ 'Standalone Battery Costs'/*, 'Battery Enable' set on battery dispatch automated fom*/ ]], { 'sidebar'='Battery Installation Costs', 'help'='cc_standalone_battery', 'bin_name'='Battery' } );
 addpage( [[ 'Operating Costs Standalone Battery']], { 'sidebar'='Battery Operating Costs', 'help'='oc_battery', 'bin_name'='Battery' } );
 setup_grid_limits_page();
 // single owner
diff --git a/deploy/runtime/ui/AA Empty.json b/deploy/runtime/ui/AA Empty.json
new file mode 100644
index 0000000000..a3ca2858d5
--- /dev/null
+++ b/deploy/runtime/ui/AA Empty.json	
@@ -0,0 +1,9 @@
+{
+    "Name": "AA Empty",
+    "Width": 987.0,
+    "Height": 1758.0,
+    "FormObjects": {},
+    "VarDatabase": {},
+    "Equations": [],
+    "Callbacks": []
+}
\ No newline at end of file
diff --git a/deploy/runtime/ui/Battery Dispatch Standalone Options FOM.json b/deploy/runtime/ui/Battery Dispatch Standalone Options FOM.json
index 7e853e47c6..9b1f784612 100644
--- a/deploy/runtime/ui/Battery Dispatch Standalone Options FOM.json	
+++ b/deploy/runtime/ui/Battery Dispatch Standalone Options FOM.json	
@@ -382,11 +382,11 @@
         "{",
         "\tshow_hide_charge_options();",
         "\tcheck_auto_ppa();\r",
-        "\tif (  technology() == 'PVWatts Wind FuelCell Battery Hybrid' \r",
+        "\t/*if (  technology() == 'PVWatts Wind FuelCell Battery Hybrid' \r",
         "\t   || technology() == 'Generic PVWatts Wind FuelCell Battery Hybrid'  )\r",
         "\t{\r",
         "\t\tcheck_fuel_cell_dispatch(); // function defined in Fuel Cell Dispatch callback\r",
-        "\t}\r",
+        "\t}*/\r",
         "\t",
         "\tvalue('batt_dispatch_excl', value('batt_dispatch_choice_ui'));",
         "};",
diff --git a/deploy/runtime/ui/Fuel Cell Dispatch.json b/deploy/runtime/ui/Fuel Cell Dispatch.json
index 866a591ddf..164ac3637e 100644
--- a/deploy/runtime/ui/Fuel Cell Dispatch.json	
+++ b/deploy/runtime/ui/Fuel Cell Dispatch.json	
@@ -513,8 +513,9 @@
         "on_change{'fuelcell_dispatch_choice'} = define()",
         "{",
         "\tenable_fc_dispatch_options();",
-        "\ttoggle_dispatch_fc(); // from Fuel Cell Dispatch Manual so manual dispatch options update",
-        "\tcheck_fuel_cell_dispatch();",
+        "\t//toggle_dispatch_fc(); // from Fuel Cell Dispatch Manual so manual dispatch options update",
+        "\tcheck_fuel_cell_dispatch();\r",
+        "\tvalue('fuelcell_dispatch_excl', value('fuelcell_dispatch_choice'));\r",
         "};",
         "",
         "function enable_fc_dispatch_options()",