Added KeyHandler, Fixed GuiHandler