Updated selectors to use @ for better selector scoping