changes to notification display logic; copy tweaks for v1.60