More GUI work

I'll probably be reworking this later...