Tweaks to style and layout