Updated templates with binding and json