More UI layout tweaks (2).