Add PopupMenu replacement for 2.3