Fixing bugs, adding PlayAgain/Generic buttons