more pop-over / context-menu enhancements