work on teams page, clean up