simplify index pages and make fixes asked by fred