fix menu behaviour