Moving hardcoded URIs from templates to JS
Rearranging templates