Tweaked form submit when adding template, moved it below file uploads and used JS submission instead