new menu
bugs fix
all is done