Fix notification and timeline