switch to using border-box WIP