Adding more collection item features, refactoring pages alongside this for ubiquity