Update notes for submitted changes

* Move window management into seperate class.