Refactor organization menu

 ADJ