Refactoring admin_menu to handle issues in #1831
Refactoring admin_menu to handle issues in #1831

fletch3555/voyager,darit/voyager,SaadEddinHassania/voyager,the-control-group/voyager,the-control-group/voyager,SaadEddinHassania/voyager,handiwijoyo/voyager,fergthh/voyager,fletch3555/voyager,darit/voyager,fergthh/voyager,handiwijoyo/voyager