Notification Format Improvements