Template is working

check template option and fix little things