Touched up most main pages