Some UI fixes and improvements