Adjust team list colspan
Improve roles and permissions