Fix lambda call
Convert more to submenu call