Deleted old static templates
Repair errors pointed in review
Fixed errors pointed in last review