fixed menuPopup bugs
merge