Make in-app notification imrpovements