diff --git a/app/controllers/org_admin/templates_controller.rb b/app/controllers/org_admin/templates_controller.rb
index 173b64b..1ef77dd 100644
--- a/app/controllers/org_admin/templates_controller.rb
+++ b/app/controllers/org_admin/templates_controller.rb
@@ -145,6 +145,7 @@
     end
 
     # GET /org_admin/templates/new
+    # SEE MODULE
     def new
       authorize Template
       @template = current_org.templates.new
diff --git a/app/views/branded/org_admin/templates/_form.html.erb b/app/views/branded/org_admin/templates/_form.html.erb
index f65f10b..6f17fc7 100644
--- a/app/views/branded/org_admin/templates/_form.html.erb
+++ b/app/views/branded/org_admin/templates/_form.html.erb
@@ -31,7 +31,7 @@
 <div class="form-group col-xs-8">
   <%= f.label(:locale, _('Locale'), class: "control-label") %>
   <%= select_tag(:locale,
-      options_from_collection_for_select(@locales, "abbreviation", "name", template.locale),
+      options_from_collection_for_select(@locales, "abbreviation", "name", f.object.locale),
       include_blank: false,
       class: "form-control",
       name: 'template[locale]') %>
diff --git a/lib/dmpopidor/controllers/org_admin/templates.rb b/lib/dmpopidor/controllers/org_admin/templates.rb
index 28b3e08..d9cba4a 100644
--- a/lib/dmpopidor/controllers/org_admin/templates.rb
+++ b/lib/dmpopidor/controllers/org_admin/templates.rb
@@ -1,7 +1,13 @@
+# frozen_string_literal: true
+
 module Dmpopidor
+
   module Controllers
+
     module OrgAdmin
+
       module Templates
+
         # GET /org_admin/templates/:id/edit
         # CHANGES : Added Locales list for view
         def edit
@@ -9,16 +15,16 @@
           @locales = Language.all
           authorize template
           # Load the info needed for the overview section if the authorization check passes!
-          phases = template.phases.includes(sections: { questions: :question_options }).
-                            order("phases.number",
+          phases = template.phases.includes(sections: { questions: :question_options })
+                           .order("phases.number",
                                   "sections.number",
                                   "questions.number",
-                                  "question_options.number").
-                            select("phases.title",
-                                  "phases.description",
-                                  "sections.title",
-                                  "questions.text",
-                                  "question_options.text")
+                                  "question_options.number")
+                           .select("phases.title",
+                                   "phases.description",
+                                   "sections.title",
+                                   "questions.text",
+                                   "question_options.text")
           if !template.latest?
             redirect_to org_admin_template_path(id: template.id)
           else
@@ -26,21 +32,28 @@
               partial_path: "edit",
               template: template,
               phases: phases,
-              referrer: get_referrer(template, request.referrer) }
+              referrer: get_referrer(template, request.referrer)
+            }
           end
         end
 
-
+        # GET /org_admin/templates/new
+        # SEE MODULE
+        def new
+          authorize Template
+          @template = current_org.templates.new
+          @locales = Language.all
+        end
 
         # CHANGES : Added Locale parameter
         def template_params
           params.require(:template).permit(:title, :description, :visibility, :links, :locale)
         end
-    
+
       end
+
     end
+
   end
+
 end
-
-
-    
\ No newline at end of file