Events window inprovement