GUI stuff

See commit descriptions for changes