Update notes for submitted changes

* Settings reorganization and cleanup Phase 1