Upgraded the notification formatting