Tidying up GUI a bit. About to embark on finding a memory leak :/