Update 2.0.0a - GUI and EventHandler Updates