Fixes #403 - revert back to border-box sizing