Replaced the remaining xpath with css selectors