Some improvements due to usability test.