Getting interstitial org switcher functional and related refactorings, fixes #2189.
Remove unused $location.
Minor styling tweaks to old tupane.
Merge pull request #2233 from waldenraines/minor_tupane_styling_tweaks

Minor styling tweaks to old tupane.
Merge pull request #2222 from waldenraines/fix_org_switcher_issues

Getting interstitial org switcher functional and related refactorings, fixes #2189.