Collection links 588

This moves toward #588, but is not a fix for every collection page: they each need individual attention.