Use x instead of * to show qty multiplier
Additional improvements to template