More UI fixes and improvements