Tweaks to the layout and styling