Improvent events ui