Added notifications, added edit