submenu and fix bug