Entity templates and undo/redo

extra tab/spaces