updated index and base templates