Popup menus work a little bit better now