GUI reshuffle

Moved some more stuff about.