Updated locators as per new System tab

- Updated  locators as per nutupane
- updated few functions