diff --git a/app/views/plans/_plan_details.html.erb b/app/views/plans/_plan_details.html.erb
index 2ed40f7..03f5f0b 100644
--- a/app/views/plans/_plan_details.html.erb
+++ b/app/views/plans/_plan_details.html.erb
@@ -172,14 +172,14 @@
           <% @important_ggs.each do |org, groups| %>                                                                                                                                                                  
               <tr>
               <td class="dmp_td_medium">
-                  <% if groups.size == 1 %>
+                  <% if groups && groups.size == 1 %>
                       <%= check_box_tag "guidance_group_ids[]", groups[0].id, @selected_guidance_groups.include?(groups[0].id) %>
                       <%= org.name %>
-                  <% else %>
-                      <%= org.name %>
+                  <% elsif groups %>
+                      <input type="checkbox" disabled> <%= org.name %>
                       <% groups.each do |group| %>
                           <tr><td class="dmp_td_small">
-                              &emsp;<%= check_box_tag "guidance_group_ids[]", group.id, @selected_guidance_groups.include?(group.id) %>
+                              └─ <%= check_box_tag "guidance_group_ids[]", group.id, @selected_guidance_groups.include?(group.id) %>
                               <%= group.name %>
                           </td></tr>
                       <% end %>
@@ -194,7 +194,7 @@
       <div class="accordion-group">
           <div class="accordion-heading">
               <a class="accordion-toggle" data-toggle="collapse" data-parent="#plan-guidance-accordion" href="#guidance-choices">
-                  <h3>More Guidance Choices<span class="plus-laranja"> </span></h3>
+                  <h3><%=_('Other institutions')%><span class="plus-laranja"> </span></h3>
               </a>
           </div>
           <div id="guidance-choices" class="accordion-project collapse">
@@ -204,14 +204,14 @@
                           <% @all_ggs_grouped_by_org.each do |org, groups| %>
                               <tr>
                               <td class="dmp_td_medium">
-                                  <% if groups.size == 1 %>
+                                  <% if groups && groups.size == 1 %>
                                       <%= check_box_tag "guidance_group_ids[]", groups[0].id, @selected_guidance_groups.include?(groups[0].id) %>
                                       <%= org.name %>
-                                  <% else %>
-                                      <%= org.name %>
+                                  <% elsif groups %>
+                                      <input type="checkbox" disabled> <%= org.name %>
                                       <% groups.each do |group| %>
                                           <tr><td class="dmp_td_small">
-                                              &emsp;<%= check_box_tag "guidance_group_ids[]", group.id, @selected_guidance_groups.include?(group.id) %>
+                                              └─ <%= check_box_tag "guidance_group_ids[]", group.id, @selected_guidance_groups.include?(group.id) %>
                                               <%= group.name %>
                                           </td></tr>
                                       <% end %>
@@ -222,12 +222,11 @@
                       </tbody>
                       </table>               
                   </div>
-                <% end %>
               </div>
           </div>
       </div>
- <!-- </div> -->
-  <%= submit_tag _('Save'), class: "btn btn-primary"%>
+      <%= submit_tag _('Save'), class: "btn btn-primary"%>
+  <% end %>
 
   <div class="div_clear"></div>
 
@@ -354,3 +353,4 @@
 			<%end%><!-- end of phases.each
 		<%end%> <!-- end of if phases.count == 1 -->
 </div>
+
diff --git a/config/locale/app.pot b/config/locale/app.pot
index 84b7672..18eb264 100644
--- a/config/locale/app.pot
+++ b/config/locale/app.pot
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: app 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-11 14:12+0100\n"
-"PO-Revision-Date: 2017-05-11 14:12+0100\n"
+"POT-Creation-Date: 2017-05-12 13:25+0100\n"
+"PO-Revision-Date: 2017-05-12 13:25+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -843,6 +843,9 @@
 msgid "Original funder template has changed!"
 msgstr ""
 
+msgid "Other institutions"
+msgstr ""
+
 msgid "Otherwise leave blank."
 msgstr ""
 
diff --git a/config/locale/de/app.po b/config/locale/de/app.po
index 8b0e98e..36ef44b 100644
--- a/config/locale/de/app.po
+++ b/config/locale/de/app.po
@@ -873,6 +873,9 @@
 msgid "Original funder template has changed!"
 msgstr "templates"
 
+msgid "Other institutions"
+msgstr ""
+
 msgid "Otherwise leave blank."
 msgstr "Falls nicht, lassen Sie dieses Feld bitte unberührt."
 
diff --git a/config/locale/en_GB/app.po b/config/locale/en_GB/app.po
index 3db41a5..26f3a5d 100644
--- a/config/locale/en_GB/app.po
+++ b/config/locale/en_GB/app.po
@@ -843,6 +843,9 @@
 msgid "Original funder template has changed!"
 msgstr "Original funder template has changed!"
 
+msgid "Other institutions"
+msgstr ""
+
 msgid "Otherwise leave blank."
 msgstr "Otherwise leave blank."
 
diff --git a/config/locale/en_US/app.po b/config/locale/en_US/app.po
index 9bebbbe..078709c 100644
--- a/config/locale/en_US/app.po
+++ b/config/locale/en_US/app.po
@@ -843,6 +843,9 @@
 msgid "Original funder template has changed!"
 msgstr "Original funder template has changed!"
 
+msgid "Other institutions"
+msgstr ""
+
 msgid "Otherwise leave blank."
 msgstr "Otherwise leave blank."
 
diff --git a/config/locale/es/app.po b/config/locale/es/app.po
index 5e8ccf2..debb763 100644
--- a/config/locale/es/app.po
+++ b/config/locale/es/app.po
@@ -865,6 +865,9 @@
 msgid "Original funder template has changed!"
 msgstr "templates"
 
+msgid "Other institutions"
+msgstr ""
+
 msgid "Otherwise leave blank."
 msgstr "Si no, déjelo en blanco."
 
diff --git a/config/locale/fr/app.po b/config/locale/fr/app.po
index e27674f..c41d966 100644
--- a/config/locale/fr/app.po
+++ b/config/locale/fr/app.po
@@ -863,6 +863,9 @@
 msgid "Original funder template has changed!"
 msgstr "templates"
 
+msgid "Other institutions"
+msgstr ""
+
 msgid "Otherwise leave blank."
 msgstr "Sinon laissez ce champ vide."