Updated templates, all templates now inheret from the base template.