Use border-box modell for the grid
* fix some comments
* move border-box modell to grid