Fixes to Drawer and notify