fixed some buttons for mainmenu
fixed conflicts