More changes to bring the items inline.