Slight changes to event_dispatcher and display update methods