Fixing a javascript loading issue
Template-tizing the tempalates