add note type settings
Merge branch 'note-settings' into testing