Tweaks to layout, and so on