Updated master template to correctly incorporate header information