MISC: more layout tweaks