TRUNK-2984 Improved UI for notiications