Improvements in teams view