merged new menu system into old