New Templates editing method (in tree), cleanup, refactor begining, fixes