Further tweaks to the layout