minor changes in menu
merged with master