Minor gui and event cleanup