working on grid and modals