various layout tweaks