Cleaned up selectors toggle selectors