added unique ID's to elements to allow fill to persist on selection