More removal of id's and replacing with selectors