Refactor organization menu

Speed up the organization navigation