More Changes to the Gui