Yes, I'm going to replace the piece in the last photo of part 1. If you had a part number, that would be great. You also mentioned polishing the glass. My glass has some hard water stains on the outside. Is it very hard to remove this or polish it out? Never done any glass polishing before. Whaddya think?