Refactored the notification display section
Merge pull request #5 from pupi1985/patch-1

Refactored the notification display section