Feedback and some ui behavior modified