Content views: various fixes to UI and CLI
Merge pull request #1501 from daviddavis/cv_ui_tweaks

Content views: various fixes to CLI and UI things