Many changes to comps page