tidy up navigation and add Performance validations