Notification & menu fix