Improved UI + added more logic to events (added Helpers)