change from popupMenu mechanism to Commands framework