Fixing some layouts issues in teambuilder