Improve icon display. Change data info at Popup page