merged and adding collab buttons