Enhance layout to add team names