diff --git a/app/components/common/accessControlForm/accessControlForm.html b/app/components/common/accessControlForm/accessControlForm.html
index 21e4c3869..f3bd32b7b 100644
--- a/app/components/common/accessControlForm/accessControlForm.html
+++ b/app/components/common/accessControlForm/accessControlForm.html
@@ -79,7 +79,7 @@
         <portainer-tooltip ng-if="!isAdmin && 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="isAdmin && availableTeams.length === 0" class="small text-muted" style="margin-left: 20px;">
-        You have not yet created any team. Head over the <a ui-sref="teams">teams view</a> to manage user teams.</span>
+        You have not yet created any team. Head over the <a ui-sref="teams">teams view</a> to manage user teams.
       </span>
       <span isteven-multi-select
       ng-if="(isAdmin && availableTeams.length > 0) || (!isAdmin && availableTeams.length > 1)"
@@ -92,7 +92,7 @@
       search-property="Name"
       on-item-click="synchronizeFormData()"
       translation="{nothingSelected: 'Select one or more teams', search: 'Search...'}"
-      style="margin-left: 20px;"
+      style="margin-left: 20px;">
     </span>
   </div>
 </div>
@@ -105,7 +105,7 @@
       <portainer-tooltip ng-if="isAdmin && 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="availableUsers.length === 0" class="small text-muted" style="margin-left: 20px;">
-      You have not yet created any user. Head over the <a ui-sref="users">users view</a> to manage users.</span>
+      You have not yet created any user. Head over the <a ui-sref="users">users view</a> to manage users.
     </span>
     <span isteven-multi-select
     ng-if="availableUsers.length > 0"
@@ -118,7 +118,7 @@
     search-property="Username"
     on-item-click="synchronizeFormData()"
     translation="{nothingSelected: 'Select one or more users', search: 'Search...'}"
-    style="margin-left: 20px;"
+    style="margin-left: 20px;">
   </span>
 </div>
 </div>
diff --git a/app/components/common/accessControlPanel/accessControlPanel.html b/app/components/common/accessControlPanel/accessControlPanel.html
index eedd4ae66..f8031ad27 100644
--- a/app/components/common/accessControlPanel/accessControlPanel.html
+++ b/app/components/common/accessControlPanel/accessControlPanel.html
@@ -120,7 +120,7 @@
               <td colspan="2">
                 <span>Teams</span>
                 <span ng-if="isAdmin && availableTeams.length === 0" class="small text-muted" style="margin-left: 10px;">
-                  You have not yet created any team. Head over the <a ui-sref="teams">teams view</a> to manage user teams.</span>
+                  You have not yet created any team. Head over the <a ui-sref="teams">teams view</a> to manage user teams.
                 </span>
                 <span isteven-multi-select
                   ng-if="(isAdmin && availableTeams.length > 0) || (!isAdmin && availableTeams.length > 1)"
@@ -132,7 +132,7 @@
                   helper-elements="filter"
                   search-property="Name"
                   max-labels="3"
-                  translation="{nothingSelected: 'Select one or more teams', search: 'Search...'}"
+                  translation="{nothingSelected: 'Select one or more teams', search: 'Search...'}">
                 </span>
               </td>
             </tr>
@@ -142,7 +142,7 @@
               <td colspan="2">
                 <span>Users</span>
                 <span ng-if="availableUsers.length === 0" class="small text-muted" style="margin-left: 10px;">
-                  You have not yet created any user. Head over the <a ui-sref="users">users view</a> to manage users.</span>
+                  You have not yet created any user. Head over the <a ui-sref="users">users view</a> to manage users.
                 </span>
                 <span isteven-multi-select
                   ng-if="availableUsers.length > 0"
@@ -154,7 +154,7 @@
                   helper-elements="filter"
                   search-property="Username"
                   max-labels="3"
-                  translation="{nothingSelected: 'Select one or more users', search: 'Search...'}"
+                  translation="{nothingSelected: 'Select one or more users', search: 'Search...'}">
                 </span>
               </td>
             </tr>
diff --git a/app/components/container/container.html b/app/components/container/container.html
index 574e67aec..5961a3c89 100644
--- a/app/components/container/container.html
+++ b/app/components/container/container.html
@@ -3,7 +3,7 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content>
-    <a ui-sref="containers">Containers</a> > <a ui-sref="container({id: container.Id})">{{ container.Name|trimcontainername }}</a>
+    <a ui-sref="containers">Containers</a> &gt; <a ui-sref="container({id: container.Id})">{{ container.Name|trimcontainername }}</a>
   </rd-header-content>
 </rd-header>
 
@@ -114,7 +114,7 @@
           </tbody>
         </table>
       </rd-widget-body>
-    </rd-widge>
+    </rd-widget>
   </div>
 </div>
 
diff --git a/app/components/containerConsole/containerConsole.html b/app/components/containerConsole/containerConsole.html
index eba9b5ea1..1189b16ed 100644
--- a/app/components/containerConsole/containerConsole.html
+++ b/app/components/containerConsole/containerConsole.html
@@ -3,7 +3,7 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content ng-if="state.loaded">
-    <a ui-sref="containers">Containers</a> > <a ui-sref="container({id: container.Id})">{{ container.Name|trimcontainername }}</a> > Console
+    <a ui-sref="containers">Containers</a> &gt; <a ui-sref="container({id: container.Id})">{{ container.Name|trimcontainername }}</a> &gt; Console
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/containerLogs/containerlogs.html b/app/components/containerLogs/containerlogs.html
index b20af8bf8..fe12b3732 100644
--- a/app/components/containerLogs/containerlogs.html
+++ b/app/components/containerLogs/containerlogs.html
@@ -3,7 +3,7 @@
       <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content>
-    <a ui-sref="containers">Containers</a> > <a ui-sref="container({id: container.Id})">{{ container.Name|trimcontainername }}</a> > Logs
+    <a ui-sref="containers">Containers</a> &gt; <a ui-sref="container({id: container.Id})">{{ container.Name|trimcontainername }}</a> &gt; Logs
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/containers/containers.html b/app/components/containers/containers.html
index 5d37ef4a8..3cd1a3aee 100644
--- a/app/components/containers/containers.html
+++ b/app/components/containers/containers.html
@@ -137,5 +137,5 @@
         </div>
       </div>
     </rd-widget-body>
-  <rd-widget>
+  </rd-widget>
 </div>
diff --git a/app/components/createContainer/createcontainer.html b/app/components/createContainer/createcontainer.html
index 1798c0230..8600fe092 100644
--- a/app/components/createContainer/createcontainer.html
+++ b/app/components/createContainer/createcontainer.html
@@ -1,7 +1,7 @@
 <rd-header>
   <rd-header-title title="Create container"></rd-header-title>
   <rd-header-content>
-    <a ui-sref="containers">Containers</a> > Add container
+    <a ui-sref="containers">Containers</a> &gt; Add container
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/createNetwork/createnetwork.html b/app/components/createNetwork/createnetwork.html
index 98992d438..fdf591b88 100644
--- a/app/components/createNetwork/createnetwork.html
+++ b/app/components/createNetwork/createnetwork.html
@@ -1,7 +1,7 @@
 <rd-header>
   <rd-header-title title="Create network"></rd-header-title>
   <rd-header-content>
-    <a ui-sref="networks">Networks</a> > Add network
+    <a ui-sref="networks">Networks</a> &gt; Add network
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/createRegistry/createregistry.html b/app/components/createRegistry/createregistry.html
index def77d867..f1204ba6f 100644
--- a/app/components/createRegistry/createregistry.html
+++ b/app/components/createRegistry/createregistry.html
@@ -3,7 +3,7 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin" style="display:none"></i>
   </rd-header-title>
   <rd-header-content>
-    <a ui-sref="registries">Registries</a> > Add registry
+    <a ui-sref="registries">Registries</a> &gt; Add registry
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/createSecret/createsecret.html b/app/components/createSecret/createsecret.html
index 385bb3067..2a840af60 100644
--- a/app/components/createSecret/createsecret.html
+++ b/app/components/createSecret/createsecret.html
@@ -1,7 +1,7 @@
 <rd-header>
   <rd-header-title title="Create secret"></rd-header-title>
   <rd-header-content>
-    <a ui-sref="secrets">Secrets</a> > Add secret
+    <a ui-sref="secrets">Secrets</a> &gt; Add secret
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/createService/createservice.html b/app/components/createService/createservice.html
index 3f2f03016..25e58e568 100644
--- a/app/components/createService/createservice.html
+++ b/app/components/createService/createservice.html
@@ -3,7 +3,7 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin" style="margin-left: 5px;"></i>
   </rd-header-title>
   <rd-header-content>
-    <a ui-sref="services">Services</a> > Add service
+    <a ui-sref="services">Services</a> &gt; Add service
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/createVolume/createvolume.html b/app/components/createVolume/createvolume.html
index 178194fe7..7444cac54 100644
--- a/app/components/createVolume/createvolume.html
+++ b/app/components/createVolume/createvolume.html
@@ -3,7 +3,7 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content>
-    <a ui-sref="volumes">Volumes</a> > Add volume
+    <a ui-sref="volumes">Volumes</a> &gt; Add volume
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/endpoint/endpoint.html b/app/components/endpoint/endpoint.html
index 543bc7062..80be7c92c 100644
--- a/app/components/endpoint/endpoint.html
+++ b/app/components/endpoint/endpoint.html
@@ -3,7 +3,7 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content>
-    <a ui-sref="endpoints">Endpoints</a> > <a ui-sref="endpoint({id: endpoint.Id})">{{ endpoint.Name }}</a>
+    <a ui-sref="endpoints">Endpoints</a> &gt; <a ui-sref="endpoint({id: endpoint.Id})">{{ endpoint.Name }}</a>
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/endpointAccess/endpointAccess.html b/app/components/endpointAccess/endpointAccess.html
index e4b14312c..695dc6955 100644
--- a/app/components/endpointAccess/endpointAccess.html
+++ b/app/components/endpointAccess/endpointAccess.html
@@ -3,7 +3,7 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content>
-    <a ui-sref="endpoints">Endpoints</a> > <a ui-sref="endpoint({id: endpoint.Id})">{{ endpoint.Name }}</a> > Access management
+    <a ui-sref="endpoints">Endpoints</a> &gt; <a ui-sref="endpoint({id: endpoint.Id})">{{ endpoint.Name }}</a> &gt; Access management
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/endpoints/endpoints.html b/app/components/endpoints/endpoints.html
index 2421d4261..6528ae711 100644
--- a/app/components/endpoints/endpoints.html
+++ b/app/components/endpoints/endpoints.html
@@ -18,7 +18,7 @@
           Endpoint management via the UI is disabled.
           <span ng-if="applicationState.application.authentication">You can still manage endpoint access.</span>
         </span>
-      </rd-wigdet-body>
+      </rd-widget-body>
     </rd-widget>
   </div>
 </div>
@@ -206,6 +206,6 @@
           </div>
         </div>
       </rd-widget-body>
-    <rd-widget>
+    </rd-widget>
   </div>
 </div>
diff --git a/app/components/events/events.html b/app/components/events/events.html
index e59c9fc8d..829bc38e3 100644
--- a/app/components/events/events.html
+++ b/app/components/events/events.html
@@ -69,6 +69,6 @@
           </div>
         </div>
       </rd-widget-body>
-    <rd-widget>
+    </rd-widget>
   </div>
 </div>
diff --git a/app/components/image/image.html b/app/components/image/image.html
index 65a188905..7e4341611 100644
--- a/app/components/image/image.html
+++ b/app/components/image/image.html
@@ -3,7 +3,7 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content>
-    <a ui-sref="images">Images</a> > <a ui-sref="image({id: image.Id})">{{ image.Id }}</a>
+    <a ui-sref="images">Images</a> &gt; <a ui-sref="image({id: image.Id})">{{ image.Id }}</a>
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/images/images.html b/app/components/images/images.html
index cfecf029a..2b078d290 100644
--- a/app/components/images/images.html
+++ b/app/components/images/images.html
@@ -132,6 +132,6 @@
           </div>
         </div>
       </rd-widget-body>
-      <rd-widget>
-      </div>
-    </div>
+    </rd-widget>
+  </div>
+</div>
diff --git a/app/components/network/network.html b/app/components/network/network.html
index ae0cc846d..b2c1c9b6e 100644
--- a/app/components/network/network.html
+++ b/app/components/network/network.html
@@ -3,7 +3,7 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content>
-    <a ui-sref="networks">Networks</a> > <a ui-sref="network({id: network.Id})">{{ network.Name }}</a>
+    <a ui-sref="networks">Networks</a> &gt; <a ui-sref="network({id: network.Id})">{{ network.Name }}</a>
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/networks/networks.html b/app/components/networks/networks.html
index e25170c97..aa0286ac9 100644
--- a/app/components/networks/networks.html
+++ b/app/components/networks/networks.html
@@ -154,6 +154,6 @@
           </div>
         </div>
       </rd-widget-body>
-    <rd-widget>
+    </rd-widget>
   </div>
 </div>
diff --git a/app/components/node/node.html b/app/components/node/node.html
index 480009e57..4b9f87910 100644
--- a/app/components/node/node.html
+++ b/app/components/node/node.html
@@ -5,7 +5,7 @@
     </a>
   </rd-header-title>
   <rd-header-content>
-    <a ui-sref="swarm">Swarm nodes</a> > <a ui-sref="node({id: node.Id})">{{ node.Hostname }}</a>
+    <a ui-sref="swarm">Swarm nodes</a> &gt; <a ui-sref="node({id: node.Id})">{{ node.Hostname }}</a>
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/registries/registries.html b/app/components/registries/registries.html
index 17ba58425..fac2ee8d5 100644
--- a/app/components/registries/registries.html
+++ b/app/components/registries/registries.html
@@ -145,6 +145,6 @@
           </div>
         </div>
       </rd-widget-body>
-    <rd-widget>
+    </rd-widget>
   </div>
 </div>
diff --git a/app/components/registry/registry.html b/app/components/registry/registry.html
index 2bbb7c2e6..971d99848 100644
--- a/app/components/registry/registry.html
+++ b/app/components/registry/registry.html
@@ -3,7 +3,7 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content>
-    <a ui-sref="registries">Registries</a> > <a ui-sref="registry({id: registry.Id})">{{ registry.Name }}</a>
+    <a ui-sref="registries">Registries</a> &gt; <a ui-sref="registry({id: registry.Id})">{{ registry.Name }}</a>
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/registryAccess/registryAccess.html b/app/components/registryAccess/registryAccess.html
index 84c3d2395..44ff3d130 100644
--- a/app/components/registryAccess/registryAccess.html
+++ b/app/components/registryAccess/registryAccess.html
@@ -3,7 +3,7 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content>
-    <a ui-sref="registries">Registries</a> > <a ui-sref="registry({id: registry.Id})">{{ registry.Name }}</a> > Access management
+    <a ui-sref="registries">Registries</a> &gt; <a ui-sref="registry({id: registry.Id})">{{ registry.Name }}</a> &gt; Access management
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/secret/secret.html b/app/components/secret/secret.html
index 8c9d10e18..fb349ebbb 100644
--- a/app/components/secret/secret.html
+++ b/app/components/secret/secret.html
@@ -6,7 +6,7 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content>
-    <a ui-sref="secrets">Secrets</a> > <a ui-sref="secret({id: secret.Id})">{{ secret.Name }}</a>
+    <a ui-sref="secrets">Secrets</a> &gt; <a ui-sref="secret({id: secret.Id})">{{ secret.Name }}</a>
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/secrets/secrets.html b/app/components/secrets/secrets.html
index 215ac1796..abd9ba6eb 100644
--- a/app/components/secrets/secrets.html
+++ b/app/components/secrets/secrets.html
@@ -63,6 +63,6 @@
           </div>
         </div>
       </rd-widget-body>
-    <rd-widget>
+    </rd-widget>
   </div>
 </div>
diff --git a/app/components/service/includes/ports.html b/app/components/service/includes/ports.html
index 7367bfbb7..95e4b232d 100644
--- a/app/components/service/includes/ports.html
+++ b/app/components/service/includes/ports.html
@@ -63,7 +63,7 @@
       </table>
     </rd-widget-body>
     <rd-widget-footer>
-      <div class="btn-toolbar" role="toolbar"
+      <div class="btn-toolbar" role="toolbar">
         <div class="btn-group" role="group">
           <button type="button" class="btn btn-primary btn-sm" ng-disabled="!hasChanges(service, ['Ports'])" ng-click="updateService(service)">Apply changes</button>
           <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/app/components/service/service.html b/app/components/service/service.html
index c854c8da1..8d89268a2 100644
--- a/app/components/service/service.html
+++ b/app/components/service/service.html
@@ -6,7 +6,7 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content>
-    <a ui-sref="services">Services</a> > <a ui-sref="service({id: service.Id})">{{ service.Name }}</a>
+    <a ui-sref="services">Services</a> &gt; <a ui-sref="service({id: service.Id})">{{ service.Name }}</a>
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/services/services.html b/app/components/services/services.html
index 945c6db40..3b373937a 100644
--- a/app/components/services/services.html
+++ b/app/components/services/services.html
@@ -128,6 +128,6 @@
           </div>
         </div>
       </rd-widget-body>
-    <rd-widget>
+    </rd-widget>
   </div>
 </div>
diff --git a/app/components/sidebar/sidebar.html b/app/components/sidebar/sidebar.html
index b4a590722..3d8d6a2c3 100644
--- a/app/components/sidebar/sidebar.html
+++ b/app/components/sidebar/sidebar.html
@@ -58,7 +58,7 @@
     <li class="sidebar-list" ng-if="applicationState.application.authentication && (isAdmin || isTeamLeader)">
       <a ui-sref="users" ui-sref-active="active">User management <span class="menu-icon fa fa-users"></span></a>
       <div class="sidebar-sublist" ng-if="toggle && ($state.current.name === 'users' || $state.current.name === 'user' || $state.current.name === 'teams' || $state.current.name === 'team')">
-        <a ui-sref="teams" ui-sref-active="active">Teams</span></a>
+        <a ui-sref="teams" ui-sref-active="active">Teams</a>
       </div>
     </li>
     <li class="sidebar-list" ng-if="!applicationState.application.authentication || isAdmin">
diff --git a/app/components/stats/stats.html b/app/components/stats/stats.html
index 1bcb0e157..a05f8c01c 100644
--- a/app/components/stats/stats.html
+++ b/app/components/stats/stats.html
@@ -1,7 +1,7 @@
 <rd-header>
   <rd-header-title title="Container stats"></rd-header-title>
   <rd-header-content>
-    <a ui-sref="containers">Containers</a> > <a ui-sref="container({id: container.Id})">{{ container.Name|trimcontainername }}</a> > Stats
+    <a ui-sref="containers">Containers</a> &gt; <a ui-sref="container({id: container.Id})">{{ container.Name|trimcontainername }}</a> &gt; Stats
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/task/task.html b/app/components/task/task.html
index 16db1a274..6bc5d5510 100644
--- a/app/components/task/task.html
+++ b/app/components/task/task.html
@@ -3,7 +3,7 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content ng-if="task && service">
-    <a ui-sref="services">Services</a> > <a ui-sref="service({id: service.Id })">{{ service.Name }}</a> > {{ task.Id }}
+    <a ui-sref="services">Services</a> &gt; <a ui-sref="service({id: service.Id })">{{ service.Name }}</a> &gt; {{ task.Id }}
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/team/team.html b/app/components/team/team.html
index b11fdd125..727372a0d 100644
--- a/app/components/team/team.html
+++ b/app/components/team/team.html
@@ -3,7 +3,7 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content>
-    <a ui-sref="teams">Teams</a> > <a ui-sref="team({id: team.Id})">{{ team.Name }}</a>
+    <a ui-sref="teams">Teams</a> &gt; <a ui-sref="team({id: team.Id})">{{ team.Name }}</a>
   </rd-header-content>
 </rd-header>
 
@@ -144,7 +144,7 @@
               <tr pagination-id="table2" dir-paginate="user in teamMembers | filter:state.filterGroupMembers | orderBy:sortTypeGroupMembers:sortReverseGroupMembers | itemsPerPage: state.pagination_count_groupMembers">
                 <td>
                   {{ user.Username }}
-                  <span style="margin-left: 5px;" ng-if="isAdmin || user.TeamRole === 'Member'")>
+                  <span style="margin-left: 5px;" ng-if="isAdmin || user.TeamRole === 'Member'">
                     <a class="btn-outline-secondary" ng-click="removeUser(user)"><i class="fa fa-minus-circle space-right" aria-hidden="true"></i>Remove</a>
                   </span>
                 </td>
diff --git a/app/components/teams/teams.html b/app/components/teams/teams.html
index 99fd2b8ad..2d082186d 100644
--- a/app/components/teams/teams.html
+++ b/app/components/teams/teams.html
@@ -43,8 +43,8 @@
                helper-elements="filter"
                search-property="Username"
                translation="{nothingSelected: 'Select one or more team leaders', search: 'Search...'}"
-               style="margin-left: 20px;"
-             </span>
+               style="margin-left: 20px;">
+              </span>
             </div>
           </div>
           <!-- !team-leaders -->
@@ -125,6 +125,6 @@
           </div>
         </div>
       </rd-widget-body>
-    <rd-widget>
+    </rd-widget>
   </div>
 </div>
diff --git a/app/components/user/user.html b/app/components/user/user.html
index 0f1bc95cd..62f0a1e75 100644
--- a/app/components/user/user.html
+++ b/app/components/user/user.html
@@ -3,7 +3,7 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content>
-    <a ui-sref="users">Users</a> > <a ui-sref="user({id: user.Id})">{{ user.Username }}</a>
+    <a ui-sref="users">Users</a> &gt; <a ui-sref="user({id: user.Id})">{{ user.Username }}</a>
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/users/users.html b/app/components/users/users.html
index e53ddec03..68e0ef9ea 100644
--- a/app/components/users/users.html
+++ b/app/components/users/users.html
@@ -69,7 +69,7 @@
                 Add to team(s)
               </label>
               <span class="small text-muted" style="margin-left: 20px;" ng-if="teams.length === 0">
-                You have not yet created any team. Head over the <a ui-sref="teams">teams view</a> to manage user teams.</span>
+                You have not yet created any team. Head over the <a ui-sref="teams">teams view</a> to manage user teams.
               </span>
               <span isteven-multi-select
                ng-if="teams.length > 0"
@@ -81,8 +81,8 @@
                helper-elements="filter"
                search-property="Name"
                translation="{nothingSelected: 'Select one or more teams', search: 'Search...'}"
-               style="margin-left: 20px;"
-             </span>
+               style="margin-left: 20px;">
+               </span>
             </div>
           </div>
           <!-- !teams -->
@@ -183,6 +183,6 @@
           </div>
         </div>
       </rd-widget-body>
-    <rd-widget>
+    </rd-widget>
   </div>
 </div>
diff --git a/app/components/volume/volume.html b/app/components/volume/volume.html
index 87eeca0f6..79f00f7d8 100644
--- a/app/components/volume/volume.html
+++ b/app/components/volume/volume.html
@@ -3,7 +3,7 @@
     <i id="loadingViewSpinner" class="fa fa-cog fa-spin"></i>
   </rd-header-title>
   <rd-header-content>
-    <a ui-sref="volumes">Volumes</a> > <a ui-sref="volume({id: volume.Id})">{{ volume.Id }}</a>
+    <a ui-sref="volumes">Volumes</a> &gt; <a ui-sref="volume({id: volume.Id})">{{ volume.Id }}</a>
   </rd-header-content>
 </rd-header>
 
diff --git a/app/components/volumes/volumes.html b/app/components/volumes/volumes.html
index c94862633..80df39615 100644
--- a/app/components/volumes/volumes.html
+++ b/app/components/volumes/volumes.html
@@ -95,5 +95,5 @@
         </div>
       </div>
     </rd-widget-body>
-    <rd-widget>
-    </div>
+  </rd-widget>
+</div>