Cleaned up gui a little