Added Comps, js cleanup