refactored edit templates
issues #1 and #2
refactored nested lists