More UI layout tweaks...