Gui changes leftover from last commit