some little changes and MENU