Readd neater team joining and better chat

Because my code became outdated with the new code