Tried fixing the some GUI stuff.

Not yet done