[IMP] Generic: configuration menus reorganization