Minor tweaks to style and layout