Updated templates to use new CSS