Change Box-Sizing Approach. Closes #15