Added some GUI changes