Tweak formatting

A collection of some minor tweaks to the layout.