User notification overhaul