Added minor templating of base and content