template classNames and key handling corrected