Improved index template, updated index files. Tests pending.