a couple more layout tweaks