Cleaning up CSS after merge conflicts

Still missing a couple styles. Can't track them down. They will have to
be readded.