Cleaned up gui system and building system