fix addclass to add to picture not container
add classes back to _full_matchup