UI bug fixes and improvements