Change 8 done

And fixes to the menu