Merge branch 'jh/notes-add-ui'