Reorganizing report templates and adding weekly summary