Refactored the templates to be a little cleaner.

Quick refactor to clean up some of the code in the Create Shift Report Template. Just want to pull that in before merging to master.