diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb
index 41abae4..77c5256 100644
--- a/app/controllers/plans_controller.rb
+++ b/app/controllers/plans_controller.rb
@@ -115,6 +115,8 @@
     @plan = Plan.eager_load(params[:id])
     authorize @plan
 
+    @visibility = @plan.visibility.blank? ? @plan.visibility.to_s : Rails.application.config.default_plan_visibility
+
     @editing = (!params[:editing].nil? && @plan.administerable_by?(current_user.id))
 
     # Get all Guidance Groups applicable for the plan and group them by org
@@ -153,6 +155,9 @@
   def edit
     @plan = Plan.find(params[:id])
     authorize @plan
+    
+    @visibility = @plan.visibility.blank? ? @plan.visibility.to_s : Rails.application.config.default_plan_visibility
+    
     # If there was no phase specified use the template's 1st phase
     @phase = (params[:phase].nil? ? @plan.template.phases.first : Phase.find(params[:phase]))
     @show_phase_tab = params[:phase]
diff --git a/app/views/plans/_edit_details.html.erb b/app/views/plans/_edit_details.html.erb
index 45adef7..d6c92f9 100644
--- a/app/views/plans/_edit_details.html.erb
+++ b/app/views/plans/_edit_details.html.erb
@@ -57,14 +57,15 @@
 
   <div class="edit-plan-right">
     <fieldset class="standard">
+      <input type="hidden" id="plan_visibility" name="plan[visibility]" value="<%= visibility %>" />
       <span class="fa fa-question-circle"></span>
       <div class="left-indent inline">
-        <label for="plan_visibility"> <%= _('Plan Visibility') %></label>
+        <label for="visibility"> <%= _('Plan Visibility') %></label>
         <div class="left-indent">(<%= _('Limited to finished plans') %>)</div>
         <br />
-        <div><input type="radio" id="plan_visibility" name="plan[visibility]" class="right-indent"<%= !['publicly_visible', 'organisationally_visible'].include?(plan.visibility) ? ' checked=true' : '' %> /><%= raw display_visibility('privately_visible') %></div>
-        <div><input type="radio" id="plan_visibility" name="plan[visibility]" class="right-indent"<%= 'organisationally_visible' == plan.visibility ? ' checked=true' : '' %> /><%= raw display_visibility('organisationally_visible') %></div>
-        <div><input type="radio" id="plan_visibility" name="plan[visibility]" class="right-indent"<%= 'publicly_visible' == plan.visibility ? ' checked=true' : '' %> /><%= raw display_visibility('publicly_visible') %></div>
+        <div><input type="radio" name="vis" id='privately_visible' class="right-indent"<%= !['publicly_visible', 'organisationally_visible'].include?(visibility) ? ' checked=true' : '' %> /><%= raw display_visibility('privately_visible') %></div>
+        <div><input type="radio" name="vis" id="organisationally_visible" class="right-indent"<%= 'organisationally_visible' == visibility ? ' checked=true' : '' %> /><%= raw display_visibility('organisationally_visible') %></div>
+        <div><input type="radio" name="vis" id="publicly_visible" class="right-indent"<%= 'publicly_visible' == visibility ? ' checked=true' : '' %> /><%= raw display_visibility('publicly_visible') %></div>
       </div>
     </fieldset>
     
diff --git a/app/views/plans/public_index.html.erb b/app/views/plans/public_index.html.erb
index 21f099b..5f0fdae 100644
--- a/app/views/plans/public_index.html.erb
+++ b/app/views/plans/public_index.html.erb
@@ -28,9 +28,9 @@
         </tr>
       <% end %>
       <tr>
-        <th class="col-large"><%= _('Plan Title') %></th>
+        <th class="col-large"><%= _('Project Title') %></th>
         <th class="col-large"><%= _('Template') %></th>
-        <th class="col-medium"><%= _('Organisation') %></th>
+        <th class="col-medium"><%= _('Institution') %></th>
         <th class="col-medium"><%= _('Owner') %></th>
         <th class="col-small sorter-false centered"><%= _('Download') %></th>
       </tr>
diff --git a/app/views/plans/show.html.erb b/app/views/plans/show.html.erb
index 0926e61..af86338 100644
--- a/app/views/plans/show.html.erb
+++ b/app/views/plans/show.html.erb
@@ -26,11 +26,11 @@
     <!-- project details -->
     <div class="tab-panels" role="tabpanel">
       <div id="details-panel" class="tab-panel active" aria-hidden="false" aria-labelledby="details-tab">
-				<% if @plan.editable_by?(current_user) %>
-					<%= render partial: 'edit_details', locals: {plan: @plan} %>
-				<% else %>
-        	<%= render partial: 'show_details', locals: {plan: @plan} %>
-				<% end %>
+        <% if @plan.editable_by?(current_user) %>
+          <%= render partial: 'edit_details', locals: {plan: @plan, visibility: @visibility} %>
+        <% else %>
+          <%= render partial: 'show_details', locals: {plan: @plan, visibility: @visibility} %>
+        <% end %>
       </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/lib/assets/javascripts/views/plans/edit.js b/lib/assets/javascripts/views/plans/edit.js
index 41309bf..322f903 100644
--- a/lib/assets/javascripts/views/plans/edit.js
+++ b/lib/assets/javascripts/views/plans/edit.js
@@ -9,8 +9,8 @@
     }
   });
   
-  $("input[name='visibility']").on('change', function(e){
-    $('#plan_visibility').val($("input[name='visibility']:checked").val());
+  $("input[name='vis']").on('change', function(e){
+    $('#plan_visibility').val($("input[name='vis']:checked").attr('id'));
   });
   
   toggleVisibility();
@@ -18,7 +18,7 @@
   function toggleVisibility(){
     var test = $("#is_test").is(':checked');
     // If the test checkbox is true then disable the visibility dropdown
-    $("input[name='visibility']").attr('aria-disabled', test).attr('disabled', test);
+    $("input[name='vis']").attr('aria-disabled', test).attr('disabled', test);
   }
 
   /*----------------