Improved context menus as discussed with Rob