added collab UI updates from master

updated this branch to have everything master has.