CSS Cleanup

https://www.pivotaltracker.com/story/show/83896390
https://www.pivotaltracker.com/story/show/83889072
...and misc cleanup