fix grid and border