Improved Team Match Screen