Minor tweaks to layout