Added basic team screens, small improvements to others