Content views: addressing feedback from #1592
Merge pull request #1610 from daviddavis/1592

Content views: addressing feedback from #1592