Tightening up the #team layout of d4tocchini - bergie