Added back to menu option on game screen plus some other small fixes
merge