Modified grid.js and columnpicker.js