Improved UI based on user feedback.