Improved fix to CSS box-sizing property