Refactored select boxes to use collection data source