Content views: addressing feedback from #1592