diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 75f9531..89167fc 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,14 +1,21 @@
 class UsersController < ApplicationController
   after_action :verify_authorized
 
+  ##
+  # GET - List of all users for an organisation
+  # Displays number of roles[was project_group], name, email, and last sign in
   def admin_index
     authorize User
-    @users = current_user.org.users.includes(:project_groups)
+    @users = current_user.org.users.includes(:roles)
     respond_to do |format|
       format.html # index.html.erb
     end
   end
 
+  ##
+  # GET - Displays the permissions available to the selected user
+  # Permissions which the user already has are pre-selected
+  # Selecting new permissions and saving calls the admin_update_permissions action
   def admin_grant_permissions
     @user = User.includes(:perms).find(params[:id])
     authorize @user
@@ -16,6 +23,9 @@
     @perms = user_perms & Perm.where(name: [constant("user_role_types.change_org_details"),constant("user_role_types.use_api"), constant("user_role_types.modify_guidance"), constant("user_role_types.modify_templates"), constant("user_role_types.grant_permissions")])
   end
 
+  ##
+  # POST - updates the permissions for a user
+  # redirects to the admin_index action
   def admin_update_permissions
     @user = User.includes(:perms).find(params[:id])
     authorize @user
diff --git a/app/views/users/admin_api_update.html.erb b/app/views/users/admin_api_update.html.erb
deleted file mode 100644
index 3f26ec2..0000000
--- a/app/views/users/admin_api_update.html.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-<%= stylesheet_link_tag "admin" %>
-
-<h1>
-    <%= t('org_admin.users_list') %>
-</h1>
-
-<%= raw t('org_admin.user_text_html')%>
-<% @users = current_user.organisation.users %>
-    <table id="dmp_table" class="dmp_table tablesorter">
-      <thead>
-        <tr>
-            <th class="dmp_th_big"><%= t('org_admin.user_full_name') %></th>
-            <th class="dmp_th_medium"><%= t('org_admin.user_name') %></th>
-            <th class="dmp_th_small"><%= t('org_admin.last_logged_in') %></th>
-            <th class="dmp_th_small"><%= t('org_admin.how_many_plans') %></th>
-            <th class="dmp_th_small"><%= t('org_admin.is_org_admin') %></th>
-            <% if current_user.organisation.token_permission_types.count > 0 %>
-            <th class="dmp_th_small"><%= t('org_admin.api_privleges') %></th>
-            <% end %>
-        </tr>
-      </thead>
-
-      <tbody>
-      <%= form_tag( admin_api_update_users_path, method: :put) do %>
-        <% @users.each do |user| %>
-            <% if !user.nil? then%>
-              <tr>
-                <td class="dmp_td_big">
-                    <% if !user.name.nil? then%>
-                        <%= user.name %>
-                    <% end %>
-                </td>
-                <td class="dmp_td_medium">
-                    <%= user.email %>
-                </td>
-                <td class="dmp_td_small">
-                    <% if !user.last_sign_in_at.nil? then%>
-                    <%= l user.last_sign_in_at.to_date, :formats => :short %>
-                    <% end %>
-                </td>
-                <td class="dmp_td_small">
-                    <% if !user.project_groups.nil? then%>
-                    <%= user.project_groups.count %>
-                    <% end %>
-                </td>
-                <td class="dmp_td_small">
-                    <%= check_box_tag "org_admin_ids[]", user.id, user.is_org_admin? %>
-                </td>
-                <% if current_user.organisation.token_permission_types.count > 0 %>
-                <td class="dmp_td_small">
-                    <%= check_box_tag "api_user_ids[]", user.id, user.api_token !="" %>
-                </td>
-                <% end %>
-              </tr>
-            <% end %>
-        <% end %>
-      </tbody>
-      <%= submit_tag "Update Users" %>
-      <% end %>
-    </table>
\ No newline at end of file
diff --git a/app/views/users/admin_grant_permissions.html.erb b/app/views/users/admin_grant_permissions.html.erb
index ca5a170..dc42fb1 100644
--- a/app/views/users/admin_grant_permissions.html.erb
+++ b/app/views/users/admin_grant_permissions.html.erb
@@ -9,16 +9,16 @@
     <table id="dmp_table" class="dmp_table tablesorter">
       <thead>
         <tr>
-          <% @roles.each do |role| %>
-          <th class="dmp_th_medium"> <%= role.name %> </th>
+          <% @perms.each do |perm| %>
+          <th class="dmp_th_medium"> <%= perm.name %> </th>
           <% end %>
         </tr>
       </thead>
       <tbody>
         <tr>
-          <% @roles.each do |role| %>
+          <% @perms.each do |perm| %>
             <td class="dmp_td_medium">
-              <%= check_box_tag "role_ids[]", role.id, @user.roles.include?(role) %>
+              <%= check_box_tag "perm_ids[]", perm.id, @user.perms.include?(perm) %>
             </td>
           <% end %>
         </tr>
diff --git a/app/views/users/admin_index.html.erb b/app/views/users/admin_index.html.erb
index c914f49..bad7dfc 100644
--- a/app/views/users/admin_index.html.erb
+++ b/app/views/users/admin_index.html.erb
@@ -33,8 +33,8 @@
                   <% end %>
               </td>
               <td class="dmp_td_small">
-                  <% if !user.project_groups.nil? then%>
-                  <%= user.project_groups.length %>
+                  <% if !user.roles.nil? then%>
+                  <%= user.roles.length %>
                   <% end %>
               </td>
               <td class="dmp_td_small">