MSINM-159: More work on Templates Admin page