added events and improved ux