Fixed box-sizing border-box
several updates