notification bug fixed and improved UX - part IV
code refactor - part II