Adding proper box-sizing