More UI layout improvements.