EventHandler added and Gui-Class renamed