Added border-box and adjusted headers