Minor UI fixes