Added extends for base templates
Added client side rendering with include