Better formatting for the %s
Better popups