diff --git a/gui/data/gui_variables.py b/gui/data/gui_variables.py
index 65c8134..6f28f22 100644
--- a/gui/data/gui_variables.py
+++ b/gui/data/gui_variables.py
@@ -29,13 +29,14 @@
     xpath_dumps_sub_menu = "//*[@data-test-id='nav-item-dumps']"
     xpath_dumps_header = "//h1[text()='Dumps']"
     xpath_event_logs_sub_menu = "//*[@data-test-id='nav-item-event-logs']"
-    xpath_event_header = "//h1[text()='Event logs']"
+    xpath_event_logs_heading = "//h1[contains(text()='Event logs')]"
     xpath_progress_logs_sub_menu = "//*[@data-test-id='nav-item-post-code-logs']"
 
     # Hardware status menu
     xpath_hardware_status_menu = "//*[@data-test-id='nav-button-hardware-status']"
     xpath_inventory_and_leds_sub_menu = "//*[@data-test-id='nav-item-inventory']"
     xpath_sensor_sub_menu = "//*[@data-test-id='nav-item-sensors']"
+    xpath_inventory_and_leds_heading = "//h1[contains(text()='Inventory and LEDs')]"
 
     # Operations menu
     xpath_operations_menu = "//*[@data-test-id='nav-button-operations']"
@@ -45,10 +46,11 @@
     xpath_host_console_sub_menu = "//*[@data-test-id='nav-item-host-console']"
     xpath_server_power_operations_sub_menu = "//*[@data-test-id='nav-item-server-power-operations']"
     xpath_host_console_heading = "//h1[text()='Host console']"
+    xpath_firmware_heading = "//h1[contains(text()='Firmware')]"
 
     # Settings menu
     xpath_settings_menu = "//*[@data-test-id='nav-button-settings']"
-    xpath_network_page_header = "//h1[contains(text(), 'Network')]"
+    xpath_network_heading = "//h1[contains(text(), 'Network')]"
     xpath_date_time_sub_menu = "//*[@data-test-id='nav-item-date-time']"
     xpath_network_sub_menu = "//*[@data-test-id='nav-item-network']"
     xpath_power_restore_policy_sub_menu = "//*[@data-test-id='nav-item-power-restore-policy']"
@@ -64,6 +66,7 @@
     # Resource management menu
     xpath_resource_management_menu = "//*[@data-test-id='nav-button-resource-management']"
     xpath_power_sub_menu = "//*[@data-test-id='nav-item-power']"
+    xpath_power_heading = "//h1[contains(text()='Power')]"
 
     # Profile settings
     xpath_default_UTC = "//*[@data-test-id='profileSettings-radio-defaultUTC']"
@@ -78,7 +81,7 @@
     xpath_add_button = "//button[normalize-space(text())='Add']"
     xpath_page_loading_progress_bar = "//*[@aria-label='Page loading progress bar']"
 
-    # Reboot sub meanu
+    # Reboot sub menu
     xpath_reboot_bmc_heading = "//h1[text()='Reboot BMC']"
     xpath_reboot_bmc_button = "//button[contains(text(),'Reboot BMC')]"
     xpath_confirm_bmc_reboot = "//*[@class='btn btn-primary']"
diff --git a/gui/gui_test/gui_header/test_gui_header.robot b/gui/gui_test/gui_header/test_gui_header.robot
index 375564e..d4b9f83 100644
--- a/gui/gui_test/gui_header/test_gui_header.robot
+++ b/gui/gui_test/gui_header/test_gui_header.robot
@@ -29,7 +29,7 @@
 
     Wait Until Element Is Visible   ${xpath_server_health_header}
     Click Element  ${xpath_server_health_header}
-    Wait Until Page Contains Element  ${xpath_event_header}  timeout=15s
+    Wait Until Page Contains Element  ${xpath_event_logs_heading}  timeout=15s
 
 
 Verify Server Power Button
diff --git a/gui/gui_test/overview_menu/test_overview_menu.robot b/gui/gui_test/overview_menu/test_overview_menu.robot
index 7b4e790..73fc570 100644
--- a/gui/gui_test/overview_menu/test_overview_menu.robot
+++ b/gui/gui_test/overview_menu/test_overview_menu.robot
@@ -86,7 +86,7 @@
     [Tags]  Verify_Edit_Network_Setting_Button
 
     Click Element  ${xpath_edit_network_settings_button}
-    Wait Until Page Contains Element  ${xpath_network_page_header}
+    Wait Until Page Contains Element  ${xpath_network_heading}
 
 
 Verify Event Under High Priority Events Section