Templating issue fixed [80%]