Improve popup menus in toolbar for "Text Only" mode