Generalized the templates so that #primary and #content tags are placed in the header and footer instead