Updated templates to reflect served site