Updated locators on several panels for 3.3