Various UI fixes and changes