UI fixes for last commit