Refactor a few selectors.

1. move a couple of them before the more specific ones.
2. change nesting to be under the same parent selector
3. use the ampersand more