Make z-index of menu work for when the sub-menu is used in the toolbar
Fix sub menus in the toolbar