Changed Gui and other misc code