more tweaks to layout