Cleaned up teams screen