Changed templates to reflect mockup