Updated to work with box-sizing