Have Condo purchased in 1999 and remodeled in 2017. Converted to rental 4/1/18. I am confused as to where to record the remodel costs.

Following the interview process for rental property.  Under property profile, it asks for purchase price, then improvements made [remodeling].  Then later asks to enter property tax values, splitting out land vs [improvements + remodel costs].  Am I double entering the remodel costs by entering them in both places? 

(Side question: Do I use assessed value [land+improvements] at time of purchase, or current assessed value?)

Then under rental property assets/depreciation, do I enter the remodel costs here too?  All remodel costs were prior to rental conversion date.