Retirement tax questions

No.  A rollover or conversion is not a new contribution.  Only enter it from the 1099R, nowhere else.