changed Main menu
merge