Adding support for box-sizing