UI fixes and changes