improve menu state