switch to border-box rules and use media queries