More UI layout optimizations.