Correct notifications and design