Columns Widget

Ready for thorough QA post merge with 3x
#3846