Fix and simplify the new subclassing of the popup menus