a few more layout tweaks