Refactor organization menu

 ADJ
Merge pull request #348 from CruGlobal/MH-988

Refactor organization menu