Refactor grids
Minor updates
Minor updates