Story fix. Most of the work was done in previous commit.
Merge pull request #76 from volusion-angular-themes/22019-26614-stories

#22019 and 26614 stories. Most of the work was done in previous commit.