Cleaned up gui creation