Refactor views to support collection links