Trunk-2984 Improved UI for notification