massive refactoring of index pages