template reordering, notifications added