Box sizing issues fixed, Grid update