cleaning up api
renamed and cleaned
fixed var wines bug into var menus