Backport ui fixes to 3.2