New simplified note editor is working
Merge branch 'simplify-notes'

* simplify-notes:
  New simplified note editor is working