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

Is verbose_name required here?