Edit handler for templates
Merge. Update handler
Fix index.html