Fixes and cleanup for columns widget

From #3846.