Added to-do-list, merged template tags