Removing hard coded strings
Moving rename toast to proper place
Merge branch 'teambuilder' into pastebin