Updated GUI unFUBARED (hopefully)