fixing UI - events