Fixed index pages and minor fixes