small changes in menu, many small changes