diff --git a/app/controllers/org_admin/templates_controller.rb b/app/controllers/org_admin/templates_controller.rb
index 07d99a4..ba6c281 100644
--- a/app/controllers/org_admin/templates_controller.rb
+++ b/app/controllers/org_admin/templates_controller.rb
@@ -7,31 +7,29 @@
     # -----------------------------------------------------
     def index
       authorize Template
+      
       # Apply scoping
-      orgs_hash = apply_scoping(params[:scope] || 'all')
-      funders_hash = apply_scoping(params[:scope] || 'all', true)
+      all_templates_hash = apply_scoping(params[:scope] || 'all', false, true)
+      own_hash = apply_scoping(params[:scope] || 'all', false, false)
+      customizable_hash = apply_scoping(params[:scope] || 'all', true, false)
 
       # Apply pagination
-      orgs_hash[:templates] = orgs_hash[:templates].page(1)
-      funders_hash[:templates] = funders_hash[:templates].page(1)
+      all_templates_hash[:templates] = all_templates_hash[:templates].page(1)
+      own_hash[:templates] = own_hash[:templates].page(1)
+      customizable_hash[:templates] = customizable_hash[:templates].page(1)
 
       # Gather up all of the publication dates for the live versions of each template.
-      published = {}
-      [funders_hash[:templates], orgs_hash[:templates]].each do |collection|
-        collection.each do |template|
-          live = Template.live(template.dmptemplate_id)
-          published[template.dmptemplate_id] = live.updated_at if live.present?
-        end
-      end
+      published = get_publication_dates(all_templates_hash[:scopes][:dmptemplate_ids])
       
       render 'index', locals: {
-        funder_templates: funders_hash[:templates], 
-        org_templates: orgs_hash[:templates],
-        customized_templates: funders_hash[:customizations],
+        all_templates: all_templates_hash[:templates],
+        customizable_templates: customizable_hash[:templates], 
+        own_templates: own_hash[:templates],
+        customized_templates: customizable_hash[:customizations],
         published: published,
         current_org: current_user.org, 
         orgs: Org.all,
-        scopes: { orgs: orgs_hash[:scopes], funders: funders_hash[:scopes] }
+        scopes: { all: all_templates_hash[:scopes], orgs: own_hash[:scopes], funders: customizable_hash[:scopes] }
       }
     end
     
@@ -284,23 +282,40 @@
       redirect_to edit_org_admin_template_path(new_customization)
     end
     
+    # GET /org_admin/templates/all/:page  (AJAX)
+    # -----------------------------------------------------
+    def all
+      authorize Template
+      # Apply scoping
+      hash = apply_scoping(params[:scope] || 'all', false, true)
+
+      # Apply pagination
+      hash[:templates] = hash[:templates].page(params[:page]) if params[:page] != 'ALL'
+      
+      # Gather up all of the publication dates for the live versions of each template.
+      published = get_publication_dates(hash[:scopes][:dmptemplate_ids])
+      
+      paginable_renderise partial: 'templates_list',
+                          scope: hash[:templates],
+                          locals: { current_org: current_user.org.id,
+                                    customizations: hash[:customizations],
+                                    published: published,
+                                    scopes: hash[:scopes],
+                                    hide_actions: true }
+    end
     
     # GET /org_admin/templates/funders/:page  (AJAX)
     # -----------------------------------------------------
     def funders
       authorize Template
       # Apply scoping
-      hash = apply_scoping(params[:scope] || 'all', true)
+      hash = apply_scoping(params[:scope] || 'all', true, false)
 
       # Apply pagination
       hash[:templates] = hash[:templates].page(params[:page]) if params[:page] != 'ALL'
       
       # Gather up all of the publication dates for the live versions of each template.
-      published = {}
-      hash[:templates].each do |template|
-        live = Template.live(template.dmptemplate_id)
-        published[template.dmptemplate_id] = live.updated_at if live.present?
-      end
+      published = get_publication_dates(hash[:scopes][:dmptemplate_ids])
       
       paginable_renderise partial: 'funder_templates_list',
                           scope: hash[:templates],
@@ -315,24 +330,21 @@
     def orgs
       authorize Template
       # Apply scoping
-      hash = apply_scoping(params[:scope] || 'all')
+      hash = apply_scoping(params[:scope] || 'all', false, false)
       
       # Apply pagination
       hash[:templates] = hash[:templates].page(params[:page]) if params[:page] != 'ALL'
       
       # Gather up all of the publication dates for the live versions of each template.
-      published = {}
-      hash[:templates].each do |template|
-        live = Template.live(template.dmptemplate_id)
-        published[template.dmptemplate_id] = live.updated_at if live.present?
-      end
+      published = get_publication_dates(hash[:scopes][:dmptemplate_ids])
       
       paginable_renderise partial: 'templates_list',
                           scope: hash[:templates],
                           locals: { current_org: current_user.org.id,
                                     customizations: hash[:customizations],
                                     published: published,
-                                    scopes: hash[:scopes] }
+                                    scopes: hash[:scopes],
+                                    hide_actions: false }
     end
     
     # PUT /org_admin/templates/:id/copy  (AJAX)
@@ -362,30 +374,29 @@
     # PUT /org_admin/templates/:id/publish  (AJAX)
     # -----------------------------------------------------
     def publish
-      @template = Template.find(params[:id])
-      authorize @template
+      template = Template.find(params[:id])
+      authorize template
 
-      current = Template.current(@template.dmptemplate_id)
+      current = Template.current(template.dmptemplate_id)
 
       # Only allow the current version to be updated
-      if current != @template
+      if current != template
         redirect_to org_admin_templates_path, alert: _('You can not publish a historical version of this template.')
 
       else
         # Unpublish the older published version if there is one
-        live = Template.live(@template.dmptemplate_id)
+        live = Template.live(template.dmptemplate_id)
         if !live.nil? and self != live
           live.published = false
           live.save!
         end
         # Set the dirty flag to false
-        @template.dirty = false
-        @template.published = true
-        @template.save
+        template.dirty = false
+        template.published = true
+        template.save
 
         flash[:notice] = _('Your template has been published and is now available to users.')
-
-        redirect_to org_admin_templates_path
+        redirect_to "#{org_admin_templates_path}#{template.customization_of.present? ? '#funder-templates' : '#organisation-templates'}"
       end
     end
 
@@ -395,18 +406,15 @@
       template = Template.find(params[:id])
       authorize template
 
-      # Unpublish the live version
-      @template = Template.live(template.dmptemplate_id)
-
-      if @template.nil?
+      if template.nil?
         flash[:alert] = _('That template is not currently published.')
       else
-        @template.published = false
-        @template.save
+        template.published = false
+        template.save
         flash[:notice] = _('Your template is no longer published. Users will not be able to create new DMPs for this template until you re-publish it')
       end
 
-      redirect_to org_admin_templates_path
+      redirect_to "#{org_admin_templates_path}#{template.customization_of.present? ? '#funder-templates' : '#organisation-templates'}"
     end
     
     # PUT /org_admin/template_options  (AJAX)
@@ -464,13 +472,15 @@
     end
     
     # Applies scoping to the template list
-    def apply_scoping(scope, funders = false)
-      if funders
-        templates = Template.get_latest_template_versions(Org.funder)
-
+    def apply_scoping(scope, customizable = false, all = false)
+      if customizable
+        # Retrieve all of the publicly visible published funder templates
+        orgs = Org.funder.where.not(id: current_user.org.id)
         # Include the default template in the list of funder templates
-        templates << Template.default
-
+        orgs << Template.default.org unless current_user.org == Template.default.org
+        
+        templates = Template.get_public_published_template_versions(orgs)
+        
         # If the user is an Org Admin look for customizations to funder templates
         customizations = {}
         if current_user.can_org_admin?
@@ -495,10 +505,14 @@
             templates = Template.where(id: scoped.collect(&:id))
           end
         end
-        
+
       else
-        valid_orgs = current_user.can_super_admin? ? Org.not_funder : Org.find(current_user.org)
-        templates = Template.get_latest_template_versions(valid_orgs)
+        # If we're collecting all templates
+        if all
+          templates = Template.get_latest_template_versions(Org.all)
+        else
+          templates = Template.get_latest_template_versions(Org.where(id: current_user.org.id))
+        end
         
         scopes = calculate_table_scopes(templates, {})
         
@@ -507,7 +521,7 @@
           templates = templates.where(published: false) if params[:scope] == 'unpublished'
         end
       end
-      
+
       { templates: templates,
         customizations: customizations || {},
         scopes: scopes }
@@ -515,10 +529,10 @@
     
     # Gets the nbr of templates and nbr of published/unpublished templates
     def calculate_table_scopes(templates, customizations)
-      scopes = { all: templates.length, published: 0, unpublished: 0 }
+      scopes = { all: templates.length, published: 0, unpublished: 0, dmptemplate_ids: templates.collect(&:dmptemplate_id).uniq }
       templates.each do |t|
         # If we have customizations use their status
-        if customizations.length > 0
+        if customizations.respond_to?(:keys)
           c = customizations[t.dmptemplate_id]
           # If the template was not customized then its unpublished
           if c.nil?
@@ -535,5 +549,14 @@
       end
       scopes
     end
+    
+    def get_publication_dates(family_ids)
+      published = {}
+      lives = Template.live(family_ids)
+      lives.each do |live|
+        published[live.dmptemplate_id] = live.updated_at
+      end
+      published
+    end
   end
 end
\ No newline at end of file
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 996a33d..598ded8 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -78,7 +78,7 @@
     redirect_to "#{edit_user_registration_path}\#notification-preferences", notice: success_message(_('preferences'), _('saved'))
   end
 
-  # PUT /users/:id/org_swap  (AJAX)
+  # PUT /users/:id/org_swap
   # -----------------------------------------------------
   def org_swap
     # Allows the user to swap their org affiliation on the fly
@@ -87,16 +87,12 @@
     if org.present?
       current_user.org = org
       if current_user.save!
-        render json: {
-          msg: _('Your organisation affiliation has been changed. You may now edit templates for %{org_name}.') % {org_name: current_user.org.name}
-        }.to_json
+        redirect_to request.referer, notice: _('Your organisation affiliation has been changed. You may now edit templates for %{org_name}.') % {org_name: current_user.org.name}
       else
-        render json: {
-          err: _('Unable to change your organisation affiliation at this time.')
-        }.to_json
+        redirect_to request.referer, alert: _('Unable to change your organisation affiliation at this time.')
       end
     else
-      render json: {}.to_json
+      redirect_to request.referer, alert: _('Unknown organisation.')
     end
   end
   
diff --git a/app/models/template.rb b/app/models/template.rb
index 0ff158d..7f0d120 100644
--- a/app/models/template.rb
+++ b/app/models/template.rb
@@ -25,7 +25,7 @@
   #   -relies on protected_attributes gem as syntax depricated in rails 4.2
   attr_accessible :id, :org_id, :description, :published, :title, :locale, :customization_of,
                   :is_default, :guidance_group_ids, :org, :plans, :phases, :dmptemplate_id,
-                  :migrated, :version, :visibility, :published, :as => [:default, :admin]
+                  :migrated, :version, :visibility, :published, :links, :as => [:default, :admin]
 
   # A standard template should be organisationally visible. Funder templates that are 
   # meant for external use will be publicly visible. This allows a funder to create 'funder' as
@@ -67,12 +67,28 @@
       select("MAX(version) AS version", :dmptemplate_id).group(:dmptemplate_id)
     end
   }
+  # Retrieves the maximum version for the array of customization_ofs passed. If customization_ofs is missing, every maximum
+  # version for each different customization_of will be retrieved
+  scope :customization_ofs_with_max_version, -> (customization_ofs=nil) {
+    if customization_ofs.is_a?(Array)
+      select("MAX(version) AS version", :customization_of).where(customization_of: customization_ofs).group(:customization_of)
+    else
+      select("MAX(version) AS version", :customization_of).group(:customization_of)
+    end
+  }
   # Retrieves the latest template version, i.e. the one with maximum version for each dmptemplate_id
   scope :latest_version, -> (dmptemplate_ids=nil) {
     from(dmptemplate_ids_with_max_version(dmptemplate_ids), :current)
     .joins("INNER JOIN templates ON current.version = templates.version"\
       " AND current.dmptemplate_id = templates.dmptemplate_id")
   }
+  # Retrieves the latest customized version, i.e. the one with maximum version for each customization_of=dmptemplate_id
+  scope :latest_customization, -> (org_id, dmptemplate_ids=nil) {
+    from(customization_ofs_with_max_version(dmptemplate_ids), :current)
+    .joins("INNER JOIN templates ON current.version = templates.version"\
+      " AND current.customization_of = templates.customization_of")
+    .where('templates.org_id = ?', org_id)
+  }
   # Retrieves the list of all dmptemplate_ids (template versioning families) for the specified Org
   def self.dmptemplate_ids
     Template.all.valid.distinct.pluck(:dmptemplate_id)
@@ -85,7 +101,11 @@
 
   # Retrieves the current published version of the template for the specified Org and dmptemplate_id
   def self.live(dmptemplate_id)
-    Template.where(dmptemplate_id: dmptemplate_id, published: true).valid.first
+    if dmptemplate_id.respond_to?(:each)
+      Template.where(dmptemplate_id: dmptemplate_id, published: true).valid
+    else
+      Template.where(dmptemplate_id: dmptemplate_id, published: true).valid.first
+    end
   end
 
   def self.default
@@ -100,8 +120,9 @@
   # @params  dmptemplate_ids of the original template
   # @params [integer] org_id for the customizing organisation
   # @return [nil, Template] the customized template or nil
-  def self.org_customizations(dmptemplate_id, org_id)
-    Template.where(customization_of: dmptemplate_id, org_id: org_id).order(version: :desc).valid
+  def self.org_customizations(dmptemplate_ids, org_id)
+    template_ids = latest_customization(org_id, dmptemplate_ids).pluck(:id)
+    includes(:org).where(id: template_ids).order('orgs.name, templates.title')
   end
   
   # Retrieves current templates with their org associated for a set of valid orgs
@@ -118,6 +139,19 @@
     includes(:org).where(id: template_ids).order('orgs.name, templates.title')
   end
   
+  # Retrieves current templates with their org associated for a set of valid orgs
+  # TODO pass an array of org ids instead of Org instances
+  def self.get_public_published_template_versions(orgs)
+    if orgs.respond_to?(:each)
+      families_ids = families(orgs.map(&:id)).pluck(:dmptemplate_id)
+    elsif orgs.is_a?(Org)
+      families_ids = families([orgs.id]).pluck(:dmptemplate_id)
+    else
+      families_ids = []
+    end
+    includes(:org).where(dmptemplate_id: families_ids, published: true, visibility: Template.visibilities[:publicly_visible]).order('orgs.name, templates.title')
+  end
+  
   ##
   # deep copy the given template and all of it's associations
   #
diff --git a/app/policies/template_policy.rb b/app/policies/template_policy.rb
index 64cf610..b4a62c3 100644
--- a/app/policies/template_policy.rb
+++ b/app/policies/template_policy.rb
@@ -44,6 +44,9 @@
   end
   
   # Pagination 
+  def all?
+    user.can_super_admin?
+  end
   def funders?
     user.can_super_admin? || user.can_modify_templates?
   end
diff --git a/app/views/layouts/_branding.html.erb b/app/views/layouts/_branding.html.erb
index 72e65ad..a746176 100644
--- a/app/views/layouts/_branding.html.erb
+++ b/app/views/layouts/_branding.html.erb
@@ -24,7 +24,7 @@
     <!-- Collect the nav links, forms, and other content for toggling -->
     <div class="collapse navbar-collapse" id="org-navbar-menu">
       <!-- Organisational links -->
-      <% if user_signed_in? && !current_user.org.nil? %>
+      <% if user_signed_in? && !current_user.org.present? && !current_user.org.links.present? && !current_user.org.links['org'].present? %>
         <ul class="nav navbar-nav">
           <% i=1; current_user.org.links['org'].each do |link| %>
             <% if !link.blank? && i <= max_number_links %>
diff --git a/app/views/org_admin/templates/_funder_templates_list.html.erb b/app/views/org_admin/templates/_funder_templates_list.html.erb
index 9a0ded9..2a7441d 100644
--- a/app/views/org_admin/templates/_funder_templates_list.html.erb
+++ b/app/views/org_admin/templates/_funder_templates_list.html.erb
@@ -13,7 +13,9 @@
       <% if scopes.present? %>
         <tr><th colspan="5" class="sorter-false table-scope"><ul class="nav navbar-nav">
           <% scopes.keys.each do |k| %>
-            <li><%= link_to "#{k.capitalize} (#{scopes[k]})", "#{funders_org_admin_templates_path(1)}?scope=#{k}", class: 'template-scope', 'data-remote': true %></li>
+            <% unless k == :dmptemplate_ids %>
+              <li><%= link_to "#{k.capitalize} (#{scopes[k]})", "#{funders_org_admin_templates_path(1)}?scope=#{k}", class: 'template-scope', 'data-remote': true %></li>
+            <% end %>
           <% end %>
         </ul></th></tr>
       <% end %>
@@ -30,36 +32,28 @@
       <% customization = customizations[template.dmptemplate_id] %>
       <tr>
         <td>
-          <%= template.title %>
+          <%= "#{template.is_default? ? '* ' : ''}#{template.title}" %>
         </td>
           <td>
             <%= raw template.org.name %>
           </td>
           <td>
-            <% if current_user.can_super_admin? %>
-              <% if !published[template.dmptemplate_id].present? %>
-                <%= _('Unpublished') %>
-              <% elsif template.dirty? %>
-                <%= _('Unpublished changes') %>
-              <% else %>
+            <% if customization.present? %>
+              <!-- If the original funder template has been changed -->
+              <% if customization.updated_at < template.updated_at %>
+                <%= _('Original funder template has changed!')%>
+              <% elsif !template.published? %>
+                <!-- The template does not have a live version -->
+                <%= b_label = _('Funder version is un-published') %>
+              <% elsif customization.dirty? %>
+                <%= _('You have un-published changes') %>
+              <% elsif customization.published? %>
                 <%= _('Published') %>
+              <% else %>
+                <%= _('Unpublished') %>
               <% end %>
             <% else %>
-              <% if customization.present? %>
-                <!-- If the original funder template has been changed -->
-                <% if customization.updated_at < template.updated_at %>
-                  <%= _('Original funder template has changed!')%>
-                <% elsif !template.published? %>
-                  <!-- The template does not have a live version -->
-                  <%= b_label = _('Funder version is un-published') %>
-                <% elsif customization.dirty? %>
-                  <%= _('You have un-published changes') %>
-                <% else %>
-                  <%= _('Published') %>
-                <% end %>
-              <% else %>
-                <%= _('Not Customised') %>
-              <% end %>
+              <%= _('Not Customised') %>
             <% end %>
           </td>
           <td>
@@ -67,52 +61,30 @@
             <%= l last_temp_updated.to_date, formats: :short %>
           </td>
           <td>
-            <div class="dropdown<%= (!current_user.can_super_admin? || (current_user.can_super_admin? && current_org == template.org.id)) ? '' : ' hide'%>">
-              <% # Span used to trigger the display of the action dropdowns via JS %>
-              <span class="super-admin-template-org hide"><%= template.org.id %></span>
-
+            <div class="dropdown">
               <button class="btn btn-link dropdown-toggle" type="button"
                       data-toggle="dropdown"
                       aria-haspopup="true" aria-expanded="true">
                 <%= _('Actions') %><span class="caret"></span>
               </button>
               <ul class="dropdown-menu">
-                <% if current_user.can_super_admin? %>
-                  <li><%= link_to _('Edit'), edit_org_admin_template_path(id: template.id, edit: "true") %></li>
-                  <li><%= link_to _('History'), history_org_admin_template_path(id: template.id) %></li>
-                  <% if !published[template.dmptemplate_id].present? %>
-                    <li><%= link_to _('Publish'), publish_org_admin_template_path(template) %></li>
-                  <% elsif template.dirty? %>
-                    <li><%= link_to _('Publish changes'), publish_org_admin_template_path(template) %></li>
+                <% if !customization.present? %>
+                  <li><%= link_to _('Customise'), customize_org_admin_template_path(template) %></li>
+                <% else %>
+                  <% if customization.updated_at < template.updated_at %>
+                    <li><%= link_to _('Transfer customisation'), transfer_customization_org_admin_template_path(template) %></li>
                   <% else %>
-                    <li><%= link_to _('Unpublish'), unpublish_org_admin_template_path(template) %></li>
-                  <% end %>
-                  <li><%= link_to _('Copy'), copy_org_admin_template_path(template) %></li>
-                  <% if template.plans.length <= 0 %>
-                    <li>
-                      <%= link_to _('Remove'), org_admin_template_path(id: template.id), 'data-method': 'delete', rel: 'nofollow',
-                          'data-confirm': _('Are you sure you want to remove "%{template_title}"?') % { template_title: template.title} %>
-                    </li>
-                  <% end %>
-
-                  <% if !customization.present? %>
-                    <li><%= link_to _('Customise'), customize_org_admin_template_path(template) %></li>
-                  <% else %>
-                    <% if customization.updated_at < template.updated_at %>
-                      <li><%= link_to _('Transfer customisation'), transfer_customization_org_admin_template_path(template) %></li>
+                    <li><%= link_to _('Edit customisation'), edit_org_admin_template_path(id: customization.id, edit: "true") %></li>
+                    <% if !customization.published? %>
+                      <li><%= link_to _('Publish'), publish_org_admin_template_path(customization) %></li>
                     <% else %>
-                      <li><%= link_to _('Edit customisation'), edit_org_admin_template_path(id: customization.id, edit: "true") %></li>
-                      <% if !customization.published? %>
-                        <li><%= link_to _('Publish'), publish_org_admin_template_path(customization) %></li>
-                      <% else %>
-                        <li><%= link_to _('Unpublish'), unpublish_org_admin_template_path(template) %></li>
-                      <% end %>
-                      <% if customization.plans.length <= 0 %>
-                        <li>
-                          <%= link_to _('Remove'), org_admin_template_path(id: customization.id), 'data-method': 'delete', rel: 'nofollow',
-                              'data-confirm': _('Are you sure you want to remove your customization of "%{template_title}"?') % { template_title: customization.title} %>
-                        </li>
-                      <% end %>
+                      <li><%= link_to _('Unpublish'), unpublish_org_admin_template_path(customization) %></li>
+                    <% end %>
+                    <% if customization.plans.length <= 0 %>
+                      <li>
+                        <%= link_to _('Remove'), org_admin_template_path(id: customization.id), 'data-method': 'delete', rel: 'nofollow',
+                            'data-confirm': _('Are you sure you want to remove your customization of "%{template_title}"?') % { template_title: customization.title} %>
+                      </li>
                     <% end %>
                   <% end %>
                 <% end %>
diff --git a/app/views/org_admin/templates/_templates_list.html.erb b/app/views/org_admin/templates/_templates_list.html.erb
index 97a5de1..fdbb1a3 100644
--- a/app/views/org_admin/templates/_templates_list.html.erb
+++ b/app/views/org_admin/templates/_templates_list.html.erb
@@ -13,7 +13,9 @@
       <% if scopes.present? %>
         <tr><th colspan="5" class="sorter-false table-scope"><ul class="nav navbar-nav">
           <% scopes.keys.each do |k| %>
-            <li><%= link_to "#{k.capitalize} (#{scopes[k]})", "#{orgs_org_admin_templates_path(1)}?scope=#{k}", class: 'template-scope', 'data-remote': true %></li>
+            <% unless k == :dmptemplate_ids %>
+              <li><%= link_to "#{k.capitalize} (#{scopes[k]})", "#{hide_actions ? all_org_admin_templates_path(1) : orgs_org_admin_templates_path(1)}?scope=#{k}", class: 'template-scope', 'data-remote': true %></li>
+            <% end %>
           <% end %>
         </ul></th></tr>
       <% end %>
@@ -22,7 +24,7 @@
         <th><%= current_user.can_super_admin? ? _('Organisation') : _('Description') %></th>
         <th><%= _('Status') %></th>
         <th><%= _('Edited Date') %></th>
-        <th class="sorter-false"></th>
+        <% if !hide_actions %><th class="sorter-false"></th><% end %>
       </tr>
     </thead>
     <tbody>
@@ -47,36 +49,38 @@
             <% last_temp_updated = template.updated_at %>
             <%= l last_temp_updated.to_date, formats: :short %>
           </td>
-          <td>
-            <div class="dropdown<%= current_org == template.org.id ? '' : ' hide'%>">
-              <% # Span used to trigger the display of the action dropdowns via JS %>
-              <span class="super-admin-template-org hide"><%= template.org.id %></span>
+          <% if !hide_actions %>
+            <td>
+              <div class="dropdown<%= current_org == template.org.id ? '' : ' hide'%>">
+                <% # Span used to trigger the display of the action dropdowns via JS %>
+                <span class="super-admin-template-org hide"><%= template.org.id %></span>
 
-              <button class="btn btn-link dropdown-toggle" type="button"
-                      data-toggle="dropdown"
-                      aria-haspopup="true" aria-expanded="true">
-                <%= _('Actions') %><span class="caret"></span>
-              </button>
-              <ul class="dropdown-menu">
-                <li><%= link_to _('Edit'), edit_org_admin_template_path(id: template.id, edit: "true") %></li>
-                <li><%= link_to _('History'), history_org_admin_template_path(id: template.id) %></li>
-                <% if !published[template.dmptemplate_id].present? %>
-                  <li><%= link_to _('Publish'), publish_org_admin_template_path(template) %></li>
-                <% elsif template.dirty? %>
-                  <li><%= link_to _('Publish changes'), publish_org_admin_template_path(template) %></li>
-                <% else %>
-                  <li><%= link_to _('Unpublish'), unpublish_org_admin_template_path(template) %></li>
-                <% end %>
-                <li><%= link_to _('Copy'), copy_org_admin_template_path(template) %></li>
-                <% if template.plans.length <= 0 %>
-                  <li>
-                    <%= link_to _('Remove'), org_admin_template_path(id: template.id), 'data-method': 'delete', rel: 'nofollow',
-                                'data-confirm': _('Are you sure you want to remove "%{template_title}"?') % { template_title: template.title} %>
-                  </li>
-                <% end %>
-              </ul>
-            </div>
-         </td>
+                <button class="btn btn-link dropdown-toggle" type="button"
+                        data-toggle="dropdown"
+                        aria-haspopup="true" aria-expanded="true">
+                  <%= _('Actions') %><span class="caret"></span>
+                </button>
+                <ul class="dropdown-menu">
+                  <li><%= link_to _('Edit'), edit_org_admin_template_path(id: template.id, edit: "true") %></li>
+                  <li><%= link_to _('History'), history_org_admin_template_path(id: template.id) %></li>
+                  <% if !published[template.dmptemplate_id].present? %>
+                    <li><%= link_to _('Publish'), publish_org_admin_template_path(template) %></li>
+                  <% elsif template.dirty? %>
+                    <li><%= link_to _('Publish changes'), publish_org_admin_template_path(template) %></li>
+                  <% else %>
+                    <li><%= link_to _('Unpublish'), unpublish_org_admin_template_path(template) %></li>
+                  <% end %>
+                  <li><%= link_to _('Copy'), copy_org_admin_template_path(template) %></li>
+                  <% if template.plans.length <= 0 %>
+                    <li>
+                      <%= link_to _('Remove'), org_admin_template_path(id: template.id), 'data-method': 'delete', rel: 'nofollow',
+                                  'data-confirm': _('Are you sure you want to remove "%{template_title}"?') % { template_title: template.title} %>
+                    </li>
+                  <% end %>
+                </ul>
+              </div>
+           </td>
+         <% end %>
        </tr>
       <% end %>
     </tbody>
diff --git a/app/views/org_admin/templates/index.html.erb b/app/views/org_admin/templates/index.html.erb
index 6c08dfd..85e5e7c 100644
--- a/app/views/org_admin/templates/index.html.erb
+++ b/app/views/org_admin/templates/index.html.erb
@@ -20,43 +20,63 @@
     </p>
   </div>
 </div>
-
 <div class="row">
   <div class="col-md-12">
     <ul class="nav nav-tabs" role="tablist">
-      <li role="organisation-templates" class="active">
-        <a href="#organisation-templates" role="tab" aria-controls="organisation-templates" data-toggle="tab"><%= current_user.can_super_admin? ? _('Organisation Templates') : _('Own Templates') %></a>
+      <% if current_user.can_super_admin? %>
+        <li role="all-templates" class="active">
+          <a href="#all-templates" role="tab" aria-controls="all-templates" data-toggle="tab"><%= _('All Templates') %></a>
+        </li>
+      <% end %>
+      <li role="organisation-templates" class="<%= !current_user.can_super_admin? ? 'active' : '' %>">
+        <a href="#organisation-templates" role="tab" aria-controls="organisation-templates" data-toggle="tab"><%= current_user.can_super_admin? ? _('%{org_name} Templates') % { org_name: current_user.org.name } : _('Own Templates') %></a>
       </li>
       <li role="funder-templates">
-        <a href="#funder-templates" role="tab" aria-controls="funder-templates" data-toggle="tab"><%= current_user.can_super_admin? ? _('Funder Templates') : _('Customizable Templates') %></a>
+        <a href="#funder-templates" role="tab" aria-controls="funder-templates" data-toggle="tab"><%= _('Customizable Templates') %></a>
       </li>
     </ul>
   
     <div class="tab-content">
-      <div id="organisation-templates" role="tabpanel" class="tab-pane active">
-        <h2><%= _('Organisation Templates') %></h2>
-        <% if org_templates.length > 0 %>
+      <% if current_user.can_super_admin? %>
+        <div id="all-templates" role="tabpanel" class="tab-pane active">
+          <h2><%= _('All Templates') %></h2>
+          <% if all_templates.length > 0 %>
+            <%= paginable_renderise(
+              partial: 'templates_list',
+              controller: 'org_admin/templates',
+              action: 'all', 
+              scope: all_templates,
+              locals: {current_org: current_org.id, published: published, scopes: scopes[:all], hide_actions: true}) %>
+          <% else %>
+            <p><%= _('There are currently no templates.') %></p>
+          <% end %>
+        </div>
+      <% end %>
+      <div id="organisation-templates" role="tabpanel" class="tab-pane<%= !current_user.can_super_admin? ? ' active' : '' %>">
+        <h2><%= current_user.can_super_admin? ? _('%{org_name} Templates') % { org_name: current_user.org.name } : _('Own Templates') %></h2>
+        <% if own_templates.length > 0 %>
           <%= paginable_renderise(
             partial: 'templates_list',
             controller: 'org_admin/templates',
             action: 'orgs', 
-            scope: org_templates,
-            locals: {current_org: current_org.id, published: published, scopes: scopes[:orgs]}) %>
+            scope: own_templates,
+            locals: {current_org: current_org.id, published: published, scopes: scopes[:orgs], hide_actions: false}) %>
         <% else %>
-          <p><%= _('There are currently no templates defined for your organisation.') %>
+          <p><%= _('There are currently no templates defined for your organisation.') %></p>
         <% end %>
       </div>
+      <!-- If the Org is not just a funder then show the customizations table -->
       <div id="funder-templates" role="tabpanel" class="tab-pane">
-        <h2><%= current_user.can_super_admin? ? _('Funder Templates') : _('Customizable Templates') %></h2>
-        <% if funder_templates.length > 0 %>
+        <h2><%= _('Customizable Templates') %></h2>
+        <% if customizable_templates.length > 0 %>
           <%= paginable_renderise(
             partial: 'funder_templates_list',
             controller: 'org_admin/templates',
             action: 'funders', 
-            scope: funder_templates,
+            scope: customizable_templates,
             locals: {current_org: current_org.id, customizations: customized_templates, published: published, scopes: scopes[:funders]}) %>
         <% else %>
-          <p><%= _('There are currently no funder templates.') %>
+          <p><%= _('There are currently no customisable templates.') %></p>
         <% end %>
       </div>
     </div>
diff --git a/config/routes.rb b/config/routes.rb
index ec70933..3513da7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -278,6 +278,7 @@
         end
           
         # pagination
+        get 'all/:page', action: :all, on: :collection, as: :all
         get 'funders/:page', action: :funders, on: :collection, as: :funders
         get 'orgs/:page', action: :orgs, on: :collection, as: :orgs
       end
diff --git a/db/seeds.rb b/db/seeds.rb
index 94f6545..239bb70 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -165,7 +165,7 @@
 orgs = [
   {name: Rails.configuration.branding[:organisation][:name],
    abbreviation: Rails.configuration.branding[:organisation][:abbreviation],
-   org_type: 3, links: {"org":[]},
+   org_type: 4, links: {"org":[]},
    language_id: Language.find_by(abbreviation: 'en_GB'),
    token_permission_types: TokenPermissionType.all},
   {name: 'Government Agency',
@@ -354,7 +354,7 @@
    migrated: false,
    dmptemplate_id: 1,
    visibility: Template.visibilities[:publicly_visible],
-   links: '{"funder":[],"sample_plan":[]}'},
+   links: {"funder":[],"sample_plan":[]}},
   
   {title: "OLD - Department of Testing Award",
    published: false,
@@ -364,7 +364,7 @@
    migrated: false,
    visibility: Template.visibilities[:organisationally_visible],
    dmptemplate_id: 2,
-   links: '{"funder":[],"sample_plan":[]}'},
+   links: {"funder":[],"sample_plan":[]}},
      
   {title: "Department of Testing Award",
    published: true,
@@ -374,7 +374,7 @@
    migrated: false,
    visibility: Template.visibilities[:organisationally_visible],
    dmptemplate_id: 3,
-   links: '{"funder":[],"sample_plan":[]}'}
+   links: {"funder":[],"sample_plan":[]}}
 ]
 # Template creation calls defaults handler which sets is_default and 
 # published to false automatically, so update them after creation
diff --git a/lib/assets/javascripts/views/org_admin/templates/index.js b/lib/assets/javascripts/views/org_admin/templates/index.js
index 0456ac5..c60f8cc 100644
--- a/lib/assets/javascripts/views/org_admin/templates/index.js
+++ b/lib/assets/javascripts/views/org_admin/templates/index.js
@@ -1,49 +1,4 @@
-import * as notifications from '../../../utils/notificationHelper';
-import { isObject } from '../../../utils/isType';
-import { isValidNumber } from '../../../utils/isValidInputType';
-
 $(() => {
-  // enable the Actions dropdown for each template belonging to the current user's org
-  const enableActions = (ctx) => {
-    if (isValidNumber($(ctx).find('#user_org_id').val())) {
-      $('tr .dropdown .super-admin-template-org').map((idx, el) => {
-        if (isValidNumber($(el).text()) && $(ctx).find('#user_org_id').val().toString() === $(el).text()) {
-          $(el).parent().removeClass('hide');
-        } else {
-          $(el).parent().addClass('hide');
-        }
-        return true;
-      });
-    }
-  };
-  const swapOrg = (ctx) => {
-    if (isValidNumber($(ctx).find('#user_org_id').val())) {
-      notifications.hideNotifications();
-      $.ajax({
-        method: $(ctx).attr('method'),
-        url: $(ctx).attr('action'),
-        data: $(ctx).serializeArray(),
-      }).done((data) => {
-        if (data.msg.length > 0) {
-          notifications.renderNotice(data.msg);
-        } else if (data.err.length > 0) {
-          notifications.renderAlert(data.err);
-        }
-        enableActions(ctx);
-      }).fail((err) => {
-        notifications.renderAlert(err);
-      });
-    }
-  };
-
-  if (isObject($('form#super-admin-switch-org'))) {
-    $('form#super-admin-switch-org').on('submit', (e) => {
-      e.preventDefault();
-      swapOrg(e.target);
-    });
-    enableActions($('form#super-admin-switch-org'));
-  }
-
   // Update the contents of the table when user clicks on a scope link
   $('.template-scope').on('ajax:success', 'a[data-remote="true"]', (e, data) => {
     $(e.target).closest('.paginable').html(data);
diff --git a/test/functional/org_admin/templates_controller_test.rb b/test/functional/org_admin/templates_controller_test.rb
index 4073b55..26aceff 100644
--- a/test/functional/org_admin/templates_controller_test.rb
+++ b/test/functional/org_admin/templates_controller_test.rb
@@ -22,22 +22,73 @@
     get org_admin_templates_path
     assert_authorized_redirect_to_plans_page
   end
-  
-  test "Org Admin should see the list of their templates and customizable funder templates" do
-    sign_in @user
+
+  test "Org admin sees the correct templates on the templates page" do
+    init_templates
+    sign_in @org_admin
     get org_admin_templates_path
-    assert_response :success
-    assert_select "#organisation-templates table tbody tr", @user.org.templates.length, "expected the Org Admin to only see their own templates"
+    
+    verify_all_templates_table(@org_admin)
+    verify_own_templates_table(@org_admin)
+    verify_funder_templates_table(@org_admin)
+  end
+    
+  test "Funder admin sees the correct templates on the templates page" do
+    init_templates
+    sign_in @funder_admin
+    get org_admin_templates_path
+    
+    verify_all_templates_table(@funder_admin)
+    verify_own_templates_table(@funder_admin)
+    verify_funder_templates_table(@funder_admin)
   end
   
-  test "Super Admin should see the list of all templates" do
-    user = User.find_by(email: 'super_admin@example.com')
-    sign_in user
+  test "Super admin sees the correct templates on the templates page" do
+    init_templates
+    sign_in @super_admin
     get org_admin_templates_path
-    assert_response :success
-    assert_select "#organisation-templates table tbody tr", Template.where(org: Org.not_funder).pluck(:dmptemplate_id).uniq.length, "expected the Super Admin to see all of the templates"
+    
+    verify_all_templates_table(@super_admin)
+    verify_own_templates_table(@super_admin)
+    verify_funder_templates_table(@super_admin)
+  end
+  
+  test "Predefined scopes correctly filter results on all templates table" do
+    init_templates
+    sign_in @super_admin
+    get org_admin_templates_path
+    
+    verify_all_templates_table(@super_admin)
+    
+    published = Template.latest_version.where(published: true, customization_of: nil)
+    unpublished = Template.latest_version.where(published: false, customization_of: nil)
+    verify_templates_table_scoping(all_org_admin_templates_path('ALL'), '#all-templates', published, unpublished)
+  end
+  
+  test "Predefined scopes correctly filter results on own templates table" do
+    init_templates
+    sign_in @org_admin
+    get org_admin_templates_path
+    
+    verify_all_templates_table(@org_admin)
+    
+    published = Template.get_latest_template_versions(@org_admin.org).where(published: true, customization_of: nil)
+    unpublished = Template.get_latest_template_versions(@org_admin.org).where(published: false, customization_of: nil)
+    verify_templates_table_scoping(orgs_org_admin_templates_path('ALL'), '#organisation-templates', published, unpublished)
   end
 
+  test "Predefined scopes correctly filter results on customizable templates table" do
+    init_templates
+    sign_in @org_admin
+    get org_admin_templates_path
+    
+    verify_all_templates_table(@org_admin)
+    
+    published = Template.where(title: 'UOS customization of Default template')
+    unpublished = Template.where('published = 1 AND visibility = 1 AND is_default = 0')
+    verify_templates_table_scoping(funders_org_admin_templates_path('ALL'), '#funders-templates', published, unpublished)
+  end
+  
   test "unauthorized user cannot access the template edit page" do
     # Should redirect user to the root path if they are not logged in!
     get edit_org_admin_template_path(@template)
@@ -226,7 +277,7 @@
 
     get publish_org_admin_template_path(funder_template)
     assert_response :redirect
-    assert_redirected_to org_admin_templates_path
+    assert_redirected_to "#{org_admin_templates_path}#organisation-templates"
 
     # Sign in as the regular user so we can customize the funder template
     sign_in @user
@@ -282,13 +333,12 @@
     assert_equal _('You can not publish a historical version of this template.'), flash[:alert]
     assert_response :redirect
     assert_redirected_to org_admin_templates_path
-    assert assigns(:template)
 
     # Publish the current template
     get publish_org_admin_template_path(current)
     assert_equal _('Your template has been published and is now available to users.'), flash[:notice]
     assert_response :redirect
-    assert_redirected_to org_admin_templates_path
+    assert_redirected_to "#{org_admin_templates_path}#organisation-templates"
     current = Template.current(family)
 
     # Update the description so that the template gets versioned
@@ -334,7 +384,7 @@
     get unpublish_org_admin_template_path(current)
     assert_equal _('Your template is no longer published. Users will not be able to create new DMPs for this template until you re-publish it'), flash[:notice]
     assert_response :redirect
-    assert_redirected_to org_admin_templates_path
+    assert_redirected_to "#{org_admin_templates_path}#organisation-templates"
 
     # Make sure there are no published versions
     assert Template.live(family).nil?
@@ -370,4 +420,157 @@
   test "transfer a template customization" do
     # TODO add test for this. Could not get working, getting a nil for max_version within the method (NOT SURE IF THIS IS STILL IN USE!)
   end
+
+  private
+  def init_templates
+    # First clear out any existing templates
+    Template.all.each do |template|
+      template.destroy!
+    end
+    
+    @super_admin = User.find_by(email: 'super_admin@example.com')
+    @org_admin = User.find_by(email: 'org_admin@example.com')
+    @funder_admin = User.find_by(email: 'funder_admin@example.com')
+    
+    default_org = Org.find_by(org_type: 4)
+    funder_org = Org.find_by(org_type: 2)
+    institution_org = Org.find_by(org_type: 1)
+    other_org = Org.create!(name: 'Another Org', abbreviation: 'BLAH', org_type: 3, links: {"org":[]})
+    
+    params = [{ title: 'Default template', org: default_org, migrated: false, dmptemplate_id: '00000100', published: true, version: 0, visibility: Template.visibilities[:publicly_visible], is_default: true },
+              { title: 'UOS published A', org: institution_org, migrated: false, dmptemplate_id: '00000099', published: true, version: 0, visibility: Template.visibilities[:organisationally_visible], is_default: false },
+              { title: 'UOS published B', org: institution_org, migrated: false, dmptemplate_id: '00000098', published: true, version: 0, visibility: Template.visibilities[:organisationally_visible], is_default: false },
+              { title: 'UOS unpublished C', org: institution_org, migrated: false, dmptemplate_id: '00000097', published: false, version: 0, visibility: Template.visibilities[:organisationally_visible], is_default: false },
+              { title: 'UOS unpublished Dv0', org: institution_org, migrated: false, dmptemplate_id: '00000096', published: false, version: 0, visibility: Template.visibilities[:organisationally_visible], is_default: false },
+              { title: 'UOS published Dv1', org: institution_org, migrated: false, dmptemplate_id: '00000096', published: true, version: 1, visibility: Template.visibilities[:organisationally_visible], is_default: false },
+              { title: 'UOS published Ev0', org: institution_org, migrated: false, dmptemplate_id: '00000095', published: true, version: 0, visibility: Template.visibilities[:organisationally_visible], is_default: false },
+              { title: 'UOS unpublished Ev1', org: institution_org, migrated: false, dmptemplate_id: '00000095', published: false, version: 1, visibility: Template.visibilities[:organisationally_visible], is_default: false },
+              { title: 'BLAH internal published A', org: other_org, migrated: false, dmptemplate_id: '00000079', published: true, version: 0, visibility: Template.visibilities[:organisationally_visible], is_default: false },
+              { title: 'BLAH public published B', org: other_org, migrated: false, dmptemplate_id: '00000078', published: true, version: 0, visibility: Template.visibilities[:publicly_visible], is_default: false },
+              { title: 'Funder public published A', org: funder_org, migrated: false, dmptemplate_id: '00000089', published: true, version: 0, visibility: Template.visibilities[:publicly_visible], is_default: false },
+              { title: 'Funder internal published B', org: funder_org, migrated: false, dmptemplate_id: '00000088', published: true, version: 0, visibility: Template.visibilities[:organisationally_visible], is_default: false },
+              { title: 'Funder internal unpublished B', org: funder_org, migrated: false, dmptemplate_id: '00000088', published: false, version: 1, visibility: Template.visibilities[:organisationally_visible], is_default: false },
+              { title: 'Funder public unpublished C', org: funder_org, migrated: false, dmptemplate_id: '00000087', published: false, version: 0, visibility: Template.visibilities[:publicly_visible], is_default: false },
+              { title: 'Funder public unpublished Dv0', org: funder_org, migrated: false, dmptemplate_id: '00000086', published: false, version: 0, visibility: Template.visibilities[:publicly_visible], is_default: false },
+              { title: 'Funder public published Dv1', org: funder_org, migrated: false, dmptemplate_id: '00000086', published: true, version: 1, visibility: Template.visibilities[:publicly_visible], is_default: false },
+              { title: 'Funder public published Ev0', org: funder_org, migrated: false, dmptemplate_id: '00000085', published: true, version: 0, visibility: Template.visibilities[:publicly_visible], is_default: false },
+              { title: 'Funder public unpublished Ev1', org: funder_org, migrated: false, dmptemplate_id: '00000085', published: false, version: 1, visibility: Template.visibilities[:publicly_visible], is_default: false }]
+    
+    params.each do |hash|
+      begin
+        template = Template.new(hash)
+        template.save!
+        # Template's have default values when created, so override those defaults
+        template.update_attributes!(published: hash[:published], visibility: hash[:visibility], is_default: hash[:is_default], dmptemplate_id: hash[:dmptemplate_id])
+        
+        if template.is_default?
+          cust = Template.create!({ title: 'UOS customization of Default template', org: institution_org, migrated: false, version: 0})
+          cust.update_attributes(published: true, customization_of: template.dmptemplate_id, visibility: Template.visibilities[:organisationally_visible])
+        elsif template.title == 'Funder public published A'
+          cust = Template.create!({ title: 'UOS customization of Funder public published A', org: institution_org, migrated: false, version: 0})
+          cust.update_attributes(published: false, customization_of: template.dmptemplate_id, visibility: Template.visibilities[:organisationally_visible])
+        end
+      rescue ActiveRecord::RecordInvalid
+        puts "EXCEPTION: #{template.errors.collect{ |e, m| "#{e}: #{m}" }.join(', ')}"
+      end 
+    end
+  end
+  
+  def verify_all_templates_table(user)
+    if user.can_super_admin?
+      assert_select "#all-templates table tbody", true, "expected a super admin to be able to see the all templates table"
+    else
+      assert_select "#all-templates table tbody", false, "expected a non-super admin to NOT see the all templates table"
+    end
+  end
+  
+  def verify_own_templates_table(user)
+    assert_select "#organisation-templates table tbody" do |el|
+      templates = Template.where(org: user.org, customization_of: nil)
+      
+      # Org Admins (funder or non-funder)
+      if user.can_org_admin?
+        # An Org Admin (for a non-funder Org) should only see their current templates in the own templates table
+        templates.each do |template|
+          # Expect to see the most current version of organisational templates
+          current = Template.current(template.dmptemplate_id)
+          if template == current
+            assert el.to_s.include?(template.title), "expected #{user.email}'s own templates table to have the institutional template: '#{template.title}'"
+          else
+            assert_not el.to_s.include?(template.title), "expected #{user.email}'s own templates table to NOT have an older version of an the org's template: '#{template.title}'"
+          end
+        end
+
+        # Expect to see no templates for other orgs in the own templates table
+        Template.where.not(id: templates.collect(&:id)).each do |template|
+          assert_not el.to_s.include?(template.title), " expected #{user.email}'s own templates table to NOT have: '#{template.title}'"
+        end
+
+        # Expect the funder templates table to contain NO 'Edit/Publish menus
+        assert_not el.to_s.include?('Customise'), "expected #{user.email}'s own templates table to NOT contain any of the Customization menu items in the funder templates table"
+      end
+    end
+  end
+  
+  def verify_funder_templates_table(user)
+    assert_select "#funder-templates table tbody" do |el|
+      # An Org Admin should see all of the funder/default templates (except ones that belong to their org)
+      templates = Template.where("(org_id IN (?) OR is_default = ?) AND org_id != ?", Org.where(org_type: [2,3]).collect(&:id), true, user.org.id)
+      if user.can_org_admin?
+        templates.each do |template|
+          # Expect to only see published public templates
+          if template.publicly_visible? && template.published?
+            assert el.to_s.include?(template.title), "expected #{user.email}'s customizable table to have the funder (or default) template: '#{template.title}'" 
+          else
+            assert_not el.to_s.include?(template.title), "expected #{user.email}'s customizable table to NOT have the unpublished/non-public funder template: '#{template.title}' (from org: #{template.org.abbreviation})"
+          end
+        end
+
+        # Expect to see only the current org's customizations
+        Template.where.not(id: templates.collect(&:id)).each do |template|
+          if template.customization_of.nil?
+            assert_not el.to_s.include?(template.title), "expected #{user.email}'s customizable table to NOT have the template from a non-funder org: '#{template.title}'"
+          else
+            if template.org == user.org
+              assert el.to_s.include?(template.title), "expected #{user.email}'s customizable table to have their own customization: '#{template.title}'" 
+            else
+              assert_not el.to_s.include?(template.title), "expected #{user.email}'s customizable table to NOT have a customization from another organisation: '#{template.title}'"
+            end
+          end
+        end
+      end
+    end
+  end
+  
+  def verify_templates_table_scoping(path, selector, published, unpublished)
+    get "#{path}?scope=published"
+    assert_select "table tbody" do |el|
+      published.each do |template|
+        assert el.to_s.include?(template.title), "expected to see '#{template.title}' in #{selector} after clicking the 'published' predefined scope"
+      end
+      unpublished.each do |template|
+        assert_not el.to_s.include?(template.title), "expected to NOT see '#{template.title}' in #{selector} after clicking the 'published' predefined scope"
+      end
+    end
+    
+    get "#{path}?scope=unpublished"
+    assert_select "table tbody" do |el|
+      published.each do |template|
+        assert_not el.to_s.include?(template.title), "expected to NOT see '#{template.title}' in #{selector} after clicking the 'unpublished' predefined scope"
+      end
+      unpublished.each do |template|
+        assert el.to_s.include?(template.title), "expected to see '#{template.title}' #{selector} after clicking the 'unpublished' predefined scope"
+      end
+    end
+    
+    get "#{path}?scope=all"
+    assert_select "table tbody" do |el|
+      published.each do |template|
+        assert el.to_s.include?(template.title), "expected to see '#{template.title}' in #{selector} after clicking the 'all' predefined scope"
+      end
+      unpublished.each do |template|
+        assert el.to_s.include?(template.title), "expected to see '#{template.title}' in #{selector} after clicking the 'all' predefined scope"
+      end
+    end
+  end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index de382d3..f9aff2a 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -51,7 +51,7 @@
   def scaffold_template
     template = Template.new(title: 'Test template',
                             description: 'My test template', 
-                            links: '{"funder":[],"sample_plan":[]}',
+                            links: {"funder":[],"sample_plan":[]},
                             org: Org.first, migrated: false, dmptemplate_id: "0000009999")
 
     template.phases << Phase.new(title: 'Test phase',
diff --git a/test/unit/template_test.rb b/test/unit/template_test.rb
index 562b319..392a847 100644
--- a/test/unit/template_test.rb
+++ b/test/unit/template_test.rb
@@ -147,4 +147,30 @@
     assert(t.valid?)
     assert_equal(nil, t.errors.messages[:links])
   end
+  
+  test 'should return the latest customizations for the Org' do
+    tA = Template.create!(title: 'My test A', version: 0, org: @org)
+    tB = Template.create!(title: 'My test B', version: 0, org: @org)
+    tC = Template.create!(title: 'My test C', version: 0, org: @org)
+    
+    # Test 1 - Multiple versions
+    cAv0 = Template.create!(title: 'My test customization A', version: 0, customization_of: tA.dmptemplate_id, org: Org.first)
+    cAv1 = Template.deep_copy(cAv0)
+    cAv1.update_attributes(version: 1)
+    
+    # Test 2 - Only one version
+    cBv0 = Template.create!(title: 'My test customization B', version: 0, customization_of: tB.dmptemplate_id, org: Org.first)
+
+    # Test 3 - Make sure it always returns the latest version regardless of published statuses
+    cCv0 = Template.create!(title: 'My test customization C', version: 0, customization_of: tC.dmptemplate_id, org: Org.first)
+    cCv1 = Template.deep_copy(cCv0)
+    cCv1.update_attributes(version: 1, published: true)
+    cCv2 = Template.deep_copy(cCv1)
+    cCv2.update_attributes(version: 2)
+    
+    latest = Template.org_customizations([tA, tB, tC].collect(&:dmptemplate_id), Org.first.id)
+    assert latest.include?(cAv1), 'expected to get customization A - version 1.'
+    assert latest.include?(cBv0), 'expected to get customization B - version 0.'
+    assert latest.include?(cCv2), 'expected to get customization C - version 2.'
+  end
 end