Tweaks to layout and styling