Update notes for submitted changes

* Properly null check all button usages.