Fixed GUI event processing/state transitioning