Fixed some things on the restart menu
merge conflict fixed