Cleaning up update event window

(in progress)