Use improved box-sizing technique

For more http://bit.ly/1qk2tVR