Index: suite_leahi/shared/scripts/configuration/navigation.py
===================================================================
diff -u -rb29968830a0ad7bfb6b1711404ece8e3f6b656eb -rc091cb2bd9bd4b20538496aa27435e8c8cf39e7a
--- suite_leahi/shared/scripts/configuration/navigation.py	(.../navigation.py)	(revision b29968830a0ad7bfb6b1711404ece8e3f6b656eb)
+++ suite_leahi/shared/scripts/configuration/navigation.py	(.../navigation.py)	(revision c091cb2bd9bd4b20538496aa27435e8c8cf39e7a)
@@ -3,82 +3,33 @@
 import test
 from leahi_dialin.ui.td_messaging import TD_Messaging
 from leahi_dialin.common.td_defs  import TDOpModes, TDStandbyStates
-from configuration                import config, utility
-from configparser import ConfigParser
-from pathlib import Path
+from configuration                import config, utility,application_init
+from configparser                 import ConfigParser
+from pathlib                      import Path
 
 td_simulator = TD_Messaging()
-
+         
 def navigate_to_device_settings_screen():
     """
-    Method to navigate to "Service" screen
+    Method to navigate to "Device Settings" screen and Compare Device Settings screen title text
     """
     td_simulator.td_operation_mode(TDOpModes.MODE_STAN.value, 0)
-    settings_menu_object = utility.get_object_from_names(
-        names.o_Settings_Menu,
-        error_message="Settings menu object missing",
-        timeout_ms=1000,
-    )
-    if settings_menu_object is not None:
-        squish.mouseClick(settings_menu_object)
+    main_menu_container = squish.waitForObject(names.o_mainMenu_MainMenu, 2000)
+    squish.mouseClick(utility.findChildByText(main_menu_container, config.SETTINGS))
     
-    device_setting_screen_title_text = utility.get_object_from_names(
-        names.o_DeviceSettingsTitleText,
-        error_message="Device Settings Screen title text object missing",
-        timeout_ms=2000,
+    headerbar_container = squish.waitForObject(names.o_headerBar_HeaderBar, 2000)
+    device_setting_screen_headerbar_title_text = utility.findChildByText(
+        headerbar_container, config.DEVICE_SETTINGS
     )
-    if device_setting_screen_title_text is not None:
+    if device_setting_screen_headerbar_title_text is not None:
         test.compare(
-            device_setting_screen_title_text.text,
+            device_setting_screen_headerbar_title_text.text,
             config.DEVICE_SETTINGS_SCREEN_TITLE_TEXT,
             "{} screen is displayed and Comparison of Device Settings Screen Title text".format(
                 config.DEVICE_SETTINGS_SCREEN_TITLE_TEXT
             ),
         )
         
-def navigate_to_device_settings_using_service_password():
-    td_simulator.td_operation_mode(TDOpModes.MODE_SERV.value, 0)
-    grid_container = squish.waitForObject(names.o_DeviceSettingsGrid)
-    service_option = utility.findChildByText(grid_container, "Service")
-
-    if service_option is not None:
-        squish.mouseClick(service_option)
-
-    headerbar_container = squish.waitForObject(names.o_headerBar_HeaderBar)
-    service_screen_headerbar_title_text = utility.findChildByText(
-        headerbar_container, "Service"
-    )
-    if service_screen_headerbar_title_text is not None:
-        test.compare(
-            service_screen_headerbar_title_text.text,
-            config.SERVICE_SCREEN_TITLE_TEXT,
-            "{} screen is displayed and Comparison of Device Settings Screen Title text".format(
-                config.SERVICE_SCREEN_TITLE_TEXT
-            ),
-        )
-    input_field = squish.waitForObject(names.o_userConfirmation_TextInput, 1000)
-
-    squish.type(input_field, config.DEFAULT_SERVICE_PASSWORD_RAW)
-    confirm_button = squish.waitForObject(names.o_userConfirmation_ConfirmButton, 1000)
-    squish.mouseClick(confirm_button)
-    
-def get_ini_value(conf_path: str , section: str, key: str):
-    """
-    Method to get the advanced option from the System.conf file
-    """
-    path = Path(conf_path)
-    if not path.exists():
-        raise FileNotFoundError(f"Not found: {path}")
-    parser = ConfigParser()
-    # Preserve case if needed:
-    # parser.optionxform = str
-    parser.read(path, encoding="utf-8")
-    if not parser.has_section(section):
-        raise KeyError(f"Section [{section}] not found in {path}")
-    if not parser.has_option(section, key):
-        raise KeyError(f"Key '{key}' not found in section [{section}]")
-    return parser.get(section, key)
-        
 def navigation_pageIndicator_step(vStep_name):
     """
         Navigate to the specified page using the step indicator component.
@@ -91,18 +42,9 @@
     """
     test.startSection("Method to navigation in the pretreatment page ")
     stepId = squish.waitForObjectExists(names.o_preTreatmentStack_stepIndicator_StepIndicator)
-    stepnames = utility.findAllObjectsById(stepId, "_text")
-    value = get_ini_value("/home/denali/Public/luis/config/configurations/Settings/System.conf", section ="AdvancedMode", key ="AdvancedMode")
-    standard = stepnames[1:] 
-    if value == "0":
-        standard = stepnames[3:] 
-        Nextbutton = utility.setObjectText(obj =names.o_preTreatmentStack_Text, text =config.NEXT)
-        squish.mouseClick(squish.waitForObject(Nextbutton))
-
-    autoLoadbutton = utility.setObjectText(obj =names.o_preTreatmentStack_Text, text ="Auto Load")
-    squish.mouseClick(squish.waitForObject(autoLoadbutton))
-    td_simulator.td_blood_set_auto_load_response(vRejectionReason = 0)
-    for input_field in standard:
+    values = utility.findAllObjectsById(stepId, "_text")
+    for index, input_field in enumerate(values[2:]):
+        test.log(str(index));
         test.log(str(input_field.text))
         if str(input_field.text) == "Water Sample":
             squish.mouseClick(squish.waitForObject(names.o_PreTreatmentSampleStack_button_TouchRect))
@@ -113,4 +55,5 @@
             Nextbutton = utility.setObjectText(obj =names.o_preTreatmentStack_Text, text =config.NEXT)
             squish.mouseClick(Nextbutton)
         
-    test.endSection() 
\ No newline at end of file
+    test.endSection() 
+    
\ No newline at end of file