All bugs fixed works with api and new Menu class created