#3846: Explicitly include sortable js.
#3846: If form fails validation, keep user's widget choices in the columns.
Merge pull request #5258 from openscholar/3846-columns_fixes

Fixes to columns widget when validation fails