#6681 Added MenuDrawer, fix issues with 2.2