Major overhaul of pages and index