Develop

This is another staging round for menu refactoring (CO-416).  There is still work / cleanup to do on the "Collaborations" menu and CO switching.