diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb
index e554b93..e713bfe 100644
--- a/app/controllers/plans_controller.rb
+++ b/app/controllers/plans_controller.rb
@@ -184,6 +184,7 @@
       end
     end
     @plan.save
+    flash[:notice] = _('Guidance choices saved.')
     redirect_to action: "show"
   end
 
diff --git a/app/models/org.rb b/app/models/org.rb
index e754693..3b67296 100644
--- a/app/models/org.rb
+++ b/app/models/org.rb
@@ -4,6 +4,11 @@
   extend Dragonfly::Model::Validations
 
   ##
+  # Sort order: Name ASC
+  default_scope { order(name: :asc) }
+  
+
+  ##
   # Associations
 #  belongs_to :organisation_type   # depricated, but cannot be removed until migration run
   belongs_to :language
diff --git a/app/views/layouts/_signin_signout.html.erb b/app/views/layouts/_signin_signout.html.erb
index 27011a7..8d36ff7 100644
--- a/app/views/layouts/_signin_signout.html.erb
+++ b/app/views/layouts/_signin_signout.html.erb
@@ -37,3 +37,7 @@
     <% end %>
   </ul>
 </div>
+<!-- Quick'n'dirty touchscreen hack for Bootstrap's buggy dropdown -->
+  <style>
+    .dropdown-backdrop{ position: static; }
+  </style>
diff --git a/app/views/users/admin_grant_permissions.html.erb b/app/views/users/admin_grant_permissions.html.erb
index 573ea31..ad925cc 100644
--- a/app/views/users/admin_grant_permissions.html.erb
+++ b/app/views/users/admin_grant_permissions.html.erb
@@ -6,11 +6,36 @@
 
 <div class="white_background">
   <%= form_tag( admin_update_permissions_user_path(@user), method: :put) do %>
-    <table id="dmp_table" class="dmp_table tablesorter">
+    <table id="dmp_table" class="dmp_table">
       <thead>
         <tr>
           <% @perms.each do |perm| %>
-          <th class="dmp_th_medium"> <%= perm.name %> </th>
+            <% case perm.name when 'grant_permissions' %>
+                <th class="dmp_th_medium" title="
+                  <%= _('Allows the user to assign permissions to other users within the same organisation. Users can only assign permissions they own themselves') %>">
+                  <%= _('Grant permissions') %>
+                </th>
+              <% when 'modify_templates' %>
+                <th class="dmp_th_medium" title="
+                  <%= _('Allows the user to create new institutional templates, edit existing ones and customise funder templates') %>">
+                  <%= _('Modify templates') %>
+                </th>
+              <% when 'modify_guidance' %>
+                <th class="dmp_th_medium" title="
+                  <%= _('Allows the user to create and edit guidance') %>">
+                  <%= _('Modify guidance') %>
+                </th>
+              <% when 'use_api' %>
+                <th class="dmp_th_medium" title="
+                  <%= _('Provides the user with an API token and grants rights to harvest information from the tool') %>">
+                  <%= _('API rights') %>
+                </th>
+              <% when 'change_org_details' %>
+                <th class="dmp_th_medium" title="
+                  <%= _('Allows the user to amend the organisation details (name, URL etc) and add basic branding such as the logo') %>">
+                  <%= _('Change organisation details') %>
+                </th>
+            <% end %>
           <% end %>
         </tr>
       </thead>
@@ -26,4 +51,4 @@
     </table>
     <%= submit_tag _('Save') %>
   <% end %>
-</div>
\ No newline at end of file
+</div>
diff --git a/lib/assets/bg.gif b/lib/assets/bg.gif
deleted file mode 120000
index 12456d2..0000000
--- a/lib/assets/bg.gif
+++ /dev/null
@@ -1 +0,0 @@
-images/bg.gif
\ No newline at end of file
diff --git a/lib/assets/stylesheets/admin.css.less b/lib/assets/stylesheets/admin.css.less
index 89eadf6..075941e 100644
--- a/lib/assets/stylesheets/admin.css.less
+++ b/lib/assets/stylesheets/admin.css.less
@@ -1670,7 +1670,7 @@
   padding-right: 20px;
 }
 table.tablesorter thead tr .header {
-  background-image: url(bg.gif);
+  background-image: asset-url("bg.gif");
   background-repeat: no-repeat;
   background-position: center right;
   background-color: @orange_lighter_colour;
@@ -1679,10 +1679,10 @@
 
 
 table.tablesorter thead tr .headerSortUp {
-  background-image: url(asc.gif);
+  background-image: asset-url("asc.gif");
 }
 table.tablesorter thead tr .headerSortDown {
-  background-image: url(desc.gif);
+  background-image: asset-url("desc.gif");
 }
 
 
diff --git a/lib/assets/stylesheets/bootstrap_and_overrides.css.less b/lib/assets/stylesheets/bootstrap_and_overrides.css.less
index 2796d1b..f083ce1 100644
--- a/lib/assets/stylesheets/bootstrap_and_overrides.css.less
+++ b/lib/assets/stylesheets/bootstrap_and_overrides.css.less
@@ -1851,15 +1851,15 @@
 table.tablesorter thead  {
   th.header {
     cursor: pointer;
-    background: url('/assets/bg.gif') no-repeat center right;
+    background: asset-url('bg.gif') no-repeat center right;
   }
 
   th.headerSortDown {
-    background: @orange_lighter_colour url('/assets/desc.gif') no-repeat center right;
+    background: @orange_lighter_colour asset-url('desc.gif') no-repeat center right;
   }
 
   th.headerSortUp {
-    background: @orange_lighter_colour url('/assets/asc.gif') no-repeat center right;
+    background: @orange_lighter_colour asset-url('asc.gif') no-repeat center right;
   }
 }