Lots of random styling improvements

Or at least I hope they're improvements.