Commit checkpoint

Redefine layout and note event