notification bug fixed and improved UX - part IV