Update doc branch, fix menu behavior