Improve events states UI