Tried to fix grid, added js