More control templates & bug fix