clean up templates, template preview
fixed conflict in cli and preview template