Modified and almost ready for css in grid