Layout changes to account for design guidelines