Update similar selectors to attribute selectors

Updated the selectors to use attribute selectors to make them less repetitive