Content views: various fixes to UI and CLI