Feature/team layout