further initial layout tweaks