Implementation of Issue #131

Leveraged Matti's code from the Category view
Merge pull request #132 from gitcac/issue-131

Implementation of Issue #131