Update reminder templates
Improve reminder triggers