Improve the CSS selectors to target new markup.