Menu layout tweaks