Browser & Element: Cleaned up locators