Quick UI fixes to streamline data entry