Clean up dashboard pills
Convert select_team to org index