update controller : forms stop looping
update template and javascript file