fix edit location
fix menu