Added user control for user feedback
Added more user controls