updated UI according to User Feedback