fix grid.js and form.js