Refactor organization menu