Thanks again for the suggestion. I decided to delete the 1099R and start over.
I answered No to this first question and Yes to the question that was specifically about Roth IRA and now everything is showing up properly.
Thanks agian!
