diff --git a/app/extensions/oauth/components/oauth-settings/oauth-settings.html b/app/extensions/oauth/components/oauth-settings/oauth-settings.html
index 955ad0665..9fde5210a 100644
--- a/app/extensions/oauth/components/oauth-settings/oauth-settings.html
+++ b/app/extensions/oauth/components/oauth-settings/oauth-settings.html
@@ -4,7 +4,7 @@
   </div>
   <div class="form-group">
     <span class="col-sm-12 text-muted small">
-      With automatic user provisioning enabled, Portainer will create user(s) automatically with standard user role. If
+      With automatic user provisioning enabled, Portainer will create user(s) automatically with the standard user role. If
       disabled, users must be created beforehand in Portainer in order to login.
     </span>
   </div>
@@ -19,13 +19,13 @@
     <div class="form-group">
       <span class="col-sm-12 text-muted small">
         <p>The users created by the automatic provisioning feature can be added to a default team on creation.</p>
-        <p>By assigning newly created users to a team they will be able to access the environments associated to that team. This setting is optional and if not set newly created users won't be able to access any environments.</p>
+        <p>By assigning newly created users to a team, they will be able to access the environments associated to that team. This setting is optional and if not set, newly created users won't be able to access any environments.</p>
       </span>
     </div>
     <div class="form-group">
       <label class="col-sm-3 col-lg-2 control-label text-left">Default team</label>
       <span class="small text-muted" style="margin-left: 20px;" ng-if="$ctrl.teams.length === 0">
-        You have not yet created any team. Head over the <a ui-sref="portainer.teams">teams view</a> to manage user teams.
+        You have not yet created any teams. Head over to the <a ui-sref="portainer.teams">Teams view</a> to manage teams.
       </span>
       <button type="button" class="btn btn-sm btn-danger" ng-click="$ctrl.settings.DefaultTeamID = null" ng-disabled="!$ctrl.settings.DefaultTeamID" ng-if="$ctrl.teams.length > 0"><i class="fa fa-times" aria-hidden="true"></i></button>
       <div class="col-sm-9 col-lg-9" ng-if="$ctrl.teams.length > 0">
diff --git a/app/portainer/components/access-datatable/accessDatatable.html b/app/portainer/components/access-datatable/accessDatatable.html
index 8368580ff..406daaa46 100644
--- a/app/portainer/components/access-datatable/accessDatatable.html
+++ b/app/portainer/components/access-datatable/accessDatatable.html
@@ -5,10 +5,10 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar small" ng-if="$ctrl.inheritFrom">
           Access tagged as <code>inherited</code> are inherited from the group access. They cannot be
-          removed nor modified at the endpoint level but they can be overriden.
+          removed or modified at the endpoint level but they can be overriden.
       </div>
       <div class="toolBar small" ng-if="$ctrl.inheritFrom">
-        Access tagged as <code>override</code> are overriding the group access for the related users / teams.
+        Access tagged as <code>override</code> are overriding the group access for the related users/teams.
       </div>
       <div class="actionBar">
         <button type="button" class="btn btn-sm btn-danger" ng-disabled="$ctrl.state.selectedItemCount === 0"
@@ -99,7 +99,7 @@
               <td colspan="4" class="text-center text-muted">Loading...</td>
             </tr>
             <tr ng-if="$ctrl.state.filteredDataSet.length === 0">
-              <td colspan="4" class="text-center text-muted">No authorized user or team.</td>
+              <td colspan="4" class="text-center text-muted">No authorized users or teams.</td>
             </tr>
           </tbody>
         </table>
diff --git a/app/portainer/components/accessControlForm/porAccessControlForm.html b/app/portainer/components/accessControlForm/porAccessControlForm.html
index 2dbc533c9..d9f3d2ddd 100644
--- a/app/portainer/components/accessControlForm/porAccessControlForm.html
+++ b/app/portainer/components/accessControlForm/porAccessControlForm.html
@@ -79,7 +79,7 @@
         <portainer-tooltip ng-if="!$ctrl.isAdmin && $ctrl.availableTeams.length > 1" position="bottom" message="As you are a member of multiple teams, you can select which teams(s) will be able to manage this resource."></portainer-tooltip>
       </label>
       <span ng-if="$ctrl.isAdmin && $ctrl.availableTeams.length === 0" class="small text-muted" style="margin-left: 20px;">
-        You have not yet created any team. Head over the <a ui-sref="portainer.teams">teams view</a> to manage user teams.
+        You have not yet created any teams. Head over to the <a ui-sref="portainer.teams">Teams view</a> to manage teams.
       </span>
       <span isteven-multi-select
         ng-if="($ctrl.isAdmin && $ctrl.availableTeams.length > 0) || (!$ctrl.isAdmin && $ctrl.availableTeams.length > 1)"
@@ -104,7 +104,7 @@
         <portainer-tooltip ng-if="$ctrl.isAdmin && $ctrl.availableUsers.length > 0" position="bottom" message="You can select which user(s) will be able to manage this resource."></portainer-tooltip>
       </label>
       <span ng-if="$ctrl.availableUsers.length === 0" class="small text-muted" style="margin-left: 20px;">
-        You have not yet created any user. Head over the <a ui-sref="portainer.users">users view</a> to manage users.
+        You have not yet created any users. Head over to the <a ui-sref="portainer.users">Users view</a> to manage users.
       </span>
       <span isteven-multi-select
         ng-if="$ctrl.availableUsers.length > 0"
diff --git a/app/portainer/components/accessControlPanel/porAccessControlPanel.html b/app/portainer/components/accessControlPanel/porAccessControlPanel.html
index a2cf9b52e..4efdd2756 100644
--- a/app/portainer/components/accessControlPanel/porAccessControlPanel.html
+++ b/app/portainer/components/accessControlPanel/porAccessControlPanel.html
@@ -127,7 +127,7 @@
               <td colspan="2">
                 <span>Teams</span>
                 <span ng-if="$ctrl.isAdmin && $ctrl.availableTeams.length === 0" class="small text-muted" style="margin-left: 10px;">
-                  You have not yet created any team. Head over the <a ui-sref="portainer.teams">teams view</a> to manage user teams.
+                  You have not yet created any teams. Head over to the <a ui-sref="portainer.teams">Teams view</a> to manage teams.
                 </span>
                 <span isteven-multi-select
                   ng-if="($ctrl.isAdmin && $ctrl.availableTeams.length > 0) || (!$ctrl.isAdmin && $ctrl.availableTeams.length > 1)"
@@ -149,7 +149,7 @@
               <td colspan="2">
                 <span>Users</span>
                 <span ng-if="$ctrl.availableUsers.length === 0" class="small text-muted" style="margin-left: 10px;">
-                  You have not yet created any user. Head over the <a ui-sref="portainer.users">users view</a> to manage users.
+                  You have not yet created any users. Head over to the <a ui-sref="portainer.users">Users view</a> to manage users.
                 </span>
                 <span isteven-multi-select
                   ng-if="$ctrl.availableUsers.length > 0"
diff --git a/app/portainer/components/accessManagement/porAccessManagement.html b/app/portainer/components/accessManagement/porAccessManagement.html
index a1f95e420..7dfb4fbb3 100644
--- a/app/portainer/components/accessManagement/porAccessManagement.html
+++ b/app/portainer/components/accessManagement/porAccessManagement.html
@@ -10,7 +10,7 @@
             </label>
             <div class="col-sm-9 col-lg-4">
               <span class="small text-muted" ng-if="ctrl.availableUsersAndTeams.length === 0">
-                No user nor team available.
+                No users or teams available.
               </span>
               <span isteven-multi-select ng-if="ctrl.availableUsersAndTeams.length > 0" input-model="ctrl.availableUsersAndTeams"
                 output-model="ctrl.formValues.multiselectOutput" button-label="icon '-' Name" item-label="icon '-' Name"
diff --git a/app/portainer/components/forms/template-form/templateForm.html b/app/portainer/components/forms/template-form/templateForm.html
index e667c921a..d2517d055 100644
--- a/app/portainer/components/forms/template-form/templateForm.html
+++ b/app/portainer/components/forms/template-form/templateForm.html
@@ -103,7 +103,7 @@
     <div class="form-group">
       <label for="template_note" class="col-sm-3 col-lg-2 control-label text-left">
         Note
-        <portainer-tooltip position="bottom" message="Usage / extra information about the template. Supports HTML."></portainer-tooltip>
+        <portainer-tooltip position="bottom" message="Usage/extra information about the template. Supports HTML."></portainer-tooltip>
       </label>
       <div class="col-sm-9 col-lg-10">
         <textarea class="form-control" name="template_note" ng-model="$ctrl.model.Note" placeholder='You can use this field to specify extra information. <br/> It supports <b>HTML</b>.'></textarea>
@@ -144,7 +144,7 @@
       <div class="col-sm-12">
         <label for="tls" class="control-label text-left">
           Administrator template
-          <portainer-tooltip position="bottom" message="Should this template be only available to administrator users."></portainer-tooltip>
+          <portainer-tooltip position="bottom" message="This template will only be available to administrator users."></portainer-tooltip>
         </label>
         <label class="switch" style="margin-left: 20px;">
           <input type="checkbox" ng-model="$ctrl.model.AdministratorOnly"><i></i>
diff --git a/app/portainer/views/users/users.html b/app/portainer/views/users/users.html
index f950b825f..9fe943107 100644
--- a/app/portainer/views/users/users.html
+++ b/app/portainer/views/users/users.html
@@ -71,7 +71,7 @@
                 Add to team(s)
               </label>
               <span class="small text-muted" style="margin-left: 20px;" ng-if="teams.length === 0">
-                You don't seem to have any teams to add user's into. Head over to the <a ui-sref="portainer.teams">Teams view</a> to create some.
+                You don't seem to have any teams to add users into. Head over to the <a ui-sref="portainer.teams">Teams view</a> to create some.
               </span>
               <span isteven-multi-select
                ng-if="teams.length > 0"