Changing to match HTML5 layout