Probably a merge error here.

Fixed the GUI stuff.