Some fixes and begin introduce new menu in menu plugin