UI fixes and polishes