Added proxy and sub controllers for menu (plus an import clean)