Update actibity to include proper collaboration. 

The buttons are still broken