diff --git a/gui/data/resource_variables.py b/gui/data/resource_variables.py
index 1dfe247..9ef949a 100644
--- a/gui/data/resource_variables.py
+++ b/gui/data/resource_variables.py
@@ -87,7 +87,7 @@
     xpath_server_health_text =  \
         "//*[@id='header__wrapper']/div/div[3]/a[2]/span"
     xpath_select_refresh_button = \
-        "//*[@id='header__wrapper']/div/div[3]/button"
+        "//*[contains(text(),'Refresh')]"
     xpath_event_severity_all = "//*[@id='event-filter']/div[1]/button[1]"
     xpath_event_severity_high = "//*[@id='event-filter']/div[1]/button[2]"
     xpath_event_severity_medium = "//*[@id='event-filter']/div[1]/button[3]"
diff --git a/gui/test/server_config/test_obmc_gui_network_settings.robot b/gui/test/server_config/test_obmc_gui_network_settings.robot
index ae5b1cc..51a8773 100644
--- a/gui/test/server_config/test_obmc_gui_network_settings.robot
+++ b/gui/test/server_config/test_obmc_gui_network_settings.robot
@@ -14,14 +14,14 @@
 ${xpath_select_server_configuration}  //*[@id="nav__top-level"]/li[4]/button
 ${xpath_select_network_settings}  //a[@href='#/configuration/network']
 ${xpath_hostname_input}  //*[@id="net-config__mac"]
-${xpath_network_save_settings}  //*[@id="configuration-network"]/form/section[3]/div[2]/button[1]
+${xpath_network_save_settings}  //*[text()="Save settings"]
 ${xpath_continue}  //*[@id=""]/main/section/div/div[4]/button[2]
 ${xpath_network_config_ipv4_address}  //*[@id="ipv4-address-1"]
 ${xpath_default_gateway_input}  //*[@id="net-config__domain"]
 ${xpath_mac_address_input}  //*[@id="net-config__host"]
 ${xpath_ipv4-address-input}  //*[@id="ipv4-address-1"]
-${xpath_network_DHCP_button}  //*[@id="configuration-network"]/form/section[2]/fieldset/div[1]/label/span
-${xpath_network_static_button}  //*[@id="configuration-network"]/form/section[2]/fieldset/div[2]/label/span
+${xpath_network_DHCP_button}  //*[contains(text(),"Obtain an IP address automatically")]
+${xpath_network_static_button}  //*[contains(text(),"Assign a static IP address")]
 
 *** Test Cases ***
 
@@ -43,6 +43,7 @@
     Click Element  ${xpath_network_save_settings}
     Wait Until Page Does Not Contain Element  ${xpath_refresh_circle}
     Click Element  ${xpath_continue}
+    Click Element  ${xpath_select_refresh_button}
     Wait Until Page Does Not Contain Element  ${xpath_refresh_circle}
     Page Should Contain  witherspoon1