Add back autocomplete field for menus. Refactored into its own files as well.