Make the template editor match the creator

Eventually I think the two templates can be merged into
just one thing. Good thinking.