Refactor collection views for common functionality