UI fixes related to previous commit