collection-view improvements
merge