Reminders and warnings reorganised