Merge branch 'jk/notes-ui-updates'