Refactor organization menu

Refactor process

Remove unused methods
Merge pull request #350 from CruGlobal/MH-988

Refactor organization menu