Tidied gui up a little.