popup and menu improvements