Event handler added
UI tuned