Move alerts back to template