updated notification handler and message view