fixed top part of main menu
merge conflict