changed class names based on latest plan (css selectors)