Move to better box-sizing implementation