Plan for Diffley Road safety upgrades includes fewer lanes, new roundabouts

County officials say additional safety elements will be incorporated in the final design.