Fixes to Drawer and notify
Merge pull request #365 from adaptlearning/issue/#364

Issue/#364