move templates, copy over changes to modal.html