edit popup-functions
edited popup-menu