Improved notification templates