Consolidate some of the CSS

Using LESS nesting when useful, and removing some rules that
were unused due to being overridden