GUI work

Lots of stuff!