small fix
some GUI stuff for main menu
merge conflict