Move templates to correct location, fix typos and refactor the same

Yes. Otherwise the underscore will make it through to the column title