UI fixes and more