Improved border-box