Fix collection_list; move view logic out of Collection class.