Moved menu modification into notification observers.
fixes #31
Merge branch 'od/issue_31' into develop