Tweaks to the layout