Better interface design, fixed combine columns code