Tidying up gui a bit more.