Merge feature SOL-20

This is a pull request to merge the SOL-20 feature (https://openedx.atlassian.net/browse/SOL-20).
@dcikatic - @cptvitamin would like to remove this h3 node herein - should be able to make it a span instead imo. There appears to be a reference to it directly as h3 within corresponding js that will also need to be changed.