more layout tweaks