Notification bug fixes & improvements
Fixing saving bug