diff --git a/app/views/plans/_form_v2.html.erb b/app/views/plans/_form_v2.html.erb
index a44fd00..f687fe5 100644
--- a/app/views/plans/_form_v2.html.erb
+++ b/app/views/plans/_form_v2.html.erb
@@ -30,6 +30,7 @@
           <%= _('Would you like to use the default template "Default Template"?') %>
         </p>
         <button class="btn btn-primary"><%= _('Use Default Template') %></button>
+        <!-- Hidden fields to store information about the default organisation (user's org) -->
         <% if @default_org %>
           <%= hidden_field_tag('own_org_name', @default_org.name) %>
           <%= hidden_field_tag('own_org_id', @default_org.id) %>
@@ -41,6 +42,7 @@
         <p>
           <%= _('Would you like to choose the template of another organisation?') %>
         </p>
+        <!-- Combo box for selecting another organisation's template -->
         <%= render partial: "shared/accessible_combobox",
                    locals: {name: 'plan[org_name]',
                             id: 'plan_org_name',
@@ -57,6 +59,7 @@
         <p>
           <%= _('Would you like to choose a template of a funder?') %>
         </p>
+        <!-- Combo box for selecting a funder's template -->
         <%= render partial: "shared/accessible_combobox",
                    locals: {name: 'plan[funder_name]',
                             id: 'plan_funder_name',
@@ -68,6 +71,7 @@
                             tooltip: _('Please select a valid funding organisation from the list.')} %>
       </div>
 
+      <!-- Legacy checkboxes from the v1 form, indicates wether or not organisation or funder is present, handled automaticaly by tab changes -->
       <%= check_box_tag(:plan_no_org, '', false, style: 'display: none;') %>
       <%= check_box_tag(:plan_no_funder, '', true, style: 'display: none;') %>
 
@@ -76,19 +80,15 @@
         <p>
           <%= _('Multiple templates where found, which one would you like to use?') %>
         </p>
+        <!-- Hidden field to store the URL from which to get available templates (async) -->
         <%= hidden_field_tag 'template-option-target', org_admin_template_options_path %>
-        <%= select_tag(:plan_template_id) %>
+        <div class="form-group row">
+          <div class="col-md-6">
+            <%= select_tag(:plan_template_id, "<option value=\"-1\">#{_('Please select a template')}</option>", name: 'plan[template_id]', class: 'form-control', 'aria-describedby': 'template-selection') %>
+          </div>
+        </div>
       </div>
 
-      <!-- In case the user does not belong to an organisation -->
-      <% unless @default_org %>
-      <div id="no_org">
-        <p>
-          <%= _('You are not linked to an organisation, we can\'t suggest you a template. Please choose an organisation in your profile') %>
-        </p>
-      </div>
-      <% end %>
-
       <!-- Single template div (if only one template is provided by organisation) -->
       <div id="single-template" style="display: none;">
         <p>
@@ -98,7 +98,7 @@
         </p>
       </div>
 
-      <!-- Default template div (if the template is the default one (organisation) -->
+      <!-- Default template div (if the template is the default one) -->
       <div id="default-template" style="display: none">
         <p>
           <span><%= _('This organisation does not provide a template. Would you like to create a plan using the default') %></span>
@@ -107,6 +107,15 @@
         </p>
       </div>
 
+      <!-- In case the user does not belong to an organisation -->
+      <% unless @default_org %>
+      <div id="no_org">
+        <p>
+          <%= _('You are not linked to an organisation, we can\'t suggest you a template. Please choose an organisation in your profile') %>
+        </p>
+      </div>
+      <% end %>
+
       <!-- Submit and other buttons -->
       <div class="pull-right">
         <%= f.button(_('Yes'), class: "btn btn-primary", type: "submit") %>