Add box-sizing to fix grid issue