Add to and refactor index pages.