Correctly switch between organizations and members

Closes #4