Linked teambuilder to main screen

Also fixed crash introduced