Updated Gui Handler