diff --git a/app/edge/__module.js b/app/edge/__module.js
index 0f4d6de7b..94affb39f 100644
--- a/app/edge/__module.js
+++ b/app/edge/__module.js
@@ -1,7 +1,7 @@
 import angular from 'angular';
 
 import edgeStackModule from './views/edge-stacks';
-import edgeDevicesModule from './devices'
+import edgeDevicesModule from './devices';
 
 angular.module('portainer.edge', [edgeStackModule, edgeDevicesModule]).config(function config($stateRegistryProvider) {
   const edge = {
diff --git a/app/edge/components/associated-endpoints-datatable/associatedEndpointsDatatable.html b/app/edge/components/associated-endpoints-datatable/associatedEndpointsDatatable.html
index d7c681ff6..b4470ffcd 100644
--- a/app/edge/components/associated-endpoints-datatable/associatedEndpointsDatatable.html
+++ b/app/edge/components/associated-endpoints-datatable/associatedEndpointsDatatable.html
@@ -2,7 +2,7 @@
   <rd-widget>
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
-        <div class="toolBarTitle"> <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }} </div>
+        <div class="toolBarTitle"> <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px"></i> {{ $ctrl.titleText }} </div>
       </div>
       <div class="searchBar">
         <i class="fa fa-search searchIcon" aria-hidden="true"></i>
@@ -62,9 +62,7 @@
         <div class="paginationControls">
           <form class="form-inline">
             <span class="limitSelector">
-              <span style="margin-right: 5px;">
-                Items per page
-              </span>
+              <span style="margin-right: 5px"> Items per page </span>
               <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
                 <option value="0">All</option>
                 <option value="10">10</option>
diff --git a/app/edge/components/edge-job-form/edgeJobForm.html b/app/edge/components/edge-job-form/edgeJobForm.html
index b3d75e3a2..27b7d0154 100644
--- a/app/edge/components/edge-job-form/edgeJobForm.html
+++ b/app/edge/components/edge-job-form/edgeJobForm.html
@@ -1,7 +1,5 @@
 <form class="form-horizontal" name="edgeJobForm">
-  <div class="col-sm-12 form-section-title">
-    Edge job configuration
-  </div>
+  <div class="col-sm-12 form-section-title"> Edge job configuration </div>
   <!-- name-input -->
   <div class="form-group">
     <label for="edgejob_name" class="col-sm-1 control-label text-left">Name</label>
@@ -30,17 +28,15 @@
   <!-- !name-input -->
   <!-- cron-input -->
   <!-- edge-job-method-select -->
-  <div class="col-sm-12 form-section-title">
-    Edge job configuration
-  </div>
+  <div class="col-sm-12 form-section-title"> Edge job configuration </div>
   <div class="form-group"></div>
-  <div class="form-group" style="margin-bottom: 0;">
+  <div class="form-group" style="margin-bottom: 0">
     <div class="boxselector_wrapper">
       <div>
         <input type="radio" id="config_basic" ng-model="$ctrl.formValues.cronMethod" value="basic" />
         <label for="config_basic">
           <div class="boxselector_header">
-            <i class="fa fa-calendar-alt" aria-hidden="true" style="margin-right: 2px;"></i>
+            <i class="fa fa-calendar-alt" aria-hidden="true" style="margin-right: 2px"></i>
             Basic configuration
           </div>
           <p>Select date from calendar</p>
@@ -50,7 +46,7 @@
         <input type="radio" id="config_advanced" ng-model="$ctrl.formValues.cronMethod" value="advanced" />
         <label for="config_advanced">
           <div class="boxselector_header">
-            <i class="fa fa-edit" aria-hidden="true" style="margin-right: 2px;"></i>
+            <i class="fa fa-edit" aria-hidden="true" style="margin-right: 2px"></i>
             Advanced configuration
           </div>
           <p>Write your own cron rule</p>
@@ -64,7 +60,7 @@
     <div class="form-group">
       <label for="recurring" class="col-sm-2 control-label text-left">Recurring Edge job</label>
       <div class="col-sm-10">
-        <label class="switch" style="margin-left: 20px;"> <input type="checkbox" name="recurring" ng-model="$ctrl.model.Recurring" /><i></i> </label>
+        <label class="switch" style="margin-left: 20px"> <input type="checkbox" name="recurring" ng-model="$ctrl.model.Recurring" /><i></i> </label>
       </div>
     </div>
     <!-- not-recurring -->
@@ -74,9 +70,7 @@
         <div class="col-sm-10">
           <input class="form-control" moment-picker ng-model="$ctrl.formValues.datetime" format="YYYY-MM-DD HH:mm" />
         </div>
-        <div class="col-sm-12 small text-muted" style="margin-top: 10px;">
-          Time should be set according to the chosen environments' timezone.
-        </div>
+        <div class="col-sm-12 small text-muted" style="margin-top: 10px"> Time should be set according to the chosen environments' timezone. </div>
         <div ng-show="edgeJobForm.datepicker.$invalid">
           <div class="col-sm-12 small text-warning">
             <div ng-messages="edgeJobForm.datepicker.$error">
@@ -129,9 +123,7 @@
           ng-pattern="$ctrl.cronRegex"
         />
       </div>
-      <div class="col-sm-12 small text-muted" style="margin-top: 10px;">
-        Time should be set according to the chosen environments' timezone.
-      </div>
+      <div class="col-sm-12 small text-muted" style="margin-top: 10px"> Time should be set according to the chosen environments' timezone. </div>
     </div>
     <div class="form-group" ng-show="edgeJobForm.edgejob_cron.$invalid && edgeJobForm.edgejob_cron.$dirty">
       <div class="col-sm-12 small text-warning">
@@ -146,17 +138,15 @@
 
   <!-- execution-method -->
   <div ng-if="!$ctrl.model.Id">
-    <div class="col-sm-12 form-section-title">
-      Job content
-    </div>
+    <div class="col-sm-12 form-section-title"> Job content </div>
     <div class="form-group"></div>
-    <div class="form-group" style="margin-bottom: 0;">
+    <div class="form-group" style="margin-bottom: 0">
       <div class="boxselector_wrapper">
         <div>
           <input type="radio" id="method_editor" ng-model="$ctrl.formValues.method" value="editor" />
           <label for="method_editor">
             <div class="boxselector_header">
-              <i class="fa fa-edit" aria-hidden="true" style="margin-right: 2px;"></i>
+              <i class="fa fa-edit" aria-hidden="true" style="margin-right: 2px"></i>
               Web editor
             </div>
             <p>Use our Web editor</p>
@@ -166,7 +156,7 @@
           <input type="radio" id="method_upload" ng-model="$ctrl.formValues.method" value="upload" />
           <label for="method_upload">
             <div class="boxselector_header">
-              <i class="fa fa-upload" aria-hidden="true" style="margin-right: 2px;"></i>
+              <i class="fa fa-upload" aria-hidden="true" style="margin-right: 2px"></i>
               Upload
             </div>
             <p>Upload from your computer</p>
@@ -178,9 +168,7 @@
   <!-- !execution-method -->
   <!-- web-editor -->
   <div ng-show="$ctrl.formValues.method === 'editor'">
-    <div class="col-sm-12 form-section-title">
-      Web editor
-    </div>
+    <div class="col-sm-12 form-section-title"> Web editor </div>
     <div class="form-group">
       <div class="col-sm-12">
         <code-editor
@@ -195,18 +183,14 @@
   <!-- !web-editor -->
   <!-- upload -->
   <div ng-show="$ctrl.formValues.method === 'upload'">
-    <div class="col-sm-12 form-section-title">
-      Upload
-    </div>
+    <div class="col-sm-12 form-section-title"> Upload </div>
     <div class="form-group">
-      <span class="col-sm-12 text-muted small">
-        You can upload a script file from your computer.
-      </span>
+      <span class="col-sm-12 text-muted small"> You can upload a script file from your computer. </span>
     </div>
     <div class="form-group">
       <div class="col-sm-12">
         <button type="button" class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.model.File">Select file</button>
-        <span style="margin-left: 5px;">
+        <span style="margin-left: 5px">
           {{ $ctrl.model.File.name }}
           <i class="fa fa-times red-icon" ng-if="!$ctrl.model.File" aria-hidden="true"></i>
         </span>
@@ -214,9 +198,7 @@
     </div>
   </div>
   <!-- !upload -->
-  <div class="col-sm-12 form-section-title">
-    Target environments
-  </div>
+  <div class="col-sm-12 form-section-title"> Target environments </div>
   <!-- node-selection -->
   <associated-endpoints-selector
     endpoint-ids="$ctrl.model.Endpoints"
@@ -228,9 +210,7 @@
   ></associated-endpoints-selector>
   <!-- !node-selection -->
   <!-- actions -->
-  <div class="col-sm-12 form-section-title">
-    Actions
-  </div>
+  <div class="col-sm-12 form-section-title"> Actions </div>
   <div class="form-group">
     <div class="col-sm-12">
       <button
@@ -247,7 +227,7 @@
         <span ng-hide="$ctrl.actionInProgress">{{ $ctrl.formActionLabel }}</span>
         <span ng-show="$ctrl.actionInProgress">In progress...</span>
       </button>
-      <span class="text-danger" ng-if="$ctrl.state.formValidationError" style="margin-left: 5px;">
+      <span class="text-danger" ng-if="$ctrl.state.formValidationError" style="margin-left: 5px">
         {{ $ctrl.state.formValidationError }}
       </span>
     </div>
diff --git a/app/edge/components/edge-job-form/edgeJobFormController.js b/app/edge/components/edge-job-form/edgeJobFormController.js
index 43a850ede..0538dfa31 100644
--- a/app/edge/components/edge-job-form/edgeJobFormController.js
+++ b/app/edge/components/edge-job-form/edgeJobFormController.js
@@ -31,7 +31,8 @@ export class EdgeJobFormController {
     };
 
     // see https://regexr.com/573i2
-    this.cronRegex = /(@(annually|yearly|monthly|weekly|daily|hourly|reboot))|(@every (\d+(ns|us|µs|ms|s|m|h))+)|((((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|\*) ){4,6}((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|\*))/;
+    this.cronRegex =
+      /(@(annually|yearly|monthly|weekly|daily|hourly|reboot))|(@every (\d+(ns|us|µs|ms|s|m|h))+)|((((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|\*) ){4,6}((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|\*))/;
 
     this.action = this.action.bind(this);
     this.editorUpdate = this.editorUpdate.bind(this);
diff --git a/app/edge/components/edge-job-results-datatable/edgeJobResultsDatatable.html b/app/edge/components/edge-job-results-datatable/edgeJobResultsDatatable.html
index 57c0fdc71..518354659 100644
--- a/app/edge/components/edge-job-results-datatable/edgeJobResultsDatatable.html
+++ b/app/edge/components/edge-job-results-datatable/edgeJobResultsDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i>
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px"></i>
           {{ $ctrl.titleText }}
         </div>
       </div>
@@ -22,9 +22,7 @@
                   Environment
                 </a>
               </th>
-              <th>
-                Actions
-              </th>
+              <th> Actions </th>
             </tr>
           </thead>
           <tbody>
@@ -35,18 +33,10 @@
                 {{ item.Endpoint.Name }}
               </td>
               <td>
-                <button ng-if="item.LogsStatus === 0 || item.LogsStatus === 1" class="btn btn-sm btn-primary" ng-click="$ctrl.collectLogs(item.EndpointId)">
-                  Retrieve logs
-                </button>
-                <button ng-if="item.LogsStatus === 3" class="btn btn-sm btn-primary" ng-click="$ctrl.onDownloadLogsClick(item.EndpointId)">
-                  Download logs
-                </button>
-                <button ng-if="item.LogsStatus === 3" class="btn btn-sm btn-primary" ng-click="$ctrl.onClearLogsClick(item.EndpointId)">
-                  Clear logs
-                </button>
-                <span ng-if="item.LogsStatus === 2">
-                  Logs marked for collection, please wait until the logs are available.
-                </span>
+                <button ng-if="item.LogsStatus === 0 || item.LogsStatus === 1" class="btn btn-sm btn-primary" ng-click="$ctrl.collectLogs(item.EndpointId)"> Retrieve logs </button>
+                <button ng-if="item.LogsStatus === 3" class="btn btn-sm btn-primary" ng-click="$ctrl.onDownloadLogsClick(item.EndpointId)"> Download logs </button>
+                <button ng-if="item.LogsStatus === 3" class="btn btn-sm btn-primary" ng-click="$ctrl.onClearLogsClick(item.EndpointId)"> Clear logs </button>
+                <span ng-if="item.LogsStatus === 2"> Logs marked for collection, please wait until the logs are available. </span>
               </td>
             </tr>
             <tr ng-if="!$ctrl.dataset">
@@ -62,9 +52,7 @@
         <div class="paginationControls">
           <form class="form-inline">
             <span class="limitSelector">
-              <span style="margin-right: 5px;">
-                Items per page
-              </span>
+              <span style="margin-right: 5px"> Items per page </span>
               <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
                 <option value="0">All</option>
                 <option value="10">10</option>
diff --git a/app/edge/components/edge-jobs-datatable/edgeJobsDatatable.html b/app/edge/components/edge-jobs-datatable/edgeJobsDatatable.html
index 977300063..9d2077598 100644
--- a/app/edge/components/edge-jobs-datatable/edgeJobsDatatable.html
+++ b/app/edge/components/edge-jobs-datatable/edgeJobsDatatable.html
@@ -2,7 +2,7 @@
   <rd-widget>
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
-        <div class="toolBarTitle"> <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }} </div>
+        <div class="toolBarTitle"> <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px"></i> {{ $ctrl.titleText }} </div>
       </div>
       <div class="actionBar">
         <button type="button" class="btn btn-sm btn-danger" ng-disabled="$ctrl.state.selectedItemCount === 0" ng-click="$ctrl.removeAction($ctrl.state.selectedItems)">
@@ -76,9 +76,7 @@
         <div class="paginationControls">
           <form class="form-inline">
             <span class="limitSelector">
-              <span style="margin-right: 5px;">
-                Items per page
-              </span>
+              <span style="margin-right: 5px"> Items per page </span>
               <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
                 <option value="0">All</option>
                 <option value="10">10</option>
diff --git a/app/edge/components/edge-stack-deployment-type-selector/edge-stack-deployment-type-selector.html b/app/edge/components/edge-stack-deployment-type-selector/edge-stack-deployment-type-selector.html
index 2f53d2fcd..94947dd3d 100644
--- a/app/edge/components/edge-stack-deployment-type-selector/edge-stack-deployment-type-selector.html
+++ b/app/edge/components/edge-stack-deployment-type-selector/edge-stack-deployment-type-selector.html
@@ -1,4 +1,2 @@
-<div class="col-sm-12 form-section-title">
-  Deployment type
-</div>
+<div class="col-sm-12 form-section-title"> Deployment type </div>
 <box-selector radio-name="'deploymentType'" value="$ctrl.value" options="$ctrl.deploymentOptions" on-change="($ctrl.onChange)"></box-selector>
diff --git a/app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatable.html b/app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatable.html
index 819d65a8a..e90ffc60d 100644
--- a/app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatable.html
+++ b/app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatable.html
@@ -2,7 +2,7 @@
   <rd-widget>
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
-        <div class="toolBarTitle"> <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }} </div>
+        <div class="toolBarTitle"> <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px"></i> {{ $ctrl.titleText }} </div>
       </div>
       <div class="searchBar">
         <i class="fa fa-search searchIcon" aria-hidden="true"></i>
@@ -67,9 +67,7 @@
         <div class="paginationControls">
           <form class="form-inline">
             <span class="limitSelector">
-              <span style="margin-right: 5px;">
-                Items per page
-              </span>
+              <span style="margin-right: 5px"> Items per page </span>
               <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
                 <option value="0">All</option>
                 <option value="10">10</option>
diff --git a/app/edge/components/edge-stacks-datatable/edgeStacksDatatable.html b/app/edge/components/edge-stacks-datatable/edgeStacksDatatable.html
index 5442f42a1..04f7b84a7 100644
--- a/app/edge/components/edge-stacks-datatable/edgeStacksDatatable.html
+++ b/app/edge/components/edge-stacks-datatable/edgeStacksDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i>
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px"></i>
           Edge Stacks
         </div>
         <div class="settings" data-cy="edgeStack-stackTableSettings">
@@ -11,9 +11,7 @@
             <span uib-dropdown-toggle> <i class="fa fa-cog" aria-hidden="true"></i> Settings </span>
             <div class="dropdown-menu dropdown-menu-right" uib-dropdown-menu>
               <div class="tableMenu">
-                <div class="menuHeader">
-                  Table settings
-                </div>
+                <div class="menuHeader"> Table settings </div>
                 <div class="menuContent">
                   <div>
                     <div class="md-checkbox">
@@ -27,9 +25,7 @@
                       <label for="setting_auto_refresh">Auto refresh</label>
                     </div>
                     <div ng-if="$ctrl.settings.repeater.autoRefresh">
-                      <label for="settings_refresh_rate">
-                        Refresh rate
-                      </label>
+                      <label for="settings_refresh_rate"> Refresh rate </label>
                       <select id="settings_refresh_rate" ng-model="$ctrl.settings.repeater.refreshRate" ng-change="$ctrl.onSettingsRepeaterChange()" class="small-select">
                         <option value="10">10s</option>
                         <option value="30">30s</option>
@@ -38,15 +34,13 @@
                         <option value="300">5min</option>
                       </select>
                       <span>
-                        <i id="refreshRateChange" class="fa fa-check green-icon" aria-hidden="true" style="margin-top: 7px; display: none;"></i>
+                        <i id="refreshRateChange" class="fa fa-check green-icon" aria-hidden="true" style="margin-top: 7px; display: none"></i>
                       </span>
                     </div>
                   </div>
                 </div>
                 <div>
-                  <a type="button" class="btn btn-default btn-sm" ng-click="$ctrl.settings.open = false;">
-                    Close
-                  </a>
+                  <a type="button" class="btn btn-default btn-sm" ng-click="$ctrl.settings.open = false;"> Close </a>
                 </div>
               </div>
             </div>
@@ -94,9 +88,7 @@
                   <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Name' && $ctrl.state.reverseOrder"></i>
                 </a>
               </th>
-              <th>
-                Status
-              </th>
+              <th> Status </th>
               <th>
                 <a ng-click="$ctrl.changeOrderBy('CreationDate')">
                   Creation Date
@@ -127,9 +119,7 @@
               <td colspan="4" class="text-center text-muted">Loading...</td>
             </tr>
             <tr ng-if="$ctrl.state.filteredDataSet.length === 0" data-cy="edgeStack-noStackRow">
-              <td colspan="4" class="text-center text-muted">
-                No stack available.
-              </td>
+              <td colspan="4" class="text-center text-muted"> No stack available. </td>
             </tr>
           </tbody>
         </table>
@@ -139,9 +129,7 @@
         <div class="paginationControls">
           <form class="form-inline">
             <span class="limitSelector">
-              <span style="margin-right: 5px;">
-                Items per page
-              </span>
+              <span style="margin-right: 5px"> Items per page </span>
               <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
                 <option value="0">All</option>
                 <option value="10">10</option>
diff --git a/app/edge/components/edit-edge-stack-form/editEdgeStackForm.html b/app/edge/components/edit-edge-stack-form/editEdgeStackForm.html
index 95eb4f316..76f76d15d 100644
--- a/app/edge/components/edit-edge-stack-form/editEdgeStackForm.html
+++ b/app/edge/components/edit-edge-stack-form/editEdgeStackForm.html
@@ -1,7 +1,5 @@
 <form class="form-horizontal">
-  <div class="col-sm-12 form-section-title">
-    Edge Groups
-  </div>
+  <div class="col-sm-12 form-section-title"> Edge Groups </div>
   <div class="form-group">
     <div class="col-sm-12">
       <edge-groups-selector model="$ctrl.model.EdgeGroups" items="$ctrl.edgeGroups" on-change="($ctrl.onChangeGroups)"></edge-groups-selector>
@@ -44,9 +42,7 @@
     <editor-description>
       <div>
         You can get more information about Compose file format in the
-        <a href="https://docs.docker.com/compose/compose-file/" target="_blank">
-          official documentation
-        </a>
+        <a href="https://docs.docker.com/compose/compose-file/" target="_blank"> official documentation </a>
         .
       </div>
     </editor-description>
@@ -69,9 +65,7 @@
   </web-editor-form>
 
   <!-- actions -->
-  <div class="col-sm-12 form-section-title">
-    Actions
-  </div>
+  <div class="col-sm-12 form-section-title"> Actions </div>
   <div class="form-group">
     <div class="col-sm-12">
       <button
diff --git a/app/edge/components/group-form/groupForm.html b/app/edge/components/group-form/groupForm.html
index 0bbcfc1b8..efba72b60 100644
--- a/app/edge/components/group-form/groupForm.html
+++ b/app/edge/components/group-form/groupForm.html
@@ -1,8 +1,6 @@
 <form class="form-horizontal" name="EdgeGroupForm" ng-submit="$ctrl.formAction()">
   <div class="form-group">
-    <label for="group_name" class="col-sm-3 col-lg-2 control-label text-left">
-      Name
-    </label>
+    <label for="group_name" class="col-sm-3 col-lg-2 control-label text-left"> Name </label>
     <div class="col-sm-9 col-lg-10">
       <input type="text" class="form-control" id="group_name" name="group_name" ng-model="$ctrl.model.Name" required auto-focus data-cy="edgeGroupCreate-groupNameInput" />
     </div>
@@ -18,16 +16,14 @@
     </div>
   </div>
 
-  <div class="col-sm-12 form-section-title">
-    Group type
-  </div>
+  <div class="col-sm-12 form-section-title"> Group type </div>
   <div class="form-group col-sm-12">
     <div class="boxselector_wrapper">
       <div class="boxselector">
         <input type="radio" id="static-group" ng-model="$ctrl.model.Dynamic" ng-value="false" ng-checked="!$ctrl.model.Dynamic" />
         <label for="static-group">
           <div class="boxselector_header">
-            <i class="fa fa-list-ol" aria-hidden="true" style="margin-right: 2px;"></i>
+            <i class="fa fa-list-ol" aria-hidden="true" style="margin-right: 2px"></i>
             Static
           </div>
           <p>Manually select Edge environments</p>
@@ -37,7 +33,7 @@
         <input type="radio" id="dynamic-group" ng-model="$ctrl.model.Dynamic" ng-value="true" ng-checked="$ctrl.model.Dynamic" />
         <label for="dynamic-group">
           <div class="boxselector_header">
-            <i class="fa fa-tags" aria-hidden="true" style="margin-right: 2px;"></i>
+            <i class="fa fa-tags" aria-hidden="true" style="margin-right: 2px"></i>
             Dynamic
           </div>
           <p>Automatically associate environments via tags</p>
@@ -50,9 +46,7 @@
   <div ng-if="!$ctrl.model.Dynamic">
     <div ng-if="!$ctrl.noEndpoints">
       <!-- environments -->
-      <div class="col-sm-12 form-section-title">
-        Associated environments
-      </div>
+      <div class="col-sm-12 form-section-title"> Associated environments </div>
       <div class="form-group">
         <associated-endpoints-selector
           endpoint-ids="$ctrl.model.Endpoints"
@@ -74,16 +68,14 @@
 
   <!-- DynamicGroup -->
   <div ng-if="$ctrl.model.Dynamic">
-    <div class="col-sm-12 form-section-title">
-      Tags
-    </div>
+    <div class="col-sm-12 form-section-title"> Tags </div>
     <div ng-if="$ctrl.tags.length" class="form-group col-sm-12">
       <div class="boxselector_wrapper">
         <div class="boxselector">
           <input type="radio" id="or-selector" ng-model="$ctrl.model.PartialMatch" ng-value="true" ng-checked="$ctrl.model.PartialMatch" />
           <label for="or-selector">
             <div class="boxselector_header">
-              <i class="fa fa-tag" aria-hidden="true" style="margin-right: 2px;"></i>
+              <i class="fa fa-tag" aria-hidden="true" style="margin-right: 2px"></i>
               Partial match
             </div>
             <p>Associate any environment matching at least one of the selected tags</p>
@@ -93,7 +85,7 @@
           <input type="radio" id="and-selector" ng-model="$ctrl.model.PartialMatch" ng-value="false" ng-checked="!$ctrl.model.PartialMatch" />
           <label for="and-selector">
             <div class="boxselector_header">
-              <i class="fa fa-tag" aria-hidden="true" style="margin-right: 2px;"></i>
+              <i class="fa fa-tag" aria-hidden="true" style="margin-right: 2px"></i>
               Full match
             </div>
             <p>Associate any environment matching all of the selected tags</p>
@@ -107,9 +99,7 @@
         No tags available. Head over to the <a ui-sref="portainer.tags">Tags view</a> to add tags
       </div>
     </div>
-    <div class="col-sm-12 form-section-title">
-      Associated environments by tags
-    </div>
+    <div class="col-sm-12 form-section-title"> Associated environments by tags </div>
     <div class="col-sm-12 form-group">
       <group-association-table
         loaded="$ctrl.loaded"
@@ -130,9 +120,7 @@
   <!-- !DynamicGroup -->
 
   <!-- actions -->
-  <div class="col-sm-12 form-section-title">
-    Actions
-  </div>
+  <div class="col-sm-12 form-section-title"> Actions </div>
   <div class="form-group">
     <div class="col-sm-12">
       <button
diff --git a/app/edge/components/groups-datatable/groupsDatatable.html b/app/edge/components/groups-datatable/groupsDatatable.html
index a40c217fb..7c3280265 100644
--- a/app/edge/components/groups-datatable/groupsDatatable.html
+++ b/app/edge/components/groups-datatable/groupsDatatable.html
@@ -79,9 +79,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 Edge group available.
-              </td>
+              <td colspan="4" class="text-center text-muted"> No Edge group available. </td>
             </tr>
           </tbody>
         </table>
@@ -91,9 +89,7 @@
         <div class="paginationControls">
           <form class="form-inline">
             <span class="limitSelector">
-              <span style="margin-right: 5px;">
-                Items per page
-              </span>
+              <span style="margin-right: 5px"> Items per page </span>
               <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
                 <option value="0">All</option>
                 <option value="10">10</option>
diff --git a/app/edge/devices/components/AMTDevicesDatatable/AMTDevices.module.css b/app/edge/devices/components/AMTDevicesDatatable/AMTDevices.module.css
index 5900f17a1..cbbad302a 100644
--- a/app/edge/devices/components/AMTDevicesDatatable/AMTDevices.module.css
+++ b/app/edge/devices/components/AMTDevicesDatatable/AMTDevices.module.css
@@ -14,4 +14,4 @@
 
 .loadingSpinner {
   margin-left: 5px;
-}
\ No newline at end of file
+}
diff --git a/app/edge/devices/components/AMTDevicesDatatable/AMTDevicesDatatable.tsx b/app/edge/devices/components/AMTDevicesDatatable/AMTDevicesDatatable.tsx
index d73fdb7b0..de0c06e1d 100644
--- a/app/edge/devices/components/AMTDevicesDatatable/AMTDevicesDatatable.tsx
+++ b/app/edge/devices/components/AMTDevicesDatatable/AMTDevicesDatatable.tsx
@@ -1,116 +1,113 @@
-import {
-  useTable,
-    usePagination,
-} from 'react-table';
+import { useTable, usePagination } from 'react-table';
 import {
   Table,
   TableContainer,
   TableHeaderRow,
   TableRow,
-} from 'Portainer/components/datatables/components';
-import { Checkbox } from 'Portainer/components/form-components/Checkbox';
-import { Device } from "Portainer/hostmanagement/open-amt/model";
-import {useEnvironment} from "Portainer/environments/useEnvironment";
+} from '@/portainer/components/datatables/components';
+import { Checkbox } from '@/portainer/components/form-components/Checkbox';
+import { Device } from '@/portainer/hostmanagement/open-amt/model';
+import { useEnvironment } from '@/portainer/environments/useEnvironment';
 
-import {useAMTDevices} from "@/edge/devices/components/AMTDevicesDatatable/useAMTDevices";
-import {RowProvider} from "@/edge/devices/components/AMTDevicesDatatable/columns/RowContext";
+import { useAMTDevices } from '@/edge/devices/components/AMTDevicesDatatable/useAMTDevices';
+import { RowProvider } from '@/edge/devices/components/AMTDevicesDatatable/columns/RowContext';
 
 import { useColumns } from './columns';
 
 export function AMTDevicesDatatable() {
-    const columns = useColumns();
+  const columns = useColumns();
 
-    const environment = useEnvironment();
-    const {isLoading, devices, error} = useAMTDevices(environment.Id);
+  const environment = useEnvironment();
+  const { isLoading, devices, error } = useAMTDevices(environment.Id);
 
-  const {
-    getTableProps,
-    getTableBodyProps,
-    headerGroups,
-    page,
-    prepareRow,
-
-  } = useTable<Device>(
+  const { getTableProps, getTableBodyProps, headerGroups, page, prepareRow } =
+    useTable<Device>(
       {
         defaultCanFilter: false,
         columns,
         data: devices || [],
         initialState: {},
         isRowSelectable() {
-          return false
+          return false;
         },
         selectCheckboxComponent: Checkbox,
       },
-      usePagination,
-  );
+      usePagination
+    );
 
   const tableProps = getTableProps();
   const tbodyProps = getTableBodyProps();
 
   return (
-      <TableContainer>
-
-        <Table
-            className={`${tableProps.className} inner-datatable`}
-            role={tableProps.role}
-            style={tableProps.style}
-        >
-          <thead>
+    <TableContainer>
+      <Table
+        className={`${tableProps.className} inner-datatable`}
+        role={tableProps.role}
+        style={tableProps.style}
+      >
+        <thead>
           {headerGroups.map((headerGroup) => {
-            const { key, className, role, style } = headerGroup.getHeaderGroupProps();
+            const { key, className, role, style } =
+              headerGroup.getHeaderGroupProps();
             return (
-                <TableHeaderRow<Device>
+              <TableHeaderRow<Device>
+                key={key}
+                className={className}
+                role={role}
+                style={style}
+                headers={headerGroup.headers}
+                onSortChange={() => {}}
+              />
+            );
+          })}
+        </thead>
+        <tbody
+          className={tbodyProps.className}
+          role={tbodyProps.role}
+          style={tbodyProps.style}
+        >
+          {!isLoading &&
+            devices &&
+            devices.length > 0 &&
+            page.map((row) => {
+              prepareRow(row);
+              const { key, className, role, style } = row.getRowProps();
+
+              return (
+                <RowProvider key={key}>
+                  <TableRow<Device>
+                    cells={row.cells}
                     key={key}
                     className={className}
                     role={role}
                     style={style}
-                    headers={headerGroup.headers}
-                    onSortChange={() => {}}
-                />
-            );
-          })}
-          </thead>
-          <tbody
-              className={tbodyProps.className}
-              role={tbodyProps.role}
-              style={tbodyProps.style}
-          >
-          {(!isLoading && devices && devices.length > 0) && (
-              page.map((row) => {
-                prepareRow(row);
-                const { key, className, role, style } = row.getRowProps();
-
-                return (
-                    <RowProvider key={key}>
-                        <TableRow<Device>
-                            cells={row.cells}
-                            key={key}
-                            className={className}
-                            role={role}
-                            style={style}
-                        />
-                    </RowProvider>
-                );
-              })
-          )}
+                  />
+                </RowProvider>
+              );
+            })}
           {isLoading && (
-              <tr>
-                  <td colSpan={5} className="text-center text-muted">Loading...</td>
-              </tr>
+            <tr>
+              <td colSpan={5} className="text-center text-muted">
+                Loading...
+              </td>
+            </tr>
           )}
-          {(!isLoading && (!devices || devices.length === 0)) &&  (
-              <tr>
-                  <td colSpan={5} className="text-center text-muted">No devices found.</td>
-              </tr>
+          {!isLoading && (!devices || devices.length === 0) && (
+            <tr>
+              <td colSpan={5} className="text-center text-muted">
+                No devices found.
+              </td>
+            </tr>
           )}
-          {(!isLoading && error) &&  (
-              <tr>
-                  <td colSpan={5} className="text-center text-muted">{{error}}</td>
-              </tr>
+          {!isLoading && error && (
+            <tr>
+              <td colSpan={5} className="text-center text-muted">
+                {{ error }}
+              </td>
+            </tr>
           )}
-
-          </tbody>
-        </Table>
-      </TableContainer>
+        </tbody>
+      </Table>
+    </TableContainer>
   );
 }
diff --git a/app/edge/devices/components/AMTDevicesDatatable/columns/RowContext.tsx b/app/edge/devices/components/AMTDevicesDatatable/columns/RowContext.tsx
index 464557238..e64551b3d 100644
--- a/app/edge/devices/components/AMTDevicesDatatable/columns/RowContext.tsx
+++ b/app/edge/devices/components/AMTDevicesDatatable/columns/RowContext.tsx
@@ -1,28 +1,34 @@
-import {createContext, useContext, useMemo, useReducer, PropsWithChildren} from "react";
+import {
+  createContext,
+  useContext,
+  useMemo,
+  useReducer,
+  PropsWithChildren,
+} from 'react';
 
 interface RowContextState {
-    isLoading: boolean;
-    toggleIsLoading(): void;
+  isLoading: boolean;
+  toggleIsLoading(): void;
 }
 
 const RowContext = createContext<RowContextState | null>(null);
 
 export function RowProvider({ children }: PropsWithChildren<unknown>) {
-    const [isLoading, toggleIsLoading] = useReducer((state) => !state, false);
+  const [isLoading, toggleIsLoading] = useReducer((state) => !state, false);
 
-    const state = useMemo(() => ({ isLoading, toggleIsLoading }), [
-        isLoading,
-        toggleIsLoading
-    ]);
+  const state = useMemo(
+    () => ({ isLoading, toggleIsLoading }),
+    [isLoading, toggleIsLoading]
+  );
 
-    return <RowContext.Provider value={state}>{children}</RowContext.Provider>;
+  return <RowContext.Provider value={state}>{children}</RowContext.Provider>;
 }
 
 export function useRowContext() {
-    const context = useContext(RowContext);
-    if (!context) {
-        throw new Error("should be nested under RowProvider");
-    }
+  const context = useContext(RowContext);
+  if (!context) {
+    throw new Error('should be nested under RowProvider');
+  }
 
-    return context;
+  return context;
 }
diff --git a/app/edge/devices/components/AMTDevicesDatatable/columns/actions.tsx b/app/edge/devices/components/AMTDevicesDatatable/columns/actions.tsx
index 22b5ae0ed..447465878 100644
--- a/app/edge/devices/components/AMTDevicesDatatable/columns/actions.tsx
+++ b/app/edge/devices/components/AMTDevicesDatatable/columns/actions.tsx
@@ -1,14 +1,14 @@
-import {CellProps, Column, TableInstance} from 'react-table';
-import {useRouter} from "@uirouter/react";
-import { Device } from "Portainer/hostmanagement/open-amt/model";
-import { MenuItem } from "@reach/menu-button";
-import { ActionsMenu } from "Portainer/components/datatables/components/ActionsMenu";
-import {confirm} from "Portainer/services/modal.service/confirm";
-import {useEnvironment} from "Portainer/environments/useEnvironment";
-import {executeDeviceAction} from "Portainer/hostmanagement/open-amt/open-amt.service";
-import * as notifications from "Portainer/services/notifications";
+import { CellProps, Column, TableInstance } from 'react-table';
+import { useRouter } from '@uirouter/react';
+import { Device } from '@/portainer/hostmanagement/open-amt/model';
+import { MenuItem } from '@reach/menu-button';
+import { ActionsMenu } from '@/portainer/components/datatables/components/ActionsMenu';
+import { confirm } from '@/portainer/services/modal.service/confirm';
+import { useEnvironment } from '@/portainer/environments/useEnvironment';
+import { executeDeviceAction } from '@/portainer/hostmanagement/open-amt/open-amt.service';
+import * as notifications from '@/portainer/services/notifications';
 
-import {useRowContext} from "@/edge/devices/components/AMTDevicesDatatable/columns/RowContext";
+import { useRowContext } from '@/edge/devices/components/AMTDevicesDatatable/columns/RowContext';
 
 export const actions: Column<Device> = {
   Header: 'Actions',
@@ -21,24 +21,43 @@ export const actions: Column<Device> = {
   Cell: ActionsCell,
 };
 
-export function ActionsCell({ row: { original: device }, }: CellProps<TableInstance>) {
+export function ActionsCell({
+  row: { original: device },
+}: CellProps<TableInstance>) {
   const router = useRouter();
   const environment = useEnvironment();
   const { isLoading, toggleIsLoading } = useRowContext();
 
   return (
-      <ActionsMenu>
-        <div className="tableActionsMenu">
-          <div className="tableActionsHeader">AMT Functions</div>
-          <div>
-            <MenuItem disabled={isLoading} onSelect={() => handleDeviceActionClick('power on')}>Power ON</MenuItem>
-            <MenuItem disabled={isLoading} onSelect={() => handleDeviceActionClick('power off')}>Power OFF</MenuItem>
-            <MenuItem disabled={isLoading} onSelect={() => handleDeviceActionClick('restart')}>Restart</MenuItem>
-            <MenuItem disabled={isLoading} onSelect={() => handleKVMClick()}>KVM</MenuItem>
-          </div>
+    <ActionsMenu>
+      <div className="tableActionsMenu">
+        <div className="tableActionsHeader">AMT Functions</div>
+        <div>
+          <MenuItem
+            disabled={isLoading}
+            onSelect={() => handleDeviceActionClick('power on')}
+          >
+            Power ON
+          </MenuItem>
+          <MenuItem
+            disabled={isLoading}
+            onSelect={() => handleDeviceActionClick('power off')}
+          >
+            Power OFF
+          </MenuItem>
+          <MenuItem
+            disabled={isLoading}
+            onSelect={() => handleDeviceActionClick('restart')}
+          >
+            Restart
+          </MenuItem>
+          <MenuItem disabled={isLoading} onSelect={() => handleKVMClick()}>
+            KVM
+          </MenuItem>
         </div>
-      </ActionsMenu>
-  )
+      </div>
+    </ActionsMenu>
+  );
 
   function handleDeviceActionClick(action: string) {
     confirm({
@@ -62,10 +81,17 @@ export function ActionsCell({ row: { original: device }, }: CellProps<TableInsta
         try {
           toggleIsLoading();
           await executeDeviceAction(environment.Id, device.guid, action);
-          notifications.success(`${action} action sent successfully`, device.hostname);
+          notifications.success(
+            `${action} action sent successfully`,
+            device.hostname
+          );
           await router.stateService.reload();
         } catch (err) {
-          notifications.error('Failure', err as Error, `Failed to ${action} the device`);
+          notifications.error(
+            'Failure',
+            err as Error,
+            `Failed to ${action} the device`
+          );
           toggleIsLoading();
         }
       },
@@ -79,5 +105,4 @@ export function ActionsCell({ row: { original: device }, }: CellProps<TableInsta
       deviceName: device.hostname,
     });
   }
-
 }
diff --git a/app/edge/devices/components/AMTDevicesDatatable/columns/hostname.tsx b/app/edge/devices/components/AMTDevicesDatatable/columns/hostname.tsx
index 42756f87c..f61bd3529 100644
--- a/app/edge/devices/components/AMTDevicesDatatable/columns/hostname.tsx
+++ b/app/edge/devices/components/AMTDevicesDatatable/columns/hostname.tsx
@@ -1,5 +1,5 @@
 import { Column } from 'react-table';
-import { Device } from "Portainer/hostmanagement/open-amt/model";
+import { Device } from '@/portainer/hostmanagement/open-amt/model';
 
 export const hostname: Column<Device> = {
   Header: 'Hostname',
@@ -10,4 +10,3 @@ export const hostname: Column<Device> = {
   sortType: 'string',
   Filter: () => null,
 };
-
diff --git a/app/edge/devices/components/AMTDevicesDatatable/columns/index.tsx b/app/edge/devices/components/AMTDevicesDatatable/columns/index.tsx
index 5c32dcf19..b4caedf4b 100644
--- a/app/edge/devices/components/AMTDevicesDatatable/columns/index.tsx
+++ b/app/edge/devices/components/AMTDevicesDatatable/columns/index.tsx
@@ -3,16 +3,8 @@ import { useMemo } from 'react';
 import { hostname } from './hostname';
 import { status } from './status';
 import { powerState } from './power-state';
-import {actions} from "./actions";
+import { actions } from './actions';
 
 export function useColumns() {
-  return useMemo(
-    () => [
-        hostname,
-        status,
-        powerState,
-        actions
-    ],
-    []
-  );
+  return useMemo(() => [hostname, status, powerState, actions], []);
 }
diff --git a/app/edge/devices/components/AMTDevicesDatatable/columns/power-state.tsx b/app/edge/devices/components/AMTDevicesDatatable/columns/power-state.tsx
index 4d3aa4e2a..5ee7a88df 100644
--- a/app/edge/devices/components/AMTDevicesDatatable/columns/power-state.tsx
+++ b/app/edge/devices/components/AMTDevicesDatatable/columns/power-state.tsx
@@ -1,10 +1,10 @@
-import {CellProps, Column, TableInstance} from 'react-table';
-import clsx from "clsx";
-import { Device } from "Portainer/hostmanagement/open-amt/model";
+import { CellProps, Column, TableInstance } from 'react-table';
+import clsx from 'clsx';
+import { Device } from '@/portainer/hostmanagement/open-amt/model';
 
-import {useRowContext} from "@/edge/devices/components/AMTDevicesDatatable/columns/RowContext";
+import { useRowContext } from '@/edge/devices/components/AMTDevicesDatatable/columns/RowContext';
 
-import styles from "../AMTDevices.module.css";
+import styles from '../AMTDevices.module.css';
 
 export const powerState: Column<Device> = {
   Header: 'Power State',
@@ -17,19 +17,25 @@ export const powerState: Column<Device> = {
   Filter: () => null,
 };
 
-export function PowerStateCell({ row: { original: device }, }: CellProps<TableInstance>) {
+export function PowerStateCell({
+  row: { original: device },
+}: CellProps<TableInstance>) {
   const { isLoading } = useRowContext();
   return (
-      <>
-        <span className={clsx({'text-success': device.powerState === 2})}>
-          {parsePowerState(device.powerState)}
-        </span>
-        <span>{isLoading && <i className={`fa fa-cog fa-spin ${styles.loadingSpinner}`} />}</span>
-      </>
-  )
+    <>
+      <span className={clsx({ 'text-success': device.powerState === 2 })}>
+        {parsePowerState(device.powerState)}
+      </span>
+      <span>
+        {isLoading && (
+          <i className={`fa fa-cog fa-spin ${styles.loadingSpinner}`} />
+        )}
+      </span>
+    </>
+  );
 }
 
-function parsePowerState(value : number) {
+function parsePowerState(value: number) {
   // https://app.swaggerhub.com/apis-docs/rbheopenamt/mps/1.4.0#/AMT/get_api_v1_amt_power_state__guid_
   switch (value) {
     case 2:
@@ -48,4 +54,4 @@ function parsePowerState(value : number) {
     default:
       return '-';
   }
-};
+}
diff --git a/app/edge/devices/components/AMTDevicesDatatable/columns/status.tsx b/app/edge/devices/components/AMTDevicesDatatable/columns/status.tsx
index a521b3f41..891ac5e72 100644
--- a/app/edge/devices/components/AMTDevicesDatatable/columns/status.tsx
+++ b/app/edge/devices/components/AMTDevicesDatatable/columns/status.tsx
@@ -1,6 +1,6 @@
-import {CellProps, Column, TableInstance} from 'react-table';
-import clsx from "clsx";
-import { Device } from "Portainer/hostmanagement/open-amt/model";
+import { CellProps, Column, TableInstance } from 'react-table';
+import clsx from 'clsx';
+import { Device } from '@/portainer/hostmanagement/open-amt/model';
 
 export const status: Column<Device> = {
   Header: 'MPS Status',
@@ -12,11 +12,12 @@ export const status: Column<Device> = {
   Filter: () => null,
 };
 
-export function StatusCell({ row: { original: device }, }: CellProps<TableInstance>) {
+export function StatusCell({
+  row: { original: device },
+}: CellProps<TableInstance>) {
   return (
-      <span className={clsx({'text-success': device.connectionStatus})}>
-        {device.connectionStatus ? 'Connected' : 'Disconnected'}
-      </span>
-  )
+    <span className={clsx({ 'text-success': device.connectionStatus })}>
+      {device.connectionStatus ? 'Connected' : 'Disconnected'}
+    </span>
+  );
 }
-
diff --git a/app/edge/devices/components/AMTDevicesDatatable/useAMTDevices.tsx b/app/edge/devices/components/AMTDevicesDatatable/useAMTDevices.tsx
index 920567c0d..18613bf0e 100644
--- a/app/edge/devices/components/AMTDevicesDatatable/useAMTDevices.tsx
+++ b/app/edge/devices/components/AMTDevicesDatatable/useAMTDevices.tsx
@@ -1,20 +1,20 @@
 import { useQuery } from 'react-query';
 
-import {getDevices} from "@/portainer/hostmanagement/open-amt/open-amt.service";
-import {EnvironmentId} from '@/portainer/environments/types';
+import { getDevices } from '@/portainer/hostmanagement/open-amt/open-amt.service';
+import { EnvironmentId } from '@/portainer/environments/types';
 
 export function useAMTDevices(environmentId: EnvironmentId) {
-    const { isLoading, isRefetching, data, error } = useQuery(
-        ['amt_devices', environmentId],
-        async () => getDevices(environmentId),
-        {
-            refetchOnWindowFocus: false,
-        },
-    );
+  const { isLoading, isRefetching, data, error } = useQuery(
+    ['amt_devices', environmentId],
+    async () => getDevices(environmentId),
+    {
+      refetchOnWindowFocus: false,
+    }
+  );
 
-    return {
-        isLoading: isLoading || isRefetching,
-        devices: data,
-        error,
-    };
-}
\ No newline at end of file
+  return {
+    isLoading: isLoading || isRefetching,
+    devices: data,
+    error,
+  };
+}
diff --git a/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatable.tsx b/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatable.tsx
index e357a62e8..a32586c87 100644
--- a/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatable.tsx
+++ b/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatable.tsx
@@ -8,8 +8,8 @@ import {
   usePagination,
 } from 'react-table';
 import { useRowSelectColumn } from '@lineup-lite/hooks';
-import { Environment } from 'Portainer/environments/types';
-import { PaginationControls } from 'Portainer/components/pagination-controls';
+import { Environment } from '@/portainer/environments/types';
+import { PaginationControls } from '@/portainer/components/pagination-controls';
 import {
   Table,
   TableActions,
@@ -19,20 +19,20 @@ import {
   TableSettingsMenu,
   TableTitle,
   TableTitleActions,
-} from 'Portainer/components/datatables/components';
-import { multiple } from 'Portainer/components/datatables/components/filter-types';
-import { useTableSettings } from 'Portainer/components/datatables/components/useTableSettings';
-import { ColumnVisibilityMenu } from 'Portainer/components/datatables/components/ColumnVisibilityMenu';
-import { useRepeater } from 'Portainer/components/datatables/components/useRepeater';
-import { useDebounce } from 'Portainer/hooks/useDebounce';
+} from '@/portainer/components/datatables/components';
+import { multiple } from '@/portainer/components/datatables/components/filter-types';
+import { useTableSettings } from '@/portainer/components/datatables/components/useTableSettings';
+import { ColumnVisibilityMenu } from '@/portainer/components/datatables/components/ColumnVisibilityMenu';
+import { useRepeater } from '@/portainer/components/datatables/components/useRepeater';
+import { useDebounce } from '@/portainer/hooks/useDebounce';
 import {
   useSearchBarContext,
   SearchBar,
-} from 'Portainer/components/datatables/components/SearchBar';
-import { useRowSelect } from 'Portainer/components/datatables/components/useRowSelect';
-import { TableFooter } from 'Portainer/components/datatables/components/TableFooter';
-import { SelectedRowsCount } from 'Portainer/components/datatables/components/SelectedRowsCount';
-import {EnvironmentProvider} from "Portainer/environments/useEnvironment";
+} from '@/portainer/components/datatables/components/SearchBar';
+import { useRowSelect } from '@/portainer/components/datatables/components/useRowSelect';
+import { TableFooter } from '@/portainer/components/datatables/components/TableFooter';
+import { SelectedRowsCount } from '@/portainer/components/datatables/components/SelectedRowsCount';
+import { EnvironmentProvider } from '@/portainer/environments/useEnvironment';
 
 import { EdgeDeviceTableSettings } from '@/edge/devices/types';
 import { EdgeDevicesDatatableSettings } from '@/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableSettings';
@@ -57,8 +57,8 @@ export function EdgeDevicesDatatable({
   onRefresh,
   setLoadingMessage,
 }: EdgeDevicesTableProps) {
-
-  const { settings, setTableSettings } = useTableSettings<EdgeDeviceTableSettings>();
+  const { settings, setTableSettings } =
+    useTableSettings<EdgeDeviceTableSettings>();
   const [searchBarValue, setSearchBarValue] = useSearchBarContext();
 
   const columns = useColumns();
@@ -155,8 +155,9 @@ export function EdgeDevicesDatatable({
       >
         <thead>
           {headerGroups.map((headerGroup) => {
-            const { key, className, role, style } = headerGroup.getHeaderGroupProps();
-            
+            const { key, className, role, style } =
+              headerGroup.getHeaderGroupProps();
+
             return (
               <TableHeaderRow<Environment>
                 key={key}
@@ -192,7 +193,7 @@ export function EdgeDevicesDatatable({
                     <td />
                     <td colSpan={10}>
                       <EnvironmentProvider environment={row.original}>
-                        <AMTDevicesDatatable/>
+                        <AMTDevicesDatatable />
                       </EnvironmentProvider>
                     </td>
                   </tr>
diff --git a/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableActions.tsx b/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableActions.tsx
index e1eeb06cd..df5a051ee 100644
--- a/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableActions.tsx
+++ b/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableActions.tsx
@@ -1,10 +1,11 @@
-import type {Environment } from 'Portainer/environments/types';
-import { Button } from 'Portainer/components/Button';
-import { confirm } from "Portainer/services/modal.service/confirm";
-import { prompt } from "Portainer/services/modal.service/prompt";
-import * as notifications from 'Portainer/services/notifications';
-import {activateDevice} from "Portainer/hostmanagement/open-amt/open-amt.service";
-import {useRouter} from "@uirouter/react";
+import { useRouter } from '@uirouter/react';
+
+import type { Environment } from '@/portainer/environments/types';
+import { Button } from '@/portainer/components/Button';
+import { confirm } from '@/portainer/services/modal.service/confirm';
+import { prompt } from '@/portainer/services/modal.service/prompt';
+import * as notifications from '@/portainer/services/notifications';
+import { activateDevice } from '@/portainer/hostmanagement/open-amt/open-amt.service';
 
 interface Props {
   selectedItems: Environment[];
@@ -17,7 +18,7 @@ export function EdgeDevicesDatatableActions({
   selectedItems,
   isOpenAMTEnabled,
   isFDOEnabled,
-                                              setLoadingMessage,
+  setLoadingMessage,
 }: Props) {
   const hasSelectedItem = selectedItems.length === 1;
 
@@ -25,7 +26,6 @@ export function EdgeDevicesDatatableActions({
 
   return (
     <div className="actionBar">
-
       {isFDOEnabled && (
         <Button onClick={() => onAddNewDeviceClick()}>
           <i className="fa fa-plus-circle space-right" aria-hidden="true" />
@@ -34,15 +34,14 @@ export function EdgeDevicesDatatableActions({
       )}
 
       {isOpenAMTEnabled && (
-          <Button
-              disabled={!hasSelectedItem}
-              onClick={() => onAssociateOpenAMTClick(selectedItems)}
-          >
-            <i className="fa fa-link space-right" aria-hidden="true" />
-            Associate with OpenAMT
-          </Button>
+        <Button
+          disabled={!hasSelectedItem}
+          onClick={() => onAssociateOpenAMTClick(selectedItems)}
+        >
+          <i className="fa fa-link space-right" aria-hidden="true" />
+          Associate with OpenAMT
+        </Button>
       )}
-
     </div>
   );
 
@@ -68,16 +67,15 @@ export function EdgeDevicesDatatableActions({
       },
       callback: async (result: string) => {
         switch (result) {
-          case "1":
+          case '1':
             router.stateService.go('portainer.endpoints.importDevice');
             break;
-          case "2":
+          case '2':
             router.stateService.go('portainer.endpoints.newEdgeDevice');
             break;
           default:
             break;
         }
-
       },
     });
   }
@@ -104,18 +102,24 @@ export function EdgeDevicesDatatableActions({
         }
 
         try {
-          setLoadingMessage('Activating Active Management Technology on selected device...');
-          await activateDevice(selectedEnvironment.Id)
-          notifications.success('Successfully associated with OpenAMT', selectedEnvironment.Name);
+          setLoadingMessage(
+            'Activating Active Management Technology on selected device...'
+          );
+          await activateDevice(selectedEnvironment.Id);
+          notifications.success(
+            'Successfully associated with OpenAMT',
+            selectedEnvironment.Name
+          );
         } catch (err) {
-          notifications.error('Failure', err as Error, 'Unable to associate with OpenAMT');
+          notifications.error(
+            'Failure',
+            err as Error,
+            'Unable to associate with OpenAMT'
+          );
         } finally {
           setLoadingMessage('');
         }
-
       },
     });
-
   }
-
 }
diff --git a/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableContainer.tsx b/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableContainer.tsx
index a3e11757b..2fff8dbeb 100644
--- a/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableContainer.tsx
+++ b/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableContainer.tsx
@@ -1,29 +1,31 @@
-import { TableSettingsProvider } from 'Portainer/components/datatables/components/useTableSettings';
-import { SearchBarProvider } from 'Portainer/components/datatables/components/SearchBar';
+import { TableSettingsProvider } from '@/portainer/components/datatables/components/useTableSettings';
+import { SearchBarProvider } from '@/portainer/components/datatables/components/SearchBar';
 
 import { react2angular } from '@/react-tools/react2angular';
 
 import {
-    EdgeDevicesDatatable,
+  EdgeDevicesDatatable,
   EdgeDevicesTableProps,
 } from './EdgeDevicesDatatable';
 
-export function EdgeDevicesDatatableContainer({ ...props }: EdgeDevicesTableProps) {
-    const defaultSettings = {
-        autoRefreshRate: 0,
-        hiddenQuickActions: [],
-        hiddenColumns: [],
-        pageSize: 10,
-        sortBy: { id: 'state', desc: false },
+export function EdgeDevicesDatatableContainer({
+  ...props
+}: EdgeDevicesTableProps) {
+  const defaultSettings = {
+    autoRefreshRate: 0,
+    hiddenQuickActions: [],
+    hiddenColumns: [],
+    pageSize: 10,
+    sortBy: { id: 'state', desc: false },
   };
 
   return (
-      <TableSettingsProvider defaults={defaultSettings} storageKey="edgeDevices">
-        <SearchBarProvider>
-          {/* eslint-disable-next-line react/jsx-props-no-spreading */}
-          <EdgeDevicesDatatable {...props} />
-        </SearchBarProvider>
-      </TableSettingsProvider>
+    <TableSettingsProvider defaults={defaultSettings} storageKey="edgeDevices">
+      <SearchBarProvider>
+        {/* eslint-disable-next-line react/jsx-props-no-spreading */}
+        <EdgeDevicesDatatable {...props} />
+      </SearchBarProvider>
+    </TableSettingsProvider>
   );
 }
 
@@ -32,8 +34,8 @@ export const EdgeDevicesDatatableAngular = react2angular(
   [
     'dataset',
     'onRefresh',
-      'setLoadingMessage',
+    'setLoadingMessage',
     'isOpenAmtEnabled',
-      'isFdoEnabled',
+    'isFdoEnabled',
   ]
 );
diff --git a/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableSettings.tsx b/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableSettings.tsx
index 76d8a3124..241a78502 100644
--- a/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableSettings.tsx
+++ b/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableSettings.tsx
@@ -1,18 +1,17 @@
-import { TableSettingsMenuAutoRefresh } from 'Portainer/components/datatables/components/TableSettingsMenuAutoRefresh';
-import { useTableSettings } from 'Portainer/components/datatables/components/useTableSettings';
+import { TableSettingsMenuAutoRefresh } from '@/portainer/datatables/components/TableSettingsMenuAutoRefresh';
+import { useTableSettings } from '@/portainer/datatables/components/useTableSettings';
 
-import { EdgeDeviceTableSettings } from "@/edge/devices/types";
+import { EdgeDeviceTableSettings } from '@/edge/devices/types';
 
 export function EdgeDevicesDatatableSettings() {
-  const { settings, setTableSettings } = useTableSettings<
-    EdgeDeviceTableSettings
-  >();
+  const { settings, setTableSettings } =
+    useTableSettings<EdgeDeviceTableSettings>();
 
   return (
-      <TableSettingsMenuAutoRefresh
-        value={settings.autoRefreshRate}
-        onChange={handleRefreshRateChange}
-      />
+    <TableSettingsMenuAutoRefresh
+      value={settings.autoRefreshRate}
+      onChange={handleRefreshRateChange}
+    />
   );
 
   function handleRefreshRateChange(autoRefreshRate: number) {
diff --git a/app/edge/devices/components/EdgeDevicesDatatable/columns/actions.tsx b/app/edge/devices/components/EdgeDevicesDatatable/columns/actions.tsx
index 63ee520d8..beff57265 100644
--- a/app/edge/devices/components/EdgeDevicesDatatable/columns/actions.tsx
+++ b/app/edge/devices/components/EdgeDevicesDatatable/columns/actions.tsx
@@ -1,7 +1,8 @@
-import {CellProps, Column, TableInstance} from 'react-table';
-import {Environment} from "Portainer/environments/types";
-import { MenuItem } from "@reach/menu-button";
-import {ActionsMenu} from "Portainer/components/datatables/components/ActionsMenu";
+import { Column } from 'react-table';
+import { MenuItem } from '@reach/menu-button';
+
+import { Environment } from '@/portainer/environments/types';
+import { ActionsMenu } from '@/portainer/components/datatables/components/ActionsMenu';
 
 export const actions: Column<Environment> = {
   Header: 'Actions',
@@ -15,13 +16,12 @@ export const actions: Column<Environment> = {
 };
 
 export function ActionsCell() {
-
   return (
-      <ActionsMenu>
-        <div>
-          <MenuItem onSelect={() => {}}>Browse</MenuItem>
-          <MenuItem onSelect={() => {}}>Refresh Snapshot</MenuItem>
-        </div>
-      </ActionsMenu>
-  )
+    <ActionsMenu>
+      <div>
+        <MenuItem onSelect={() => {}}>Browse</MenuItem>
+        <MenuItem onSelect={() => {}}>Refresh Snapshot</MenuItem>
+      </div>
+    </ActionsMenu>
+  );
 }
diff --git a/app/edge/devices/components/EdgeDevicesDatatable/columns/group.tsx b/app/edge/devices/components/EdgeDevicesDatatable/columns/group.tsx
index 7f15175f7..194caab3b 100644
--- a/app/edge/devices/components/EdgeDevicesDatatable/columns/group.tsx
+++ b/app/edge/devices/components/EdgeDevicesDatatable/columns/group.tsx
@@ -1,6 +1,7 @@
 import { Column } from 'react-table';
-import {Environment} from "Portainer/environments/types";
-import { DefaultFilter } from 'Portainer/components/datatables/components/Filter';
+
+import { Environment } from '@/portainer/environments/types';
+import { DefaultFilter } from '@/portainer/components/datatables/components/Filter';
 
 export const group: Column<Environment> = {
   Header: 'Group',
@@ -9,8 +10,3 @@ export const group: Column<Environment> = {
   Filter: DefaultFilter,
   canHide: true,
 };
-
-
-
-
-
diff --git a/app/edge/devices/components/EdgeDevicesDatatable/columns/heartbeat.tsx b/app/edge/devices/components/EdgeDevicesDatatable/columns/heartbeat.tsx
index 51ad2744c..e95368f5b 100644
--- a/app/edge/devices/components/EdgeDevicesDatatable/columns/heartbeat.tsx
+++ b/app/edge/devices/components/EdgeDevicesDatatable/columns/heartbeat.tsx
@@ -1,11 +1,12 @@
-import {Column} from 'react-table';
-import {Environment, EnvironmentStatus} from "Portainer/environments/types";
-import {DefaultFilter} from 'Portainer/components/datatables/components/Filter';
-import clsx from "clsx";
+import { Column } from 'react-table';
+import clsx from 'clsx';
+
+import { Environment, EnvironmentStatus } from '@/portainer/environments/types';
+import { DefaultFilter } from '@/portainer/components/datatables/components/Filter';
 
 export const heartbeat: Column<Environment> = {
   Header: 'Heartbeat',
-  accessor: (row) => row.Status === EnvironmentStatus.Up ? 'up' : 'down',
+  accessor: (row) => (row.Status === EnvironmentStatus.Up ? 'up' : 'down'),
   id: 'status',
   Cell: StatusCell,
   Filter: DefaultFilter,
@@ -14,8 +15,8 @@ export const heartbeat: Column<Environment> = {
 
 function StatusCell({ value: status }: { value: string }) {
   return (
-      <span className={clsx('label', `label-${environmentStatusBadge(status)}`)}>
-        {status}
+    <span className={clsx('label', `label-${environmentStatusBadge(status)}`)}>
+      {status}
     </span>
   );
 
@@ -26,5 +27,3 @@ function StatusCell({ value: status }: { value: string }) {
     return 'success';
   }
 }
-
-
diff --git a/app/edge/devices/components/EdgeDevicesDatatable/columns/index.tsx b/app/edge/devices/components/EdgeDevicesDatatable/columns/index.tsx
index 1f618f7d4..1d985baa6 100644
--- a/app/edge/devices/components/EdgeDevicesDatatable/columns/index.tsx
+++ b/app/edge/devices/components/EdgeDevicesDatatable/columns/index.tsx
@@ -3,16 +3,8 @@ import { useMemo } from 'react';
 import { name } from './name';
 import { heartbeat } from './heartbeat';
 import { group } from './group';
-import {actions} from "./actions";
+import { actions } from './actions';
 
 export function useColumns() {
-  return useMemo(
-    () => [
-      name,
-        heartbeat,
-        group,
-        actions,
-    ],
-    []
-  );
+  return useMemo(() => [name, heartbeat, group, actions], []);
 }
diff --git a/app/edge/devices/components/EdgeDevicesDatatable/columns/name.tsx b/app/edge/devices/components/EdgeDevicesDatatable/columns/name.tsx
index a1f19091d..ebe22464f 100644
--- a/app/edge/devices/components/EdgeDevicesDatatable/columns/name.tsx
+++ b/app/edge/devices/components/EdgeDevicesDatatable/columns/name.tsx
@@ -1,7 +1,8 @@
 import { CellProps, Column, TableInstance } from 'react-table';
-import { Environment } from 'Portainer/environments/types';
-import { Link } from 'Portainer/components/Link';
-import { arrowClass } from 'Portainer/components/datatables/utils';
+
+import { Environment } from '@/portainer/environments/types';
+import { Link } from '@/portainer/components/Link';
+import { arrowClass } from '@/portainer/components/datatables/utils';
 
 export const name: Column<Environment> = {
   Header: 'Name',
@@ -15,7 +16,7 @@ export const name: Column<Environment> = {
 };
 
 export function NameCell({ value: name, row }: CellProps<TableInstance>) {
-    return (
+  return (
     // eslint-disable-next-line react/jsx-props-no-spreading
     <div {...row.getToggleRowExpandedProps({})}>
       <i
diff --git a/app/edge/devices/index.ts b/app/edge/devices/index.ts
index 66e18e1c7..674188140 100644
--- a/app/edge/devices/index.ts
+++ b/app/edge/devices/index.ts
@@ -1,7 +1,7 @@
 import angular from 'angular';
 
-import { EdgeDevicesDatatableAngular } from "@/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableContainer";
+import { EdgeDevicesDatatableAngular } from '@/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableContainer';
 
 export default angular
-    .module('portainer.edge.devices', [])
+  .module('portainer.edge.devices', [])
   .component('edgeDevicesDatatable', EdgeDevicesDatatableAngular).name;
diff --git a/app/edge/devices/types.ts b/app/edge/devices/types.ts
index 04221f3b1..403a5e3d8 100644
--- a/app/edge/devices/types.ts
+++ b/app/edge/devices/types.ts
@@ -1,6 +1,6 @@
 export interface EdgeDeviceTableSettings {
-    hiddenColumns: string[];
-    autoRefreshRate: number;
-    pageSize: number;
-    sortBy: { id: string; desc: boolean };
-}
\ No newline at end of file
+  hiddenColumns: string[];
+  autoRefreshRate: number;
+  pageSize: number;
+  sortBy: { id: string; desc: boolean };
+}
diff --git a/app/edge/services/edge-job.js b/app/edge/services/edge-job.js
index 9ed0bc755..c0629a34b 100644
--- a/app/edge/services/edge-job.js
+++ b/app/edge/services/edge-job.js
@@ -1,6 +1,6 @@
 import angular from 'angular';
 
-import { ScheduleCreateRequest, ScheduleUpdateRequest } from 'Portainer/models/schedule';
+import { ScheduleCreateRequest, ScheduleUpdateRequest } from '@/portainer/models/schedule';
 
 function EdgeJobService(EdgeJobs, EdgeJobResults, FileUploadService) {
   var service = {};
diff --git a/app/edge/views/edge-devices/edgeDevicesView/edgeDevicesView.html b/app/edge/views/edge-devices/edgeDevicesView/edgeDevicesView.html
index 66f6654f0..7e2c8ff30 100644
--- a/app/edge/views/edge-devices/edgeDevicesView/edgeDevicesView.html
+++ b/app/edge/views/edge-devices/edgeDevicesView/edgeDevicesView.html
@@ -9,7 +9,7 @@
 
 <div
   class="row"
-  style="width: 100%; height: 100%; text-align: center; display: flex; flex-direction: column; align-items: center; justify-content: center;"
+  style="width: 100%; height: 100%; text-align: center; display: flex; flex-direction: column; align-items: center; justify-content: center"
   ng-if="$ctrl.loadingMessage"
 >
   <div class="sk-fold">
@@ -18,7 +18,7 @@
     <div class="sk-fold-cube"></div>
     <div class="sk-fold-cube"></div>
   </div>
-  <span style="margin-top: 25px;">
+  <span style="margin-top: 25px">
     {{ $ctrl.loadingMessage }}
     <i class="fa fa-cog fa-spin"></i>
   </span>
diff --git a/app/edge/views/edge-devices/edgeDevicesView/edgeDevicesViewController.js b/app/edge/views/edge-devices/edgeDevicesView/edgeDevicesViewController.js
index cb8729994..280c764fc 100644
--- a/app/edge/views/edge-devices/edgeDevicesView/edgeDevicesViewController.js
+++ b/app/edge/views/edge-devices/edgeDevicesView/edgeDevicesViewController.js
@@ -1,61 +1,60 @@
-import EndpointHelper from "Portainer/helpers/endpointHelper";
-import {getEndpoints} from "Portainer/environments/environment.service";
+import EndpointHelper from 'Portainer/helpers/endpointHelper';
+import { getEndpoints } from 'Portainer/environments/environment.service';
 
 angular.module('portainer.edge').controller('EdgeDevicesViewController', EdgeDevicesViewController);
 /* @ngInject */
 export function EdgeDevicesViewController($q, $async, EndpointService, GroupService, SettingsService, ModalService, Notifications) {
-    var ctrl = this;
+  var ctrl = this;
 
-    ctrl.edgeDevices = [];
+  ctrl.edgeDevices = [];
 
-  this.getEnvironments = function() {
-      return $async(async () => {
-        $q.all({
-              endpoints: getEndpoints(0, 100, {edgeDeviceFilter: true}),
-              groups: GroupService.groups(),
-          })
-          .then(function success(data) {
-              var endpoints = data.endpoints.value;
-              var groups = data.groups;
-              EndpointHelper.mapGroupNameToEndpoint(endpoints, groups);
-              ctrl.edgeDevices = endpoints;
-          })
-          .catch(function error(err) {
-              Notifications.error('Failure', err, 'Unable to retrieve edge devices');
-              ctrl.edgeDevices = [];
-          });
+  this.getEnvironments = function () {
+    return $async(async () => {
+      $q.all({
+        endpoints: getEndpoints(0, 100, { edgeDeviceFilter: true }),
+        groups: GroupService.groups(),
       })
-  }
-
-    this.getSettings = function() {
-
-      return $async(async () => {
-            try {
-                const settings = await SettingsService.settings();
-
-                const openAMTFeatureFlagValue = settings && settings.FeatureFlagSettings && settings.FeatureFlagSettings['open-amt'];
-                const openAMTFeatureEnabled = settings && settings.EnableEdgeComputeFeatures && settings.openAMTConfiguration && settings.openAMTConfiguration.enabled;
-                ctrl.isOpenAMTEnabled = openAMTFeatureFlagValue && openAMTFeatureEnabled;
-
-                const fdoFeatureFlagValue = settings && settings.FeatureFlagSettings && settings.FeatureFlagSettings['fdo'];
-                const fdoFeatureEnabled = settings && settings.EnableEdgeComputeFeatures && settings.fdoConfiguration && settings.fdoConfiguration.enabled;
-                ctrl.isFDOEnabled = fdoFeatureFlagValue && fdoFeatureEnabled;
-            } catch (err) {
-                Notifications.error('Failure', err, 'Unable to retrieve settings');
-            }
+        .then(function success(data) {
+          var endpoints = data.endpoints.value;
+          var groups = data.groups;
+          EndpointHelper.mapGroupNameToEndpoint(endpoints, groups);
+          ctrl.edgeDevices = endpoints;
         })
-    }
+        .catch(function error(err) {
+          Notifications.error('Failure', err, 'Unable to retrieve edge devices');
+          ctrl.edgeDevices = [];
+        });
+    });
+  };
 
-    this.setLoadingMessage = function(message) {
-        return $async(async () => {
-            ctrl.loadingMessage = message;
-        })
-    }
+  this.getSettings = function () {
+    return $async(async () => {
+      try {
+        const settings = await SettingsService.settings();
+
+        const openAMTFeatureFlagValue = settings && settings.FeatureFlagSettings && settings.FeatureFlagSettings['open-amt'];
+        const openAMTFeatureEnabled = settings && settings.EnableEdgeComputeFeatures && settings.openAMTConfiguration && settings.openAMTConfiguration.enabled;
+        ctrl.isOpenAMTEnabled = openAMTFeatureFlagValue && openAMTFeatureEnabled;
+
+        const fdoFeatureFlagValue = settings && settings.FeatureFlagSettings && settings.FeatureFlagSettings['fdo'];
+        const fdoFeatureEnabled = settings && settings.EnableEdgeComputeFeatures && settings.fdoConfiguration && settings.fdoConfiguration.enabled;
+        ctrl.isFDOEnabled = fdoFeatureFlagValue && fdoFeatureEnabled;
+      } catch (err) {
+        Notifications.error('Failure', err, 'Unable to retrieve settings');
+      }
+    });
+  };
+
+  this.setLoadingMessage = function (message) {
+    return $async(async () => {
+      ctrl.loadingMessage = message;
+    });
+  };
 
   function initView() {
-      ctrl.getEnvironments();
-      ctrl.getSettings();
+    ctrl.getEnvironments();
+    ctrl.getSettings();
   }
 
   initView();
-}
\ No newline at end of file
+}
diff --git a/app/edge/views/edge-jobs/edgeJob/edgeJob.html b/app/edge/views/edge-jobs/edgeJob/edgeJob.html
index a98314bdd..e24f85fc2 100644
--- a/app/edge/views/edge-jobs/edgeJob/edgeJob.html
+++ b/app/edge/views/edge-jobs/edgeJob/edgeJob.html
@@ -32,7 +32,7 @@
             <uib-tab-heading> <i class="fa fa-tasks" aria-hidden="true"></i> Results </uib-tab-heading>
 
             <edge-job-results-datatable
-              style="display: block; margin-top: 10px;"
+              style="display: block; margin-top: 10px"
               ng-if="$ctrl.results"
               title-text="Results"
               title-icon="fa-tasks"
diff --git a/app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.html b/app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.html
index d7d9239ca..2f14d4b98 100644
--- a/app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.html
+++ b/app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.html
@@ -10,9 +10,7 @@
         <form class="form-horizontal" name="$ctrl.form">
           <!-- name-input -->
           <div class="form-group">
-            <label for="stack_name" class="col-sm-1 control-label text-left">
-              Name
-            </label>
+            <label for="stack_name" class="col-sm-1 control-label text-left"> Name </label>
             <div class="col-sm-11">
               <input
                 type="text"
@@ -29,9 +27,7 @@
           </div>
           <!-- !name-input -->
 
-          <div class="col-sm-12 form-section-title">
-            Edge Groups
-          </div>
+          <div class="col-sm-12 form-section-title"> Edge Groups </div>
           <div class="form-group" ng-if="$ctrl.edgeGroups">
             <div class="col-sm-12">
               <edge-groups-selector ng-if="!$ctrl.noGroups" model="$ctrl.formValues.Groups" on-change="($ctrl.onChangeGroups)" items="$ctrl.edgeGroups"></edge-groups-selector>
@@ -62,9 +58,7 @@
           <edge-stacks-kube-manifest-form ng-if="$ctrl.formValues.DeploymentType == 1" form-values="$ctrl.formValues" state="$ctrl.state"></edge-stacks-kube-manifest-form>
 
           <!-- actions -->
-          <div class="col-sm-12 form-section-title">
-            Actions
-          </div>
+          <div class="col-sm-12 form-section-title"> Actions </div>
           <div class="form-group">
             <div class="col-sm-12">
               <button
@@ -82,7 +76,7 @@
                 <span ng-hide="$ctrl.state.actionInProgress">Deploy the stack</span>
                 <span ng-show="$ctrl.state.actionInProgress">Deployment in progress...</span>
               </button>
-              <span class="text-danger" ng-if="$ctrl.state.formValidationError" style="margin-left: 5px;">
+              <span class="text-danger" ng-if="$ctrl.state.formValidationError" style="margin-left: 5px">
                 {{ $ctrl.state.formValidationError }}
               </span>
             </div>
diff --git a/app/edge/views/edge-stacks/createEdgeStackView/docker-compose-form/docker-compose-form.html b/app/edge/views/edge-stacks/createEdgeStackView/docker-compose-form/docker-compose-form.html
index 4a61d2889..5678639de 100644
--- a/app/edge/views/edge-stacks/createEdgeStackView/docker-compose-form/docker-compose-form.html
+++ b/app/edge/views/edge-stacks/createEdgeStackView/docker-compose-form/docker-compose-form.html
@@ -1,6 +1,4 @@
-<div class="col-sm-12 form-section-title">
-  Build method
-</div>
+<div class="col-sm-12 form-section-title"> Build method </div>
 <box-selector radio-name="'method'" value="$ctrl.state.Method" options="$ctrl.methodOptions" on-change="($ctrl.onChangeMethod)"></box-selector>
 
 <web-editor-form
@@ -14,17 +12,13 @@
 >
   <editor-description>
     You can get more information about Compose file format in the
-    <a href="https://docs.docker.com/compose/compose-file/" target="_blank">
-      official documentation
-    </a>
+    <a href="https://docs.docker.com/compose/compose-file/" target="_blank"> official documentation </a>
     .
   </editor-description>
 </web-editor-form>
 
 <file-upload-form ng-if="$ctrl.state.Method === 'upload'" file="$ctrl.formValues.StackFile" on-change="($ctrl.onChangeFile)" ng-required="true">
-  <file-upload-description>
-    You can upload a Compose file from your computer.
-  </file-upload-description>
+  <file-upload-description> You can upload a Compose file from your computer. </file-upload-description>
 </file-upload-form>
 
 <git-form ng-if="$ctrl.state.Method === 'repository'" model="$ctrl.formValues" on-change="($ctrl.onChangeFormValues)"></git-form>
@@ -32,9 +26,7 @@
 <!-- template -->
 <div ng-if="$ctrl.state.Method === 'template'">
   <div class="form-group">
-    <label for="stack_template" class="col-sm-1 control-label text-left">
-      Template
-    </label>
+    <label for="stack_template" class="col-sm-1 control-label text-left"> Template </label>
     <div class="col-sm-11">
       <select
         class="form-control"
@@ -48,9 +40,7 @@
   </div>
   <!-- description -->
   <div ng-if="$ctrl.selectedTemplate.note">
-    <div class="col-sm-12 form-section-title">
-      Information
-    </div>
+    <div class="col-sm-12 form-section-title"> Information </div>
     <div class="form-group">
       <div class="col-sm-12">
         <div class="template-note" ng-bind-html="$ctrl.selectedTemplate.note"></div>
diff --git a/app/edge/views/edge-stacks/createEdgeStackView/kube-deploy-description/kube-deploy-description.html b/app/edge/views/edge-stacks/createEdgeStackView/kube-deploy-description/kube-deploy-description.html
index c12d7ab22..b00fbae38 100644
--- a/app/edge/views/edge-stacks/createEdgeStackView/kube-deploy-description/kube-deploy-description.html
+++ b/app/edge/views/edge-stacks/createEdgeStackView/kube-deploy-description/kube-deploy-description.html
@@ -1,5 +1,5 @@
 <p>
-  <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+  <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
   This feature allows you to deploy any kind of Kubernetes resource in this environment (Deployment, Secret, ConfigMap...).
 </p>
 <p>
diff --git a/app/edge/views/edge-stacks/createEdgeStackView/kube-manifest-form/kube-manifest-form.html b/app/edge/views/edge-stacks/createEdgeStackView/kube-manifest-form/kube-manifest-form.html
index bb963c5ab..62e2c3a2a 100644
--- a/app/edge/views/edge-stacks/createEdgeStackView/kube-manifest-form/kube-manifest-form.html
+++ b/app/edge/views/edge-stacks/createEdgeStackView/kube-manifest-form/kube-manifest-form.html
@@ -1,6 +1,4 @@
-<div class="col-sm-12 form-section-title">
-  Build method
-</div>
+<div class="col-sm-12 form-section-title"> Build method </div>
 <box-selector radio-name="'method'" value="$ctrl.state.Method" options="$ctrl.methodOptions" on-change="($ctrl.onChangeMethod)"></box-selector>
 
 <web-editor-form
diff --git a/app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackView.html b/app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackView.html
index d5d5c04b5..361bee52a 100644
--- a/app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackView.html
+++ b/app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackView.html
@@ -15,7 +15,7 @@
           <uib-tab index="0" classes="btn-sm">
             <uib-tab-heading> <i class="fa fa-layer-group space-right" aria-hidden="true"></i> Stack</uib-tab-heading>
 
-            <div style="padding: 20px;">
+            <div style="padding: 20px">
               <edit-edge-stack-form
                 edge-groups="$ctrl.edgeGroups"
                 model="$ctrl.formValues"
@@ -28,7 +28,7 @@
           <uib-tab index="1" classes="btn-sm">
             <uib-tab-heading> <i class="fa fa-plug space-right" aria-hidden="true"></i> Environments</uib-tab-heading>
 
-            <div style="margin-top: 25px;">
+            <div style="margin-top: 25px">
               <edge-stack-endpoints-datatable
                 title-text="Environments Status"
                 dataset="$ctrl.endpoints"