Complete layout tweaks