Fixed Notification, Fixed Issues In User and Vendor