Content views: fixed a couple UI content view bugs
(cherry picked from commit 23970b25a0dbbb7cb818622d492f8091d051f0d9)
Merge pull request #1488 from daviddavis/ui_fixes

Content views: fixed a couple UI bugs with content views