refactor with editables as json
refactor with editables as json
Refactored templates