CWRCPS-16: Collection and bookmark views

A bit of refactor of things as well.