Tidied up gui a little bit