started introducing notification icon
and some refactoring