layout tweaks
various tweaks