various tweaks to the layout