fixed bugs related to the new way the teambuilder is loaded
move includes and loading statemekt