Fixed navigation by having the org switch come before any menu navigation that requires us to switch to the correct org first.  This fixes the problematic org test.