fix some typos in Layout
next iteration for changesets; turn them on by default