Collab Frontend 1/3 done

fixed conflict

1/2 the way done with collab

Fixe collab not showing in pipeline