From 1b1a50d6b574c3d71030ff89734d930a7bc9b6ea Mon Sep 17 00:00:00 2001
From: Chaim Lev-Ari <chiptus@users.noreply.github.com>
Date: Mon, 17 Jan 2022 07:53:32 +0200
Subject: [PATCH] fix(app): add github action for linting and formatting
 [EE-2344] (#6356)

---
 .eslintrc.yml                                 |   4 +
 .git-blame-ignore-revs                        |   4 +
 .github/workflows/lint.yml                    |  41 ++
 .github/workflows/test-client.yaml            |  11 +
 .prettierrc                                   |  11 +-
 .vscode.example/settings.json                 |   3 +-
 api/datastore/init.go                         |   4 +-
 api/docker/client.go                          |   2 +-
 api/exec/common.go                            |   2 +-
 .../handler/endpointproxy/proxy_docker.go     |   2 +-
 .../handler/registries/registry_configure.go  |   2 +-
 .../handler/registries/registry_update.go     |   6 +-
 api/http/handler/webhooks/webhook_create.go   |   2 +-
 api/http/handler/webhooks/webhook_execute.go  |   4 +-
 .../proxy/factory/kubernetes/deployments.go   |   2 +-
 api/http/proxy/factory/kubernetes/pods.go     |   2 +-
 .../factory/kubernetes/refresh_registry.go    |   2 +-
 api/internal/endpointutils/endpoint_test.go   |   2 +-
 api/kubernetes/cli/client.go                  |   2 +-
 api/kubernetes/cli/registries.go              |   4 +-
 .../file-uploader/fileUploader.html           |   2 +-
 .../files-datatable/filesDatatable.html       |   4 +-
 app/assets/ico/manifest.json                  |  34 +-
 .../azureEndpointConfig.html                  |   4 +-
 .../containerGroupsDatatable.html             |  10 +-
 .../containerInstanceDetails.html             |  22 +-
 .../create/createcontainerinstance.html       |  26 +-
 .../containerCapabilities.html                |   8 +-
 .../configs-datatable/configsDatatable.html   |  16 +-
 .../containerNetworksDatatable.html           |   6 +-
 .../containerProcessesDatatable.html          |   6 +-
 .../events-datatable/eventsDatatable.html     |   6 +-
 .../images-datatable/imagesDatatable.html     |  22 +-
 .../macvlanNodesDatatable.html                |   6 +-
 .../networkRowContent.html                    |   2 +-
 .../networks-datatable/networksDatatable.html |  18 +-
 .../nodeTasksDatatable.html                   |   6 +-
 .../nodes-datatable/nodesDatatable.html       |  16 +-
 .../secrets-datatable/secretsDatatable.html   |  16 +-
 .../serviceTasksDatatable.html                |   8 +-
 .../services-datatable/servicesDatatable.html |  18 +-
 .../tasks-datatable/tasksDatatable.html       |   6 +-
 .../volumes-datatable/volumesDatatable.html   |  22 +-
 .../devices-panel/devices-panel.html          |   4 +-
 .../disks-panel/disks-panel.html              |   4 +-
 .../host-details-panel.html                   |   4 +-
 .../node-labels-table/node-labels-table.html  |   8 +-
 .../swarm-node-details-panel.html             |   4 +-
 .../por-image-registry-rate-limits.html       |   8 +-
 .../imageRegistry/por-image-registry.html     |   8 +-
 .../components/log-viewer/logViewer.html      |  38 +-
 .../networkMacvlanForm.html                   |  12 +-
 .../volumesCIFSForm/volumesCifsForm.html      |   4 +-
 .../volumesNFSForm/volumesnfsForm.html        |   4 +-
 .../ContainersDatatable.tsx                   |   8 +-
 .../ContainersDatatableContainer.tsx          |   1 -
 .../views/configs/create/createconfig.html    |  14 +-
 .../containers/create/createcontainer.html    | 180 +++---
 .../containers/stats/containerstats.html      |  14 +-
 app/docker/views/dashboard/dashboard.html     |   8 +-
 .../docker-features-configuration.html        |  20 +-
 app/docker/views/images/build/buildimage.html |  58 +-
 app/docker/views/images/edit/image.html       |  22 +-
 app/docker/views/images/images.html           |   4 +-
 .../views/images/import/importimage.html      |  20 +-
 .../views/networks/create/createnetwork.html  |  56 +-
 .../views/secrets/create/createsecret.html    |  16 +-
 .../views/services/create/createservice.html  | 120 ++--
 .../services/create/includes/config.html      |  14 +-
 .../create/includes/resources-placement.html  |  64 +-
 .../services/create/includes/secret.html      |  14 +-
 .../create/includes/update-restart.html       |  38 +-
 .../views/services/edit/includes/configs.html |   4 +-
 .../edit/includes/container-specs.html        |  20 +-
 .../views/services/edit/includes/logging.html |   2 +-
 .../services/edit/includes/networks.html      |   2 +-
 .../services/edit/includes/resources.html     |  44 +-
 .../views/services/edit/includes/restart.html |  12 +-
 .../views/services/edit/includes/secrets.html |   4 +-
 .../services/edit/includes/servicelabels.html |   8 +-
 .../services/edit/includes/updateconfig.html  |  16 +-
 app/docker/views/services/edit/service.html   |   4 +-
 .../swarm/visualizer/swarmvisualizer.html     |  22 +-
 .../views/volumes/create/createvolume.html    |  42 +-
 .../associatedEndpointsDatatable.html         |   6 +-
 .../components/edge-job-form/edgeJobForm.html |  58 +-
 .../edge-job-form/edgeJobFormController.js    |   3 +-
 .../edgeJobResultsDatatable.html              |  26 +-
 .../edgeJobsDatatable.html                    |   6 +-
 .../edge-stack-deployment-type-selector.html  |   4 +-
 .../edgeStackEndpointsDatatable.html          |   6 +-
 .../edgeStacksDatatable.html                  |  28 +-
 .../editEdgeStackForm.html                    |  12 +-
 app/edge/components/group-form/groupForm.html |  32 +-
 .../groups-datatable/groupsDatatable.html     |   8 +-
 app/edge/views/edge-jobs/edgeJob/edgeJob.html |   2 +-
 .../create-edge-stack-view.html               |  14 +-
 .../docker-compose-form.html                  |  20 +-
 .../kube-deploy-description.html              |   2 +-
 .../kube-manifest-form.html                   |   4 +-
 .../editEdgeStackView/editEdgeStackView.html  |   4 +-
 app/index.html                                |   8 +-
 .../storidgeClusterEventsDatatable.html       |   6 +-
 .../storidgeDrivesDatatable.html              |  10 +-
 .../storidgeNodesDatatable.html               |  10 +-
 .../storidgeProfilesDatatable.html            |   6 +-
 .../storidgeSnapshotsDatatable.html           |   6 +-
 .../volumeStoridgeInfo.html                   |   8 +-
 .../storidge/views/cluster/cluster.html       |   4 +-
 .../storidge/views/monitor/monitor.html       |  18 +-
 .../views/profiles/create/createprofile.html  |  70 +--
 .../storidge/views/profiles/edit/profile.html |  70 +--
 .../containersDatatable.html                  |  20 +-
 .../applications-datatable-details.html       |   6 +-
 .../applications-datatable-url.html           |   4 +-
 .../applicationsDatatable.html                |  32 +-
 .../applicationsPortsDatatable.html           |  46 +-
 .../applicationsStacksDatatable.html          |  28 +-
 .../configurationsDatatable.html              |  20 +-
 .../events-datatable/eventsDatatable.html     |  16 +-
 .../integratedApplicationsDatatable.html      |  16 +-
 .../nodeApplicationsDatatable.html            |  20 +-
 .../nodes-datatable/nodesDatatable.html       |  24 +-
 .../resourcePoolApplicationsDatatable.html    |  18 +-
 .../resourcePoolsDatatable.html               |  28 +-
 .../volumes-datatable/volumesDatatable.html   |  30 +-
 .../helm-add-repository.html                  |   4 +-
 .../helm-templates-list-item.html             |   4 +-
 .../helm-templates-list.html                  |  14 +-
 .../helm/helm-templates/helm-templates.html   |  26 +-
 .../kube-services/kube-services.html          |  26 +-
 .../kubectl-shell/kubectl-shell.html          |   4 +-
 .../kubernetesConfigurationData.html          |  20 +-
 .../resourceReservation.html                  |  36 +-
 .../yaml-inspector/yamlInspector.html         |   7 +-
 .../kube-create-custom-template-view.html     |  14 +-
 .../kube-custom-templates-view.html           |   4 +-
 .../kube-edit-custom-template-view.html       |   6 +-
 .../kube-registry-access-view.html            |  12 +-
 .../views/applications/applications.html      |   4 +-
 .../views/applications/console/console.html   |  10 +-
 .../create/createApplication.html             | 248 ++++----
 .../views/applications/edit/application.html  | 104 ++--
 .../placements-datatable/template.html        |  32 +-
 .../views/applications/helm/helm.html         |   6 +-
 .../views/applications/logs/logs.html         |  18 +-
 .../views/applications/stats/stats.html       |  12 +-
 app/kubernetes/views/cluster/cluster.html     |  16 +-
 app/kubernetes/views/cluster/node/node.html   |  66 +--
 .../views/cluster/node/stats/stats.html       |  12 +-
 .../views/configurations/configurations.html  |   4 +-
 .../create/createConfiguration.html           |  30 +-
 .../configurations/edit/configuration.html    |  28 +-
 app/kubernetes/views/configure/configure.html |  98 ++--
 app/kubernetes/views/dashboard/dashboard.html |   4 +-
 app/kubernetes/views/deploy/deploy.html       |  34 +-
 .../access/resourcePoolAccess.html            |   4 +-
 .../create/createResourcePool.html            | 106 ++--
 .../ingresses-datatable/template.html         |  24 +-
 .../resource-pools/edit/resourcePool.html     | 110 ++--
 .../views/resource-pools/resourcePools.html   |   4 +-
 app/kubernetes/views/stacks/logs/logs.html    |  18 +-
 app/kubernetes/views/summary/summary.html     |   6 +-
 .../volumes-storages-datatable/template.html  |  22 +-
 app/kubernetes/views/volumes/edit/volume.html |  14 +-
 app/kubernetes/views/volumes/volumes.html     |   4 +-
 app/portainer/components/BoxSelector/index.ts |  12 +-
 .../components/Code/Code.stories.tsx          |   5 +-
 .../components/ReactExample.test.tsx          |  11 -
 .../access-datatable/accessDatatable.html     |  10 +-
 .../components/access-table/accessTable.html  |   8 +-
 .../porAccessControlPanel.html                |  46 +-
 .../por-access-management-users-selector.html |   8 +-
 .../accessManagement/porAccessManagement.html |   6 +-
 .../associatedEndpointsSelector.html          |   6 +-
 .../components/beta-panel/betaPanel.html      |   2 +-
 .../customTemplateCommonFields.html           |   4 +-
 .../custom-template-selector.html             |   8 +-
 .../customTemplatesList.html                  |  14 +-
 .../access-tokens-datatable.html              |   8 +-
 .../components/QuickActionsSettings.tsx       |   5 +-
 .../datatables/components/SearchBar.tsx       |   4 +-
 .../components/useTableSettings.tsx           |  51 +-
 .../datatable-columns-visibility.html         |   4 +-
 .../endpointsDatatable.html                   |   8 +-
 .../datatables/filter/datatable-filter.html   |   6 +-
 .../groups-datatable/groupsDatatable.html     |   6 +-
 .../datatables/pagination/pagination.html     |   2 +-
 .../registriesDatatable.html                  |  22 +-
 .../stacks-datatable/stacksDatatable.html     |  26 +-
 .../tags-datatable/tagsDatatable.html         |   6 +-
 .../teams-datatable/teamsDatatable.html       |   6 +-
 .../titlebar/datatable-titlebar.html          |   4 +-
 .../users-datatable/usersDatatable.html       |  12 +-
 .../endpoint-item/endpointItem.html           |  26 +-
 .../endpoint-list/endpointList.html           |  18 +-
 .../endpointSecurity/porEndpointSecurity.html |  26 +-
 .../environment-variables-panel.html          |   6 +-
 ...nvironment-variables-simple-mode-item.html |   2 +-
 .../FileUpload/FileUploadField.stories.tsx    |   4 +-
 .../FileUpload/FileUploadForm.stories.tsx     |   4 +-
 .../form-components/InputGroup/index.ts       |   3 +-
 .../form-components/InputList/InputList.tsx   |   4 +-
 .../form-components/InputList/utils.test.ts   |  13 +-
 .../form-components/InputList/utils.ts        |  14 +-
 .../web-editor-form/web-editor-form.html      |   4 +-
 .../git-form-additional-file-item.html        |   2 +-
 .../git-form-additional-files-panel.html      |   6 +-
 .../git-form-auth-fieldset.html               |   6 +-
 .../git-form-auto-update-fieldset.html        |  20 +-
 .../git-form-url-field.html                   |   4 +-
 .../components/forms/git-form/git-form.html   |   4 +-
 .../forms/group-form/groupForm.html           |  24 +-
 .../kubernetes-app-git-form.html              |  16 +-
 .../kubernetes-redeploy-app-git-form.html     |  16 +-
 .../registry-form-ecr.html                    |  14 +-
 .../registry-form-azure.html                  |   8 +-
 .../registry-form-custom.html                 |  14 +-
 .../registry-form-dockerhub.html              |   8 +-
 .../gitlabProjectsDatatable.html              |   6 +-
 .../registry-form-gitlab.html                 |  18 +-
 .../registry-form-proget.html                 |  12 +-
 .../registry-form-quay.html                   |  14 +-
 .../stackFromTemplateForm.html                |  16 +-
 .../stack-redeploy-git-form.html              |   8 +-
 .../groupAssociationTable.html                |  16 +-
 .../informationPanelOffline.html              |   4 +-
 .../information-panel/informationPanel.html   |   4 +-
 .../components/motd-panel/motdPanel.html      |   4 +-
 .../components/product-list/productList.html  |   2 +-
 .../stack-duplication-form.html               |  14 +-
 .../components/tag-selector/tagSelector.html  |  26 +-
 .../template-list/templateList.html           |  20 +-
 .../components/theme/theme-settings.html      |   2 +-
 .../oauth-providers-selector.html             |   4 +-
 .../access-viewer-datatable.html              |   8 +-
 .../access-viewer/access-viewer.html          |  16 +-
 .../roles-datatable/roles-datatable.html      |   6 +-
 .../auto-user-provision-toggle.html           |  10 +-
 .../internal-auth/internal-auth.html          |   8 +-
 .../ldap/ad-settings/ad-settings.html         |  22 +-
 .../ldap-custom-admin-group.html              |  12 +-
 .../ldap-custom-group-search.html             |  18 +-
 .../ldap-custom-user-search.html              |  18 +-
 .../ldap-group-search-item.html               |  18 +-
 .../ldap-group-search/ldap-group-search.html  |  12 +-
 .../ldap-groups-datatable.html                |  12 +-
 .../ldap-settings-custom.html                 |   8 +-
 .../ldap-settings-dn-builder.html             |   4 +-
 .../ldap-settings-group-dn-builder.html       |   6 +-
 .../ldap-settings-openldap.html               |  26 +-
 .../ldap-settings-security.html               |   8 +-
 .../ldap-settings-test-login.html             |  10 +-
 .../ldap/ldap-settings/ldap-settings.html     |   6 +-
 .../ldap-user-search-item.html                |  24 +-
 .../ldap-user-search/ldap-user-search.html    |  12 +-
 .../ldap-users-datatable.html                 |   6 +-
 .../save-auth-settings-button.html            |   4 +-
 .../settings/general/open-amt/open-amt.html   |  30 +-
 .../ssl-certificate/ssl-certificate.html      |  28 +-
 .../CreateTeamForm/CreateTeamForm.stories.tsx |   4 +-
 .../CreateTeamForm.validation.ts              |   6 +-
 app/portainer/teams/CreateTeamForm/index.ts   |   7 +-
 .../activity-logs-datatable.html              |  12 +-
 .../auth-logs-datatable.html                  |   8 +-
 .../views/account/CreateAccessToken/index.ts  |   7 +-
 app/portainer/views/account/account.html      |   6 +-
 app/portainer/views/auth/auth.html            |  24 +-
 app/portainer/views/auth/authController.js    |   2 +-
 .../createCustomTemplateView.html             |  40 +-
 .../customTemplatesView.html                  |   8 +-
 .../editCustomTemplateView.html               |  14 +-
 .../create/createEndpointController.js        | 533 ++++++++---------
 .../endpoints/create/createendpoint.html      | 102 ++--
 .../views/endpoints/edit/endpoint.html        |  52 +-
 app/portainer/views/home/home.html            |   8 +-
 app/portainer/views/home/homeController.js    | 174 +++---
 app/portainer/views/init/admin/initAdmin.html |  60 +-
 .../views/init/endpoint/includes/agent.html   |  12 +-
 .../init/endpoint/includes/localDocker.html   |  14 +-
 .../endpoint/includes/localKubernetes.html    |   8 +-
 .../views/init/endpoint/initEndpoint.html     |   8 +-
 app/portainer/views/logout/logout.html        |   4 +-
 .../registries/create/createRegistry.html     |  20 +-
 .../views/registries/edit/registry.html       |   8 +-
 .../views/registries/registries.html          |   4 +-
 .../settingsAuthentication.html               |  12 +-
 app/portainer/views/settings/settings.html    |  72 +--
 app/portainer/views/sidebar/sidebar.html      |   4 +-
 .../stacks/create/createStackController.js    | 545 +++++++++---------
 .../views/stacks/create/createstack.html      |  34 +-
 app/portainer/views/tags/tags.html            |   4 +-
 app/portainer/views/teams/edit/team.html      |  14 +-
 app/portainer/views/templates/templates.html  |  56 +-
 app/portainer/views/users/edit/user.html      |   6 +-
 app/portainer/views/users/users.html          |  12 +-
 .../wizard-endpoint-aci/wizard-aci.html       |   8 +-
 .../wizard-endpoint-docker/wizard-docker.html |  50 +-
 .../wizard-kubernetes.html                    |  20 +-
 .../wizard-endpoint-list.html                 |   2 +-
 .../wizard-endpoints/wizard-endpoints.html    |   4 +-
 .../wizard-endpoint-type.html                 |   4 +-
 .../views/wizard/wizard-link/wizard-link.html |   4 +-
 app/portainer/views/wizard/wizard-view.html   |   8 +-
 app/react-table-config.d.ts                   |  26 +-
 jsconfig.json                                 |   2 +-
 lint-staged.config.js                         |   2 +-
 package.json                                  |   4 +-
 test/e2e/cypress/support/commands.js          |   6 +-
 tool-versions.json                            |   8 +-
 translations/en/translation.json              |   2 +-
 tsconfig.json                                 |   2 +-
 webpack/webpack.common.js                     |   1 -
 313 files changed, 2633 insertions(+), 3821 deletions(-)
 create mode 100644 .git-blame-ignore-revs
 create mode 100644 .github/workflows/lint.yml
 create mode 100644 .github/workflows/test-client.yaml
 delete mode 100644 app/portainer/components/ReactExample.test.tsx

diff --git a/.eslintrc.yml b/.eslintrc.yml
index cc4e73a73..7a34eedcb 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -99,3 +99,7 @@ overrides:
       'jest/globals': true
     rules:
       'react/jsx-no-constructed-context-values': off
+  - files:
+      - app/**/*.stories.*
+    rules:
+      'no-alert': off
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 000000000..7d15d6796
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,4 @@
+# prettier
+cf5056d9c03b62d91a25c3b9127caac838695f98
+
+# prettier v2 (put here after fix/EE-2344/fix-eslint-issues is merged)
\ No newline at end of file
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 000000000..926c760aa
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,41 @@
+name: Lint
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+      - release/*
+  pull_request:
+    branches:
+      - master
+      - develop
+      - release/*
+
+jobs:
+  run-linters:
+    name: Run linters
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12
+
+      # ESLint and Prettier must be in `package.json`
+      - name: Install Node.js dependencies
+        run: yarn
+
+      - name: Run linters
+        uses: wearerequired/lint-action@v1
+        with:
+          eslint: true
+          eslint_extensions: ts,tsx,js,jsx
+          prettier: true
+          prettier_dir: app/
+          gofmt: true
+          gofmt_dir: api/
diff --git a/.github/workflows/test-client.yaml b/.github/workflows/test-client.yaml
new file mode 100644
index 000000000..256849b43
--- /dev/null
+++ b/.github/workflows/test-client.yaml
@@ -0,0 +1,11 @@
+name: Test Frontend
+on: push
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install modules
+        run: yarn
+      - name: Run tests
+        run: yarn test:client
diff --git a/.prettierrc b/.prettierrc
index 184ed56cb..a9d2ada8a 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -4,21 +4,16 @@
   "htmlWhitespaceSensitivity": "strict",
   "overrides": [
     {
-      "files": [
-        "*.html"
-      ],
+      "files": ["*.html"],
       "options": {
         "parser": "angular"
       }
     },
     {
-      "files": [
-        "*.{j,t}sx",
-        "*.ts"
-      ],
+      "files": ["*.{j,t}sx", "*.ts"],
       "options": {
         "printWidth": 80
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/.vscode.example/settings.json b/.vscode.example/settings.json
index 64be114a1..02a896c80 100644
--- a/.vscode.example/settings.json
+++ b/.vscode.example/settings.json
@@ -1,4 +1,5 @@
 {
   "go.lintTool": "golangci-lint",
-  "go.lintFlags": ["--fast", "-E", "exportloopref"]
+  "go.lintFlags": ["--fast", "-E", "exportloopref"],
+  "gitlens.advanced.blame.customArguments": ["–ignore-revs-file", ".git-blame-ignore-revs"]
 }
diff --git a/api/datastore/init.go b/api/datastore/init.go
index a92abe3da..d46d76297 100644
--- a/api/datastore/init.go
+++ b/api/datastore/init.go
@@ -34,10 +34,10 @@ func (store *Store) Init() error {
 				AutoCreateUsers: true,
 				TLSConfig:       portainer.TLSConfiguration{},
 				SearchSettings: []portainer.LDAPSearchSettings{
-					portainer.LDAPSearchSettings{},
+					{},
 				},
 				GroupSearchSettings: []portainer.LDAPGroupSearchSettings{
-					portainer.LDAPGroupSearchSettings{},
+					{},
 				},
 			},
 			OAuthSettings: portainer.OAuthSettings{},
diff --git a/api/docker/client.go b/api/docker/client.go
index b80c772da..eac3b238c 100644
--- a/api/docker/client.go
+++ b/api/docker/client.go
@@ -95,7 +95,7 @@ func createEdgeClient(endpoint *portainer.Endpoint, signatureService portainer.D
 	if err != nil {
 		return nil, err
 	}
-	
+
 	endpointURL := fmt.Sprintf("http://127.0.0.1:%d", tunnel.Port)
 
 	return client.NewClientWithOpts(
diff --git a/api/exec/common.go b/api/exec/common.go
index abae6dac7..97a10f432 100644
--- a/api/exec/common.go
+++ b/api/exec/common.go
@@ -33,7 +33,7 @@ func (s StringSet) List() []string {
 	list := make([]string, s.Len())
 
 	i := 0
-	for k, _ := range s {
+	for k := range s {
 		list[i] = k
 		i++
 	}
diff --git a/api/http/handler/endpointproxy/proxy_docker.go b/api/http/handler/endpointproxy/proxy_docker.go
index d84588b65..96a539ddb 100644
--- a/api/http/handler/endpointproxy/proxy_docker.go
+++ b/api/http/handler/endpointproxy/proxy_docker.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	httperror "github.com/portainer/libhttp/error"
 	"github.com/portainer/libhttp/request"
+	portainer "github.com/portainer/portainer/api"
 	"strconv"
 	"strings"
-	portainer "github.com/portainer/portainer/api"
 
 	"net/http"
 )
diff --git a/api/http/handler/registries/registry_configure.go b/api/http/handler/registries/registry_configure.go
index 146d425b0..0c56e267d 100644
--- a/api/http/handler/registries/registry_configure.go
+++ b/api/http/handler/registries/registry_configure.go
@@ -21,7 +21,7 @@ type registryConfigurePayload struct {
 	// Password used to authenticate against this registry. required when Authentication is true
 	Password string `example:"registry_password"`
 	// ECR region
-	Region  string
+	Region string
 	// Use TLS
 	TLS bool `example:"true"`
 	// Skip the verification of the server TLS certificate
diff --git a/api/http/handler/registries/registry_update.go b/api/http/handler/registries/registry_update.go
index 57075880c..cf0a6a51a 100644
--- a/api/http/handler/registries/registry_update.go
+++ b/api/http/handler/registries/registry_update.go
@@ -25,13 +25,13 @@ type registryUpdatePayload struct {
 	// Username used to authenticate against this registry. Required when Authentication is true
 	Username *string `example:"registry_user"`
 	// Password used to authenticate against this registry. required when Authentication is true
-	Password         *string `example:"registry_password"`
+	Password *string `example:"registry_password"`
 	// Quay data
-	Quay             *portainer.QuayRegistryData
+	Quay *portainer.QuayRegistryData
 	// Registry access control
 	RegistryAccesses *portainer.RegistryAccesses `json:",omitempty"`
 	// ECR data
-	Ecr              *portainer.EcrData          `json:",omitempty"`
+	Ecr *portainer.EcrData `json:",omitempty"`
 }
 
 func (payload *registryUpdatePayload) Validate(r *http.Request) error {
diff --git a/api/http/handler/webhooks/webhook_create.go b/api/http/handler/webhooks/webhook_create.go
index 077f159d7..78326b720 100644
--- a/api/http/handler/webhooks/webhook_create.go
+++ b/api/http/handler/webhooks/webhook_create.go
@@ -17,7 +17,7 @@ import (
 type webhookCreatePayload struct {
 	ResourceID  string
 	EndpointID  int
-	RegistryID portainer.RegistryID
+	RegistryID  portainer.RegistryID
 	WebhookType int
 }
 
diff --git a/api/http/handler/webhooks/webhook_execute.go b/api/http/handler/webhooks/webhook_execute.go
index e7e9c1394..e312c3b64 100644
--- a/api/http/handler/webhooks/webhook_execute.go
+++ b/api/http/handler/webhooks/webhook_execute.go
@@ -80,13 +80,13 @@ func (handler *Handler) executeServiceWebhook(
 	}
 
 	service.Spec.TaskTemplate.ForceUpdate++
-	
+
 	var imageName = strings.Split(service.Spec.TaskTemplate.ContainerSpec.Image, "@sha")[0]
 
 	if imageTag != "" {
 		var tagIndex = strings.LastIndex(imageName, ":")
 		if tagIndex == -1 {
-	  		tagIndex = len(imageName)
+			tagIndex = len(imageName)
 		}
 		service.Spec.TaskTemplate.ContainerSpec.Image = imageName[:tagIndex] + ":" + imageTag
 	} else {
diff --git a/api/http/proxy/factory/kubernetes/deployments.go b/api/http/proxy/factory/kubernetes/deployments.go
index ee8e85e0b..2cd7257d1 100644
--- a/api/http/proxy/factory/kubernetes/deployments.go
+++ b/api/http/proxy/factory/kubernetes/deployments.go
@@ -12,4 +12,4 @@ func (transport *baseTransport) proxyDeploymentsRequest(request *http.Request, n
 	default:
 		return transport.executeKubernetesRequest(request)
 	}
-}
\ No newline at end of file
+}
diff --git a/api/http/proxy/factory/kubernetes/pods.go b/api/http/proxy/factory/kubernetes/pods.go
index 743c716b7..9a88508a3 100644
--- a/api/http/proxy/factory/kubernetes/pods.go
+++ b/api/http/proxy/factory/kubernetes/pods.go
@@ -12,4 +12,4 @@ func (transport *baseTransport) proxyPodsRequest(request *http.Request, namespac
 	default:
 		return transport.executeKubernetesRequest(request)
 	}
-}
\ No newline at end of file
+}
diff --git a/api/http/proxy/factory/kubernetes/refresh_registry.go b/api/http/proxy/factory/kubernetes/refresh_registry.go
index 7e9025bfb..e58f672ae 100644
--- a/api/http/proxy/factory/kubernetes/refresh_registry.go
+++ b/api/http/proxy/factory/kubernetes/refresh_registry.go
@@ -14,4 +14,4 @@ func (transport *baseTransport) refreshRegistry(request *http.Request, namespace
 	err = registryutils.RefreshEcrSecret(cli, transport.endpoint, transport.dataStore, namespace)
 
 	return
-}
\ No newline at end of file
+}
diff --git a/api/internal/endpointutils/endpoint_test.go b/api/internal/endpointutils/endpoint_test.go
index 8d65552a2..ad6b3c76f 100644
--- a/api/internal/endpointutils/endpoint_test.go
+++ b/api/internal/endpointutils/endpoint_test.go
@@ -101,4 +101,4 @@ func Test_FilterByExcludeIDs(t *testing.T) {
 			tt.asserts(t, output)
 		})
 	}
-}
\ No newline at end of file
+}
diff --git a/api/kubernetes/cli/client.go b/api/kubernetes/cli/client.go
index 88f73e32b..bc3e43c46 100644
--- a/api/kubernetes/cli/client.go
+++ b/api/kubernetes/cli/client.go
@@ -50,7 +50,7 @@ func (factory *ClientFactory) GetInstanceID() (instanceID string) {
 }
 
 // Remove the cached kube client so a new one can be created
- func (factory *ClientFactory) RemoveKubeClient(endpointID portainer.EndpointID) {
+func (factory *ClientFactory) RemoveKubeClient(endpointID portainer.EndpointID) {
 	factory.endpointClients.Remove(strconv.Itoa(int(endpointID)))
 }
 
diff --git a/api/kubernetes/cli/registries.go b/api/kubernetes/cli/registries.go
index b8c7e5278..ed6fb736c 100644
--- a/api/kubernetes/cli/registries.go
+++ b/api/kubernetes/cli/registries.go
@@ -16,8 +16,8 @@ import (
 
 const (
 	secretDockerConfigKey = ".dockerconfigjson"
-	labelRegistryType = "io.portainer.kubernetes.registry.type"
-	annotationRegistryID = "portainer.io/registry.id"
+	labelRegistryType     = "io.portainer.kubernetes.registry.type"
+	annotationRegistryID  = "portainer.io/registry.id"
 )
 
 type (
diff --git a/app/agent/components/file-uploader/fileUploader.html b/app/agent/components/file-uploader/fileUploader.html
index 27b741b0a..aced458fa 100644
--- a/app/agent/components/file-uploader/fileUploader.html
+++ b/app/agent/components/file-uploader/fileUploader.html
@@ -1,3 +1,3 @@
 <button type="button" ngf-select="$ctrl.onFileSelected($file)" class="btn ng-scope" button-spinner="$ctrl.state.uploadInProgress">
-  <i style="margin: 0;" class="fa fa-upload" ng-if="!$ctrl.state.uploadInProgress"></i>
+  <i style="margin: 0" class="fa fa-upload" ng-if="!$ctrl.state.uploadInProgress"></i>
 </button>
diff --git a/app/agent/components/files-datatable/filesDatatable.html b/app/agent/components/files-datatable/filesDatatable.html
index c29562d61..d4e719d47 100644
--- a/app/agent/components/files-datatable/filesDatatable.html
+++ b/app/agent/components/files-datatable/filesDatatable.html
@@ -41,9 +41,7 @@
                   <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'ModTime' && $ctrl.state.reverseOrder"></i>
                 </a>
               </th>
-              <th>
-                Actions
-              </th>
+              <th> Actions </th>
             </tr>
           </thead>
           <tbody>
diff --git a/app/assets/ico/manifest.json b/app/assets/ico/manifest.json
index 843e03e83..f70fd66f2 100644
--- a/app/assets/ico/manifest.json
+++ b/app/assets/ico/manifest.json
@@ -1,18 +1,18 @@
 {
-    "name": "Portainer",
-    "icons": [
-        {
-            "src": "ico/android-chrome-192x192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "ico/android-chrome-256x256.png",
-            "sizes": "256x256",
-            "type": "image/png"
-        }
-    ],
-    "theme_color": "#ffffff",
-    "background_color": "#ffffff",
-    "display": "standalone"
-}
\ No newline at end of file
+  "name": "Portainer",
+  "icons": [
+    {
+      "src": "ico/android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "ico/android-chrome-256x256.png",
+      "sizes": "256x256",
+      "type": "image/png"
+    }
+  ],
+  "theme_color": "#ffffff",
+  "background_color": "#ffffff",
+  "display": "standalone"
+}
diff --git a/app/azure/components/azure-endpoint-config/azureEndpointConfig.html b/app/azure/components/azure-endpoint-config/azureEndpointConfig.html
index efc8bd79f..b6ee79f3d 100644
--- a/app/azure/components/azure-endpoint-config/azureEndpointConfig.html
+++ b/app/azure/components/azure-endpoint-config/azureEndpointConfig.html
@@ -1,7 +1,5 @@
 <div>
-  <div class="col-sm-12 form-section-title">
-    Azure configuration
-  </div>
+  <div class="col-sm-12 form-section-title"> Azure configuration </div>
   <!-- applicationId-input -->
   <div class="form-group">
     <label for="azure_credential_appid" class="col-sm-3 col-lg-2 control-label text-left">Application ID</label>
diff --git a/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.html b/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.html
index bea19d1fc..abcc2e92a 100644
--- a/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.html
+++ b/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.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)">
@@ -46,9 +46,7 @@
                   <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Location' && $ctrl.state.reverseOrder"></i>
                 </a>
               </th>
-              <th>
-                Published Ports
-              </th>
+              <th> Published Ports </th>
               <th>
                 <a ng-click="$ctrl.changeOrderBy('ResourceControl.Ownership')">
                   Ownership
@@ -98,9 +96,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/azure/views/containerinstances/container-instance-details/containerInstanceDetails.html b/app/azure/views/containerinstances/container-instance-details/containerInstanceDetails.html
index 37465bcae..4abbe7098 100644
--- a/app/azure/views/containerinstances/container-instance-details/containerInstanceDetails.html
+++ b/app/azure/views/containerinstances/container-instance-details/containerInstanceDetails.html
@@ -8,9 +8,7 @@
     <rd-widget>
       <rd-widget-body>
         <div class="form-horizontal" autocomplete="off">
-          <div class="col-sm-12 form-section-title">
-            Azure settings
-          </div>
+          <div class="col-sm-12 form-section-title"> Azure settings </div>
           <!-- subscription-input -->
           <div class="form-group">
             <label for="azure_subscription" class="col-sm-2 control-label text-left">Subscription</label>
@@ -35,9 +33,7 @@
             </div>
           </div>
           <!-- !location-input -->
-          <div class="col-sm-12 form-section-title">
-            Container configuration
-          </div>
+          <div class="col-sm-12 form-section-title"> Container configuration </div>
           <!-- name-input -->
           <div class="form-group">
             <label for="container_name" class="col-sm-2 control-label text-left">Name</label>
@@ -68,15 +64,15 @@
               <label class="control-label text-left">Port mapping</label>
             </div>
             <!-- port-mapping-input-list -->
-            <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-              <div ng-repeat="binding in $ctrl.container.Ports" style="margin-top: 2px;">
+            <div class="col-sm-12 form-inline" style="margin-top: 10px">
+              <div ng-repeat="binding in $ctrl.container.Ports" style="margin-top: 2px">
                 <!-- host-port -->
                 <div class="input-group col-sm-4 input-group-sm">
                   <span class="input-group-addon">host</span>
                   <input type="text" class="form-control" ng-model="binding.host" placeholder="e.g. 80" disabled />
                 </div>
                 <!-- !host-port -->
-                <span style="margin: 0 10px 0 10px;">
+                <span style="margin: 0 10px 0 10px">
                   <i class="fa fa-long-arrow-alt-right" aria-hidden="true"></i>
                 </span>
                 <!-- container-port -->
@@ -100,17 +96,13 @@
           <!-- !port-mapping -->
           <!-- public-ip -->
           <div class="form-group" ng-if="$ctrl.container.AllocatePublicIP">
-            <label for="public_ip" class="col-sm-2 control-label text-left">
-              Public IP
-            </label>
+            <label for="public_ip" class="col-sm-2 control-label text-left"> Public IP </label>
             <div class="col-sm-10">
               <input type="text" class="form-control" ng-model="$ctrl.container.IPAddress" disabled />
             </div>
           </div>
           <!-- public-ip -->
-          <div class="col-sm-12 form-section-title">
-            Container resources
-          </div>
+          <div class="col-sm-12 form-section-title"> Container resources </div>
           <!-- cpu-input -->
           <div class="form-group">
             <label for="container_cpu" class="col-sm-2 control-label text-left">CPU</label>
diff --git a/app/azure/views/containerinstances/create/createcontainerinstance.html b/app/azure/views/containerinstances/create/createcontainerinstance.html
index 1e1d76424..d0694a16c 100644
--- a/app/azure/views/containerinstances/create/createcontainerinstance.html
+++ b/app/azure/views/containerinstances/create/createcontainerinstance.html
@@ -8,9 +8,7 @@
     <rd-widget>
       <rd-widget-body>
         <form class="form-horizontal" autocomplete="off" name="aciForm">
-          <div class="col-sm-12 form-section-title">
-            Azure settings
-          </div>
+          <div class="col-sm-12 form-section-title"> Azure settings </div>
           <!-- subscription-input -->
           <div class="form-group">
             <label for="azure_subscription" class="col-sm-1 control-label text-left">Subscription</label>
@@ -46,9 +44,7 @@
             </div>
           </div>
           <!-- !location-input -->
-          <div class="col-sm-12 form-section-title">
-            Container configuration
-          </div>
+          <div class="col-sm-12 form-section-title"> Container configuration </div>
           <!-- name-input -->
           <div class="form-group">
             <label for="container_name" class="col-sm-1 control-label text-left">Name</label>
@@ -94,20 +90,20 @@
           <div class="form-group">
             <div class="col-sm-12">
               <label class="control-label text-left">Port mapping</label>
-              <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addPortBinding()">
+              <span class="label label-default interactive" style="margin-left: 10px" ng-click="addPortBinding()">
                 <i class="fa fa-plus-circle" aria-hidden="true"></i> map additional port
               </span>
             </div>
             <!-- port-mapping-input-list -->
-            <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-              <div ng-repeat="binding in model.Ports" style="margin-top: 2px;">
+            <div class="col-sm-12 form-inline" style="margin-top: 10px">
+              <div ng-repeat="binding in model.Ports" style="margin-top: 2px">
                 <!-- host-port -->
                 <div class="input-group col-sm-4 input-group-sm">
                   <span class="input-group-addon">host</span>
                   <input type="text" class="form-control" ng-model="binding.host" placeholder="e.g. 80" />
                 </div>
                 <!-- !host-port -->
-                <span style="margin: 0 10px 0 10px;">
+                <span style="margin: 0 10px 0 10px">
                   <i class="fa fa-long-arrow-alt-right" aria-hidden="true"></i>
                 </span>
                 <!-- container-port -->
@@ -138,9 +134,7 @@
           </div>
           <!-- public-ip -->
 
-          <div class="col-sm-12 form-section-title">
-            Container resources
-          </div>
+          <div class="col-sm-12 form-section-title"> Container resources </div>
           <!-- cpu-input -->
           <div class="form-group">
             <label for="container_cpu" class="col-sm-1 control-label text-left">CPU</label>
@@ -161,16 +155,14 @@
           <por-access-control-form form-data="model.AccessControlData"></por-access-control-form>
           <!-- !access-control -->
           <!-- 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 type="button" class="btn btn-primary btn-sm" ng-disabled="state.actionInProgress" ng-click="create()" button-spinner="state.actionInProgress">
                 <span ng-hide="state.actionInProgress">Deploy the container</span>
                 <span ng-show="state.actionInProgress">Deployment in progress...</span>
               </button>
-              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px;">{{ state.formValidationError }}</span>
+              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px">{{ state.formValidationError }}</span>
             </div>
           </div>
           <!-- !actions -->
diff --git a/app/docker/components/container-capabilities/containerCapabilities.html b/app/docker/components/container-capabilities/containerCapabilities.html
index 22d6b9aed..89163c10a 100644
--- a/app/docker/components/container-capabilities/containerCapabilities.html
+++ b/app/docker/components/container-capabilities/containerCapabilities.html
@@ -1,12 +1,10 @@
-<form class="form-horizontal" style="margin-top: 15px;">
-  <div class="col-sm-12 form-section-title">
-    Container capabilities
-  </div>
+<form class="form-horizontal" style="margin-top: 15px">
+  <div class="col-sm-12 form-section-title"> Container capabilities </div>
   <div class="form-group">
     <div ng-repeat="cap in $ctrl.capabilities" class="col-xs-12 col-sm-6 col-md-4">
       <div class="row">
         <div class="col-xs-8">
-          <label for="capability" class="control-label text-left" style="display: flex; padding: 0;">
+          <label for="capability" class="control-label text-left" style="display: flex; padding: 0">
             {{ cap.capability }}
             <portainer-tooltip position="bottom" message="{{ cap.description }}"></portainer-tooltip>
           </label>
diff --git a/app/docker/components/datatables/configs-datatable/configsDatatable.html b/app/docker/components/datatables/configs-datatable/configsDatatable.html
index 4e252481a..8a319ecd4 100644
--- a/app/docker/components/datatables/configs-datatable/configsDatatable.html
+++ b/app/docker/components/datatables/configs-datatable/configsDatatable.html
@@ -2,15 +2,13 @@
   <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 class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
             <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">
@@ -18,9 +16,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>
@@ -29,7 +25,7 @@
                         <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>
@@ -133,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/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html b/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html
index b334fb97d..d60bf5467 100644
--- a/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html
+++ b/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.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">
         <form class="form-horizontal">
@@ -99,9 +99,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/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.html b/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.html
index 737148685..d6c422f5b 100644
--- a/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.html
+++ b/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.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>
@@ -34,9 +34,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/docker/components/datatables/events-datatable/eventsDatatable.html b/app/docker/components/datatables/events-datatable/eventsDatatable.html
index 00d17230b..bf298e7ad 100644
--- a/app/docker/components/datatables/events-datatable/eventsDatatable.html
+++ b/app/docker/components/datatables/events-datatable/eventsDatatable.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>
@@ -65,9 +65,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/docker/components/datatables/images-datatable/imagesDatatable.html b/app/docker/components/datatables/images-datatable/imagesDatatable.html
index 8d70bdc4e..c89004521 100644
--- a/app/docker/components/datatables/images-datatable/imagesDatatable.html
+++ b/app/docker/components/datatables/images-datatable/imagesDatatable.html
@@ -2,15 +2,13 @@
   <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 class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
             <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">
@@ -18,9 +16,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>
@@ -29,7 +25,7 @@
                         <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>
@@ -115,9 +111,7 @@
                 </div>
                 <div class="dropdown-menu" uib-dropdown-menu>
                   <div class="tableMenu">
-                    <div class="menuHeader">
-                      Filter by usage
-                    </div>
+                    <div class="menuHeader"> Filter by usage </div>
                     <div class="menuContent">
                       <div class="md-checkbox">
                         <input id="filter_usage_usedImages" type="checkbox" ng-model="$ctrl.filters.state.showUsedImages" ng-change="$ctrl.onstateFilterChange()" />
@@ -178,7 +172,7 @@
                   item.Id | truncate: 40
                 }}</a>
                 <span ng-if="$ctrl.offlineMode">{{ item.Id | truncate: 40 }}</span>
-                <span style="margin-left: 10px;" class="label label-warning image-tag" ng-if="::item.ContainerCount === 0">Unused</span>
+                <span style="margin-left: 10px" class="label label-warning image-tag" ng-if="::item.ContainerCount === 0">Unused</span>
               </td>
               <td>
                 <span class="label label-primary image-tag" ng-repeat="tag in (item | repotags) track by $index">{{ tag }}</span>
@@ -201,9 +195,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/docker/components/datatables/macvlan-nodes-datatable/macvlanNodesDatatable.html b/app/docker/components/datatables/macvlan-nodes-datatable/macvlanNodesDatatable.html
index 0ab44f74d..cd8ea8a81 100644
--- a/app/docker/components/datatables/macvlan-nodes-datatable/macvlanNodesDatatable.html
+++ b/app/docker/components/datatables/macvlan-nodes-datatable/macvlanNodesDatatable.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>
@@ -94,9 +94,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/docker/components/datatables/networks-datatable/network-row-content/networkRowContent.html b/app/docker/components/datatables/networks-datatable/network-row-content/networkRowContent.html
index b2152f746..3d4e00c7e 100644
--- a/app/docker/components/datatables/networks-datatable/network-row-content/networkRowContent.html
+++ b/app/docker/components/datatables/networks-datatable/network-row-content/networkRowContent.html
@@ -17,7 +17,7 @@
 <td>
   <a ng-if="!parentCtrl.offlineMode" ui-sref="docker.networks.network({ id: item.Id, nodeName: item.NodeName })" title="{{ item.Name }}">{{ item.Name | truncate: 40 }}</a>
   <span ng-if="parentCtrl.offlineMode">{{ item.Name | truncate: 40 }}</span>
-  <span style="margin-left: 10px;" class="label label-info image-tag space-left" ng-if="item.ResourceControl.System">System</span>
+  <span style="margin-left: 10px" class="label label-info image-tag space-left" ng-if="item.ResourceControl.System">System</span>
 </td>
 <td>{{ item.StackName ? item.StackName : '-' }}</td>
 <td>{{ item.Driver }}</td>
diff --git a/app/docker/components/datatables/networks-datatable/networksDatatable.html b/app/docker/components/datatables/networks-datatable/networksDatatable.html
index 1d63c2d7e..6af7331b8 100644
--- a/app/docker/components/datatables/networks-datatable/networksDatatable.html
+++ b/app/docker/components/datatables/networks-datatable/networksDatatable.html
@@ -2,15 +2,13 @@
   <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 class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
             <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">
@@ -18,9 +16,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>
@@ -29,7 +25,7 @@
                         <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>
@@ -72,7 +68,7 @@
         <table class="table table-hover nowrap-cells">
           <thead>
             <tr>
-              <th style="width: 55px;">
+              <th style="width: 55px">
                 <span class="md-checkbox" ng-if="!$ctrl.offlineMode" authorization="DockerNetworkDelete, DockerNetworkCreate">
                   <input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" />
                   <label for="select_all"></label>
@@ -186,9 +182,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/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html b/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html
index dc92c09d2..648869d74 100644
--- a/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html
+++ b/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.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>
@@ -85,9 +85,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/docker/components/datatables/nodes-datatable/nodesDatatable.html b/app/docker/components/datatables/nodes-datatable/nodesDatatable.html
index a95b48f03..408cad837 100644
--- a/app/docker/components/datatables/nodes-datatable/nodesDatatable.html
+++ b/app/docker/components/datatables/nodes-datatable/nodesDatatable.html
@@ -2,15 +2,13 @@
   <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 class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
             <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">
@@ -18,9 +16,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>
@@ -29,7 +25,7 @@
                         <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>
@@ -150,9 +146,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/docker/components/datatables/secrets-datatable/secretsDatatable.html b/app/docker/components/datatables/secrets-datatable/secretsDatatable.html
index 3bd5d8c7d..e7411757e 100644
--- a/app/docker/components/datatables/secrets-datatable/secretsDatatable.html
+++ b/app/docker/components/datatables/secrets-datatable/secretsDatatable.html
@@ -2,15 +2,13 @@
   <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 class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
             <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">
@@ -18,9 +16,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>
@@ -29,7 +25,7 @@
                         <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>
@@ -133,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/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html b/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html
index 521e324a9..cee98db02 100644
--- a/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html
+++ b/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html
@@ -2,7 +2,7 @@
   <table class="table table-condensed table-hover nowrap-cells">
     <thead>
       <tr>
-        <th uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.filters.state.open" style="width: 10%;">
+        <th uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.filters.state.open" style="width: 10%">
           <a ng-click="$ctrl.changeOrderBy('Status.State')">
             Status
             <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Status.State' && !$ctrl.state.reverseOrder"></i>
@@ -14,9 +14,7 @@
           </span>
           <div class="dropdown-menu" uib-dropdown-menu>
             <div class="tableMenu">
-              <div class="menuHeader">
-                Filter by state
-              </div>
+              <div class="menuHeader"> Filter by state </div>
               <div class="menuContent">
                 <div class="md-checkbox" ng-repeat="filter in $ctrl.filters.state.values track by $index">
                   <input id="filter_state_{{ $ctrl.serviceId }}_{{ $index }}" type="checkbox" ng-model="filter.display" ng-change="$ctrl.onStateFilterChange()" />
@@ -29,7 +27,7 @@
             </div>
           </div>
         </th>
-        <th style="width: 22%;">Task</th>
+        <th style="width: 22%">Task</th>
         <th>Actions</th>
         <th>
           <a ng-click="$ctrl.changeOrderBy('Slot')">
diff --git a/app/docker/components/datatables/services-datatable/servicesDatatable.html b/app/docker/components/datatables/services-datatable/servicesDatatable.html
index ae0e41d7b..f7ee9c969 100644
--- a/app/docker/components/datatables/services-datatable/servicesDatatable.html
+++ b/app/docker/components/datatables/services-datatable/servicesDatatable.html
@@ -2,16 +2,14 @@
   <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 class="settings">
           <datatable-columns-visibility columns="$ctrl.columnVisibility.columns" on-change="($ctrl.onColumnVisibilityChange)"></datatable-columns-visibility>
           <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
             <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">
@@ -19,9 +17,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>
@@ -30,7 +26,7 @@
                         <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>
@@ -66,7 +62,7 @@
         <table class="table table-hover nowrap-cells">
           <thead>
             <tr>
-              <th style="width: 55px;">
+              <th style="width: 55px">
                 <span class="md-checkbox" authorization="DockerServiceUpdate, DockerServiceDelete, DockerServiceCreate">
                   <input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" />
                   <label for="select_all"></label>
@@ -218,9 +214,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/docker/components/datatables/tasks-datatable/tasksDatatable.html b/app/docker/components/datatables/tasks-datatable/tasksDatatable.html
index aeba33c37..3a5364c76 100644
--- a/app/docker/components/datatables/tasks-datatable/tasksDatatable.html
+++ b/app/docker/components/datatables/tasks-datatable/tasksDatatable.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>
@@ -106,9 +106,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/docker/components/datatables/volumes-datatable/volumesDatatable.html b/app/docker/components/datatables/volumes-datatable/volumesDatatable.html
index a7c5e485e..ae75d2ea5 100644
--- a/app/docker/components/datatables/volumes-datatable/volumesDatatable.html
+++ b/app/docker/components/datatables/volumes-datatable/volumesDatatable.html
@@ -2,15 +2,13 @@
   <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 class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
             <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">
@@ -18,9 +16,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>
@@ -29,7 +25,7 @@
                         <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>
@@ -88,9 +84,7 @@
                 </div>
                 <div class="dropdown-menu" uib-dropdown-menu>
                   <div class="tableMenu">
-                    <div class="menuHeader">
-                      Filter by usage
-                    </div>
+                    <div class="menuHeader"> Filter by usage </div>
                     <div class="menuContent">
                       <div class="md-checkbox">
                         <input id="filter_usage_usedImages" type="checkbox" ng-model="$ctrl.filters.state.showUsedVolumes" ng-change="$ctrl.onstateFilterChange()" />
@@ -170,7 +164,7 @@
                     <i class="fa fa-search"></i> browse
                   </a>
                 </btn>
-                <span style="margin-left: 10px;" class="label label-warning image-tag space-left" ng-if="item.dangling">Unused</span>
+                <span style="margin-left: 10px" class="label label-warning image-tag space-left" ng-if="item.dangling">Unused</span>
               </td>
               <td>{{ item.StackName ? item.StackName : '-' }}</td>
               <td>{{ item.Driver }}</td>
@@ -198,9 +192,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/docker/components/host-view-panels/devices-panel/devices-panel.html b/app/docker/components/host-view-panels/devices-panel/devices-panel.html
index 1555e508e..2fb821d7c 100644
--- a/app/docker/components/host-view-panels/devices-panel/devices-panel.html
+++ b/app/docker/components/host-view-panels/devices-panel/devices-panel.html
@@ -19,9 +19,7 @@
               <td colspan="2" class="text-center text-muted">Loading...</td>
             </tr>
             <tr ng-if="$ctrl.devices.length === 0">
-              <td colspan="2" class="text-center text-muted">
-                No device available.
-              </td>
+              <td colspan="2" class="text-center text-muted"> No device available. </td>
             </tr>
           </tbody>
         </table>
diff --git a/app/docker/components/host-view-panels/disks-panel/disks-panel.html b/app/docker/components/host-view-panels/disks-panel/disks-panel.html
index f2f59ec2c..ef5fb9022 100644
--- a/app/docker/components/host-view-panels/disks-panel/disks-panel.html
+++ b/app/docker/components/host-view-panels/disks-panel/disks-panel.html
@@ -19,9 +19,7 @@
               <td colspan="2" class="text-center text-muted">Loading...</td>
             </tr>
             <tr ng-if="$ctrl.disks.length === 0">
-              <td colspan="2" class="text-center text-muted">
-                No disks available.
-              </td>
+              <td colspan="2" class="text-center text-muted"> No disks available. </td>
             </tr>
           </tbody>
         </table>
diff --git a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html
index 13f5a0eae..11681b915 100644
--- a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html
+++ b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html
@@ -27,9 +27,7 @@
             </tr>
             <tr ng-if="$ctrl.isBrowseEnabled">
               <td colspan="2">
-                <button class="btn btn-primary btn-sm" title="Browse" ui-sref="{{ $ctrl.browseUrl }}">
-                  Browse
-                </button>
+                <button class="btn btn-primary btn-sm" title="Browse" ui-sref="{{ $ctrl.browseUrl }}"> Browse </button>
               </td>
             </tr>
           </tbody>
diff --git a/app/docker/components/host-view-panels/node-labels-table/node-labels-table.html b/app/docker/components/host-view-panels/node-labels-table/node-labels-table.html
index 4e2dff80b..320ff3ddc 100644
--- a/app/docker/components/host-view-panels/node-labels-table/node-labels-table.html
+++ b/app/docker/components/host-view-panels/node-labels-table/node-labels-table.html
@@ -1,9 +1,7 @@
-<div ng-if="!$ctrl.labels.length">
-  There are no labels for this node.
-</div>
+<div ng-if="!$ctrl.labels.length"> There are no labels for this node. </div>
 
-<div class="col-sm-12 form-inline" style="padding: 0px;" ng-if="$ctrl.labels.length">
-  <div ng-repeat="label in $ctrl.labels" style="margin-top: 2px;">
+<div class="col-sm-12 form-inline" style="padding: 0px" ng-if="$ctrl.labels.length">
+  <div ng-repeat="label in $ctrl.labels" style="margin-top: 2px">
     <div class="input-group col-sm-5 input-group-sm">
       <span class="input-group-addon">name</span>
       <input type="text" class="form-control" ng-model="label.key" placeholder="e.g. com.example.foo" ng-change="$ctrl.updateLabel(label)" />
diff --git a/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html
index 2a0cd5143..c0ab66bde 100644
--- a/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html
+++ b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html
@@ -48,9 +48,7 @@
               <td colspan="2">
                 <div class="btn-toolbar" role="toolbar">
                   <div class="btn-group" role="group">
-                    <button type="button" class="btn btn-primary btn-sm" ng-disabled="!$ctrl.state.hasChanges" ng-click="$ctrl.saveChanges()">
-                      Apply changes
-                    </button>
+                    <button type="button" class="btn btn-primary btn-sm" ng-disabled="!$ctrl.state.hasChanges" ng-click="$ctrl.saveChanges()"> Apply changes </button>
                     <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                       <span class="caret"></span>
                     </button>
diff --git a/app/docker/components/imageRegistry/por-image-registry-rate-limits.html b/app/docker/components/imageRegistry/por-image-registry-rate-limits.html
index 7097fa66c..dbbbe1951 100644
--- a/app/docker/components/imageRegistry/por-image-registry-rate-limits.html
+++ b/app/docker/components/imageRegistry/por-image-registry-rate-limits.html
@@ -1,21 +1,21 @@
 <div class="form-group" ng-if="$ctrl.pullRateLimits">
   <div class="col-sm-12 small">
     <div ng-if="$ctrl.pullRateLimits.remaining > 0" class="text-muted">
-      <i class="fa fa-exclamation-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+      <i class="fa fa-exclamation-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
       <span ng-if="$ctrl.isAuthenticated">
         You are currently using a free account to pull images from DockerHub and will be limited to 200 pulls every 6 hours. Remaining pulls:
-        <span style="font-weight: bold;">{{ $ctrl.pullRateLimits.remaining }}/{{ $ctrl.pullRateLimits.limit }}</span>
+        <span style="font-weight: bold">{{ $ctrl.pullRateLimits.remaining }}/{{ $ctrl.pullRateLimits.limit }}</span>
       </span>
       <span ng-if="!$ctrl.isAuthenticated">
         <span ng-if="$ctrl.isAdmin">
           You are currently using an anonymous account to pull images from DockerHub and will be limited to 100 pulls every 6 hours. You can configure DockerHub authentication in
           the
           <a ui-sref="portainer.registries">Registries View</a>. Remaining pulls:
-          <span style="font-weight: bold;">{{ $ctrl.pullRateLimits.remaining }}/{{ $ctrl.pullRateLimits.limit }}</span>
+          <span style="font-weight: bold">{{ $ctrl.pullRateLimits.remaining }}/{{ $ctrl.pullRateLimits.limit }}</span>
         </span>
         <span ng-if="!$ctrl.isAdmin">
           You are currently using an anonymous account to pull images from DockerHub and will be limited to 100 pulls every 6 hours. Contact your administrator to configure
-          DockerHub authentication. Remaining pulls: <span style="font-weight: bold;">{{ $ctrl.pullRateLimits.remaining }}/{{ $ctrl.pullRateLimits.limit }}</span>
+          DockerHub authentication. Remaining pulls: <span style="font-weight: bold">{{ $ctrl.pullRateLimits.remaining }}/{{ $ctrl.pullRateLimits.limit }}</span>
         </span>
       </span>
     </div>
diff --git a/app/docker/components/imageRegistry/por-image-registry.html b/app/docker/components/imageRegistry/por-image-registry.html
index b3a485ba1..21389ddb8 100644
--- a/app/docker/components/imageRegistry/por-image-registry.html
+++ b/app/docker/components/imageRegistry/por-image-registry.html
@@ -1,9 +1,7 @@
 <!-- use registry -->
 <div>
   <div class="form-group" ng-if="$ctrl.model.UseRegistry">
-    <label for="image_registry" class="control-label text-left" ng-class="$ctrl.labelClass">
-      Registry
-    </label>
+    <label for="image_registry" class="control-label text-left" ng-class="$ctrl.labelClass"> Registry </label>
     <div ng-class="$ctrl.inputClass">
       <select
         ng-options="registry as registry.Name for registry in $ctrl.registries track by registry.Id"
@@ -47,8 +45,8 @@
   <div ng-if="!$ctrl.model.UseRegistry">
     <div class="form-group">
       <span class="small">
-        <p class="text-muted" style="margin-left: 15px;">
-          <i class="fa fa-exclamation-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+        <p class="text-muted" style="margin-left: 15px">
+          <i class="fa fa-exclamation-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
           When using advanced mode, image and repository <b>must be</b> publicly available.
         </p>
       </span>
diff --git a/app/docker/components/log-viewer/logViewer.html b/app/docker/components/log-viewer/logViewer.html
index e74e70e55..ef093baec 100644
--- a/app/docker/components/log-viewer/logViewer.html
+++ b/app/docker/components/log-viewer/logViewer.html
@@ -10,7 +10,7 @@
                 Auto-refresh logs
                 <portainer-tooltip position="bottom" message="Disabling this option allows you to pause the log collection process and the auto-scrolling."></portainer-tooltip>
               </label>
-              <label class="switch" style="margin-left: 20px;">
+              <label class="switch" style="margin-left: 20px">
                 <input
                   type="checkbox"
                   ng-model="$ctrl.state.logCollection"
@@ -21,24 +21,18 @@
           </div>
           <div class="form-group">
             <div class="col-sm-12">
-              <label for="tls" class="control-label text-left">
-                Wrap lines
-              </label>
-              <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="$ctrl.state.wrapLines" /><i></i> </label>
+              <label for="tls" class="control-label text-left"> Wrap lines </label>
+              <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="$ctrl.state.wrapLines" /><i></i> </label>
             </div>
           </div>
           <div class="form-group">
             <div class="col-sm-12">
-              <label for="tls" class="control-label text-left">
-                Display timestamps
-              </label>
-              <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="$ctrl.displayTimestamps" /><i></i> </label>
+              <label for="tls" class="control-label text-left"> Display timestamps </label>
+              <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="$ctrl.displayTimestamps" /><i></i> </label>
             </div>
           </div>
           <div class="form-group">
-            <label for="logs_since" class="col-sm-1 control-label text-left">
-              Fetch
-            </label>
+            <label for="logs_since" class="col-sm-1 control-label text-left"> Fetch </label>
             <div class="col-sm-2">
               <select class="form-control" ng-model="$ctrl.sinceTimestamp" id="logs_since">
                 <option selected value="">All logs</option>
@@ -47,27 +41,21 @@
             </div>
           </div>
           <div class="form-group">
-            <label for="logs_search" class="col-sm-1 control-label text-left">
-              Search
-            </label>
+            <label for="logs_search" class="col-sm-1 control-label text-left"> Search </label>
             <div class="col-sm-11">
               <input class="form-control" type="text" name="logs_search" ng-model="$ctrl.state.search" ng-change="$ctrl.state.selectedLines.length = 0;" placeholder="Filter..." />
             </div>
           </div>
           <div class="form-group">
-            <label for="lines_count" class="col-sm-1 control-label text-left">
-              Lines
-            </label>
+            <label for="lines_count" class="col-sm-1 control-label text-left"> Lines </label>
             <div class="col-sm-11">
               <input class="form-control" type="number" name="lines_count" ng-model="$ctrl.lineCount" placeholder="Enter no of lines..." />
             </div>
           </div>
           <div class="form-group" ng-if="$ctrl.state.copySupported">
-            <label class="col-sm-1 control-label text-left">
-              Actions
-            </label>
+            <label class="col-sm-1 control-label text-left"> Actions </label>
             <div class="col-sm-11">
-              <button class="btn btn-primary btn-sm" type="button" ng-click="$ctrl.downloadLogs()" style="margin-left: 0;"><i class="fa fa-download"></i> Download logs</button>
+              <button class="btn btn-primary btn-sm" type="button" ng-click="$ctrl.downloadLogs()" style="margin-left: 0"><i class="fa fa-download"></i> Download logs</button>
               <button
                 class="btn btn-primary btn-sm"
                 ng-click="$ctrl.copy()"
@@ -84,7 +72,7 @@
                 ><i class="fa fa-times space-right" aria-hidden="true"></i>Unselect</button
               >
               <span>
-                <i id="refreshRateChange" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none;"></i>
+                <i id="refreshRateChange" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none"></i>
               </span>
             </div>
           </div>
@@ -94,8 +82,8 @@
   </div>
 </div>
 
-<div class="row" style="height: 54%;">
-  <div class="col-sm-12" style="height: 100%;">
+<div class="row" style="height: 54%">
+  <div class="col-sm-12" style="height: 100%">
     <pre ng-class="{ wrap_lines: $ctrl.state.wrapLines }" class="log_viewer" scroll-glue="$ctrl.state.autoScroll" force-glue>
       <div ng-repeat="log in $ctrl.state.filteredLogs = ($ctrl.data | filter:{ 'line': $ctrl.state.search }) track by $index" class="line" ng-if="log.line"><p class="inner_line" ng-click="$ctrl.selectLine(log.line)" ng-class="{ 'line_selected': $ctrl.state.selectedLines.indexOf(log.line) > -1 }"><span ng-repeat="span in log.spans" ng-style="{ 'color': span.foregroundColor, 'background-color': span.backgroundColor }">{{ span.text }}</span></p></div>
       <div ng-if="!$ctrl.state.filteredLogs.length" class="line"><p class="inner_line">No log line matching the '{{ $ctrl.state.search }}' filter</p></div>
diff --git a/app/docker/components/network-macvlan-form/networkMacvlanForm.html b/app/docker/components/network-macvlan-form/networkMacvlanForm.html
index 59898e2ee..4e7fe2d24 100644
--- a/app/docker/components/network-macvlan-form/networkMacvlanForm.html
+++ b/app/docker/components/network-macvlan-form/networkMacvlanForm.html
@@ -1,22 +1,20 @@
 <div>
-  <div class="col-sm-12 form-section-title">
-    Macvlan configuration
-  </div>
+  <div class="col-sm-12 form-section-title"> Macvlan configuration </div>
   <!-- selector -->
   <div class="form-group">
     <span class="col-sm-12 text-muted small">
-      <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>
       To create a MACVLAN network you need to create a configuration, then create the network from this configuration.
     </span>
   </div>
   <div class="col-sm-12">
-    <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="network_config" ng-model="$ctrl.data.Scope" value="local" />
           <label for="network_config">
             <div class="boxselector_header">
-              <i class="fa fa-cog" aria-hidden="true" style="margin-right: 2px;"></i>
+              <i class="fa fa-cog" aria-hidden="true" style="margin-right: 2px"></i>
               Configuration
             </div>
             <p>I want to configure a network before deploying it</p>
@@ -26,7 +24,7 @@
           <input type="radio" id="network_deploy" ng-model="$ctrl.data.Scope" value="swarm" ng-disabled="$ctrl.availableNetworks.length === 0" />
           <label for="network_deploy" ng-class="$ctrl.availableNetworks.length === 0 ? 'boxselector_disabled' : ''">
             <div class="boxselector_header">
-              <i class="fa fa-sitemap" aria-hidden="true" style="margin-right: 2px;"></i>
+              <i class="fa fa-sitemap" aria-hidden="true" style="margin-right: 2px"></i>
               Creation
             </div>
             <p>I want to create a network from a configuration</p>
diff --git a/app/docker/components/volumesCIFSForm/volumesCifsForm.html b/app/docker/components/volumesCIFSForm/volumesCifsForm.html
index f95455491..45c6f7450 100644
--- a/app/docker/components/volumesCIFSForm/volumesCifsForm.html
+++ b/app/docker/components/volumesCIFSForm/volumesCifsForm.html
@@ -1,9 +1,7 @@
 <!-- CIFS-settings -->
 <div ng-show="$ctrl.data.useCIFS">
   <ng-form class="form-horizontal" name="cifsInformationForm">
-    <div class="col-sm-12 form-section-title">
-      CIFS Settings
-    </div>
+    <div class="col-sm-12 form-section-title"> CIFS Settings </div>
     <!-- address-input -->
     <div class="form-group col-md-12">
       <label for="cifs_address" class="col-sm-2 col-md-1 control-label text-left">Address</label>
diff --git a/app/docker/components/volumesNFSForm/volumesnfsForm.html b/app/docker/components/volumesNFSForm/volumesnfsForm.html
index fa6496f30..5ae6c8f17 100644
--- a/app/docker/components/volumesNFSForm/volumesnfsForm.html
+++ b/app/docker/components/volumesNFSForm/volumesnfsForm.html
@@ -1,9 +1,7 @@
 <!-- NFS-settings -->
 <div ng-show="$ctrl.data.useNFS">
   <ng-form class="form-horizontal" name="nfsInformationForm">
-    <div class="col-sm-12 form-section-title">
-      NFS Settings
-    </div>
+    <div class="col-sm-12 form-section-title"> NFS Settings </div>
     <!-- address-input -->
     <div class="form-group col-md-12">
       <label for="nfs_address" class="col-sm-2 col-md-1 control-label text-left">Address</label>
diff --git a/app/docker/containers/components/ContainersDatatable/ContainersDatatable.tsx b/app/docker/containers/components/ContainersDatatable/ContainersDatatable.tsx
index fd8e0bd1e..691e986c4 100644
--- a/app/docker/containers/components/ContainersDatatable/ContainersDatatable.tsx
+++ b/app/docker/containers/components/ContainersDatatable/ContainersDatatable.tsx
@@ -52,7 +52,6 @@ export interface ContainerTableProps {
   dataset: DockerContainer[];
   onRefresh?(): Promise<void>;
   isHostColumnVisible: boolean;
-  autoFocusSearch: boolean;
   tableKey?: string;
 }
 
@@ -61,7 +60,6 @@ export function ContainersDatatable({
   dataset,
   onRefresh,
   isHostColumnVisible,
-  autoFocusSearch,
 }: ContainerTableProps) {
   const { settings, setTableSettings } =
     useTableSettings<ContainersTableSettings>();
@@ -164,11 +162,7 @@ export function ContainersDatatable({
         />
       </TableActions>
 
-      <SearchBar
-        value={searchBarValue}
-        onChange={handleSearchBarChange}
-        autoFocus={autoFocusSearch}
-      />
+      <SearchBar value={searchBarValue} onChange={handleSearchBarChange} />
 
       <Table
         className={tableProps.className}
diff --git a/app/docker/containers/components/ContainersDatatable/ContainersDatatableContainer.tsx b/app/docker/containers/components/ContainersDatatable/ContainersDatatableContainer.tsx
index 866daadc4..3b2dae099 100644
--- a/app/docker/containers/components/ContainersDatatable/ContainersDatatableContainer.tsx
+++ b/app/docker/containers/components/ContainersDatatable/ContainersDatatableContainer.tsx
@@ -47,7 +47,6 @@ export const ContainersDatatableAngular = react2angular(
     'dataset',
     'onRefresh',
     'isHostColumnVisible',
-    'autoFocusSearch',
     'tableKey',
   ]
 );
diff --git a/app/docker/views/configs/create/createconfig.html b/app/docker/views/configs/create/createconfig.html
index 06e0af527..83b1dc8f7 100644
--- a/app/docker/views/configs/create/createconfig.html
+++ b/app/docker/views/configs/create/createconfig.html
@@ -31,15 +31,15 @@
           <!-- !config-data -->
           <!-- labels -->
           <div class="form-group">
-            <div class="col-sm-12" style="margin-top: 5px;">
+            <div class="col-sm-12" style="margin-top: 5px">
               <label class="control-label text-left">Labels</label>
-              <span class="label label-default interactive" style="margin-left: 10px;" ng-click="ctrl.addLabel()">
+              <span class="label label-default interactive" style="margin-left: 10px" ng-click="ctrl.addLabel()">
                 <i class="fa fa-plus-circle" aria-hidden="true"></i> add label
               </span>
             </div>
             <!-- labels-input-list -->
-            <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-              <div ng-repeat="label in ctrl.formValues.Labels" style="margin-top: 2px;">
+            <div class="col-sm-12 form-inline" style="margin-top: 10px">
+              <div ng-repeat="label in ctrl.formValues.Labels" style="margin-top: 2px">
                 <div class="input-group col-sm-5 input-group-sm">
                   <span class="input-group-addon">name</span>
                   <input type="text" class="form-control" ng-model="label.name" placeholder="e.g. com.example.foo" />
@@ -60,13 +60,11 @@
           <por-access-control-form form-data="ctrl.formValues.AccessControlData"></por-access-control-form>
           <!-- !access-control -->
           <!-- 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 type="button" class="btn btn-primary btn-sm" ng-disabled="!ctrl.formValues.Name" ng-click="ctrl.create()">Create config</button>
-              <span class="text-danger" ng-if="ctrl.state.formValidationError" style="margin-left: 5px;">{{ ctrl.state.formValidationError }}</span>
+              <span class="text-danger" ng-if="ctrl.state.formValidationError" style="margin-left: 5px">{{ ctrl.state.formValidationError }}</span>
             </div>
           </div>
           <!-- !actions -->
diff --git a/app/docker/views/containers/create/createcontainer.html b/app/docker/views/containers/create/createcontainer.html
index e668c547a..0df48fd3e 100644
--- a/app/docker/views/containers/create/createcontainer.html
+++ b/app/docker/views/containers/create/createcontainer.html
@@ -6,7 +6,7 @@
 <information-panel title-text="Caution" ng-if="state.mode == 'duplicate'">
   <span class="small">
     <p class="text-muted">
-      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
       The new container may fail to start if the image is changed, and settings from the previous container aren't compatible. Common causes include entrypoint, cmd or
       <a href="http://portainer.readthedocs.io/en/stable/agent.html" target="_blank">other settings</a> set by an image.
     </p>
@@ -26,12 +26,10 @@
             </div>
           </div>
           <!-- !name-input -->
-          <div class="col-sm-12 form-section-title">
-            Image configuration
-          </div>
+          <div class="col-sm-12 form-section-title"> Image configuration </div>
           <div ng-if="!formValues.RegistryModel.Registry && fromContainer">
             <i class="fa fa-exclamation-triangle orange-icon" aria-hidden="true"></i>
-            <span class="small text-danger" style="margin-left: 5px;">
+            <span class="small text-danger" style="margin-left: 5px">
               The Docker registry for the <code>{{ config.Image }}</code> image is not registered inside Portainer, you will not be able to create a container. Please register that
               registry first.
             </span>
@@ -60,18 +58,14 @@
                       message="When enabled, Portainer will automatically try to pull the specified image before creating the container."
                     ></portainer-tooltip>
                   </label>
-                  <label class="switch" style="margin-left: 20px;">
-                    <input type="checkbox" ng-model="formValues.alwaysPull" ng-disabled="!state.pullImageValidity" /><i></i>
-                  </label>
+                  <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="formValues.alwaysPull" ng-disabled="!state.pullImageValidity" /><i></i> </label>
                 </div>
               </div>
               <!-- !always-pull -->
             </por-image-registry>
             <!-- !image-and-registry -->
           </div>
-          <div class="col-sm-12 form-section-title">
-            Network ports configuration
-          </div>
+          <div class="col-sm-12 form-section-title"> Network ports configuration </div>
           <!-- publish-exposed-ports -->
           <div class="form-group">
             <div class="col-sm-12">
@@ -82,7 +76,7 @@
                   message="When enabled, Portainer will let Docker automatically map a random port on the host to each one defined in the image Dockerfile."
                 ></portainer-tooltip>
               </label>
-              <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="config.HostConfig.PublishAllPorts" /><i></i> </label>
+              <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="config.HostConfig.PublishAllPorts" /><i></i> </label>
             </div>
           </div>
           <!-- !publish-exposed-ports -->
@@ -96,20 +90,20 @@
                   message="When a range of ports on the host and a single port on the container is specified, Docker will randomly choose a single available port in the defined range and forward that to the container port."
                 ></portainer-tooltip>
               </label>
-              <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addPortBinding()">
+              <span class="label label-default interactive" style="margin-left: 10px" ng-click="addPortBinding()">
                 <i class="fa fa-plus-circle" aria-hidden="true"></i> publish a new network port
               </span>
             </div>
             <!-- port-mapping-input-list -->
-            <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-              <div ng-repeat="portBinding in config.HostConfig.PortBindings" style="margin-top: 2px;">
+            <div class="col-sm-12 form-inline" style="margin-top: 10px">
+              <div ng-repeat="portBinding in config.HostConfig.PortBindings" style="margin-top: 2px">
                 <!-- host-port -->
                 <div class="input-group col-sm-4 input-group-sm">
                   <span class="input-group-addon">host</span>
                   <input type="text" class="form-control" ng-model="portBinding.hostPort" placeholder="e.g. 80, 80-88, ip:80 or ip:80-88 (optional)" />
                 </div>
                 <!-- !host-port -->
-                <span style="margin: 0 10px 0 10px;">
+                <span style="margin: 0 10px 0 10px">
                   <i class="fa fa-long-arrow-alt-right" aria-hidden="true"></i>
                 </span>
                 <!-- container-port -->
@@ -135,9 +129,7 @@
           </div>
           <!-- !port-mapping -->
           <div ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
-            <div class="col-sm-12 form-section-title">
-              Deployment
-            </div>
+            <div class="col-sm-12 form-section-title"> Deployment </div>
             <!-- node-selection -->
             <node-selector model="formValues.NodeName"> </node-selector>
             <!-- !node-selection -->
@@ -146,9 +138,7 @@
           <por-access-control-form form-data="formValues.AccessControlData" resource-control="fromContainer.ResourceControl" ng-if="fromContainer"></por-access-control-form>
           <!-- !access-control -->
           <!-- actions -->
-          <div class="col-sm-12 form-section-title">
-            Actions
-          </div>
+          <div class="col-sm-12 form-section-title"> Actions </div>
           <!-- autoremove -->
           <div class="form-group">
             <div class="col-sm-12">
@@ -159,7 +149,7 @@
                   message="When enabled, Portainer will automatically remove the container when it exits. This is useful when you want to use the container only once."
                 ></portainer-tooltip>
               </label>
-              <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="config.HostConfig.AutoRemove" /><i></i> </label>
+              <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="config.HostConfig.AutoRemove" /><i></i> </label>
             </div>
           </div>
           <!-- !autoremove -->
@@ -176,7 +166,7 @@
                 <span ng-hide="state.actionInProgress">Deploy the container</span>
                 <span ng-show="state.actionInProgress">Deployment in progress...</span>
               </button>
-              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px;">{{ state.formValidationError }}</span>
+              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px">{{ state.formValidationError }}</span>
             </div>
           </div>
           <!-- !actions -->
@@ -205,14 +195,14 @@
         <div class="tab-content">
           <!-- tab-command -->
           <div class="tab-pane active" id="command">
-            <form class="form-horizontal" style="margin-top: 15px;">
+            <form class="form-horizontal" style="margin-top: 15px">
               <!-- command-input -->
               <div class="form-group">
                 <label for="container_command" class="col-sm-2 col-lg-1 control-label text-left">Command</label>
                 <div class="col-sm-9">
                   <div class="input-group">
                     <div class="input-group-btn">
-                      <button class="btn btn-primary" ng-model="formValues.CmdMode" uib-btn-radio="'default'" style="margin-left: 0px;"> Default</button>
+                      <button class="btn btn-primary" ng-model="formValues.CmdMode" uib-btn-radio="'default'" style="margin-left: 0px"> Default</button>
                       <button class="btn btn-primary" ng-model="formValues.CmdMode" uib-btn-radio="'override'">Override</button>
                     </div>
                     <input
@@ -239,7 +229,7 @@
                 <div class="col-sm-9">
                   <div class="input-group">
                     <div class="input-group-btn">
-                      <label class="btn btn-primary" ng-model="formValues.EntrypointMode" uib-btn-radio="'default'" style="margin-left: 0px;"> Default</label>
+                      <label class="btn btn-primary" ng-model="formValues.EntrypointMode" uib-btn-radio="'default'" style="margin-left: 0px"> Default</label>
                       <label class="btn btn-primary" ng-model="formValues.EntrypointMode" uib-btn-radio="'override'">Override</label>
                     </div>
                     <input
@@ -300,9 +290,7 @@
               </div>
               <!-- !console -->
 
-              <div class="col-sm-12 form-section-title">
-                Logging
-              </div>
+              <div class="col-sm-12 form-section-title"> Logging </div>
               <!-- logging-driver -->
               <div class="form-group">
                 <label for="log-driver" class="col-sm-2 col-lg-1 control-label text-left">Driver</label>
@@ -323,7 +311,7 @@
               <!-- !logging-driver -->
               <!-- logging-opts -->
               <div class="form-group">
-                <div class="col-sm-12" style="margin-top: 5px;">
+                <div class="col-sm-12" style="margin-top: 5px">
                   <label class="control-label text-left">
                     Options
                     <portainer-tooltip
@@ -333,15 +321,15 @@
                   </label>
                   <span
                     class="label label-default interactive"
-                    style="margin-left: 10px;"
+                    style="margin-left: 10px"
                     ng-click="!formValues.LogDriverName || formValues.LogDriverName === 'none' || addLogDriverOpt(formValues.LogDriverName)"
                   >
                     <i class="fa fa-plus-circle" aria-hidden="true"></i> add logging driver option
                   </span>
                 </div>
                 <!-- logging-opts-input-list -->
-                <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-                  <div ng-repeat="opt in formValues.LogDriverOpts" style="margin-top: 2px;">
+                <div class="col-sm-12 form-inline" style="margin-top: 10px">
+                  <div ng-repeat="opt in formValues.LogDriverOpts" style="margin-top: 2px">
                     <div class="input-group col-sm-5 input-group-sm">
                       <span class="input-group-addon">option</span>
                       <input type="text" class="form-control" ng-model="opt.name" placeholder="e.g. FOO" />
@@ -363,20 +351,20 @@
           <!-- !tab-command -->
           <!-- tab-volume -->
           <div class="tab-pane" id="volumes">
-            <form class="form-horizontal" style="margin-top: 15px;">
+            <form class="form-horizontal" style="margin-top: 15px">
               <!-- volumes -->
               <div class="form-group">
-                <div class="col-sm-12" style="margin-top: 5px;">
+                <div class="col-sm-12" style="margin-top: 5px">
                   <label class="control-label text-left">Volume mapping</label>
-                  <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addVolume()">
+                  <span class="label label-default interactive" style="margin-left: 10px" ng-click="addVolume()">
                     <i class="fa fa-plus-circle" aria-hidden="true"></i> map additional volume
                   </span>
                 </div>
                 <!-- volumes-input-list -->
-                <div class="form-inline" style="margin-top: 10px;">
+                <div class="form-inline" style="margin-top: 10px">
                   <div ng-repeat="volume in formValues.Volumes">
                     <!-- volume-line1 -->
-                    <div class="col-sm-12 form-inline" style="margin-top: 10px;">
+                    <div class="col-sm-12 form-inline" style="margin-top: 10px">
                       <!-- container-path -->
                       <div class="input-group input-group-sm col-sm-6">
                         <span class="input-group-addon">container</span>
@@ -384,7 +372,7 @@
                       </div>
                       <!-- !container-path -->
                       <!-- volume-type -->
-                      <div class="input-group col-sm-5" style="margin-left: 5px;">
+                      <div class="input-group col-sm-5" style="margin-left: 5px">
                         <div class="btn-group btn-group-sm" ng-if="allowBindMounts">
                           <label class="btn btn-primary" ng-model="volume.type" uib-btn-radio="'volume'" ng-click="volume.name = ''">Volume</label>
                           <label class="btn btn-primary" ng-model="volume.type" uib-btn-radio="'bind'" ng-click="volume.name = ''">Bind</label>
@@ -397,7 +385,7 @@
                     </div>
                     <!-- !volume-line1 -->
                     <!-- volume-line2 -->
-                    <div class="col-sm-12 form-inline" style="margin-top: 5px;">
+                    <div class="col-sm-12 form-inline" style="margin-top: 5px">
                       <i class="fa fa-long-arrow-alt-right" aria-hidden="true"></i>
                       <!-- volume -->
                       <div class="input-group input-group-sm col-sm-6" ng-if="volume.type === 'volume'">
@@ -415,7 +403,7 @@
                       </div>
                       <!-- !bind -->
                       <!-- read-only -->
-                      <div class="input-group input-group-sm col-sm-5" style="margin-left: 5px;">
+                      <div class="input-group input-group-sm col-sm-5" style="margin-left: 5px">
                         <div class="btn-group btn-group-sm">
                           <label class="btn btn-primary" ng-model="volume.readOnly" uib-btn-radio="false">Writable</label>
                           <label class="btn btn-primary" ng-model="volume.readOnly" uib-btn-radio="true">Read-only</label>
@@ -434,7 +422,7 @@
           <!-- !tab-volume -->
           <!-- tab-network -->
           <div class="tab-pane" id="network">
-            <form class="form-horizontal" style="margin-top: 15px;">
+            <form class="form-horizontal" style="margin-top: 15px">
               <div class="form-group" ng-if="globalNetworkCount === 0 && applicationState.endpoint.mode.provider !== 'DOCKER_SWARM_MODE'">
                 <div class="col-sm-12">
                   <span class="small text-muted">You don't have any shared networks. Head over to the <a ui-sref="docker.networks">networks view</a> to create one.</span>
@@ -524,15 +512,15 @@
               <!-- !dns-secondary-input -->
               <!-- extra-hosts-variables -->
               <div class="form-group">
-                <div class="col-sm-12" style="margin-top: 5px;">
+                <div class="col-sm-12" style="margin-top: 5px">
                   <label class="control-label text-left">Hosts file entries</label>
-                  <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addExtraHost()">
+                  <span class="label label-default interactive" style="margin-left: 10px" ng-click="addExtraHost()">
                     <i class="fa fa-plus-circle" aria-hidden="true"></i> add additional entry
                   </span>
                 </div>
                 <!-- extra-hosts-input-list -->
-                <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-                  <div ng-repeat="variable in formValues.ExtraHosts" style="margin-top: 2px;">
+                <div class="col-sm-12 form-inline" style="margin-top: 10px">
+                  <div ng-repeat="variable in formValues.ExtraHosts" style="margin-top: 2px">
                     <div class="input-group col-sm-5 input-group-sm">
                       <span class="input-group-addon">value</span>
                       <input type="text" class="form-control" ng-model="variable.value" placeholder="e.g. host:IP" />
@@ -550,18 +538,18 @@
           <!-- !tab-network -->
           <!-- tab-labels -->
           <div class="tab-pane" id="labels">
-            <form class="form-horizontal" style="margin-top: 15px;">
+            <form class="form-horizontal" style="margin-top: 15px">
               <!-- labels -->
               <div class="form-group">
-                <div class="col-sm-12" style="margin-top: 5px;">
+                <div class="col-sm-12" style="margin-top: 5px">
                   <label class="control-label text-left">Labels</label>
-                  <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addLabel()">
+                  <span class="label label-default interactive" style="margin-left: 10px" ng-click="addLabel()">
                     <i class="fa fa-plus-circle" aria-hidden="true"></i> add label
                   </span>
                 </div>
                 <!-- labels-input-list -->
-                <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-                  <div ng-repeat="label in formValues.Labels" style="margin-top: 2px;">
+                <div class="col-sm-12 form-inline" style="margin-top: 10px">
+                  <div ng-repeat="label in formValues.Labels" style="margin-top: 2px">
                     <div class="input-group col-sm-5 input-group-sm">
                       <span class="input-group-addon">name</span>
                       <input type="text" class="form-control" ng-model="label.name" placeholder="e.g. com.example.foo" />
@@ -592,25 +580,15 @@
           <!-- !tab-env -->
           <!-- tab-restart-policy -->
           <div class="tab-pane" id="restart-policy">
-            <form class="form-horizontal" style="margin-top: 15px;">
+            <form class="form-horizontal" style="margin-top: 15px">
               <div class="form-group">
                 <div class="col-sm-12">
-                  <label class="control-label text-left">
-                    Restart policy
-                  </label>
-                  <div class="btn-group btn-group-sm" style="margin-left: 20px;">
-                    <label class="btn btn-primary" ng-model="config.HostConfig.RestartPolicy.Name" uib-btn-radio="'no'">
-                      Never
-                    </label>
-                    <label class="btn btn-primary" ng-model="config.HostConfig.RestartPolicy.Name" uib-btn-radio="'always'">
-                      Always
-                    </label>
-                    <label class="btn btn-primary" ng-model="config.HostConfig.RestartPolicy.Name" uib-btn-radio="'on-failure'">
-                      On failure
-                    </label>
-                    <label class="btn btn-primary" ng-model="config.HostConfig.RestartPolicy.Name" uib-btn-radio="'unless-stopped'">
-                      Unless stopped
-                    </label>
+                  <label class="control-label text-left"> Restart policy </label>
+                  <div class="btn-group btn-group-sm" style="margin-left: 20px">
+                    <label class="btn btn-primary" ng-model="config.HostConfig.RestartPolicy.Name" uib-btn-radio="'no'"> Never </label>
+                    <label class="btn btn-primary" ng-model="config.HostConfig.RestartPolicy.Name" uib-btn-radio="'always'"> Always </label>
+                    <label class="btn btn-primary" ng-model="config.HostConfig.RestartPolicy.Name" uib-btn-radio="'on-failure'"> On failure </label>
+                    <label class="btn btn-primary" ng-model="config.HostConfig.RestartPolicy.Name" uib-btn-radio="'unless-stopped'"> Unless stopped </label>
                   </div>
                 </div>
               </div>
@@ -619,27 +597,21 @@
           <!-- !tab-restart-policy -->
           <!-- tab-runtime-resources -->
           <div class="tab-pane" id="runtime-resources">
-            <form class="form-horizontal" style="margin-top: 15px;">
-              <div class="col-sm-12 form-section-title">
-                Runtime
-              </div>
+            <form class="form-horizontal" style="margin-top: 15px">
+              <div class="col-sm-12 form-section-title"> Runtime </div>
               <!-- privileged-mode -->
               <div class="form-group" ng-if="isAdmin || allowPrivilegedMode">
                 <div class="col-sm-12">
-                  <label for="privileged_mode" class="control-label text-left">
-                    Privileged mode
-                  </label>
-                  <label class="switch" style="margin-left: 20px;"> <input type="checkbox" name="privileged_mode" ng-model="config.HostConfig.Privileged" /><i></i> </label>
+                  <label for="privileged_mode" class="control-label text-left"> Privileged mode </label>
+                  <label class="switch" style="margin-left: 20px"> <input type="checkbox" name="privileged_mode" ng-model="config.HostConfig.Privileged" /><i></i> </label>
                 </div>
               </div>
               <!-- !privileged-mode -->
               <!-- init -->
               <div class="form-group" ng-if="applicationState.endpoint.apiVersion >= 1.37">
                 <div class="col-sm-12">
-                  <label for="init" class="control-label text-left">
-                    Init
-                  </label>
-                  <label class="switch" style="margin-left: 20px;"> <input type="checkbox" name="init" ng-model="config.HostConfig.Init" /><i></i> </label>
+                  <label for="init" class="control-label text-left"> Init </label>
+                  <label class="switch" style="margin-left: 20px"> <input type="checkbox" name="init" ng-model="config.HostConfig.Init" /><i></i> </label>
                 </div>
               </div>
               <!-- !init -->
@@ -654,18 +626,18 @@
               </div>
               <!-- !runtimes -->
             </form>
-            <form class="form-horizontal" style="margin-top: 15px;">
+            <form class="form-horizontal" style="margin-top: 15px">
               <!-- devices -->
               <div ng-if="showDeviceMapping" class="form-group">
-                <div class="col-sm-12" style="margin-top: 5px;">
+                <div class="col-sm-12" style="margin-top: 5px">
                   <label class="control-label text-left">Devices</label>
-                  <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addDevice()">
+                  <span class="label label-default interactive" style="margin-left: 10px" ng-click="addDevice()">
                     <i class="fa fa-plus-circle" aria-hidden="true"></i> add device
                   </span>
                 </div>
                 <!-- devices-input-list -->
-                <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-                  <div ng-repeat="device in config.HostConfig.Devices" style="margin-top: 2px;">
+                <div class="col-sm-12 form-inline" style="margin-top: 10px">
+                  <div ng-repeat="device in config.HostConfig.Devices" style="margin-top: 2px">
                     <div class="input-group col-sm-5 input-group-sm">
                       <span class="input-group-addon">host</span>
                       <input type="text" class="form-control" ng-model="device.pathOnHost" placeholder="e.g. /dev/tty0" />
@@ -684,15 +656,15 @@
               <!-- !devices-->
               <!-- sysctls -->
               <div ng-if="showSysctls" class="form-group">
-                <div class="col-sm-12" style="margin-top: 5px;">
+                <div class="col-sm-12" style="margin-top: 5px">
                   <label class="control-label text-left">Sysctls</label>
-                  <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addSysctl()">
+                  <span class="label label-default interactive" style="margin-left: 10px" ng-click="addSysctl()">
                     <i class="fa fa-plus-circle" aria-hidden="true"></i> add sysctl
                   </span>
                 </div>
                 <!-- sysctls-input-list -->
-                <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-                  <div ng-repeat="sysctl in formValues.Sysctls" style="margin-top: 2px;">
+                <div class="col-sm-12 form-inline" style="margin-top: 10px">
+                  <div ng-repeat="sysctl in formValues.Sysctls" style="margin-top: 2px">
                     <div class="input-group col-sm-5 input-group-sm">
                       <span class="input-group-addon">name</span>
                       <input type="text" class="form-control" ng-model="sysctl.name" placeholder="e.g. FOO" />
@@ -710,14 +682,10 @@
               </div>
               <!-- !sysctls -->
               <div ng-class="{ 'edit-resources': state.mode == 'duplicate' }">
-                <div class="col-sm-12 form-section-title">
-                  Resources
-                </div>
+                <div class="col-sm-12 form-section-title"> Resources </div>
                 <!-- memory-reservation-input -->
                 <div class="form-group">
-                  <label for="memory-reservation" class="col-sm-3 col-lg-2 control-label text-left mt-20">
-                    Memory reservation
-                  </label>
+                  <label for="memory-reservation" class="col-sm-3 col-lg-2 control-label text-left mt-20"> Memory reservation </label>
                   <div class="col-sm-3">
                     <slider
                       on-change="(handleResourceChange)"
@@ -732,17 +700,13 @@
                     <input type="number" min="0" class="form-control" ng-model="formValues.MemoryReservation" id="memory-reservation" />
                   </div>
                   <div class="col-sm-4">
-                    <p class="small text-muted mt-7">
-                      Memory soft limit (<b>MB</b>)
-                    </p>
+                    <p class="small text-muted mt-7"> Memory soft limit (<b>MB</b>) </p>
                   </div>
                 </div>
                 <!-- !memory-reservation-input -->
                 <!-- memory-limit-input -->
                 <div class="form-group">
-                  <label for="memory-limit" class="col-sm-3 col-lg-2 control-label text-left mt-20">
-                    Memory limit
-                  </label>
+                  <label for="memory-limit" class="col-sm-3 col-lg-2 control-label text-left mt-20"> Memory limit </label>
                   <div class="col-sm-3">
                     <slider
                       on-change="(handleResourceChange)"
@@ -757,17 +721,13 @@
                     <input type="number" min="0" class="form-control" ng-model="formValues.MemoryLimit" id="memory-limit" />
                   </div>
                   <div class="col-sm-4">
-                    <p class="small text-muted mt-7">
-                      Memory limit (<b>MB</b>)
-                    </p>
+                    <p class="small text-muted mt-7"> Memory limit (<b>MB</b>) </p>
                   </div>
                 </div>
                 <!-- !memory-limit-input -->
                 <!-- cpu-limit-input -->
                 <div class="form-group">
-                  <label for="cpu-limit" class="col-sm-3 col-lg-2 control-label text-left mt-20">
-                    CPU limit
-                  </label>
+                  <label for="cpu-limit" class="col-sm-3 col-lg-2 control-label text-left mt-20"> CPU limit </label>
                   <div class="col-sm-5">
                     <slider
                       on-change="(handleResourceChange)"
@@ -780,9 +740,7 @@
                     ></slider>
                   </div>
                   <div class="col-sm-4 mt-20">
-                    <p class="small text-muted">
-                      Maximum CPU usage
-                    </p>
+                    <p class="small text-muted"> Maximum CPU usage </p>
                   </div>
                 </div>
                 <!-- !cpu-limit-input -->
diff --git a/app/docker/views/containers/stats/containerstats.html b/app/docker/views/containers/stats/containerstats.html
index c6fc413f4..23262bd2b 100644
--- a/app/docker/views/containers/stats/containerstats.html
+++ b/app/docker/views/containers/stats/containerstats.html
@@ -20,9 +20,7 @@
             </div>
           </div>
           <div class="form-group">
-            <label for="refreshRate" class="col-sm-3 col-md-2 col-lg-2 margin-sm-top control-label text-left">
-              Refresh rate
-            </label>
+            <label for="refreshRate" class="col-sm-3 col-md-2 col-lg-2 margin-sm-top control-label text-left"> Refresh rate </label>
             <div class="col-sm-3 col-md-2">
               <select id="refreshRate" ng-model="state.refreshRate" ng-change="changeUpdateRepeater()" class="form-control">
                 <option value="1">1s</option>
@@ -34,7 +32,7 @@
               </select>
             </div>
             <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 class="form-group" ng-if="state.networkStatsUnavailable">
@@ -58,7 +56,7 @@
     <rd-widget>
       <rd-widget-header icon="fa-chart-area" title-text="Memory usage"></rd-widget-header>
       <rd-widget-body>
-        <div class="chart-container" style="position: relative;">
+        <div class="chart-container" style="position: relative">
           <canvas id="memoryChart" width="770" height="300"></canvas>
         </div>
       </rd-widget-body>
@@ -69,7 +67,7 @@
     <rd-widget>
       <rd-widget-header icon="fa-chart-area" title-text="CPU usage"></rd-widget-header>
       <rd-widget-body>
-        <div class="chart-container" style="position: relative;">
+        <div class="chart-container" style="position: relative">
           <canvas id="cpuChart" width="770" height="300"></canvas>
         </div>
       </rd-widget-body>
@@ -80,7 +78,7 @@
     <rd-widget>
       <rd-widget-header icon="fa-chart-area" title-text="Network usage (aggregate)"></rd-widget-header>
       <rd-widget-body>
-        <div class="chart-container" style="position: relative;">
+        <div class="chart-container" style="position: relative">
           <canvas id="networkChart" width="770" height="300"></canvas>
         </div>
       </rd-widget-body>
@@ -91,7 +89,7 @@
     <rd-widget>
       <rd-widget-header icon="fa-chart-area" title-text="I/O usage (aggregate)"></rd-widget-header>
       <rd-widget-body>
-        <div class="chart-container" style="position: relative;">
+        <div class="chart-container" style="position: relative">
           <canvas id="ioChart" width="770" height="300"></canvas>
         </div>
       </rd-widget-body>
diff --git a/app/docker/views/dashboard/dashboard.html b/app/docker/views/dashboard/dashboard.html
index cdc2ba083..47c58d4b8 100644
--- a/app/docker/views/dashboard/dashboard.html
+++ b/app/docker/views/dashboard/dashboard.html
@@ -20,12 +20,12 @@
 >
   <span class="small">
     <p class="text-muted" ng-if="applicationState.endpoint.mode.role === 'MANAGER'">
-      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
       Portainer is connected to a node that is part of a Swarm cluster. Some resources located on other nodes in the cluster might not be available for management, have a look at
       <a href="http://portainer.readthedocs.io/en/stable/agent.html" target="_blank">our agent setup</a> for more details.
     </p>
     <p class="text-muted" ng-if="applicationState.endpoint.mode.role === 'WORKER'">
-      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
       Portainer is connected to a worker node. Swarm management features will not be available.
     </p>
   </span>
@@ -107,11 +107,11 @@
           <div class="widget-icon blue pull-left">
             <i class="fa fa-cubes"></i>
           </div>
-          <div class="pull-right" style="padding-left: 5px;">
+          <div class="pull-right" style="padding-left: 5px">
             <div><i class="fa fa-power-off space-right green-icon"></i>{{ containers | runningcontainers }} running</div>
             <div><i class="fa fa-power-off space-right red-icon"></i>{{ containers | stoppedcontainers }} stopped</div>
           </div>
-          <div class="pull-right" style="padding-right: 5px;">
+          <div class="pull-right" style="padding-right: 5px">
             <div><i class="fa fa-heartbeat space-right green-icon"></i>{{ containers | healthycontainers }} healthy</div>
             <div><i class="fa fa-heartbeat space-right orange-icon"></i>{{ containers | unhealthycontainers }} unhealthy</div>
           </div>
diff --git a/app/docker/views/docker-features-configuration/docker-features-configuration.html b/app/docker/views/docker-features-configuration/docker-features-configuration.html
index c08d902b8..5dc5029f9 100644
--- a/app/docker/views/docker-features-configuration/docker-features-configuration.html
+++ b/app/docker/views/docker-features-configuration/docker-features-configuration.html
@@ -8,12 +8,10 @@
     <rd-widget>
       <rd-widget-body>
         <form class="form-horizontal" name="$ctrl.form">
-          <div class="col-sm-12 form-section-title">
-            Host and Filesystem
-          </div>
+          <div class="col-sm-12 form-section-title"> Host and Filesystem </div>
           <div ng-if="!$ctrl.isAgent" class="form-group">
             <span class="col-sm-12 text-muted small">
-              <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>
               These features are only available for an Agent enabled environments.
             </span>
           </div>
@@ -44,9 +42,7 @@
             </div>
           </div>
           <!-- auto update window -->
-          <div class="col-sm-12 form-section-title">
-            Change Window Setting
-          </div>
+          <div class="col-sm-12 form-section-title"> Change Window Setting </div>
 
           <div class="form-group">
             <div class="col-sm-12">
@@ -64,9 +60,7 @@
           </div>
 
           <!-- security -->
-          <div class="col-sm-12 form-section-title">
-            Docker Security Settings
-          </div>
+          <div class="col-sm-12 form-section-title"> Docker Security Settings </div>
           <div class="form-group">
             <div class="col-sm-12">
               <por-switch-field
@@ -150,16 +144,14 @@
 
           <div class="form-group" ng-if="$ctrl.isContainerEditDisabled()">
             <span class="col-sm-12 text-muted small">
-              <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>
               Note: The recreate/duplicate/edit feature is currently disabled (for non-admin users) by one or more security settings.
             </span>
           </div>
           <!-- !security -->
 
           <!-- 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 type="button" class="btn btn-primary btn-sm" ng-click="$ctrl.save()" ng-disabled="$ctrl.state.actionInProgress" button-spinner="$ctrl.state.actionInProgress">
diff --git a/app/docker/views/images/build/buildimage.html b/app/docker/views/images/build/buildimage.html
index 96577d004..0d9840696 100644
--- a/app/docker/views/images/build/buildimage.html
+++ b/app/docker/views/images/build/buildimage.html
@@ -11,19 +11,15 @@
           <uib-tab index="0">
             <uib-tab-heading> <i class="fa fa-wrench space-right" aria-hidden="true"></i> Builder </uib-tab-heading>
             <form class="form-horizontal">
-              <div class="col-sm-12 form-section-title">
-                Naming
-              </div>
+              <div class="col-sm-12 form-section-title"> Naming </div>
               <!-- names -->
               <div class="form-group">
-                <span class="col-sm-12 text-muted small">
-                  You can specify multiple names to your image.
-                </span>
+                <span class="col-sm-12 text-muted small"> You can specify multiple names to your image. </span>
               </div>
               <div class="form-group">
                 <div class="col-sm-12">
                   <label class="control-label text-left">Names</label>
-                  <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addImageName()">
+                  <span class="label label-default interactive" style="margin-left: 10px" ng-click="addImageName()">
                     <i class="fa fa-plus-circle" aria-hidden="true"></i> add additional name
                   </span>
                 </div>
@@ -44,8 +40,8 @@
                 </div>
                 <div class="form-group">
                   <div class="col-sm-12">
-                    <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-                      <div ng-repeat="item in formValues.ImageNames track by $index" style="margin-top: 2px;">
+                    <div class="col-sm-12 form-inline" style="margin-top: 10px">
+                      <div ng-repeat="item in formValues.ImageNames track by $index" style="margin-top: 2px">
                         <!-- name-input -->
                         <div class="input-group col-sm-5 input-group-sm">
                           <span class="input-group-addon">name</span>
@@ -69,17 +65,15 @@
               </div>
               <!-- !name-input-list -->
               <!-- build-method -->
-              <div class="col-sm-12 form-section-title">
-                Build method
-              </div>
+              <div class="col-sm-12 form-section-title"> Build method </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="state.BuildType" value="editor" ng-click="toggleEditor()" />
                     <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>
@@ -89,7 +83,7 @@
                     <input type="radio" id="method_upload" ng-model="state.BuildType" value="upload" ng-click="saveEditorContent()" />
                     <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 a tarball or a Dockerfile from your computer</p>
@@ -99,7 +93,7 @@
                     <input type="radio" id="method_url" ng-model="state.BuildType" value="url" ng-click="saveEditorContent()" />
                     <label for="method_url">
                       <div class="boxselector_header">
-                        <i class="fa fa-globe" aria-hidden="true" style="margin-right: 2px;"></i>
+                        <i class="fa fa-globe" aria-hidden="true" style="margin-right: 2px"></i>
                         URL
                       </div>
                       <p>Specify a URL to a file</p>
@@ -110,9 +104,7 @@
               <!-- !build-method -->
               <!-- web-editor -->
               <div ng-show="state.BuildType === '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">
                   <span class="col-sm-12 text-muted small">
                     You can get more information about Dockerfile format in the
@@ -133,9 +125,7 @@
               <!-- !web-editor -->
               <!-- upload -->
               <div ng-show="state.BuildType === '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 Dockerfile or a tar archive containing a Dockerfile from your computer. When using a tarball, the root folder will be used as the build
@@ -145,7 +135,7 @@
                 <div class="form-group">
                   <div class="col-sm-12">
                     <button class="btn btn-sm btn-primary" ngf-select ngf-min-size="10" ng-model="formValues.UploadFile">Select file</button>
-                    <span style="margin-left: 5px;">
+                    <span style="margin-left: 5px">
                       {{ formValues.UploadFile.name }}
                       <i class="fa fa-times red-icon" ng-if="!formValues.UploadFile" aria-hidden="true"></i>
                     </span>
@@ -153,9 +143,7 @@
                 </div>
                 <div ng-if="formValues.UploadFile.type === 'application/gzip' || formValues.UploadFile.type === 'application/x-tar'">
                   <div class="form-group">
-                    <span class="col-sm-12 text-muted small">
-                      Indicate the path to the Dockerfile within the tarball.
-                    </span>
+                    <span class="col-sm-12 text-muted small"> Indicate the path to the Dockerfile within the tarball. </span>
                   </div>
                   <div class="form-group">
                     <label for="image_path" class="col-sm-2 control-label text-left">Dockerfile path</label>
@@ -168,9 +156,7 @@
               <!-- !upload -->
               <!-- url -->
               <div ng-show="state.BuildType === 'url'">
-                <div class="col-sm-12 form-section-title">
-                  URL
-                </div>
+                <div class="col-sm-12 form-section-title"> URL </div>
                 <div class="form-group">
                   <span class="col-sm-12 text-muted small">
                     Specify the URL to a Dockerfile, a tarball or a public Git repository (suffixed by <b>.git</b>). When using a tarball or a Git repository URL, the root folder
@@ -184,9 +170,7 @@
                   </div>
                 </div>
                 <div class="form-group">
-                  <span class="col-sm-12 text-muted small">
-                    Indicate the path to the Dockerfile within the tarball/repository (ignored when using a Dockerfile).
-                  </span>
+                  <span class="col-sm-12 text-muted small"> Indicate the path to the Dockerfile within the tarball/repository (ignored when using a Dockerfile). </span>
                 </div>
                 <div class="form-group">
                   <label for="image_path" class="col-sm-2 control-label text-left">Dockerfile path</label>
@@ -197,17 +181,13 @@
               </div>
               <!-- !url -->
               <div ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
-                <div class="col-sm-12 form-section-title">
-                  Deployment
-                </div>
+                <div class="col-sm-12 form-section-title"> Deployment </div>
                 <!-- node-selection -->
                 <node-selector model="formValues.NodeName"> </node-selector>
                 <!-- !node-selection -->
               </div>
               <!-- 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
@@ -223,7 +203,7 @@
                     <span ng-hide="state.actionInProgress">Build the image</span>
                     <span ng-show="state.actionInProgress">Image building in progress...</span>
                   </button>
-                  <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px;">{{ state.formValidationError }}</span>
+                  <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px">{{ state.formValidationError }}</span>
                 </div>
               </div>
               <!-- !actions -->
diff --git a/app/docker/views/images/edit/image.html b/app/docker/views/images/edit/image.html
index b6e6e6510..41dd92cb2 100644
--- a/app/docker/views/images/edit/image.html
+++ b/app/docker/views/images/edit/image.html
@@ -13,8 +13,8 @@
         <form class="form-horizontal">
           <div class="form-group">
             <div class="row">
-              <div class="pull-left" ng-repeat="tag in image.RepoTags" style="display: table;">
-                <div class="input-group col-md-1" style="padding: 0 15px;">
+              <div class="pull-left" ng-repeat="tag in image.RepoTags" style="display: table">
+                <div class="input-group col-md-1" style="padding: 0 15px">
                   <span class="input-group-addon">{{ tag }}</span>
                   <span class="input-group-btn" authorization="DockerImagePush, DockerImageCreate, DockerImageDelete">
                     <a data-toggle="tooltip" class="btn btn-primary interactive" title="Push to registry" ng-click="pushTag(tag)" authorization="DockerImagePush">
@@ -40,13 +40,13 @@
               </span>
             </div>
             <div class="col-sm-12">
-              <span id="downloadResourceHint" class="createResource" style="display: none; margin-left: 0;">
+              <span id="downloadResourceHint" class="createResource" style="display: none; margin-left: 0">
                 Download in progress...
-                <i class="fa fa-circle-notch fa-spin" aria-hidden="true" style="margin-left: 2px;"></i>
+                <i class="fa fa-circle-notch fa-spin" aria-hidden="true" style="margin-left: 2px"></i>
               </span>
-              <span id="uploadResourceHint" class="createResource" style="display: none; margin-left: 0;">
+              <span id="uploadResourceHint" class="createResource" style="display: none; margin-left: 0">
                 Upload in progress...
-                <i class="fa fa-circle-notch fa-spin" aria-hidden="true" style="margin-left: 2px;"></i>
+                <i class="fa fa-circle-notch fa-spin" aria-hidden="true" style="margin-left: 2px"></i>
               </span>
             </div>
           </div>
@@ -217,7 +217,7 @@
       <rd-widget-body classes="no-padding">
         <table id="image-layers" class="table">
           <thead>
-            <th style="white-space: nowrap;">
+            <th style="white-space: nowrap">
               <a ng-click="order('Order')">
                 Order
                 <span ng-show="sortType == 'Order' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
@@ -241,20 +241,20 @@
           </thead>
           <tbody>
             <tr ng-repeat="layer in history | orderBy:sortType:sortReverse">
-              <td style="white-space: nowrap;">
+              <td style="white-space: nowrap">
                 {{ layer.Order }}
               </td>
-              <td style="white-space: nowrap;">
+              <td style="white-space: nowrap">
                 {{ layer.Size | humansize }}
               </td>
               <td class="expand">
                 <div ng-if="layer.CreatedBy.length > 130">
-                  <span id="layer-command-{{ $index }}-full" style="display: none;">
+                  <span id="layer-command-{{ $index }}-full" style="display: none">
                     {{ layer.CreatedBy | imagelayercommand }}
                   </span>
                   <span id="layer-command-{{ $index }}-short">
                     {{ layer.CreatedBy | imagelayercommand | truncate: 130 }}
-                    <span ng-if="layer.CreatedBy.length > 130" style="margin-left: 5px;">
+                    <span ng-if="layer.CreatedBy.length > 130" style="margin-left: 5px">
                       <a id="layer-command-expander{{ $index }}" class="btn" ng-click="toggleLayerCommand($index)">
                         <i class="fa fa-plus-circle" aria-hidden="true"></i>
                       </a>
diff --git a/app/docker/views/images/images.html b/app/docker/views/images/images.html
index 7130a8bd1..efc7c434c 100644
--- a/app/docker/views/images/images.html
+++ b/app/docker/views/images/images.html
@@ -25,9 +25,7 @@
             check-rate-limits="true"
           >
             <div ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
-              <div class="col-sm-12 form-section-title">
-                Deployment
-              </div>
+              <div class="col-sm-12 form-section-title"> Deployment </div>
               <!-- node-selection -->
               <node-selector model="formValues.NodeName"> </node-selector>
               <!-- !node-selection -->
diff --git a/app/docker/views/images/import/importimage.html b/app/docker/views/images/import/importimage.html
index 7e6c7fcc7..d729471e0 100644
--- a/app/docker/views/images/import/importimage.html
+++ b/app/docker/views/images/import/importimage.html
@@ -9,18 +9,14 @@
       <rd-widget-body>
         <form class="form-horizontal">
           <!-- 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 tar archive containing your images.
-            </span>
+            <span class="col-sm-12 text-muted small"> You can upload a tar archive containing your images. </span>
           </div>
           <div class="form-group">
             <div class="col-sm-12">
               <button type="button" class="btn btn-sm btn-primary" ngf-select ngf-min-size="10" ng-model="formValues.UploadFile">Select file</button>
-              <span style="margin-left: 5px;">
+              <span style="margin-left: 5px">
                 {{ formValues.UploadFile.name }}
                 <i class="fa fa-times red-icon" ng-if="!formValues.UploadFile" aria-hidden="true"></i>
               </span>
@@ -28,9 +24,7 @@
           </div>
           <!-- !upload -->
           <div ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
-            <div class="col-sm-12 form-section-title">
-              Deployment
-            </div>
+            <div class="col-sm-12 form-section-title"> Deployment </div>
             <!-- node-selection -->
             <node-selector model="formValues.NodeName"> </node-selector>
             <!-- !node-selection -->
@@ -55,9 +49,7 @@
             </div>
           </div>
           <!-- 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
@@ -70,7 +62,7 @@
                 <span ng-hide="state.actionInProgress">Upload</span>
                 <span ng-show="state.actionInProgress">Images uploading in progress...</span>
               </button>
-              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px;">{{ state.formValidationError }}</span>
+              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px">{{ state.formValidationError }}</span>
             </div>
           </div>
           <!-- !actions -->
diff --git a/app/docker/views/networks/create/createnetwork.html b/app/docker/views/networks/create/createnetwork.html
index d352268af..95acab6f3 100644
--- a/app/docker/views/networks/create/createnetwork.html
+++ b/app/docker/views/networks/create/createnetwork.html
@@ -16,9 +16,7 @@
             </div>
           </div>
           <!-- !name-input -->
-          <div class="col-sm-12 form-section-title">
-            Driver configuration
-          </div>
+          <div class="col-sm-12 form-section-title"> Driver configuration </div>
           <!-- driver-input -->
           <div class="form-group">
             <label for="network_driver" class="col-sm-2 col-lg-1 control-label text-left">Driver</label>
@@ -32,7 +30,7 @@
           <!-- !driver-input -->
           <!-- driver-options -->
           <div class="form-group">
-            <div class="col-sm-12" style="margin-top: 5px;">
+            <div class="col-sm-12" style="margin-top: 5px">
               <label class="control-label text-left">
                 Driver options
                 <portainer-tooltip
@@ -40,13 +38,13 @@
                   message="Driver options are specific to the selected driver. Please refer to the selected driver documentation."
                 ></portainer-tooltip>
               </label>
-              <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addDriverOption()">
+              <span class="label label-default interactive" style="margin-left: 10px" ng-click="addDriverOption()">
                 <i class="fa fa-plus-circle" aria-hidden="true"></i> add driver option
               </span>
             </div>
             <!-- driver-options-input-list -->
-            <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-              <div ng-repeat="option in formValues.DriverOptions" style="margin-top: 2px;">
+            <div class="col-sm-12 form-inline" style="margin-top: 10px">
+              <div ng-repeat="option in formValues.DriverOptions" style="margin-top: 2px">
                 <div class="input-group col-sm-5 input-group-sm">
                   <span class="input-group-addon">name</span>
                   <input type="text" class="form-control" ng-model="option.name" placeholder="e.g. com.docker.network.bridge.enable_icc" />
@@ -67,9 +65,7 @@
           <network-macvlan-form ng-show="config.Driver === 'macvlan'" data="formValues.Macvlan" application-state="applicationState"></network-macvlan-form>
           <!-- !macvlan-management -->
           <div ng-hide="config.Driver === 'macvlan' && formValues.Macvlan.Scope === 'swarm'">
-            <div class="col-sm-12 form-section-title">
-              IPV4 Network configuration
-            </div>
+            <div class="col-sm-12 form-section-title"> IPV4 Network configuration </div>
             <!-- subnet-gateway-inputs -->
             <div class="form-group">
               <label for="ipv4_network_subnet" class="col-sm-2 col-lg-1 control-label text-left">Subnet</label>
@@ -110,15 +106,13 @@
             </div>
             <!-- !iprange-auxaddr-inputs -->
             <div class="form-group">
-              <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addIPV4AuxAddress()">
+              <span class="label label-default interactive" style="margin-left: 10px" ng-click="addIPV4AuxAddress()">
                 <i class="fa fa-plus-circle" aria-hidden="true"></i> add excluded IP
               </span>
             </div>
           </div>
           <div ng-show="config.Driver === 'bridge' || (config.Driver === 'macvlan' && formValues.Macvlan.Scope !== 'swarm')">
-            <div class="col-sm-12 form-section-title">
-              IPV6 Network configuration
-            </div>
+            <div class="col-sm-12 form-section-title"> IPV6 Network configuration </div>
             <!-- subnet-gateway-inputs -->
             <div class="form-group">
               <label for="ipv6_network_subnet" class="col-sm-2 col-lg-1 control-label text-left">Subnet</label>
@@ -159,23 +153,21 @@
             </div>
             <!-- !iprange-auxaddr-inputs -->
             <div class="form-group">
-              <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addIPV6AuxAddress()">
+              <span class="label label-default interactive" style="margin-left: 10px" ng-click="addIPV6AuxAddress()">
                 <i class="fa fa-plus-circle" aria-hidden="true"></i> add excluded IP
               </span>
             </div>
           </div>
-          <div class="col-sm-12 form-section-title">
-            Advanced configuration
-          </div>
+          <div class="col-sm-12 form-section-title"> Advanced configuration </div>
           <!-- labels -->
           <div class="form-group">
-            <div class="col-sm-12" style="margin-top: 5px;">
+            <div class="col-sm-12" style="margin-top: 5px">
               <label class="control-label text-left">Labels</label>
-              <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addLabel()"> <i class="fa fa-plus-circle" aria-hidden="true"></i> add label </span>
+              <span class="label label-default interactive" style="margin-left: 10px" ng-click="addLabel()"> <i class="fa fa-plus-circle" aria-hidden="true"></i> add label </span>
             </div>
             <!-- labels-input-list -->
-            <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-              <div ng-repeat="label in formValues.Labels" style="margin-top: 2px;">
+            <div class="col-sm-12 form-inline" style="margin-top: 10px">
+              <div ng-repeat="label in formValues.Labels" style="margin-top: 2px">
                 <div class="input-group col-sm-5 input-group-sm">
                   <span class="input-group-addon">name</span>
                   <input type="text" class="form-control" ng-model="label.key" placeholder="e.g. com.example.foo" />
@@ -199,7 +191,7 @@
                 Isolated network
                 <portainer-tooltip position="bottom" message="An isolated network has no inbound or outbound communications."></portainer-tooltip>
               </label>
-              <label name="ownership" class="switch" style="margin-left: 20px;">
+              <label name="ownership" class="switch" style="margin-left: 20px">
                 <input type="checkbox" ng-model="config.Internal" />
                 <i></i>
               </label>
@@ -209,10 +201,8 @@
           <!-- attachable -->
           <div class="form-group" ng-hide="config.Driver === 'macvlan' && formValues.Macvlan.Scope === 'local'">
             <div class="col-sm-12">
-              <label for="attachable" class="control-label text-left">
-                Enable manual container attachment
-              </label>
-              <label name="attachable" class="switch" style="margin-left: 20px;">
+              <label for="attachable" class="control-label text-left"> Enable manual container attachment </label>
+              <label name="attachable" class="switch" style="margin-left: 20px">
                 <input type="checkbox" ng-model="config.Attachable" />
                 <i></i>
               </label>
@@ -227,9 +217,7 @@
               config.Driver !== 'macvlan'
             "
           >
-            <div class="col-sm-12 form-section-title">
-              Deployment
-            </div>
+            <div class="col-sm-12 form-section-title"> Deployment </div>
             <!-- node-selection -->
             <node-selector model="formValues.NodeName"> </node-selector>
             <!-- !node-selection -->
@@ -238,9 +226,7 @@
           <por-access-control-form form-data="formValues.AccessControlData"></por-access-control-form>
           <!-- !access-control -->
           <!-- 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
@@ -253,8 +239,8 @@
                 <span ng-hide="state.actionInProgress">Create the network</span>
                 <span ng-show="state.actionInProgress">Creating network...</span>
               </button>
-              <i id="createResourceSpinner" class="fa fa-cog fa-spin" style="margin-left: 5px; display: none;"></i>
-              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px;">{{ state.formValidationError }}</span>
+              <i id="createResourceSpinner" class="fa fa-cog fa-spin" style="margin-left: 5px; display: none"></i>
+              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px">{{ state.formValidationError }}</span>
             </div>
           </div>
           <!-- !actions -->
diff --git a/app/docker/views/secrets/create/createsecret.html b/app/docker/views/secrets/create/createsecret.html
index 7aeec6072..b3d34c7c4 100644
--- a/app/docker/views/secrets/create/createsecret.html
+++ b/app/docker/views/secrets/create/createsecret.html
@@ -31,19 +31,19 @@
                 Encode secret
                 <portainer-tooltip position="bottom" message="Secrets need to be base64 encoded. Disable this if your secret is already base64 encoded."></portainer-tooltip>
               </label>
-              <label class="switch" style="margin-left: 20px;"> <input type="checkbox" name="encode_secret" ng-model="formValues.encodeSecret" /><i></i> </label>
+              <label class="switch" style="margin-left: 20px"> <input type="checkbox" name="encode_secret" ng-model="formValues.encodeSecret" /><i></i> </label>
             </div>
           </div>
           <!-- !encode-secret -->
           <!-- labels -->
           <div class="form-group">
-            <div class="col-sm-12" style="margin-top: 5px;">
+            <div class="col-sm-12" style="margin-top: 5px">
               <label class="control-label text-left">Labels</label>
-              <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addLabel()"> <i class="fa fa-plus-circle" aria-hidden="true"></i> add label </span>
+              <span class="label label-default interactive" style="margin-left: 10px" ng-click="addLabel()"> <i class="fa fa-plus-circle" aria-hidden="true"></i> add label </span>
             </div>
             <!-- labels-input-list -->
-            <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-              <div ng-repeat="label in formValues.Labels" style="margin-top: 2px;">
+            <div class="col-sm-12 form-inline" style="margin-top: 10px">
+              <div ng-repeat="label in formValues.Labels" style="margin-top: 2px">
                 <div class="input-group col-sm-5 input-group-sm">
                   <span class="input-group-addon">name</span>
                   <input type="text" class="form-control" ng-model="label.key" placeholder="e.g. com.example.foo" />
@@ -64,9 +64,7 @@
           <por-access-control-form form-data="formValues.AccessControlData"></por-access-control-form>
           <!-- !access-control -->
           <!-- 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
@@ -79,7 +77,7 @@
                 <span ng-hide="state.actionInProgress">Create the secret</span>
                 <span ng-show="state.actionInProgress">Creating secret...</span>
               </button>
-              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px;">{{ state.formValidationError }}</span>
+              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px">{{ state.formValidationError }}</span>
             </div>
           </div>
           <!-- !actions -->
diff --git a/app/docker/views/services/create/createservice.html b/app/docker/views/services/create/createservice.html
index 45a0a9f16..a491209ea 100644
--- a/app/docker/views/services/create/createservice.html
+++ b/app/docker/views/services/create/createservice.html
@@ -16,9 +16,7 @@
             </div>
           </div>
           <!-- !name-input -->
-          <div class="col-sm-12 form-section-title">
-            Image configuration
-          </div>
+          <div class="col-sm-12 form-section-title"> Image configuration </div>
           <!-- image-and-registry -->
           <por-image-registry
             model="formValues.RegistryModel"
@@ -32,16 +30,12 @@
           >
           </por-image-registry>
           <!-- !image-and-registry -->
-          <div class="col-sm-12 form-section-title">
-            Scheduling
-          </div>
+          <div class="col-sm-12 form-section-title"> Scheduling </div>
           <!-- scheduling-mode -->
           <div class="form-group">
             <div class="col-sm-12">
-              <label class="control-label text-left">
-                Scheduling mode
-              </label>
-              <div class="btn-group btn-group-sm" style="margin-left: 20px;">
+              <label class="control-label text-left"> Scheduling mode </label>
+              <div class="btn-group btn-group-sm" style="margin-left: 20px">
                 <label class="btn btn-primary" ng-model="formValues.Mode" uib-btn-radio="'global'">Global</label>
                 <label class="btn btn-primary" ng-model="formValues.Mode" uib-btn-radio="'replicated'">Replicated</label>
               </div>
@@ -49,33 +43,29 @@
           </div>
           <div class="form-group form-inline" ng-if="formValues.Mode === 'replicated'">
             <div class="col-sm-12">
-              <label class="control-label text-left">
-                Replicas
-              </label>
-              <input type="number" class="form-control" ng-model="formValues.Replicas" id="replicas" placeholder="e.g. 3" style="margin-left: 20px;" />
+              <label class="control-label text-left"> Replicas </label>
+              <input type="number" class="form-control" ng-model="formValues.Replicas" id="replicas" placeholder="e.g. 3" style="margin-left: 20px" />
             </div>
           </div>
           <!-- !scheduling-mode -->
-          <div class="col-sm-12 form-section-title">
-            Ports configuration
-          </div>
+          <div class="col-sm-12 form-section-title"> Ports configuration </div>
           <!-- port-mapping -->
           <div class="form-group">
-            <div class="col-sm-12" style="margin-top: 5px;">
+            <div class="col-sm-12" style="margin-top: 5px">
               <label class="control-label text-left">Port mapping</label>
-              <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addPortBinding()">
+              <span class="label label-default interactive" style="margin-left: 10px" ng-click="addPortBinding()">
                 <i class="fa fa-plus-circle" aria-hidden="true"></i> map additional port
               </span>
             </div>
-            <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-              <div ng-repeat="portBinding in formValues.Ports" style="margin-top: 2px;">
+            <div class="col-sm-12 form-inline" style="margin-top: 10px">
+              <div ng-repeat="portBinding in formValues.Ports" style="margin-top: 2px">
                 <!-- host-port -->
                 <div class="input-group col-sm-3 input-group-sm">
                   <span class="input-group-addon">host</span>
                   <input type="text" class="form-control" ng-model="portBinding.PublishedPort" placeholder="e.g. 80 or 1.2.3.4:80 (optional)" />
                 </div>
                 <!-- !host-port -->
-                <span style="margin: 0 10px 0 10px;">
+                <span style="margin: 0 10px 0 10px">
                   <i class="fa fa-long-arrow-alt-right" aria-hidden="true"></i>
                 </span>
                 <!-- container-port -->
@@ -106,9 +96,7 @@
           <!-- !port-mapping -->
           <!-- create-webhook -->
           <div ng-if="endpoint.Type !== 4">
-            <div class="col-sm-12 form-section-title">
-              Webhooks
-            </div>
+            <div class="col-sm-12 form-section-title"> Webhooks </div>
             <div class="form-group">
               <div class="col-sm-12">
                 <label class="control-label text-left">
@@ -118,7 +106,7 @@
                     message="Create a webhook (or callback URI) to automate the update of this service. Sending a POST request to this callback URI (without requiring any authentication) will pull the most up-to-date version of the associated image and re-deploy this service."
                   ></portainer-tooltip>
                 </label>
-                <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="formValues.Webhook" /><i></i> </label>
+                <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="formValues.Webhook" /><i></i> </label>
               </div>
             </div>
           </div>
@@ -127,9 +115,7 @@
           <por-access-control-form form-data="formValues.AccessControlData"></por-access-control-form>
           <!-- !access-control -->
           <!-- 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
@@ -142,7 +128,7 @@
                 <span ng-hide="state.actionInProgress">Create the service</span>
                 <span ng-show="state.actionInProgress">Creating service...</span>
               </button>
-              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px;">{{ state.formValidationError }}</span>
+              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px">{{ state.formValidationError }}</span>
             </div>
           </div>
           <!-- !actions -->
@@ -171,10 +157,8 @@
         <div class="tab-content">
           <!-- tab-command -->
           <div class="tab-pane active" id="command">
-            <form class="form-horizontal" style="margin-top: 15px;">
-              <div class="col-sm-12 form-section-title">
-                Command
-              </div>
+            <form class="form-horizontal" style="margin-top: 15px">
+              <div class="col-sm-12 form-section-title"> Command </div>
               <!-- command-input -->
               <div class="form-group">
                 <label for="service_command" class="col-sm-2 col-lg-1 control-label text-left">Command</label>
@@ -203,9 +187,7 @@
                 </div>
               </div>
               <!-- !workdir-user-input -->
-              <div class="col-sm-12 form-section-title">
-                Logging
-              </div>
+              <div class="col-sm-12 form-section-title"> Logging </div>
               <!-- logging-driver -->
               <div class="form-group">
                 <label for="log-driver" class="col-sm-2 col-lg-1 control-label text-left">Driver</label>
@@ -227,7 +209,7 @@
               <!-- !logging-driver -->
               <!-- logging-opts -->
               <div class="form-group">
-                <div class="col-sm-12" style="margin-top: 5px;">
+                <div class="col-sm-12" style="margin-top: 5px">
                   <label class="control-label text-left">
                     Options
                     <portainer-tooltip
@@ -237,15 +219,15 @@
                   </label>
                   <span
                     class="label label-default interactive"
-                    style="margin-left: 10px;"
+                    style="margin-left: 10px"
                     ng-click="!formValues.LogDriverName || formValues.LogDriverName === 'none' || addLogDriverOpt(formValues.LogDriverName)"
                   >
                     <i class="fa fa-plus-circle" aria-hidden="true"></i> add logging driver option
                   </span>
                 </div>
                 <!-- logging-opts-input-list -->
-                <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-                  <div ng-repeat="opt in formValues.LogDriverOpts" style="margin-top: 2px;">
+                <div class="col-sm-12 form-inline" style="margin-top: 10px">
+                  <div ng-repeat="opt in formValues.LogDriverOpts" style="margin-top: 2px">
                     <div class="input-group col-sm-5 input-group-sm">
                       <span class="input-group-addon">option</span>
                       <input type="text" class="form-control" ng-model="opt.name" placeholder="e.g. FOO" />
@@ -267,19 +249,19 @@
           <!-- !tab-command -->
           <!-- tab-volume -->
           <div class="tab-pane" id="volumes">
-            <form class="form-horizontal" style="margin-top: 15px;">
+            <form class="form-horizontal" style="margin-top: 15px">
               <!-- volumes -->
               <div class="form-group">
-                <div class="col-sm-12" style="margin-top: 5px;">
+                <div class="col-sm-12" style="margin-top: 5px">
                   <label class="control-label text-left">Volume mapping</label>
-                  <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addVolume()">
+                  <span class="label label-default interactive" style="margin-left: 10px" ng-click="addVolume()">
                     <i class="fa fa-plus-circle" aria-hidden="true"></i> map additional volume
                   </span>
                 </div>
                 <!-- volumes-input-list -->
-                <div class="col-sm-12 form-inline" style="margin-top: 10px;">
+                <div class="col-sm-12 form-inline" style="margin-top: 10px">
                   <div ng-repeat="volume in formValues.Volumes">
-                    <div class="col-sm-12" style="margin-top: 10px;">
+                    <div class="col-sm-12" style="margin-top: 10px">
                       <!-- volume-line1 -->
                       <div class="col-sm-12 form-inline">
                         <!-- container-path -->
@@ -292,7 +274,7 @@
                         </div>
                         <!-- !container-path -->
                         <!-- volume-type -->
-                        <div class="input-group col-sm-5" style="margin-left: 5px; vertical-align: top;">
+                        <div class="input-group col-sm-5" style="margin-left: 5px; vertical-align: top">
                           <div class="btn-group btn-group-sm" ng-if="allowBindMounts">
                             <label class="btn btn-primary" ng-model="volume.Type" uib-btn-radio="'volume'" ng-click="volume.Source = null">Volume</label>
                             <label class="btn btn-primary" ng-model="volume.Type" uib-btn-radio="'bind'" ng-click="volume.Source = null">Bind</label>
@@ -305,12 +287,12 @@
                       </div>
                       <!-- !volume-line1 -->
                       <!-- volume-line2 -->
-                      <div class="col-sm-12 form-inline" style="margin-top: 5px;">
-                        <div style="height: 30px; display: inline-block; vertical-align: top; display: inline-flex; align-items: center;">
+                      <div class="col-sm-12 form-inline" style="margin-top: 5px">
+                        <div style="height: 30px; display: inline-block; vertical-align: top; display: inline-flex; align-items: center">
                           <i class="fa fa-long-arrow-alt-right" aria-hidden="true"></i>
                         </div>
                         <!-- volume -->
-                        <div class="col-sm-6 input-group" ng-if="volume.Type === 'volume'" style="float: none; padding: 0;">
+                        <div class="col-sm-6 input-group" ng-if="volume.Type === 'volume'" style="float: none; padding: 0">
                           <div class="input-group input-group-sm w-full">
                             <span class="input-group-addon">volume</span>
                             <select
@@ -334,7 +316,7 @@
                         </div>
                         <!-- !bind -->
                         <!-- read-only -->
-                        <div class="input-group input-group-sm col-sm-5" style="margin-left: 5px; vertical-align: top;">
+                        <div class="input-group input-group-sm col-sm-5" style="margin-left: 5px; vertical-align: top">
                           <div class="btn-group btn-group-sm">
                             <label class="btn btn-primary" ng-model="volume.ReadOnly" uib-btn-radio="false">Writable</label>
                             <label class="btn btn-primary" ng-model="volume.ReadOnly" uib-btn-radio="true">Read-only</label>
@@ -354,7 +336,7 @@
           <!-- !tab-volume -->
           <!-- tab-network -->
           <div class="tab-pane" id="network">
-            <form class="form-horizontal" style="margin-top: 15px;">
+            <form class="form-horizontal" style="margin-top: 15px">
               <!-- network-input -->
               <div class="form-group">
                 <label for="container_network" class="col-sm-2 col-lg-1 control-label text-left">Network</label>
@@ -369,15 +351,15 @@
               <!-- !network-input -->
               <!-- extra-networks -->
               <div class="form-group">
-                <div class="col-sm-12" style="margin-top: 5px;">
+                <div class="col-sm-12" style="margin-top: 5px">
                   <label class="control-label text-left">Extra networks</label>
-                  <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addExtraNetwork()">
+                  <span class="label label-default interactive" style="margin-left: 10px" ng-click="addExtraNetwork()">
                     <i class="fa fa-plus-circle" aria-hidden="true"></i> add extra network
                   </span>
                 </div>
                 <!-- network-input-list -->
-                <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-                  <div ng-repeat="network in formValues.ExtraNetworks" style="margin-top: 2px;">
+                <div class="col-sm-12 form-inline" style="margin-top: 10px">
+                  <div ng-repeat="network in formValues.ExtraNetworks" style="margin-top: 2px">
                     <select class="form-control" ng-model="network.Name">
                       <option selected disabled hidden value="">Select a network</option>
                       <option ng-repeat="net in availableNetworks" ng-value="net.Name">{{ net.Name }}</option>
@@ -392,15 +374,15 @@
               <!-- !extra-networks -->
               <!-- extra-hosts-variables -->
               <div class="form-group" ng-if="applicationState.endpoint.apiVersion >= 1.25">
-                <div class="col-sm-12" style="margin-top: 5px;">
+                <div class="col-sm-12" style="margin-top: 5px">
                   <label class="control-label text-left">Hosts file entries</label>
-                  <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addHostsEntry()">
+                  <span class="label label-default interactive" style="margin-left: 10px" ng-click="addHostsEntry()">
                     <i class="fa fa-plus-circle" aria-hidden="true"></i> add additional entry
                   </span>
                 </div>
                 <!-- hosts-input-list -->
-                <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-                  <div ng-repeat="variable in formValues.HostsEntries" style="margin-top: 2px;">
+                <div class="col-sm-12 form-inline" style="margin-top: 10px">
+                  <div ng-repeat="variable in formValues.HostsEntries" style="margin-top: 2px">
                     <div class="input-group col-sm-5 input-group-sm">
                       <span class="input-group-addon">value</span>
                       <input type="text" class="form-control" ng-model="variable.value" placeholder="e.g. host:IP" />
@@ -427,18 +409,18 @@
           <!-- !tab-env -->
           <!-- tab-labels -->
           <div class="tab-pane" id="labels">
-            <form class="form-horizontal" style="margin-top: 15px;">
+            <form class="form-horizontal" style="margin-top: 15px">
               <!-- labels -->
               <div class="form-group">
-                <div class="col-sm-12" style="margin-top: 5px;">
+                <div class="col-sm-12" style="margin-top: 5px">
                   <label class="control-label text-left">Service labels</label>
-                  <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addLabel()">
+                  <span class="label label-default interactive" style="margin-left: 10px" ng-click="addLabel()">
                     <i class="fa fa-plus-circle" aria-hidden="true"></i> add service label
                   </span>
                 </div>
                 <!-- labels-input-list -->
-                <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-                  <div ng-repeat="label in formValues.Labels" style="margin-top: 2px;">
+                <div class="col-sm-12 form-inline" style="margin-top: 10px">
+                  <div ng-repeat="label in formValues.Labels" style="margin-top: 2px">
                     <div class="input-group col-sm-5 input-group-sm">
                       <span class="input-group-addon">name</span>
                       <input type="text" class="form-control" ng-model="label.key" placeholder="e.g. com.example.foo" />
@@ -457,15 +439,15 @@
               <!-- !labels-->
               <!-- container-labels -->
               <div class="form-group">
-                <div class="col-sm-12" style="margin-top: 5px;">
+                <div class="col-sm-12" style="margin-top: 5px">
                   <label class="control-label text-left">Container labels</label>
-                  <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addContainerLabel()">
+                  <span class="label label-default interactive" style="margin-left: 10px" ng-click="addContainerLabel()">
                     <i class="fa fa-plus-circle" aria-hidden="true"></i> add container label
                   </span>
                 </div>
                 <!-- container-labels-input-list -->
-                <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-                  <div ng-repeat="label in formValues.ContainerLabels" style="margin-top: 2px;">
+                <div class="col-sm-12 form-inline" style="margin-top: 10px">
+                  <div ng-repeat="label in formValues.ContainerLabels" style="margin-top: 2px">
                     <div class="input-group col-sm-5 input-group-sm">
                       <span class="input-group-addon">name</span>
                       <input type="text" class="form-control" ng-model="label.key" placeholder="e.g. com.example.foo" />
diff --git a/app/docker/views/services/create/includes/config.html b/app/docker/views/services/create/includes/config.html
index 2e10eb722..b4fa82f2f 100644
--- a/app/docker/views/services/create/includes/config.html
+++ b/app/docker/views/services/create/includes/config.html
@@ -1,17 +1,17 @@
-<form class="form-horizontal" style="margin-top: 15px;">
+<form class="form-horizontal" style="margin-top: 15px">
   <div class="form-group">
-    <div class="col-sm-12" style="margin-top: 5px;">
+    <div class="col-sm-12" style="margin-top: 5px">
       <label class="control-label text-left">Configs</label>
-      <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addConfig()"> <i class="fa fa-plus-circle" aria-hidden="true"></i> add a config </span>
+      <span class="label label-default interactive" style="margin-left: 10px" ng-click="addConfig()"> <i class="fa fa-plus-circle" aria-hidden="true"></i> add a config </span>
     </div>
     <!-- info message -->
-    <div class="form-group" ng-show="formValues.Configs.$invalid" style="margin-bottom: 0px;">
-      <div class="col-sm-12 small text-warning" style="padding-left: 35px; padding-top: 20px;">
+    <div class="form-group" ng-show="formValues.Configs.$invalid" style="margin-bottom: 0px">
+      <div class="col-sm-12 small text-warning" style="padding-left: 35px; padding-top: 20px">
         <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> {{ formValues.Configs.$error }}
       </div>
     </div>
-    <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-      <div ng-repeat="config in formValues.Configs" style="margin-top: 2px;">
+    <div class="col-sm-12 form-inline" style="margin-top: 10px">
+      <div ng-repeat="config in formValues.Configs" style="margin-top: 2px">
         <div class="input-group col-sm-4 input-group-sm">
           <span class="input-group-addon">config</span>
           <select class="form-control" ng-model="config.model" ng-change="checkIfConfigDuplicated()" ng-options="config.Name for config in availableConfigs | orderBy: 'Name'">
diff --git a/app/docker/views/services/create/includes/resources-placement.html b/app/docker/views/services/create/includes/resources-placement.html
index d1c1f0068..1b7baeccf 100644
--- a/app/docker/views/services/create/includes/resources-placement.html
+++ b/app/docker/views/services/create/includes/resources-placement.html
@@ -1,12 +1,8 @@
-<form class="form-horizontal" style="margin-top: 15px;">
-  <div class="col-sm-12 form-section-title">
-    Resources
-  </div>
+<form class="form-horizontal" style="margin-top: 15px">
+  <div class="col-sm-12 form-section-title"> Resources </div>
   <!-- memory-reservation-input -->
   <div class="form-group">
-    <label for="memory-reservation" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px;">
-      Memory reservation
-    </label>
+    <label for="memory-reservation" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px"> Memory reservation </label>
     <div class="col-sm-3">
       <slider model="formValues.MemoryReservation" floor="0" ceil="state.sliderMaxMemory" step="256" ng-if="state.sliderMaxMemory"></slider>
     </div>
@@ -14,73 +10,57 @@
       <input type="number" min="0" class="form-control" ng-model="formValues.MemoryReservation" />
     </div>
     <div class="col-sm-4">
-      <p class="small text-muted" style="margin-top: 7px;">
-        Minimum memory available on a node to run a task (<b>MB</b>)
-      </p>
+      <p class="small text-muted" style="margin-top: 7px"> Minimum memory available on a node to run a task (<b>MB</b>) </p>
     </div>
   </div>
   <!-- !memory-reservation-input -->
   <!-- memory-limit-input -->
   <div class="form-group">
-    <label for="memory-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px;">
-      Memory limit
-    </label>
+    <label for="memory-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px"> Memory limit </label>
     <div class="col-sm-3">
       <slider model="formValues.MemoryLimit" floor="0" ceil="state.sliderMaxMemory" step="256" ng-if="state.sliderMaxMemory"></slider>
     </div>
     <div class="col-sm-2">
       <input type="number" min="0" class="form-control" ng-model="formValues.MemoryLimit" />
     </div>
-    <div class="col-sm-4" style="margin-top: 7px;">
-      <p class="small text-muted">
-        Maximum memory usage per task (<b>MB</b>)
-      </p>
+    <div class="col-sm-4" style="margin-top: 7px">
+      <p class="small text-muted"> Maximum memory usage per task (<b>MB</b>) </p>
     </div>
   </div>
   <!-- !memory-limit-input -->
   <!-- cpu-reservation-input -->
   <div class="form-group">
-    <label for="cpu-reservation" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px;">
-      CPU reservation
-    </label>
+    <label for="cpu-reservation" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px"> CPU reservation </label>
     <div class="col-sm-5">
       <slider model="formValues.CpuReservation" floor="0" ceil="state.sliderMaxCpu" step="0.25" precision="2" ng-if="state.sliderMaxCpu"></slider>
     </div>
-    <div class="col-sm-4" style="margin-top: 20px;">
-      <p class="small text-muted">
-        Minimum CPU available on a node to run a task
-      </p>
+    <div class="col-sm-4" style="margin-top: 20px">
+      <p class="small text-muted"> Minimum CPU available on a node to run a task </p>
     </div>
   </div>
   <!-- !cpu-reservation-input -->
   <!-- cpu-limit-input -->
   <div class="form-group">
-    <label for="cpu-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px;">
-      CPU limit
-    </label>
+    <label for="cpu-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px"> CPU limit </label>
     <div class="col-sm-5">
       <slider model="formValues.CpuLimit" floor="0" ceil="state.sliderMaxCpu" step="0.25" precision="2" ng-if="state.sliderMaxCpu"></slider>
     </div>
-    <div class="col-sm-4" style="margin-top: 20px;">
-      <p class="small text-muted">
-        Maximum CPU usage per task
-      </p>
+    <div class="col-sm-4" style="margin-top: 20px">
+      <p class="small text-muted"> Maximum CPU usage per task </p>
     </div>
   </div>
   <!-- !cpu-limit-input -->
-  <div class="col-sm-12 form-section-title">
-    Placement
-  </div>
+  <div class="col-sm-12 form-section-title"> Placement </div>
   <!-- placement-constraints -->
   <div class="form-group">
-    <div class="col-sm-12" style="margin-top: 5px;">
+    <div class="col-sm-12" style="margin-top: 5px">
       <label class="control-label text-left">Placement constraints</label>
-      <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addPlacementConstraint()">
+      <span class="label label-default interactive" style="margin-left: 10px" ng-click="addPlacementConstraint()">
         <i class="fa fa-plus-circle" aria-hidden="true"></i> placement constraint
       </span>
     </div>
-    <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-      <div ng-repeat="constraint in formValues.PlacementConstraints" style="margin-top: 2px;">
+    <div class="col-sm-12 form-inline" style="margin-top: 10px">
+      <div ng-repeat="constraint in formValues.PlacementConstraints" style="margin-top: 2px">
         <div class="input-group col-sm-4 input-group-sm">
           <span class="input-group-addon">name</span>
           <input type="text" class="form-control" ng-model="constraint.key" placeholder="e.g. node.role" />
@@ -104,14 +84,14 @@
   <!-- !placement-constraints -->
   <!-- placement-preferences -->
   <div class="form-group" ng-if="applicationState.endpoint.apiVersion >= 1.3">
-    <div class="col-sm-12" style="margin-top: 5px;">
+    <div class="col-sm-12" style="margin-top: 5px">
       <label class="control-label text-left">Placement preferences</label>
-      <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addPlacementPreference()">
+      <span class="label label-default interactive" style="margin-left: 10px" ng-click="addPlacementPreference()">
         <i class="fa fa-plus-circle" aria-hidden="true"></i> placement preference
       </span>
     </div>
-    <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-      <div ng-repeat="preference in formValues.PlacementPreferences" style="margin-top: 2px;">
+    <div class="col-sm-12 form-inline" style="margin-top: 10px">
+      <div ng-repeat="preference in formValues.PlacementPreferences" style="margin-top: 2px">
         <div class="input-group col-sm-4 input-group-sm">
           <span class="input-group-addon">strategy</span>
           <input type="text" class="form-control" ng-model="preference.strategy" placeholder="e.g. spread" />
diff --git a/app/docker/views/services/create/includes/secret.html b/app/docker/views/services/create/includes/secret.html
index 7f0a2fe9d..fb7ce1a8a 100644
--- a/app/docker/views/services/create/includes/secret.html
+++ b/app/docker/views/services/create/includes/secret.html
@@ -1,4 +1,4 @@
-<form class="form-horizontal" style="margin-top: 15px;">
+<form class="form-horizontal" style="margin-top: 15px">
   <div class="form-group">
     <div class="col-sm-12 small text-muted">
       By default, secrets will be available under <code>/run/secrets/$SECRET_NAME</code> in containers (Linux) or
@@ -6,18 +6,18 @@
     >
   </div>
   <div class="form-group">
-    <div class="col-sm-12" style="margin-top: 5px;">
+    <div class="col-sm-12" style="margin-top: 5px">
       <label class="control-label text-left">Secrets</label>
-      <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addSecret()"> <i class="fa fa-plus-circle" aria-hidden="true"></i> add a secret </span>
+      <span class="label label-default interactive" style="margin-left: 10px" ng-click="addSecret()"> <i class="fa fa-plus-circle" aria-hidden="true"></i> add a secret </span>
     </div>
     <!-- info message -->
-    <div class="form-group" ng-show="formValues.Secrets.$invalid" style="margin-bottom: 0px;">
-      <div class="col-sm-12 small text-warning" style="padding-left: 35px; padding-top: 20px;">
+    <div class="form-group" ng-show="formValues.Secrets.$invalid" style="margin-bottom: 0px">
+      <div class="col-sm-12 small text-warning" style="padding-left: 35px; padding-top: 20px">
         <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> {{ formValues.Secrets.$error }}
       </div>
     </div>
-    <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-      <div ng-repeat="secret in formValues.Secrets track by $index" style="margin-top: 4px;">
+    <div class="col-sm-12 form-inline" style="margin-top: 10px">
+      <div ng-repeat="secret in formValues.Secrets track by $index" style="margin-top: 4px">
         <div class="input-group col-sm-4 input-group-sm">
           <span class="input-group-addon">secret</span>
           <select class="form-control" ng-model="secret.model" ng-change="checkIfSecretDuplicated()" ng-options="secret.Name for secret in availableSecrets | orderBy: 'Name'">
diff --git a/app/docker/views/services/create/includes/update-restart.html b/app/docker/views/services/create/includes/update-restart.html
index 6438eef9d..200d5389d 100644
--- a/app/docker/views/services/create/includes/update-restart.html
+++ b/app/docker/views/services/create/includes/update-restart.html
@@ -1,7 +1,5 @@
-<form class="form-horizontal" style="margin-top: 15px;">
-  <div class="col-sm-12 form-section-title">
-    Update config
-  </div>
+<form class="form-horizontal" style="margin-top: 15px">
+  <div class="col-sm-12 form-section-title"> Update config </div>
   <!-- parallelism-input -->
   <div class="form-group">
     <label for="parallelism" class="col-sm-3 col-lg-2 control-label text-left">Update parallelism</label>
@@ -9,9 +7,7 @@
       <input type="number" class="form-control" ng-model="formValues.Parallelism" id="parallelism" placeholder="e.g. 1" />
     </div>
     <div class="col-sm-5">
-      <p class="small text-muted">
-        Maximum number of tasks to be updated simultaneously (0 to update all at once).
-      </p>
+      <p class="small text-muted"> Maximum number of tasks to be updated simultaneously (0 to update all at once). </p>
     </div>
   </div>
   <!-- !parallelism-input -->
@@ -25,9 +21,7 @@
       <input type="text" class="form-control" ng-model="formValues.UpdateDelay" id="update-delay" placeholder="e.g. 1m" ng-pattern="/^([0-9]+)(h|m|s|ms|us|ns)$/i" />
     </div>
     <div class="col-sm-5">
-      <p class="small text-muted">
-        Amount of time between updates expressed by a number followed by unit (ns|us|ms|s|m|h). Default value is 0s, 0 seconds.
-      </p>
+      <p class="small text-muted"> Amount of time between updates expressed by a number followed by unit (ns|us|ms|s|m|h). Default value is 0s, 0 seconds. </p>
     </div>
   </div>
   <!-- !delay-input -->
@@ -41,9 +35,7 @@
       </div>
     </div>
     <div class="col-sm-5">
-      <p class="small text-muted">
-        Action taken on failure to start after update.
-      </p>
+      <p class="small text-muted"> Action taken on failure to start after update. </p>
     </div>
   </div>
   <!-- !failureAction-input -->
@@ -57,16 +49,12 @@
       </div>
     </div>
     <div class="col-sm-5">
-      <p class="small text-muted">
-        Operation order on failure.
-      </p>
+      <p class="small text-muted"> Operation order on failure. </p>
     </div>
   </div>
   <!-- !order-input -->
 
-  <div class="col-sm-12 form-section-title">
-    Restart policy
-  </div>
+  <div class="col-sm-12 form-section-title"> Restart policy </div>
   <!-- restartCondition-input -->
   <div class="form-group">
     <label for="restart-condition" class="col-sm-3 col-lg-2 control-label text-left">Restart condition</label>
@@ -78,9 +66,7 @@
       </div>
     </div>
     <div class="col-sm-5">
-      <p class="small text-muted">
-        Restart when condition is met (default condition "any").
-      </p>
+      <p class="small text-muted"> Restart when condition is met (default condition "any"). </p>
     </div>
   </div>
   <!-- !restartCondition-input -->
@@ -94,9 +80,7 @@
       <input type="text" class="form-control" ng-model="formValues.RestartDelay" id="restart-delay" placeholder="e.g. 1m" ng-pattern="/^([0-9]+)(h|m|s|ms|us|ns)$/i" />
     </div>
     <div class="col-sm-5">
-      <p class="small text-muted">
-        Delay between restart attempts expressed by a number followed by unit (ns|us|ms|s|m|h). Default value is 5s, 5 seconds.
-      </p>
+      <p class="small text-muted"> Delay between restart attempts expressed by a number followed by unit (ns|us|ms|s|m|h). Default value is 5s, 5 seconds. </p>
     </div>
   </div>
   <!-- !restartDelay-input -->
@@ -107,9 +91,7 @@
       <input type="number" class="form-control" ng-model="formValues.RestartMaxAttempts" id="restart-max-attempts" placeholder="e.g. 0" />
     </div>
     <div class="col-sm-5">
-      <p class="small text-muted">
-        Maximum attempts to restart a given task before giving up (default value is 0, which means unlimited).
-      </p>
+      <p class="small text-muted"> Maximum attempts to restart a given task before giving up (default value is 0, which means unlimited). </p>
     </div>
   </div>
   <!-- !restartMaxAttempts-input -->
diff --git a/app/docker/views/services/edit/includes/configs.html b/app/docker/views/services/edit/includes/configs.html
index 70cab224f..4eb47e4b9 100644
--- a/app/docker/views/services/edit/includes/configs.html
+++ b/app/docker/views/services/edit/includes/configs.html
@@ -2,14 +2,14 @@
   <rd-widget>
     <rd-widget-header icon="fa-tasks" title-text="Configs"> </rd-widget-header>
     <rd-widget-body classes="no-padding">
-      <div class="form-inline" style="padding: 10px;" authorization="DockerServiceUpdate">
+      <div class="form-inline" style="padding: 10px" authorization="DockerServiceUpdate">
         Add a config:
         <select class="form-control" ng-options="config.Name for config in configs | orderBy: 'Name'" ng-model="newConfig">
           <option selected disabled hidden value="">Select a config</option>
         </select>
         <a class="btn btn-default btn-sm" ng-click="addConfig(service, newConfig)"> <i class="fa fa-plus-circle" aria-hidden="true"></i> add config </a>
       </div>
-      <table class="table" style="margin-top: 5px;">
+      <table class="table" style="margin-top: 5px">
         <thead>
           <tr>
             <th>Name</th>
diff --git a/app/docker/views/services/edit/includes/container-specs.html b/app/docker/views/services/edit/includes/container-specs.html
index 9150de59b..a0c87501a 100644
--- a/app/docker/views/services/edit/includes/container-specs.html
+++ b/app/docker/views/services/edit/includes/container-specs.html
@@ -10,9 +10,7 @@
               ><code ng-if="service.Command">{{ service.Command | command }}</code></td
             >
             <td>
-              <p class="small text-muted" style="margin-top: 10px;">
-                Command to execute.
-              </p>
+              <p class="small text-muted" style="margin-top: 10px"> Command to execute. </p>
             </td>
           </tr>
           <tr>
@@ -21,36 +19,28 @@
               ><code ng-if="service.Arguments">{{ service.Arguments }}</code></td
             >
             <td>
-              <p class="small text-muted" style="margin-top: 10px;">
-                Arguments passed to command in container.
-              </p>
+              <p class="small text-muted" style="margin-top: 10px"> Arguments passed to command in container. </p>
             </td>
           </tr>
           <tr>
             <td>User</td>
             <td>{{ service.User }}</td>
             <td>
-              <p class="small text-muted" style="margin-top: 10px;">
-                Username or UID.
-              </p>
+              <p class="small text-muted" style="margin-top: 10px"> Username or UID. </p>
             </td>
           </tr>
           <tr>
             <td>Working directory</td>
             <td>{{ service.Dir }}</td>
             <td>
-              <p class="small text-muted" style="margin-top: 10px;">
-                Working directory inside the container.
-              </p>
+              <p class="small text-muted" style="margin-top: 10px"> Working directory inside the container. </p>
             </td>
           </tr>
           <tr>
             <td>Stop grace period</td>
             <td>{{ service.StopGracePeriod }}</td>
             <td>
-              <p class="small text-muted" style="margin-top: 10px;">
-                Time to wait before force killing a container (default none).
-              </p>
+              <p class="small text-muted" style="margin-top: 10px"> Time to wait before force killing a container (default none). </p>
             </td>
           </tr>
         </tbody>
diff --git a/app/docker/views/services/edit/includes/logging.html b/app/docker/views/services/edit/includes/logging.html
index 34bc23f7e..783140e7a 100644
--- a/app/docker/views/services/edit/includes/logging.html
+++ b/app/docker/views/services/edit/includes/logging.html
@@ -2,7 +2,7 @@
   <rd-widget>
     <rd-widget-header icon="fa-tasks" title-text="Logging driver"> </rd-widget-header>
     <rd-widget-body classes="no-padding">
-      <div class="form-inline" style="padding: 10px;" authorization="DockerServiceUpdate">
+      <div class="form-inline" style="padding: 10px" authorization="DockerServiceUpdate">
         Driver:
         <select class="form-control" ng-model="service.LogDriverName" ng-change="updateLogDriverName(service)" ng-disabled="isUpdating">
           <option selected value="">Default logging driver</option>
diff --git a/app/docker/views/services/edit/includes/networks.html b/app/docker/views/services/edit/includes/networks.html
index aa3060c10..4470fee18 100644
--- a/app/docker/views/services/edit/includes/networks.html
+++ b/app/docker/views/services/edit/includes/networks.html
@@ -30,7 +30,7 @@
                 ng-change="updateNetwork(service)"
                 ng-options="net.Id as net.Name for net in filterNetworks(swarmNetworks, network)"
                 disable-authorization="DockerServiceUpdate"
-                style="width: initial; min-width: 50%;"
+                style="width: initial; min-width: 50%"
               >
                 <option disabled value="" selected>Select a network</option>
               </select>
diff --git a/app/docker/views/services/edit/includes/resources.html b/app/docker/views/services/edit/includes/resources.html
index b0575e2e5..633dc4ce3 100644
--- a/app/docker/views/services/edit/includes/resources.html
+++ b/app/docker/views/services/edit/includes/resources.html
@@ -5,9 +5,7 @@
       <table class="table">
         <tbody>
           <tr>
-            <td style="vertical-align: middle;">
-              Memory reservation (MB)
-            </td>
+            <td style="vertical-align: middle"> Memory reservation (MB) </td>
             <td>
               <input
                 class="input-sm"
@@ -19,16 +17,12 @@
                 disable-authorization="DockerServiceUpdate"
               />
             </td>
-            <td style="vertical-align: middle;">
-              <p class="small text-muted">
-                Minimum memory available on a node to run a task (set to 0 for unlimited)
-              </p>
+            <td style="vertical-align: middle">
+              <p class="small text-muted"> Minimum memory available on a node to run a task (set to 0 for unlimited) </p>
             </td>
           </tr>
           <tr>
-            <td style="vertical-align: middle;">
-              Memory limit (MB)
-            </td>
+            <td style="vertical-align: middle"> Memory limit (MB) </td>
             <td>
               <input
                 class="input-sm"
@@ -40,17 +34,13 @@
                 disable-authorization="DockerServiceUpdate"
               />
             </td>
-            <td style="vertical-align: middle;">
-              <p class="small text-muted">
-                Maximum memory usage per task (set to 0 for unlimited)
-              </p>
+            <td style="vertical-align: middle">
+              <p class="small text-muted"> Maximum memory usage per task (set to 0 for unlimited) </p>
             </td>
           </tr>
           <tr>
-            <td style="vertical-align: middle;">
-              <div>
-                CPU reservation
-              </div>
+            <td style="vertical-align: middle">
+              <div> CPU reservation </div>
             </td>
             <td>
               <slider
@@ -64,17 +54,13 @@
                 disable-authorization="DockerServiceUpdate"
               ></slider>
             </td>
-            <td style="vertical-align: middle;">
-              <p class="small text-muted">
-                Minimum CPU available on a node to run a task
-              </p>
+            <td style="vertical-align: middle">
+              <p class="small text-muted"> Minimum CPU available on a node to run a task </p>
             </td>
           </tr>
           <tr>
-            <td style="vertical-align: middle;">
-              <div>
-                CPU limit
-              </div>
+            <td style="vertical-align: middle">
+              <div> CPU limit </div>
             </td>
             <td>
               <slider
@@ -88,10 +74,8 @@
                 disable-authorization="DockerServiceUpdate"
               ></slider>
             </td>
-            <td style="vertical-align: middle;">
-              <p class="small text-muted">
-                Maximum CPU usage per task
-              </p>
+            <td style="vertical-align: middle">
+              <p class="small text-muted"> Maximum CPU usage per task </p>
             </td>
           </tr>
         </tbody>
diff --git a/app/docker/views/services/edit/includes/restart.html b/app/docker/views/services/edit/includes/restart.html
index eb645cc25..1e1ebfc66 100644
--- a/app/docker/views/services/edit/includes/restart.html
+++ b/app/docker/views/services/edit/includes/restart.html
@@ -21,9 +21,7 @@
               </div>
             </td>
             <td>
-              <p class="small text-muted" style="margin-top: 10px;">
-                Condition for restart.
-              </p>
+              <p class="small text-muted" style="margin-top: 10px"> Condition for restart. </p>
             </td>
           </tr>
           <tr>
@@ -39,7 +37,7 @@
               />
             </td>
             <td>
-              <p class="small text-muted" style="margin-top: 10px;">
+              <p class="small text-muted" style="margin-top: 10px">
                 Delay between restart attempts expressed by a number followed by unit (ns|us|ms|s|m|h). Default value is 5s, 5 seconds.
               </p>
             </td>
@@ -56,9 +54,7 @@
               />
             </td>
             <td>
-              <p class="small text-muted" style="margin-top: 10px;">
-                Maximum attempts to restart a given task before giving up (default value is 0, which means unlimited).
-              </p>
+              <p class="small text-muted" style="margin-top: 10px"> Maximum attempts to restart a given task before giving up (default value is 0, which means unlimited). </p>
             </td>
           </tr>
           <tr>
@@ -74,7 +70,7 @@
               />
             </td>
             <td>
-              <p class="small text-muted" style="margin-top: 10px;">
+              <p class="small text-muted" style="margin-top: 10px">
                 Time window to evaluate restart attempts expressed by a number followed by unit (ns|us|ms|s|m|h). Default value is 0 seconds, which is unbounded.
               </p>
             </td>
diff --git a/app/docker/views/services/edit/includes/secrets.html b/app/docker/views/services/edit/includes/secrets.html
index 2c36398bd..79e19c634 100644
--- a/app/docker/views/services/edit/includes/secrets.html
+++ b/app/docker/views/services/edit/includes/secrets.html
@@ -2,7 +2,7 @@
   <rd-widget>
     <rd-widget-header icon="fa-tasks" title-text="Secrets"> </rd-widget-header>
     <rd-widget-body classes="no-padding">
-      <div class="form-inline" style="padding: 10px;" authorization="DockerServiceUpdate">
+      <div class="form-inline" style="padding: 10px" authorization="DockerServiceUpdate">
         Add a secret:
         <select class="form-control" ng-options="secret.Name for secret in secrets | orderBy: 'Name'" ng-model="state.addSecret.secret">
           <option selected disabled hidden value="">Select a secret</option>
@@ -17,7 +17,7 @@
         </div>
         <a class="btn btn-default btn-sm" ng-click="addSecret(service, state.addSecret)"> <i class="fa fa-plus-circle" aria-hidden="true"></i> add secret </a>
       </div>
-      <table class="table" style="margin-top: 5px;">
+      <table class="table" style="margin-top: 5px">
         <thead>
           <tr>
             <th>Name</th>
diff --git a/app/docker/views/services/edit/includes/servicelabels.html b/app/docker/views/services/edit/includes/servicelabels.html
index e9a5b268d..f4f151a6c 100644
--- a/app/docker/views/services/edit/includes/servicelabels.html
+++ b/app/docker/views/services/edit/includes/servicelabels.html
@@ -14,12 +14,8 @@
       <table class="table">
         <thead>
           <tr>
-            <th>
-              Label
-            </th>
-            <th>
-              Value
-            </th>
+            <th> Label </th>
+            <th> Value </th>
           </tr>
         </thead>
         <tbody>
diff --git a/app/docker/views/services/edit/includes/updateconfig.html b/app/docker/views/services/edit/includes/updateconfig.html
index bb5a6595d..340e983c1 100644
--- a/app/docker/views/services/edit/includes/updateconfig.html
+++ b/app/docker/views/services/edit/includes/updateconfig.html
@@ -16,9 +16,7 @@
               />
             </td>
             <td>
-              <p class="small text-muted" style="margin-top: 10px;">
-                Maximum number of tasks to be updated simultaneously (0 to update all at once).
-              </p>
+              <p class="small text-muted" style="margin-top: 10px"> Maximum number of tasks to be updated simultaneously (0 to update all at once). </p>
             </td>
           </tr>
           <tr>
@@ -34,9 +32,7 @@
               />
             </td>
             <td>
-              <p class="small text-muted" style="margin-top: 10px;">
-                Amount of time between updates expressed by a number followed by unit (ns|us|ms|s|m|h). Example: 1m.
-              </p>
+              <p class="small text-muted" style="margin-top: 10px"> Amount of time between updates expressed by a number followed by unit (ns|us|ms|s|m|h). Example: 1m. </p>
             </td>
           </tr>
           <tr>
@@ -68,9 +64,7 @@
               </div>
             </td>
             <td>
-              <p class="small text-muted" style="margin-top: 10px;">
-                Action taken on failure to start after update.
-              </p>
+              <p class="small text-muted" style="margin-top: 10px"> Action taken on failure to start after update. </p>
             </td>
           </tr>
           <tr ng-if="applicationState.endpoint.apiVersion >= 1.29">
@@ -102,9 +96,7 @@
               </div>
             </td>
             <td>
-              <p class="small text-muted" style="margin-top: 10px;">
-                Operation order on failure.
-              </p>
+              <p class="small text-muted" style="margin-top: 10px"> Operation order on failure. </p>
             </td>
           </tr>
         </tbody>
diff --git a/app/docker/views/services/edit/service.html b/app/docker/views/services/edit/service.html
index 82cc85bca..3b1de5a71 100644
--- a/app/docker/views/services/edit/service.html
+++ b/app/docker/views/services/edit/service.html
@@ -81,7 +81,7 @@
                   position="top"
                   message="Webhook (or callback URI) used to automate the update of this service. Sending a POST request to this callback URI (without requiring any authentication) will pull the most up-to-date version of the associated image and re-deploy this service."
                 ></portainer-tooltip>
-                <label class="switch" style="margin-left: 20px;">
+                <label class="switch" style="margin-left: 20px">
                   <input disable-authorization="DockerServiceUpdate" type="checkbox" ng-model="WebhookExists" ng-click="updateWebhook(service)" /><i></i>
                 </label>
               </td>
@@ -91,7 +91,7 @@
                   <span><i class="fa fa-copy space-right" aria-hidden="true"></i>Copy link</span>
                 </button>
                 <span>
-                  <i id="copyNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none;"></i>
+                  <i id="copyNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none"></i>
                 </span>
               </td>
             </tr>
diff --git a/app/docker/views/swarm/visualizer/swarmvisualizer.html b/app/docker/views/swarm/visualizer/swarmvisualizer.html
index da55572c8..7e7b8e82e 100644
--- a/app/docker/views/swarm/visualizer/swarmvisualizer.html
+++ b/app/docker/views/swarm/visualizer/swarmvisualizer.html
@@ -34,34 +34,26 @@
           </tbody>
         </table>
         <form class="form-horizontal">
-          <div class="col-sm-12 form-section-title">
-            Options
-          </div>
+          <div class="col-sm-12 form-section-title"> Options </div>
           <div class="form-group">
             <div class="col-sm-12">
-              <label class="control-label text-left">
-                Only display running tasks
-              </label>
-              <label class="switch" style="margin-left: 20px;">
+              <label class="control-label text-left"> Only display running tasks </label>
+              <label class="switch" style="margin-left: 20px">
                 <input type="checkbox" ng-model="state.DisplayOnlyRunningTasks" ng-change="changeDisplayOnlyRunningTasks()" /><i></i>
               </label>
             </div>
             <div class="col-sm-12">
-              <label class="control-label text-left">
-                Display node labels
-              </label>
-              <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="state.DisplayNodeLabels" ng-change="changeDisplayNodeLabels()" /><i></i> </label>
+              <label class="control-label text-left"> Display node labels </label>
+              <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="state.DisplayNodeLabels" ng-change="changeDisplayNodeLabels()" /><i></i> </label>
             </div>
           </div>
         </form>
         <form class="form-horizontal">
-          <div class="col-sm-12 form-section-title">
-            Refresh
-          </div>
+          <div class="col-sm-12 form-section-title"> Refresh </div>
           <div class="form-group">
             <label for="refreshRate" class="col-sm-1 margin-sm-top control-label text-left">
               Rate
-              <i id="refreshRateChange" class="fa fa-check green-icon" aria-hidden="true" style="display: none;"></i>
+              <i id="refreshRateChange" class="fa fa-check green-icon" aria-hidden="true" style="display: none"></i>
             </label>
             <div class="col-sm-2">
               <select id="refreshRate" ng-model="state.refreshRate" ng-change="changeUpdateRepeater()" class="form-control">
diff --git a/app/docker/views/volumes/create/createvolume.html b/app/docker/views/volumes/create/createvolume.html
index 2dc4ef6a4..6310d977b 100644
--- a/app/docker/views/volumes/create/createvolume.html
+++ b/app/docker/views/volumes/create/createvolume.html
@@ -16,9 +16,7 @@
             </div>
           </div>
           <!-- !name-input -->
-          <div class="col-sm-12 form-section-title">
-            Driver configuration
-          </div>
+          <div class="col-sm-12 form-section-title"> Driver configuration </div>
           <!-- driver-input -->
           <div class="form-group">
             <label for="volume_driver" class="col-sm-2 col-md-1 control-label text-left">Driver</label>
@@ -32,7 +30,7 @@
           <!-- !driver-input -->
           <!-- driver-options -->
           <div class="form-group" ng-hide="formValues.CIFSData.useCIFS || formValues.NFSData.useNFS">
-            <div class="col-sm-12" style="margin-top: 5px;">
+            <div class="col-sm-12" style="margin-top: 5px">
               <label class="control-label text-left">
                 Driver options
                 <portainer-tooltip
@@ -40,13 +38,13 @@
                   message="Driver options are specific to the selected driver. Please refer to the selected driver documentation."
                 ></portainer-tooltip>
               </label>
-              <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addDriverOption()">
+              <span class="label label-default interactive" style="margin-left: 10px" ng-click="addDriverOption()">
                 <i class="fa fa-plus-circle" aria-hidden="true"></i> add driver option
               </span>
             </div>
             <!-- driver-options-input-list -->
-            <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-              <div ng-repeat="option in formValues.DriverOptions" style="margin-top: 2px;">
+            <div class="col-sm-12 form-inline" style="margin-top: 10px">
+              <div ng-repeat="option in formValues.DriverOptions" style="margin-top: 2px">
                 <div class="input-group col-sm-5 input-group-sm">
                   <span class="input-group-addon">name</span>
                   <input type="text" class="form-control" ng-model="option.name" placeholder="e.g. mountpoint" />
@@ -65,42 +63,34 @@
           <!-- !driver-options -->
           <!-- nfs-management -->
           <div class="form-group col-md-12">
-            <label for="useNFS" class="control-label text-left">
-              Use NFS volume
-            </label>
-            <label class="switch" style="margin-left: 20px;">
+            <label for="useNFS" class="control-label text-left"> Use NFS volume </label>
+            <label class="switch" style="margin-left: 20px">
               <input type="checkbox" name="useNFS" ng-model="formValues.NFSData.useNFS" ng-click="formValues.CIFSData.useCIFS = false" />
               <i></i>
             </label>
-            <div ng-if="formValues.NFSData.useNFS" class="small text-muted" style="margin-top: 10px;"> Ensure <code>nfs-utils</code> are installed on your hosts. </div>
+            <div ng-if="formValues.NFSData.useNFS" class="small text-muted" style="margin-top: 10px"> Ensure <code>nfs-utils</code> are installed on your hosts. </div>
           </div>
           <volumes-nfs-form data="formValues.NFSData" ng-show="formValues.Driver === 'local'"></volumes-nfs-form>
           <!-- !nfs-management -->
           <!-- cifs-management -->
           <div class="form-group col-md-12">
-            <label for="useCIFS" class="control-label text-left">
-              Use CIFS volume
-            </label>
-            <label class="switch" style="margin-left: 20px;">
+            <label for="useCIFS" class="control-label text-left"> Use CIFS volume </label>
+            <label class="switch" style="margin-left: 20px">
               <input type="checkbox" name="useCIFS" ng-model="formValues.CIFSData.useCIFS" ng-click="formValues.NFSData.useNFS = false" />
               <i></i>
             </label>
-            <div ng-if="formValues.CIFSData.useCIFS" class="small text-muted" style="margin-top: 10px;"> Ensure <code>cifs-utils</code> are installed on your hosts. </div>
+            <div ng-if="formValues.CIFSData.useCIFS" class="small text-muted" style="margin-top: 10px"> Ensure <code>cifs-utils</code> are installed on your hosts. </div>
           </div>
           <volumes-cifs-form data="formValues.CIFSData" ng-show="formValues.Driver === 'local'"></volumes-cifs-form>
           <!-- !cifs-management -->
           <!-- storidge -->
           <div ng-if="formValues.Driver === 'cio:latest'">
-            <div class="col-sm-12 form-section-title">
-              Storidge
-            </div>
+            <div class="col-sm-12 form-section-title"> Storidge </div>
             <storidge-profile-selector storidge-profile="formValues.StoridgeProfile"></storidge-profile-selector>
           </div>
           <!-- storidge -->
           <div ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE' && formValues.Driver === 'local'">
-            <div class="col-sm-12 form-section-title">
-              Deployment
-            </div>
+            <div class="col-sm-12 form-section-title"> Deployment </div>
             <!-- node-selection -->
             <node-selector model="formValues.NodeName"> </node-selector>
             <!-- !node-selection -->
@@ -109,9 +99,7 @@
           <por-access-control-form form-data="formValues.AccessControlData"></por-access-control-form>
           <!-- !access-control -->
           <!-- 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
@@ -124,7 +112,7 @@
                 <span ng-hide="state.actionInProgress">Create the volume</span>
                 <span ng-show="state.actionInProgress">Creating volume...</span>
               </button>
-              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px;">{{ state.formValidationError }}</span>
+              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px">{{ state.formValidationError }}</span>
             </div>
           </div>
           <!-- !actions -->
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/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"
diff --git a/app/index.html b/app/index.html
index ed764d4f3..920e1af72 100644
--- a/app/index.html
+++ b/app/index.html
@@ -1,5 +1,5 @@
-<!DOCTYPE html
-><html lang="en" ng-app="<%= name %>" ng-strict-di>
+<!DOCTYPE html>
+<html lang="en" ng-app="<%= name %>" ng-strict-di>
   <head>
     <meta charset="utf-8" />
     <title>Portainer</title>
@@ -51,9 +51,9 @@
                 </div>
                 <!-- !loading box logo -->
                 <!-- panel -->
-                <div class="row" style="text-align: center;">
+                <div class="row" style="text-align: center">
                   Loading Portainer...
-                  <i class="fa fa-cog fa-spin" style="margin-left: 5px;"></i>
+                  <i class="fa fa-cog fa-spin" style="margin-left: 5px"></i>
                 </div>
                 <!-- !panel -->
               </div>
diff --git a/app/integrations/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html b/app/integrations/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html
index 55754f8e5..446bea312 100644
--- a/app/integrations/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html
+++ b/app/integrations/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.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>
@@ -73,9 +73,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/integrations/storidge/components/drives-datatable/storidgeDrivesDatatable.html b/app/integrations/storidge/components/drives-datatable/storidgeDrivesDatatable.html
index 042b1bab0..eae7519c5 100644
--- a/app/integrations/storidge/components/drives-datatable/storidgeDrivesDatatable.html
+++ b/app/integrations/storidge/components/drives-datatable/storidgeDrivesDatatable.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-primary" ng-click="$ctrl.rescanAction()"> <i class="fa fa-sync space-right" aria-hidden="true"></i>Rescan drives </button>
@@ -72,9 +72,7 @@
                   <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Status' && $ctrl.state.reverseOrder"></i>
                 </a>
               </th>
-              <th>
-                Actions
-              </th>
+              <th> Actions </th>
             </tr>
           </thead>
           <tbody>
@@ -121,9 +119,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/integrations/storidge/components/nodes-datatable/storidgeNodesDatatable.html b/app/integrations/storidge/components/nodes-datatable/storidgeNodesDatatable.html
index 2a2115ccc..00c7489d9 100644
--- a/app/integrations/storidge/components/nodes-datatable/storidgeNodesDatatable.html
+++ b/app/integrations/storidge/components/nodes-datatable/storidgeNodesDatatable.html
@@ -2,12 +2,12 @@
   <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">
         <div class="row">
           <button type="button" class="btn btn-sm btn-primary" ng-click="$ctrl.addNodeAction()"> <i class="fa fa-plus space-right" aria-hidden="true"></i>Add node </button>
-          <div style="margin-bottom: 0px;">
+          <div style="margin-bottom: 0px">
             <span ng-if="$ctrl.addInfo" class="text-muted small">
               To add a node to this cluster, run the following command on your new node
               <code>
@@ -15,7 +15,7 @@
               </code>
               <span class="btn btn-primary btn-sm space-left" ng-click="$ctrl.copyAddNodeCommand()"><i class="fa fa-copy space-right" aria-hidden="true"></i>Copy</span>
               <span>
-                <i id="copyNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none;"></i>
+                <i id="copyNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none"></i>
               </span>
             </span>
           </div>
@@ -95,9 +95,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/integrations/storidge/components/profiles-datatable/storidgeProfilesDatatable.html b/app/integrations/storidge/components/profiles-datatable/storidgeProfilesDatatable.html
index 885a6cab7..f8c615f8b 100644
--- a/app/integrations/storidge/components/profiles-datatable/storidgeProfilesDatatable.html
+++ b/app/integrations/storidge/components/profiles-datatable/storidgeProfilesDatatable.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)">
@@ -65,9 +65,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/integrations/storidge/components/snapshots-datatable/storidgeSnapshotsDatatable.html b/app/integrations/storidge/components/snapshots-datatable/storidgeSnapshotsDatatable.html
index 10e1df84c..ccc716269 100644
--- a/app/integrations/storidge/components/snapshots-datatable/storidgeSnapshotsDatatable.html
+++ b/app/integrations/storidge/components/snapshots-datatable/storidgeSnapshotsDatatable.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)">
@@ -80,9 +80,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/integrations/storidge/components/volume-storidge-info/volumeStoridgeInfo.html b/app/integrations/storidge/components/volume-storidge-info/volumeStoridgeInfo.html
index af83310fd..5a909c884 100644
--- a/app/integrations/storidge/components/volume-storidge-info/volumeStoridgeInfo.html
+++ b/app/integrations/storidge/components/volume-storidge-info/volumeStoridgeInfo.html
@@ -168,15 +168,15 @@
       <!-- !Bandwidth -->
       <!-- labels -->
       <div class="form-group">
-        <div class="col-sm-12" style="margin-top: 5px;">
+        <div class="col-sm-12" style="margin-top: 5px">
           <label class="control-label text-left">Labels</label>
-          <span class="label label-default interactive" style="margin-left: 10px;" ng-click="$ctrl.addLabel()">
+          <span class="label label-default interactive" style="margin-left: 10px" ng-click="$ctrl.addLabel()">
             <i class="fa fa-plus-circle" aria-hidden="true"></i> add label
           </span>
         </div>
         <!-- labels-input-list -->
-        <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-          <div ng-repeat="label in $ctrl.formValues.Labels" style="margin-top: 2px;">
+        <div class="col-sm-12 form-inline" style="margin-top: 10px">
+          <div ng-repeat="label in $ctrl.formValues.Labels" style="margin-top: 2px">
             <div class="input-group col-sm-5 input-group-sm">
               <span class="input-group-addon">name</span>
               <input type="text" class="form-control" ng-model="label.name" placeholder="e.g. com.example.foo" />
diff --git a/app/integrations/storidge/views/cluster/cluster.html b/app/integrations/storidge/views/cluster/cluster.html
index c370a5673..972209783 100644
--- a/app/integrations/storidge/views/cluster/cluster.html
+++ b/app/integrations/storidge/views/cluster/cluster.html
@@ -34,9 +34,7 @@
           </tbody>
         </table>
         <form class="form-horizontal">
-          <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 type="button" class="btn btn-danger btn-sm" ng-click="shutdownCluster()" ng-disabled="state.shutdownInProgress" button-spinner="state.shutdownInProgress">
diff --git a/app/integrations/storidge/views/monitor/monitor.html b/app/integrations/storidge/views/monitor/monitor.html
index 7cf0dfed4..f292b9670 100644
--- a/app/integrations/storidge/views/monitor/monitor.html
+++ b/app/integrations/storidge/views/monitor/monitor.html
@@ -12,10 +12,10 @@
     <rd-widget>
       <rd-widget-header icon="fa-tachometer-alt" title-text="Cluster capacity"></rd-widget-header>
       <rd-widget-body>
-        <div class="chart-container" style="position: relative;">
+        <div class="chart-container" style="position: relative">
           <canvas id="capacityChart" width="770" height="400"></canvas>
         </div>
-        <div style="margin-top: 10px;" ng-if="info">
+        <div style="margin-top: 10px" ng-if="info">
           <table class="table">
             <tbody>
               <tr>
@@ -27,7 +27,7 @@
                 <td>
                   {{ info.ProvisionedCapacity | humansize }}
                   <span ng-if="+info.ProvisionedCapacity >= +info.TotalCapacity">
-                    <i class="fa fa-exclamation-triangle red-icon" aria-hidden="true" style="margin-left: 2px;"></i>
+                    <i class="fa fa-exclamation-triangle red-icon" aria-hidden="true" style="margin-left: 2px"></i>
                   </span>
                 </td>
               </tr>
@@ -45,10 +45,10 @@
     <rd-widget>
       <rd-widget-header icon="fa-chart-area" title-text="IOPS usage"></rd-widget-header>
       <rd-widget-body>
-        <div class="chart-container" style="position: relative;">
+        <div class="chart-container" style="position: relative">
           <canvas id="iopsChart" width="770" height="400"></canvas>
         </div>
-        <div style="margin-top: 10px;" ng-if="info">
+        <div style="margin-top: 10px" ng-if="info">
           <table class="table">
             <tbody>
               <tr>
@@ -60,7 +60,7 @@
                 <td>
                   {{ info.ProvisionedIOPS | number }}
                   <span ng-if="+info.ProvisionedIOPS >= +info.TotalIOPS">
-                    <i class="fa fa-exclamation-triangle red-icon" aria-hidden="true" style="margin-left: 2px;"></i>
+                    <i class="fa fa-exclamation-triangle red-icon" aria-hidden="true" style="margin-left: 2px"></i>
                   </span>
                 </td>
               </tr>
@@ -78,10 +78,10 @@
     <rd-widget>
       <rd-widget-header icon="fa-chart-area" title-text="Bandwith usage"></rd-widget-header>
       <rd-widget-body>
-        <div class="chart-container" style="position: relative;">
+        <div class="chart-container" style="position: relative">
           <canvas id="bandwithChart" width="770" height="400"></canvas>
         </div>
-        <div style="margin-top: 10px;" ng-if="info">
+        <div style="margin-top: 10px" ng-if="info">
           <table class="table">
             <tbody>
               <tr>
@@ -93,7 +93,7 @@
                 <td>
                   {{ info.ProvisionedBandwidth | humansize }}
                   <span ng-if="+info.ProvisionedBandwidth >= +info.TotalBandwidth">
-                    <i class="fa fa-exclamation-triangle red-icon" aria-hidden="true" style="margin-left: 2px;"></i>
+                    <i class="fa fa-exclamation-triangle red-icon" aria-hidden="true" style="margin-left: 2px"></i>
                   </span>
                 </td>
               </tr>
diff --git a/app/integrations/storidge/views/profiles/create/createprofile.html b/app/integrations/storidge/views/profiles/create/createprofile.html
index a8ecbcf3a..56bc3a32f 100644
--- a/app/integrations/storidge/views/profiles/create/createprofile.html
+++ b/app/integrations/storidge/views/profiles/create/createprofile.html
@@ -23,9 +23,7 @@
             </div>
           </div>
           <!-- !name-input -->
-          <div class="col-sm-12 form-section-title">
-            Profile configuration
-          </div>
+          <div class="col-sm-12 form-section-title"> Profile configuration </div>
           <!-- directory -->
           <div class="form-group" ng-class="{ 'has-error': storidgeCreateProfileForm.profile_directory.$invalid }">
             <label for="profile_directory" class="col-sm-2 col-lg-1 control-label text-left">Directory</label>
@@ -110,17 +108,13 @@
           <!-- !Filesystem -->
           <!-- snapshotEnabled -->
           <div class="form-group">
-            <label for="profile_snapshotEnabled" class="col-sm-2 col-lg-1 control-label text-left">
-              Enable snapshots
-            </label>
-            <label class="switch" style="margin-left: 20px;"> <input name="profile_snapshotEnabled" type="checkbox" ng-model="model.SnapshotEnabled" /><i></i> </label>
+            <label for="profile_snapshotEnabled" class="col-sm-2 col-lg-1 control-label text-left"> Enable snapshots </label>
+            <label class="switch" style="margin-left: 20px"> <input name="profile_snapshotEnabled" type="checkbox" ng-model="model.SnapshotEnabled" /><i></i> </label>
           </div>
           <!-- !snapshotEnabled -->
           <!-- snapshotMax -->
           <div class="form-group" ng-if="model.SnapshotEnabled">
-            <label for="profile_snapshotMax" class="col-sm-2 col-lg-1 control-label text-left" style="margin-top: 20px;">
-              Snapshot max
-            </label>
+            <label for="profile_snapshotMax" class="col-sm-2 col-lg-1 control-label text-left" style="margin-top: 20px"> Snapshot max </label>
             <div class="col-sm-4">
               <slider model="model.SnapshotMax" floor="1" ceil="100" step="1"></slider>
             </div>
@@ -128,27 +122,21 @@
               <input type="number" min="1" class="form-control" ng-model="model.SnapshotMax" id="profile_snapshotMax" />
             </div>
             <div class="col-sm-4">
-              <p class="small text-muted" style="margin-top: 7px;">
-                Snapshot max (<b>count</b>)
-              </p>
+              <p class="small text-muted" style="margin-top: 7px"> Snapshot max (<b>count</b>) </p>
             </div>
           </div>
           <!-- !snapshotMax -->
           <!-- snapshotEnabled -->
           <div class="form-group" ng-if="model.SnapshotEnabled">
-            <label for="profile_recurringSnapshotEnabled" class="col-sm-2 col-lg-1 control-label text-left">
-              Enable periodic snapshots
-            </label>
-            <label class="switch" style="margin-left: 20px;">
+            <label for="profile_recurringSnapshotEnabled" class="col-sm-2 col-lg-1 control-label text-left"> Enable periodic snapshots </label>
+            <label class="switch" style="margin-left: 20px">
               <input name="profile_recurringSnapshotEnabled" type="checkbox" ng-model="state.RecurringSnapshotEnabled" /><i></i>
             </label>
           </div>
           <!-- !snapshotEnabled -->
           <!-- snapshotInterval -->
           <div class="form-group" ng-if="model.SnapshotEnabled && state.RecurringSnapshotEnabled">
-            <label for="profile_snapshotInterval" class="col-sm-2 col-lg-1 control-label text-left" style="margin-top: 20px;">
-              Snapshot interval
-            </label>
+            <label for="profile_snapshotInterval" class="col-sm-2 col-lg-1 control-label text-left" style="margin-top: 20px"> Snapshot interval </label>
             <div class="col-sm-4">
               <slider model="model.SnapshotInterval" floor="1" ceil="2880" step="1"></slider>
             </div>
@@ -156,18 +144,14 @@
               <input type="number" min="1" class="form-control" ng-model="model.SnapshotInterval" id="profile_snapshotInterval" />
             </div>
             <div class="col-sm-4">
-              <p class="small text-muted" style="margin-top: 7px;">
-                Snapshot interval (<b>minutes</b>)
-              </p>
+              <p class="small text-muted" style="margin-top: 7px"> Snapshot interval (<b>minutes</b>) </p>
             </div>
           </div>
           <!-- !snapshotInterval -->
           <!-- encryptionEnabled -->
           <div class="form-group">
-            <label for="profile_encryptionEnabled" class="col-sm-2 col-lg-1 control-label text-left">
-              Enable encryption
-            </label>
-            <label class="switch" style="margin-left: 20px;"> <input name="profile_encryptionEnabled" type="checkbox" ng-model="model.EncryptionEnabled" /><i></i> </label>
+            <label for="profile_encryptionEnabled" class="col-sm-2 col-lg-1 control-label text-left"> Enable encryption </label>
+            <label class="switch" style="margin-left: 20px"> <input name="profile_encryptionEnabled" type="checkbox" ng-model="model.EncryptionEnabled" /><i></i> </label>
           </div>
           <!-- !encryptionEnabled -->
           <!-- interfaceType -->
@@ -211,13 +195,13 @@
           <!-- !interfaceConf -->
           <!-- labels -->
           <div class="form-group">
-            <div class="col-sm-12" style="margin-top: 5px;">
+            <div class="col-sm-12" style="margin-top: 5px">
               <label class="control-label text-left">Labels</label>
-              <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addLabel()"> <i class="fa fa-plus-circle" aria-hidden="true"></i> add label </span>
+              <span class="label label-default interactive" style="margin-left: 10px" ng-click="addLabel()"> <i class="fa fa-plus-circle" aria-hidden="true"></i> add label </span>
             </div>
             <!-- labels-input-list -->
-            <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-              <div ng-repeat="label in formValues.Labels" style="margin-top: 2px;">
+            <div class="col-sm-12 form-inline" style="margin-top: 10px">
+              <div ng-repeat="label in formValues.Labels" style="margin-top: 2px">
                 <div class="input-group col-sm-5 input-group-sm">
                   <span class="input-group-addon">name</span>
                   <input type="text" class="form-control" ng-model="label.name" placeholder="e.g. com.example.foo" />
@@ -236,16 +220,12 @@
           <!-- !labels -->
           <!-- iops -->
           <div ng-if="!state.LimitBandwidth || state.NoLimit">
-            <div class="col-sm-12 form-section-title">
-              IOPS
-            </div>
+            <div class="col-sm-12 form-section-title"> IOPS </div>
             <div class="form-group">
               <div class="col-md-1 col-sm-2">
-                <label for="permissions" class="control-label text-left">
-                  Limit IOPS
-                </label>
+                <label for="permissions" class="control-label text-left"> Limit IOPS </label>
               </div>
-              <label class="switch" style="margin-left: 20px;">
+              <label class="switch" style="margin-left: 20px">
                 <input type="checkbox" ng-model="state.LimitIOPS" ng-change="state.NoLimit = (!state.LimitBandwidth && !state.LimitIOPS)" /><i></i>
               </label>
             </div>
@@ -281,16 +261,12 @@
           <!-- !iops -->
           <!-- bandwidth -->
           <div ng-if="!state.LimitIOPS || state.NoLimit">
-            <div class="col-sm-12 form-section-title">
-              Bandwidth
-            </div>
+            <div class="col-sm-12 form-section-title"> Bandwidth </div>
             <div class="form-group">
               <div class="col-md-1 col-sm-2">
-                <label for="permissions" class="control-label text-left">
-                  Limit bandwidth
-                </label>
+                <label for="permissions" class="control-label text-left"> Limit bandwidth </label>
               </div>
-              <label class="switch" style="margin-left: 20px;">
+              <label class="switch" style="margin-left: 20px">
                 <input type="checkbox" ng-model="state.LimitBandwidth" ng-change="state.NoLimit = (!state.LimitBandwidth && !state.LimitIOPS)" /><i></i>
               </label>
             </div>
@@ -324,9 +300,7 @@
             </div>
           </div>
           <!-- !bandwidth -->
-          <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/integrations/storidge/views/profiles/edit/profile.html b/app/integrations/storidge/views/profiles/edit/profile.html
index e02b56312..e636500bd 100644
--- a/app/integrations/storidge/views/profiles/edit/profile.html
+++ b/app/integrations/storidge/views/profiles/edit/profile.html
@@ -16,9 +16,7 @@
             </div>
           </div>
           <!-- !name-input -->
-          <div class="col-sm-12 form-section-title">
-            Profile configuration
-          </div>
+          <div class="col-sm-12 form-section-title"> Profile configuration </div>
           <!-- directory -->
           <div class="form-group" ng-class="{ 'has-error': storidgeUpdateProfileForm.profile_directory.$invalid }">
             <label for="profile_directory" class="col-sm-2 col-lg-1 control-label text-left">Directory</label>
@@ -95,17 +93,13 @@
           <!-- !Filesystem -->
           <!-- snapshotEnabled -->
           <div class="form-group">
-            <label for="profile_snapshotEnabled" class="col-sm-2 col-lg-1 control-label text-left">
-              Enable snapshots
-            </label>
-            <label class="switch" style="margin-left: 20px;"> <input name="profile_snapshotEnabled" type="checkbox" ng-model="profile.SnapshotEnabled" /><i></i> </label>
+            <label for="profile_snapshotEnabled" class="col-sm-2 col-lg-1 control-label text-left"> Enable snapshots </label>
+            <label class="switch" style="margin-left: 20px"> <input name="profile_snapshotEnabled" type="checkbox" ng-model="profile.SnapshotEnabled" /><i></i> </label>
           </div>
           <!-- !snapshotEnabled -->
           <!-- snapshotMax -->
           <div class="form-group" ng-if="profile.SnapshotEnabled">
-            <label for="profile_snapshotMax" class="col-sm-2 col-lg-1 control-label text-left" style="margin-top: 20px;">
-              Snapshot max
-            </label>
+            <label for="profile_snapshotMax" class="col-sm-2 col-lg-1 control-label text-left" style="margin-top: 20px"> Snapshot max </label>
             <div class="col-sm-4">
               <slider model="profile.SnapshotMax" floor="1" ceil="100" step="1"></slider>
             </div>
@@ -113,27 +107,21 @@
               <input type="number" min="1" class="form-control" ng-model="profile.SnapshotMax" id="profile_snapshotMax" />
             </div>
             <div class="col-sm-4">
-              <p class="small text-muted" style="margin-top: 7px;">
-                Snapshot max (<b>count</b>)
-              </p>
+              <p class="small text-muted" style="margin-top: 7px"> Snapshot max (<b>count</b>) </p>
             </div>
           </div>
           <!-- !snapshotMax -->
           <!-- snapshotEnabled -->
           <div class="form-group" ng-if="profile.SnapshotEnabled">
-            <label for="profile_recurringSnapshotEnabled" class="col-sm-2 col-lg-1 control-label text-left">
-              Enable periodic snapshots
-            </label>
-            <label class="switch" style="margin-left: 20px;">
+            <label for="profile_recurringSnapshotEnabled" class="col-sm-2 col-lg-1 control-label text-left"> Enable periodic snapshots </label>
+            <label class="switch" style="margin-left: 20px">
               <input name="profile_recurringSnapshotEnabled" type="checkbox" ng-model="state.RecurringSnapshotEnabled" /><i></i>
             </label>
           </div>
           <!-- !snapshotEnabled -->
           <!-- snapshotInterval -->
           <div class="form-group" ng-if="profile.SnapshotEnabled && state.RecurringSnapshotEnabled">
-            <label for="profile_snapshotInterval" class="col-sm-2 col-lg-1 control-label text-left" style="margin-top: 20px;">
-              Snapshot interval
-            </label>
+            <label for="profile_snapshotInterval" class="col-sm-2 col-lg-1 control-label text-left" style="margin-top: 20px"> Snapshot interval </label>
             <div class="col-sm-4">
               <slider model="profile.SnapshotInterval" floor="1" ceil="2880" step="1"></slider>
             </div>
@@ -141,18 +129,14 @@
               <input type="number" min="1" class="form-control" ng-model="profile.SnapshotInterval" id="profile_snapshotInterval" />
             </div>
             <div class="col-sm-4">
-              <p class="small text-muted" style="margin-top: 7px;">
-                Snapshot interval (<b>minutes</b>)
-              </p>
+              <p class="small text-muted" style="margin-top: 7px"> Snapshot interval (<b>minutes</b>) </p>
             </div>
           </div>
           <!-- !snapshotInterval -->
           <!-- encryptionEnabled -->
           <div class="form-group">
-            <label for="profile_encryptionEnabled" class="col-sm-2 col-lg-1 control-label text-left">
-              Enable encryption
-            </label>
-            <label class="switch" style="margin-left: 20px;"> <input name="profile_encryptionEnabled" type="checkbox" ng-model="profile.EncryptionEnabled" /><i></i> </label>
+            <label for="profile_encryptionEnabled" class="col-sm-2 col-lg-1 control-label text-left"> Enable encryption </label>
+            <label class="switch" style="margin-left: 20px"> <input name="profile_encryptionEnabled" type="checkbox" ng-model="profile.EncryptionEnabled" /><i></i> </label>
           </div>
           <!-- !encryptionEnabled -->
           <!-- interfaceType -->
@@ -196,13 +180,13 @@
           <!-- !interfaceConf -->
           <!-- labels -->
           <div class="form-group">
-            <div class="col-sm-12" style="margin-top: 5px;">
+            <div class="col-sm-12" style="margin-top: 5px">
               <label class="control-label text-left">Labels</label>
-              <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addLabel()"> <i class="fa fa-plus-circle" aria-hidden="true"></i> add label </span>
+              <span class="label label-default interactive" style="margin-left: 10px" ng-click="addLabel()"> <i class="fa fa-plus-circle" aria-hidden="true"></i> add label </span>
             </div>
             <!-- labels-input-list -->
-            <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-              <div ng-repeat="label in formValues.Labels" style="margin-top: 2px;">
+            <div class="col-sm-12 form-inline" style="margin-top: 10px">
+              <div ng-repeat="label in formValues.Labels" style="margin-top: 2px">
                 <div class="input-group col-sm-5 input-group-sm">
                   <span class="input-group-addon">name</span>
                   <input type="text" class="form-control" ng-model="label.name" placeholder="e.g. com.example.foo" />
@@ -221,15 +205,11 @@
           <!-- !labels -->
           <!-- iops -->
           <div ng-if="!state.LimitBandwidth || state.NoLimit">
-            <div class="col-sm-12 form-section-title">
-              IOPS
-            </div>
+            <div class="col-sm-12 form-section-title"> IOPS </div>
             <div class="form-group">
               <div class="col-sm-12">
-                <label for="permissions" class="control-label text-left">
-                  Limit IOPS
-                </label>
-                <label class="switch" style="margin-left: 20px;">
+                <label for="permissions" class="control-label text-left"> Limit IOPS </label>
+                <label class="switch" style="margin-left: 20px">
                   <input type="checkbox" ng-model="state.LimitIOPS" ng-change="state.NoLimit = (!state.LimitBandwidth && !state.LimitIOPS)" /><i></i>
                 </label>
               </div>
@@ -266,15 +246,11 @@
           <!-- !iops -->
           <!-- bandwidth -->
           <div ng-if="!state.LimitIOPS || state.NoLimit">
-            <div class="col-sm-12 form-section-title">
-              Bandwidth
-            </div>
+            <div class="col-sm-12 form-section-title"> Bandwidth </div>
             <div class="form-group">
               <div class="col-sm-12">
-                <label for="permissions" class="control-label text-left">
-                  Limit bandwidth
-                </label>
-                <label class="switch" style="margin-left: 20px;">
+                <label for="permissions" class="control-label text-left"> Limit bandwidth </label>
+                <label class="switch" style="margin-left: 20px">
                   <input type="checkbox" ng-model="state.LimitBandwidth" ng-change="state.NoLimit = (!state.LimitBandwidth && !state.LimitIOPS)" /><i></i>
                 </label>
               </div>
@@ -310,9 +286,7 @@
           </div>
           <!-- !bandwidth -->
           <!-- 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/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html b/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html
index 1da166857..c2a2e74dc 100644
--- a/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html
+++ b/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html
@@ -2,15 +2,13 @@
   <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 ng-if="$ctrl.refreshCallback" class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
             <span uib-dropdown-toggle><i class="fa fa-cog" aria-hidden="true"></i> Table 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">
@@ -18,9 +16,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>
@@ -29,7 +25,7 @@
                         <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>
@@ -142,12 +138,12 @@
                 <a
                   ng-if="item.Status === 'Running' && $ctrl.useServerMetrics"
                   ui-sref="kubernetes.applications.application.stats({ pod: item.PodName, container: item.Name })"
-                  style="margin-right: 10px;"
+                  style="margin-right: 10px"
                 >
                   <i class="fa fa-chart-area" aria-hidden="true"></i> Stats
                 </a>
                 <a ui-sref="kubernetes.applications.application.logs({ pod: item.PodName, container: item.Name })"> <i class="fa fa-file-alt" aria-hidden="true"></i> Logs </a>
-                <a ng-if="item.Status === 'Running'" ui-sref="kubernetes.applications.application.console({ pod: item.PodName, container: item.Name })" style="margin-left: 10px;">
+                <a ng-if="item.Status === 'Running'" ui-sref="kubernetes.applications.application.console({ pod: item.PodName, container: item.Name })" style="margin-left: 10px">
                   <i class="fa fa-terminal" aria-hidden="true"></i> Console
                 </a>
               </td>
@@ -166,9 +162,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/kubernetes/components/datatables/applications-datatable-details/applications-datatable-details.html b/app/kubernetes/components/datatables/applications-datatable-details/applications-datatable-details.html
index 7d9cc659e..2399c36ee 100644
--- a/app/kubernetes/components/datatables/applications-datatable-details/applications-datatable-details.html
+++ b/app/kubernetes/components/datatables/applications-datatable-details/applications-datatable-details.html
@@ -1,7 +1,5 @@
-<div class="col-xs-12 form-section-title">
-  Secrets
-</div>
-<table style="width: 50%;">
+<div class="col-xs-12 form-section-title"> Secrets </div>
+<table style="width: 50%">
   <tbody>
     <tr>
       <td>
diff --git a/app/kubernetes/components/datatables/applications-datatable-url/applications-datatable-url.html b/app/kubernetes/components/datatables/applications-datatable-url/applications-datatable-url.html
index ea25b014c..ccd7e9fbe 100644
--- a/app/kubernetes/components/datatables/applications-datatable-url/applications-datatable-url.html
+++ b/app/kubernetes/components/datatables/applications-datatable-url/applications-datatable-url.html
@@ -1,6 +1,4 @@
 <div class="published-url-container">
-  <div class="text-muted">
-    Published URL
-  </div>
+  <div class="text-muted"> Published URL </div>
   <a ng-href="{{ $ctrl.publishedUrl }}" target="_blank" class="publish-url-link"> <i class="fa fa-external-link-alt" aria-hidden="true"></i> {{ $ctrl.publishedUrl }} </a>
 </div>
diff --git a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
index 6603946bb..9b34d1ac0 100644
--- a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
+++ b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
@@ -2,9 +2,9 @@
   <rd-widget>
     <rd-widget-body classes="no-padding">
       <div ng-if="$ctrl.isPrimary" class="toolBar">
-        <div class="toolBarTitle"> <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }} </div>
-        <span class="small text-muted" style="float: left; margin-top: 5px;" ng-if="$ctrl.isAdmin && !$ctrl.settings.showSystem">
-          <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+        <div class="toolBarTitle"> <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px"></i> {{ $ctrl.titleText }} </div>
+        <span class="small text-muted" style="float: left; margin-top: 5px" ng-if="$ctrl.isAdmin && !$ctrl.settings.showSystem">
+          <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
           System resources are hidden, this can be changed in the table settings.
         </span>
         <div class="settings" data-cy="k8sApp-tableSettings">
@@ -12,9 +12,7 @@
             <span uib-dropdown-toggle><i class="fa fa-cog" aria-hidden="true"></i> Table 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" ng-if="$ctrl.isAdmin">
@@ -32,9 +30,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"
@@ -49,7 +45,7 @@
                         <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>
@@ -147,9 +143,7 @@
                 </div>
                 <div class="dropdown-menu" uib-dropdown-menu>
                   <div class="tableMenu">
-                    <div class="menuHeader">
-                      Filter by application type
-                    </div>
+                    <div class="menuHeader"> Filter by application type </div>
                     <div class="menuContent">
                       <div class="md-checkbox" ng-repeat="filter in $ctrl.filters.state.values track by $index">
                         <input id="filter_state_{{ $index }}" type="checkbox" ng-model="filter.display" ng-change="$ctrl.onStateFilterChange()" />
@@ -162,12 +156,8 @@
                   </div>
                 </div>
               </th>
-              <th>
-                Status
-              </th>
-              <th>
-                Published
-              </th>
+              <th> Status </th>
+              <th> Published </th>
               <th>
                 <a ng-click="$ctrl.changeOrderBy('CreationDate')">
                   Created
@@ -281,9 +271,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/kubernetes/components/datatables/applications-ports-datatable/applicationsPortsDatatable.html b/app/kubernetes/components/datatables/applications-ports-datatable/applicationsPortsDatatable.html
index c04ec53f0..8030c07f3 100644
--- a/app/kubernetes/components/datatables/applications-ports-datatable/applicationsPortsDatatable.html
+++ b/app/kubernetes/components/datatables/applications-ports-datatable/applicationsPortsDatatable.html
@@ -2,9 +2,9 @@
   <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>
-        <span class="small text-muted" style="float: left; margin-top: 5px;" ng-if="$ctrl.isAdmin && !$ctrl.settings.showSystem">
-          <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+        <div class="toolBarTitle"> <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px"></i> {{ $ctrl.titleText }} </div>
+        <span class="small text-muted" style="float: left; margin-top: 5px" ng-if="$ctrl.isAdmin && !$ctrl.settings.showSystem">
+          <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
           System resources are hidden, this can be changed in the table settings.
         </span>
         <div class="settings">
@@ -12,9 +12,7 @@
             <span uib-dropdown-toggle><i class="fa fa-cog" aria-hidden="true"></i> Table 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" ng-if="$ctrl.isAdmin">
@@ -26,9 +24,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>
@@ -37,7 +33,7 @@
                         <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>
@@ -78,9 +74,7 @@
                   <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Name' && $ctrl.state.reverseOrder"></i>
                 </a>
               </th>
-              <th>
-                Publishing mode
-              </th>
+              <th> Publishing mode </th>
               <th>
                 <a ng-click="$ctrl.changeOrderBy('TargetPort')">
                   Exposed port
@@ -95,9 +89,7 @@
                   <i class="fa fa-sort-numeric-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Port' && $ctrl.state.reverseOrder"></i>
                 </a>
               </th>
-              <th>
-                HTTP route
-              </th>
+              <th> HTTP route </th>
             </tr>
           </thead>
           <tbody>
@@ -125,24 +117,24 @@
               <td>
                 <!-- LB -->
                 <span ng-if="item.ServiceType === $ctrl.KubernetesServiceTypes.LOAD_BALANCER">
-                  <span> <i class="fa fa-project-diagram" aria-hidden="true" style="margin-right: 2px;"></i> LoadBalancer </span>
-                  <span class="text-muted small" style="margin-left: 5px;">
+                  <span> <i class="fa fa-project-diagram" aria-hidden="true" style="margin-right: 2px"></i> LoadBalancer </span>
+                  <span class="text-muted small" style="margin-left: 5px">
                     <span ng-if="item.LoadBalancerIPAddress">{{ item.LoadBalancerIPAddress }}</span>
                     <span ng-if="!item.LoadBalancerIPAddress">pending</span>
                   </span>
                 </span>
                 <!-- Internal -->
                 <span ng-if="item.ServiceType === $ctrl.KubernetesServiceTypes.CLUSTER_IP">
-                  <i class="fa fa-list-alt" aria-hidden="true" style="margin-right: 2px;"></i> ClusterIP
+                  <i class="fa fa-list-alt" aria-hidden="true" style="margin-right: 2px"></i> ClusterIP
                 </span>
                 <!-- Cluster -->
-                <span ng-if="item.ServiceType === $ctrl.KubernetesServiceTypes.NODE_PORT"> <i class="fa fa-list" aria-hidden="true" style="margin-right: 2px;"></i> NodePort </span>
+                <span ng-if="item.ServiceType === $ctrl.KubernetesServiceTypes.NODE_PORT"> <i class="fa fa-list" aria-hidden="true" style="margin-right: 2px"></i> NodePort </span>
               </td>
               <!-- Exposed port -->
               <td>
                 <span ng-if="!$ctrl.itemCanExpand(item)">
                   {{ item.Ports[0].Port }}
-                  <a ng-if="item.LoadBalancerIPAddress" ng-href="http://{{ item.LoadBalancerIPAddress }}:{{ item.Ports[0].Port }}" target="_blank" style="margin-left: 5px;">
+                  <a ng-if="item.LoadBalancerIPAddress" ng-href="http://{{ item.LoadBalancerIPAddress }}:{{ item.Ports[0].Port }}" target="_blank" style="margin-left: 5px">
                     <i class="fa fa-external-link-alt" aria-hidden="true"></i> access
                   </a>
                 </span>
@@ -163,7 +155,7 @@
                       tooltip-placement="bottom"
                       tooltip-class="portainer-tooltip"
                       uib-tooltip="Ingress controller IP address not available yet"
-                      style="cursor: pointer;"
+                      style="cursor: pointer"
                       >pending
                     </span>
                     <span ng-if="$ctrl.ruleCanBeDisplayed(item.Ports[0].IngressRules[0])">
@@ -182,7 +174,7 @@
               <td ng-if="!$ctrl.portHasIngressRules(port)">-</td>
               <td ng-if="!$ctrl.portHasIngressRules(port)">
                 {{ port.Port }}
-                <a ng-if="item.LoadBalancerIPAddress" ng-href="http://{{ item.LoadBalancerIPAddress }}:{{ port.Port }}" target="_blank" style="margin-left: 5px;">
+                <a ng-if="item.LoadBalancerIPAddress" ng-href="http://{{ item.LoadBalancerIPAddress }}:{{ port.Port }}" target="_blank" style="margin-left: 5px">
                   <i class="fa fa-external-link-alt" aria-hidden="true"></i> access
                 </a>
               </td>
@@ -200,7 +192,7 @@
               <td>-</td>
               <td>
                 {{ port.Port }}
-                <a ng-if="item.LoadBalancerIPAddress" ng-href="http://{{ item.LoadBalancerIPAddress }}:{{ port.Port }}" target="_blank" style="margin-left: 5px;">
+                <a ng-if="item.LoadBalancerIPAddress" ng-href="http://{{ item.LoadBalancerIPAddress }}:{{ port.Port }}" target="_blank" style="margin-left: 5px">
                   <i class="fa fa-external-link-alt" aria-hidden="true"></i> access
                 </a>
               </td>
@@ -213,7 +205,7 @@
                   tooltip-placement="bottom"
                   tooltip-class="portainer-tooltip"
                   uib-tooltip="Ingress controller IP address not available yet"
-                  style="cursor: pointer;"
+                  style="cursor: pointer"
                   >pending
                 </span>
                 <span ng-if="$ctrl.ruleCanBeDisplayed(rule)">
@@ -240,9 +232,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/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html b/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html
index 078a0f6bf..978ff6739 100644
--- a/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html
+++ b/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html
@@ -2,9 +2,9 @@
   <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>
-        <span class="small text-muted" style="float: left; margin-top: 5px;" ng-if="$ctrl.isAdmin && !$ctrl.settings.showSystem">
-          <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+        <div class="toolBarTitle"> <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px"></i> {{ $ctrl.titleText }} </div>
+        <span class="small text-muted" style="float: left; margin-top: 5px" ng-if="$ctrl.isAdmin && !$ctrl.settings.showSystem">
+          <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
           System resources are hidden, this can be changed in the table settings.
         </span>
         <div class="settings">
@@ -12,9 +12,7 @@
             <span uib-dropdown-toggle><i class="fa fa-cog" aria-hidden="true"></i> Table 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" ng-if="$ctrl.isAdmin">
@@ -26,9 +24,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>
@@ -37,7 +33,7 @@
                         <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>
@@ -71,7 +67,7 @@
         <table class="table table-hover nowrap-cells">
           <thead>
             <tr>
-              <th style="width: 55px;">
+              <th style="width: 55px">
                 <span class="md-checkbox">
                   <input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" />
                   <label for="select_all"></label>
@@ -101,9 +97,7 @@
                   <i class="fa fa-sort-numeric-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Applications.length' && $ctrl.state.reverseOrder"></i>
                 </a>
               </th>
-              <th>
-                Actions
-              </th>
+              <th> Actions </th>
             </tr>
           </thead>
           <tbody>
@@ -149,7 +143,7 @@
               <td></td>
               <td colspan="4">
                 <a ui-sref="kubernetes.applications.application({ name: app.Name, namespace: app.ResourcePool })">{{ app.Name }}</a>
-                <span style="margin-left: 5px;" class="label label-primary image-tag" ng-if="!$ctrl.isSystemNamespace(app.ResourcePool) && $ctrl.isExternalApplication(app)"
+                <span style="margin-left: 5px" class="label label-primary image-tag" ng-if="!$ctrl.isSystemNamespace(app.ResourcePool) && $ctrl.isExternalApplication(app)"
                   >external</span
                 >
               </td>
@@ -168,9 +162,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/kubernetes/components/datatables/configurations-datatable/configurationsDatatable.html b/app/kubernetes/components/datatables/configurations-datatable/configurationsDatatable.html
index 657e4b1a5..30f350a1f 100644
--- a/app/kubernetes/components/datatables/configurations-datatable/configurationsDatatable.html
+++ b/app/kubernetes/components/datatables/configurations-datatable/configurationsDatatable.html
@@ -2,9 +2,9 @@
   <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>
-        <span class="small text-muted" style="float: left; margin-top: 5px;" ng-if="$ctrl.isAdmin && !$ctrl.settings.showSystem">
-          <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+        <div class="toolBarTitle"> <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px"></i> {{ $ctrl.titleText }} </div>
+        <span class="small text-muted" style="float: left; margin-top: 5px" ng-if="$ctrl.isAdmin && !$ctrl.settings.showSystem">
+          <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
           System resources are hidden, this can be changed in the table settings.
         </span>
         <div class="settings">
@@ -12,9 +12,7 @@
             <span uib-dropdown-toggle data-cy="k8sConfig-configSettingsButton"><i class="fa fa-cog" aria-hidden="true"></i> Table 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" ng-if="$ctrl.isAdmin">
@@ -32,9 +30,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>
@@ -43,7 +39,7 @@
                         <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>
@@ -158,9 +154,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="k8sConfig-paginationDropdown">
                 <option value="0">All</option>
                 <option value="10">10</option>
diff --git a/app/kubernetes/components/datatables/events-datatable/eventsDatatable.html b/app/kubernetes/components/datatables/events-datatable/eventsDatatable.html
index 4f4da0287..939bc9e88 100644
--- a/app/kubernetes/components/datatables/events-datatable/eventsDatatable.html
+++ b/app/kubernetes/components/datatables/events-datatable/eventsDatatable.html
@@ -2,15 +2,13 @@
   <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 class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
             <span uib-dropdown-toggle><i class="fa fa-cog" aria-hidden="true"></i> Table 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">
@@ -18,9 +16,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>
@@ -29,7 +25,7 @@
                         <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>
@@ -115,9 +111,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"
diff --git a/app/kubernetes/components/datatables/integrated-applications-datatable/integratedApplicationsDatatable.html b/app/kubernetes/components/datatables/integrated-applications-datatable/integratedApplicationsDatatable.html
index 884302532..b1caa6bcc 100644
--- a/app/kubernetes/components/datatables/integrated-applications-datatable/integratedApplicationsDatatable.html
+++ b/app/kubernetes/components/datatables/integrated-applications-datatable/integratedApplicationsDatatable.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 ng-if="$ctrl.refreshCallback" class="settings">
@@ -11,9 +11,7 @@
             <span uib-dropdown-toggle> <i class="fa fa-cog" aria-hidden="true"></i> Table 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">
@@ -21,9 +19,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>
@@ -32,7 +28,7 @@
                         <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>
@@ -107,9 +103,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/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatable.html b/app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatable.html
index bc23fdef0..6539f5dfd 100644
--- a/app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatable.html
+++ b/app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatable.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 class="settings">
@@ -11,9 +11,7 @@
             <span uib-dropdown-toggle> <i class="fa fa-cog" aria-hidden="true"></i> Table 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">
@@ -21,9 +19,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>
@@ -32,7 +28,7 @@
                         <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>
@@ -111,8 +107,8 @@
             >
               <td>
                 <a ui-sref="kubernetes.applications.application({ name: item.Name, namespace: item.ResourcePool })">{{ item.Name }}</a>
-                <span style="margin-left: 5px;" class="label label-info image-tag" ng-if="$ctrl.isSystemNamespace(item)">system</span>
-                <span style="margin-left: 5px;" class="label label-primary image-tag" ng-if="!$ctrl.isSystemNamespace(item) && $ctrl.isExternalApplication(item)">external</span>
+                <span style="margin-left: 5px" class="label label-info image-tag" ng-if="$ctrl.isSystemNamespace(item)">system</span>
+                <span style="margin-left: 5px" class="label label-primary image-tag" ng-if="!$ctrl.isSystemNamespace(item) && $ctrl.isExternalApplication(item)">external</span>
               </td>
               <td>{{ item.StackName || '-' }}</td>
               <td>
@@ -138,9 +134,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/kubernetes/components/datatables/nodes-datatable/nodesDatatable.html b/app/kubernetes/components/datatables/nodes-datatable/nodesDatatable.html
index 837bad408..cea99f863 100644
--- a/app/kubernetes/components/datatables/nodes-datatable/nodesDatatable.html
+++ b/app/kubernetes/components/datatables/nodes-datatable/nodesDatatable.html
@@ -2,15 +2,13 @@
   <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 class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
             <span uib-dropdown-toggle><i class="fa fa-cog" aria-hidden="true"></i> Table 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">
@@ -18,9 +16,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>
@@ -29,7 +25,7 @@
                         <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>
@@ -107,9 +103,7 @@
                   <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'IPAddress' && $ctrl.state.reverseOrder"></i>
                 </a>
               </th>
-              <th ng-if="$ctrl.useServerMetrics">
-                Actions
-              </th>
+              <th ng-if="$ctrl.useServerMetrics"> Actions </th>
             </tr>
           </thead>
           <tbody>
@@ -120,7 +114,7 @@
                 <a ui-sref="kubernetes.cluster.node({ name: item.Name })">
                   {{ item.Name }}
                 </a>
-                <span class="label label-primary image-tag" style="margin-left: 5px;" ng-if="item.Api">api</span>
+                <span class="label label-primary image-tag" style="margin-left: 5px" ng-if="item.Api">api</span>
               </td>
               <td ng-if="!$ctrl.isAdmin"> {{ item.Name }}</td>
               <td>{{ item.Role }}</td>
@@ -132,7 +126,7 @@
               <td>{{ item.Version }}</td>
               <td>{{ item.IPAddress }}</td>
               <td ng-if="$ctrl.useServerMetrics">
-                <a ui-sref="kubernetes.cluster.node.stats({ name: item.Name })" style="cursor: pointer;"> <i class="fa fa-chart-area" aria-hidden="true"></i> Stats </a>
+                <a ui-sref="kubernetes.cluster.node.stats({ name: item.Name })" style="cursor: pointer"> <i class="fa fa-chart-area" aria-hidden="true"></i> Stats </a>
               </td>
             </tr>
             <tr ng-if="!$ctrl.dataset">
@@ -149,9 +143,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/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatable.html b/app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatable.html
index 7c970f309..54e2e9348 100644
--- a/app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatable.html
+++ b/app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatable.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 ng-if="$ctrl.refreshCallback" class="settings">
@@ -11,9 +11,7 @@
             <span uib-dropdown-toggle> <i class="fa fa-cog" aria-hidden="true"></i> Table 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">
@@ -21,9 +19,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>
@@ -32,7 +28,7 @@
                         <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>
@@ -104,7 +100,7 @@
             >
               <td>
                 <a ui-sref="kubernetes.applications.application({ name: item.Name, namespace: item.ResourcePool })">{{ item.Name }}</a>
-                <span style="margin-left: 5px;" class="label label-primary image-tag" ng-if="$ctrl.isExternalApplication(item)">external</span>
+                <span style="margin-left: 5px" class="label label-primary image-tag" ng-if="$ctrl.isExternalApplication(item)">external</span>
               </td>
               <td>{{ item.StackName || '-' }}</td>
               <td title="{{ item.Image }}"
@@ -127,9 +123,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/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html b/app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html
index 4efc7ebf8..d5ce7b7a0 100644
--- a/app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html
+++ b/app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html
@@ -2,9 +2,9 @@
   <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>
-        <span class="small text-muted" style="float: left; margin-top: 5px;" ng-if="$ctrl.isAdmin && !$ctrl.settings.showSystem">
-          <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+        <div class="toolBarTitle"> <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px"></i> {{ $ctrl.titleText }} </div>
+        <span class="small text-muted" style="float: left; margin-top: 5px" ng-if="$ctrl.isAdmin && !$ctrl.settings.showSystem">
+          <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
           System resources are hidden, this can be changed in the table settings.
         </span>
         <div class="settings">
@@ -12,9 +12,7 @@
             <span uib-dropdown-toggle><i class="fa fa-cog" aria-hidden="true"></i> Table 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" ng-if="$ctrl.isAdmin">
@@ -26,9 +24,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>
@@ -37,7 +33,7 @@
                         <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>
@@ -116,9 +112,7 @@
                   <i class="fa fa-sort-numeric-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'CreationDate' && $ctrl.state.reverseOrder"></i>
                 </a>
               </th>
-              <th ng-if="$ctrl.isAdmin">
-                Actions
-              </th>
+              <th ng-if="$ctrl.isAdmin"> Actions </th>
             </tr>
           </thead>
           <tbody>
@@ -132,12 +126,12 @@
                   <label for="select_{{ $index }}"></label>
                 </span>
                 <a ui-sref="kubernetes.resourcePools.resourcePool({ id: item.Namespace.Name })">{{ item.Namespace.Name }}</a>
-                <span style="margin-left: 5px;" class="label label-info image-tag" ng-if="$ctrl.isSystemNamespace(item)">system</span>
+                <span style="margin-left: 5px" class="label label-info image-tag" ng-if="$ctrl.isSystemNamespace(item)">system</span>
               </td>
               <td>
                 <span class="label label-{{ $ctrl.namespaceStatusColor(item.Namespace.Status) }}">{{ item.Namespace.Status }}</span>
               </td>
-              <td> <i class="fa {{ item.Quota ? 'fa-toggle-on' : 'fa-toggle-off' }}" aria-hidden="true" style="margin-right: 2px;"></i> {{ item.Quota ? 'Yes' : 'No' }} </td>
+              <td> <i class="fa {{ item.Quota ? 'fa-toggle-on' : 'fa-toggle-off' }}" aria-hidden="true" style="margin-right: 2px"></i> {{ item.Quota ? 'Yes' : 'No' }} </td>
               <td>{{ item.Namespace.CreationDate | getisodate }} {{ item.Namespace.ResourcePoolOwner ? 'by ' + item.Namespace.ResourcePoolOwner : '' }}</td>
               <td ng-if="$ctrl.isAdmin">
                 <a ng-if="$ctrl.canManageAccess(item)" ui-sref="kubernetes.resourcePools.resourcePool.access({id: item.Namespace.Name})">
@@ -160,9 +154,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/kubernetes/components/datatables/volumes-datatable/volumesDatatable.html b/app/kubernetes/components/datatables/volumes-datatable/volumesDatatable.html
index 5951594ba..5bdae7212 100644
--- a/app/kubernetes/components/datatables/volumes-datatable/volumesDatatable.html
+++ b/app/kubernetes/components/datatables/volumes-datatable/volumesDatatable.html
@@ -2,19 +2,25 @@
   <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>
-        <span class="small text-muted" style="float: left; margin-top: 5px;" ng-if="$ctrl.isAdmin && !$ctrl.settings.showSystem">
-          <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+        <div class="toolBarTitle"> <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px"></i> {{ $ctrl.titleText }} </div>
+        <span class="small text-muted" style="float: left; margin-top: 5px" ng-if="$ctrl.isAdmin && !$ctrl.settings.showSystem">
+          <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
           System resources are hidden, this can be changed in the table settings.
         </span>
         <div class="settings">
-          <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open" data-cy="k8s-vol-table-settings">
+          <span
+            class="setting"
+            ng-class="{ 'setting-active': $ctrl.settings.open }"
+            uib-dropdown
+            dropdown-append-to-body
+            auto-close="disabled"
+            is-open="$ctrl.settings.open"
+            data-cy="k8s-vol-table-settings"
+          >
             <span uib-dropdown-toggle><i class="fa fa-cog" aria-hidden="true"></i> Table 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" ng-if="$ctrl.isAdmin">
@@ -26,9 +32,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>
@@ -37,7 +41,7 @@
                         <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>
@@ -176,9 +180,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/kubernetes/components/helm/helm-templates/helm-add-repository/helm-add-repository.html b/app/kubernetes/components/helm/helm-templates/helm-add-repository/helm-add-repository.html
index dafc32032..09aa76313 100644
--- a/app/kubernetes/components/helm/helm-templates/helm-add-repository/helm-add-repository.html
+++ b/app/kubernetes/components/helm/helm-templates/helm-add-repository/helm-add-repository.html
@@ -4,9 +4,7 @@
     <div class="actionBar">
       <form class="form-horizontal" name="addUserHelmRepoForm">
         <div class="form-group">
-          <span class="col-sm-12 text-muted small">
-            Add a Helm repository. All Helm charts in the repository will be added to the list.
-          </span>
+          <span class="col-sm-12 text-muted small"> Add a Helm repository. All Helm charts in the repository will be added to the list. </span>
         </div>
 
         <div class="form-group">
diff --git a/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list-item/helm-templates-list-item.html b/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list-item/helm-templates-list-item.html
index 2bade37a0..c36dfcede 100644
--- a/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list-item/helm-templates-list-item.html
+++ b/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list-item/helm-templates-list-item.html
@@ -21,9 +21,7 @@
             <span>
               <i class="fa fa-dharmachakra" aria-hidden="true"></i>
             </span>
-            <span>
-              Helm
-            </span>
+            <span> Helm </span>
           </span>
         </span>
       </div>
diff --git a/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list.html b/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list.html
index 7993acfb7..d10d933ac 100644
--- a/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list.html
+++ b/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list.html
@@ -2,12 +2,12 @@
   <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">
         <div>
-          <span style="width: 25%;">
+          <span style="width: 25%">
             <ui-select ng-model="$ctrl.state.selectedCategory" theme="bootstrap">
               <ui-select-match placeholder="Select a category">
                 <a class="btn btn-xs btn-link pull-right" ng-click="$ctrl.clearCategory()"><i class="glyphicon glyphicon-remove"></i></a>
@@ -21,7 +21,7 @@
         </div>
       </div>
 
-      <div class="searchBar" style="border-top: 2px solid #f6f6f6;">
+      <div class="searchBar" style="border-top: 2px solid #f6f6f6">
         <i class="fa fa-search searchIcon" aria-hidden="true"></i>
         <input
           type="text"
@@ -44,13 +44,9 @@
         </helm-templates-list-item>
         <div ng-if="$ctrl.loading" class="text-center text-muted">
           Loading...
-          <div class="text-center text-muted">
-            Initial download of Helm Charts can take a few minutes
-          </div>
-        </div>
-        <div ng-if="!$ctrl.loading && $ctrl.charts.length === 0" class="text-center text-muted">
-          No helm charts available.
+          <div class="text-center text-muted"> Initial download of Helm Charts can take a few minutes </div>
         </div>
+        <div ng-if="!$ctrl.loading && $ctrl.charts.length === 0" class="text-center text-muted"> No helm charts available. </div>
       </div>
     </rd-widget-body>
   </rd-widget>
diff --git a/app/kubernetes/components/helm/helm-templates/helm-templates.html b/app/kubernetes/components/helm/helm-templates/helm-templates.html
index 454f8b501..3ccc2ead0 100644
--- a/app/kubernetes/components/helm/helm-templates/helm-templates.html
+++ b/app/kubernetes/components/helm/helm-templates/helm-templates.html
@@ -1,15 +1,13 @@
-<kubernetes-view-header id="view-top" title="Helm" state="kubernetes.templates.helm" view-ready="true">
-  Charts
-</kubernetes-view-header>
+<kubernetes-view-header id="view-top" title="Helm" state="kubernetes.templates.helm" view-ready="true"> Charts </kubernetes-view-header>
 
 <information-panel title-text="Information" ng-if="!$ctrl.state.chart">
   <span class="small text-muted">
     <p>
-      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
       This is a first version for Helm charts, for more information see this <a href="https://www.portainer.io/blog/portainer-now-with-helm-support" target="_blank">blog post</a>.
     </p>
     <p ng-if="$ctrl.state.globalRepository === ''">
-      <i class="fa fa-exclamation-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+      <i class="fa fa-exclamation-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
       <span>The Global Helm Repository is not configured.</span>
       <a ng-if="$ctrl.state.isAdmin" ui-sref="portainer.settings">Configure Global Helm Repository in Settings</a>
     </p>
@@ -25,9 +23,7 @@
         <form class="form-horizontal" name="$ctrl.helmTemplateCreationForm">
           <!-- description -->
           <div>
-            <div class="col-sm-12 form-section-title">
-              Description
-            </div>
+            <div class="col-sm-12 form-section-title"> Description </div>
             <div class="form-group">
               <div class="col-sm-12">
                 <div class="template-note" ng-bind-html="$ctrl.state.chart.description"></div>
@@ -35,9 +31,7 @@
             </div>
           </div>
           <!-- !description -->
-          <div class="col-sm-12 form-section-title">
-            Configuration
-          </div>
+          <div class="col-sm-12 form-section-title"> Configuration </div>
           <!-- namespace-input -->
           <div class="form-group" ng-if="$ctrl.state.resourcePool">
             <label for="resource-pool-selector" class="col-sm-2 control-label text-left">Namespace</label>
@@ -55,7 +49,7 @@
 
           <div class="form-group" ng-if="!$ctrl.state.resourcePool">
             <div class="col-sm-12 small text-muted">
-              <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+              <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
               You do not have access to any namespace. Contact your administrator to get access to a namespace.
             </div>
           </div>
@@ -102,9 +96,7 @@
           <div ng-if="$ctrl.state.showCustomValues">
             <!-- web-editor -->
             <div>
-              <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">
                 <span class="col-sm-12 text-muted small">
                   You can get more information about Helm values file format in the
@@ -127,9 +119,7 @@
           </div>
           <!-- !values override -->
           <!-- helm 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/kubernetes/components/kube-services/kube-services.html b/app/kubernetes/components/kube-services/kube-services.html
index 35a83c8ca..fc7dde9c6 100644
--- a/app/kubernetes/components/kube-services/kube-services.html
+++ b/app/kubernetes/components/kube-services/kube-services.html
@@ -1,12 +1,10 @@
-<div class="col-sm-12 form-section-title">
-  Publishing the application
-</div>
+<div class="col-sm-12 form-section-title"> Publishing the application </div>
 
 <div class="form-group">
   <div class="col-sm-12 form-inline">
-    <div class="col-sm-5" style="padding-left: 0px;">
+    <div class="col-sm-5" style="padding-left: 0px">
       <select class="form-control" ng-model="$ctrl.state.selected" ng-options="item.typeValue as item.typeName for item in $ctrl.state.serviceType"></select>
-      <button type="button" class="btn btn-sm btn-default" style="margin-left: 0;" ng-click="$ctrl.addEntry( $ctrl.state.selected )" data-cy="k8sConfigCreate-createEntryButton">
+      <button type="button" class="btn btn-sm btn-default" style="margin-left: 0" ng-click="$ctrl.addEntry( $ctrl.state.selected )" data-cy="k8sConfigCreate-createEntryButton">
         <i class="fa fa-plus-circle" aria-hidden="true"></i> Create service
       </button>
     </div>
@@ -14,10 +12,10 @@
 </div>
 
 <div class="form-group">
-  <div class="col-sm-12 form-inline" style="margin-top: 20px;" ng-repeat="service in $ctrl.formValues.Services">
+  <div class="col-sm-12 form-inline" style="margin-top: 20px" ng-repeat="service in $ctrl.formValues.Services">
     <div ng-if="!$ctrl.formValues.Services[$index].Ingress">
       <div class="text-muted">
-        <i class="{{ $ctrl.iconStyle(service.Type) }}" aria-hidden="true" style="margin-right: 2px;"></i>
+        <i class="{{ $ctrl.iconStyle(service.Type) }}" aria-hidden="true" style="margin-right: 2px"></i>
         {{ $ctrl.serviceType(service.Type) }}
       </div>
       <kube-services-item-view
@@ -31,7 +29,7 @@
       <button
         type="button"
         class="btn btn-sm btn-danger space-right"
-        style="margin-left: 0; margin-top: 10px;"
+        style="margin-left: 0; margin-top: 10px"
         ng-click="$ctrl.deleteService( $index )"
         data-cy="k8sConfigCreate-removeButton"
       >
@@ -41,24 +39,24 @@
 
     <div ng-if="$ctrl.formValues.Services[$index].Ingress && $ctrl.formValues.OriginalIngresses.length === 0">
       <div class="text-muted">
-        <i class="fa fa-route" aria-hidden="true" style="margin-right: 2px;"></i>
+        <i class="fa fa-route" aria-hidden="true" style="margin-right: 2px"></i>
         Ingress
       </div>
       <div ng-if="$ctrl.isAdmin()" class="small text-warning">
-        <p style="margin-top: 10px;">
+        <p style="margin-top: 10px">
           <i class="fa fa-exclamation-circle" aria-hidden="true"></i> Ingress is not configured in this namespace, select another namespace or click
           <a ui-sref="portainer.k8sendpoint.kubernetesConfig({id: $ctrl.state.endpointId})">here</a> to configure ingress.
         </p>
       </div>
       <div ng-if="!$ctrl.isAdmin()" class="small text-warning">
-        <p style="margin-top: 10px;">
+        <p style="margin-top: 10px">
           <i class="fa fa-exclamation-circle" aria-hidden="true"></i> Ingress is not configured in this namespace, select another namespace or contact your administrator.
         </p>
       </div>
       <button
         type="button"
         class="btn btn-sm btn-danger space-right"
-        style="margin-left: 0; margin-top: 10px;"
+        style="margin-left: 0; margin-top: 10px"
         ng-click="$ctrl.deleteService( $index )"
         data-cy="k8sConfigCreate-removeButton"
       >
@@ -68,7 +66,7 @@
 
     <div ng-if="$ctrl.formValues.Services[$index].Ingress && $ctrl.formValues.OriginalIngresses.length !== 0">
       <div class="text-muted">
-        <i class="fa fa-route" aria-hidden="true" style="margin-right: 2px;"></i>
+        <i class="fa fa-route" aria-hidden="true" style="margin-right: 2px"></i>
         Ingress
       </div>
       <kube-services-item-view
@@ -83,7 +81,7 @@
       <button
         type="button"
         class="btn btn-sm btn-danger space-right"
-        style="margin-left: 0; margin-top: 10px;"
+        style="margin-left: 0; margin-top: 10px"
         ng-click="$ctrl.deleteService( $index )"
         data-cy="k8sConfigCreate-removeButton"
       >
diff --git a/app/kubernetes/components/kubectl-shell/kubectl-shell.html b/app/kubernetes/components/kubectl-shell/kubectl-shell.html
index cf7ef80fb..faf0a1269 100644
--- a/app/kubernetes/components/kubectl-shell/kubectl-shell.html
+++ b/app/kubernetes/components/kubectl-shell/kubectl-shell.html
@@ -13,7 +13,7 @@
 
 <div ng-if="$ctrl.state.shell.connected" class="{{ $ctrl.state.css }}-kubectl-shell">
   <div class="shell-container">
-    <div class="shell-item"><i class="fas fa-terminal" style="margin-right: 5px;"></i>kubectl shell</div>
+    <div class="shell-item"><i class="fas fa-terminal" style="margin-right: 5px"></i>kubectl shell</div>
     <div class="shell-item-right">
       <i class="fas fa-redo-alt" ng-click="$ctrl.screenClear();" data-cy="k8sShell-refreshButton"></i>
       <i
@@ -28,7 +28,7 @@
     <div class="nopadding">
       <div>
         <div id="terminal-container" class="terminal-container">
-          <div style="position: fixed; color: #fff;">Loading Terminal...</div>
+          <div style="position: fixed; color: #fff">Loading Terminal...</div>
         </div>
       </div>
     </div>
diff --git a/app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationData.html b/app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationData.html
index fdbf0a416..97fd2153e 100644
--- a/app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationData.html
+++ b/app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationData.html
@@ -1,7 +1,5 @@
 <ng-form name="kubernetesConfigurationDataCreationForm">
-  <div class="col-sm-12 form-section-title" style="margin-top: 10px;">
-    Data
-  </div>
+  <div class="col-sm-12 form-section-title" style="margin-top: 10px"> Data </div>
 
   <div class="form-group" ng-if="$ctrl.isCreation">
     <div class="col-sm-12">
@@ -15,21 +13,21 @@
       </p>
     </div>
     <div class="col-sm-12 small text-muted" ng-if="$ctrl.formValues.IsSimple">
-      <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>
       Switch to advanced mode to copy and paste multiple key/values
     </div>
     <div class="col-sm-12 small text-muted" ng-if="!$ctrl.formValues.IsSimple">
-      <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>
       Generate a configuration entry per line, use YAML format
     </div>
   </div>
 
   <div class="form-group" ng-if="$ctrl.formValues.IsSimple">
     <div class="col-sm-12">
-      <button type="button" class="btn btn-sm btn-default" style="margin-left: 0;" ng-click="$ctrl.addEntry()" data-cy="k8sConfigCreate-createEntryButton">
+      <button type="button" class="btn btn-sm btn-default" style="margin-left: 0" ng-click="$ctrl.addEntry()" data-cy="k8sConfigCreate-createEntryButton">
         <i class="fa fa-plus-circle" aria-hidden="true"></i> Create entry
       </button>
-      <button type="button" class="btn btn-sm btn-default" ngf-select="$ctrl.addEntryFromFile($file)" style="margin-left: 0;" data-cy="k8sConfigCreate-createConfigsFromFileButton">
+      <button type="button" class="btn btn-sm btn-default" ngf-select="$ctrl.addEntryFromFile($file)" style="margin-left: 0" data-cy="k8sConfigCreate-createConfigsFromFileButton">
         <i class="fa fa-file-upload" aria-hidden="true"></i> Create key/value from file
       </button>
     </div>
@@ -52,7 +50,7 @@
       </div>
       <div
         class="col-sm-11 small text-warning"
-        style="margin-top: 5px;"
+        style="margin-top: 5px"
         ng-show="
           kubernetesConfigurationDataCreationForm['configuration_data_key_' + index].$invalid ||
           (!entry.Used && $ctrl.state.duplicateKeys[index] !== undefined) ||
@@ -81,7 +79,7 @@
           required
         ></textarea>
       </div>
-      <div class="col-sm-11 small text-warning" style="margin-top: 5px;" ng-show="kubernetesConfigurationDataCreationForm['configuration_data_value_' + index].$invalid">
+      <div class="col-sm-11 small text-warning" style="margin-top: 5px" ng-show="kubernetesConfigurationDataCreationForm['configuration_data_value_' + index].$invalid">
         <ng-messages for="kubernetesConfigurationDataCreationForm['configuration_data_value_' + index].$error">
           <p ng-message="required"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
         </ng-messages>
@@ -101,7 +99,7 @@
         <button
           type="button"
           class="btn btn-sm btn-danger space-right"
-          style="margin-left: 0;"
+          style="margin-left: 0"
           ng-disabled="entry.Used"
           ng-click="$ctrl.removeEntry(index, entry)"
           data-cy="k8sConfigDetail-removeEntryButton{{ index }}"
@@ -117,7 +115,7 @@
   </div>
 
   <div class="form-group" ng-if="!$ctrl.formValues.IsSimple">
-    <input type="text" ng-model="$ctrl.formValues.DataYaml" required style="display: none;" />
+    <input type="text" ng-model="$ctrl.formValues.DataYaml" required style="display: none" />
     <code-editor identifier="kubernetes-configuration-editor" value="$ctrl.formValues.DataYaml" read-only="false" yml="true" on-change="($ctrl.editorUpdate)"></code-editor>
   </div>
 </ng-form>
diff --git a/app/kubernetes/components/resource-reservation/resourceReservation.html b/app/kubernetes/components/resource-reservation/resourceReservation.html
index 66b1f3d5c..3ca7cb3ac 100644
--- a/app/kubernetes/components/resource-reservation/resourceReservation.html
+++ b/app/kubernetes/components/resource-reservation/resourceReservation.html
@@ -1,7 +1,5 @@
 <div class="row">
-  <div class="col-sm-12 form-section-title">
-    Resource reservation
-  </div>
+  <div class="col-sm-12 form-section-title"> Resource reservation </div>
   <div class="form-group">
     <span class="col-sm-12 text-muted small">
       <p>
@@ -10,47 +8,39 @@
     </span>
   </div>
   <div class="form-group" ng-if="$ctrl.memoryLimit !== 0">
-    <label for="memory-reservation" class="col-sm-3 col-lg-2 control-label text-left">
-      Memory reservation
-    </label>
-    <div class="col-sm-9" style="margin-top: 4px;">
+    <label for="memory-reservation" class="col-sm-3 col-lg-2 control-label text-left"> Memory reservation </label>
+    <div class="col-sm-9" style="margin-top: 4px">
       <uib-progressbar
         animate="false"
         value="$ctrl.memoryReservationPercent"
         type="{{ $ctrl.memoryReservationPercent | kubernetesUsageLevelInfo }}"
         data-cy="k8sNamespaceDetail-memoryUsage"
       >
-        <b style="white-space: nowrap;"> {{ $ctrl.memoryReservation }} / {{ $ctrl.memoryLimit }} MB - {{ $ctrl.memoryReservationPercent }}% </b>
+        <b style="white-space: nowrap"> {{ $ctrl.memoryReservation }} / {{ $ctrl.memoryLimit }} MB - {{ $ctrl.memoryReservationPercent }}% </b>
       </uib-progressbar>
     </div>
   </div>
   <div class="form-group" ng-if="$ctrl.displayUsage && $ctrl.memoryLimit !== 0">
-    <label for="memory-usage" class="col-sm-3 col-lg-2 control-label text-left">
-      Memory used
-    </label>
-    <div class="col-sm-9" style="margin-top: 4px;">
+    <label for="memory-usage" class="col-sm-3 col-lg-2 control-label text-left"> Memory used </label>
+    <div class="col-sm-9" style="margin-top: 4px">
       <uib-progressbar animate="false" value="$ctrl.memoryUsagePercent" type="{{ $ctrl.memoryUsagePercent | kubernetesUsageLevelInfo }}">
-        <b style="white-space: nowrap;"> {{ $ctrl.memoryUsage }} / {{ $ctrl.memoryLimit }} MB - {{ $ctrl.memoryUsagePercent }}% </b>
+        <b style="white-space: nowrap"> {{ $ctrl.memoryUsage }} / {{ $ctrl.memoryLimit }} MB - {{ $ctrl.memoryUsagePercent }}% </b>
       </uib-progressbar>
     </div>
   </div>
   <div class="form-group" ng-if="$ctrl.cpuLimit !== 0">
-    <label for="cpu-reservation" class="col-sm-3 col-lg-2 control-label text-left">
-      CPU reservation
-    </label>
-    <div class="col-sm-9" style="margin-top: 4px;">
+    <label for="cpu-reservation" class="col-sm-3 col-lg-2 control-label text-left"> CPU reservation </label>
+    <div class="col-sm-9" style="margin-top: 4px">
       <uib-progressbar animate="false" value="$ctrl.cpuReservationPercent" type="{{ $ctrl.cpuReservationPercent | kubernetesUsageLevelInfo }}">
-        <b style="white-space: nowrap;"> {{ $ctrl.cpuReservation | kubernetesApplicationCPUValue }} / {{ $ctrl.cpuLimit }} - {{ $ctrl.cpuReservationPercent }}% </b>
+        <b style="white-space: nowrap"> {{ $ctrl.cpuReservation | kubernetesApplicationCPUValue }} / {{ $ctrl.cpuLimit }} - {{ $ctrl.cpuReservationPercent }}% </b>
       </uib-progressbar>
     </div>
   </div>
   <div class="form-group" ng-if="$ctrl.displayUsage && $ctrl.cpuLimit !== 0">
-    <label for="cpu-usage" class="col-sm-3 col-lg-2 control-label text-left">
-      CPU used
-    </label>
-    <div class="col-sm-9" style="margin-top: 4px;">
+    <label for="cpu-usage" class="col-sm-3 col-lg-2 control-label text-left"> CPU used </label>
+    <div class="col-sm-9" style="margin-top: 4px">
       <uib-progressbar animate="false" value="$ctrl.cpuUsagePercent" type="{{ $ctrl.cpuUsagePercent | kubernetesUsageLevelInfo }}">
-        <b style="white-space: nowrap;"> {{ $ctrl.cpuUsage | kubernetesApplicationCPUValue }} / {{ $ctrl.cpuLimit }} - {{ $ctrl.cpuUsagePercent }}% </b>
+        <b style="white-space: nowrap"> {{ $ctrl.cpuUsage | kubernetesApplicationCPUValue }} / {{ $ctrl.cpuLimit }} - {{ $ctrl.cpuUsagePercent }}% </b>
       </uib-progressbar>
     </div>
   </div>
diff --git a/app/kubernetes/components/yaml-inspector/yamlInspector.html b/app/kubernetes/components/yaml-inspector/yamlInspector.html
index e0e24bcfa..b0c524950 100644
--- a/app/kubernetes/components/yaml-inspector/yamlInspector.html
+++ b/app/kubernetes/components/yaml-inspector/yamlInspector.html
@@ -1,9 +1,10 @@
 <div>
   <code-editor identifier="application-details-yaml" read-only="true" value="$ctrl.data"></code-editor>
-  <div style="margin: 15px;">
+  <div style="margin: 15px">
     <span class="btn btn-primary btn-sm" ng-click="$ctrl.copyYAML()"><i class="fa fa-copy space-right" aria-hidden="true"></i>Copy to clipboard</span>
     <span class="btn btn-primary btn-sm space-left" ng-click="$ctrl.toggleYAMLInspectorExpansion()">
-      <i class="fa fa-{{ $ctrl.expanded ? 'minus' : 'plus' }} space-right" aria-hidden="true"></i>{{ $ctrl.expanded ? 'Collapse' : 'Expand' }}</span>
-    <span id="copyNotificationYAML" style="margin-left: 7px; display: none; color: #23ae89;" class="small"> <i class="fa fa-check" aria-hidden="true"></i> copied </span>
+      <i class="fa fa-{{ $ctrl.expanded ? 'minus' : 'plus' }} space-right" aria-hidden="true"></i>{{ $ctrl.expanded ? 'Collapse' : 'Expand' }}</span
+    >
+    <span id="copyNotificationYAML" style="margin-left: 7px; display: none; color: #23ae89" class="small"> <i class="fa fa-check" aria-hidden="true"></i> copied </span>
   </div>
 </div>
diff --git a/app/kubernetes/custom-templates/kube-create-custom-template-view/kube-create-custom-template-view.html b/app/kubernetes/custom-templates/kube-create-custom-template-view/kube-create-custom-template-view.html
index 2be6911c4..d7e04ab02 100644
--- a/app/kubernetes/custom-templates/kube-create-custom-template-view/kube-create-custom-template-view.html
+++ b/app/kubernetes/custom-templates/kube-create-custom-template-view/kube-create-custom-template-view.html
@@ -11,9 +11,7 @@
           <custom-template-common-fields form-values="$ctrl.formValues"></custom-template-common-fields>
 
           <!-- build-method -->
-          <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
@@ -35,17 +33,13 @@
           </web-editor-form>
 
           <file-upload-form ng-if="$ctrl.state.method === 'upload'" file="$ctrl.formValues.File" on-change="($ctrl.onChangeFile)" ng-required="true">
-            <file-upload-description>
-              You can upload a Manifest file from your computer.
-            </file-upload-description>
+            <file-upload-description> You can upload a Manifest file from your computer. </file-upload-description>
           </file-upload-form>
 
           <por-access-control-form form-data="$ctrl.formValues.AccessControlData"></por-access-control-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
@@ -58,7 +52,7 @@
                 <span ng-hide="$ctrl.state.actionInProgress">Create custom template</span>
                 <span ng-show="$ctrl.state.actionInProgress">Creation 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/kubernetes/custom-templates/kube-custom-templates-view/kube-custom-templates-view.html b/app/kubernetes/custom-templates/kube-custom-templates-view/kube-custom-templates-view.html
index 762474c74..ecdcdf56c 100644
--- a/app/kubernetes/custom-templates/kube-custom-templates-view/kube-custom-templates-view.html
+++ b/app/kubernetes/custom-templates/kube-custom-templates-view/kube-custom-templates-view.html
@@ -1,6 +1,4 @@
-<kubernetes-view-header title="Custom Templates" state="kubernetes.templates.custom" view-ready="true">
-  Custom Templates
-</kubernetes-view-header>
+<kubernetes-view-header title="Custom Templates" state="kubernetes.templates.custom" view-ready="true"> Custom Templates </kubernetes-view-header>
 
 <div class="row">
   <div class="col-sm-12">
diff --git a/app/kubernetes/custom-templates/kube-edit-custom-template-view/kube-edit-custom-template-view.html b/app/kubernetes/custom-templates/kube-edit-custom-template-view/kube-edit-custom-template-view.html
index 0d3c15179..82fca1f2a 100644
--- a/app/kubernetes/custom-templates/kube-edit-custom-template-view/kube-edit-custom-template-view.html
+++ b/app/kubernetes/custom-templates/kube-edit-custom-template-view/kube-edit-custom-template-view.html
@@ -33,9 +33,7 @@
 
           <por-access-control-form form-data="$ctrl.formValues.AccessControlData" resource-control="$ctrl.formValues.ResourceControl"></por-access-control-form>
 
-          <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
@@ -48,7 +46,7 @@
                 <span ng-hide="$ctrl.actionInProgress">Update the template</span>
                 <span ng-show="$ctrl.actionInProgress">Update 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/kubernetes/registries/kube-registry-access-view/kube-registry-access-view.html b/app/kubernetes/registries/kube-registry-access-view/kube-registry-access-view.html
index 011cb557a..d0dbcfbbf 100644
--- a/app/kubernetes/registries/kube-registry-access-view/kube-registry-access-view.html
+++ b/app/kubernetes/registries/kube-registry-access-view/kube-registry-access-view.html
@@ -12,13 +12,9 @@
       <rd-widget-body>
         <form class="form-horizontal">
           <div class="form-group">
-            <label class="col-sm-3 col-lg-2 control-label text-left" style="padding-top: 0;">
-              Select namespaces
-            </label>
-            <div class="col-sm-9 col-lg-4" style="margin-bottom: 15px;">
-              <span class="small text-muted" ng-if="!$ctrl.resourcePools.length">
-                No namespaces available.
-              </span>
+            <label class="col-sm-3 col-lg-2 control-label text-left" style="padding-top: 0"> Select namespaces </label>
+            <div class="col-sm-9 col-lg-4" style="margin-bottom: 15px">
+              <span class="small text-muted" ng-if="!$ctrl.resourcePools.length"> No namespaces available. </span>
               <span
                 isteven-multi-select
                 ng-if="$ctrl.resourcePools.length"
@@ -34,7 +30,7 @@
               </span>
             </div>
             <div class="col-sm-12 small text-muted">
-              <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+              <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
               Note: adding this registry will expose the registry credentials to all users of this namespace
             </div>
           </div>
diff --git a/app/kubernetes/views/applications/applications.html b/app/kubernetes/views/applications/applications.html
index b3af3b112..a135f6a65 100644
--- a/app/kubernetes/views/applications/applications.html
+++ b/app/kubernetes/views/applications/applications.html
@@ -1,6 +1,4 @@
-<kubernetes-view-header title="Application list" state="kubernetes.applications" view-ready="ctrl.state.viewReady">
-  Applications
-</kubernetes-view-header>
+<kubernetes-view-header title="Application list" state="kubernetes.applications" view-ready="ctrl.state.viewReady"> Applications </kubernetes-view-header>
 
 <kubernetes-view-loading view-ready="ctrl.state.viewReady"></kubernetes-view-loading>
 
diff --git a/app/kubernetes/views/applications/console/console.html b/app/kubernetes/views/applications/console/console.html
index da64b5fe4..c42a7f791 100644
--- a/app/kubernetes/views/applications/console/console.html
+++ b/app/kubernetes/views/applications/console/console.html
@@ -14,9 +14,7 @@
       <rd-widget>
         <rd-widget-body>
           <form class="form-horizontal" autocomplete="off">
-            <div class="col-sm-12 form-section-title">
-              Console
-            </div>
+            <div class="col-sm-12 form-section-title"> Console </div>
             <!-- Command -->
             <div class="form-group">
               <label for="console_command" class="col-sm-1 control-label text-left">Command</label>
@@ -43,7 +41,7 @@
                 <button
                   type="button"
                   class="btn btn-primary btn-sm"
-                  style="margin: 0;"
+                  style="margin: 0"
                   ng-if="!ctrl.state.connected"
                   ng-disabled="!ctrl.state.command || ctrl.state.connected"
                   ng-click="ctrl.connectConsole()"
@@ -52,9 +50,7 @@
                   <span ng-hide="ctrl.state.actionInProgress">Connect</span>
                   <span ng-show="ctrl.state.actionInProgress">Connection in progress...</span>
                 </button>
-                <button type="button" class="btn btn-primary btn-sm" style="margin: 0;" ng-if="ctrl.state.connected" ng-click="ctrl.disconnect()">
-                  Disconnect
-                </button>
+                <button type="button" class="btn btn-primary btn-sm" style="margin: 0" ng-if="ctrl.state.connected" ng-click="ctrl.disconnect()"> Disconnect </button>
               </div>
             </div>
           </form>
diff --git a/app/kubernetes/views/applications/create/createApplication.html b/app/kubernetes/views/applications/create/createApplication.html
index c06674084..9714a5b50 100644
--- a/app/kubernetes/views/applications/create/createApplication.html
+++ b/app/kubernetes/views/applications/create/createApplication.html
@@ -24,9 +24,7 @@
                 additional-files="ctrl.stack.AdditionalFiles"
                 type="application"
               ></git-form-info-panel>
-              <div class="col-sm-12 form-section-title" ng-if="ctrl.state.appType === ctrl.KubernetesDeploymentTypes.APPLICATION_FORM">
-                Namespace
-              </div>
+              <div class="col-sm-12 form-section-title" ng-if="ctrl.state.appType === ctrl.KubernetesDeploymentTypes.APPLICATION_FORM"> Namespace </div>
               <!-- #region NAMESPACE -->
               <div class="form-group" ng-if="ctrl.formValues.ResourcePool">
                 <label for="resource-pool-selector" class="col-sm-1 control-label text-left">Namespace</label>
@@ -44,14 +42,14 @@
               </div>
               <div class="form-group" ng-if="ctrl.state.resourcePoolHasQuota && ctrl.resourceQuotaCapacityExceeded() && ctrl.formValues.ResourcePool">
                 <div class="col-sm-12 small text-danger">
-                  <i class="fa fa-exclamation-circle red-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                  <i class="fa fa-exclamation-circle red-icon" aria-hidden="true" style="margin-right: 2px"></i>
                   This namespace has exhausted its resource capacity and you will not be able to deploy the application. Contact your administrator to expand the capacity of the
                   namespace.
                 </div>
               </div>
               <div class="form-group" ng-if="!ctrl.formValues.ResourcePool">
                 <div class="col-sm-12 small text-muted">
-                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                   You do not have access to any namespace. Contact your administrator to get access to a namespace.
                 </div>
               </div>
@@ -77,7 +75,7 @@
                 <editor-description>
                   <span class="text-muted small" ng-show="ctrl.stack.IsComposeFormat">
                     <p>
-                      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                       Portainer uses <a href="https://kompose.io/" target="_blank">Kompose</a> to convert your Compose manifest to a Kubernetes compliant manifest. Be wary that not
                       all the Compose format options are supported by Kompose at the moment.
                     </p>
@@ -88,7 +86,7 @@
                   </span>
                   <span class="text-muted small" ng-show="!ctrl.stack.IsComposeFormat">
                     <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>
@@ -100,9 +98,7 @@
               </web-editor-form>
               <!-- #endregion -->
               <div ng-if="ctrl.state.appType === ctrl.KubernetesDeploymentTypes.APPLICATION_FORM">
-                <div class="col-sm-12 form-section-title">
-                  Application
-                </div>
+                <div class="col-sm-12 form-section-title"> Application </div>
                 <!-- #region NAME FIELD -->
                 <div class="form-group">
                   <label for="application_name" class="col-sm-1 control-label text-left">Name</label>
@@ -157,13 +153,11 @@
                   </div>
                 </div>
                 <div ng-if="ctrl.formValues.ResourcePool">
-                  <div class="col-sm-12 form-section-title">
-                    Stack
-                  </div>
+                  <div class="col-sm-12 form-section-title"> Stack </div>
                   <!-- #region STACK -->
                   <div class="form-group">
                     <div class="col-sm-12 small text-muted">
-                      <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>
                       Portainer can automatically bundle multiple applications inside a stack. Enter a name of a new stack or select an existing stack in the list. Leave empty to
                       use the application name.
                     </div>
@@ -187,9 +181,7 @@
                   </div>
                   <!-- #endregion -->
 
-                  <div class="col-sm-12 form-section-title">
-                    Environment
-                  </div>
+                  <div class="col-sm-12 form-section-title"> Environment </div>
                   <!-- #region ENVIRONMENT VARIABLES -->
                   <div class="form-group">
                     <div class="col-sm-12">
@@ -197,7 +189,7 @@
                       <span
                         ng-if="ctrl.formValues.Containers.length <= 1"
                         class="label label-default interactive"
-                        style="margin-left: 10px;"
+                        style="margin-left: 10px"
                         ng-click="ctrl.addEnvironmentVariable()"
                         data-cy="k8sAppCreate-addEnvVarButton"
                       >
@@ -205,9 +197,9 @@
                       </span>
                     </div>
 
-                    <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-                      <div ng-repeat="envVar in ctrl.formValues.EnvironmentVariables | orderBy: 'NameIndex'" style="margin-top: 2px;">
-                        <div style="margin-top: 2px;">
+                    <div class="col-sm-12 form-inline" style="margin-top: 10px">
+                      <div ng-repeat="envVar in ctrl.formValues.EnvironmentVariables | orderBy: 'NameIndex'" style="margin-top: 2px">
+                        <div style="margin-top: 2px">
                           <div class="col-sm-4 input-group input-group-sm">
                             <div class="input-group col-sm-12 input-group-sm" ng-class="{ striked: envVar.NeedsDeletion }">
                               <span class="input-group-addon">name</span>
@@ -263,7 +255,7 @@
                           <div class="col-sm-4 input-group input-group-sm">
                             <div
                               class="small text-warning"
-                              style="margin-top: 5px;"
+                              style="margin-top: 5px"
                               ng-show="
                                 kubernetesApplicationCreationForm['environment_variable_name_' + $index].$invalid ||
                                 ctrl.state.duplicates.environmentVariables.refs[$index] !== undefined
@@ -289,16 +281,14 @@
                   </div>
                   <!-- #endregion -->
 
-                  <div class="col-sm-12 form-section-title">
-                    Configurations
-                  </div>
+                  <div class="col-sm-12 form-section-title"> Configurations </div>
                   <!-- #region CONFIGURATIONS -->
                   <div class="form-group">
                     <div class="col-sm-12">
                       <label class="control-label text-left">Configurations</label>
                       <span
                         class="label label-default interactive"
-                        style="margin-left: 10px;"
+                        style="margin-left: 10px"
                         ng-click="ctrl.addConfiguration()"
                         ng-if="ctrl.formValues.Containers.length <= 1"
                         data-cy="k8sAppCreate-addConfigButton"
@@ -306,8 +296,8 @@
                         <i class="fa fa-plus-circle" aria-hidden="true"></i> add configuration
                       </span>
                     </div>
-                    <div class="col-sm-12 small text-muted" style="margin-top: 15px;" ng-if="ctrl.formValues.Configurations.length">
-                      <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                    <div class="col-sm-12 small text-muted" style="margin-top: 15px" ng-if="ctrl.formValues.Configurations.length">
+                      <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
                       Portainer will automatically expose all the keys of a configuration as environment variables. This behavior can be overriden to filesystem mounts for each key
                       via the override button.
                     </div>
@@ -326,7 +316,7 @@
                         data-cy="k8sAppCreate-addConfigSelect_{{ $index }}"
                       ></select>
                     </div>
-                    <div class="col-sm-6" style="margin-top: 2px;">
+                    <div class="col-sm-6" style="margin-top: 2px">
                       <button
                         class="btn btn-sm btn-primary"
                         type="button"
@@ -358,9 +348,9 @@
                       </button>
                     </div>
                     <!-- no-override -->
-                    <div class="col-sm-12" style="margin-top: 10px;" ng-if="config.SelectedConfiguration && !config.Overriden">
+                    <div class="col-sm-12" style="margin-top: 10px" ng-if="config.SelectedConfiguration && !config.Overriden">
                       <div class="col-md-1 col-sm-2"></div>
-                      <div class="col-md-11 col-sm-10 small text-muted" style="padding-left: 5px;">
+                      <div class="col-md-11 col-sm-10 small text-muted" style="padding-left: 5px">
                         The following keys will be loaded from the <code>{{ config.SelectedConfiguration.Name }}</code> configuration as environment variables:
                         <span ng-repeat="(key, _) in config.SelectedConfiguration.Data">
                           <code>{{ key }}</code
@@ -371,10 +361,10 @@
                     <!-- !no-override -->
 
                     <!-- has-override -->
-                    <div class="col-sm-12 form-inline" style="margin-top: 10px;" ng-if="config.Overriden">
-                      <div ng-repeat="(keyIndex, overridenKey) in config.OverridenKeys" style="margin-top: 2px;">
-                        <div style="margin-top: 2px;">
-                          <div class="col-sm-1 input-group input-group-sm" style="margin-left: 3px;"></div>
+                    <div class="col-sm-12 form-inline" style="margin-top: 10px" ng-if="config.Overriden">
+                      <div ng-repeat="(keyIndex, overridenKey) in config.OverridenKeys" style="margin-top: 2px">
+                        <div style="margin-top: 2px">
+                          <div class="col-sm-1 input-group input-group-sm" style="margin-left: 3px"></div>
                           <div class="col-sm-3 input-group input-group-sm">
                             <span class="input-group-addon">configuration key</span>
                             <input type="text" class="form-control" ng-value="overridenKey.Key" disabled />
@@ -413,12 +403,12 @@
                             ctrl.state.duplicates.configurationPaths.refs[index + '_' + keyIndex] !== undefined
                           "
                         >
-                          <div class="col-sm-1 input-group input-group-sm" style="margin-left: 3px;"></div>
+                          <div class="col-sm-1 input-group input-group-sm" style="margin-left: 3px"></div>
                           <div class="col-sm-3 input-group input-group-sm"></div>
                           <div class="col-sm-3 input-group input-group-sm" ng-if="overridenKey.Type === ctrl.ApplicationConfigurationFormValueOverridenKeyTypes.FILESYSTEM">
                             <div
                               class="small text-warning"
-                              style="margin-top: 5px;"
+                              style="margin-top: 5px"
                               ng-show="
                                 kubernetesApplicationCreationForm['overriden_key_path_' + index + '_' + keyIndex].$invalid ||
                                 ctrl.state.duplicates.configurationPaths.refs[index + '_' + keyIndex] !== undefined
@@ -441,23 +431,21 @@
                   <!-- !config-element -->
                   <!-- #endregion -->
 
-                  <div class="col-sm-12 form-section-title">
-                    Persisting data
-                  </div>
+                  <div class="col-sm-12 form-section-title"> Persisting data </div>
                   <!-- #region PERSISTED FOLDERS -->
                   <div class="form-group" ng-if="!ctrl.storageClassAvailable()">
                     <div class="col-sm-12 small text-muted">
-                      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                       No storage option is available to persist data, contact your administrator to enable a storage option.
                     </div>
                   </div>
 
                   <div class="form-group" ng-if="ctrl.storageClassAvailable()">
-                    <div class="col-sm-12" style="margin-top: 5px;">
+                    <div class="col-sm-12" style="margin-top: 5px">
                       <label class="control-label text-left">Persisted folders</label>
                       <span
                         class="label label-default interactive"
-                        style="margin-left: 10px;"
+                        style="margin-left: 10px"
                         ng-click="ctrl.addPersistedFolder()"
                         ng-if="ctrl.isAddPersistentFolderButtonShowed()"
                         data-cy="k8sAppCreate-addPersistentFolderButton"
@@ -466,8 +454,8 @@
                       </span>
                     </div>
 
-                    <div class="col-sm-12 form-inline" style="margin-top: 10px;" ng-repeat="persistedFolder in ctrl.formValues.PersistedFolders">
-                      <div style="margin-top: 2px;">
+                    <div class="col-sm-12 form-inline" style="margin-top: 10px" ng-repeat="persistedFolder in ctrl.formValues.PersistedFolders">
+                      <div style="margin-top: 2px">
                         <div class="input-group col-sm-3 input-group-sm" ng-class="{ striked: persistedFolder.NeedsDeletion }">
                           <span class="input-group-addon">path in container</span>
                           <input
@@ -524,7 +512,7 @@
                             required
                             ng-disabled="ctrl.isEditAndExistingPersistedFolder($index) || ctrl.formValues.Containers.length > 1"
                           />
-                          <span class="input-group-addon" style="padding: 0;">
+                          <span class="input-group-addon" style="padding: 0">
                             <select
                               ng-model="persistedFolder.SizeUnit"
                               ng-style="{ width: '100%', height: '100%', cursor: ctrl.isEditAndExistingPersistedFolder($index) ? 'not-allowed' : 'auto' }"
@@ -605,7 +593,7 @@
                         <div class="input-group col-sm-3 input-group-sm">
                           <div
                             class="small text-warning"
-                            style="margin-top: 5px;"
+                            style="margin-top: 5px"
                             ng-show="
                               kubernetesApplicationCreationForm['persisted_folder_path_' + $index].$invalid || ctrl.state.duplicates.persistedFolders.refs[$index] !== undefined
                             "
@@ -622,7 +610,7 @@
                         <div class="input-group col-sm-2 input-group-sm"></div>
 
                         <div class="input-group col-sm-5 input-group-sm">
-                          <div class="small text-warning" style="margin-top: 5px;" ng-show="kubernetesApplicationCreationForm['persisted_folder_size_' + $index].$invalid">
+                          <div class="small text-warning" style="margin-top: 5px" ng-show="kubernetesApplicationCreationForm['persisted_folder_size_' + $index].$invalid">
                             <ng-messages for="kubernetesApplicationCreationForm['persisted_folder_size_' + $index].$error">
                               <p ng-message="required"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Size is required.</p>
                               <p ng-message="min"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This value must be greater than zero.</p>
@@ -656,13 +644,11 @@
                     </div>
 
                     <div class="form-group">
-                      <div class="col-sm-12 small text-muted">
-                        Specify how the data will be used across instances.
-                      </div>
+                      <div class="col-sm-12 small text-muted"> Specify how the data will be used across instances. </div>
                     </div>
 
                     <!-- access policy options -->
-                    <div class="form-group" style="margin-bottom: 0;">
+                    <div class="form-group" style="margin-bottom: 0">
                       <div class="boxselector_wrapper">
                         <div
                           ng-if="
@@ -679,14 +665,14 @@
                           />
                           <label for="data_access_isolated">
                             <div class="boxselector_header">
-                              <i class="fa fa-cubes" aria-hidden="true" style="margin-right: 2px;"></i>
+                              <i class="fa fa-cubes" aria-hidden="true" style="margin-right: 2px"></i>
                               Isolated
                             </div>
                             <p>Application will be deployed as a StatefulSet with each instantiating their own data</p>
                           </label>
                         </div>
                         <div
-                          style="color: #767676;"
+                          style="color: #767676"
                           ng-if="
                             (ctrl.state.isEdit && ctrl.formValues.DataAccessPolicy === ctrl.ApplicationDataAccessPolicies.SHARED) || ctrl.state.persistedFoldersUseExistingVolumes
                           "
@@ -698,10 +684,10 @@
                             tooltip-placement="bottom"
                             tooltip-class="portainer-tooltip"
                             uib-tooltip="Changing the data access policy is not allowed"
-                            style="cursor: pointer; border-color: #767676;"
+                            style="cursor: pointer; border-color: #767676"
                           >
                             <div class="boxselector_header">
-                              <i class="fa fa-cubes" aria-hidden="true" style="margin-right: 2px;"></i>
+                              <i class="fa fa-cubes" aria-hidden="true" style="margin-right: 2px"></i>
                               Isolated
                             </div>
                             <p>Application will be deployed as a StatefulSet with each instantiating their own data</p>
@@ -717,13 +703,13 @@
                           />
                           <label for="data_access_shared">
                             <div class="boxselector_header">
-                              <i class="fa fa-cube" aria-hidden="true" style="margin-right: 2px;"></i>
+                              <i class="fa fa-cube" aria-hidden="true" style="margin-right: 2px"></i>
                               Shared
                             </div>
                             <p>Application will be deployed as a Deployment with a shared storage access</p>
                           </label>
                         </div>
-                        <div style="color: #767676;" ng-if="ctrl.state.isEdit && ctrl.formValues.DataAccessPolicy === ctrl.ApplicationDataAccessPolicies.ISOLATED">
+                        <div style="color: #767676" ng-if="ctrl.state.isEdit && ctrl.formValues.DataAccessPolicy === ctrl.ApplicationDataAccessPolicies.ISOLATED">
                           <input type="radio" id="data_access_shared" disabled />
                           <label
                             for="data_access_shared"
@@ -731,10 +717,10 @@
                             tooltip-placement="bottom"
                             tooltip-class="portainer-tooltip"
                             uib-tooltip="Changing the data access policy is not allowed"
-                            style="cursor: pointer; border-color: #767676;"
+                            style="cursor: pointer; border-color: #767676"
                           >
                             <div class="boxselector_header">
-                              <i class="fa fa-cube" aria-hidden="true" style="margin-right: 2px;"></i>
+                              <i class="fa fa-cube" aria-hidden="true" style="margin-right: 2px"></i>
                               Shared
                             </div>
                             <p>Application will be deployed as a Deployment with a shared storage access</p>
@@ -746,20 +732,18 @@
                   </div>
                   <!-- #endregion -->
 
-                  <div class="col-sm-12 form-section-title">
-                    Resource reservations
-                  </div>
+                  <div class="col-sm-12 form-section-title"> Resource reservations </div>
                   <!-- #region RESOURCE RESERVATIONS -->
                   <div class="form-group" ng-if="!ctrl.state.resourcePoolHasQuota">
                     <div class="col-sm-12 small text-muted">
-                      <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>
                       Resource reservations are applied per instance of the application.
                     </div>
                   </div>
 
                   <div class="form-group" ng-if="ctrl.state.resourcePoolHasQuota && !ctrl.resourceQuotaCapacityExceeded()">
                     <div class="col-sm-12 small text-muted">
-                      <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>
                       A resource quota is set on this namespace, you must specify resource reservations. Resource reservations are applied per instance of the application. Maximums
                       are inherited from the namespace quota.
                     </div>
@@ -767,7 +751,7 @@
 
                   <div class="form-group" ng-if="ctrl.state.resourcePoolHasQuota && ctrl.resourceQuotaCapacityExceeded()">
                     <div class="col-sm-12 small text-danger">
-                      <i class="fa fa-exclamation-circle red-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                      <i class="fa fa-exclamation-circle red-icon" aria-hidden="true" style="margin-right: 2px"></i>
                       This namespace has exhausted its resource capacity and you will not be able to deploy the application. Contact your administrator to expand the capacity of
                       the namespace.
                     </div>
@@ -780,7 +764,7 @@
                       (!ctrl.state.resourcePoolHasQuota || (ctrl.state.resourcePoolHasQuota && !ctrl.resourceQuotaCapacityExceeded())) && ctrl.formValues.Containers.length <= 1
                     "
                   >
-                    <label for="memory-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px;">
+                    <label for="memory-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px">
                       Memory
                       <portainer-tooltip
                         position="bottom"
@@ -805,9 +789,7 @@
                       />
                     </div>
                     <div class="col-sm-4">
-                      <p class="small text-muted" style="margin-top: 7px;">
-                        Maximum memory usage (<b>MB</b>)
-                      </p>
+                      <p class="small text-muted" style="margin-top: 7px"> Maximum memory usage (<b>MB</b>) </p>
                     </div>
                   </div>
                   <div class="form-group" ng-show="kubernetesApplicationCreationForm.memory_limit.$invalid">
@@ -828,7 +810,7 @@
                       (!ctrl.state.resourcePoolHasQuota || (ctrl.state.resourcePoolHasQuota && !ctrl.resourceQuotaCapacityExceeded())) && ctrl.formValues.Containers.length <= 1
                     "
                   >
-                    <label for="cpu-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px;">
+                    <label for="cpu-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px">
                       CPU
                       <portainer-tooltip
                         position="bottom"
@@ -839,34 +821,28 @@
                     <div class="col-sm-5">
                       <slider model="ctrl.formValues.CpuLimit" floor="ctrl.state.sliders.cpu.min" ceil="ctrl.state.sliders.cpu.max" step="0.10" precision="2"></slider>
                     </div>
-                    <div class="col-sm-4" style="margin-top: 20px;">
-                      <p class="small text-muted">
-                        Maximum CPU usage
-                      </p>
+                    <div class="col-sm-4" style="margin-top: 20px">
+                      <p class="small text-muted"> Maximum CPU usage </p>
                     </div>
                   </div>
 
                   <div class="form-group" ng-if="ctrl.nodeLimitsOverflow()">
                     <div class="col-sm-12 small text-danger">
-                      <i class="fa fa-exclamation-circle red-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                      <i class="fa fa-exclamation-circle red-icon" aria-hidden="true" style="margin-right: 2px"></i>
                       These reservations would exceed the resources currently available in the cluster.
                     </div>
                   </div>
                   <!-- !cpu-limit-input -->
                   <!-- #endregion -->
 
-                  <div class="col-sm-12 form-section-title">
-                    Deployment
-                  </div>
+                  <div class="col-sm-12 form-section-title"> Deployment </div>
                   <!-- #region DEPLOYMENT -->
                   <div class="form-group">
-                    <div class="col-sm-12 small text-muted">
-                      Select how you want to deploy your application inside the cluster.
-                    </div>
+                    <div class="col-sm-12 small text-muted"> Select how you want to deploy your application inside the cluster. </div>
                   </div>
 
                   <!-- deployment options -->
-                  <div class="form-group" style="margin-bottom: 0;">
+                  <div class="form-group" style="margin-bottom: 0">
                     <div class="boxselector_wrapper">
                       <div>
                         <input
@@ -878,13 +854,13 @@
                         />
                         <label for="deployment_replicated">
                           <div class="boxselector_header">
-                            <i class="fa fa-cube" aria-hidden="true" style="margin-right: 2px;"></i>
+                            <i class="fa fa-cube" aria-hidden="true" style="margin-right: 2px"></i>
                             Replicated
                           </div>
                           <p>Run one or multiple instances of this container</p>
                         </label>
                       </div>
-                      <div style="color: #767676;" ng-if="!ctrl.supportGlobalDeployment()">
+                      <div style="color: #767676" ng-if="!ctrl.supportGlobalDeployment()">
                         <input type="radio" id="deployment_global" disabled />
                         <label
                           for="deployment_global"
@@ -892,10 +868,10 @@
                           tooltip-placement="bottom"
                           tooltip-class="portainer-tooltip"
                           uib-tooltip="The storage or access policy used for persisted folders cannot be used with this option"
-                          style="cursor: pointer; border-color: #767676;"
+                          style="cursor: pointer; border-color: #767676"
                         >
                           <div class="boxselector_header">
-                            <i class="fa fa-cubes" aria-hidden="true" style="margin-right: 2px;"></i>
+                            <i class="fa fa-cubes" aria-hidden="true" style="margin-right: 2px"></i>
                             Global
                           </div>
                           <p>Application will be deployed as a DaemonSet with an instance on each node of the cluster</p>
@@ -912,7 +888,7 @@
                         />
                         <label for="deployment_global">
                           <div class="boxselector_header">
-                            <i class="fa fa-cubes" aria-hidden="true" style="margin-right: 2px;"></i>
+                            <i class="fa fa-cubes" aria-hidden="true" style="margin-right: 2px"></i>
                             Global
                           </div>
                           <p>Application will be deployed as a DaemonSet with an instance on each node of the cluster</p>
@@ -925,9 +901,7 @@
                   <!-- replica count -->
                   <div class="form-group form-inline" ng-if="ctrl.formValues.DeploymentType === ctrl.ApplicationDeploymentTypes.REPLICATED">
                     <div class="col-sm-12">
-                      <label class="control-label text-left">
-                        Instance count
-                      </label>
+                      <label class="control-label text-left"> Instance count </label>
                       <input
                         type="number"
                         name="replica_count"
@@ -935,7 +909,7 @@
                         min="1"
                         max="9999"
                         placeholder="1"
-                        style="margin-left: 20px;"
+                        style="margin-left: 20px"
                         ng-model="ctrl.formValues.ReplicaCount"
                         ng-disabled="!ctrl.supportScalableReplicaDeployment()"
                         ng-change="ctrl.enforceReplicaCountMinimum()"
@@ -959,7 +933,7 @@
                     ng-if="!ctrl.resourceReservationsOverflow() && ctrl.formValues.ReplicaCount > 1 && (ctrl.formValues.CpuLimit !== 0 || ctrl.formValues.MemoryLimit !== 0)"
                   >
                     <div class="col-sm-12 small text-muted">
-                      <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 application will reserve the following resources:
                       <b>{{ ctrl.formValues.CpuLimit * ctrl.formValues.ReplicaCount | kubernetesApplicationCPUValue }} CPU</b> and
                       <b>{{ ctrl.formValues.MemoryLimit * ctrl.formValues.ReplicaCount }} MB</b> of memory.
@@ -968,14 +942,14 @@
 
                   <div class="form-group" ng-if="ctrl.resourceReservationsOverflow()">
                     <div class="col-sm-12 small text-danger">
-                      <i class="fa fa-exclamation-circle red-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                      <i class="fa fa-exclamation-circle red-icon" aria-hidden="true" style="margin-right: 2px"></i>
                       This application would exceed available resources. Please review resource reservations or the instance count.
                     </div>
                   </div>
 
                   <div class="form-group" ng-if="!ctrl.supportScalableReplicaDeployment()">
                     <div class="col-sm-12 small text-muted">
-                      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                       The following storage option(s) do not support concurrent access from multiples instances: <code>{{ ctrl.getNonScalableStorage() }}</code
                       >. You will not be able to scale that application.
                     </div>
@@ -983,16 +957,12 @@
                   <!-- #endregion -->
 
                   <!-- #region AUTO SCALING -->
-                  <div class="col-sm-12 form-section-title" ng-if="ctrl.formValues.DeploymentType !== ctrl.ApplicationDeploymentTypes.GLOBAL">
-                    Auto-scaling
-                  </div>
+                  <div class="col-sm-12 form-section-title" ng-if="ctrl.formValues.DeploymentType !== ctrl.ApplicationDeploymentTypes.GLOBAL"> Auto-scaling </div>
 
                   <div class="form-group" ng-if="ctrl.formValues.DeploymentType !== ctrl.ApplicationDeploymentTypes.GLOBAL && ctrl.state.useServerMetrics">
                     <div class="col-sm-12">
-                      <label for="enable_auto_scaling" class="control-label text-left">
-                        Enable auto scaling for this application
-                      </label>
-                      <label class="switch" style="margin-left: 20px;">
+                      <label for="enable_auto_scaling" class="control-label text-left"> Enable auto scaling for this application </label>
+                      <label class="switch" style="margin-left: 20px">
                         <input
                           type="checkbox"
                           class="form-control"
@@ -1007,9 +977,7 @@
 
                   <div class="form-group" ng-if="ctrl.formValues.DeploymentType !== ctrl.ApplicationDeploymentTypes.GLOBAL && !ctrl.state.useServerMetrics">
                     <div class="col-sm-12 small text-muted">
-                      <p ng-if="!ctrl.isAdmin">
-                        This feature is currently disabled and must be enabled by an administrator user.
-                      </p>
+                      <p ng-if="!ctrl.isAdmin"> This feature is currently disabled and must be enabled by an administrator user. </p>
                       <p ng-if="ctrl.isAdmin">
                         Server metrics features must be enabled in the
                         <a ui-sref="portainer.k8sendpoint.kubernetesConfig({id: ctrl.endpoint.Id})" class="ctrl.isAdmin">environment configuration view</a>.
@@ -1018,12 +986,12 @@
                   </div>
 
                   <div class="form-inline" ng-if="ctrl.formValues.DeploymentType !== ctrl.ApplicationDeploymentTypes.GLOBAL && ctrl.formValues.AutoScaler.IsUsed">
-                    <table class="table" style="margin-bottom: 0px;">
+                    <table class="table" style="margin-bottom: 0px">
                       <tbody>
                         <tr class="small">
-                          <td style="width: 33%; border: none; padding: 2px 0 2px 0;">Minimum instances</td>
-                          <td style="width: 33%; border: none; padding: 2px 0 2px 0;">Maximum instances</td>
-                          <td style="width: 33%; border: none; padding: 2px 0 2px 0;">
+                          <td style="width: 33%; border: none; padding: 2px 0 2px 0">Minimum instances</td>
+                          <td style="width: 33%; border: none; padding: 2px 0 2px 0">Maximum instances</td>
+                          <td style="width: 33%; border: none; padding: 2px 0 2px 0">
                             Target CPU usage (<b>%</b>)
                             <portainer-tooltip
                               position="bottom"
@@ -1033,8 +1001,8 @@
                           </td>
                         </tr>
                         <tr>
-                          <td style="padding: 8px 5px 5px 0; border: none;">
-                            <div class="input-group input-group-sm" style="width: 100%;">
+                          <td style="padding: 8px 5px 5px 0; border: none">
+                            <div class="input-group input-group-sm" style="width: 100%">
                               <input
                                 type="number"
                                 class="form-control"
@@ -1047,7 +1015,7 @@
                               />
                             </div>
                             <div class="input-group input-group-sm" ng-show="kubernetesApplicationCreationForm['auto_scaler_min'].$invalid">
-                              <div class="small text-warning" style="margin-top: 5px;">
+                              <div class="small text-warning" style="margin-top: 5px">
                                 <ng-messages for="kubernetesApplicationCreationForm['auto_scaler_min'].$error">
                                   <p ng-message="required"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Minimum instances is required.</p>
                                   <p ng-message="min"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Minimum instances must be greater than 0.</p>
@@ -1056,8 +1024,8 @@
                               </div>
                             </div>
                           </td>
-                          <td style="padding: 8px 5px 5px 0; border: none;">
-                            <div class="input-group input-group-sm" style="width: 100%;">
+                          <td style="padding: 8px 5px 5px 0; border: none">
+                            <div class="input-group input-group-sm" style="width: 100%">
                               <input
                                 type="number"
                                 class="form-control"
@@ -1067,7 +1035,7 @@
                               />
                             </div>
                             <div class="input-group input-group-sm" ng-show="kubernetesApplicationCreationForm['auto_scaler_max'].$invalid || ctrl.autoScalerOverflow()">
-                              <div class="small text-warning" style="margin-top: 5px;">
+                              <div class="small text-warning" style="margin-top: 5px">
                                 <ng-messages for="kubernetesApplicationCreationForm['auto_scaler_max'].$error">
                                   <p ng-message="required"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Maximum instances is required.</p>
                                   <p ng-message="min"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Maximum instances must be greater than minimum instances.</p>
@@ -1075,8 +1043,8 @@
                               </div>
                             </div>
                           </td>
-                          <td style="padding: 8px 5px 5px 0; border: none;">
-                            <div class="input-group input-group-sm" style="width: 100%;">
+                          <td style="padding: 8px 5px 5px 0; border: none">
+                            <div class="input-group input-group-sm" style="width: 100%">
                               <input
                                 type="number"
                                 class="form-control"
@@ -1089,7 +1057,7 @@
                               />
                             </div>
                             <div class="input-group input-group-sm" ng-show="kubernetesApplicationCreationForm['auto_scaler_cpu'].$invalid">
-                              <div class="small text-warning" style="margin-top: 5px;">
+                              <div class="small text-warning" style="margin-top: 5px">
                                 <ng-messages for="kubernetesApplicationCreationForm['auto_scaler_cpu'].$error">
                                   <p ng-message="required"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Target CPU usage is required.</p>
                                   <p ng-message="min"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Target CPU usage must be greater than 0.</p>
@@ -1102,9 +1070,9 @@
                       </tbody>
                     </table>
 
-                    <div class="form-group" ng-if="ctrl.autoScalerOverflow()" style="margin-bottom: 10px;">
+                    <div class="form-group" ng-if="ctrl.autoScalerOverflow()" style="margin-bottom: 10px">
                       <div class="col-sm-12 small text-danger">
-                        <i class="fa fa-exclamation-circle red-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                        <i class="fa fa-exclamation-circle red-icon" aria-hidden="true" style="margin-right: 2px"></i>
                         This application would exceed available resources. Please review resource reservations or the maximum instance count of the auto-scaling policy.
                       </div>
                     </div>
@@ -1112,26 +1080,24 @@
                   <!-- #endregion -->
 
                   <div ng-if="ctrl.formValues.DeploymentType === ctrl.ApplicationDeploymentTypes.REPLICATED">
-                    <div class="col-sm-12 form-section-title">
-                      Placement preferences and constraints
-                    </div>
+                    <div class="col-sm-12 form-section-title"> Placement preferences and constraints </div>
 
                     <!-- #region PLACEMENTS -->
                     <div class="form-group">
                       <div class="col-sm-12">
                         <label class="control-label text-left">Placement rules</label>
-                        <span class="label label-default interactive" style="margin-left: 10px;" ng-click="ctrl.addPlacement()">
+                        <span class="label label-default interactive" style="margin-left: 10px" ng-click="ctrl.addPlacement()">
                           <i class="fa fa-plus-circle" aria-hidden="true"></i> add rule
                         </span>
                       </div>
 
-                      <div class="col-sm-12 small text-muted" ng-if="ctrl.formValues.Placements.length > 0" style="margin-top: 10px;">
-                        <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                      <div class="col-sm-12 small text-muted" ng-if="ctrl.formValues.Placements.length > 0" style="margin-top: 10px">
+                        <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
                         Deploy this application on nodes that respect <b>ALL</b> of the following placement rules. Placement rules are based on node labels.
                       </div>
 
-                      <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-                        <div ng-repeat-start="placement in ctrl.formValues.Placements" style="margin-top: 2px;">
+                      <div class="col-sm-12 form-inline" style="margin-top: 10px">
+                        <div ng-repeat-start="placement in ctrl.formValues.Placements" style="margin-top: 2px">
                           <div class="col-sm-5 input-group" ng-class="{ striked: placement.NeedsDeletion }">
                             <select
                               class="form-control"
@@ -1177,7 +1143,7 @@
                         </div>
                         <div ng-repeat-end ng-show="ctrl.state.duplicates.placements.refs[$index] !== undefined">
                           <div class="col-sm-5 input-group">
-                            <div class="small text-warning" style="margin-top: 5px;" ng-if="ctrl.state.duplicates.placements.refs[$index] !== undefined">
+                            <div class="small text-warning" style="margin-top: 5px" ng-if="ctrl.state.duplicates.placements.refs[$index] !== undefined">
                               <p ng-if="ctrl.state.duplicates.placements.refs[$index] !== undefined">
                                 <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This label is already defined.
                               </p>
@@ -1194,13 +1160,11 @@
                       </div>
 
                       <div class="form-group">
-                        <div class="col-sm-12 small text-muted">
-                          Specify the policy associated to the placement rules.
-                        </div>
+                        <div class="col-sm-12 small text-muted"> Specify the policy associated to the placement rules. </div>
                       </div>
 
                       <!-- placement policy options -->
-                      <div class="form-group" style="margin-bottom: 0;" ng-if="ctrl.formValues.Placements.length">
+                      <div class="form-group" style="margin-bottom: 0" ng-if="ctrl.formValues.Placements.length">
                         <div class="boxselector_wrapper">
                           <div>
                             <input
@@ -1212,7 +1176,7 @@
                             />
                             <label for="placement_hard">
                               <div class="boxselector_header">
-                                <i class="fa fa-tasks" aria-hidden="true" style="margin-right: 2px;"></i>
+                                <i class="fa fa-tasks" aria-hidden="true" style="margin-right: 2px"></i>
                                 Mandatory
                               </div>
                               <p>Schedule this application <b>ONLY</b> on nodes that match <b>ALL</b> Rules</p>
@@ -1228,7 +1192,7 @@
                             />
                             <label for="placement_soft">
                               <div class="boxselector_header">
-                                <i class="fa fa-list" aria-hidden="true" style="margin-right: 2px;"></i>
+                                <i class="fa fa-list" aria-hidden="true" style="margin-right: 2px"></i>
                                 Preferred
                               </div>
                               <p>Schedule this application on nodes that match the rules if possible</p>
@@ -1255,9 +1219,7 @@
               </div>
             </div>
             <div ng-if="ctrl.isExternalApplication()">
-              <div class="col-sm-12 form-section-title" ng-if="ctrl.state.appType === ctrl.KubernetesDeploymentTypes.APPLICATION_FORM">
-                Namespace
-              </div>
+              <div class="col-sm-12 form-section-title" ng-if="ctrl.state.appType === ctrl.KubernetesDeploymentTypes.APPLICATION_FORM"> Namespace </div>
               <!-- #region NAMESPACE -->
               <div class="form-group" ng-if="ctrl.formValues.ResourcePool">
                 <label for="resource-pool-selector" class="col-sm-1 control-label text-left">Namespace</label>
@@ -1275,14 +1237,14 @@
               </div>
               <div class="form-group" ng-if="ctrl.state.resourcePoolHasQuota && ctrl.resourceQuotaCapacityExceeded() && ctrl.formValues.ResourcePool">
                 <div class="col-sm-12 small text-danger">
-                  <i class="fa fa-exclamation-circle red-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                  <i class="fa fa-exclamation-circle red-icon" aria-hidden="true" style="margin-right: 2px"></i>
                   This namespace has exhausted its resource capacity and you will not be able to deploy the application. Contact your administrator to expand the capacity of the
                   namespace.
                 </div>
               </div>
               <div class="form-group" ng-if="!ctrl.formValues.ResourcePool">
                 <div class="col-sm-12 small text-muted">
-                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                   You do not have access to any namespace. Contact your administrator to get access to a namespace.
                 </div>
               </div>
@@ -1294,9 +1256,7 @@
             <!-- kubernetes summary for external application -->
             <kubernetes-summary-view ng-if="ctrl.isExternalApplication()" form-values="ctrl.formValues" old-form-values="ctrl.savedFormValues"></kubernetes-summary-view>
             <!-- kubernetes summary for external application -->
-            <div class="col-sm-12 form-section-title" ng-if="ctrl.state.appType !== ctrl.KubernetesDeploymentTypes.GIT">
-              Actions
-            </div>
+            <div class="col-sm-12 form-section-title" ng-if="ctrl.state.appType !== ctrl.KubernetesDeploymentTypes.GIT"> Actions </div>
             <!-- #region ACTIONS -->
             <div class="form-group">
               <div class="col-sm-12">
@@ -1329,7 +1289,7 @@
                   ng-click="ctrl.updateApplicationViaWebEditor()"
                   ng-if="ctrl.state.appType === ctrl.KubernetesDeploymentTypes.CONTENT || ctrl.state.updateWebEditorInProgress"
                   ng-disabled="!kubernetesApplicationCreationForm.$valid || !ctrl.state.isEditorDirty || ctrl.state.updateWebEditorInProgress"
-                  style="margin-top: 7px; margin-left: 0;"
+                  style="margin-top: 7px; margin-left: 0"
                   button-spinner="ctrl.state.updateWebEditorInProgress"
                 >
                   <span ng-show="!ctrl.state.updateWebEditorInProgress">Update the application</span>
diff --git a/app/kubernetes/views/applications/edit/application.html b/app/kubernetes/views/applications/edit/application.html
index 49b4694d2..5e5763ff7 100644
--- a/app/kubernetes/views/applications/edit/application.html
+++ b/app/kubernetes/views/applications/edit/application.html
@@ -14,7 +14,7 @@
           <uib-tabset active="ctrl.state.activeTab" justified="true" type="pills">
             <uib-tab index="0" classes="btn-sm" select="ctrl.selectTab(0)">
               <uib-tab-heading> <i class="fa fa-laptop-code space-right" aria-hidden="true"></i> Application </uib-tab-heading>
-              <div style="padding: 20px;">
+              <div style="padding: 20px">
                 <table class="table">
                   <tbody>
                     <tr>
@@ -32,7 +32,7 @@
                       <td>Namespace</td>
                       <td data-cy="k8sAppDetail-resourcePoolName">
                         <a ui-sref="kubernetes.resourcePools.resourcePool({ id: ctrl.application.ResourcePool })">{{ ctrl.application.ResourcePool }}</a>
-                        <span style="margin-left: 5px;" class="label label-info image-tag" ng-if="ctrl.isSystemNamespace()">system</span>
+                        <span style="margin-left: 5px" class="label label-info image-tag" ng-if="ctrl.isSystemNamespace()">system</span>
                       </td>
                     </tr>
                     <tr>
@@ -68,7 +68,7 @@
                     <tr>
                       <td>Creation</td>
                       <td>
-                        <span ng-if="ctrl.application.ApplicationOwner" style="margin-right: 5px;"> <i class="fas fa-user"></i> {{ ctrl.application.ApplicationOwner }} </span>
+                        <span ng-if="ctrl.application.ApplicationOwner" style="margin-right: 5px"> <i class="fas fa-user"></i> {{ ctrl.application.ApplicationOwner }} </span>
                         <span> <i class="fas fa-clock"></i> {{ ctrl.application.CreationDate | getisodate }}</span>
                         <span ng-if="ctrl.application.ApplicationOwner">
                           <i class="fa fa-file-code space-left space-right" aria-hidden="true"></i> Deployed from {{ ctrl.state.appType }}</span
@@ -103,7 +103,7 @@
                             <div class="col-sm-12">
                               <button
                                 class="btn btn-primary btn-sm"
-                                style="margin-left: 0px;"
+                                style="margin-left: 0px"
                                 type="button"
                                 ng-click="ctrl.updateApplication()"
                                 ng-disabled="ctrl.formValues.Note === ctrl.application.Note"
@@ -141,12 +141,12 @@
               <uib-tab-heading>
                 <i class="fas fa-compress-arrows-alt space-right" aria-hidden="true"></i> Placement
                 <div ng-if="ctrl.state.placementWarning">
-                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                   warning
                 </div>
               </uib-tab-heading>
-              <div class="small text-muted" style="padding: 20px;">
-                <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+              <div class="small text-muted" style="padding: 20px">
+                <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
                 The placement component helps you understand whether or not this application can be deployed on a specific node.
               </div>
               <kubernetes-application-placements-datatable
@@ -165,7 +165,7 @@
               <uib-tab-heading>
                 <i class="fa fa-history space-right" aria-hidden="true"></i> Events
                 <div ng-if="ctrl.hasEventWarnings()">
-                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                   {{ ctrl.state.eventWarningCount }} warning(s)
                 </div>
               </uib-tab-heading>
@@ -183,7 +183,7 @@
 
             <uib-tab index="3" ng-if="ctrl.application.Yaml" select="ctrl.showEditor()" classes="btn-sm">
               <uib-tab-heading> <i class="fa fa-code space-right" aria-hidden="true"></i> YAML </uib-tab-heading>
-              <div style="padding-right: 25px;" ng-if="ctrl.state.showEditorTab">
+              <div style="padding-right: 25px" ng-if="ctrl.state.showEditorTab">
                 <kubernetes-yaml-inspector key="application-yaml" data="ctrl.application.Yaml"></kubernetes-yaml-inspector>
               </div>
             </uib-tab>
@@ -197,13 +197,13 @@
     <div class="col-sm-12">
       <rd-widget>
         <rd-widget-body>
-          <div ng-if="!ctrl.isSystemNamespace()" style="margin-bottom: 15px;">
+          <div ng-if="!ctrl.isSystemNamespace()" style="margin-bottom: 15px">
             <button
               ng-if="!ctrl.isExternalApplication()"
               type="button"
               class="btn btn-sm btn-primary"
               ui-sref="kubernetes.applications.application.edit"
-              style="margin-left: 0;"
+              style="margin-left: 0"
               data-cy="k8sAppDetail-editAppButton"
             >
               <i class="fa fa-file-code space-right" aria-hidden="true"></i>Edit this application
@@ -214,7 +214,7 @@
               type="button"
               class="btn btn-sm btn-primary"
               ui-sref="kubernetes.applications.application.edit"
-              style="margin-left: 0;"
+              style="margin-left: 0"
               data-cy="k8sAppDetail-editAppButton"
             >
               <i class="fa fa-file-code space-right" aria-hidden="true"></i>Edit External application
@@ -223,7 +223,7 @@
               ng-if="ctrl.application.ApplicationType !== ctrl.KubernetesApplicationTypes.POD"
               type="button"
               class="btn btn-sm btn-primary"
-              style="margin-left: 0;"
+              style="margin-left: 0"
               ng-click="ctrl.redeployApplication()"
               data-cy="k8sAppDetail-redeployButton"
             >
@@ -233,7 +233,7 @@
               ng-if="!ctrl.isExternalApplication()"
               type="button"
               class="btn btn-sm btn-primary"
-              style="margin-left: 0;"
+              style="margin-left: 0"
               ng-click="ctrl.rollbackApplication()"
               ng-disabled="ctrl.application.Revisions.length < 2 || ctrl.state.appType !== ctrl.KubernetesDeploymentTypes.APPLICATION_FORM"
               data-cy="k8sAppDetail-rollbackButton"
@@ -250,12 +250,10 @@
           </div>
 
           <!-- ACCESSING APPLICATION -->
-          <div class="text-muted" style="margin-bottom: 15px;">
-            <i class="fa fa-external-link-alt" aria-hidden="true" style="margin-right: 2px;"></i> Accessing the application
-          </div>
+          <div class="text-muted" style="margin-bottom: 15px"> <i class="fa fa-external-link-alt" aria-hidden="true" style="margin-right: 2px"></i> Accessing the application </div>
 
-          <div class="small text-muted" ng-if="ctrl.application.PublishedPorts.length === 0" style="margin-bottom: 15px;">
-            <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+          <div class="small text-muted" ng-if="ctrl.application.PublishedPorts.length === 0" style="margin-bottom: 15px">
+            <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
             This application is not exposing any port.
           </div>
 
@@ -264,7 +262,7 @@
             <div>
               <div class="small text-muted">
                 <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 application is exposed through service(s) as below:
                 </p>
               </div>
@@ -284,21 +282,21 @@
           </div>
           <!-- !ACCESSING APPLICATION -->
           <!-- AUTO SCALING -->
-          <div class="text-muted" style="margin-bottom: 15px;"> <i class="fa fa-expand-arrows-alt" aria-hidden="true" style="margin-right: 2px;"></i> Auto-scaling</div>
+          <div class="text-muted" style="margin-bottom: 15px"> <i class="fa fa-expand-arrows-alt" aria-hidden="true" style="margin-right: 2px"></i> Auto-scaling</div>
 
-          <div class="small text-muted" ng-if="!ctrl.application.AutoScaler" style="margin-bottom: 15px;">
-            <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+          <div class="small text-muted" ng-if="!ctrl.application.AutoScaler" style="margin-bottom: 15px">
+            <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
             This application does not have an autoscaling policy defined.
           </div>
 
           <div ng-if="ctrl.application.AutoScaler">
-            <div style="margin-top: 15px; width: 50%;">
+            <div style="margin-top: 15px; width: 50%">
               <table class="table">
                 <tbody>
                   <tr class="text-muted">
-                    <td style="width: 33%;">Minimum instances</td>
-                    <td style="width: 33%;">Maximum instances</td>
-                    <td style="width: 33%;">
+                    <td style="width: 33%">Minimum instances</td>
+                    <td style="width: 33%">Maximum instances</td>
+                    <td style="width: 33%">
                       Target CPU usage
                       <portainer-tooltip position="bottom" message="The autoscaler will ensure enough instances are running to maintain an average CPU usage across all instances.">
                       </portainer-tooltip>
@@ -316,21 +314,21 @@
           <!-- !AUTO SCALING -->
 
           <!-- CONFIGURATIONS -->
-          <div class="text-muted" style="margin-bottom: 15px; margin-top: 25px;"> <i class="fa fa-file-code" aria-hidden="true" style="margin-right: 2px;"></i> Configuration </div>
+          <div class="text-muted" style="margin-bottom: 15px; margin-top: 25px"> <i class="fa fa-file-code" aria-hidden="true" style="margin-right: 2px"></i> Configuration </div>
 
-          <div class="small text-muted" ng-if="!ctrl.application.Env.length > 0 && !ctrl.hasVolumeConfiguration()" style="margin-bottom: 15px;">
-            <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+          <div class="small text-muted" ng-if="!ctrl.application.Env.length > 0 && !ctrl.hasVolumeConfiguration()" style="margin-bottom: 15px">
+            <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
             This application is not using any environment variable or configuration.
           </div>
 
           <table class="table" ng-if="ctrl.application.Env.length > 0">
             <tr class="text-muted">
-              <td style="width: 25%;">Container</td>
-              <td style="width: 25%;">Environment variable</td>
-              <td style="width: 25%;">Value</td>
-              <td style="width: 25%;">Configuration</td>
+              <td style="width: 25%">Container</td>
+              <td style="width: 25%">Environment variable</td>
+              <td style="width: 25%">Value</td>
+              <td style="width: 25%">Configuration</td>
             </tr>
-            <tbody ng-repeat="container in ctrl.application.Containers" style="border-top: 0;">
+            <tbody ng-repeat="container in ctrl.application.Containers" style="border-top: 0">
               <tr ng-repeat="envvar in container.Env | orderBy: 'name'">
                 <td data-cy="k8sAppDetail-containerName">
                   {{ container.Name }}
@@ -379,13 +377,13 @@
 
           <table class="table" ng-if="ctrl.hasVolumeConfiguration()">
             <tr class="text-muted">
-              <td style="width: 25%;">Container</td>
-              <td style="width: 25%;">Configuration path</td>
-              <td style="width: 25%;">Value</td>
-              <td style="width: 25%;">Configuration</td>
+              <td style="width: 25%">Container</td>
+              <td style="width: 25%">Configuration path</td>
+              <td style="width: 25%">Value</td>
+              <td style="width: 25%">Configuration</td>
             </tr>
-            <tbody ng-repeat="container in ctrl.application.Containers" style="border-top: 0;">
-              <tr ng-repeat="volume in container.ConfigurationVolumes track by $index" style="border-top: 0;">
+            <tbody ng-repeat="container in ctrl.application.Containers" style="border-top: 0">
+              <tr ng-repeat="volume in container.ConfigurationVolumes track by $index" style="border-top: 0">
                 <td>
                   {{ container.Name }}
                   <span ng-if="container.Type === ctrl.KubernetesPodContainerTypes.INIT"
@@ -411,17 +409,15 @@
           <!-- !CONFIGURATIONS -->
 
           <!-- DATA PERSISTENCE -->
-          <div class="text-muted" style="margin-bottom: 15px; margin-top: 25px;">
-            <i class="fa fa-database" aria-hidden="true" style="margin-right: 2px;"></i> Data persistence
-          </div>
+          <div class="text-muted" style="margin-bottom: 15px; margin-top: 25px"> <i class="fa fa-database" aria-hidden="true" style="margin-right: 2px"></i> Data persistence </div>
 
           <div class="small text-muted" ng-if="!ctrl.hasPersistedFolders()">
-            <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 application has no persisted folders.
           </div>
 
           <div ng-if="ctrl.hasPersistedFolders()">
-            <div class="small text-muted" style="margin-bottom: 15px;">
+            <div class="small text-muted" style="margin-bottom: 15px">
               Data access policy: <i class="fa {{ ctrl.application.DataAccessPolicy | kubernetesApplicationDataAccessPolicyIcon }}" aria-hidden="true"></i>
               {{ ctrl.application.DataAccessPolicy | kubernetesApplicationDataAccessPolicyText }}
               <portainer-tooltip position="right" message="{{ ctrl.application.DataAccessPolicy | kubernetesApplicationDataAccessPolicyTooltip }}"> </portainer-tooltip>
@@ -429,10 +425,10 @@
 
             <table class="table" ng-if="ctrl.application.DataAccessPolicy === ctrl.ApplicationDataAccessPolicies.SHARED">
               <tr class="text-muted">
-                <td style="width: 33%;">Persisted folder</td>
-                <td style="width: 66%;">Persistence</td>
+                <td style="width: 33%">Persisted folder</td>
+                <td style="width: 66%">Persistence</td>
               </tr>
-              <tbody ng-repeat="container in ctrl.application.Containers" style="border-top: 0;">
+              <tbody ng-repeat="container in ctrl.application.Containers" style="border-top: 0">
                 <tr ng-repeat="volume in container.PersistedFolders track by $index">
                   <td data-cy="k8sAppDetail-volMountPath">
                     {{ volume.MountPath }}
@@ -450,13 +446,13 @@
             <table class="table" ng-if="ctrl.application.DataAccessPolicy === ctrl.ApplicationDataAccessPolicies.ISOLATED">
               <thead>
                 <tr class="text-muted">
-                  <td style="width: 25%;">Container name</td>
-                  <td style="width: 25%;">Pod name</td>
-                  <td style="width: 25%;">Persisted folder</td>
-                  <td style="width: 25%;">Persistence</td>
+                  <td style="width: 25%">Container name</td>
+                  <td style="width: 25%">Pod name</td>
+                  <td style="width: 25%">Persisted folder</td>
+                  <td style="width: 25%">Persistence</td>
                 </tr>
               </thead>
-              <tbody ng-repeat="container in ctrl.allContainers track by $index" style="border-top: none;">
+              <tbody ng-repeat="container in ctrl.allContainers track by $index" style="border-top: none">
                 <tr ng-repeat="volume in container.PersistedFolders track by $index">
                   <td>
                     {{ container.Name }}
diff --git a/app/kubernetes/views/applications/edit/components/placements-datatable/template.html b/app/kubernetes/views/applications/edit/components/placements-datatable/template.html
index 80a7dbf97..041088920 100644
--- a/app/kubernetes/views/applications/edit/components/placements-datatable/template.html
+++ b/app/kubernetes/views/applications/edit/components/placements-datatable/template.html
@@ -2,15 +2,13 @@
   <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 class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
             <span uib-dropdown-toggle><i class="fa fa-cog" aria-hidden="true"></i> Table 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">
@@ -18,9 +16,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>
@@ -29,7 +25,7 @@
                         <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>
@@ -58,12 +54,12 @@
         <table class="table table-hover nowrap-cells">
           <thead>
             <tr>
-              <th style="width: 2%;">
+              <th style="width: 2%">
                 <a ng-click="$ctrl.expandAll()" ng-if="$ctrl.hasExpandableItems()">
                   <i ng-class="{ 'fas fa-angle-down': $ctrl.state.expandAll, 'fas fa-angle-right': !$ctrl.state.expandAll }" aria-hidden="true"></i>
                 </a>
               </th>
-              <th style="width: 98%;">
+              <th style="width: 98%">
                 <a ng-click="$ctrl.changeOrderBy('Name')">
                   Node
                   <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Name' && !$ctrl.state.reverseOrder"></i>
@@ -108,9 +104,7 @@
               ng-show="item.Expanded"
               ng-class="{ 'datatable-highlighted': item.Highlighted, 'datatable-unhighlighted': !item.Highlighted }"
             >
-              <td colspan="2">
-                Placement constraint not respected for that node.
-              </td>
+              <td colspan="2"> Placement constraint not respected for that node. </td>
             </tr>
             <!-- ! USER + UNMET TAINTS -->
             <!-- ADMIN + UNMET NODE SELECTOR LABELS -->
@@ -131,9 +125,7 @@
               ng-show="item.Expanded"
               ng-class="{ 'datatable-highlighted': item.Highlighted, 'datatable-unhighlighted': !item.Highlighted }"
             >
-              <td colspan="2">
-                Placement label not respected for that node.
-              </td>
+              <td colspan="2"> Placement label not respected for that node. </td>
             </tr>
             <!-- ! USER + UNMET NODE SELECTOR LABELS || UNMET NODE AFFINITIES -->
             <!-- ADMIN + UNMET NODE AFFINITIES -->
@@ -142,9 +134,7 @@
               ng-show="item.Expanded && item.UnmatchedNodeAffinities.length"
               ng-class="{ 'datatable-highlighted': item.Highlighted, 'datatable-unhighlighted': !item.Highlighted }"
             >
-              <td colspan="2">
-                This application can only be scheduled on nodes respecting one of the following labels combination:
-              </td>
+              <td colspan="2"> This application can only be scheduled on nodes respecting one of the following labels combination: </td>
             </tr>
             <tr
               dir-paginate-end
@@ -176,9 +166,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/kubernetes/views/applications/helm/helm.html b/app/kubernetes/views/applications/helm/helm.html
index fe891cfca..e8eaef278 100644
--- a/app/kubernetes/views/applications/helm/helm.html
+++ b/app/kubernetes/views/applications/helm/helm.html
@@ -7,11 +7,9 @@
 <div ng-if="$ctrl.state.viewReady">
   <div class="row">
     <div class="col-sm-12">
-      <div class="col-sm-12 form-section-title">
-        Information
-      </div>
+      <div class="col-sm-12 form-section-title"> Information </div>
       <p class="text-muted">
-        <i class="fa fa-flask orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+        <i class="fa fa-flask orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
         This is a first version for Helm charts, for more information see this
         <a href="https://www.portainer.io/blog/portainer-now-with-helm-support" target="_blank">blog post</a>.
       </p>
diff --git a/app/kubernetes/views/applications/logs/logs.html b/app/kubernetes/views/applications/logs/logs.html
index 420398668..bcb76a02a 100644
--- a/app/kubernetes/views/applications/logs/logs.html
+++ b/app/kubernetes/views/applications/logs/logs.html
@@ -8,15 +8,13 @@
 
 <kubernetes-view-loading view-ready="ctrl.state.viewReady"></kubernetes-view-loading>
 
-<div ng-if="ctrl.state.viewReady" style="height: 100%;">
+<div ng-if="ctrl.state.viewReady" style="height: 100%">
   <div class="row">
     <div class="col-sm-12">
       <rd-widget>
         <rd-widget-body>
           <form class="form-horizontal" autocomplete="off">
-            <div class="col-sm-12 form-section-title">
-              Actions
-            </div>
+            <div class="col-sm-12 form-section-title"> Actions </div>
             <!-- auto-refresh -->
             <div class="form-group">
               <div class="col-sm-12">
@@ -24,15 +22,13 @@
                   Auto-refresh
                   <portainer-tooltip position="bottom" message="Automatically refresh logs every 5 seconds"></portainer-tooltip>
                 </label>
-                <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="ctrl.state.autoRefresh" ng-change="ctrl.updateAutoRefresh()" /><i></i> </label>
+                <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="ctrl.state.autoRefresh" ng-change="ctrl.updateAutoRefresh()" /><i></i> </label>
               </div>
             </div>
             <!-- !auto-refresh -->
             <!-- search -->
             <div class="form-group">
-              <label for="logs_search" class="col-sm-1 control-label text-left">
-                Search
-              </label>
+              <label for="logs_search" class="col-sm-1 control-label text-left"> Search </label>
               <div class="col-sm-11">
                 <input
                   class="form-control"
@@ -49,7 +45,7 @@
             <!-- actions -->
             <div class="form-group">
               <div class="col-sm-12">
-                <button class="btn btn-primary btn-sm" type="button" ng-click="ctrl.downloadLogs()" style="margin-left: 0;"><i class="fa fa-download"></i> Download logs</button>
+                <button class="btn btn-primary btn-sm" type="button" ng-click="ctrl.downloadLogs()" style="margin-left: 0"><i class="fa fa-download"></i> Download logs</button>
               </div>
             </div>
             <!-- !actions -->
@@ -59,8 +55,8 @@
     </div>
   </div>
 
-  <div class="row" style="height: 54%;">
-    <div class="col-sm-12" style="height: 100%;">
+  <div class="row" style="height: 54%">
+    <div class="col-sm-12" style="height: 100%">
       <pre
         class="log_viewer"
       ><div ng-repeat="line in ctrl.state.filteredLogs = (ctrl.applicationLogs | filter:ctrl.state.search) track by $index" class="line" ng-if="line"><p class="inner_line">{{ line }}</p></div><div ng-if="ctrl.applicationLogs.length && !ctrl.state.filteredLogs.length" class="line"><p class="inner_line">No log line matching the '{{ ctrl.state.search }}' filter</p></div><div ng-if="ctrl.applicationLogs.length === 0" class="line"><p class="inner_line">No logs available</p></div></pre>
diff --git a/app/kubernetes/views/applications/stats/stats.html b/app/kubernetes/views/applications/stats/stats.html
index 1e9411996..535e11e53 100644
--- a/app/kubernetes/views/applications/stats/stats.html
+++ b/app/kubernetes/views/applications/stats/stats.html
@@ -13,7 +13,7 @@
 <div ng-if="ctrl.state.viewReady">
   <information-panel ng-if="!ctrl.state.getMetrics" title-text="Unable to retrieve container metrics">
     <span class="small text-muted">
-      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
       Portainer was unable to retrieve any metrics associated to that container. Please contact your administrator to ensure that the Kubernetes metrics feature is properly
       configured.
     </span>
@@ -33,9 +33,7 @@
               </div>
             </div>
             <div class="form-group">
-              <label for="refreshRate" class="col-sm-3 col-md-2 col-lg-2 margin-sm-top control-label text-left">
-                Refresh rate
-              </label>
+              <label for="refreshRate" class="col-sm-3 col-md-2 col-lg-2 margin-sm-top control-label text-left"> Refresh rate </label>
               <div class="col-sm-3 col-md-2">
                 <select id="refreshRate" ng-model="ctrl.state.refreshRate" ng-change="ctrl.changeUpdateRepeater()" class="form-control">
                   <option value="30">30s</option>
@@ -43,7 +41,7 @@
                 </select>
               </div>
               <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 class="form-group" ng-if="ctrl.state.networkStatsUnavailable">
@@ -62,7 +60,7 @@
       <rd-widget>
         <rd-widget-header icon="fa-chart-area" title-text="Memory usage"></rd-widget-header>
         <rd-widget-body>
-          <div class="chart-container" style="position: relative;">
+          <div class="chart-container" style="position: relative">
             <canvas id="memoryChart" width="770" height="300"></canvas>
           </div>
         </rd-widget-body>
@@ -72,7 +70,7 @@
       <rd-widget>
         <rd-widget-header icon="fa-chart-area" title-text="CPU usage"></rd-widget-header>
         <rd-widget-body>
-          <div class="chart-container" style="position: relative;">
+          <div class="chart-container" style="position: relative">
             <canvas id="cpuChart" width="770" height="300"></canvas>
           </div>
         </rd-widget-body>
diff --git a/app/kubernetes/views/cluster/cluster.html b/app/kubernetes/views/cluster/cluster.html
index c8c230e47..63c5dd2f8 100644
--- a/app/kubernetes/views/cluster/cluster.html
+++ b/app/kubernetes/views/cluster/cluster.html
@@ -1,6 +1,4 @@
-<kubernetes-view-header title="Cluster" state="kubernetes.cluster" view-ready="ctrl.state.viewReady">
-  Cluster information
-</kubernetes-view-header>
+<kubernetes-view-header title="Cluster" state="kubernetes.cluster" view-ready="ctrl.state.viewReady"> Cluster information </kubernetes-view-header>
 
 <kubernetes-view-loading view-ready="ctrl.state.viewReady"></kubernetes-view-loading>
 
@@ -27,21 +25,19 @@
 
           <!-- leader-status -->
           <div ng-if="ctrl.systemEndpoints.length > 0">
-            <div class="col-sm-12 form-section-title">
-              Leader status
-            </div>
+            <div class="col-sm-12 form-section-title"> Leader status </div>
 
             <table class="table">
               <tbody>
                 <tr class="text-muted">
-                  <td style="border-top: none; width: 25%;">Component</td>
-                  <td style="border-top: none; width: 25%;">Leader node</td>
+                  <td style="border-top: none; width: 25%">Component</td>
+                  <td style="border-top: none; width: 25%">Leader node</td>
                 </tr>
                 <tr ng-repeat="ep in ctrl.systemEndpoints">
-                  <td style="width: 25%;">
+                  <td style="width: 25%">
                     {{ ep.Name }}
                   </td>
-                  <td style="width: 25%;">
+                  <td style="width: 25%">
                     {{ ep.HolderIdentity }}
                   </td>
                 </tr>
diff --git a/app/kubernetes/views/cluster/node/node.html b/app/kubernetes/views/cluster/node/node.html
index 13d99df10..a1bec9edd 100644
--- a/app/kubernetes/views/cluster/node/node.html
+++ b/app/kubernetes/views/cluster/node/node.html
@@ -13,20 +13,18 @@
             <uib-tab index="0" classes="btn-sm" select="ctrl.selectTab(0)">
               <uib-tab-heading> <i class="fa fa-hdd space-right" aria-hidden="true"></i> Node </uib-tab-heading>
 
-              <form class="form-horizontal" name="kubernetesNodeUpdateForm" style="padding: 20px;" autocomplete="off">
+              <form class="form-horizontal" name="kubernetesNodeUpdateForm" style="padding: 20px" autocomplete="off">
                 <table class="table">
                   <tbody ng-if="ctrl.node">
                     <tr>
                       <td>Hostname</td>
                       <td>
                         {{ ctrl.node.Name }}
-                        <span class="label label-primary image-tag" style="margin-left: 5px;" ng-if="ctrl.node.Api">api</span>
+                        <span class="label label-primary image-tag" style="margin-left: 5px" ng-if="ctrl.node.Api">api</span>
                       </td>
                     </tr>
                     <tr ng-if="ctrl.node.Api">
-                      <td>
-                        Kubernetes API
-                      </td>
+                      <td> Kubernetes API </td>
                       <td>{{ ctrl.node.IPAddress }}:{{ ctrl.node.Port }}</td>
                     </tr>
                     <tr>
@@ -53,21 +51,19 @@
                       </td>
                     </tr>
                     <tr>
-                      <td class="col-xs-3">
-                        Availability
-                      </td>
+                      <td class="col-xs-3"> Availability </td>
                       <td class="col-xs-9">
-                        <select class="form-control" name="availability" style="display: inline-block; width: 16rem;" ng-model="ctrl.formValues.Availability">
+                        <select class="form-control" name="availability" style="display: inline-block; width: 16rem" ng-model="ctrl.formValues.Availability">
                           <option>{{ ctrl.availabilities.ACTIVE }}</option>
                           <option>{{ ctrl.availabilities.PAUSE }}</option>
                           <option>{{ ctrl.availabilities.DRAIN }}</option>
                         </select>
                         <span class="small text-warning" ng-if="ctrl.state.isDrainOperation && ctrl.formValues.Availability === ctrl.availabilities.DRAIN">
-                          <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                          <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                           Cannot use this action while another node is currently being drained.
                         </span>
                         <span class="small text-warning" ng-if="ctrl.state.isContainPortainer && ctrl.formValues.Availability === ctrl.availabilities.DRAIN">
-                          <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                          <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                           Cannot drain a node where this Portainer instance is running.
                         </span>
                       </td>
@@ -75,7 +71,7 @@
                   </tbody>
                 </table>
 
-                <div style="padding: 8px;">
+                <div style="padding: 8px">
                   <kubernetes-resource-reservation
                     ng-if="ctrl.resourceReservation"
                     cpu-reservation="ctrl.resourceReservation.CPU"
@@ -90,17 +86,15 @@
                   </kubernetes-resource-reservation>
                 </div>
 
-                <div style="padding: 8px;">
+                <div style="padding: 8px">
                   <!-- #region labels -->
-                  <div class="col-sm-12 form-section-title">
-                    Labels
-                  </div>
+                  <div class="col-sm-12 form-section-title"> Labels </div>
 
-                  <div style="margin-bottom: 10px;">
+                  <div style="margin-bottom: 10px">
                     <span class="label label-default interactive" ng-click="ctrl.addLabel()"> <i class="fa fa-plus-circle" aria-hidden="true"></i> add label </span>
                   </div>
 
-                  <div class="form-inline" ng-repeat="label in ctrl.formValues.Labels" style="padding: 3px 0 3px 0;">
+                  <div class="form-inline" ng-repeat="label in ctrl.formValues.Labels" style="padding: 3px 0 3px 0">
                     <div class="input-group col-sm-3 input-group-sm" ng-class="{ striked: label.NeedsDeletion }">
                       <span class="input-group-addon">Key</span>
                       <input
@@ -125,20 +119,20 @@
                       />
                     </div>
                     <div class="input-group col-sm-1 input-group-sm">
-                      <div style="white-space: nowrap;">
+                      <div style="white-space: nowrap">
                         <button ng-if="!ctrl.isSystemLabel($index) && !label.NeedsDeletion" class="btn btn-sm btn-danger" type="button" ng-click="ctrl.removeLabel($index)">
                           <i class="fa fa-times" aria-hidden="true"></i>
                         </button>
                         <button ng-if="!ctrl.isSystemLabel($index) && label.NeedsDeletion" class="btn btn-sm btn-primary" type="button" ng-click="ctrl.restoreLabel($index)">
                           Restore
                         </button>
-                        <span class="label label-warning label-sm image-tag" ng-if="label.IsUsed && !ctrl.isSystemLabel($index)" style="margin-left: 5px;">used</span>
-                        <span class="label label-info image-tag" ng-if="ctrl.isSystemLabel($index)" style="margin-left: 5px;">system</span>
+                        <span class="label label-warning label-sm image-tag" ng-if="label.IsUsed && !ctrl.isSystemLabel($index)" style="margin-left: 5px">used</span>
+                        <span class="label label-info image-tag" ng-if="ctrl.isSystemLabel($index)" style="margin-left: 5px">system</span>
                       </div>
                     </div>
                     <div
                       class="small text-warning"
-                      style="margin-top: 5px;"
+                      style="margin-top: 5px"
                       ng-show="kubernetesNodeUpdateForm['label_key_' + $index].$invalid || ctrl.state.duplicateLabelKeys[$index] !== undefined"
                     >
                       <ng-messages for="kubernetesNodeUpdateForm['label_key_' + $index].$error">
@@ -154,15 +148,13 @@
 
                   <!-- #region taints -->
 
-                  <div class="col-sm-12 form-section-title" style="margin-top: 20px;">
-                    Taints
-                  </div>
+                  <div class="col-sm-12 form-section-title" style="margin-top: 20px"> Taints </div>
 
-                  <div style="margin-bottom: 10px;">
+                  <div style="margin-bottom: 10px">
                     <span class="label label-default interactive" ng-click="ctrl.addTaint()"> <i class="fa fa-plus-circle" aria-hidden="true"></i> add taint </span>
                   </div>
 
-                  <div class="form-inline" ng-repeat="taint in ctrl.formValues.Taints" style="padding: 3px 0 3px 0;">
+                  <div class="form-inline" ng-repeat="taint in ctrl.formValues.Taints" style="padding: 3px 0 3px 0">
                     <div class="input-group col-sm-3 input-group-sm" ng-class="{ striked: taint.NeedsDeletion }">
                       <span class="input-group-addon">Key</span>
                       <input type="text" class="form-control" name="taint_key_{{ $index }}" ng-model="taint.Key" ng-change="ctrl.onChangeTaintKey($index)" required />
@@ -188,14 +180,12 @@
                         <button ng-if="!taint.NeedsDeletion" class="btn btn-sm btn-danger" type="button" ng-click="ctrl.removeTaint($index)">
                           <i class="fa fa-times" aria-hidden="true"></i>
                         </button>
-                        <button ng-if="taint.NeedsDeletion" class="btn btn-sm btn-primary" type="button" ng-click="ctrl.restoreTaint($index)">
-                          Restore
-                        </button>
+                        <button ng-if="taint.NeedsDeletion" class="btn btn-sm btn-primary" type="button" ng-click="ctrl.restoreTaint($index)"> Restore </button>
                       </div>
                     </div>
                     <div
                       class="small text-warning"
-                      style="margin-top: 5px;"
+                      style="margin-top: 5px"
                       ng-show="kubernetesNodeUpdateForm['taint_key_' + $index].$invalid || ctrl.state.duplicateTaintKeys[$index] !== undefined"
                     >
                       <ng-messages for="kubernetesNodeUpdateForm['taint_key_' + $index].$error">
@@ -211,24 +201,20 @@
 
                   <!-- #region actions -->
 
-                  <div class="col-sm-12 form-section-title" style="margin-top: 20px;">
-                    Actions
-                  </div>
+                  <div class="col-sm-12 form-section-title" style="margin-top: 20px"> Actions </div>
 
                   <div class="form-group">
                     <div class="col-sm-12">
                       <button
                         class="btn btn-primary btn-sm"
                         type="button"
-                        style="margin-left: 0;"
+                        style="margin-left: 0"
                         ng-click="ctrl.updateNode()"
                         ng-disabled="kubernetesNodeUpdateForm.$invalid || !ctrl.isFormValid()"
                       >
                         Update node
                       </button>
-                      <button class="btn btn-default btn-sm" type="button" ng-click="ctrl.resetFormValues()" ng-disabled="ctrl.isNoChangesMade()">
-                        Cancel
-                      </button>
+                      <button class="btn btn-default btn-sm" type="button" ng-click="ctrl.resetFormValues()" ng-disabled="ctrl.isNoChangesMade()"> Cancel </button>
                     </div>
                   </div>
 
@@ -240,7 +226,7 @@
               <uib-tab-heading>
                 <i class="fa fa-history space-right" aria-hidden="true"></i> Events
                 <div ng-if="ctrl.hasEventWarnings()">
-                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                   {{ ctrl.state.eventWarningCount }} warning(s)
                 </div>
               </uib-tab-heading>
@@ -258,7 +244,7 @@
             </uib-tab>
             <uib-tab index="2" ng-if="ctrl.node.Yaml" select="ctrl.showEditor()" classes="btn-sm">
               <uib-tab-heading> <i class="fa fa-code space-right" aria-hidden="true"></i> YAML </uib-tab-heading>
-              <div style="padding-right: 25px;" ng-if="ctrl.state.showEditorTab">
+              <div style="padding-right: 25px" ng-if="ctrl.state.showEditorTab">
                 <kubernetes-yaml-inspector key="node-yaml" data="ctrl.node.Yaml"> </kubernetes-yaml-inspector>
               </div>
             </uib-tab>
diff --git a/app/kubernetes/views/cluster/node/stats/stats.html b/app/kubernetes/views/cluster/node/stats/stats.html
index be2341dbf..099351272 100644
--- a/app/kubernetes/views/cluster/node/stats/stats.html
+++ b/app/kubernetes/views/cluster/node/stats/stats.html
@@ -8,7 +8,7 @@
 <div ng-if="ctrl.state.viewReady">
   <information-panel ng-if="!ctrl.state.getMetrics" title-text="Unable to retrieve node metrics">
     <span class="small text-muted">
-      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
       Portainer was unable to retrieve any metrics associated to that node. Please contact your administrator to ensure that the Kubernetes metrics feature is properly configured.
     </span>
   </information-panel>
@@ -27,9 +27,7 @@
               </div>
             </div>
             <div class="form-group">
-              <label for="refreshRate" class="col-sm-3 col-md-2 col-lg-2 margin-sm-top control-label text-left">
-                Refresh rate
-              </label>
+              <label for="refreshRate" class="col-sm-3 col-md-2 col-lg-2 margin-sm-top control-label text-left"> Refresh rate </label>
               <div class="col-sm-3 col-md-2">
                 <select id="refreshRate" ng-model="ctrl.state.refreshRate" ng-change="ctrl.changeUpdateRepeater()" class="form-control">
                   <option value="30">30s</option>
@@ -37,7 +35,7 @@
                 </select>
               </div>
               <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>
           </form>
@@ -51,7 +49,7 @@
       <rd-widget>
         <rd-widget-header icon="fa-chart-area" title-text="Memory usage"></rd-widget-header>
         <rd-widget-body>
-          <div class="chart-node" style="position: relative;">
+          <div class="chart-node" style="position: relative">
             <canvas id="memoryChart" width="770" height="300"></canvas>
           </div>
         </rd-widget-body>
@@ -61,7 +59,7 @@
       <rd-widget>
         <rd-widget-header icon="fa-chart-area" title-text="CPU usage"></rd-widget-header>
         <rd-widget-body>
-          <div class="chart-node" style="position: relative;">
+          <div class="chart-node" style="position: relative">
             <canvas id="cpuChart" width="770" height="300"></canvas>
           </div>
         </rd-widget-body>
diff --git a/app/kubernetes/views/configurations/configurations.html b/app/kubernetes/views/configurations/configurations.html
index 48c5141d6..8a699289b 100644
--- a/app/kubernetes/views/configurations/configurations.html
+++ b/app/kubernetes/views/configurations/configurations.html
@@ -1,6 +1,4 @@
-<kubernetes-view-header title="ConfigMaps & Secrets list" state="kubernetes.configurations" view-ready="ctrl.state.viewReady">
-  ConfigMaps & Secrets
-</kubernetes-view-header>
+<kubernetes-view-header title="ConfigMaps & Secrets list" state="kubernetes.configurations" view-ready="ctrl.state.viewReady"> ConfigMaps & Secrets </kubernetes-view-header>
 
 <kubernetes-view-loading view-ready="ctrl.state.viewReady"></kubernetes-view-loading>
 
diff --git a/app/kubernetes/views/configurations/create/createConfiguration.html b/app/kubernetes/views/configurations/create/createConfiguration.html
index 3c652740d..555471ece 100644
--- a/app/kubernetes/views/configurations/create/createConfiguration.html
+++ b/app/kubernetes/views/configurations/create/createConfiguration.html
@@ -44,9 +44,7 @@
             </div>
             <!-- !name -->
 
-            <div class="col-sm-12 form-section-title">
-              Namespace
-            </div>
+            <div class="col-sm-12 form-section-title"> Namespace </div>
 
             <!-- resource-pool -->
             <div class="form-group" ng-if="ctrl.formValues.ResourcePool">
@@ -64,37 +62,33 @@
             </div>
             <div class="form-group" ng-if="ctrl.state.resourcePoolHasQuota && ctrl.resourceQuotaCapacityExceeded()">
               <div class="col-sm-12 small text-warning">
-                <i class="fa fa-exclamation-triangle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                <i class="fa fa-exclamation-triangle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                 This namespace has exhausted its resource capacity and you will not be able to deploy the configuration. Contact your administrator to expand the capacity of the
                 namespace.
               </div>
             </div>
             <div class="form-group" ng-if="!ctrl.formValues.ResourcePool">
               <div class="col-sm-12 small text-muted">
-                <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                 You do not have access to any namespace. Contact your administrator to get access to a namespace.
               </div>
             </div>
             <!-- !resource-pool -->
             <div ng-if="ctrl.formValues.ResourcePool">
-              <div class="col-sm-12 form-section-title">
-                Configuration type
-              </div>
+              <div class="col-sm-12 form-section-title"> Configuration type </div>
 
               <div class="form-group">
-                <div class="col-sm-12 small text-muted">
-                  Select the type of data that you want to save in the configuration.
-                </div>
+                <div class="col-sm-12 small text-muted"> Select the type of data that you want to save in the configuration. </div>
               </div>
 
               <!-- type options -->
-              <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="type_basic" ng-value="ctrl.KubernetesConfigurationTypes.CONFIGMAP" ng-model="ctrl.formValues.Type" />
                     <label for="type_basic" data-cy="k8sConfigCreate-nonSensitiveButton">
                       <div class="boxselector_header">
-                        <i class="fa fa-file-code" aria-hidden="true" style="margin-right: 2px;"></i>
+                        <i class="fa fa-file-code" aria-hidden="true" style="margin-right: 2px"></i>
                         ConfigMap
                       </div>
                       <p>This configuration holds non-sensitive information</p>
@@ -104,7 +98,7 @@
                     <input type="radio" id="type_secret" ng-value="ctrl.KubernetesConfigurationTypes.SECRET" ng-model="ctrl.formValues.Type" />
                     <label for="type_secret" data-cy="k8sConfigCreate-sensitiveButton">
                       <div class="boxselector_header">
-                        <i class="fa fa-user-secret" aria-hidden="true" style="margin-right: 2px;"></i>
+                        <i class="fa fa-user-secret" aria-hidden="true" style="margin-right: 2px"></i>
                         Secret
                       </div>
                       <p>This configuration holds sensitive information</p>
@@ -114,9 +108,7 @@
               </div>
               <!-- !type options -->
 
-              <div class="col-sm-12 form-section-title" ng-if="ctrl.formValues.Type == ctrl.KubernetesConfigurationTypes.SECRET">
-                Information
-              </div>
+              <div class="col-sm-12 form-section-title" ng-if="ctrl.formValues.Type == ctrl.KubernetesConfigurationTypes.SECRET"> Information </div>
               <div class="form-group" ng-if="ctrl.formValues.Type == ctrl.KubernetesConfigurationTypes.SECRET">
                 <div class="col-sm-12 small text-muted">
                   Creating a sensitive configuration will create a Kubernetes Secret of type <code>Opaque</code>. You can find more information about this in the
@@ -140,9 +132,7 @@
             </div>
 
             <!-- actions -->
-            <div class="col-sm-12 form-section-title" style="margin-top: 10px;">
-              Actions
-            </div>
+            <div class="col-sm-12 form-section-title" style="margin-top: 10px"> Actions </div>
             <div class="form-group">
               <div class="col-sm-12">
                 <button
diff --git a/app/kubernetes/views/configurations/edit/configuration.html b/app/kubernetes/views/configurations/edit/configuration.html
index c115c614f..f2652afeb 100644
--- a/app/kubernetes/views/configurations/edit/configuration.html
+++ b/app/kubernetes/views/configurations/edit/configuration.html
@@ -14,21 +14,21 @@
           <uib-tabset active="ctrl.state.activeTab" justified="true" type="pills">
             <uib-tab index="0" classes="btn-sm" select="ctrl.selectTab(0)" data-cy="k8sConfigDetail-configTab">
               <uib-tab-heading> <i class="fa fa-file-code space-right" aria-hidden="true"></i> Configuration </uib-tab-heading>
-              <div style="padding: 20px;">
+              <div style="padding: 20px">
                 <table class="table" data-cy="k8sConfigDetail-configTable">
                   <tbody>
                     <tr>
                       <td>Name</td>
                       <td>
                         {{ ctrl.configuration.Name }}
-                        <span style="margin-left: 5px;" class="label label-info image-tag" ng-if="ctrl.configuration.IsRegistrySecret">system</span>
+                        <span style="margin-left: 5px" class="label label-info image-tag" ng-if="ctrl.configuration.IsRegistrySecret">system</span>
                       </td>
                     </tr>
                     <tr>
                       <td>Namespace</td>
                       <td>
                         <a ui-sref="kubernetes.resourcePools.resourcePool({ id: ctrl.configuration.Namespace })">{{ ctrl.configuration.Namespace }}</a>
-                        <span style="margin-left: 5px;" class="label label-info image-tag" ng-if="ctrl.isSystemNamespace()">system</span>
+                        <span style="margin-left: 5px" class="label label-info image-tag" ng-if="ctrl.isSystemNamespace()">system</span>
                       </td>
                     </tr>
                     <tr>
@@ -45,7 +45,7 @@
               <uib-tab-heading>
                 <i class="fa fa-history space-right" aria-hidden="true"></i> Events
                 <div ng-if="ctrl.hasEventWarnings()">
-                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                   {{ ctrl.state.eventWarningCount }} warning(s)
                 </div>
               </uib-tab-heading>
@@ -63,7 +63,7 @@
             </uib-tab>
             <uib-tab index="2" ng-if="ctrl.configuration.Yaml" classes="btn-sm" select="ctrl.showEditor()" data-cy="k8sConfigDetail-yamlTab">
               <uib-tab-heading> <i class="fa fa-code space-right" aria-hidden="true"></i> YAML </uib-tab-heading>
-              <div style="padding-right: 25px;" ng-if="ctrl.state.showEditorTab">
+              <div style="padding-right: 25px" ng-if="ctrl.state.showEditorTab">
                 <kubernetes-yaml-inspector key="configuration-yaml" data="ctrl.configuration.Yaml"> </kubernetes-yaml-inspector>
               </div>
             </uib-tab>
@@ -93,9 +93,7 @@
             ></kubernetes-summary-view>
 
             <!-- actions -->
-            <div class="col-sm-12 form-section-title" style="margin-top: 10px;">
-              Actions
-            </div>
+            <div class="col-sm-12 form-section-title" style="margin-top: 10px"> Actions </div>
             <div class="form-group">
               <div class="col-sm-12">
                 <button
@@ -114,23 +112,21 @@
             <!-- !actions -->
           </form>
           <div ng-if="ctrl.isSystemConfig()">
-            <div class="col-sm-12 form-section-title" style="margin-top: 10px;">
-              Data
-            </div>
+            <div class="col-sm-12 form-section-title" style="margin-top: 10px"> Data </div>
             <table class="table">
               <tbody>
                 <tr class="text-muted">
-                  <td style="width: 10%; border-top: none;">Key</td>
-                  <td style="width: 90%; border-top: none;">Value</td>
+                  <td style="width: 10%; border-top: none">Key</td>
+                  <td style="width: 90%; border-top: none">Value</td>
                 </tr>
 
                 <tr ng-repeat="item in ctrl.formValues.Data track by $index">
                   <td>{{ item.Key }}</td>
                   <td>
-                    <div style="white-space: pre-wrap;">{{ item.Value }}</div>
-                    <div style="margin-top: 2px;">
+                    <div style="white-space: pre-wrap">{{ item.Value }}</div>
+                    <div style="margin-top: 2px">
                       <span class="btn btn-primary btn-xs" ng-click="ctrl.copyConfigurationValue($index)"> <i class="fa fa-copy space-right" aria-hidden="true"></i>Copy </span>
-                      <span id="copyValueNotification_{{ $index }}" style="display: none; color: #23ae89; margin-left: 5px;" class="small">
+                      <span id="copyValueNotification_{{ $index }}" style="display: none; color: #23ae89; margin-left: 5px" class="small">
                         <i class="fa fa-check" aria-hidden="true"></i> copied
                       </span>
                     </div>
diff --git a/app/kubernetes/views/configure/configure.html b/app/kubernetes/views/configure/configure.html
index 599270813..1665d72cd 100644
--- a/app/kubernetes/views/configure/configure.html
+++ b/app/kubernetes/views/configure/configure.html
@@ -10,24 +10,20 @@
       <rd-widget>
         <rd-widget-body>
           <form class="form-horizontal" name="kubernetesClusterSetupForm">
-            <div class="col-sm-12 form-section-title">
-              Networking
-            </div>
+            <div class="col-sm-12 form-section-title"> Networking </div>
 
             <div class="form-group">
               <span class="col-sm-12 text-muted small">
                 Enabling the load balancer feature will allow users to expose application they deploy over an external IP address assigned by cloud provider.
-                <p style="margin-top: 2px;">
-                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                <p style="margin-top: 2px">
+                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                   Ensure that your cloud provider allows you to create load balancers if you want to use this feature. Might incur costs.
                 </p>
               </span>
 
               <div class="col-sm-12">
-                <label class="control-label text-left">
-                  Allow users to use external load balancer
-                </label>
-                <label class="switch" style="margin-left: 20px;">
+                <label class="control-label text-left"> Allow users to use external load balancer </label>
+                <label class="switch" style="margin-left: 20px">
                   <input type="checkbox" ng-model="ctrl.formValues.UseLoadBalancer" /><i data-cy="kubeSetup-loadBalancerToggle"></i>
                 </label>
               </div>
@@ -36,8 +32,8 @@
             <div class="form-group">
               <span class="col-sm-12 text-muted small">
                 Configuring ingress controllers will allow users to expose application they deploy over a HTTP route.<br />
-                <p style="margin-top: 2px;">
-                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                <p style="margin-top: 2px">
+                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                   Ingress classes must be manually specified for each controller you want to use in the cluster. Make sure that each controller is running inside your cluster.
                 </p>
               </span>
@@ -45,13 +41,13 @@
             <div class="form-group">
               <div class="col-sm-12">
                 <label class="control-label text-left">Ingress controller</label>
-                <span class="label label-default interactive" style="margin-left: 10px;" ng-click="ctrl.addIngressClass()" data-cy="kubeSetup-congifIngressButton">
+                <span class="label label-default interactive" style="margin-left: 10px" ng-click="ctrl.addIngressClass()" data-cy="kubeSetup-congifIngressButton">
                   <i class="fa fa-plus-circle" aria-hidden="true"></i> configure ingress controller
                 </span>
               </div>
 
-              <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-                <div ng-repeat-start="ingressClass in ctrl.formValues.IngressClasses" style="margin-top: 2px;">
+              <div class="col-sm-12 form-inline" style="margin-top: 10px">
+                <div ng-repeat-start="ingressClass in ctrl.formValues.IngressClasses" style="margin-top: 2px">
                   <div class="col-sm-7 input-group input-group-sm" ng-class="{ striked: ingressClass.NeedsDeletion }">
                     <span class="input-group-addon">Ingress class</span>
                     <input
@@ -106,7 +102,7 @@
                   <div class="col-sm-7 input-group">
                     <div
                       class="small text-warning"
-                      style="margin-top: 5px;"
+                      style="margin-top: 5px"
                       ng-if="kubernetesClusterSetupForm['ingress_class_name_' + $index].$invalid || ctrl.state.duplicates.ingressClasses.refs[$index] !== undefined"
                     >
                       <div ng-messages="kubernetesClusterSetupForm['ingress_class_name_'+$index].$error">
@@ -122,7 +118,7 @@
                     </div>
                   </div>
                   <div class="col-sm-3 input-group">
-                    <div class="small text-warning" style="margin-top: 5px;" ng-if="kubernetesClusterSetupForm['ingress_class_type_' + $index].$invalid">
+                    <div class="small text-warning" style="margin-top: 5px" ng-if="kubernetesClusterSetupForm['ingress_class_type_' + $index].$invalid">
                       <div ng-messages="kubernetesClusterSetupForm['ingress_class_type_'+$index].$error">
                         <p ng-message="required"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Ingress class type is required.</p>
                       </div>
@@ -135,16 +131,14 @@
             <div class="form-group" ng-if="ctrl.hasTraefikIngress()">
               <span class="col-sm-12 text-muted small">
                 <p>
-                  <i class="fa fa-flask blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                  <i class="fa fa-flask blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
                   Traefik support is experimental.
                 </p>
               </span>
             </div>
 
             <!-- auto update window -->
-            <div class="col-sm-12 form-section-title">
-              Change Window Setting
-            </div>
+            <div class="col-sm-12 form-section-title"> Change Window Setting </div>
 
             <div class="form-group">
               <div class="col-sm-12">
@@ -160,9 +154,7 @@
               </div>
             </div>
 
-            <div class="col-sm-12 form-section-title">
-              Security
-            </div>
+            <div class="col-sm-12 form-section-title"> Security </div>
 
             <div class="form-group">
               <span class="col-sm-12 text-muted small">
@@ -171,25 +163,21 @@
             </div>
             <div class="form-group">
               <div class="col-sm-12">
-                <label class="control-label text-left">
-                  Restrict access to the default namespace
-                </label>
-                <label class="switch" style="margin-left: 20px;">
+                <label class="control-label text-left"> Restrict access to the default namespace </label>
+                <label class="switch" style="margin-left: 20px">
                   <input type="checkbox" ng-model="ctrl.formValues.RestrictDefaultNamespace" /><i data-cy="kubeSetup-restrictDefaultNsToggle"></i>
                 </label>
               </div>
             </div>
 
-            <div class="col-sm-12 form-section-title">
-              Resources and Metrics
-            </div>
+            <div class="col-sm-12 form-section-title"> Resources and Metrics </div>
 
             <div class="form-group">
               <span class="col-sm-12 text-muted small">
                 By ENABLING resource over-commit, you are able to assign more resources to namespaces than is physically available in the cluster. This may lead to unexpected
                 deployment failures if there is insufficient resource to service demand.
-                <p style="margin-top: 2px;">
-                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                <p style="margin-top: 2px">
+                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                   By DISABLING resource over-commit (highly recommended), you are only able to assign resources to namespaces that are less (in aggregate) than the cluster total
                   minus any system resource reservation.
                 </p>
@@ -211,8 +199,8 @@
             <div class="form-group">
               <span class="col-sm-12 text-muted small">
                 Enabling this feature will allow users to use specific features like autoscaling and to see container and node resource usage.
-                <p style="margin-top: 2px;">
-                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                <p style="margin-top: 2px">
+                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                   Ensure that <a href="https://kubernetes.io/docs/tasks/debug-application-cluster/resource-metrics-pipeline/#metrics-server" target="_blank">metrics server</a> or
                   <a href="https://github.com/kubernetes-sigs/prometheus-adapter" target="_blank">prometheus</a> is running inside your cluster.
                 </p>
@@ -220,40 +208,36 @@
             </div>
             <div class="form-group">
               <div class="col-sm-12">
-                <label class="control-label text-left">
-                  Enable features using the metrics API
-                </label>
-                <label class="switch" style="margin-left: 20px;">
+                <label class="control-label text-left"> Enable features using the metrics API </label>
+                <label class="switch" style="margin-left: 20px">
                   <input type="checkbox" ng-model="ctrl.formValues.UseServerMetrics" ng-change="ctrl.enableMetricsServer()" /><i data-cy="kubeSetup-metricsToggle"></i>
                 </label>
               </div>
-              <div ng-if="ctrl.state.metrics.pending && ctrl.state.metrics.userClick" class="col-sm-12 small text-muted" style="margin-top: 5px;">
-                Checking metrics API... <i class="fa fa-spinner fa-spin" style="margin-left: 2px;"></i>
+              <div ng-if="ctrl.state.metrics.pending && ctrl.state.metrics.userClick" class="col-sm-12 small text-muted" style="margin-top: 5px">
+                Checking metrics API... <i class="fa fa-spinner fa-spin" style="margin-left: 2px"></i>
               </div>
               <div
                 ng-if="!ctrl.state.metrics.pending && ctrl.state.metrics.isServerRunning && ctrl.state.metrics.userClick"
                 class="col-sm-12 small text-muted"
-                style="margin-top: 5px;"
+                style="margin-top: 5px"
               >
-                <i class="fa fa-check green-icon" aria-hidden="true" style="margin-right: 2px;"></i> Successfully reached metrics API
+                <i class="fa fa-check green-icon" aria-hidden="true" style="margin-right: 2px"></i> Successfully reached metrics API
               </div>
               <div
                 ng-if="!ctrl.state.metrics.pending && !ctrl.state.metrics.isServerRunning && ctrl.state.metrics.userClick"
                 class="col-sm-12 small text-muted"
-                style="margin-top: 5px;"
+                style="margin-top: 5px"
               >
-                <i class="fa fa-times red-icon" aria-hidden="true" style="margin-right: 2px;"></i> Unable to reach metrics API, make sure metrics server is properly deployed inside
+                <i class="fa fa-times red-icon" aria-hidden="true" style="margin-right: 2px"></i> Unable to reach metrics API, make sure metrics server is properly deployed inside
                 that cluster.
               </div>
             </div>
 
-            <div class="col-sm-12 form-section-title">
-              Available storage options
-            </div>
+            <div class="col-sm-12 form-section-title"> Available storage options </div>
 
             <div class="form-group" ng-if="!ctrl.storageClassAvailable()">
               <div class="col-sm-12 small text-muted">
-                <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                 Unable to detect any storage class available to persist data. Users won't be able to persist application data inside this cluster.
               </div>
             </div>
@@ -272,8 +256,8 @@
             </div>
 
             <div class="form-group" ng-if="ctrl.storageClassAvailable()">
-              <div style="margin-top: 10px;" class="col-sm-12">
-                <table class="table" style="table-layout: fixed;">
+              <div style="margin-top: 10px" class="col-sm-12">
+                <table class="table" style="table-layout: fixed">
                   <tbody>
                     <tr class="text-muted">
                       <td>Storage</td>
@@ -282,8 +266,8 @@
                     </tr>
                     <tr ng-repeat="class in ctrl.StorageClasses">
                       <td>
-                        <div style="margin: 5px;">
-                          <label class="switch" style="margin-right: 10px;">
+                        <div style="margin: 5px">
+                          <label class="switch" style="margin-right: 10px">
                             <input type="checkbox" ng-model="class.selected" /><i data-cy="kubeSetup-storageToggle{{ class.Name }}"></i>
                           </label>
                           <span>{{ class.Name }}</span>
@@ -305,7 +289,7 @@
                         </span>
                       </td>
                       <td>
-                        <div style="margin: 5px;">
+                        <div style="margin: 5px">
                           <label class="switch"
                             ><input type="checkbox" ng-model="class.AllowVolumeExpansion" /><i data-cy="kubeSetup-storageExpansionToggle{{ class.Name }}"></i>
                           </label>
@@ -316,16 +300,14 @@
                 </table>
               </div>
               <div class="col-sm-12">
-                <span ng-if="!ctrl.hasValidStorageConfiguration()" style="margin-left: 5px;" class="text-muted small">
-                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                <span ng-if="!ctrl.hasValidStorageConfiguration()" style="margin-left: 5px" class="text-muted small">
+                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                   Shared access policy configuration required
                 </span>
               </div>
             </div>
 
-            <div class="col-sm-12 form-section-title">
-              Actions
-            </div>
+            <div class="col-sm-12 form-section-title"> Actions </div>
             <!-- actions -->
             <div class="form-group">
               <div class="col-sm-12">
diff --git a/app/kubernetes/views/dashboard/dashboard.html b/app/kubernetes/views/dashboard/dashboard.html
index 903c54075..7bd43a708 100644
--- a/app/kubernetes/views/dashboard/dashboard.html
+++ b/app/kubernetes/views/dashboard/dashboard.html
@@ -1,6 +1,4 @@
-<kubernetes-view-header title="Dashboard" state="kubernetes.dashboard" view-ready="ctrl.state.viewReady">
-  Environment summary
-</kubernetes-view-header>
+<kubernetes-view-header title="Dashboard" state="kubernetes.dashboard" view-ready="ctrl.state.viewReady"> Environment summary </kubernetes-view-header>
 
 <kubernetes-view-loading view-ready="ctrl.state.viewReady"></kubernetes-view-loading>
 
diff --git a/app/kubernetes/views/deploy/deploy.html b/app/kubernetes/views/deploy/deploy.html
index ccc4d56a9..88b0aac4e 100644
--- a/app/kubernetes/views/deploy/deploy.html
+++ b/app/kubernetes/views/deploy/deploy.html
@@ -1,6 +1,4 @@
-<kubernetes-view-header title="Advanced deployment" state="kubernetes.deploy" view-ready="ctrl.state.viewReady">
-  Deploy Kubernetes resources
-</kubernetes-view-header>
+<kubernetes-view-header title="Advanced deployment" state="kubernetes.deploy" view-ready="ctrl.state.viewReady"> Deploy Kubernetes resources </kubernetes-view-header>
 
 <kubernetes-view-loading view-ready="ctrl.state.viewReady"></kubernetes-view-loading>
 
@@ -15,7 +13,7 @@
             <uib-tab index="0">
               <uib-tab-heading> <i class="fa fa-code space-right" aria-hidden="true"></i> Deploy </uib-tab-heading>
 
-              <form class="form-horizontal" style="margin-top: 20px;">
+              <form class="form-horizontal" style="margin-top: 20px">
                 <div class="form-group" ng-if="ctrl.formValues.Namespace">
                   <label for="target_node" class="col-lg-1 col-sm-2 control-label text-left">Namespace</label>
                   <div class="col-lg-11 col-sm-10">
@@ -24,7 +22,7 @@
                 </div>
                 <div class="form-group" ng-if="!ctrl.formValues.Namespace">
                   <div class="col-sm-12 small text-muted">
-                    <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                    <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                     You do not have access to any namespace. Contact your administrator to get access to a namespace.
                   </div>
                 </div>
@@ -36,9 +34,7 @@
                   </div>
                 </div>
 
-                <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.BuildMethod"
@@ -48,9 +44,7 @@
                 ></box-selector>
 
                 <div ng-if="ctrl.state.BuildMethod !== ctrl.BuildMethods.CUSTOM_TEMPLATE">
-                  <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="'deploy'"
                     value="ctrl.state.DeployType"
@@ -95,7 +89,7 @@
                   <editor-description>
                     <span class="col-sm-12 text-muted small" ng-show="ctrl.state.DeployType === ctrl.ManifestDeployTypes.COMPOSE">
                       <p>
-                        <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                        <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                         Portainer uses <a href="https://kompose.io/" target="_blank">Kompose</a> to convert your Compose manifest to a Kubernetes compliant manifest. Be wary that
                         not all the Compose format options are supported by Kompose at the moment.
                       </p>
@@ -109,7 +103,7 @@
                       ng-show="ctrl.state.DeployType === ctrl.ManifestDeployTypes.KUBERNETES && ctrl.state.BuildMethod === ctrl.BuildMethods.WEB_EDITOR"
                     >
                       <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>
@@ -124,13 +118,9 @@
 
                 <!-- url -->
                 <div ng-show="ctrl.state.BuildMethod === ctrl.BuildMethods.URL">
-                  <div class="col-sm-12 form-section-title">
-                    URL
-                  </div>
+                  <div class="col-sm-12 form-section-title"> URL </div>
                   <div class="form-group">
-                    <span class="col-sm-12 text-muted small">
-                      Indicate the URL to the manifest.
-                    </span>
+                    <span class="col-sm-12 text-muted small"> Indicate the URL to the manifest. </span>
                   </div>
                   <div class="form-group">
                     <label for="manifest_url" class="col-sm-1 control-label text-left">URL</label>
@@ -149,9 +139,7 @@
                 <!-- !url -->
 
                 <!-- 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
@@ -177,7 +165,7 @@
 
             <uib-tab index="1" disable="ctrl.state.tabLogsDisabled">
               <uib-tab-heading> <i class="fa fa-file space-right" aria-hidden="true"></i> Logs </uib-tab-heading>
-              <form class="form-horizontal" style="margin-top: 20px;">
+              <form class="form-horizontal" style="margin-top: 20px">
                 <div class="form-group" ng-if="ctrl.state.activeTab === 1">
                   <div class="col-sm-12">
                     <code-editor identifier="kubernetes-deploy-logs" read-only="true" yml="false" value="ctrl.errorLog"></code-editor>
diff --git a/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html b/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html
index d6ba1d52b..f78a15fe3 100644
--- a/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html
+++ b/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html
@@ -33,9 +33,7 @@
         <rd-widget-body>
           <form class="form-horizontal">
             <div class="form-group">
-              <label class="col-sm-3 col-lg-2 control-label text-left">
-                Select user(s) and/or team(s)
-              </label>
+              <label class="col-sm-3 col-lg-2 control-label text-left"> Select user(s) and/or team(s) </label>
               <div class="col-sm-9 col-lg-4">
                 <span class="small text-muted" ng-if="ctrl.availableUsersAndTeams.length === 0">
                   No user nor team access has been set on the environment. Head over to the
diff --git a/app/kubernetes/views/resource-pools/create/createResourcePool.html b/app/kubernetes/views/resource-pools/create/createResourcePool.html
index 9023c8c0d..334fc5470 100644
--- a/app/kubernetes/views/resource-pools/create/createResourcePool.html
+++ b/app/kubernetes/views/resource-pools/create/createResourcePool.html
@@ -42,44 +42,36 @@
             </div>
             <!-- #endregion -->
 
-            <div class="col-sm-12 form-section-title">
-              Quota
-            </div>
+            <div class="col-sm-12 form-section-title"> Quota </div>
             <!-- #region QUOTA -->
             <!-- quotas-switch -->
             <div class="form-group">
               <div class="col-sm-12 small text-muted">
                 <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>
                   A namespace segments the underlying physical Kubernetes cluster into smaller virtual clusters. You should assign a capped limit of resources to this namespace or
                   disable for the safe operation of your platform.
                 </p>
               </div>
               <div class="col-sm-12">
-                <label class="control-label text-left">
-                  Resource assignment
-                </label>
-                <label class="switch" style="margin-left: 20px;">
+                <label class="control-label text-left"> Resource assignment </label>
+                <label class="switch" style="margin-left: 20px">
                   <input type="checkbox" ng-model="$ctrl.formValues.HasQuota" /><i data-cy="k8sNamespaceCreate-resourceAssignmentToggle"></i>
                 </label>
               </div>
             </div>
             <div class="form-group" ng-if="$ctrl.formValues.HasQuota && !$ctrl.isQuotaValid()">
               <span class="col-sm-12 text-warning small">
-                <p> <i class="fa fa-exclamation-triangle" aria-hidden="true" style="margin-right: 2px;"></i> At least a single limit must be set for the quota to be valid. </p>
+                <p> <i class="fa fa-exclamation-triangle" aria-hidden="true" style="margin-right: 2px"></i> At least a single limit must be set for the quota to be valid. </p>
               </span>
             </div>
             <!-- !quotas-switch -->
             <div ng-if="$ctrl.formValues.HasQuota">
-              <div class="col-sm-12 form-section-title">
-                Resource limits
-              </div>
+              <div class="col-sm-12 form-section-title"> Resource limits </div>
               <div>
                 <!-- memory-limit-input -->
                 <div class="form-group">
-                  <label for="memory-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px;">
-                    Memory
-                  </label>
+                  <label for="memory-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px"> Memory </label>
                   <div class="col-sm-3">
                     <slider
                       model="$ctrl.formValues.MemoryLimit"
@@ -105,9 +97,7 @@
                     />
                   </div>
                   <div class="col-sm-4">
-                    <p class="small text-muted" style="margin-top: 7px;">
-                      Maximum memory usage (<b>MB</b>)
-                    </p>
+                    <p class="small text-muted" style="margin-top: 7px"> Maximum memory usage (<b>MB</b>) </p>
                   </div>
                 </div>
                 <div class="form-group" ng-show="resourcePoolCreationForm.memory_limit.$invalid">
@@ -122,9 +112,7 @@
                 <!-- !memory-limit-input -->
                 <!-- cpu-limit-input -->
                 <div class="form-group">
-                  <label for="cpu-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px;">
-                    CPU
-                  </label>
+                  <label for="cpu-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px"> CPU </label>
                   <div class="col-sm-5">
                     <slider
                       model="$ctrl.formValues.CpuLimit"
@@ -137,10 +125,8 @@
                     >
                     </slider>
                   </div>
-                  <div class="col-sm-4" style="margin-top: 20px;">
-                    <p class="small text-muted">
-                      Maximum CPU usage
-                    </p>
+                  <div class="col-sm-4" style="margin-top: 20px">
+                    <p class="small text-muted"> Maximum CPU usage </p>
                   </div>
                 </div>
                 <!-- !cpu-limit-input -->
@@ -149,13 +135,11 @@
             <!-- #endregion -->
 
             <!-- #region LOAD-BALANCERS -->
-            <div class="col-sm-12 form-section-title">
-              Load balancers
-            </div>
+            <div class="col-sm-12 form-section-title"> Load balancers </div>
 
             <div class="form-group">
               <span class="col-sm-12 text-muted small">
-                <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>
                 You can set a quota on the amount of external load balancers that can be created inside this namespace. Set this quota to 0 to effectively disable the use of load
                 balancers in this namespace.
               </span>
@@ -175,19 +159,17 @@
             <!-- #endregion -->
 
             <!-- #region STORAGES -->
-            <div class="col-sm-12 form-section-title">
-              Storage
-            </div>
+            <div class="col-sm-12 form-section-title"> Storage </div>
 
             <div class="form-group">
               <span class="col-sm-12 text-muted small">
-                <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>
                 Quotas can be set on each storage option to prevent users from exceeding a specific threshold when deploying applications. You can set a quota to 0 to effectively
                 prevent the usage of a specific storage option inside this namespace.
               </span>
             </div>
             <div class="col-sm-12 form-section-title">
-              <i class="fa fa-route" aria-hidden="true" style="margin-right: 2px;"></i>
+              <i class="fa fa-route" aria-hidden="true" style="margin-right: 2px"></i>
               standard
             </div>
 
@@ -196,9 +178,7 @@
             <!-- #endregion -->
 
             <div ng-if="$ctrl.state.canUseIngress">
-              <div class="col-sm-12 form-section-title">
-                Ingresses
-              </div>
+              <div class="col-sm-12 form-section-title"> Ingresses </div>
               <!-- #region INGRESSES -->
               <div class="form-group" ng-if="$ctrl.formValues.IngressClasses.length === 0">
                 <div class="col-sm-12 small text-muted">
@@ -211,24 +191,22 @@
               <div class="form-group" ng-if="$ctrl.formValues.IngressClasses.length > 0">
                 <div class="col-sm-12 small text-muted">
                   <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>
                     Enable and configure ingresses available to users when deploying applications.
                   </p>
                 </div>
               </div>
 
               <div class="form-group" ng-repeat-start="ic in $ctrl.formValues.IngressClasses track by ic.IngressClass.Name">
-                <div class="text-muted col-sm-12" style="width: 100%;">
-                  <div style="border-bottom: 1px solid #cdcdcd; padding-bottom: 5px;">
-                    <i class="fa fa-route" aria-hidden="true" style="margin-right: 2px;"></i> {{ ic.IngressClass.Name }}
+                <div class="text-muted col-sm-12" style="width: 100%">
+                  <div style="border-bottom: 1px solid #cdcdcd; padding-bottom: 5px">
+                    <i class="fa fa-route" aria-hidden="true" style="margin-right: 2px"></i> {{ ic.IngressClass.Name }}
                   </div>
                 </div>
 
-                <div class="col-sm-12" style="margin-top: 10px;">
-                  <label class="control-label text-left">
-                    Allow users to use this ingress
-                  </label>
-                  <label class="switch" style="margin-left: 20px;">
+                <div class="col-sm-12" style="margin-top: 10px">
+                  <label class="control-label text-left"> Allow users to use this ingress </label>
+                  <label class="switch" style="margin-left: 20px">
                     <input type="checkbox" ng-model="ic.Selected" /><i data-cy="namespaceCreate-ingressToggle{{ ic.IngressClass.Name }}"></i>
                   </label>
                 </div>
@@ -247,15 +225,15 @@
                     </label>
                     <span
                       class="label label-default interactive"
-                      style="margin-left: 10px;"
+                      style="margin-left: 10px"
                       ng-click="$ctrl.addHostname(ic)"
                       data-cy="namespaceCreate-addHostButton{{ ic.IngressClass.Name }}"
                     >
                       <i class="fa fa-plus-circle" aria-hidden="true"></i> add hostname
                     </span>
                   </div>
-                  <div class="col-sm-12" style="margin-top: 10px;">
-                    <div ng-repeat="item in ic.Hosts track by $index" style="margin-top: 2px;">
+                  <div class="col-sm-12" style="margin-top: 10px">
+                    <div ng-repeat="item in ic.Hosts track by $index" style="margin-top: 2px">
                       <div class="form-inline">
                         <div class="col-sm-10 input-group input-group-sm">
                           <span class="input-group-addon">Hostname</span>
@@ -279,7 +257,7 @@
                       </div>
                       <div
                         class="small text-warning"
-                        style="margin-top: 5px;"
+                        style="margin-top: 5px"
                         ng-show="
                           resourcePoolCreationForm['hostname_' + ic.IngressClass.Name + '_' + $index].$invalid ||
                           $ctrl.state.duplicates.ingressHosts.refs[ic.IngressClass.Name][$index] !== undefined
@@ -309,13 +287,13 @@
                       >
                       </portainer-tooltip>
                     </label>
-                    <label class="switch" style="margin-left: 20px;">
+                    <label class="switch" style="margin-left: 20px">
                       <input type="checkbox" ng-model="ic.RewriteTarget" /><i data-cy="namespaceCreate-redirectRoutesToggle{{ ic.IngressClass.Name }}"></i>
                     </label>
                   </div>
                 </div>
               </div>
-              <div ng-repeat-end class="form-group" ng-if="ic.Selected" style="margin-bottom: 20px;">
+              <div ng-repeat-end class="form-group" ng-if="ic.Selected" style="margin-bottom: 20px">
                 <div class="col-sm-12">
                   <p>
                     <a class="small interactive" ng-if="!ic.AdvancedConfig" ng-click="ic.AdvancedConfig = true" data-cy="namespaceCreate-advancedConfig{{ ic.IngressClass.Name }}">
@@ -327,9 +305,9 @@
                   </p>
                 </div>
 
-                <div class="col-sm-12 small text-muted" ng-if="ic.AdvancedConfig" style="margin-top: 5px;">
+                <div class="col-sm-12 small text-muted" ng-if="ic.AdvancedConfig" style="margin-top: 5px">
                   <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>
                     You can specify a list of annotations that will be associated to the ingress.
                   </p>
                 </div>
@@ -338,7 +316,7 @@
                   <label class="control-label text-left">Annotations</label>
                   <span
                     class="label label-default interactive"
-                    style="margin-left: 10px;"
+                    style="margin-left: 10px"
                     ng-click="$ctrl.addAnnotation(ic)"
                     data-cy="namespaceCreate-addAnnotation{{ ic.IngressClass.Name }}"
                   >
@@ -346,8 +324,8 @@
                   </span>
                 </div>
 
-                <div class="col-sm-12 form-inline" style="margin-top: 10px;" ng-if="ic.AdvancedConfig">
-                  <div ng-repeat="annotation in ic.Annotations track by $index" style="margin-top: 2px;">
+                <div class="col-sm-12 form-inline" style="margin-top: 10px" ng-if="ic.AdvancedConfig">
+                  <div ng-repeat="annotation in ic.Annotations track by $index" style="margin-top: 2px">
                     <div class="input-group col-sm-5 input-group-sm">
                       <span class="input-group-addon">Key</span>
                       <input
@@ -387,22 +365,18 @@
             </div>
 
             <!-- #region REGISTRIES -->
-            <div class="col-sm-12 form-section-title">
-              Registries
-            </div>
+            <div class="col-sm-12 form-section-title"> Registries </div>
             <div class="form-group">
               <div class="col-sm-12 small text-muted">
                 <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>
                   Define which registry can be used by users who have access to this namespace.
                 </p>
               </div>
             </div>
 
             <div class="form-group">
-              <label class="col-sm-3 col-lg-2 control-label text-left" style="padding-top: 0;">
-                Select registries
-              </label>
+              <label class="col-sm-3 col-lg-2 control-label text-left" style="padding-top: 0"> Select registries </label>
               <div class="col-sm-9 col-lg-4">
                 <span class="small text-muted" ng-if="!$ctrl.registries.length && $ctrl.state.isAdmin">
                   No registries available. Head over <a ui-sref="portainer.registries">registry view</a> to define container registry.
@@ -432,9 +406,7 @@
             <kubernetes-summary-view ng-if="resourcePoolCreationForm.$valid && !$ctrl.isCreateButtonDisabled()" form-values="$ctrl.formValues"></kubernetes-summary-view>
             <!-- !summary -->
 
-            <div class="col-sm-12 form-section-title">
-              Actions
-            </div>
+            <div class="col-sm-12 form-section-title"> Actions </div>
             <!-- #region ACTIONS -->
             <div class="form-group">
               <div class="col-sm-12">
diff --git a/app/kubernetes/views/resource-pools/edit/components/ingresses-datatable/template.html b/app/kubernetes/views/resource-pools/edit/components/ingresses-datatable/template.html
index 3a1e4fbc5..a3626e442 100644
--- a/app/kubernetes/views/resource-pools/edit/components/ingresses-datatable/template.html
+++ b/app/kubernetes/views/resource-pools/edit/components/ingresses-datatable/template.html
@@ -2,15 +2,13 @@
   <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 class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
             <span uib-dropdown-toggle><i class="fa fa-cog" aria-hidden="true"></i> Table 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">
@@ -18,9 +16,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>
@@ -29,7 +25,7 @@
                         <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>
@@ -59,7 +55,7 @@
           <thead>
             <tr>
               <th>
-                <a ng-click="$ctrl.expandAll()" ng-if="$ctrl.hasExpandableItems()" style="margin-right: 5px;">
+                <a ng-click="$ctrl.expandAll()" ng-if="$ctrl.hasExpandableItems()" style="margin-right: 5px">
                   <i ng-class="{ 'fas fa-angle-down': $ctrl.state.expandAll, 'fas fa-angle-right': !$ctrl.state.expandAll }" aria-hidden="true"></i>
                 </a>
                 <a ng-click="$ctrl.changeOrderBy('Name')">
@@ -78,7 +74,7 @@
               pagination-id="$ctrl.tableKey"
             >
               <td colspan="3">
-                <a ng-if="$ctrl.itemCanExpand(item)" style="margin-right: 5px;">
+                <a ng-if="$ctrl.itemCanExpand(item)" style="margin-right: 5px">
                   <i ng-class="{ 'fas fa-angle-down': item.Expanded, 'fas fa-angle-right': !item.Expanded }" class="space-right" aria-hidden="true"></i> </a
                 >{{ item.Name }}
               </td>
@@ -90,11 +86,11 @@
               ng-class="{ 'datatable-highlighted': item.Highlighted, 'datatable-unhighlighted': !item.Highlighted }"
             >
               <td>
-                <a style="margin-left: 15px;" ng-href="http://{{ path.Host ? path.Host : path.IP }}{{ path.Path }}" target="_blank">
+                <a style="margin-left: 15px" ng-href="http://{{ path.Host ? path.Host : path.IP }}{{ path.Path }}" target="_blank">
                   {{ path.Host ? path.Host : path.IP }}{{ path.Path }}
                 </a>
                 <span ng-if="path.ApplicationName !== '-'">
-                  <i class="fas fa-long-arrow-alt-right" style="margin: 2px;"></i>
+                  <i class="fas fa-long-arrow-alt-right" style="margin: 2px"></i>
                   <a ui-sref="kubernetes.applications.application({ name: path.ApplicationName, namespace: item.Namespace })">{{ path.ApplicationName }}</a>
                 </span>
                 <span class="label label-warning image-tag label-margins" ng-if="path.ApplicationName === '-'">unused</span>
@@ -114,9 +110,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/kubernetes/views/resource-pools/edit/resourcePool.html b/app/kubernetes/views/resource-pools/edit/resourcePool.html
index 5b3a3cc6b..7e9d8819a 100644
--- a/app/kubernetes/views/resource-pools/edit/resourcePool.html
+++ b/app/kubernetes/views/resource-pools/edit/resourcePool.html
@@ -12,7 +12,7 @@
           <uib-tabset active="ctrl.state.activeTab" justified="true" type="pills">
             <uib-tab index="0" classes="btn-sm" select="ctrl.selectTab(0)">
               <uib-tab-heading> <i class="fa fa-layer-group space-right" aria-hidden="true"></i> Namespace </uib-tab-heading>
-              <form class="form-horizontal" autocomplete="off" name="resourcePoolEditForm" style="padding: 20px; margin-top: 10px;">
+              <form class="form-horizontal" autocomplete="off" name="resourcePoolEditForm" style="padding: 20px; margin-top: 10px">
                 <!-- name-input -->
                 <div class="form-group">
                   <div class="col-sm-12">
@@ -34,15 +34,13 @@
                 <!-- quotas-switch -->
                 <div ng-if="ctrl.isAdmin && ctrl.isEditable" class="form-group">
                   <div class="col-sm-12">
-                    <label class="control-label text-left">
-                      Resource assignment
-                    </label>
-                    <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="ctrl.formValues.HasQuota" /><i></i> </label>
+                    <label class="control-label text-left"> Resource assignment </label>
+                    <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="ctrl.formValues.HasQuota" /><i></i> </label>
                   </div>
                 </div>
                 <div class="form-group" ng-if="ctrl.formValues.HasQuota && ctrl.isAdmin && ctrl.isEditable && !ctrl.isQuotaValid()">
                   <span class="col-sm-12 text-warning small">
-                    <p> <i class="fa fa-exclamation-triangle" aria-hidden="true" style="margin-right: 2px;"></i> At least a single limit must be set for the quota to be valid. </p>
+                    <p> <i class="fa fa-exclamation-triangle" aria-hidden="true" style="margin-right: 2px"></i> At least a single limit must be set for the quota to be valid. </p>
                   </span>
                 </div>
                 <div ng-if="ctrl.formValues.HasQuota">
@@ -61,15 +59,11 @@
                 </div>
                 <!-- !quotas-switch -->
                 <div ng-if="ctrl.formValues.HasQuota && ctrl.isAdmin && ctrl.isEditable">
-                  <div class="col-sm-12 form-section-title">
-                    Resource limits
-                  </div>
+                  <div class="col-sm-12 form-section-title"> Resource limits </div>
                   <div>
                     <!-- memory-limit-input -->
                     <div class="form-group">
-                      <label for="memory-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px;">
-                        Memory limit
-                      </label>
+                      <label for="memory-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px"> Memory limit </label>
                       <div class="col-sm-3">
                         <slider
                           model="ctrl.formValues.MemoryLimit"
@@ -92,9 +86,7 @@
                         />
                       </div>
                       <div class="col-sm-4">
-                        <p class="small text-muted" style="margin-top: 7px;">
-                          Memory limit (<b>MB</b>)
-                        </p>
+                        <p class="small text-muted" style="margin-top: 7px"> Memory limit (<b>MB</b>) </p>
                       </div>
                     </div>
                     <div class="form-group" ng-show="resourcePoolEditForm.memory_limit.$invalid">
@@ -110,9 +102,7 @@
                     <!-- !memory-limit-input -->
                     <!-- cpu-limit-input -->
                     <div class="form-group">
-                      <label for="cpu-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px;">
-                        CPU limit
-                      </label>
+                      <label for="cpu-limit" class="col-sm-3 col-lg-2 control-label text-left" style="margin-top: 20px"> CPU limit </label>
                       <div class="col-sm-5">
                         <slider
                           model="ctrl.formValues.CpuLimit"
@@ -123,23 +113,19 @@
                           ng-if="ctrl.state.sliderMaxCpu"
                         ></slider>
                       </div>
-                      <div class="col-sm-4" style="margin-top: 20px;">
-                        <p class="small text-muted">
-                          Maximum CPU usage
-                        </p>
+                      <div class="col-sm-4" style="margin-top: 20px">
+                        <p class="small text-muted"> Maximum CPU usage </p>
                       </div>
                     </div>
                     <!-- !cpu-limit-input -->
                   </div>
                 </div>
                 <!-- #region LOADBALANCERS -->
-                <div class="col-sm-12 form-section-title">
-                  Load balancers
-                </div>
+                <div class="col-sm-12 form-section-title"> Load balancers </div>
 
                 <div class="form-group">
                   <span class="col-sm-12 text-muted small">
-                    <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>
                     You can set a quota on the amount of external load balancers that can be created inside this namespace. Set this quota to 0 to effectively disable the use of
                     load balancers in this namespace.
                   </span>
@@ -158,9 +144,7 @@
                 </div>
                 <!-- #endregion -->
                 <div ng-if="ctrl.isAdmin && ctrl.isEditable && ctrl.state.canUseIngress">
-                  <div class="col-sm-12 form-section-title">
-                    Ingresses
-                  </div>
+                  <div class="col-sm-12 form-section-title"> Ingresses </div>
                   <!-- #region INGRESSES -->
                   <div class="form-group" ng-if="ctrl.formValues.IngressClasses.length === 0">
                     <div class="col-sm-12 small text-muted">
@@ -173,24 +157,22 @@
                   <div class="form-group" ng-if="ctrl.formValues.IngressClasses.length > 0">
                     <div class="col-sm-12 small text-muted">
                       <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>
                         Enable and configure ingresses available to users when deploying applications.
                       </p>
                     </div>
                   </div>
 
                   <div class="form-group" ng-repeat-start="ic in ctrl.formValues.IngressClasses track by ic.IngressClass.Name">
-                    <div class="text-muted col-sm-12" style="width: 100%;">
-                      <div style="border-bottom: 1px solid #cdcdcd; padding-bottom: 5px;">
-                        <i class="fa fa-route" aria-hidden="true" style="margin-right: 2px;"></i> {{ ic.IngressClass.Name }}
+                    <div class="text-muted col-sm-12" style="width: 100%">
+                      <div style="border-bottom: 1px solid #cdcdcd; padding-bottom: 5px">
+                        <i class="fa fa-route" aria-hidden="true" style="margin-right: 2px"></i> {{ ic.IngressClass.Name }}
                       </div>
                     </div>
 
-                    <div class="col-sm-12" style="margin-top: 10px;">
-                      <label class="control-label text-left">
-                        Allow users to use this ingress
-                      </label>
-                      <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="ic.Selected" /><i></i> </label>
+                    <div class="col-sm-12" style="margin-top: 10px">
+                      <label class="control-label text-left"> Allow users to use this ingress </label>
+                      <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="ic.Selected" /><i></i> </label>
                     </div>
                   </div>
 
@@ -205,12 +187,12 @@
                           >
                           </portainer-tooltip>
                         </label>
-                        <span class="label label-default interactive" style="margin-left: 10px;" ng-click="ctrl.addHostname(ic)">
+                        <span class="label label-default interactive" style="margin-left: 10px" ng-click="ctrl.addHostname(ic)">
                           <i class="fa fa-plus-circle" aria-hidden="true"></i> add hostname
                         </span>
                       </div>
-                      <div class="col-sm-12" style="margin-top: 10px;">
-                        <div ng-repeat="item in ic.Hosts track by $index" style="margin-top: 2px;">
+                      <div class="col-sm-12" style="margin-top: 10px">
+                        <div ng-repeat="item in ic.Hosts track by $index" style="margin-top: 2px">
                           <div class="form-inline">
                             <div class="col-sm-10 input-group input-group-sm" ng-class="{ striked: item.NeedsDeletion }">
                               <span class="input-group-addon">Hostname</span>
@@ -236,7 +218,7 @@
                           </div>
                           <div
                             class="small text-warning"
-                            style="margin-top: 5px;"
+                            style="margin-top: 5px"
                             ng-show="resourcePoolEditForm['hostname_' + ic.IngressClass.Name + '_' + $index].$invalid || item.Duplicate"
                           >
                             <ng-messages for="resourcePoolEditForm['hostname_' + ic.IngressClass.Name + '_' + $index].$error">
@@ -266,11 +248,11 @@
                           >
                           </portainer-tooltip>
                         </label>
-                        <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="ic.RewriteTarget" /><i></i> </label>
+                        <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="ic.RewriteTarget" /><i></i> </label>
                       </div>
                     </div>
                   </div>
-                  <div ng-repeat-end class="form-group" ng-if="ic.Selected" style="margin-bottom: 20px;">
+                  <div ng-repeat-end class="form-group" ng-if="ic.Selected" style="margin-bottom: 20px">
                     <div class="col-sm-12">
                       <p>
                         <a class="small interactive" ng-if="!ic.AdvancedConfig" ng-click="ic.AdvancedConfig = true">
@@ -282,22 +264,22 @@
                       </p>
                     </div>
 
-                    <div class="col-sm-12 small text-muted" ng-if="ic.AdvancedConfig" style="margin-top: 5px;">
+                    <div class="col-sm-12 small text-muted" ng-if="ic.AdvancedConfig" style="margin-top: 5px">
                       <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>
                         You can specify a list of annotations that will be associated to the ingress.
                       </p>
                     </div>
 
                     <div class="col-sm-12" ng-if="ic.AdvancedConfig">
                       <label class="control-label text-left">Annotations</label>
-                      <span class="label label-default interactive" style="margin-left: 10px;" ng-click="ctrl.addAnnotation(ic)">
+                      <span class="label label-default interactive" style="margin-left: 10px" ng-click="ctrl.addAnnotation(ic)">
                         <i class="fa fa-plus-circle" aria-hidden="true"></i> add annotation
                       </span>
                     </div>
 
-                    <div class="col-sm-12 form-inline" style="margin-top: 10px;" ng-if="ic.AdvancedConfig">
-                      <div ng-repeat="annotation in ic.Annotations track by $index" style="margin-top: 2px;">
+                    <div class="col-sm-12 form-inline" style="margin-top: 10px" ng-if="ic.AdvancedConfig">
+                      <div ng-repeat="annotation in ic.Annotations track by $index" style="margin-top: 2px">
                         <div class="input-group col-sm-5 input-group-sm">
                           <span class="input-group-addon">Key</span>
                           <input type="text" class="form-control" ng-model="annotation.Key" placeholder="nginx.ingress.kubernetes.io/rewrite-target" required />
@@ -319,14 +301,10 @@
 
                 <!-- #region REGISTRIES -->
                 <div>
-                  <div class="col-sm-12 form-section-title">
-                    Registries
-                  </div>
+                  <div class="col-sm-12 form-section-title"> Registries </div>
 
                   <div class="form-group" ng-if="!ctrl.isAdmin || ctrl.isSystem">
-                    <label class="col-sm-3 col-lg-2 control-label text-left" style="padding-top: 0;">
-                      Selected registries
-                    </label>
+                    <label class="col-sm-3 col-lg-2 control-label text-left" style="padding-top: 0"> Selected registries </label>
                     <div class="col-sm-9 col-lg-4">
                       {{ ctrl.selectedRegistries ? ctrl.selectedRegistries : 'None' }}
                     </div>
@@ -336,15 +314,13 @@
                     <div class="form-group">
                       <div class="col-sm-12 small text-muted">
                         <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>
                           Define which registry can be used by users who have access to this namespace.
                         </p>
                       </div>
                     </div>
                     <div class="form-group">
-                      <label class="col-sm-3 col-lg-2 control-label text-left" style="padding-top: 0;">
-                        Select registries
-                      </label>
+                      <label class="col-sm-3 col-lg-2 control-label text-left" style="padding-top: 0"> Select registries </label>
                       <div class="col-sm-9 col-lg-4">
                         <span class="small text-muted" ng-if="!ctrl.registries.length && ctrl.state.isAdmin">
                           No registries available. Head over <a ui-sref="portainer.registries">registry view</a> to define container registry.
@@ -372,19 +348,17 @@
                 <!-- #endregion -->
 
                 <!-- #region STORAGES -->
-                <div class="col-sm-12 form-section-title">
-                  Storage
-                </div>
+                <div class="col-sm-12 form-section-title"> Storage </div>
 
                 <div class="form-group">
                   <span class="col-sm-12 text-muted small">
-                    <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>
                     Quotas can be set on each storage option to prevent users from exceeding a specific threshold when deploying applications. You can set a quota to 0 to
                     effectively prevent the usage of a specific storage option inside this namespace.
                   </span>
                 </div>
                 <div class="col-sm-12 form-section-title">
-                  <i class="fa fa-route" aria-hidden="true" style="margin-right: 2px;"></i>
+                  <i class="fa fa-route" aria-hidden="true" style="margin-right: 2px"></i>
                   standard
                 </div>
 
@@ -401,9 +375,7 @@
                 <!-- !summary -->
 
                 <!-- actions -->
-                <div ng-if="ctrl.isAdmin" class="col-sm-12 form-section-title">
-                  Actions
-                </div>
+                <div ng-if="ctrl.isAdmin" class="col-sm-12 form-section-title"> Actions </div>
                 <div ng-if="ctrl.isAdmin" class="form-group">
                   <div class="col-sm-12">
                     <button
@@ -436,7 +408,7 @@
               <uib-tab-heading>
                 <i class="fa fa-history space-right" aria-hidden="true"></i> Events
                 <div ng-if="ctrl.hasEventWarnings()">
-                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                   {{ ctrl.state.eventWarningCount }} warning(s)
                 </div>
               </uib-tab-heading>
@@ -453,7 +425,7 @@
             </uib-tab>
             <uib-tab index="2" ng-if="ctrl.pool.Yaml" select="ctrl.showEditor()" classes="btn-sm">
               <uib-tab-heading> <i class="fa fa-code space-right" aria-hidden="true"></i> YAML </uib-tab-heading>
-              <div style="padding-right: 25px;" ng-if="ctrl.state.showEditorTab">
+              <div style="padding-right: 25px" ng-if="ctrl.state.showEditorTab">
                 <kubernetes-yaml-inspector key="resource-pool-yaml" data="ctrl.pool.Yaml"></kubernetes-yaml-inspector>
               </div>
             </uib-tab>
diff --git a/app/kubernetes/views/resource-pools/resourcePools.html b/app/kubernetes/views/resource-pools/resourcePools.html
index 6636dea14..10043b953 100644
--- a/app/kubernetes/views/resource-pools/resourcePools.html
+++ b/app/kubernetes/views/resource-pools/resourcePools.html
@@ -1,6 +1,4 @@
-<kubernetes-view-header title="Namespace list" state="kubernetes.resourcePools" view-ready="ctrl.state.viewReady">
-  Namespaces
-</kubernetes-view-header>
+<kubernetes-view-header title="Namespace list" state="kubernetes.resourcePools" view-ready="ctrl.state.viewReady"> Namespaces </kubernetes-view-header>
 
 <kubernetes-view-loading view-ready="ctrl.state.viewReady"></kubernetes-view-loading>
 
diff --git a/app/kubernetes/views/stacks/logs/logs.html b/app/kubernetes/views/stacks/logs/logs.html
index 7c3aa81a0..eaa3680d2 100644
--- a/app/kubernetes/views/stacks/logs/logs.html
+++ b/app/kubernetes/views/stacks/logs/logs.html
@@ -6,15 +6,13 @@
 
 <kubernetes-view-loading view-ready="ctrl.state.viewReady"></kubernetes-view-loading>
 
-<div ng-if="ctrl.state.viewReady" style="height: 100%;">
+<div ng-if="ctrl.state.viewReady" style="height: 100%">
   <div class="row">
     <div class="col-sm-12">
       <rd-widget>
         <rd-widget-body>
           <form class="form-horizontal" autocomplete="off">
-            <div class="col-sm-12 form-section-title">
-              Actions
-            </div>
+            <div class="col-sm-12 form-section-title"> Actions </div>
             <!-- auto-refresh -->
             <div class="form-group">
               <div class="col-sm-12">
@@ -22,15 +20,13 @@
                   Auto-refresh
                   <portainer-tooltip position="bottom" message="Automatically refresh logs every 30 seconds"></portainer-tooltip>
                 </label>
-                <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="ctrl.state.autoRefresh" ng-change="ctrl.updateAutoRefresh()" /><i></i> </label>
+                <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="ctrl.state.autoRefresh" ng-change="ctrl.updateAutoRefresh()" /><i></i> </label>
               </div>
             </div>
             <!-- !auto-refresh -->
             <!-- search -->
             <div class="form-group">
-              <label for="logs_search" class="col-sm-1 control-label text-left">
-                Search
-              </label>
+              <label for="logs_search" class="col-sm-1 control-label text-left"> Search </label>
               <div class="col-sm-11">
                 <input
                   class="form-control"
@@ -47,7 +43,7 @@
             <!-- actions -->
             <div class="form-group">
               <div class="col-sm-12">
-                <button class="btn btn-primary btn-sm" type="button" ng-click="ctrl.downloadLogs()" style="margin-left: 0;"><i class="fa fa-download"></i> Download logs</button>
+                <button class="btn btn-primary btn-sm" type="button" ng-click="ctrl.downloadLogs()" style="margin-left: 0"><i class="fa fa-download"></i> Download logs</button>
               </div>
             </div>
             <!-- !actions -->
@@ -57,8 +53,8 @@
     </div>
   </div>
 
-  <div class="row" style="height: 54%;">
-    <div class="col-sm-12" style="height: 100%;">
+  <div class="row" style="height: 54%">
+    <div class="col-sm-12" style="height: 100%">
       <pre
         class="log_viewer"
       ><div ng-repeat="line in ctrl.state.filteredLogs = (ctrl.stackLogs | filter:ctrl.state.search) track by $index" class="line" ng-if="line"><p class="inner_line"><span ng-style="{'color': line.Color, 'font-weight': 'bold'};">{{ line.AppName }}</span> {{ line.Line }}</p></div><div ng-if="ctrl.stackLogs.length && !ctrl.state.filteredLogs.length" class="line"><p class="inner_line">No log line matching the '{{ ctrl.state.search }}' filter</p></div><div ng-if="ctrl.stackLogs.length === 0" class="line"><p class="inner_line">No logs available</p></div></pre>
diff --git a/app/kubernetes/views/summary/summary.html b/app/kubernetes/views/summary/summary.html
index a023cb12a..3b0767e2e 100644
--- a/app/kubernetes/views/summary/summary.html
+++ b/app/kubernetes/views/summary/summary.html
@@ -1,7 +1,7 @@
 <div
   class="col-xs-12 form-section-title interactive"
   ng-click="$ctrl.toggleSummary()"
-  style="display: flex; justify-content: space-between;"
+  style="display: flex; justify-content: space-between"
   ng-if="$ctrl.state.resources.length > 0"
 >
   Summary
@@ -13,11 +13,11 @@
 
 <div class="form-group" ng-if="$ctrl.state.expandedTemplate">
   <div class="col-sm-12 small text-muted">
-    <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>
     Portainer will execute the following Kubernetes actions.
   </div>
 
-  <div class="col-sm-12 small text-muted" style="padding-top: 1em;" ng-if="$ctrl.state.resources.length > 0">
+  <div class="col-sm-12 small text-muted" style="padding-top: 1em" ng-if="$ctrl.state.resources.length > 0">
     <ul>
       <li ng-repeat="summary in $ctrl.state.resources" ng-if="summary.action && summary.kind && summary.name">
         {{ summary.action }}
diff --git a/app/kubernetes/views/volumes/components/volumes-storages-datatable/template.html b/app/kubernetes/views/volumes/components/volumes-storages-datatable/template.html
index 424f69350..dda47adb1 100644
--- a/app/kubernetes/views/volumes/components/volumes-storages-datatable/template.html
+++ b/app/kubernetes/views/volumes/components/volumes-storages-datatable/template.html
@@ -2,15 +2,13 @@
   <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 class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
             <span uib-dropdown-toggle><i class="fa fa-cog" aria-hidden="true"></i> Table 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">
@@ -18,9 +16,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>
@@ -29,7 +25,7 @@
                         <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>
@@ -58,19 +54,19 @@
         <table class="table table-hover nowrap-cells">
           <thead>
             <tr>
-              <th style="width: 20px;">
+              <th style="width: 20px">
                 <a ng-click="$ctrl.expandAll()" ng-if="$ctrl.hasExpandableItems()">
                   <i ng-class="{ 'fas fa-angle-down': $ctrl.state.expandAll, 'fas fa-angle-right': !$ctrl.state.expandAll }" aria-hidden="true"></i>
                 </a>
               </th>
-              <th style="width: 60%;">
+              <th style="width: 60%">
                 <a ng-click="$ctrl.changeOrderBy('Name')">
                   Storage
                   <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Name' && !$ctrl.state.reverseOrder"></i>
                   <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Name' && $ctrl.state.reverseOrder"></i>
                 </a>
               </th>
-              <th style="width: 38%;">
+              <th style="width: 38%">
                 <a ng-click="$ctrl.changeOrderBy('Size')">
                   Usage
                   <i class="fa fa-sort-numeric-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Size' && !$ctrl.state.reverseOrder"></i>
@@ -124,9 +120,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/kubernetes/views/volumes/edit/volume.html b/app/kubernetes/views/volumes/edit/volume.html
index 64d8e8e73..01dffd150 100644
--- a/app/kubernetes/views/volumes/edit/volume.html
+++ b/app/kubernetes/views/volumes/edit/volume.html
@@ -15,7 +15,7 @@
             <uib-tab index="0" classes="btn-sm" select="ctrl.selectTab(0)">
               <uib-tab-heading data-cy="k8sVolDetail-volTab"> <i class="fa fa-database space-right" aria-hidden="true"></i> Volume </uib-tab-heading>
 
-              <div style="padding: 20px;">
+              <div style="padding: 20px">
                 <table class="table">
                   <tbody>
                     <tr>
@@ -32,7 +32,7 @@
                         <a ui-sref="kubernetes.resourcePools.resourcePool({ id: ctrl.volume.ResourcePool.Namespace.Name })" data-cy="k8sVolDetail-volNamespace">{{
                           ctrl.volume.ResourcePool.Namespace.Name
                         }}</a>
-                        <span style="margin-left: 5px;" class="label label-info image-tag" ng-if="ctrl.isSystemNamespace()">system</span>
+                        <span style="margin-left: 5px" class="label label-info image-tag" ng-if="ctrl.isSystemNamespace()">system</span>
                       </td>
                     </tr>
                     <tr>
@@ -89,12 +89,12 @@
                                 required
                                 data-cy="k8sVolDetail-increaseSizeInput"
                               />
-                              <span class="input-group-addon" style="padding: 0;">
+                              <span class="input-group-addon" style="padding: 0">
                                 <select
                                   ng-model="ctrl.state.volumeSizeUnit"
                                   ng-change="ctrl.onChangeSize()"
                                   ng-options="unit for unit in ctrl.state.availableSizeUnits"
-                                  style="width: 100%; height: 100%;"
+                                  style="width: 100%; height: 100%"
                                   data-cy="k8sVolDetail-increaseSizeUnits"
                                 ></select>
                               </span>
@@ -114,7 +114,7 @@
                           </div>
 
                           <div class="form-inline">
-                            <div class="small text-warning" style="margin-top: 5px;" ng-show="ctrl.state.errors.volumeSize || kubernetesVolumeUpdateForm.size.$invalid">
+                            <div class="small text-warning" style="margin-top: 5px" ng-show="ctrl.state.errors.volumeSize || kubernetesVolumeUpdateForm.size.$invalid">
                               <div ng-messages="kubernetesVolumeUpdateForm.size.$error">
                                 <p ng-message="required"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
                               </div>
@@ -135,7 +135,7 @@
               <uib-tab-heading data-cy="k8sVolDetail-volEventsTab">
                 <i class="fa fa-history space-right" aria-hidden="true"></i> Events
                 <div ng-if="ctrl.hasEventWarnings()">
-                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                   {{ ctrl.state.eventWarningCount }} warning(s)
                 </div>
               </uib-tab-heading>
@@ -154,7 +154,7 @@
 
             <uib-tab index="2" ng-if="ctrl.volume.PersistentVolumeClaim.Yaml" select="ctrl.showEditor()" classes="btn-sm">
               <uib-tab-heading data-cy="k8sVolDetail-volYamlTab"> <i class="fa fa-code space-right" aria-hidden="true"></i> YAML </uib-tab-heading>
-              <div style="padding-right: 25px;" ng-if="ctrl.state.showEditorTab">
+              <div style="padding-right: 25px" ng-if="ctrl.state.showEditorTab">
                 <kubernetes-yaml-inspector key="volume-yaml" data="ctrl.volume.PersistentVolumeClaim.Yaml"></kubernetes-yaml-inspector>
               </div>
             </uib-tab>
diff --git a/app/kubernetes/views/volumes/volumes.html b/app/kubernetes/views/volumes/volumes.html
index b02fe9c8a..78611e63a 100644
--- a/app/kubernetes/views/volumes/volumes.html
+++ b/app/kubernetes/views/volumes/volumes.html
@@ -1,6 +1,4 @@
-<kubernetes-view-header title="Volume list" state="kubernetes.volumes" view-ready="ctrl.state.viewReady">
-  Volumes
-</kubernetes-view-header>
+<kubernetes-view-header title="Volume list" state="kubernetes.volumes" view-ready="ctrl.state.viewReady"> Volumes </kubernetes-view-header>
 
 <kubernetes-view-loading view-ready="ctrl.state.viewReady"></kubernetes-view-loading>
 
diff --git a/app/portainer/components/BoxSelector/index.ts b/app/portainer/components/BoxSelector/index.ts
index a51e63d32..36858b8e2 100644
--- a/app/portainer/components/BoxSelector/index.ts
+++ b/app/portainer/components/BoxSelector/index.ts
@@ -6,6 +6,14 @@ import { BoxSelector, buildOption } from './BoxSelector';
 import { BoxSelectorAngular } from './BoxSelectorAngular';
 
 export { BoxSelector, buildOption };
-const BoxSelectorReact = react2angular(BoxSelector, ['value', 'onChange', 'options', 'radioName']);
+const BoxSelectorReact = react2angular(BoxSelector, [
+  'value',
+  'onChange',
+  'options',
+  'radioName',
+]);
 
-export default angular.module('app.portainer.component.box-selector', []).component('boxSelectorReact', BoxSelectorReact).component('boxSelector', BoxSelectorAngular).name;
+export default angular
+  .module('app.portainer.component.box-selector', [])
+  .component('boxSelectorReact', BoxSelectorReact)
+  .component('boxSelector', BoxSelectorAngular).name;
diff --git a/app/portainer/components/Code/Code.stories.tsx b/app/portainer/components/Code/Code.stories.tsx
index 0c22df705..d941a46c9 100644
--- a/app/portainer/components/Code/Code.stories.tsx
+++ b/app/portainer/components/Code/Code.stories.tsx
@@ -19,9 +19,8 @@ Primary.args = {
   children: 'curl -X GET http://ultra-sound-money.eth',
 };
 
-export const MultiLineWithChildren: Story<PropsWithChildren<
-  unknown
->> = Template.bind({});
+export const MultiLineWithChildren: Story<PropsWithChildren<unknown>> =
+  Template.bind({});
 MultiLineWithChildren.args = {
   children: 'curl -X\n GET http://example-with-children.crypto',
 };
diff --git a/app/portainer/components/ReactExample.test.tsx b/app/portainer/components/ReactExample.test.tsx
deleted file mode 100644
index 2245dcada..000000000
--- a/app/portainer/components/ReactExample.test.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import { render } from '@/react-tools/test-utils';
-
-import { ReactExample } from './ReactExample';
-
-test('loads component', async () => {
-  const text = 'hello';
-
-  const { getByText } = render(<ReactExample text={text} />);
-
-  expect(getByText(text)).toBeInTheDocument();
-});
diff --git a/app/portainer/components/access-datatable/accessDatatable.html b/app/portainer/components/access-datatable/accessDatatable.html
index 525218d8e..419845b60 100644
--- a/app/portainer/components/access-datatable/accessDatatable.html
+++ b/app/portainer/components/access-datatable/accessDatatable.html
@@ -57,10 +57,8 @@
                   <label for="select_{{ $index }}"></label>
                 </span>
                 {{ item.Name }}
-                <span ng-if="$ctrl.inheritFrom && item.Inherited" class="text-muted small" style="margin-left: 2px;"
-                  ><code style="font-size: 85% !important;">inherited</code></span
-                >
-                <span ng-if="$ctrl.inheritFrom && item.Override" class="text-muted small" style="margin-left: 2px;"><code style="font-size: 85% !important;">override</code></span>
+                <span ng-if="$ctrl.inheritFrom && item.Inherited" class="text-muted small" style="margin-left: 2px"><code style="font-size: 85% !important">inherited</code></span>
+                <span ng-if="$ctrl.inheritFrom && item.Override" class="text-muted small" style="margin-left: 2px"><code style="font-size: 85% !important">override</code></span>
               </td>
               <td>{{ item.Type }}</td>
             </tr>
@@ -78,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/portainer/components/access-table/accessTable.html b/app/portainer/components/access-table/accessTable.html
index 13cf98acb..7f91a2ded 100644
--- a/app/portainer/components/access-table/accessTable.html
+++ b/app/portainer/components/access-table/accessTable.html
@@ -38,10 +38,10 @@
         <td>
           {{ item.Name }}
           <!-- <span class="image-tag label label-">inherited</span> -->
-          <span ng-if="item.Inherited" class="text-muted small" style="margin-left: 2px;"><code style="font-size: 85% !important;">inherited</code></span>
+          <span ng-if="item.Inherited" class="text-muted small" style="margin-left: 2px"><code style="font-size: 85% !important">inherited</code></span>
         </td>
         <td>
-          <i class="fa" ng-class="item.Type === 'user' ? 'fa-user' : 'fa-users'" aria-hidden="true" style="margin-right: 2px;"></i>
+          <i class="fa" ng-class="item.Type === 'user' ? 'fa-user' : 'fa-users'" aria-hidden="true" style="margin-right: 2px"></i>
           {{ item.Type }}
         </td>
       </tr>
@@ -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 ng-model="$ctrl.state.paginatedItemLimit">
             <option value="0">All</option>
             <option value="10">10</option>
diff --git a/app/portainer/components/accessControlPanel/porAccessControlPanel.html b/app/portainer/components/accessControlPanel/porAccessControlPanel.html
index 5fc0967b3..5b7796bc1 100644
--- a/app/portainer/components/accessControlPanel/porAccessControlPanel.html
+++ b/app/portainer/components/accessControlPanel/porAccessControlPanel.html
@@ -9,10 +9,10 @@
             <tr>
               <td>Ownership</td>
               <td>
-                <i ng-class="$ctrl.resourceControl.Ownership | ownershipicon" aria-hidden="true" style="margin-right: 2px;"></i>
+                <i ng-class="$ctrl.resourceControl.Ownership | ownershipicon" aria-hidden="true" style="margin-right: 2px"></i>
                 <span ng-if="!$ctrl.resourceControl">
                   administrators
-                  <portainer-tooltip message="This resource can only be managed by administrators." position="bottom" style="margin-left: -3px;"></portainer-tooltip>
+                  <portainer-tooltip message="This resource can only be managed by administrators." position="bottom" style="margin-left: -3px"></portainer-tooltip>
                 </span>
                 <span ng-if="$ctrl.resourceControl">
                   {{ $ctrl.resourceControl.Ownership }}
@@ -20,19 +20,19 @@
                     ng-if="$ctrl.resourceControl.Ownership === $ctrl.RCO.PUBLIC"
                     message="This resource can be managed by any user with access to this environment."
                     position="bottom"
-                    style="margin-left: -3px;"
+                    style="margin-left: -3px"
                   ></portainer-tooltip>
                   <portainer-tooltip
                     ng-if="$ctrl.resourceControl.Ownership === $ctrl.RCO.PRIVATE"
                     message="Management of this resource is restricted to a single user."
                     position="bottom"
-                    style="margin-left: -3px;"
+                    style="margin-left: -3px"
                   ></portainer-tooltip>
                   <portainer-tooltip
                     ng-if="$ctrl.resourceControl.Ownership === $ctrl.RCO.RESTRICTED"
                     message="This resource can be managed by a restricted set of users and/or teams."
                     position="bottom"
-                    style="margin-left: -3px;"
+                    style="margin-left: -3px"
                   ></portainer-tooltip>
                 </span>
               </td>
@@ -40,36 +40,36 @@
             <!-- !ownership -->
             <tr ng-if="$ctrl.resourceControl.Type === $ctrl.RCTI.SERVICE && $ctrl.resourceType === $ctrl.RCTS.CONTAINER">
               <td colspan="2">
-                <i class="fa fa-info-circle" aria-hidden="true" style="margin-right: 2px;"></i>
+                <i class="fa fa-info-circle" aria-hidden="true" style="margin-right: 2px"></i>
                 Access control on this resource is inherited from the following service:
                 <a ui-sref="docker.services.service({ id: $ctrl.resourceControl.ResourceId })">{{ $ctrl.resourceControl.ResourceId | truncate }}</a>
                 <portainer-tooltip
                   message="Access control applied on a service is also applied on each container of that service."
                   position="bottom"
-                  style="margin-left: 2px;"
+                  style="margin-left: 2px"
                 ></portainer-tooltip>
               </td>
             </tr>
             <tr ng-if="$ctrl.resourceControl.Type === $ctrl.RCTI.CONTAINER && $ctrl.resourceType === $ctrl.RCTS.VOLUME">
               <td colspan="2">
-                <i class="fa fa-info-circle" aria-hidden="true" style="margin-right: 2px;"></i>
+                <i class="fa fa-info-circle" aria-hidden="true" style="margin-right: 2px"></i>
                 Access control on this resource is inherited from the following container:
                 <a ui-sref="docker.containers.container({ id: $ctrl.resourceControl.ResourceId })">{{ $ctrl.resourceControl.ResourceId | truncate }}</a>
                 <portainer-tooltip
                   message="Access control applied on a container created using a template is also applied on each volume associated to the container."
                   position="bottom"
-                  style="margin-left: 2px;"
+                  style="margin-left: 2px"
                 ></portainer-tooltip>
               </td>
             </tr>
             <tr ng-if="$ctrl.resourceControl.Type === $ctrl.RCTI.STACK && $ctrl.resourceType !== $ctrl.RCTS.STACK">
               <td colspan="2">
-                <i class="fa fa-info-circle" aria-hidden="true" style="margin-right: 2px;"></i>
+                <i class="fa fa-info-circle" aria-hidden="true" style="margin-right: 2px"></i>
                 Access control on this resource is inherited from the following stack: {{ $ctrl.resourceControl.ResourceId }}
                 <portainer-tooltip
                   message="Access control applied on a stack is also applied on each resource in the stack."
                   position="bottom"
-                  style="margin-left: 2px;"
+                  style="margin-left: 2px"
                 ></portainer-tooltip>
               </td>
             </tr>
@@ -98,13 +98,13 @@
             <!-- !edit-ownership -->
             <!-- edit-ownership-choices -->
             <tr ng-if="$ctrl.state.editOwnership">
-              <td colspan="2" style="white-space: inherit;">
+              <td colspan="2" style="white-space: inherit">
                 <div class="boxselector_wrapper">
                   <div ng-if="$ctrl.isAdmin">
                     <input type="radio" id="access_administrators" ng-model="$ctrl.formValues.Ownership" ng-value="$ctrl.RCO.ADMINISTRATORS" />
                     <label for="access_administrators">
                       <div class="boxselector_header">
-                        <i ng-class="'administrators' | ownershipicon" aria-hidden="true" style="margin-right: 2px;"></i>
+                        <i ng-class="'administrators' | ownershipicon" aria-hidden="true" style="margin-right: 2px"></i>
                         Administrators
                       </div>
                       <p>I want to restrict the management of this resource to administrators only</p>
@@ -114,35 +114,31 @@
                     <input type="radio" id="access_restricted" ng-model="$ctrl.formValues.Ownership" ng-value="$ctrl.RCO.RESTRICTED" />
                     <label for="access_restricted">
                       <div class="boxselector_header">
-                        <i ng-class="'restricted' | ownershipicon" aria-hidden="true" style="margin-right: 2px;"></i>
+                        <i ng-class="'restricted' | ownershipicon" aria-hidden="true" style="margin-right: 2px"></i>
                         Restricted
                       </div>
-                      <p>
-                        I want to restrict the management of this resource to a set of users and/or teams
-                      </p>
+                      <p> I want to restrict the management of this resource to a set of users and/or teams </p>
                     </label>
                   </div>
                   <div ng-if="!$ctrl.isAdmin && $ctrl.state.canChangeOwnershipToTeam && $ctrl.availableTeams.length > 0">
                     <input type="radio" id="access_restricted" ng-model="$ctrl.formValues.Ownership" ng-value="$ctrl.RCO.RESTRICTED" />
                     <label for="access_restricted">
                       <div class="boxselector_header">
-                        <i ng-class="'restricted' | ownershipicon" aria-hidden="true" style="margin-right: 2px;"></i>
+                        <i ng-class="'restricted' | ownershipicon" aria-hidden="true" style="margin-right: 2px"></i>
                         Restricted
                       </div>
                       <p ng-if="$ctrl.availableTeams.length === 1">
                         I want any member of my team (<b>{{ $ctrl.availableTeams[0].Name }}</b
                         >) to be able to manage this resource
                       </p>
-                      <p ng-if="$ctrl.availableTeams.length > 1">
-                        I want to restrict the management of this resource to one or more of my teams
-                      </p>
+                      <p ng-if="$ctrl.availableTeams.length > 1"> I want to restrict the management of this resource to one or more of my teams </p>
                     </label>
                   </div>
                   <div>
                     <input type="radio" id="access_public" ng-model="$ctrl.formValues.Ownership" ng-value="$ctrl.RCO.PUBLIC" />
                     <label for="access_public">
                       <div class="boxselector_header">
-                        <i ng-class="'public' | ownershipicon" aria-hidden="true" style="margin-right: 2px;"></i>
+                        <i ng-class="'public' | ownershipicon" aria-hidden="true" style="margin-right: 2px"></i>
                         Public
                       </div>
                       <p>I want any user with access to this environment to be able to manage this resource</p>
@@ -156,7 +152,7 @@
             <tr ng-if="$ctrl.state.editOwnership && $ctrl.formValues.Ownership === $ctrl.RCO.RESTRICTED && ($ctrl.isAdmin || (!$ctrl.isAdmin && $ctrl.availableTeams.length > 1))">
               <td colspan="2">
                 <span>Teams</span>
-                <span ng-if="$ctrl.isAdmin && $ctrl.availableTeams.length === 0" class="small text-muted" style="margin-left: 10px;">
+                <span ng-if="$ctrl.isAdmin && $ctrl.availableTeams.length === 0" class="small text-muted" style="margin-left: 10px">
                   You have not yet created any teams. Head over to the <a ui-sref="portainer.teams">Teams view</a> to manage teams.
                 </span>
                 <span
@@ -180,7 +176,7 @@
             <tr ng-if="$ctrl.isAdmin && $ctrl.state.editOwnership && $ctrl.formValues.Ownership === $ctrl.RCO.RESTRICTED">
               <td colspan="2">
                 <span>Users</span>
-                <span ng-if="$ctrl.availableUsers.length === 0" class="small text-muted" style="margin-left: 10px;">
+                <span ng-if="$ctrl.availableUsers.length === 0" class="small text-muted" style="margin-left: 10px">
                   You have not yet created any users. Head over to the <a ui-sref="portainer.users">Users view</a> to manage users.
                 </span>
                 <span
@@ -206,7 +202,7 @@
                 <div>
                   <a type="button" class="btn btn-default btn-sm" ng-click="$ctrl.state.editOwnership = false">Cancel</a>
                   <a type="button" class="btn btn-primary btn-sm" ng-click="$ctrl.confirmUpdateOwnership()">Update ownership</a>
-                  <span class="text-danger" ng-if="$ctrl.state.formValidationError" style="margin-left: 5px;">{{ $ctrl.state.formValidationError }}</span>
+                  <span class="text-danger" ng-if="$ctrl.state.formValidationError" style="margin-left: 5px">{{ $ctrl.state.formValidationError }}</span>
                 </div>
               </td>
             </tr>
diff --git a/app/portainer/components/accessManagement/por-access-management-users-selector/por-access-management-users-selector.html b/app/portainer/components/accessManagement/por-access-management-users-selector/por-access-management-users-selector.html
index 5b1ad6e66..4941e6904 100644
--- a/app/portainer/components/accessManagement/por-access-management-users-selector/por-access-management-users-selector.html
+++ b/app/portainer/components/accessManagement/por-access-management-users-selector/por-access-management-users-selector.html
@@ -1,11 +1,7 @@
 <div class="form-group">
-  <label class="col-sm-3 col-lg-2 control-label text-left">
-    Select user(s) and/or team(s)
-  </label>
+  <label class="col-sm-3 col-lg-2 control-label text-left"> Select user(s) and/or team(s) </label>
   <div class="col-sm-9 col-lg-4">
-    <span class="small text-muted" ng-if="$ctrl.options.length === 0">
-      No users or teams available.
-    </span>
+    <span class="small text-muted" ng-if="$ctrl.options.length === 0"> No users or teams available. </span>
     <span
       isteven-multi-select
       ng-if="$ctrl.options.length > 0"
diff --git a/app/portainer/components/accessManagement/porAccessManagement.html b/app/portainer/components/accessManagement/porAccessManagement.html
index b8670486e..88984f4b8 100644
--- a/app/portainer/components/accessManagement/porAccessManagement.html
+++ b/app/portainer/components/accessManagement/porAccessManagement.html
@@ -7,7 +7,7 @@
           <div ng-if="ctrl.entityType !== 'registry'" class="form-group">
             <span class="col-sm-12 small text-warning">
               <p>
-                <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
                 Adding user access will require the affected user(s) to logout and login for the changes to be taken into account.
               </p>
             </span>
@@ -16,9 +16,7 @@
           <por-access-management-users-selector options="ctrl.availableUsersAndTeams" value="ctrl.formValues.multiselectOutput"></por-access-management-users-selector>
 
           <div class="form-group" ng-if="ctrl.entityType !== 'registry'">
-            <label class="col-sm-3 col-lg-2 control-label text-left">
-              Role
-            </label>
+            <label class="col-sm-3 col-lg-2 control-label text-left"> Role </label>
             <div class="col-sm-9 col-lg-6">
               <div class="flex items-center">
                 <select
diff --git a/app/portainer/components/associated-endpoints-selector/associatedEndpointsSelector.html b/app/portainer/components/associated-endpoints-selector/associatedEndpointsSelector.html
index 0c66ff2ae..d1656914e 100644
--- a/app/portainer/components/associated-endpoints-selector/associatedEndpointsSelector.html
+++ b/app/portainer/components/associated-endpoints-selector/associatedEndpointsSelector.html
@@ -2,11 +2,11 @@
   You can select which environment should be part of this group by moving them to the associated environments table. Simply click on any environment entry to move it from one table
   to the other.
 </div>
-<div class="col-sm-12" style="margin-top: 20px;">
+<div class="col-sm-12" style="margin-top: 20px">
   <!-- available-endpoints -->
   <div class="col-sm-6">
     <div class="text-center small text-muted">Available environments</div>
-    <div style="margin-top: 10px;">
+    <div style="margin-top: 10px">
       <group-association-table
         loaded="$ctrl.loaded"
         page-type="$ctrl.pageType"
@@ -29,7 +29,7 @@
   <!-- associated-endpoints -->
   <div class="col-sm-6">
     <div class="text-center small text-muted">Associated environments</div>
-    <div style="margin-top: 10px;">
+    <div style="margin-top: 10px">
       <group-association-table
         loaded="$ctrl.loaded"
         page-type="$ctrl.pageType"
diff --git a/app/portainer/components/beta-panel/betaPanel.html b/app/portainer/components/beta-panel/betaPanel.html
index 01d0db0f1..a2bf912c5 100644
--- a/app/portainer/components/beta-panel/betaPanel.html
+++ b/app/portainer/components/beta-panel/betaPanel.html
@@ -1,7 +1,7 @@
 <information-panel title-text="Information">
   <span class="small">
     <p class="text-muted">
-      <i class="fa fa-flask orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+      <i class="fa fa-flask orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
       This is a beta feature.
     </p>
   </span>
diff --git a/app/portainer/components/custom-template-common-fields/customTemplateCommonFields.html b/app/portainer/components/custom-template-common-fields/customTemplateCommonFields.html
index 44808228e..faceb3188 100644
--- a/app/portainer/components/custom-template-common-fields/customTemplateCommonFields.html
+++ b/app/portainer/components/custom-template-common-fields/customTemplateCommonFields.html
@@ -1,9 +1,7 @@
 <ng-form name="commonCustomTemplateForm">
   <!-- title-input -->
   <div class="form-group">
-    <label for="template_title" class="col-sm-3 col-lg-2 control-label text-left">
-      Title
-    </label>
+    <label for="template_title" class="col-sm-3 col-lg-2 control-label text-left"> Title </label>
     <div class="col-sm-9 col-lg-10">
       <input
         type="text"
diff --git a/app/portainer/components/custom-template-selector/custom-template-selector.html b/app/portainer/components/custom-template-selector/custom-template-selector.html
index 26c74ed8a..516778cc3 100644
--- a/app/portainer/components/custom-template-selector/custom-template-selector.html
+++ b/app/portainer/components/custom-template-selector/custom-template-selector.html
@@ -1,8 +1,6 @@
 <div>
   <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
         ng-if="$ctrl.templates.length"
@@ -19,9 +17,7 @@
 
   <!-- 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/portainer/components/custom-templates-list/customTemplatesList.html b/app/portainer/components/custom-templates-list/customTemplatesList.html
index 6c0dcbac4..c8e86978d 100644
--- a/app/portainer/components/custom-templates-list/customTemplatesList.html
+++ b/app/portainer/components/custom-templates-list/customTemplatesList.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-primary" ui-state="$ctrl.createPath"> <i class="fa fa-plus space-right" aria-hidden="true"></i>Add Custom Template </button>
@@ -29,20 +29,16 @@
           on-select="($ctrl.onSelectClick)"
         >
           <template-item-actions>
-            <div ng-if="$ctrl.isEditAllowed(template)" style="display: flex;">
-              <a ui-state="$ctrl.editPath" ui-state-params="{id: template.Id}" ng-click="$event.stopPropagation();" class="btn btn-primary btn-xs" style="margin-right: 10px;">
+            <div ng-if="$ctrl.isEditAllowed(template)" style="display: flex">
+              <a ui-state="$ctrl.editPath" ui-state-params="{id: template.Id}" ng-click="$event.stopPropagation();" class="btn btn-primary btn-xs" style="margin-right: 10px">
                 Edit
               </a>
               <button class="btn btn-danger btn-xs" ng-click="$ctrl.onDeleteClick(template.Id); $event.stopPropagation();">Delete</button>
             </div>
           </template-item-actions>
         </template-item>
-        <div ng-if="!$ctrl.templates" class="text-center text-muted">
-          Loading...
-        </div>
-        <div ng-if="($ctrl.templates | filter: $ctrl.state.textFilter).length === 0" class="text-center text-muted">
-          No templates available.
-        </div>
+        <div ng-if="!$ctrl.templates" class="text-center text-muted"> Loading... </div>
+        <div ng-if="($ctrl.templates | filter: $ctrl.state.textFilter).length === 0" class="text-center text-muted"> No templates available. </div>
       </div>
     </rd-widget-body>
   </rd-widget>
diff --git a/app/portainer/components/datatables/access-tokens-datatable/access-tokens-datatable.html b/app/portainer/components/datatables/access-tokens-datatable/access-tokens-datatable.html
index bc8ed6ccd..d31e34687 100644
--- a/app/portainer/components/datatables/access-tokens-datatable/access-tokens-datatable.html
+++ b/app/portainer/components/datatables/access-tokens-datatable/access-tokens-datatable.html
@@ -1,8 +1,8 @@
-<div class="datatable" style="margin-top: 25px;">
+<div class="datatable" style="margin-top: 25px">
   <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
@@ -101,9 +101,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/portainer/components/datatables/components/QuickActionsSettings.tsx b/app/portainer/components/datatables/components/QuickActionsSettings.tsx
index d5d34c4c4..4afac83b3 100644
--- a/app/portainer/components/datatables/components/QuickActionsSettings.tsx
+++ b/app/portainer/components/datatables/components/QuickActionsSettings.tsx
@@ -16,9 +16,8 @@ export interface QuickActionsSettingsType {
 }
 
 export function QuickActionsSettings({ actions }: Props) {
-  const { settings, setTableSettings } = useTableSettings<
-    QuickActionsSettingsType
-  >();
+  const { settings, setTableSettings } =
+    useTableSettings<QuickActionsSettingsType>();
 
   return (
     <>
diff --git a/app/portainer/components/datatables/components/SearchBar.tsx b/app/portainer/components/datatables/components/SearchBar.tsx
index 6550f125f..a9c65de7b 100644
--- a/app/portainer/components/datatables/components/SearchBar.tsx
+++ b/app/portainer/components/datatables/components/SearchBar.tsx
@@ -3,17 +3,15 @@ import { useContext, createContext, PropsWithChildren } from 'react';
 import { useLocalStorage } from '@/portainer/hooks/useLocalStorage';
 
 interface Props {
-  autoFocus: boolean;
   value: string;
   onChange(value: string): void;
 }
 
-export function SearchBar({ autoFocus, value, onChange }: Props) {
+export function SearchBar({ value, onChange }: Props) {
   return (
     <div className="searchBar">
       <i className="fa fa-search searchIcon" aria-hidden="true" />
       <input
-        autoFocus={autoFocus}
         type="text"
         className="searchInput"
         value={value}
diff --git a/app/portainer/components/datatables/components/useTableSettings.tsx b/app/portainer/components/datatables/components/useTableSettings.tsx
index a2de1363f..15c23d6fa 100644
--- a/app/portainer/components/datatables/components/useTableSettings.tsx
+++ b/app/portainer/components/datatables/components/useTableSettings.tsx
@@ -1,4 +1,12 @@
-import { Context, createContext, ReactNode, useContext, useState } from 'react';
+import {
+  Context,
+  createContext,
+  ReactNode,
+  useCallback,
+  useContext,
+  useMemo,
+  useState,
+} from 'react';
 
 import { useLocalStorage } from '@/portainer/hooks/useLocalStorage';
 
@@ -44,26 +52,31 @@ export function TableSettingsProvider<T>({
 
   const [settings, setTableSettings] = useState(storage);
 
-  return (
-    <Context.Provider value={{ settings, setTableSettings: handleChange }}>
-      {children}
-    </Context.Provider>
-  );
+  const handleChange = useCallback(
+    (mutation: Partial<T> | ((settings: T) => T)): void => {
+      setTableSettings((settings) => {
+        const newTableSettings =
+          mutation instanceof Function
+            ? mutation(settings)
+            : { ...settings, ...mutation };
 
-  function handleChange(partialSettings: T): void;
-  function handleChange(mutation: (settings: T) => T): void;
-  function handleChange(mutation: T | ((settings: T) => T)): void {
-    setTableSettings((settings) => {
-      const newTableSettings =
-        mutation instanceof Function
-          ? mutation(settings)
-          : { ...settings, ...mutation };
+        setStorage(newTableSettings);
 
-      setStorage(newTableSettings);
+        return newTableSettings;
+      });
+    },
+    [setStorage]
+  );
 
-      return newTableSettings;
-    });
-  }
+  const contextValue = useMemo(
+    () => ({
+      settings,
+      setTableSettings: handleChange,
+    }),
+    [settings, handleChange]
+  );
+
+  return <Context.Provider value={contextValue}>{children}</Context.Provider>;
 
   function keyBuilder(key: string) {
     return `datatable_TableSettings_${key}`;
@@ -71,7 +84,7 @@ export function TableSettingsProvider<T>({
 }
 
 function getContextType<T>() {
-  return (TableSettingsContext as unknown) as Context<
+  return TableSettingsContext as unknown as Context<
     TableSettingsContextInterface<T>
   >;
 }
diff --git a/app/portainer/components/datatables/datatable-columns-visibility/datatable-columns-visibility.html b/app/portainer/components/datatables/datatable-columns-visibility/datatable-columns-visibility.html
index dc8668edd..7d00beba9 100644
--- a/app/portainer/components/datatables/datatable-columns-visibility/datatable-columns-visibility.html
+++ b/app/portainer/components/datatables/datatable-columns-visibility/datatable-columns-visibility.html
@@ -2,9 +2,7 @@
   <span uib-dropdown-toggle><i class="fa fa-columns space-right" aria-hidden="true"></i>Columns</span>
   <div class="dropdown-menu dropdown-menu-right" uib-dropdown-menu>
     <div class="tableMenu">
-      <div class="menuHeader">
-        Show / Hide Columns
-      </div>
+      <div class="menuHeader"> Show / Hide Columns </div>
       <div class="menuContent">
         <div class="md-checkbox" ng-repeat="(key, value) in $ctrl.columns">
           <input id="col_vis_{{::key}}" ng-change="$ctrl.onChange($ctrl.columns)" type="checkbox" ng-model="value.display" />
diff --git a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html
index 2d7fc923f..56658b86a 100644
--- a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html
+++ b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.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
@@ -85,7 +85,7 @@
               </td>
               <td>
                 <span>
-                  <i ng-class="item.Type | endpointtypeicon" aria-hidden="true" style="margin-right: 2px;"></i>
+                  <i ng-class="item.Type | endpointtypeicon" aria-hidden="true" style="margin-right: 2px"></i>
                   {{ item.Type | endpointtypename }}
                 </span>
               </td>
@@ -112,9 +112,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/portainer/components/datatables/filter/datatable-filter.html b/app/portainer/components/datatables/filter/datatable-filter.html
index f824447ff..504950e9d 100644
--- a/app/portainer/components/datatables/filter/datatable-filter.html
+++ b/app/portainer/components/datatables/filter/datatable-filter.html
@@ -6,7 +6,7 @@
       <i class="fa" ng-class="[$ctrl.isEnabled() ? 'fa-check' : 'fa-filter']" aria-hidden="true"></i>
     </span>
   </div>
-  <div class="dropdown-menu" style="min-width: 0;" uib-dropdown-menu>
+  <div class="dropdown-menu" style="min-width: 0" uib-dropdown-menu>
     <div class="tableMenu">
       <div class="menuContent">
         <div class="md-checkbox" ng-repeat="filter in $ctrl.labels track by filter.value">
@@ -23,9 +23,7 @@
         </div>
       </div>
       <div>
-        <a class="btn btn-default btn-sm" ng-click="$ctrl.isOpen = false;">
-          Close
-        </a>
+        <a class="btn btn-default btn-sm" ng-click="$ctrl.isOpen = false;"> Close </a>
       </div>
     </div>
   </div>
diff --git a/app/portainer/components/datatables/groups-datatable/groupsDatatable.html b/app/portainer/components/datatables/groups-datatable/groupsDatatable.html
index 22d8b2785..84a8807d9 100644
--- a/app/portainer/components/datatables/groups-datatable/groupsDatatable.html
+++ b/app/portainer/components/datatables/groups-datatable/groupsDatatable.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
@@ -79,9 +79,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/portainer/components/datatables/pagination/pagination.html b/app/portainer/components/datatables/pagination/pagination.html
index 930b047c3..60c5d30eb 100644
--- a/app/portainer/components/datatables/pagination/pagination.html
+++ b/app/portainer/components/datatables/pagination/pagination.html
@@ -1,7 +1,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.limit" ng-change="$ctrl.onChangeLimit($ctrl.limit)">
         <option ng-if="$ctrl.enableNoLimit" ng-value="0">All</option>
         <option ng-value="10">10</option>
diff --git a/app/portainer/components/datatables/registries-datatable/registriesDatatable.html b/app/portainer/components/datatables/registries-datatable/registriesDatatable.html
index 66e540800..26f0d9c87 100644
--- a/app/portainer/components/datatables/registries-datatable/registriesDatatable.html
+++ b/app/portainer/components/datatables/registries-datatable/registriesDatatable.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" ng-if="$ctrl.isAdmin">
         <button
@@ -14,7 +14,9 @@
         >
           <i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Remove
         </button>
-        <button type="button" class="btn btn-sm btn-primary" ui-sref="portainer.registries.new" data-cy="add-registry"> <i class="fa fa-plus space-right" aria-hidden="true"></i>Add registry </button>
+        <button type="button" class="btn btn-sm btn-primary" ui-sref="portainer.registries.new" data-cy="add-registry">
+          <i class="fa fa-plus space-right" aria-hidden="true"></i>Add registry
+        </button>
       </div>
       <div class="searchBar">
         <i class="fa fa-search searchIcon" aria-hidden="true"></i>
@@ -62,12 +64,8 @@
                 </span>
                 <span>DockerHub (anonymous)</span>
               </td>
-              <td>
-                docker.io
-              </td>
-              <td>
-                -
-              </td>
+              <td> docker.io </td>
+              <td> - </td>
             </tr>
             <tr
               dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit))"
@@ -80,7 +78,7 @@
                 </span>
                 <a ui-sref="portainer.registries.registry({id: item.Id})" ng-if="$ctrl.enableGoToLink(item)">{{ item.Name }}</a>
                 <span ng-if="!$ctrl.enableGoToLink(item)">{{ item.Name }}</span>
-                <span ng-if="item.Authentication" style="margin-left: 5px;" class="label label-info image-tag">authentication-enabled</span>
+                <span ng-if="item.Authentication" style="margin-left: 5px" class="label label-info image-tag">authentication-enabled</span>
               </td>
               <td>
                 {{ item.URL }}
@@ -88,7 +86,7 @@
               <td>
                 <a ng-if="$ctrl.canManageAccess(item)" ng-click="$ctrl.redirectToManageAccess(item)"> <i class="fa fa-users" aria-hidden="true"></i> Manage access </a>
                 <be-feature-indicator feature="$ctrl.limitedFeature" ng-if="$ctrl.canBrowse(item)">
-                  <span class="text-muted space-left" style="padding-right: 5px;"> <i class="fa fa-search" aria-hidden="true"></i> Browse</span>
+                  <span class="text-muted space-left" style="padding-right: 5px"> <i class="fa fa-search" aria-hidden="true"></i> Browse</span>
                 </be-feature-indicator>
 
                 <span ng-if="!$ctrl.canBrowse(item) && !$ctrl.canManageAccess(item)"> - </span>
@@ -105,9 +103,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/portainer/components/datatables/stacks-datatable/stacksDatatable.html b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html
index cd34b3b4f..107309c53 100644
--- a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html
+++ b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html
@@ -2,16 +2,14 @@
   <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 class="settings">
           <datatable-columns-visibility columns="$ctrl.columnVisibility.columns" on-change="($ctrl.onColumnVisibilityChange)"></datatable-columns-visibility>
           <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
             <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" ng-if="$ctrl.isAdmin">
@@ -23,9 +21,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>
@@ -34,7 +30,7 @@
                         <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>
@@ -104,9 +100,7 @@
                 </div>
                 <div class="dropdown-menu" uib-dropdown-menu>
                   <div class="tableMenu">
-                    <div class="menuHeader">
-                      Filter by activity
-                    </div>
+                    <div class="menuHeader"> Filter by activity </div>
                     <div class="menuContent">
                       <div class="md-checkbox">
                         <input id="filter_usage_activeStacks" type="checkbox" ng-model="$ctrl.filters.state.showActiveStacks" ng-change="$ctrl.onFilterChange()" />
@@ -170,7 +164,7 @@
                   >{{ item.Name }}</a
                 >
                 <span ng-if="$ctrl.offlineMode">{{ item.Name }}</span>
-                <span ng-if="item.Regular && item.Status == 2" style="margin-left: 10px;" class="label label-warning image-tag space-left">Inactive</span>
+                <span ng-if="item.Regular && item.Status == 2" style="margin-left: 10px" class="label label-warning image-tag space-left">Inactive</span>
               </td>
               <td>{{ item.Type === 1 ? 'Swarm' : 'Compose' }}</td>
               <td>
@@ -182,7 +176,7 @@
                   tooltip-class="portainer-tooltip"
                   uib-tooltip="This stack was created inside an environment that is no longer registered inside Portainer."
                 >
-                  Orphaned <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-left: 2px;"></i>
+                  Orphaned <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-left: 2px"></i>
                 </span>
                 <span
                   ng-if="item.External"
@@ -192,7 +186,7 @@
                   tooltip-class="portainer-tooltip"
                   uib-tooltip="This stack was created outside of Portainer. Control over this stack is limited."
                 >
-                  Limited <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-left: 2px;"></i>
+                  Limited <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-left: 2px"></i>
                 </span>
                 <span ng-if="item.Regular">Total</span>
               </td>
@@ -228,9 +222,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/portainer/components/datatables/tags-datatable/tagsDatatable.html b/app/portainer/components/datatables/tags-datatable/tagsDatatable.html
index ecca372e5..db232d9c9 100644
--- a/app/portainer/components/datatables/tags-datatable/tagsDatatable.html
+++ b/app/portainer/components/datatables/tags-datatable/tagsDatatable.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)">
@@ -64,9 +64,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/portainer/components/datatables/teams-datatable/teamsDatatable.html b/app/portainer/components/datatables/teams-datatable/teamsDatatable.html
index 4dae710de..23339ac5d 100644
--- a/app/portainer/components/datatables/teams-datatable/teamsDatatable.html
+++ b/app/portainer/components/datatables/teams-datatable/teamsDatatable.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)">
@@ -64,9 +64,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/portainer/components/datatables/titlebar/datatable-titlebar.html b/app/portainer/components/datatables/titlebar/datatable-titlebar.html
index add8e9fff..a56ff1aff 100644
--- a/app/portainer/components/datatables/titlebar/datatable-titlebar.html
+++ b/app/portainer/components/datatables/titlebar/datatable-titlebar.html
@@ -1,7 +1,7 @@
 <div class="toolBar">
   <div class="toolBarTitle">
-    <i class="fa" ng-class="$ctrl.icon" aria-hidden="true" style="margin-right: 2px;"></i>
-    <span style="margin-right: 10px;">{{ $ctrl.title }}</span>
+    <i class="fa" ng-class="$ctrl.icon" aria-hidden="true" style="margin-right: 2px"></i>
+    <span style="margin-right: 10px">{{ $ctrl.title }}</span>
     <be-feature-indicator feature="$ctrl.feature"></be-feature-indicator>
   </div>
 </div>
diff --git a/app/portainer/components/datatables/users-datatable/usersDatatable.html b/app/portainer/components/datatables/users-datatable/usersDatatable.html
index f8c3b8aee..ae9414490 100644
--- a/app/portainer/components/datatables/users-datatable/usersDatatable.html
+++ b/app/portainer/components/datatables/users-datatable/usersDatatable.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
@@ -71,9 +71,9 @@
               </td>
               <td>
                 <span>
-                  <i class="fa fa-user-circle" aria-hidden="true" style="margin-right: 5px;" ng-if="item.Role === 1 && !item.isTeamLeader"></i>
-                  <i class="fa fa-user-plus" aria-hidden="true" style="margin-right: 5px;" ng-if="item.Role !== 1 && item.isTeamLeader"></i>
-                  <i class="fa fa-user" aria-hidden="true" style="margin-right: 5px;" ng-if="item.Role !== 1 && !item.isTeamLeader"></i>
+                  <i class="fa fa-user-circle" aria-hidden="true" style="margin-right: 5px" ng-if="item.Role === 1 && !item.isTeamLeader"></i>
+                  <i class="fa fa-user-plus" aria-hidden="true" style="margin-right: 5px" ng-if="item.Role !== 1 && item.isTeamLeader"></i>
+                  <i class="fa fa-user" aria-hidden="true" style="margin-right: 5px" ng-if="item.Role !== 1 && !item.isTeamLeader"></i>
                   {{ item.RoleName ? item.RoleName : '-' }}
                 </span>
               </td>
@@ -97,9 +97,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/portainer/components/endpoint-list/endpoint-item/endpointItem.html b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html
index fb3dc2445..1f7b3d94d 100644
--- a/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html
+++ b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html
@@ -51,15 +51,15 @@
       <div class="blocklist-item-line endpoint-item" ng-if="$ctrl.model.Snapshots[0]">
         <span class="blocklist-item-desc">
           <span>
-            <span style="padding: 0 7px 0 0;">
+            <span style="padding: 0 7px 0 0">
               <i class="fa fa-th-list space-right" aria-hidden="true"></i>{{ $ctrl.model.Snapshots[0].StackCount }}
               {{ $ctrl.model.Snapshots[0].StackCount === 1 ? 'stack' : 'stacks' }}
             </span>
-            <span style="padding: 0 7px 0 7px;" ng-if="$ctrl.model.Snapshots[0].Swarm">
+            <span style="padding: 0 7px 0 7px" ng-if="$ctrl.model.Snapshots[0].Swarm">
               <i class="fa fa-list-alt space-right" aria-hidden="true"></i>{{ $ctrl.model.Snapshots[0].ServiceCount }}
               {{ $ctrl.model.Snapshots[0].ServiceCount === 1 ? 'service' : 'services' }}
             </span>
-            <span style="padding: 0 7px 0 7px;">
+            <span style="padding: 0 7px 0 7px">
               <i class="fa fa-cubes space-right" aria-hidden="true"></i>{{ $ctrl.model.Snapshots[0].RunningContainerCount + $ctrl.model.Snapshots[0].StoppedContainerCount }}
               {{ $ctrl.model.Snapshots[0].RunningContainerCount + $ctrl.model.Snapshots[0].StoppedContainerCount === 1 ? 'container' : 'containers' }}
               <span ng-if="$ctrl.model.Snapshots[0].RunningContainerCount > 0 || $ctrl.model.Snapshots[0].StoppedContainerCount > 0">
@@ -71,11 +71,11 @@
                 <i class="fa fa-heartbeat orange-icon" aria-hidden="true"></i> {{ $ctrl.model.Snapshots[0].UnhealthyContainerCount }}
               </span>
             </span>
-            <span style="padding: 0 7px 0 7px;">
+            <span style="padding: 0 7px 0 7px">
               <i class="fa fa-hdd space-right" aria-hidden="true"></i>{{ $ctrl.model.Snapshots[0].VolumeCount }}
               {{ $ctrl.model.Snapshots[0].VolumeCount === 1 ? 'volume' : 'volumes' }}
             </span>
-            <span style="padding: 0 7px 0 7px;">
+            <span style="padding: 0 7px 0 7px">
               <i class="fa fa-clone space-right" aria-hidden="true"></i>{{ $ctrl.model.Snapshots[0].ImageCount }}
               {{ $ctrl.model.Snapshots[0].ImageCount === 1 ? 'image' : 'images' }}
             </span>
@@ -84,7 +84,7 @@
         <span class="small text-muted">
           {{ $ctrl.model.Snapshots[0].Swarm ? 'Swarm' : 'Standalone' }} {{ $ctrl.model.Snapshots[0].DockerVersion }}
           <span ng-if="$ctrl.model.Type === 2">+ <i class="fa fa-bolt" aria-hidden="true"></i> Agent</span>
-          <span style="padding: 0 7px 0 0;" ng-if="$ctrl.model.Snapshots[0].Swarm">
+          <span style="padding: 0 7px 0 0" ng-if="$ctrl.model.Snapshots[0].Swarm">
             <i class="fa fa-hdd space-left space-right" aria-hidden="true"></i>{{ $ctrl.model.Snapshots[0].NodeCount }}
             {{ $ctrl.model.Snapshots[0].NodeCount === 1 ? 'node' : 'nodes' }}
           </span>
@@ -92,23 +92,21 @@
       </div>
 
       <div class="blocklist-item-line endpoint-item" ng-if="!$ctrl.model.Snapshots[0] && $ctrl.model.Type !== 5 && $ctrl.model.Type !== 6 && $ctrl.model.Type !== 7">
-        <span class="blocklist-item-desc">
-          No snapshot available
-        </span>
+        <span class="blocklist-item-desc"> No snapshot available </span>
       </div>
 
       <div class="blocklist-item-line endpoint-item" ng-if="$ctrl.model.Kubernetes.Snapshots[0] && ($ctrl.model.Type === 5 || $ctrl.model.Type === 6 || $ctrl.model.Type === 7)">
         <span class="blocklist-item-desc">
           <span>
-            <span style="padding: 0 7px 0 0;"> <i class="fa fa-microchip space-right" aria-hidden="true"></i>{{ $ctrl.model.Kubernetes.Snapshots[0].TotalCPU }} CPU </span>
-            <span style="padding: 0 7px 0 7px;">
+            <span style="padding: 0 7px 0 0"> <i class="fa fa-microchip space-right" aria-hidden="true"></i>{{ $ctrl.model.Kubernetes.Snapshots[0].TotalCPU }} CPU </span>
+            <span style="padding: 0 7px 0 7px">
               <i class="fa fa-memory space-right" aria-hidden="true"></i>{{ $ctrl.model.Kubernetes.Snapshots[0].TotalMemory | humansize }} RAM
             </span>
           </span>
         </span>
         <span class="small text-muted">
           Kubernetes {{ $ctrl.model.Kubernetes.Snapshots[0].KubernetesVersion }}
-          <span style="padding: 0 0 0 7px;">
+          <span style="padding: 0 0 0 7px">
             <i class="fa fa-hdd space-left space-right" aria-hidden="true"></i>
             {{ $ctrl.model.Kubernetes.Snapshots[0].NodeCount }} {{ $ctrl.model.Kubernetes.Snapshots[0].NodeCount === 1 ? 'node' : 'nodes' }}
           </span>
@@ -116,9 +114,7 @@
       </div>
 
       <div class="blocklist-item-line endpoint-item" ng-if="!$ctrl.model.Kubernetes.Snapshots[0] && ($ctrl.model.Type === 5 || $ctrl.model.Type === 6 || $ctrl.model.Type === 7)">
-        <span class="blocklist-item-desc">
-          -
-        </span>
+        <span class="blocklist-item-desc"> - </span>
       </div>
 
       <div class="blocklist-item-line endpoint-item">
diff --git a/app/portainer/components/endpoint-list/endpointList.html b/app/portainer/components/endpoint-list/endpointList.html
index 33c9453a8..2e22d1096 100644
--- a/app/portainer/components/endpoint-list/endpointList.html
+++ b/app/portainer/components/endpoint-list/endpointList.html
@@ -2,12 +2,12 @@
   <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" ng-if="$ctrl.showSnapshotAction || $ctrl.showKubeconfigButton()">
-        <div style="margin-bottom: 10px;" ng-if="$ctrl.endpoints.length">
-          <i class="fa fa-exclamation-circle blue-icon" style="margin-right: 5px;"></i>Click on an environment to manage
+        <div style="margin-bottom: 10px" ng-if="$ctrl.endpoints.length">
+          <i class="fa fa-exclamation-circle blue-icon" style="margin-right: 5px"></i>Click on an environment to manage
         </div>
         <button type="button" ng-if="$ctrl.showSnapshotAction" class="btn btn-sm btn-primary" ng-click="$ctrl.snapshotAction()" data-cy="home-refreshEndpointsButton">
           <i class="fa fa-sync space-right" aria-hidden="true"></i>Refresh
@@ -61,21 +61,15 @@
           tags="$ctrl.tags"
           endpoint-init-time="$ctrl.endpointInitTime"
         ></endpoint-item>
-        <div ng-if="$ctrl.state.loading" class="text-center text-muted" data-cy="home-loadingEndpoints">
-          Loading...
-        </div>
-        <div ng-if="!$ctrl.state.loading && !$ctrl.state.filteredEndpoints.length" class="text-center text-muted" data-cy="home-noEndpoints">
-          No environment available.
-        </div>
+        <div ng-if="$ctrl.state.loading" class="text-center text-muted" data-cy="home-loadingEndpoints"> Loading... </div>
+        <div ng-if="!$ctrl.state.loading && !$ctrl.state.filteredEndpoints.length" class="text-center text-muted" data-cy="home-noEndpoints"> No environment available. </div>
       </div>
 
       <div class="footer" ng-if="$ctrl.endpoints">
         <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="home-paginationSelect">
                 <option value="0" ng-if="!$ctrl.hasBackendPagination()">All</option>
                 <option value="10">10</option>
diff --git a/app/portainer/components/endpointSecurity/porEndpointSecurity.html b/app/portainer/components/endpointSecurity/porEndpointSecurity.html
index c18c64fa1..19c329a42 100644
--- a/app/portainer/components/endpointSecurity/porEndpointSecurity.html
+++ b/app/portainer/components/endpointSecurity/porEndpointSecurity.html
@@ -6,13 +6,11 @@
         TLS
         <portainer-tooltip position="bottom" message="Enable this option if you need to connect to the Docker environment with TLS."></portainer-tooltip>
       </label>
-      <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="$ctrl.formData.TLS" /><i></i> </label>
+      <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="$ctrl.formData.TLS" /><i></i> </label>
     </div>
   </div>
   <!-- !tls-checkbox -->
-  <div class="col-sm-12 form-section-title" ng-if="$ctrl.formData.TLS">
-    TLS mode
-  </div>
+  <div class="col-sm-12 form-section-title" ng-if="$ctrl.formData.TLS"> TLS mode </div>
   <!-- note -->
   <div class="form-group" ng-if="$ctrl.formData.TLS">
     <div class="col-sm-12">
@@ -24,13 +22,13 @@
   </div>
   <div class="form-group"></div>
   <!-- endpoint-tls-mode -->
-  <div class="form-group" style="margin-bottom: 0;" ng-if="$ctrl.formData.TLS">
+  <div class="form-group" style="margin-bottom: 0" ng-if="$ctrl.formData.TLS">
     <div class="boxselector_wrapper">
       <div>
         <input type="radio" id="tls_client_ca" ng-model="$ctrl.formData.TLSMode" value="tls_client_ca" />
         <label for="tls_client_ca">
           <div class="boxselector_header">
-            <i class="fa fa-shield-alt" aria-hidden="true" style="margin-right: 2px;"></i>
+            <i class="fa fa-shield-alt" aria-hidden="true" style="margin-right: 2px"></i>
             TLS with server and client verification
           </div>
           <p>Use client certificates and server verification</p>
@@ -40,7 +38,7 @@
         <input type="radio" id="tls_client_noca" ng-model="$ctrl.formData.TLSMode" value="tls_client_noca" />
         <label for="tls_client_noca">
           <div class="boxselector_header">
-            <i class="fa fa-shield-alt" aria-hidden="true" style="margin-right: 2px;"></i>
+            <i class="fa fa-shield-alt" aria-hidden="true" style="margin-right: 2px"></i>
             TLS with client verification only
           </div>
           <p>Use client certificates without server verification</p>
@@ -50,7 +48,7 @@
         <input type="radio" id="tls_ca" ng-model="$ctrl.formData.TLSMode" value="tls_ca" />
         <label for="tls_ca">
           <div class="boxselector_header">
-            <i class="fa fa-shield-alt" aria-hidden="true" style="margin-right: 2px;"></i>
+            <i class="fa fa-shield-alt" aria-hidden="true" style="margin-right: 2px"></i>
             TLS with server verification only
           </div>
           <p>Only verify the server certificate</p>
@@ -60,7 +58,7 @@
         <input type="radio" id="tls_only" ng-model="$ctrl.formData.TLSMode" value="tls_only" />
         <label for="tls_only">
           <div class="boxselector_header">
-            <i class="fa fa-shield-alt" aria-hidden="true" style="margin-right: 2px;"></i>
+            <i class="fa fa-shield-alt" aria-hidden="true" style="margin-right: 2px"></i>
             TLS only
           </div>
           <p>No server/client verification</p>
@@ -69,9 +67,7 @@
     </div>
   </div>
   <!-- !endpoint-tls-mode -->
-  <div class="col-sm-12 form-section-title" ng-if="$ctrl.formData.TLS && $ctrl.formData.TLSMode !== 'tls_only'">
-    Required TLS files
-  </div>
+  <div class="col-sm-12 form-section-title" ng-if="$ctrl.formData.TLS && $ctrl.formData.TLSMode !== 'tls_only'"> Required TLS files </div>
   <!-- tls-file-upload -->
   <div ng-if="$ctrl.formData.TLS">
     <!-- tls-file-ca -->
@@ -79,7 +75,7 @@
       <label class="col-sm-3 col-lg-2 control-label text-left">TLS CA certificate</label>
       <div class="col-sm-9 col-lg-10">
         <button type="button" class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formData.TLSCACert">Select file</button>
-        <span style="margin-left: 5px;">
+        <span style="margin-left: 5px">
           {{ $ctrl.formData.TLSCACert.name }}
           <i class="fa fa-check green-icon" ng-if="$ctrl.formData.TLSCACert && $ctrl.formData.TLSCACert === $ctrl.endpoint.TLSConfig.TLSCACert" aria-hidden="true"></i>
           <i class="fa fa-times red-icon" ng-if="!$ctrl.formData.TLSCACert" aria-hidden="true"></i>
@@ -94,7 +90,7 @@
         <label for="tls_cert" class="col-sm-3 col-lg-2 control-label text-left">TLS certificate</label>
         <div class="col-sm-9 col-lg-10">
           <button type="button" class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formData.TLSCert">Select file</button>
-          <span style="margin-left: 5px;">
+          <span style="margin-left: 5px">
             {{ $ctrl.formData.TLSCert.name }}
             <i class="fa fa-check green-icon" ng-if="$ctrl.formData.TLSCert && $ctrl.formData.TLSCert === $ctrl.endpoint.TLSConfig.TLSCert" aria-hidden="true"></i>
             <i class="fa fa-times red-icon" ng-if="!$ctrl.formData.TLSCert" aria-hidden="true"></i>
@@ -107,7 +103,7 @@
         <label class="col-sm-3 col-lg-2 control-label text-left">TLS key</label>
         <div class="col-sm-9 col-lg-10">
           <button type="button" class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formData.TLSKey">Select file</button>
-          <span style="margin-left: 5px;">
+          <span style="margin-left: 5px">
             {{ $ctrl.formData.TLSKey.name }}
             <i class="fa fa-check green-icon" ng-if="$ctrl.formData.TLSKey && $ctrl.formData.TLSKey === $ctrl.endpoint.TLSConfig.TLSKey" aria-hidden="true"></i>
             <i class="fa fa-times red-icon" ng-if="!$ctrl.formData.TLSKey" aria-hidden="true"></i>
diff --git a/app/portainer/components/environment-variables-panel/environment-variables-panel.html b/app/portainer/components/environment-variables-panel/environment-variables-panel.html
index c84f37ff2..4dc97870c 100644
--- a/app/portainer/components/environment-variables-panel/environment-variables-panel.html
+++ b/app/portainer/components/environment-variables-panel/environment-variables-panel.html
@@ -1,8 +1,6 @@
 <ng-form class="form-horizontal environment-variables-panel" name="$ctrl.envVarsForm">
   <div class="form-group">
-    <div class="col-sm-12 form-section-title" style="margin-top: 10px; margin-left: 15px; width: 98%;">
-      Environment variables
-    </div>
+    <div class="col-sm-12 form-section-title" style="margin-top: 10px; margin-left: 15px; width: 98%"> Environment variables </div>
     <div class="col-sm-12 environment-variables-panel--explanation">
       {{::$ctrl.explanation}}
     </div>
@@ -22,7 +20,7 @@
         <i class="fa fa-info-circle blue-icon space-right" aria-hidden="true"></i>
         Switch to simple mode to define variables line by line, or load from .env file
       </div>
-      <div class="form-group" style="margin-left: 1px;">
+      <div class="form-group" style="margin-left: 1px">
         <code-editor identifier="environment-variables-editor" placeholder="e.g. key=value" value="$ctrl.editorText" yml="false" on-change="($ctrl.editorUpdate)"></code-editor>
       </div>
     </div>
diff --git a/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode-item/environment-variables-simple-mode-item.html b/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode-item/environment-variables-simple-mode-item.html
index 27ace7bc2..2815e6196 100644
--- a/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode-item/environment-variables-simple-mode-item.html
+++ b/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode-item/environment-variables-simple-mode-item.html
@@ -13,7 +13,7 @@
         required
       />
     </div>
-    <div class="form-group" style="margin-top: 5px;" ng-show="$ctrl[$ctrl.formName].name.$invalid">
+    <div class="form-group" style="margin-top: 5px" ng-show="$ctrl[$ctrl.formName].name.$invalid">
       <div class="col-sm-12 small text-warning">
         <div ng-messages="$ctrl[$ctrl.formName].name.$error">
           <p ng-message="required"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Name is required. </p>
diff --git a/app/portainer/components/form-components/FileUpload/FileUploadField.stories.tsx b/app/portainer/components/form-components/FileUpload/FileUploadField.stories.tsx
index 9e1e610d3..535097a67 100644
--- a/app/portainer/components/form-components/FileUpload/FileUploadField.stories.tsx
+++ b/app/portainer/components/form-components/FileUpload/FileUploadField.stories.tsx
@@ -12,7 +12,9 @@ interface Args {
   title: string;
 }
 
-export function Example({ title }: Args) {
+export { Example };
+
+function Example({ title }: Args) {
   const [value, setValue] = useState<File>();
   function onChange(value: File) {
     if (value) {
diff --git a/app/portainer/components/form-components/FileUpload/FileUploadForm.stories.tsx b/app/portainer/components/form-components/FileUpload/FileUploadForm.stories.tsx
index b9ede8b03..690c9beb6 100644
--- a/app/portainer/components/form-components/FileUpload/FileUploadForm.stories.tsx
+++ b/app/portainer/components/form-components/FileUpload/FileUploadForm.stories.tsx
@@ -12,7 +12,9 @@ interface Args {
   title: string;
 }
 
-export function Example({ title }: Args) {
+export { Example };
+
+function Example({ title }: Args) {
   const [value, setValue] = useState<File>();
   function onChange(value: File) {
     if (value) {
diff --git a/app/portainer/components/form-components/InputGroup/index.ts b/app/portainer/components/form-components/InputGroup/index.ts
index 8b5b6eaea..d28565d6f 100644
--- a/app/portainer/components/form-components/InputGroup/index.ts
+++ b/app/portainer/components/form-components/InputGroup/index.ts
@@ -10,7 +10,8 @@ interface InputGroupSubComponents {
   Input: typeof Input;
 }
 
-const InputGroup: typeof MainComponent & InputGroupSubComponents = MainComponent as typeof MainComponent & InputGroupSubComponents;
+const InputGroup: typeof MainComponent & InputGroupSubComponents =
+  MainComponent as typeof MainComponent & InputGroupSubComponents;
 
 InputGroup.Addon = InputGroupAddon;
 InputGroup.ButtonWrapper = InputGroupButtonWrapper;
diff --git a/app/portainer/components/form-components/InputList/InputList.tsx b/app/portainer/components/form-components/InputList/InputList.tsx
index dd30e5d7f..fbb80f1f5 100644
--- a/app/portainer/components/form-components/InputList/InputList.tsx
+++ b/app/portainer/components/form-components/InputList/InputList.tsx
@@ -44,8 +44,8 @@ export function InputList<T = DefaultType>({
   label,
   value,
   onChange,
-  itemBuilder = (defaultItemBuilder as unknown) as () => T,
-  item = (DefaultItem as unknown) as ComponentType<ItemProps<T>>,
+  itemBuilder = defaultItemBuilder as unknown as () => T,
+  item = DefaultItem as unknown as ComponentType<ItemProps<T>>,
   tooltip,
   addLabel = 'Add item',
   itemKeyGetter = (item: T, index: number) => index,
diff --git a/app/portainer/components/form-components/InputList/utils.test.ts b/app/portainer/components/form-components/InputList/utils.test.ts
index 4f7a61020..cf350e649 100644
--- a/app/portainer/components/form-components/InputList/utils.test.ts
+++ b/app/portainer/components/form-components/InputList/utils.test.ts
@@ -2,7 +2,18 @@ import { arrayMove } from './utils';
 
 it('moves items in an array', () => {
   expect(arrayMove(['a', 'b', 'c'], 2, 0)).toEqual(['c', 'a', 'b']);
-  expect(arrayMove([{ name: 'Fred' }, { name: 'Barney' }, { name: 'Wilma' }, { name: 'Betty' }], 2, 1)).toEqual([
+  expect(
+    arrayMove(
+      [
+        { name: 'Fred' },
+        { name: 'Barney' },
+        { name: 'Wilma' },
+        { name: 'Betty' },
+      ],
+      2,
+      1
+    )
+  ).toEqual([
     { name: 'Fred' },
     { name: 'Wilma' },
     { name: 'Barney' },
diff --git a/app/portainer/components/form-components/InputList/utils.ts b/app/portainer/components/form-components/InputList/utils.ts
index 6152b3316..41b7fc307 100644
--- a/app/portainer/components/form-components/InputList/utils.ts
+++ b/app/portainer/components/form-components/InputList/utils.ts
@@ -10,13 +10,23 @@ export function arrayMove<T>(array: Array<T>, from: number, to: number) {
 
   if (diff > 0) {
     // move left
-    return [...array.slice(0, to), item, ...array.slice(to, from), ...array.slice(from + 1, length)];
+    return [
+      ...array.slice(0, to),
+      item,
+      ...array.slice(to, from),
+      ...array.slice(from + 1, length),
+    ];
   }
 
   if (diff < 0) {
     // move right
     const targetIndex = to + 1;
-    return [...array.slice(0, from), ...array.slice(from + 1, targetIndex), item, ...array.slice(targetIndex, length)];
+    return [
+      ...array.slice(0, from),
+      ...array.slice(from + 1, targetIndex),
+      item,
+      ...array.slice(targetIndex, length),
+    ];
   }
 
   return [...array];
diff --git a/app/portainer/components/form-components/web-editor-form/web-editor-form.html b/app/portainer/components/form-components/web-editor-form/web-editor-form.html
index 2dc4a9447..9f77113c7 100644
--- a/app/portainer/components/form-components/web-editor-form/web-editor-form.html
+++ b/app/portainer/components/form-components/web-editor-form/web-editor-form.html
@@ -1,7 +1,5 @@
 <ng-form name="$ctrl.webEditorForm">
-  <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">
     <span class="col-sm-12 text-muted small" ng-transclude="description"> </span>
   </div>
diff --git a/app/portainer/components/forms/git-form/git-form-additional-files-panel/git-form-additional-file-item/git-form-additional-file-item.html b/app/portainer/components/forms/git-form/git-form-additional-files-panel/git-form-additional-file-item/git-form-additional-file-item.html
index 3796ac4eb..b463ba798 100644
--- a/app/portainer/components/forms/git-form/git-form-additional-files-panel/git-form-additional-file-item/git-form-additional-file-item.html
+++ b/app/portainer/components/forms/git-form/git-form-additional-files-panel/git-form-additional-file-item/git-form-additional-file-item.html
@@ -1,6 +1,6 @@
 <ng-form class="env-item form-horizontal" name="$ctrl.{{ $ctrl.formName }}">
   <div class="form-group col-sm-12">
-    <div class="form-inline" style="margin-top: 10px;">
+    <div class="form-inline" style="margin-top: 10px">
       <div class="input-group col-sm-5 input-group-sm">
         <span class="input-group-addon">path</span>
         <input type="text" name="name" class="form-control" ng-model="$ctrl.variable" ng-change="$ctrl.onChangePath($ctrl.variable)" required />
diff --git a/app/portainer/components/forms/git-form/git-form-additional-files-panel/git-form-additional-files-panel.html b/app/portainer/components/forms/git-form/git-form-additional-files-panel/git-form-additional-files-panel.html
index b012c4a5d..ac85dacd2 100644
--- a/app/portainer/components/forms/git-form/git-form-additional-files-panel/git-form-additional-files-panel.html
+++ b/app/portainer/components/forms/git-form/git-form-additional-files-panel/git-form-additional-files-panel.html
@@ -1,9 +1,9 @@
 <div class="form-group">
-  <div class="col-sm-12" style="margin-top: 5px;">
+  <div class="col-sm-12" style="margin-top: 5px">
     <label class="control-label text-left">Additional paths</label>
-    <span class="label label-default interactive" style="margin-left: 10px;" ng-click="$ctrl.add()"> <i class="fa fa-plus-circle" aria-hidden="true"></i> add file </span>
+    <span class="label label-default interactive" style="margin-left: 10px" ng-click="$ctrl.add()"> <i class="fa fa-plus-circle" aria-hidden="true"></i> add file </span>
   </div>
-  <div class="col-sm-12 form-inline" style="margin-top: 10px;">
+  <div class="col-sm-12 form-inline" style="margin-top: 10px">
     <git-form-additional-file-item
       ng-repeat="variable in $ctrl.model.AdditionalFiles track by $index"
       variable="variable"
diff --git a/app/portainer/components/forms/git-form/git-form-auth-fieldset/git-form-auth-fieldset.html b/app/portainer/components/forms/git-form/git-form-auth-fieldset/git-form-auth-fieldset.html
index 4d53f4682..ebf53b1d3 100644
--- a/app/portainer/components/forms/git-form/git-form-auth-fieldset/git-form-auth-fieldset.html
+++ b/app/portainer/components/forms/git-form/git-form-auth-fieldset/git-form-auth-fieldset.html
@@ -9,15 +9,13 @@
     ></por-switch-field>
   </div>
 </div>
-<div class="small text-warning" style="margin: 5px 0 15px 0;" ng-if="$ctrl.model.RepositoryAuthentication && $ctrl.showAuthExplanation">
+<div class="small text-warning" style="margin: 5px 0 15px 0" ng-if="$ctrl.model.RepositoryAuthentication && $ctrl.showAuthExplanation">
   <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
   <span class="text-muted">Enabling authentication will store the credentials and it is advisable to use a git service account</span>
 </div>
 <div ng-if="$ctrl.model.RepositoryAuthentication">
   <div class="form-group">
-    <label for="repository_username" class="control-label text-left inline-label">
-      Username
-    </label>
+    <label for="repository_username" class="control-label text-left inline-label"> Username </label>
     <div class="inline-input">
       <input
         type="text"
diff --git a/app/portainer/components/forms/git-form/git-form-auto-update-fieldset/git-form-auto-update-fieldset.html b/app/portainer/components/forms/git-form/git-form-auto-update-fieldset/git-form-auto-update-fieldset.html
index b10286636..6b064808c 100644
--- a/app/portainer/components/forms/git-form/git-form-auto-update-fieldset/git-form-auto-update-fieldset.html
+++ b/app/portainer/components/forms/git-form/git-form-auto-update-fieldset/git-form-auto-update-fieldset.html
@@ -4,14 +4,12 @@
       <por-switch-field name="'autoUpdate'" checked="$ctrl.model.RepositoryAutomaticUpdates" label="'Automatic Updates'" on-change="($ctrl.onChangeAutoUpdate)"></por-switch-field>
     </div>
   </div>
-  <div class="small text-warning" style="margin: 5px 0 10px 0;" ng-if="$ctrl.model.RepositoryAutomaticUpdates">
+  <div class="small text-warning" style="margin: 5px 0 10px 0" ng-if="$ctrl.model.RepositoryAutomaticUpdates">
     <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
     <span class="text-muted">Any changes to this stack or application made locally in Portainer will be overridden, which may cause service interruption.</span>
   </div>
   <div class="form-group" ng-if="$ctrl.model.RepositoryAutomaticUpdates">
-    <label for="repository_mechanism" class="col-sm-1 control-label text-left">
-      Mechanism
-    </label>
+    <label for="repository_mechanism" class="col-sm-1 control-label text-left"> Mechanism </label>
     <div class="col-sm-11">
       <div class="input-group col-sm-10 input-group-sm">
         <div class="btn-group btn-group-sm">
@@ -27,23 +25,19 @@
   </div>
 
   <div class="form-group" ng-if="$ctrl.model.RepositoryAutomaticUpdates && $ctrl.model.RepositoryMechanism === 'Webhook'">
-    <label for="repository_mechanism" class="col-sm-1 control-label text-left">
-      Webhook
-    </label>
+    <label for="repository_mechanism" class="col-sm-1 control-label text-left"> Webhook </label>
     <div class="col-sm-11">
       <span class="text-muted"> {{ $ctrl.model.RepositoryWebhookURL | truncatelr }} </span>
       <button type="button" class="btn btn-sm btn-primary btn-sm space-left" ng-if="$ctrl.model.RepositoryWebhookURL" ng-click="$ctrl.copyWebhook()">
         <span><i class="fa fa-copy space-right" aria-hidden="true"></i>Copy link</span>
       </button>
       <span>
-        <i id="copyNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none;"></i>
+        <i id="copyNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none"></i>
       </span>
     </div>
   </div>
   <div class="form-group" ng-if="$ctrl.model.RepositoryAutomaticUpdates && $ctrl.model.RepositoryMechanism === 'Interval'">
-    <label for="repository_fetch_interval" class="col-sm-1 control-label text-left">
-      Fetch interval
-    </label>
+    <label for="repository_fetch_interval" class="col-sm-1 control-label text-left"> Fetch interval </label>
     <div class="col-sm-11">
       <input
         type="text"
@@ -68,7 +62,7 @@
       ></por-switch-field>
     </div>
   </div>
-  <div class="small text-warning" style="margin: 5px 0 10px 0;" ng-if="$ctrl.model.RepositoryAutomaticUpdates">
+  <div class="small text-warning" style="margin: 5px 0 10px 0" ng-if="$ctrl.model.RepositoryAutomaticUpdates">
     <i class="fa fa-exclamation-circle blue-icon" aria-hidden="true"></i>
     <span class="text-muted">When enabled, enforces automatic deployment at each interval or webhook invocation.</span>
   </div>
@@ -81,7 +75,7 @@
       </div>
     </div>
   </div>
-  <div class="small text-warning" style="margin: 5px 0 10px 0;" ng-if="!$ctrl.model.RepositoryAutomaticUpdates">
+  <div class="small text-warning" style="margin: 5px 0 10px 0" ng-if="!$ctrl.model.RepositoryAutomaticUpdates">
     <i class="fa fa-exclamation-circle blue-icon" aria-hidden="true"></i>
     <span class="text-muted">When enabled, updates from the git repository will occur automatically at an interval or webhook.</span>
   </div>
diff --git a/app/portainer/components/forms/git-form/git-form-url-field/git-form-url-field.html b/app/portainer/components/forms/git-form/git-form-url-field/git-form-url-field.html
index b249d6720..09b474d78 100644
--- a/app/portainer/components/forms/git-form/git-form-url-field/git-form-url-field.html
+++ b/app/portainer/components/forms/git-form/git-form-url-field/git-form-url-field.html
@@ -1,7 +1,5 @@
 <div class="form-group">
-  <span class="col-sm-12 text-muted small">
-    You can use the URL of a git repository.
-  </span>
+  <span class="col-sm-12 text-muted small"> You can use the URL of a git repository. </span>
 </div>
 <div class="form-group">
   <label for="stack_repository_url" class="col-sm-2 control-label text-left">Repository URL</label>
diff --git a/app/portainer/components/forms/git-form/git-form.html b/app/portainer/components/forms/git-form/git-form.html
index 7762a0eca..d6829ffbf 100644
--- a/app/portainer/components/forms/git-form/git-form.html
+++ b/app/portainer/components/forms/git-form/git-form.html
@@ -1,7 +1,5 @@
 <ng-form name="$ctrl.gitForm">
-  <div class="col-sm-12 form-section-title">
-    Git repository
-  </div>
+  <div class="col-sm-12 form-section-title"> Git repository </div>
   <git-form-url-field value="$ctrl.model.RepositoryURL" on-change="($ctrl.onChangeURL)"></git-form-url-field>
   <git-form-ref-field value="$ctrl.model.RepositoryReferenceName" on-change="($ctrl.onChangeRefName)"></git-form-ref-field>
   <git-form-compose-path-field
diff --git a/app/portainer/components/forms/group-form/groupForm.html b/app/portainer/components/forms/group-form/groupForm.html
index ec688059d..7f0e80c56 100644
--- a/app/portainer/components/forms/group-form/groupForm.html
+++ b/app/portainer/components/forms/group-form/groupForm.html
@@ -22,9 +22,7 @@
     </div>
   </div>
   <!-- !description-input -->
-  <div class="col-sm-12 form-section-title">
-    Metadata
-  </div>
+  <div class="col-sm-12 form-section-title"> Metadata </div>
   <!-- tags -->
   <div class="form-group">
     <tag-selector
@@ -38,19 +36,17 @@
   <!-- !tags -->
   <!-- environments -->
   <div ng-if="$ctrl.model.Id !== 1">
-    <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">
       <div class="col-sm-12 small text-muted">
         You can select which environment should be part of this group by moving them to the associated environments table. Simply click on any environment entry to move it from one
         table to the other.
       </div>
-      <div class="col-sm-12" style="margin-top: 20px;">
+      <div class="col-sm-12" style="margin-top: 20px">
         <!-- available-endpoints -->
         <div class="col-sm-6">
           <div class="text-center small text-muted">Available environments</div>
-          <div style="margin-top: 10px;">
+          <div style="margin-top: 10px">
             <group-association-table
               loaded="$ctrl.loaded"
               page-type="$ctrl.pageType"
@@ -67,7 +63,7 @@
         <!-- associated-endpoints -->
         <div class="col-sm-6">
           <div class="text-center small text-muted">Associated environments</div>
-          <div style="margin-top: 10px;">
+          <div style="margin-top: 10px">
             <group-association-table
               loaded="$ctrl.loaded"
               page-type="$ctrl.pageType"
@@ -86,10 +82,8 @@
     </div>
   </div>
   <div ng-if="$ctrl.model.Id === 1">
-    <div class="col-sm-12 form-section-title">
-      Unassociated environments
-    </div>
-    <div style="margin-top: 10px;">
+    <div class="col-sm-12 form-section-title"> Unassociated environments </div>
+    <div style="margin-top: 10px">
       <group-association-table
         loaded="$ctrl.loaded"
         page-type="$ctrl.pageType"
@@ -103,9 +97,7 @@
   </div>
   <!-- !endpoints -->
   <!-- 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/portainer/components/forms/kubernetes-app-git-form/kubernetes-app-git-form.html b/app/portainer/components/forms/kubernetes-app-git-form/kubernetes-app-git-form.html
index 88f019f26..b94f2bcae 100644
--- a/app/portainer/components/forms/kubernetes-app-git-form/kubernetes-app-git-form.html
+++ b/app/portainer/components/forms/kubernetes-app-git-form/kubernetes-app-git-form.html
@@ -1,12 +1,8 @@
 <form name="$ctrl.redeployGitForm">
-  <div class="col-sm-12 form-section-title">
-    Redeploy from git repository
-  </div>
+  <div class="col-sm-12 form-section-title"> Redeploy from git repository </div>
   <div class="form-group text-muted">
     <div class="col-sm-12">
-      <p>
-        Pull the latest manifest from git and redeploy the application.
-      </p>
+      <p> Pull the latest manifest from git and redeploy the application. </p>
     </div>
   </div>
 
@@ -29,15 +25,13 @@
     show-auth-explanation="true"
   ></git-form-auth-fieldset>
 
-  <div class="col-sm-12 form-section-title">
-    Actions
-  </div>
+  <div class="col-sm-12 form-section-title"> Actions </div>
   <!-- #Git buttons -->
   <button
     class="btn btn-sm btn-primary"
     ng-click="$ctrl.pullAndRedeployApplication()"
     ng-disabled="$ctrl.isSubmitButtonDisabled() || !$ctrl.redeployGitForm.$valid"
-    style="margin-top: 7px; margin-left: 0;"
+    style="margin-top: 7px; margin-left: 0"
     button-spinner="ctrl.state.redeployInProgress"
     analytics-on
     analytics-category="kubernetes"
@@ -50,7 +44,7 @@
     class="btn btn-sm btn-primary"
     ng-click="$ctrl.saveGitSettings()"
     ng-disabled="$ctrl.isSubmitButtonDisabled() || !$ctrl.redeployGitForm.$valid"
-    style="margin-top: 7px; margin-left: 0;"
+    style="margin-top: 7px; margin-left: 0"
     button-spinner="$ctrl.state.saveGitSettingsInProgress"
   >
     <span ng-show="!$ctrl.state.saveGitSettingsInProgress"> Save settings </span>
diff --git a/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.html b/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.html
index 17861006c..b2bc98e0e 100644
--- a/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.html
+++ b/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.html
@@ -1,12 +1,8 @@
 <form name="$ctrl.redeployGitForm">
-  <div class="col-sm-12 form-section-title">
-    Redeploy from git repository
-  </div>
+  <div class="col-sm-12 form-section-title"> Redeploy from git repository </div>
   <div class="form-group text-muted">
     <div class="col-sm-12">
-      <p>
-        Pull the latest manifest from git and redeploy the application.
-      </p>
+      <p> Pull the latest manifest from git and redeploy the application. </p>
     </div>
   </div>
   <git-form-auto-update-fieldset model="$ctrl.formValues.AutoUpdate" on-change="($ctrl.onChangeAutoUpdate)"></git-form-auto-update-fieldset>
@@ -29,15 +25,13 @@
     show-auth-explanation="true"
   ></git-form-auth-fieldset>
 
-  <div class="col-sm-12 form-section-title">
-    Actions
-  </div>
+  <div class="col-sm-12 form-section-title"> Actions </div>
   <!-- #Git buttons -->
   <button
     class="btn btn-sm btn-primary"
     ng-click="$ctrl.pullAndRedeployApplication()"
     ng-disabled="$ctrl.isSubmitButtonDisabled() || $ctrl.state.hasUnsavedChanges|| !$ctrl.redeployGitForm.$valid"
-    style="margin-top: 7px; margin-left: 0;"
+    style="margin-top: 7px; margin-left: 0"
     button-spinner="$ctrl.state.redeployInProgress"
     analytics-on
     analytics-category="kubernetes"
@@ -50,7 +44,7 @@
     class="btn btn-sm btn-primary"
     ng-click="$ctrl.saveGitSettings()"
     ng-disabled="$ctrl.isSubmitButtonDisabled() || !$ctrl.state.hasUnsavedChanges|| !$ctrl.redeployGitForm.$valid"
-    style="margin-top: 7px; margin-left: 0;"
+    style="margin-top: 7px; margin-left: 0"
     button-spinner="$ctrl.state.saveGitSettingsInProgress"
     analytics-on
     analytics-category="kubernetes"
diff --git a/app/portainer/components/forms/registry-form-aws-ecr/registry-form-ecr.html b/app/portainer/components/forms/registry-form-aws-ecr/registry-form-ecr.html
index abf0c02ea..93b11c9c0 100644
--- a/app/portainer/components/forms/registry-form-aws-ecr/registry-form-ecr.html
+++ b/app/portainer/components/forms/registry-form-aws-ecr/registry-form-ecr.html
@@ -1,7 +1,5 @@
 <form class="form-horizontal" name="registryFormEcr" ng-submit="$ctrl.formAction()">
-  <div class="col-sm-12 form-section-title">
-    Important notice
-  </div>
+  <div class="col-sm-12 form-section-title"> Important notice </div>
   <div class="form-group">
     <span class="col-sm-12 text-muted small">
       For information on how to generate an Access Key, follow the
@@ -9,9 +7,7 @@
     </span>
   </div>
 
-  <div class="col-sm-12 form-section-title">
-    ECR connection details
-  </div>
+  <div class="col-sm-12 form-section-title"> ECR connection details </div>
 
   <!-- name-input -->
   <div class="form-group">
@@ -63,7 +59,7 @@
         Authentication
         <portainer-tooltip position="bottom" message="Enable this option if you need to specify credentials to connect to a private registry."></portainer-tooltip>
       </label>
-      <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="$ctrl.model.Authentication" /><i></i> </label>
+      <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="$ctrl.model.Authentication" /><i></i> </label>
     </div>
   </div>
   <!-- !authentication-checkbox -->
@@ -119,9 +115,7 @@
   </div>
 
   <!-- 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/portainer/components/forms/registry-form-azure/registry-form-azure.html b/app/portainer/components/forms/registry-form-azure/registry-form-azure.html
index 70dad0ce8..510995a2f 100644
--- a/app/portainer/components/forms/registry-form-azure/registry-form-azure.html
+++ b/app/portainer/components/forms/registry-form-azure/registry-form-azure.html
@@ -1,7 +1,5 @@
 <form class="form-horizontal" name="registryFormAzure" ng-submit="$ctrl.formAction()">
-  <div class="col-sm-12 form-section-title">
-    Azure registry details
-  </div>
+  <div class="col-sm-12 form-section-title"> Azure registry details </div>
   <!-- name-input -->
   <div class="form-group">
     <label for="registry_name" class="col-sm-3 col-lg-2 control-label text-left">Name</label>
@@ -66,9 +64,7 @@
   </div>
   <!-- !credentials-password -->
   <!-- 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/portainer/components/forms/registry-form-custom/registry-form-custom.html b/app/portainer/components/forms/registry-form-custom/registry-form-custom.html
index ee77175cc..168058c06 100644
--- a/app/portainer/components/forms/registry-form-custom/registry-form-custom.html
+++ b/app/portainer/components/forms/registry-form-custom/registry-form-custom.html
@@ -1,16 +1,12 @@
 <form class="form-horizontal" name="registryFormCustom" ng-submit="$ctrl.formAction()">
-  <div class="col-sm-12 form-section-title">
-    Important notice
-  </div>
+  <div class="col-sm-12 form-section-title"> Important notice </div>
   <div class="form-group">
     <span class="col-sm-12 text-muted small">
       Docker requires you to connect to a <a href="https://docs.docker.com/registry/deploying/#running-a-domain-registry" target="_blank">secure registry</a>. You can find more
       information about how to connect to an insecure registry <a href="https://docs.docker.com/registry/insecure/" target="_blank">in the Docker documentation</a>.
     </span>
   </div>
-  <div class="col-sm-12 form-section-title">
-    Custom registry details
-  </div>
+  <div class="col-sm-12 form-section-title"> Custom registry details </div>
   <!-- name-input -->
   <div class="form-group">
     <label for="registry_name" class="col-sm-3 col-lg-2 control-label text-left">Name</label>
@@ -51,7 +47,7 @@
         Authentication
         <portainer-tooltip position="bottom" message="Enable this option if you need to specify credentials to connect to this registry."></portainer-tooltip>
       </label>
-      <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="$ctrl.model.Authentication" /><i></i> </label>
+      <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="$ctrl.model.Authentication" /><i></i> </label>
     </div>
   </div>
   <!-- !authentication-checkbox -->
@@ -88,9 +84,7 @@
     <!-- !credentials-password -->
   </div>
   <!-- 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/portainer/components/forms/registry-form-dockerhub/registry-form-dockerhub.html b/app/portainer/components/forms/registry-form-dockerhub/registry-form-dockerhub.html
index bd9fe4281..269162a1d 100644
--- a/app/portainer/components/forms/registry-form-dockerhub/registry-form-dockerhub.html
+++ b/app/portainer/components/forms/registry-form-dockerhub/registry-form-dockerhub.html
@@ -1,7 +1,5 @@
 <form class="form-horizontal" name="registryFormDockerhub" ng-submit="$ctrl.formAction()">
-  <div class="col-sm-12 form-section-title">
-    DockerHub account details
-  </div>
+  <div class="col-sm-12 form-section-title"> DockerHub account details </div>
   <!-- name-input -->
   <div class="form-group">
     <label for="registry_name" class="col-sm-3 col-lg-2 control-label text-left">Name</label>
@@ -49,9 +47,7 @@
   <!-- !credentials-password -->
 
   <!-- 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/portainer/components/forms/registry-form-gitlab/gitlab-projects-datatable/gitlabProjectsDatatable.html b/app/portainer/components/forms/registry-form-gitlab/gitlab-projects-datatable/gitlabProjectsDatatable.html
index 918c195f8..9c1c28cb0 100644
--- a/app/portainer/components/forms/registry-form-gitlab/gitlab-projects-datatable/gitlabProjectsDatatable.html
+++ b/app/portainer/components/forms/registry-form-gitlab/gitlab-projects-datatable/gitlabProjectsDatatable.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>
@@ -73,9 +73,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/portainer/components/forms/registry-form-gitlab/registry-form-gitlab.html b/app/portainer/components/forms/registry-form-gitlab/registry-form-gitlab.html
index de276ffb4..820f84e80 100644
--- a/app/portainer/components/forms/registry-form-gitlab/registry-form-gitlab.html
+++ b/app/portainer/components/forms/registry-form-gitlab/registry-form-gitlab.html
@@ -1,7 +1,5 @@
 <form class="form-horizontal" name="registryFormGitlab" ng-submit="$ctrl.retrieveRegistries()">
-  <div class="col-sm-12 form-section-title">
-    Important notice
-  </div>
+  <div class="col-sm-12 form-section-title"> Important notice </div>
   <div class="form-group">
     <span class="col-sm-12 text-muted small">
       <p>
@@ -10,9 +8,7 @@
       </p>
     </span>
   </div>
-  <div class="col-sm-12 form-section-title">
-    Gitlab registry connection details
-  </div>
+  <div class="col-sm-12 form-section-title"> Gitlab registry connection details </div>
   <!-- credentials-user -->
   <div class="form-group">
     <label for="registry_username" class="col-sm-3 col-lg-2 control-label text-left">Username</label>
@@ -102,15 +98,11 @@
   </div>
 </form>
 <div class="form-horizontal" ng-if="$ctrl.projects">
-  <div class="col-sm-12 form-section-title">
-    Gitlab projects
-  </div>
+  <div class="col-sm-12 form-section-title"> Gitlab projects </div>
   <div class="form-group">
+    <span class="col-sm-12 text-muted small"> Select the project's registries you want to manage. Portainer will create one registry for each selected project. </span>
     <span class="col-sm-12 text-muted small">
-      Select the project's registries you want to manage. Portainer will create one registry for each selected project.
-    </span>
-    <span class="col-sm-12 text-muted small">
-      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
       If you can't select a project, make sure that registry feature is activated on it.
     </span>
   </div>
diff --git a/app/portainer/components/forms/registry-form-proget/registry-form-proget.html b/app/portainer/components/forms/registry-form-proget/registry-form-proget.html
index a8c25ac0d..f03e3284e 100644
--- a/app/portainer/components/forms/registry-form-proget/registry-form-proget.html
+++ b/app/portainer/components/forms/registry-form-proget/registry-form-proget.html
@@ -1,16 +1,12 @@
 <form class="form-horizontal" name="registryFormProGet" ng-submit="$ctrl.formAction()">
-  <div class="col-sm-12 form-section-title">
-    Important notice
-  </div>
+  <div class="col-sm-12 form-section-title"> Important notice </div>
   <div class="form-group">
     <div class="col-sm-12 text-muted small">
       Any Portainer user that has access to this registry will be able to use the Registry Manager features against the content of any Feed in the ProGet registry that the ProGet
       user has access to.
     </div>
   </div>
-  <div class="col-sm-12 form-section-title">
-    ProGet registry details
-  </div>
+  <div class="col-sm-12 form-section-title"> ProGet registry details </div>
   <!-- name-input -->
   <div class="form-group">
     <label for="registry_name" class="col-sm-3 col-lg-2 control-label text-left">Name</label>
@@ -95,9 +91,7 @@
     <!-- !credentials-password -->
   </div>
   <!-- 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/portainer/components/forms/registry-form-quay/registry-form-quay.html b/app/portainer/components/forms/registry-form-quay/registry-form-quay.html
index 28a7c1bc8..1ebd3cf2d 100644
--- a/app/portainer/components/forms/registry-form-quay/registry-form-quay.html
+++ b/app/portainer/components/forms/registry-form-quay/registry-form-quay.html
@@ -1,7 +1,5 @@
 <form class="form-horizontal" name="registryFormQuay" ng-submit="$ctrl.formAction()">
-  <div class="col-sm-12 form-section-title">
-    Quay account details
-  </div>
+  <div class="col-sm-12 form-section-title"> Quay account details </div>
   <!-- credentials-user -->
   <div class="form-group">
     <label for="registry_username" class="col-sm-3 col-lg-2 control-label text-left">Username</label>
@@ -36,10 +34,8 @@
   <!-- organisation-checkbox -->
   <div class="form-group">
     <div class="col-sm-12">
-      <label class="control-label text-left">
-        Use organisation registry
-      </label>
-      <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="$ctrl.model.Quay.useOrganisation" /><i></i> </label>
+      <label class="control-label text-left"> Use organisation registry </label>
+      <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="$ctrl.model.Quay.useOrganisation" /><i></i> </label>
     </div>
   </div>
   <!-- !organisation-checkbox -->
@@ -62,9 +58,7 @@
   </div>
 
   <!-- 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/portainer/components/forms/stack-from-template-form/stackFromTemplateForm.html b/app/portainer/components/forms/stack-from-template-form/stackFromTemplateForm.html
index 7a0bfcf51..2d3f263ae 100644
--- a/app/portainer/components/forms/stack-from-template-form/stackFromTemplateForm.html
+++ b/app/portainer/components/forms/stack-from-template-form/stackFromTemplateForm.html
@@ -5,9 +5,7 @@
       <form class="form-horizontal" name="stackTemplateForm">
         <!-- description -->
         <div ng-if="$ctrl.template.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.template.Note"></div>
@@ -15,9 +13,7 @@
           </div>
         </div>
         <!-- !description -->
-        <div class="col-sm-12 form-section-title">
-          Configuration
-        </div>
+        <div class="col-sm-12 form-section-title"> Configuration </div>
         <!-- name-input -->
         <div class="form-group">
           <label for="template_name" class="col-sm-2 control-label text-left">Name</label>
@@ -57,9 +53,7 @@
         <por-access-control-form form-data="$ctrl.formValues.AccessControlData"></por-access-control-form>
         <!-- !access-control -->
         <!-- 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
@@ -73,8 +67,8 @@
               <span ng-show="$ctrl.state.actionInProgress">Deployment in progress...</span>
             </button>
             <button type="button" class="btn btn-sm btn-default" ng-click="$ctrl.unselectTemplate($ctrl.template)">Hide</button>
-            <div class="cols-sm-12 small text-danger" ng-if="$ctrl.state.formValidationError" style="margin-left: 5px; margin-top: 5px;">{{ $ctrl.state.formValidationError }}</div>
-            <div class="cols-sm-12 small text-danger" ng-if="!$ctrl.state.deployable" style="margin-left: 5px; margin-top: 5px;"
+            <div class="cols-sm-12 small text-danger" ng-if="$ctrl.state.formValidationError" style="margin-left: 5px; margin-top: 5px">{{ $ctrl.state.formValidationError }}</div>
+            <div class="cols-sm-12 small text-danger" ng-if="!$ctrl.state.deployable" style="margin-left: 5px; margin-top: 5px"
               >This template type cannot be deployed on this environment.</div
             >
           </div>
diff --git a/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.html b/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.html
index 88260ad0a..7d0f80933 100644
--- a/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.html
+++ b/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.html
@@ -1,7 +1,5 @@
 <form name="$ctrl.redeployGitForm" class="form-horizontal my-8">
-  <div class="col-sm-12 form-section-title">
-    Redeploy from git repository
-  </div>
+  <div class="col-sm-12 form-section-title"> Redeploy from git repository </div>
   <git-form-info-panel
     class-name="text-muted small"
     url="$ctrl.model.URL"
@@ -39,7 +37,7 @@
     class="btn btn-sm btn-primary"
     ng-click="$ctrl.submit()"
     ng-disabled="$ctrl.isSubmitButtonDisabled() || $ctrl.state.hasUnsavedChanges || !$ctrl.redeployGitForm.$valid"
-    style="margin-top: 7px; margin-left: 0;"
+    style="margin-top: 7px; margin-left: 0"
     button-spinner="$ctrl.state.redeployInProgress"
     analytics-on
     analytics-event="docker-stack-pull-redeploy"
@@ -53,7 +51,7 @@
     class="btn btn-sm btn-primary"
     ng-click="$ctrl.saveGitSettings()"
     ng-disabled="$ctrl.isSubmitButtonDisabled() || !$ctrl.state.hasUnsavedChanges || !$ctrl.redeployGitForm.$valid"
-    style="margin-top: 7px; margin-left: 0;"
+    style="margin-top: 7px; margin-left: 0"
     button-spinner="$ctrl.state.inProgress"
     analytics-on
     analytics-event="docker-stack-update-git-settings"
diff --git a/app/portainer/components/group-association-table/groupAssociationTable.html b/app/portainer/components/group-association-table/groupAssociationTable.html
index 6f3f0a299..d31399412 100644
--- a/app/portainer/components/group-association-table/groupAssociationTable.html
+++ b/app/portainer/components/group-association-table/groupAssociationTable.html
@@ -13,15 +13,9 @@
     </div>
     <thead>
       <tr>
-        <th>
-          Name
-        </th>
-        <th ng-if="$ctrl.showGroups">
-          Group
-        </th>
-        <th ng-if="$ctrl.showTags">
-          Tags
-        </th>
+        <th> Name </th>
+        <th ng-if="$ctrl.showGroups"> Group </th>
+        <th ng-if="$ctrl.showTags"> Tags </th>
       </tr>
     </thead>
     <tbody>
@@ -73,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 ng-model="$ctrl.paginationState.limit" ng-change="$ctrl.onPaginationLimitChanged()">
             <option value="10">10</option>
             <option value="25">25</option>
diff --git a/app/portainer/components/information-panel-offline/informationPanelOffline.html b/app/portainer/components/information-panel-offline/informationPanelOffline.html
index bcd5bfc51..592aff205 100644
--- a/app/portainer/components/information-panel-offline/informationPanelOffline.html
+++ b/app/portainer/components/information-panel-offline/informationPanelOffline.html
@@ -1,11 +1,11 @@
 <information-panel title-text="Offline mode" cant-dismiss="true">
   <span class="small">
     <p class="text-muted">
-      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
       This environment is currently offline (read-only). Data shown is based on the latest available snapshot.
     </p>
     <p class="text-muted">
-      <i class="fa fa-clock" aria-hidden="true" style="margin-right: 2px;"></i>
+      <i class="fa fa-clock" aria-hidden="true" style="margin-right: 2px"></i>
       Last snapshot: {{ $ctrl.snapshotTime | getisodatefromtimestamp }}
     </p>
     <button type="button" class="btn btn-xs btn-primary" ng-click="$ctrl.triggerSnapshot()" ng-if="$ctrl.showRefreshButton">
diff --git a/app/portainer/components/information-panel/informationPanel.html b/app/portainer/components/information-panel/informationPanel.html
index c67863b7e..92cef0ad3 100644
--- a/app/portainer/components/information-panel/informationPanel.html
+++ b/app/portainer/components/information-panel/informationPanel.html
@@ -3,10 +3,10 @@
     <rd-widget>
       <rd-widget-body>
         <div class="col-sm-12 form-section-title">
-          <span style="float: left;">
+          <span style="float: left">
             {{ $ctrl.titleText }}
           </span>
-          <span class="small" style="float: right;" ng-if="$ctrl.dismissAction">
+          <span class="small" style="float: right" ng-if="$ctrl.dismissAction">
             <a ng-click="$ctrl.dismissAction()"><i class="fa fa-times"></i> dismiss</a>
           </span>
         </div>
diff --git a/app/portainer/components/motd-panel/motdPanel.html b/app/portainer/components/motd-panel/motdPanel.html
index 0f5e7737c..043eff1e7 100644
--- a/app/portainer/components/motd-panel/motdPanel.html
+++ b/app/portainer/components/motd-panel/motdPanel.html
@@ -7,10 +7,10 @@
         </style>
         <div ng-style="{{ $ctrl.motd.ContentLayout ? $ctrl.motd.ContentLayout : {} }}">
           <div class="col-sm-12 form-section-title">
-            <span style="float: left;">
+            <span style="float: left">
               {{ $ctrl.motd.Title }}
             </span>
-            <span class="small" style="float: right;" ng-if="$ctrl.dismissAction">
+            <span class="small" style="float: right" ng-if="$ctrl.dismissAction">
               <a ng-click="$ctrl.dismissAction()"><i class="fa fa-times"></i> dismiss</a>
             </span>
           </div>
diff --git a/app/portainer/components/product-list/productList.html b/app/portainer/components/product-list/productList.html
index efb3d772a..feba466cf 100644
--- a/app/portainer/components/product-list/productList.html
+++ b/app/portainer/components/product-list/productList.html
@@ -2,7 +2,7 @@
   <rd-widget>
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
-        <div class="toolBarTitle"> <i class="fa fa-bolt" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }} </div>
+        <div class="toolBarTitle"> <i class="fa fa-bolt" aria-hidden="true" style="margin-right: 2px"></i> {{ $ctrl.titleText }} </div>
       </div>
 
       <div class="blocklist">
diff --git a/app/portainer/components/stack-duplication-form/stack-duplication-form.html b/app/portainer/components/stack-duplication-form/stack-duplication-form.html
index 7f6c65331..bcce3d68a 100644
--- a/app/portainer/components/stack-duplication-form/stack-duplication-form.html
+++ b/app/portainer/components/stack-duplication-form/stack-duplication-form.html
@@ -1,15 +1,11 @@
 <div authorization="PortainerStackMigrate">
-  <div class="col-sm-12 form-section-title">
-    Stack duplication / migration
-  </div>
+  <div class="col-sm-12 form-section-title"> Stack duplication / migration </div>
   <rd-widget>
     <rd-widget-body>
       <form class="form-horizontal" name="dupStackForm">
         <div class="form-group">
-          <span class="small" style="margin-top: 10px;">
-            <p class="text-muted">
-              This feature allows you to duplicate or migrate this stack.
-            </p>
+          <span class="small" style="margin-top: 10px">
+            <p class="text-muted"> This feature allows you to duplicate or migrate this stack. </p>
           </span>
         </div>
 
@@ -43,7 +39,7 @@
             class="btn btn-sm btn-primary"
             ng-click="$ctrl.migrateStack()"
             ng-disabled="$ctrl.isMigrationButtonDisabled()"
-            style="margin-top: 7px; margin-left: 0;"
+            style="margin-top: 7px; margin-left: 0"
             button-spinner="$ctrl.state.migrationInProgress"
           >
             <span ng-hide="$ctrl.state.migrationInProgress"> <i class="fa fa-long-arrow-alt-right space-right" aria-hidden="true"></i> Migrate </span>
@@ -53,7 +49,7 @@
             class="btn btn-sm btn-primary"
             ng-click="$ctrl.duplicateStack()"
             ng-disabled="!$ctrl.isFormValidForDuplication() || $ctrl.state.duplicationInProgress || $ctrl.state.migrationInProgress"
-            style="margin-top: 7px; margin-left: 0;"
+            style="margin-top: 7px; margin-left: 0"
             button-spinner="$ctrl.state.duplicationInProgress"
           >
             <span ng-hide="$ctrl.state.duplicationInProgress"> <i class="fa fa-clone space-right" aria-hidden="true"></i> Duplicate </span>
diff --git a/app/portainer/components/tag-selector/tagSelector.html b/app/portainer/components/tag-selector/tagSelector.html
index 3d1667427..03c495c4a 100644
--- a/app/portainer/components/tag-selector/tagSelector.html
+++ b/app/portainer/components/tag-selector/tagSelector.html
@@ -1,20 +1,16 @@
-<div ng-show="$ctrl.model.length > 0" class="col-sm-12" style="padding: 0; margin-bottom: 15px;">
-  <label class="col-sm-3 col-lg-2 control-label text-left">
-    Selected tags
-  </label>
-  <div class="col-sm-9 col-lg-10" style="padding-top: 4px;">
+<div ng-show="$ctrl.model.length > 0" class="col-sm-12" style="padding: 0; margin-bottom: 15px">
+  <label class="col-sm-3 col-lg-2 control-label text-left"> Selected tags </label>
+  <div class="col-sm-9 col-lg-10" style="padding-top: 4px">
     <span class="tag space-right interactive" ng-repeat="tag in $ctrl.state.selectedTags" ng-click="$ctrl.removeTag(tag)">
       {{ tag.Name }}
-      <a title="Remove tag" ng-click="$ctrl.removeTag(tag)" style="margin-left: 2px;">
+      <a title="Remove tag" ng-click="$ctrl.removeTag(tag)" style="margin-left: 2px">
         <span class="fa fa-trash-alt white-icon" aria-hidden="true"></span>
       </a>
     </span>
   </div>
 </div>
-<div class="col-sm-12" style="padding: 0;">
-  <label for="tags" class="col-sm-3 col-lg-2 control-label text-left">
-    Tags
-  </label>
+<div class="col-sm-12" style="padding: 0">
+  <label for="tags" class="col-sm-3 col-lg-2 control-label text-left"> Tags </label>
   <div class="col-sm-9 col-lg-10" id="scrollable-dropdown-menu" ng-if="$ctrl.allowCreate || $ctrl.tags.length > 0">
     <input
       type="text"
@@ -31,13 +27,9 @@
     />
   </div>
   <div class="col-sm-9 col-lg-10" ng-if="!$ctrl.allowCreate && $ctrl.tags.length === 0">
-    <span class="small text-muted">
-      No tags available.
-    </span>
+    <span class="small text-muted"> No tags available. </span>
   </div>
 </div>
-<div class="col-sm-offset-3 col-lg-offset-2 col-sm-12" ng-if="!$ctrl.allowCreate && $ctrl.state.noResult" style="margin-top: 2px;">
-  <span class="small text-muted">
-    No tags matching your filter.
-  </span>
+<div class="col-sm-offset-3 col-lg-offset-2 col-sm-12" ng-if="!$ctrl.allowCreate && $ctrl.state.noResult" style="margin-top: 2px">
+  <span class="small text-muted"> No tags matching your filter. </span>
 </div>
diff --git a/app/portainer/components/template-list/templateList.html b/app/portainer/components/template-list/templateList.html
index d516651d5..30f91c787 100644
--- a/app/portainer/components/template-list/templateList.html
+++ b/app/portainer/components/template-list/templateList.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">
@@ -10,7 +10,7 @@
           <button type="button" class="btn btn-sm btn-primary" ui-sref="docker.templates.new" ng-if="$ctrl.showAddAction">
             <i class="fa fa-plus space-right" aria-hidden="true"></i>Add template
           </button>
-          <span ng-class="{ 'pull-right': $ctrl.showAddAction }" style="width: 25%;">
+          <span ng-class="{ 'pull-right': $ctrl.showAddAction }" style="width: 25%">
             <ui-select ng-model="$ctrl.state.selectedCategory">
               <ui-select-match placeholder="Select a category" allow-clear="true">
                 <span>{{ $select.selected }}</span>
@@ -22,11 +22,9 @@
           </span>
         </div>
 
-        <div class="small text-muted" style="margin: 15px 0 0 5px;">
-          <label for="show_stacks" class="control-label text-left">
-            Show container templates
-          </label>
-          <label class="switch" style="margin-left: 20px;">
+        <div class="small text-muted" style="margin: 15px 0 0 5px">
+          <label for="show_stacks" class="control-label text-left"> Show container templates </label>
+          <label class="switch" style="margin-left: 20px">
             <input type="checkbox" name="show_stacks" ng-model="$ctrl.state.showContainerTemplates" ng-change="$ctrl.updateCategories()" /><i></i>
           </label>
         </div>
@@ -53,14 +51,10 @@
           on-select="($ctrl.selectAction)"
         >
           <template-item-actions ng-if="template.Type === 2 || template.Type === 3">
-            <button ng-click="$event.stopPropagation(); $ctrl.duplicateTemplate(template)" class="btn btn-primary btn-xs">
-              Copy as Custom
-            </button>
+            <button ng-click="$event.stopPropagation(); $ctrl.duplicateTemplate(template)" class="btn btn-primary btn-xs"> Copy as Custom </button>
           </template-item-actions>
         </template-item>
-        <div ng-if="!$ctrl.templates" class="text-center text-muted">
-          Loading...
-        </div>
+        <div ng-if="!$ctrl.templates" class="text-center text-muted"> Loading... </div>
         <div ng-if="($ctrl.templates | filter: $ctrl.filterByType | filter: $ctrl.filterByCategory | filter: $ctrl.state.textFilter).length === 0" class="text-center text-muted">
           No templates available.
         </div>
diff --git a/app/portainer/components/theme/theme-settings.html b/app/portainer/components/theme/theme-settings.html
index 45a47b42d..433c45007 100644
--- a/app/portainer/components/theme/theme-settings.html
+++ b/app/portainer/components/theme/theme-settings.html
@@ -1,7 +1,7 @@
 <information-panel class="theme-information" title-text="Information">
   <span class="small text-muted">
     <p>
-      <i class="fa fa-flask orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+      <i class="fa fa-flask orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
       Dark and High-contrast theme are experimental. Some UI components might not display properly.
     </p>
   </span>
diff --git a/app/portainer/oauth/components/oauth-providers-selector/oauth-providers-selector.html b/app/portainer/oauth/components/oauth-providers-selector/oauth-providers-selector.html
index ea141d0df..158a10259 100644
--- a/app/portainer/oauth/components/oauth-providers-selector/oauth-providers-selector.html
+++ b/app/portainer/oauth/components/oauth-providers-selector/oauth-providers-selector.html
@@ -1,5 +1,3 @@
-<div class="col-sm-12 form-section-title">
-  Provider
-</div>
+<div class="col-sm-12 form-section-title"> Provider </div>
 
 <box-selector value="$ctrl.value" options="$ctrl.options" on-change="($ctrl.onChange)" radio-name="'oauth_provider'"></box-selector>
diff --git a/app/portainer/rbac/components/access-viewer/access-viewer-datatable/access-viewer-datatable.html b/app/portainer/rbac/components/access-viewer/access-viewer-datatable/access-viewer-datatable.html
index 4492e6d93..81471b928 100644
--- a/app/portainer/rbac/components/access-viewer/access-viewer-datatable/access-viewer-datatable.html
+++ b/app/portainer/rbac/components/access-viewer/access-viewer-datatable/access-viewer-datatable.html
@@ -34,10 +34,10 @@
             >{{ item.TeamName ? 'Team' : 'User' }} <code ng-if="item.TeamName">{{ item.TeamName }}</code> access defined on {{ item.AccessLocation }}
             <code ng-if="item.GroupName">{{ item.GroupName }}</code>
             <a ng-if="!item.GroupName" ui-sref="portainer.endpoints.endpoint.access({id: item.EndpointId})"
-              ><i style="margin-left: 5px;" class="fa fa-users" aria-hidden="true"></i> Manage access
+              ><i style="margin-left: 5px" class="fa fa-users" aria-hidden="true"></i> Manage access
             </a>
             <a ng-if="item.GroupName" ui-sref="portainer.groups.group.access({id: item.GroupId})"
-              ><i style="margin-left: 5px;" class="fa fa-users" aria-hidden="true"></i> Manage access
+              ><i style="margin-left: 5px" class="fa fa-users" aria-hidden="true"></i> Manage access
             </a>
           </td>
         </tr>
@@ -55,9 +55,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()">
             <option value="0">All</option>
             <option value="10">10</option>
diff --git a/app/portainer/rbac/components/access-viewer/access-viewer.html b/app/portainer/rbac/components/access-viewer/access-viewer.html
index 1f42912d1..40c62c427 100644
--- a/app/portainer/rbac/components/access-viewer/access-viewer.html
+++ b/app/portainer/rbac/components/access-viewer/access-viewer.html
@@ -1,4 +1,4 @@
-<div class="col-sm-12" style="margin-bottom: 0px;">
+<div class="col-sm-12" style="margin-bottom: 0px">
   <rd-widget>
     <rd-widget-header icon="fa-user-lock">
       <header-title>
@@ -8,14 +8,10 @@
     </rd-widget-header>
     <rd-widget-body>
       <form class="form-horizontal">
-        <div class="col-sm-12 form-section-title">
-          User
-        </div>
+        <div class="col-sm-12 form-section-title"> User </div>
         <div class="form-group">
           <div class="col-sm-12">
-            <span class="small text-muted" ng-if="$ctrl.users.length === 0">
-              No user available
-            </span>
+            <span class="small text-muted" ng-if="$ctrl.users.length === 0"> No user available </span>
             <ui-select ng-if="$ctrl.users.length > 0" ng-model="$ctrl.selectedUser" ng-change="$ctrl.onUserSelect()">
               <ui-select-match placeholder="Select a user">
                 <span>{{ $select.selected.Username }}</span>
@@ -27,11 +23,9 @@
           </div>
         </div>
 
-        <div class="col-sm-12 form-section-title">
-          Access
-        </div>
+        <div class="col-sm-12 form-section-title"> Access </div>
         <div>
-          <div class="small text-muted" style="margin-bottom: 15px;">
+          <div class="small text-muted" style="margin-bottom: 15px">
             <i class="fa fa-info-circle blue-icon space-right" aria-hidden="true"></i>
             Effective role for each environment will be displayed for the selected user
           </div>
diff --git a/app/portainer/rbac/components/roles-datatable/roles-datatable.html b/app/portainer/rbac/components/roles-datatable/roles-datatable.html
index 59c7e4003..73399ade4 100644
--- a/app/portainer/rbac/components/roles-datatable/roles-datatable.html
+++ b/app/portainer/rbac/components/roles-datatable/roles-datatable.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>
@@ -65,9 +65,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()">
                 <option value="0">All</option>
                 <option value="10">10</option>
diff --git a/app/portainer/settings/authentication/auto-user-provision-toggle/auto-user-provision-toggle.html b/app/portainer/settings/authentication/auto-user-provision-toggle/auto-user-provision-toggle.html
index aac43263a..631690005 100644
--- a/app/portainer/settings/authentication/auto-user-provision-toggle/auto-user-provision-toggle.html
+++ b/app/portainer/settings/authentication/auto-user-provision-toggle/auto-user-provision-toggle.html
@@ -1,14 +1,10 @@
-<div class="col-sm-12 form-section-title">
-  Automatic user provisioning
-</div>
+<div class="col-sm-12 form-section-title"> Automatic user provisioning </div>
 <div class="form-group">
   <span class="col-sm-12 text-muted small" ng-transclude="description"> </span>
 </div>
 <div class="form-group">
   <div class="col-sm-12">
-    <label for="tls" class="control-label text-left">
-      Automatic user provisioning
-    </label>
-    <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="$ctrl.ngModel" /><i></i> </label>
+    <label for="tls" class="control-label text-left"> Automatic user provisioning </label>
+    <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="$ctrl.ngModel" /><i></i> </label>
   </div>
 </div>
diff --git a/app/portainer/settings/authentication/internal-auth/internal-auth.html b/app/portainer/settings/authentication/internal-auth/internal-auth.html
index b54ee2fb1..27332b21c 100644
--- a/app/portainer/settings/authentication/internal-auth/internal-auth.html
+++ b/app/portainer/settings/authentication/internal-auth/internal-auth.html
@@ -1,8 +1,4 @@
-<div class="col-sm-12 form-section-title">
-  Information
-</div>
-<div class="form-group col-sm-12 text-muted small">
-  When using internal authentication, Portainer will encrypt user passwords and store credentials locally.
-</div>
+<div class="col-sm-12 form-section-title"> Information </div>
+<div class="form-group col-sm-12 text-muted small"> When using internal authentication, Portainer will encrypt user passwords and store credentials locally. </div>
 
 <save-auth-settings-button on-save-settings="($ctrl.onSaveSettings)" save-button-state="($ctrl.saveButtonState)"></save-auth-settings-button>
diff --git a/app/portainer/settings/authentication/ldap/ad-settings/ad-settings.html b/app/portainer/settings/authentication/ldap/ad-settings/ad-settings.html
index 48bf2c375..4da78df05 100644
--- a/app/portainer/settings/authentication/ldap/ad-settings/ad-settings.html
+++ b/app/portainer/settings/authentication/ldap/ad-settings/ad-settings.html
@@ -9,23 +9,19 @@
   </auto-user-provision-toggle>
 
   <div>
-    <div class="col-sm-12 form-section-title">
-      Information
-    </div>
+    <div class="col-sm-12 form-section-title"> Information </div>
     <div class="form-group col-sm-12 text-muted small">
       When using Microsoft AD authentication, Portainer will delegate user authentication to the Domain Controller(s) configured below; if there is no connectivity, Portainer will
       fallback to internal authentication.
     </div>
   </div>
 
-  <div class="col-sm-12 form-section-title">
-    AD configuration
-  </div>
+  <div class="col-sm-12 form-section-title"> AD configuration </div>
 
   <div class="form-group">
     <div class="col-sm-12 small text-muted">
       <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>
         You can configure multiple AD Controllers for authentication fallback. Make sure all servers are using the same configuration (i.e. if TLS is enabled, they should all use
         the same certificates).
       </p>
@@ -33,12 +29,12 @@
   </div>
 
   <div class="form-group">
-    <label for="ldap_url" class="col-sm-3 col-lg-2 control-label text-left" style="display: flex; flex-wrap: wrap;">
+    <label for="ldap_url" class="col-sm-3 col-lg-2 control-label text-left" style="display: flex; flex-wrap: wrap">
       AD Controller
       <button
         type="button"
         class="label label-default interactive"
-        style="border: 0;"
+        style="border: 0"
         ng-click="$ctrl.addLDAPUrl()"
         limited-feature-dir="{{::$ctrl.limitedFeatureId}}"
         limited-feature-tabindex="-1"
@@ -47,7 +43,7 @@
       </button>
     </label>
     <div class="col-sm-9 col-lg-10">
-      <div ng-repeat="url in $ctrl.settings.URLs track by $index" style="display: flex; margin-bottom: 10px;">
+      <div ng-repeat="url in $ctrl.settings.URLs track by $index" style="display: flex; margin-bottom: 10px">
         <input
           type="text"
           class="form-control"
@@ -135,7 +131,7 @@
   ></ldap-connectivity-check>
 
   <ldap-user-search
-    style="margin-top: 5px;"
+    style="margin-top: 5px"
     show-username-format="true"
     settings="$ctrl.settings.SearchSettings"
     domain-suffix="{{ $ctrl.domainSuffix }}"
@@ -145,7 +141,7 @@
   ></ldap-user-search>
 
   <ldap-group-search
-    style="margin-top: 5px;"
+    style="margin-top: 5px"
     settings="$ctrl.settings.GroupSearchSettings"
     domain-suffix="{{ $ctrl.domainSuffix }}"
     base-filter="(objectClass=group)"
@@ -154,7 +150,7 @@
   ></ldap-group-search>
 
   <ldap-custom-admin-group
-    style="margin-top: 5px;"
+    style="margin-top: 5px"
     settings="$ctrl.settings"
     on-search-click="($ctrl.onSearchAdminGroupsClick)"
     selected-admin-groups="$ctrl.selectedAdminGroups"
diff --git a/app/portainer/settings/authentication/ldap/ldap-custom-admin-group/ldap-custom-admin-group.html b/app/portainer/settings/authentication/ldap/ldap-custom-admin-group/ldap-custom-admin-group.html
index 3f3d9fc65..fed13d4c9 100644
--- a/app/portainer/settings/authentication/ldap/ldap-custom-admin-group/ldap-custom-admin-group.html
+++ b/app/portainer/settings/authentication/ldap/ldap-custom-admin-group/ldap-custom-admin-group.html
@@ -5,9 +5,7 @@
 <rd-widget ng-repeat="config in $ctrl.settings.AdminGroupSearchSettings | limitTo: (1 - $ctrl.settings.AdminGroupSearchSettings)">
   <rd-widget-body>
     <div class="form-group m-b-10" ng-if="$index > 0">
-      <span class="col-sm-12 text-muted small">
-        Extra search configuration
-      </span>
+      <span class="col-sm-12 text-muted small"> Extra search configuration </span>
     </div>
 
     <div class="form-group">
@@ -104,9 +102,7 @@
 
 <div class="form-group">
   <div class="col-sm-12">
-    <label for="admin-auto-populate" class="control-label text-left text-muted" ng-class="{ 'text-muted': !$ctrl.enableAssignAdminGroup }">
-      Assign admin rights to group(s)
-    </label>
+    <label for="admin-auto-populate" class="control-label text-left text-muted" ng-class="{ 'text-muted': !$ctrl.enableAssignAdminGroup }"> Assign admin rights to group(s) </label>
     <label class="switch m-l-20" ng-class="{ 'business limited': $ctrl.isLimitedFeatureSelfContained }">
       <input id="admin-auto-populate" ng-disabled="!$ctrl.enableAssignAdminGroup" name="admin-auto-populate" type="checkbox" ng-model="$ctrl.settings.AdminAutoPopulate" /><i></i>
     </label>
@@ -115,9 +111,7 @@
 
 <div class="form-group" ng-if="$ctrl.settings.AdminAutoPopulate">
   <div class="col-sm-12">
-    <label for="group-access" class="control-label text-left">
-      Select Group(s)
-    </label>
+    <label for="group-access" class="control-label text-left"> Select Group(s) </label>
     <span
       class="m-l-20"
       isteven-multi-select
diff --git a/app/portainer/settings/authentication/ldap/ldap-custom-group-search/ldap-custom-group-search.html b/app/portainer/settings/authentication/ldap/ldap-custom-group-search/ldap-custom-group-search.html
index 7ae2ff302..d1ca79dd7 100644
--- a/app/portainer/settings/authentication/ldap/ldap-custom-group-search/ldap-custom-group-search.html
+++ b/app/portainer/settings/authentication/ldap/ldap-custom-group-search/ldap-custom-group-search.html
@@ -1,13 +1,9 @@
-<div class="col-sm-12 form-section-title" style="float: initial;">
-  Group search configurations
-</div>
+<div class="col-sm-12 form-section-title" style="float: initial"> Group search configurations </div>
 
-<rd-widget ng-repeat="config in $ctrl.settings | limitTo: (1 - $ctrl.settings)" style="display: block; margin-bottom: 10px;">
+<rd-widget ng-repeat="config in $ctrl.settings | limitTo: (1 - $ctrl.settings)" style="display: block; margin-bottom: 10px">
   <rd-widget-body>
-    <div class="form-group" ng-if="$index > 0" style="margin-bottom: 10px;">
-      <span class="col-sm-12 text-muted small">
-        Extra search configuration
-      </span>
+    <div class="form-group" ng-if="$index > 0" style="margin-bottom: 10px">
+      <span class="col-sm-12 text-muted small"> Extra search configuration </span>
     </div>
 
     <div class="form-group">
@@ -44,13 +40,13 @@
   </rd-widget-body>
 </rd-widget>
 
-<div class="form-group" style="margin-top: 10px;">
+<div class="form-group" style="margin-top: 10px">
   <div class="col-sm-12">
-    <button class="label label-default interactive" style="border: 0;" ng-click="$ctrl.onAddClick()">
+    <button class="label label-default interactive" style="border: 0" ng-click="$ctrl.onAddClick()">
       <i class="fa fa-plus-circle" aria-hidden="true"></i> add group search configuration
     </button>
   </div>
-  <div class="col-sm-12" style="margin-top: 10px;">
+  <div class="col-sm-12" style="margin-top: 10px">
     <button
       class="btn btm-sm btn-primary"
       type="button"
diff --git a/app/portainer/settings/authentication/ldap/ldap-custom-user-search/ldap-custom-user-search.html b/app/portainer/settings/authentication/ldap/ldap-custom-user-search/ldap-custom-user-search.html
index fe41906ca..489a9a02d 100644
--- a/app/portainer/settings/authentication/ldap/ldap-custom-user-search/ldap-custom-user-search.html
+++ b/app/portainer/settings/authentication/ldap/ldap-custom-user-search/ldap-custom-user-search.html
@@ -1,13 +1,9 @@
-<div class="col-sm-12 form-section-title" style="float: initial;">
-  User search configurations
-</div>
+<div class="col-sm-12 form-section-title" style="float: initial"> User search configurations </div>
 
-<rd-widget ng-repeat="config in $ctrl.settings | limitTo: (1 - $ctrl.settings)" style="display: block; margin-bottom: 10px;">
+<rd-widget ng-repeat="config in $ctrl.settings | limitTo: (1 - $ctrl.settings)" style="display: block; margin-bottom: 10px">
   <rd-widget-body>
-    <div class="form-group" ng-if="$index > 0" style="margin-bottom: 10px;">
-      <span class="col-sm-12 text-muted small">
-        Extra search configuration
-      </span>
+    <div class="form-group" ng-if="$index > 0" style="margin-bottom: 10px">
+      <span class="col-sm-12 text-muted small"> Extra search configuration </span>
     </div>
 
     <div class="form-group">
@@ -44,13 +40,13 @@
   </rd-widget-body>
 </rd-widget>
 
-<div class="form-group" style="margin-top: 10px;">
+<div class="form-group" style="margin-top: 10px">
   <div class="col-sm-12">
-    <button class="label label-default interactive" style="border: 0;" ng-click="$ctrl.onAddClick()">
+    <button class="label label-default interactive" style="border: 0" ng-click="$ctrl.onAddClick()">
       <i class="fa fa-plus-circle" aria-hidden="true"></i> add user search configuration
     </button>
   </div>
-  <div class="col-sm-12" style="margin-top: 10px;">
+  <div class="col-sm-12" style="margin-top: 10px">
     <button
       class="btn btm-sm btn-primary"
       type="button"
diff --git a/app/portainer/settings/authentication/ldap/ldap-group-search-item/ldap-group-search-item.html b/app/portainer/settings/authentication/ldap/ldap-group-search-item/ldap-group-search-item.html
index cb3791e28..9903406da 100644
--- a/app/portainer/settings/authentication/ldap/ldap-group-search-item/ldap-group-search-item.html
+++ b/app/portainer/settings/authentication/ldap/ldap-group-search-item/ldap-group-search-item.html
@@ -1,9 +1,7 @@
 <rd-widget>
   <rd-widget-body>
-    <div ng-if="$ctrl.index > 0" style="margin-bottom: 10px;">
-      <span class="text-muted small">
-        Extra search configuration
-      </span>
+    <div ng-if="$ctrl.index > 0" style="margin-bottom: 10px">
+      <span class="text-muted small"> Extra search configuration </span>
       <button
         class="btn btn-sm btn-danger"
         type="button"
@@ -24,18 +22,16 @@
     ></ldap-settings-dn-builder>
 
     <div class="form-group">
-      <label class="col-sm-4 col-md-2 control-label text-left">
-        Group Base DN
-      </label>
+      <label class="col-sm-4 col-md-2 control-label text-left"> Group Base DN </label>
       <div class="col-sm-8 col-md-10">
         {{ $ctrl.config.GroupBaseDN }}
       </div>
     </div>
 
     <div class="form-group">
-      <div class="col-sm-12" style="margin-bottom: 5px;">
+      <div class="col-sm-12" style="margin-bottom: 5px">
         <label class="control-label text-left">Groups</label>
-        <span class="label label-default interactive" style="margin-left: 10px;" ng-click="$ctrl.addGroup()">
+        <span class="label label-default interactive" style="margin-left: 10px" ng-click="$ctrl.addGroup()">
           <i class="fa fa-plus-circle" aria-hidden="true"></i> add another group
         </span>
       </div>
@@ -82,9 +78,7 @@
     </div>
 
     <div class="form-group no-margin-last-child">
-      <label class="col-sm-4 col-md-2 control-label text-left">
-        Group Filter
-      </label>
+      <label class="col-sm-4 col-md-2 control-label text-left"> Group Filter </label>
       <div class="col-sm-8 col-md-10">
         {{ $ctrl.config.GroupFilter }}
       </div>
diff --git a/app/portainer/settings/authentication/ldap/ldap-group-search/ldap-group-search.html b/app/portainer/settings/authentication/ldap/ldap-group-search/ldap-group-search.html
index 7b50f27e0..6df82d984 100644
--- a/app/portainer/settings/authentication/ldap/ldap-group-search/ldap-group-search.html
+++ b/app/portainer/settings/authentication/ldap/ldap-group-search/ldap-group-search.html
@@ -1,8 +1,6 @@
-<div class="col-sm-12 form-section-title" style="float: initial;">
-  Group search configurations
-</div>
+<div class="col-sm-12 form-section-title" style="float: initial"> Group search configurations </div>
 
-<div style="margin-top: 10px;" ng-repeat="config in $ctrl.settings | limitTo: (1 - $ctrl.settings)">
+<div style="margin-top: 10px" ng-repeat="config in $ctrl.settings | limitTo: (1 - $ctrl.settings)">
   <ldap-group-search-item
     config="config"
     domain-suffix="{{ $ctrl.domainSuffix }}"
@@ -13,11 +11,11 @@
   ></ldap-group-search-item>
 </div>
 
-<div class="form-group" style="margin-top: 10px;">
+<div class="form-group" style="margin-top: 10px">
   <div class="col-sm-12">
     <button
       class="label label-default interactive"
-      style="border: 0;"
+      style="border: 0"
       ng-click="$ctrl.onAddClick()"
       limited-feature-dir="{{::$ctrl.limitedFeatureId}}"
       limited-feature-tabindex="-1"
@@ -25,7 +23,7 @@
       <i class="fa fa-plus-circle" aria-hidden="true"></i> add group search configuration
     </button>
   </div>
-  <div class="col-sm-12" style="margin-top: 10px;">
+  <div class="col-sm-12" style="margin-top: 10px">
     <button class="btn btm-sm btn-primary" type="button" ng-click="$ctrl.search()" limited-feature-dir="{{::$ctrl.limitedFeatureId}}" limited-feature-tabindex="-1">
       Display User/Group matching
     </button>
diff --git a/app/portainer/settings/authentication/ldap/ldap-groups-datatable/ldap-groups-datatable.html b/app/portainer/settings/authentication/ldap/ldap-groups-datatable/ldap-groups-datatable.html
index 061448f70..ab2d0e9b0 100644
--- a/app/portainer/settings/authentication/ldap/ldap-groups-datatable/ldap-groups-datatable.html
+++ b/app/portainer/settings/authentication/ldap/ldap-groups-datatable/ldap-groups-datatable.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>
@@ -27,9 +27,7 @@
                   <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Name' && $ctrl.state.reverseOrder"></i>
                 </a>
               </th>
-              <th>
-                Groups
-              </th>
+              <th> Groups </th>
             </tr>
           </thead>
           <tbody>
@@ -41,7 +39,7 @@
                 {{ item.Name }}
               </td>
               <td>
-                <p ng-repeat="group in item.Groups" style="margin: 0;">{{ group }}</p>
+                <p ng-repeat="group in item.Groups" style="margin: 0">{{ group }}</p>
               </td>
             </tr>
             <tr ng-if="!$ctrl.dataset">
@@ -57,9 +55,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()">
                 <option value="0">All</option>
                 <option value="10">10</option>
diff --git a/app/portainer/settings/authentication/ldap/ldap-settings-custom/ldap-settings-custom.html b/app/portainer/settings/authentication/ldap/ldap-settings-custom/ldap-settings-custom.html
index f287132fa..15e2055d9 100644
--- a/app/portainer/settings/authentication/ldap/ldap-settings-custom/ldap-settings-custom.html
+++ b/app/portainer/settings/authentication/ldap/ldap-settings-custom/ldap-settings-custom.html
@@ -1,15 +1,11 @@
 <div>
-  <div class="col-sm-12 form-section-title">
-    Information
-  </div>
+  <div class="col-sm-12 form-section-title"> Information </div>
   <div class="form-group col-sm-12 text-muted small">
     When using LDAP authentication, Portainer will delegate user authentication to a LDAP server and fallback to internal authentication if LDAP authentication fails.
   </div>
 </div>
 
-<div class="col-sm-12 form-section-title">
-  LDAP configuration
-</div>
+<div class="col-sm-12 form-section-title"> LDAP configuration </div>
 
 <div class="form-group">
   <div class="col-sm-12 small text-muted">
diff --git a/app/portainer/settings/authentication/ldap/ldap-settings-dn-builder/ldap-settings-dn-builder.html b/app/portainer/settings/authentication/ldap/ldap-settings-dn-builder/ldap-settings-dn-builder.html
index ab1902981..d72a48c58 100644
--- a/app/portainer/settings/authentication/ldap/ldap-settings-dn-builder/ldap-settings-dn-builder.html
+++ b/app/portainer/settings/authentication/ldap/ldap-settings-dn-builder/ldap-settings-dn-builder.html
@@ -1,10 +1,10 @@
 <div class="form-group ldap-dn-builder">
-  <div class="col-sm-12" style="margin-bottom: 5px;">
+  <div class="col-sm-12" style="margin-bottom: 5px">
     <label class="control-label text-left">{{ $ctrl.label || 'DN entries' }}</label>
     <button
       type="button"
       class="label label-default interactive"
-      style="margin-left: 10px; border: 0;"
+      style="margin-left: 10px; border: 0"
       ng-click="$ctrl.addEntry()"
       limited-feature-dir="{{::$ctrl.limitedFeatureId}}"
       limited-feature-tabindex="-1"
diff --git a/app/portainer/settings/authentication/ldap/ldap-settings-group-dn-builder/ldap-settings-group-dn-builder.html b/app/portainer/settings/authentication/ldap/ldap-settings-group-dn-builder/ldap-settings-group-dn-builder.html
index b00f63c47..632b8a9c0 100644
--- a/app/portainer/settings/authentication/ldap/ldap-settings-group-dn-builder/ldap-settings-group-dn-builder.html
+++ b/app/portainer/settings/authentication/ldap/ldap-settings-group-dn-builder/ldap-settings-group-dn-builder.html
@@ -1,8 +1,6 @@
 <div class="form-group">
-  <label for="group-name-input" class="col-sm-4 control-label text-left">
-    Group Name
-  </label>
-  <div class="col-sm-7" style="padding-left: 0;">
+  <label for="group-name-input" class="col-sm-4 control-label text-left"> Group Name </label>
+  <div class="col-sm-7" style="padding-left: 0">
     <input
       type="text"
       class="form-control"
diff --git a/app/portainer/settings/authentication/ldap/ldap-settings-openldap/ldap-settings-openldap.html b/app/portainer/settings/authentication/ldap/ldap-settings-openldap/ldap-settings-openldap.html
index 04d66907d..9f144ba7d 100644
--- a/app/portainer/settings/authentication/ldap/ldap-settings-openldap/ldap-settings-openldap.html
+++ b/app/portainer/settings/authentication/ldap/ldap-settings-openldap/ldap-settings-openldap.html
@@ -2,22 +2,18 @@
   <be-feature-indicator feature="$ctrl.limitedFeatureId" class="my-8 block"></be-feature-indicator>
 
   <div>
-    <div class="col-sm-12 form-section-title">
-      Information
-    </div>
+    <div class="col-sm-12 form-section-title"> Information </div>
     <div class="form-group col-sm-12 text-muted small">
       When using LDAP authentication, Portainer will delegate user authentication to a LDAP server and fallback to internal authentication if LDAP authentication fails.
     </div>
   </div>
 
-  <div class="col-sm-12 form-section-title">
-    LDAP configuration
-  </div>
+  <div class="col-sm-12 form-section-title"> LDAP configuration </div>
 
   <div class="form-group">
     <div class="col-sm-12 small text-muted">
       <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>
         You can configure multiple LDAP Servers for authentication fallback. Make sure all servers are using the same configuration (i.e. if TLS is enabled, they should all use the
         same certificates).
       </p>
@@ -25,12 +21,12 @@
   </div>
 
   <div class="form-group">
-    <label for="ldap_url" class="col-sm-3 col-lg-2 control-label text-left" style="display: flex; flex-wrap: wrap;">
+    <label for="ldap_url" class="col-sm-3 col-lg-2 control-label text-left" style="display: flex; flex-wrap: wrap">
       LDAP Server
       <button
         type="button"
         class="label label-default interactive"
-        style="border: 0;"
+        style="border: 0"
         ng-click="$ctrl.addLDAPUrl()"
         limited-feature-dir="{{::$ctrl.limitedFeatureId}}"
         limited-feature-tabindex="-1"
@@ -39,7 +35,7 @@
       </button>
     </label>
     <div class="col-sm-9 col-lg-10">
-      <div ng-repeat="url in $ctrl.settings.URLs track by $index" style="display: flex; margin-bottom: 10px;">
+      <div ng-repeat="url in $ctrl.settings.URLs track by $index" style="display: flex; margin-bottom: 10px">
         <input
           type="text"
           class="form-control"
@@ -65,7 +61,7 @@
 
   <!-- Anonymous mode-->
   <div class="form-group">
-    <label for="anonymous_mode" class="control-label text-left col-sm-3" style="padding-top: 0;">
+    <label for="anonymous_mode" class="control-label text-left col-sm-3" style="padding-top: 0">
       Anonymous mode
       <portainer-tooltip position="bottom" message="Enable this option if the server is configured for Anonymous access."></portainer-tooltip>
     </label>
@@ -124,9 +120,7 @@
   </div>
 
   <div class="form-group" ng-if="$ctrl.settings.AnonymousMode">
-    <label for="ldap_domain_root" class="col-sm-3 control-label text-left">
-      Domain root
-    </label>
+    <label for="ldap_domain_root" class="col-sm-3 control-label text-left"> Domain root </label>
     <div class="col-sm-9">
       <input
         type="text"
@@ -166,7 +160,7 @@
   ></ldap-connectivity-check>
 
   <ldap-user-search
-    style="margin-top: 5px;"
+    style="margin-top: 5px"
     settings="$ctrl.settings.SearchSettings"
     domain-suffix="{{ $ctrl.domainSuffix }}"
     base-filter="(objectClass=inetOrgPerson)"
@@ -175,7 +169,7 @@
   ></ldap-user-search>
 
   <ldap-group-search
-    style="margin-top: 5px;"
+    style="margin-top: 5px"
     settings="$ctrl.settings.GroupSearchSettings"
     domain-suffix="{{ $ctrl.domainSuffix }}"
     base-filter="(objectClass=groupOfNames)"
diff --git a/app/portainer/settings/authentication/ldap/ldap-settings-security/ldap-settings-security.html b/app/portainer/settings/authentication/ldap/ldap-settings-security/ldap-settings-security.html
index 6bab54bff..44b38954a 100644
--- a/app/portainer/settings/authentication/ldap/ldap-settings-security/ldap-settings-security.html
+++ b/app/portainer/settings/authentication/ldap/ldap-settings-security/ldap-settings-security.html
@@ -4,7 +4,7 @@
 
 <!-- starttls -->
 <div class="form-group" ng-if="!$ctrl.settings.TLSConfig.TLS">
-  <label for="tls" class="control-label col-sm-3 text-left" style="padding-top: 0;">
+  <label for="tls" class="control-label col-sm-3 text-left" style="padding-top: 0">
     Use StartTLS
     <portainer-tooltip
       position="bottom"
@@ -21,7 +21,7 @@
 
 <!-- tls-checkbox -->
 <div class="form-group" ng-if="!$ctrl.settings.StartTLS">
-  <label for="tls" class="control-label col-sm-3 text-left" style="padding-top: 0;">
+  <label for="tls" class="control-label col-sm-3 text-left" style="padding-top: 0">
     Use TLS
     <portainer-tooltip position="bottom" message="Enable this option if you need to specify TLS certificates to connect to the LDAP server."></portainer-tooltip>
   </label>
@@ -35,7 +35,7 @@
 
 <!-- tls-skip-verify -->
 <div class="form-group">
-  <label for="tls" class="control-label col-sm-3 text-left" style="padding-top: 0;">
+  <label for="tls" class="control-label col-sm-3 text-left" style="padding-top: 0">
     Skip verification of server certificate
     <portainer-tooltip position="bottom" message="Skip the verification of the server TLS certificate. Not recommended on unsecured networks."></portainer-tooltip>
   </label>
@@ -61,7 +61,7 @@
     >
       Select file
     </button>
-    <span style="margin-left: 5px;">
+    <span style="margin-left: 5px">
       {{ $ctrl.tlscaCert.name }}
       <i class="fa fa-check green-icon" ng-if="$ctrl.tlscaCert && $ctrl.tlscaCert === $ctrl.settings.TLSConfig.TLSCACert" aria-hidden="true"></i>
       <i class="fa fa-times red-icon" ng-if="!$ctrl.tlscaCert" aria-hidden="true"></i>
diff --git a/app/portainer/settings/authentication/ldap/ldap-settings-test-login/ldap-settings-test-login.html b/app/portainer/settings/authentication/ldap/ldap-settings-test-login/ldap-settings-test-login.html
index d352b9461..c31bb4cc2 100644
--- a/app/portainer/settings/authentication/ldap/ldap-settings-test-login/ldap-settings-test-login.html
+++ b/app/portainer/settings/authentication/ldap/ldap-settings-test-login/ldap-settings-test-login.html
@@ -8,10 +8,8 @@
   ></be-feature-indicator>
 </div>
 <div class="form-inline">
-  <div class="form-group" style="margin: 0;">
-    <label for="ldap_test_username" style="font-size: 0.9em; margin-right: 5px;">
-      Username
-    </label>
+  <div class="form-group" style="margin: 0">
+    <label for="ldap_test_username" style="font-size: 0.9em; margin-right: 5px"> Username </label>
     <input
       type="text"
       class="form-control"
@@ -25,9 +23,7 @@
   </div>
 
   <div class="form-group no-margin">
-    <label for="ldap_test_password">
-      Password
-    </label>
+    <label for="ldap_test_password"> Password </label>
     <input
       type="password"
       class="form-control"
diff --git a/app/portainer/settings/authentication/ldap/ldap-settings/ldap-settings.html b/app/portainer/settings/authentication/ldap/ldap-settings/ldap-settings.html
index 72e008858..95416ac92 100644
--- a/app/portainer/settings/authentication/ldap/ldap-settings/ldap-settings.html
+++ b/app/portainer/settings/authentication/ldap/ldap-settings/ldap-settings.html
@@ -6,12 +6,10 @@
     </field-description>
   </auto-user-provision-toggle>
 
-  <div class="col-sm-12 form-section-title">
-    Server Type
-  </div>
+  <div class="col-sm-12 form-section-title"> Server Type </div>
 
   <box-selector
-    style="margin-bottom: 0;"
+    style="margin-bottom: 0"
     radio-name="'ldap-server-type-selector'"
     value="$ctrl.settings.ServerType"
     options="$ctrl.boxSelectorOptions"
diff --git a/app/portainer/settings/authentication/ldap/ldap-user-search-item/ldap-user-search-item.html b/app/portainer/settings/authentication/ldap/ldap-user-search-item/ldap-user-search-item.html
index 4e75783ff..4dc862490 100644
--- a/app/portainer/settings/authentication/ldap/ldap-user-search-item/ldap-user-search-item.html
+++ b/app/portainer/settings/authentication/ldap/ldap-user-search-item/ldap-user-search-item.html
@@ -1,9 +1,7 @@
 <rd-widget>
   <rd-widget-body>
-    <div ng-if="$ctrl.index > 0" style="margin-bottom: 10px;">
-      <span class="text-muted small">
-        Extra search configuration
-      </span>
+    <div ng-if="$ctrl.index > 0" style="margin-bottom: 10px">
+      <span class="text-muted small"> Extra search configuration </span>
       <button
         ng-if="$ctrl.index > 0"
         class="btn btn-sm btn-danger"
@@ -17,7 +15,7 @@
     </div>
 
     <div class="form-group" ng-if="$ctrl.showUsernameFormat">
-      <div class="col-sm-4" style="margin-bottom: 5px;">
+      <div class="col-sm-4" style="margin-bottom: 5px">
         <label class="control-label text-left">Username Format</label>
       </div>
       <div class="col-sm-8">
@@ -27,7 +25,7 @@
               class="btn btn-primary"
               ng-model="$ctrl.config.UserNameAttribute"
               uib-btn-radio="'sAMAccountName'"
-              style="margin-left: 0px;"
+              style="margin-left: 0px"
               limited-feature-dir="{{::$ctrl.limitedFeatureId}}"
               limited-feature-tabindex="-1"
               >username</button
@@ -46,9 +44,7 @@
     </div>
 
     <div class="form-group">
-      <label class="col-sm-4 control-label text-left">
-        Root Domain
-      </label>
+      <label class="col-sm-4 control-label text-left"> Root Domain </label>
       <div class="col-sm-8">
         {{ $ctrl.config.BaseDN }}
       </div>
@@ -63,12 +59,12 @@
     ></ldap-settings-dn-builder>
 
     <div class="form-group no-margin-last-child">
-      <div class="col-sm-12" style="margin-bottom: 5px;">
+      <div class="col-sm-12" style="margin-bottom: 5px">
         <label class="control-label text-left">Allowed Groups (optional)</label>
         <button
           type="button"
           class="label label-default interactive"
-          style="margin-left: 10px; border: 0;"
+          style="margin-left: 10px; border: 0"
           ng-click="$ctrl.addGroup()"
           limited-feature-dir="{{::$ctrl.limitedFeatureId}}"
           limited-feature-tabindex="-1"
@@ -77,7 +73,7 @@
         </button>
       </div>
       <div class="col-sm-12">
-        <div ng-repeat="group in $ctrl.groups track by $index" style="margin-bottom: 10px;">
+        <div ng-repeat="group in $ctrl.groups track by $index" style="margin-bottom: 10px">
           <rd-widget>
             <rd-widget-body>
               <ldap-settings-group-dn-builder
@@ -95,9 +91,7 @@
     </div>
 
     <div class="form-group">
-      <label class="col-sm-4 control-label text-left">
-        User Filter
-      </label>
+      <label class="col-sm-4 control-label text-left"> User Filter </label>
       <div class="col-sm-8">
         {{ $ctrl.config.Filter }}
       </div>
diff --git a/app/portainer/settings/authentication/ldap/ldap-user-search/ldap-user-search.html b/app/portainer/settings/authentication/ldap/ldap-user-search/ldap-user-search.html
index ae8741fce..e78170eb4 100644
--- a/app/portainer/settings/authentication/ldap/ldap-user-search/ldap-user-search.html
+++ b/app/portainer/settings/authentication/ldap/ldap-user-search/ldap-user-search.html
@@ -1,8 +1,6 @@
-<div class="col-sm-12 form-section-title" style="float: initial;">
-  User search configurations
-</div>
+<div class="col-sm-12 form-section-title" style="float: initial"> User search configurations </div>
 
-<div style="margin-top: 10px;" ng-repeat="config in $ctrl.settings | limitTo: (1 - $ctrl.settings)">
+<div style="margin-top: 10px" ng-repeat="config in $ctrl.settings | limitTo: (1 - $ctrl.settings)">
   <ldap-user-search-item
     index="$index"
     config="config"
@@ -14,11 +12,11 @@
   ></ldap-user-search-item>
 </div>
 
-<div class="form-group" style="margin-top: 10px;">
+<div class="form-group" style="margin-top: 10px">
   <div class="col-sm-12">
     <button
       class="label label-default interactive"
-      style="border: 0;"
+      style="border: 0"
       ng-click="$ctrl.onAddClick()"
       limited-feature-dir="{{::$ctrl.limitedFeatureId}}"
       limited-feature-tabindex="-1"
@@ -26,7 +24,7 @@
       <i class="fa fa-plus-circle" aria-hidden="true"></i> add user search configuration
     </button>
   </div>
-  <div class="col-sm-12" style="margin-top: 10px;">
+  <div class="col-sm-12" style="margin-top: 10px">
     <button class="btn btm-sm btn-primary" type="button" ng-click="$ctrl.search()" limited-feature-dir="{{::$ctrl.limitedFeatureId}}" limited-feature-tabindex="-1">
       Display Users
     </button>
diff --git a/app/portainer/settings/authentication/ldap/ldap-users-datatable/ldap-users-datatable.html b/app/portainer/settings/authentication/ldap/ldap-users-datatable/ldap-users-datatable.html
index 9817654f2..3d6d4a449 100644
--- a/app/portainer/settings/authentication/ldap/ldap-users-datatable/ldap-users-datatable.html
+++ b/app/portainer/settings/authentication/ldap/ldap-users-datatable/ldap-users-datatable.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>
@@ -51,9 +51,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()">
                 <option value="0">All</option>
                 <option value="10">10</option>
diff --git a/app/portainer/settings/authentication/save-auth-settings-button/save-auth-settings-button.html b/app/portainer/settings/authentication/save-auth-settings-button/save-auth-settings-button.html
index d1b470c35..959b06d29 100644
--- a/app/portainer/settings/authentication/save-auth-settings-button/save-auth-settings-button.html
+++ b/app/portainer/settings/authentication/save-auth-settings-button/save-auth-settings-button.html
@@ -1,6 +1,4 @@
-<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/portainer/settings/general/open-amt/open-amt.html b/app/portainer/settings/general/open-amt/open-amt.html
index 5a9364d2c..497088aef 100644
--- a/app/portainer/settings/general/open-amt/open-amt.html
+++ b/app/portainer/settings/general/open-amt/open-amt.html
@@ -6,8 +6,8 @@
         <form class="form-horizontal" name="openAMTForm">
           <por-switch-field checked="$ctrl.formValues.enableOpenAMT" label="'Enable edge OpenAMT'" on-change="($ctrl.onChangeEnableOpenAMT)"></por-switch-field>
           <span class="small">
-            <p class="text-muted" style="margin-top: 10px;">
-              <i class="fa fa-exclamation-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+            <p class="text-muted" style="margin-top: 10px">
+              <i class="fa fa-exclamation-circle blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
               When enabled, this will allow Portainer to interact with an OpenAMT MPS API.
             </p>
           </span>
@@ -16,9 +16,7 @@
             <hr />
 
             <div class="form-group">
-              <label for="mps_server" class="col-sm-3 control-label text-left">
-                MPS Server
-              </label>
+              <label for="mps_server" class="col-sm-3 control-label text-left"> MPS Server </label>
               <div class="col-sm-8">
                 <input
                   type="text"
@@ -40,9 +38,7 @@
             </div>
 
             <div class="form-group">
-              <label for="mps_user" class="col-sm-3 control-label text-left">
-                MPS User
-              </label>
+              <label for="mps_user" class="col-sm-3 control-label text-left"> MPS User </label>
               <div class="col-sm-8">
                 <input
                   type="text"
@@ -127,10 +123,10 @@
                 ></portainer-tooltip>
               </label>
               <div class="col-sm-8">
-                <button style="margin-left: 0px !important;" class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formValues.certFile" ngf-pattern=".pfx" name="certFile">
+                <button style="margin-left: 0px !important" class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formValues.certFile" ngf-pattern=".pfx" name="certFile">
                   Upload file
                 </button>
-                <span style="margin-left: 5px;">
+                <span style="margin-left: 5px">
                   {{ $ctrl.formValues.certFile.name }}
                   <i class="fa fa-times red-icon" ng-if="!$ctrl.formValues.certFile" aria-hidden="true"></i>
                 </span>
@@ -181,9 +177,7 @@
             </div>
             <div ng-show="$ctrl.formValues.useWirelessConfig">
               <div class="form-group">
-                <label for="wifi_auth_method" class="col-sm-3 control-label text-left">
-                  Authentication Method
-                </label>
+                <label for="wifi_auth_method" class="col-sm-3 control-label text-left"> Authentication Method </label>
                 <div class="col-sm-8">
                   <select class="form-control" ng-model="$ctrl.formValues.wifiAuthenticationMethod">
                     <option value="4">WPA PSK</option>
@@ -192,9 +186,7 @@
                 </div>
               </div>
               <div class="form-group">
-                <label for="wifi_encrypt_method" class="col-sm-3 control-label text-left">
-                  Encryption Method
-                </label>
+                <label for="wifi_encrypt_method" class="col-sm-3 control-label text-left"> Encryption Method </label>
                 <div class="col-sm-8">
                   <select class="form-control" ng-model="$ctrl.formValues.wifiEncryptionMethod" id="wifi_encrypt_method">
                     <option value="3">TKIP</option>
@@ -203,9 +195,7 @@
                 </div>
               </div>
               <div class="form-group">
-                <label for="wifi_ssid" class="col-sm-3 control-label text-left">
-                  SSID
-                </label>
+                <label for="wifi_ssid" class="col-sm-3 control-label text-left"> SSID </label>
                 <div class="col-sm-8">
                   <input
                     type="text"
@@ -249,7 +239,7 @@
                 <span ng-hide="$ctrl.state.actionInProgress">Save Settings</span>
                 <span ng-show="$ctrl.state.actionInProgress">In progress...</span>
               </button>
-              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px;">{{ state.formValidationError }}</span>
+              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px">{{ state.formValidationError }}</span>
             </div>
           </div>
         </form>
diff --git a/app/portainer/settings/general/ssl-certificate/ssl-certificate.html b/app/portainer/settings/general/ssl-certificate/ssl-certificate.html
index 29bd773a2..19a21c80e 100644
--- a/app/portainer/settings/general/ssl-certificate/ssl-certificate.html
+++ b/app/portainer/settings/general/ssl-certificate/ssl-certificate.html
@@ -6,7 +6,7 @@
         <form class="form-horizontal" name="$ctrl.sslForm">
           <span class="small">
             <p class="text-muted">
-              <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+              <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
               Forcing HTTPs only will cause Portainer to stop listening on the HTTP port. Any edge agent environment that is using HTTP will no longer be available.
             </p>
           </span>
@@ -16,23 +16,17 @@
           <hr />
 
           <div class="form-group">
-            <span class="col-sm-12">
-              Provide a new SSL Certificate to replace the existing one that is used for HTTPS connections.
-            </span>
+            <span class="col-sm-12"> Provide a new SSL Certificate to replace the existing one that is used for HTTPS connections. </span>
           </div>
 
           <div class="form-group">
-            <span class="col-sm-12">
-              Upload a X.509 certificate, commonly a crt, a cer, or a pem file.
-            </span>
+            <span class="col-sm-12"> Upload a X.509 certificate, commonly a crt, a cer, or a pem file. </span>
           </div>
 
           <div class="form-group">
             <div class="col-sm-12">
-              <button class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formValues.certFile" ngf-pattern="$ctrl.certFilePattern" name="certFile">
-                Select file
-              </button>
-              <span style="margin-left: 5px;">
+              <button class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formValues.certFile" ngf-pattern="$ctrl.certFilePattern" name="certFile"> Select file </button>
+              <span style="margin-left: 5px">
                 {{ $ctrl.formValues.certFile.name }}
                 <i class="fa fa-times red-icon" ng-if="!$ctrl.formValues.certFile" aria-hidden="true"></i>
               </span>
@@ -47,17 +41,13 @@
           </div>
 
           <div class="form-group">
-            <span class="col-sm-12">
-              Upload a private key, commonly a key, or a pem file.
-            </span>
+            <span class="col-sm-12"> Upload a private key, commonly a key, or a pem file. </span>
           </div>
 
           <div class="form-group">
             <div class="col-sm-12">
-              <button class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formValues.keyFile" ngf-pattern="$ctrl.keyFilePattern" name="keyFile">
-                Select file
-              </button>
-              <span style="margin-left: 5px;">
+              <button class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formValues.keyFile" ngf-pattern="$ctrl.keyFilePattern" name="keyFile"> Select file </button>
+              <span style="margin-left: 5px">
                 {{ $ctrl.formValues.keyFile.name }}
                 <i class="fa fa-times red-icon" ng-if="!$ctrl.formValues.keyFile" aria-hidden="true"></i>
               </span>
@@ -90,7 +80,7 @@
                 <span ng-show="$ctrl.state.actionInProgress">Saving in progress...</span>
                 <span ng-show="$ctrl.state.reloadingPage">Reloading Page...</span>
               </button>
-              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px;">{{ state.formValidationError }}</span>
+              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px">{{ state.formValidationError }}</span>
             </div>
           </div>
         </form>
diff --git a/app/portainer/teams/CreateTeamForm/CreateTeamForm.stories.tsx b/app/portainer/teams/CreateTeamForm/CreateTeamForm.stories.tsx
index 9da3249e9..c7589a9b4 100644
--- a/app/portainer/teams/CreateTeamForm/CreateTeamForm.stories.tsx
+++ b/app/portainer/teams/CreateTeamForm/CreateTeamForm.stories.tsx
@@ -11,7 +11,9 @@ const meta: Meta = {
 
 export default meta;
 
-export function Example() {
+export { Example };
+
+function Example() {
   const [message, setMessage] = useState('');
   const { teams, users } = mockExampleData();
 
diff --git a/app/portainer/teams/CreateTeamForm/CreateTeamForm.validation.ts b/app/portainer/teams/CreateTeamForm/CreateTeamForm.validation.ts
index ca84472e6..05944d3d1 100644
--- a/app/portainer/teams/CreateTeamForm/CreateTeamForm.validation.ts
+++ b/app/portainer/teams/CreateTeamForm/CreateTeamForm.validation.ts
@@ -6,7 +6,11 @@ export function validationSchema(teams: TeamViewModel[]) {
   return object().shape({
     name: string()
       .required('This field is required.')
-      .test('is-unique', 'This team already exists.', (name) => !!name && teams.every((team) => team.Name !== name)),
+      .test(
+        'is-unique',
+        'This team already exists.',
+        (name) => !!name && teams.every((team) => team.Name !== name)
+      ),
     leaders: array().of(number()),
   });
 }
diff --git a/app/portainer/teams/CreateTeamForm/index.ts b/app/portainer/teams/CreateTeamForm/index.ts
index c902f74d1..7443e3297 100644
--- a/app/portainer/teams/CreateTeamForm/index.ts
+++ b/app/portainer/teams/CreateTeamForm/index.ts
@@ -4,4 +4,9 @@ import { CreateTeamForm } from './CreateTeamForm';
 
 export { CreateTeamForm };
 
-export const CreateTeamFormAngular = r2a(CreateTeamForm, ['users', 'actionInProgress', 'onSubmit', 'teams']);
+export const CreateTeamFormAngular = r2a(CreateTeamForm, [
+  'users',
+  'actionInProgress',
+  'onSubmit',
+  'teams',
+]);
diff --git a/app/portainer/user-activity/activity-logs-view/activity-logs-datatable/activity-logs-datatable.html b/app/portainer/user-activity/activity-logs-view/activity-logs-datatable/activity-logs-datatable.html
index ac2f1bbaf..9556c7cf4 100644
--- a/app/portainer/user-activity/activity-logs-view/activity-logs-datatable/activity-logs-datatable.html
+++ b/app/portainer/user-activity/activity-logs-view/activity-logs-datatable/activity-logs-datatable.html
@@ -26,12 +26,8 @@
                 </a>
               </th>
 
-              <th>
-                Action
-              </th>
-              <th>
-                Payload
-              </th>
+              <th> Action </th>
+              <th> Payload </th>
             </tr>
           </thead>
           <tbody>
@@ -51,9 +47,7 @@
               <td class="text-center text-muted" colspan="5">Loading...</td>
             </tr>
             <tr ng-if="$ctrl.logs.length === 0">
-              <td class="text-center text-muted" colspan="8">
-                No logs available.
-              </td>
+              <td class="text-center text-muted" colspan="8"> No logs available. </td>
             </tr>
           </tbody>
         </table>
diff --git a/app/portainer/user-activity/auth-logs-view/auth-logs-datatable/auth-logs-datatable.html b/app/portainer/user-activity/auth-logs-view/auth-logs-datatable/auth-logs-datatable.html
index 07d687ee8..56e3c02a3 100644
--- a/app/portainer/user-activity/auth-logs-view/auth-logs-datatable/auth-logs-datatable.html
+++ b/app/portainer/user-activity/auth-logs-view/auth-logs-datatable/auth-logs-datatable.html
@@ -32,9 +32,7 @@
                   <datatable-sort-icon key="Username" selected-sort-key="{{ $ctrl.sort.key }}" reverse-order="$ctrl.sort.desc"></datatable-sort-icon>
                 </a>
               </th>
-              <th>
-                Result
-              </th>
+              <th> Result </th>
             </tr>
           </thead>
           <tbody>
@@ -49,9 +47,7 @@
               <td class="text-center text-muted" colspan="5">Loading...</td>
             </tr>
             <tr ng-if="$ctrl.state.logs.length === 0">
-              <td class="text-center text-muted" colspan="8">
-                No logs available.
-              </td>
+              <td class="text-center text-muted" colspan="8"> No logs available. </td>
             </tr>
           </tbody>
         </table>
diff --git a/app/portainer/views/account/CreateAccessToken/index.ts b/app/portainer/views/account/CreateAccessToken/index.ts
index 391d108fb..5b168d024 100644
--- a/app/portainer/views/account/CreateAccessToken/index.ts
+++ b/app/portainer/views/account/CreateAccessToken/index.ts
@@ -2,5 +2,10 @@ import { react2angular } from '@/react-tools/react2angular';
 
 import { CreateAccessToken } from './CreateAccessToken';
 
-const CreateAccessTokenAngular = react2angular(CreateAccessToken, ['userId', 'onSubmit', 'onSuccess', 'onError']);
+const CreateAccessTokenAngular = react2angular(CreateAccessToken, [
+  'userId',
+  'onSubmit',
+  'onSuccess',
+  'onError',
+]);
 export { CreateAccessToken, CreateAccessTokenAngular };
diff --git a/app/portainer/views/account/account.html b/app/portainer/views/account/account.html
index f7a0f5bab..274b0b447 100644
--- a/app/portainer/views/account/account.html
+++ b/app/portainer/views/account/account.html
@@ -8,7 +8,7 @@
     <rd-widget>
       <rd-widget-header icon="fa-lock" title-text="Change user password"></rd-widget-header>
       <rd-widget-body>
-        <form class="form-horizontal" style="margin-top: 15px;">
+        <form class="form-horizontal" style="margin-top: 15px">
           <!-- current-password-input -->
           <div class="form-group">
             <label for="current_password" class="col-sm-2 control-label text-left">Current password</label>
@@ -65,11 +65,11 @@
                 ng-click="updatePassword()"
                 >Update password</button
               >
-              <span class="text-muted small" style="margin-left: 5px;" ng-if="AuthenticationMethod === 2 && userID !== 1">
+              <span class="text-muted small" style="margin-left: 5px" ng-if="AuthenticationMethod === 2 && userID !== 1">
                 <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
                 You cannot change your password when using LDAP authentication.
               </span>
-              <span class="text-muted small" style="margin-left: 5px;" ng-if="AuthenticationMethod === 3 && userID !== 1">
+              <span class="text-muted small" style="margin-left: 5px" ng-if="AuthenticationMethod === 3 && userID !== 1">
                 <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
                 You cannot change your password when using OAuth authentication.
               </span>
diff --git a/app/portainer/views/auth/auth.html b/app/portainer/views/auth/auth.html
index 392d7fe80..efd5bbd75 100644
--- a/app/portainer/views/auth/auth.html
+++ b/app/portainer/views/auth/auth.html
@@ -15,18 +15,18 @@
           <!-- login form -->
           <form class="simple-box-form form-horizontal">
             <div class="form-group">
-              <div class="col-sm-12" style="display: flex; justify-content: center;" ng-if="ctrl.state.showOAuthLogin">
+              <div class="col-sm-12" style="display: flex; justify-content: center" ng-if="ctrl.state.showOAuthLogin">
                 <a ng-href="{{ ctrl.OAuthLoginURI }}">
-                  <div class="btn btn-primary pull-left" style="font-size: 120%; margin-left: 2px;" ng-if="ctrl.state.OAuthProvider === 'Microsoft'">
+                  <div class="btn btn-primary pull-left" style="font-size: 120%; margin-left: 2px" ng-if="ctrl.state.OAuthProvider === 'Microsoft'">
                     <i class="fab fa-microsoft" aria-hidden="true"></i> Login with Microsoft
                   </div>
-                  <div class="btn btn-primary pull-left" style="font-size: 120%; margin-left: 2px;" ng-if="ctrl.state.OAuthProvider === 'Google'">
+                  <div class="btn btn-primary pull-left" style="font-size: 120%; margin-left: 2px" ng-if="ctrl.state.OAuthProvider === 'Google'">
                     <i class="fab fa-google" aria-hidden="true"></i> Login with Google
                   </div>
-                  <div class="btn btn-primary pull-left" style="font-size: 120%; margin-left: 2px;" ng-if="ctrl.state.OAuthProvider === 'Github'">
+                  <div class="btn btn-primary pull-left" style="font-size: 120%; margin-left: 2px" ng-if="ctrl.state.OAuthProvider === 'Github'">
                     <i class="fab fa-github" aria-hidden="true"></i> Login with Github
                   </div>
-                  <div class="btn btn-primary pull-left" style="font-size: 120%; margin-left: 2px;" ng-if="ctrl.state.OAuthProvider === 'OAuth'">
+                  <div class="btn btn-primary pull-left" style="font-size: 120%; margin-left: 2px" ng-if="ctrl.state.OAuthProvider === 'OAuth'">
                     <i class="fa fa-sign-in-alt" aria-hidden="true"></i> Login with OAuth
                   </div>
                 </a>
@@ -35,17 +35,15 @@
 
             <!-- divider -->
             <div class="form-group" ng-if="ctrl.state.showOAuthLogin">
-              <div class="col-sm-12" style="display: flex; align-items: center; justify-content: center;">
-                <div class="striketext small text-muted" style="display: flex; align-items: center; justify-content: center; width: 90%;">or</div>
+              <div class="col-sm-12" style="display: flex; align-items: center; justify-content: center">
+                <div class="striketext small text-muted" style="display: flex; align-items: center; justify-content: center; width: 90%">or</div>
               </div>
             </div>
 
             <!-- use internal auth button -->
             <div class="form-group" ng-if="ctrl.state.showOAuthLogin && !ctrl.state.showStandardLogin">
-              <div class="col-sm-12" style="display: flex; justify-content: center;">
-                <div class="btn btn-sm btn-primary pull-left" style="margin-left: 2px;" ng-click="ctrl.toggleStandardLogin()">
-                  Use internal authentication
-                </div>
+              <div class="col-sm-12" style="display: flex; justify-content: center">
+                <div class="btn btn-sm btn-primary pull-left" style="margin-left: 2px" ng-click="ctrl.toggleStandardLogin()"> Use internal authentication </div>
               </div>
             </div>
 
@@ -63,7 +61,7 @@
 
             <div class="form-group" ng-if="ctrl.state.showStandardLogin">
               <!-- login button -->
-              <div class="col-sm-12" style="display: flex; align-items: center; justify-content: center;">
+              <div class="col-sm-12" style="display: flex; align-items: center; justify-content: center">
                 <button
                   type="submit"
                   class="btn btn-primary btn-sm pull-right"
@@ -82,7 +80,7 @@
 
           <!-- error message -->
           <div class="pull-right" ng-if="ctrl.state.AuthenticationError">
-            <i class="fa fa-exclamation-triangle red-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+            <i class="fa fa-exclamation-triangle red-icon" aria-hidden="true" style="margin-right: 2px"></i>
             <span class="small text-danger">{{ ctrl.state.AuthenticationError }}</span>
           </div>
         </div>
diff --git a/app/portainer/views/auth/authController.js b/app/portainer/views/auth/authController.js
index 95f212184..0731c1d67 100644
--- a/app/portainer/views/auth/authController.js
+++ b/app/portainer/views/auth/authController.js
@@ -249,7 +249,7 @@ class AuthenticationController {
         this.generateOAuthLoginURI();
         return;
       }
-      if(!this.logo){
+      if (!this.logo) {
         await this.StateManager.initialize();
         this.logo = this.StateManager.getState().application.logo;
       }
diff --git a/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateView.html b/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateView.html
index c165a9d15..42ca2ba08 100644
--- a/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateView.html
+++ b/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateView.html
@@ -17,17 +17,15 @@
 
           <!-- build-method -->
           <div ng-if="!$ctrl.state.fromStack">
-            <div class="col-sm-12 form-section-title">
-              Build method
-            </div>
+            <div class="col-sm-12 form-section-title"> Build method </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.state.Method" value="editor" ng-change="$ctrl.onChangeMethod()" />
                   <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>
@@ -37,7 +35,7 @@
                   <input type="radio" id="method_upload" ng-model="$ctrl.state.Method" value="upload" ng-change="$ctrl.onChangeMethod()" />
                   <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>
@@ -47,7 +45,7 @@
                   <input type="radio" id="method_repository" ng-model="$ctrl.state.Method" value="repository" ng-change="$ctrl.onChangeMethod()" />
                   <label for="method_repository">
                     <div class="boxselector_header">
-                      <i class="fab fa-git" aria-hidden="true" style="margin-right: 2px;"></i>
+                      <i class="fab fa-git" aria-hidden="true" style="margin-right: 2px"></i>
                       Repository
                     </div>
                     <p>Use a git repository</p>
@@ -59,15 +57,11 @@
           <!-- !build-method -->
           <!-- web-editor -->
           <div ng-show="$ctrl.state.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">
               <span class="col-sm-12 text-muted small">
                 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>
                 .
               </span>
             </div>
@@ -86,20 +80,14 @@
           <!-- !web-editor -->
           <!-- upload -->
           <div ng-show="$ctrl.state.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 Compose file from your computer.
-              </span>
+              <span class="col-sm-12 text-muted small"> You can upload a Compose 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.formValues.File">
-                  Select file
-                </button>
-                <span style="margin-left: 5px;">
+                <button type="button" class="btn btn-sm btn-primary" ngf-select ng-model="$ctrl.formValues.File"> Select file </button>
+                <span style="margin-left: 5px">
                   {{ $ctrl.formValues.File.name }}
                   <i class="fa fa-times red-icon" ng-if="!$ctrl.formValues.File" aria-hidden="true"></i>
                 </span>
@@ -113,9 +101,7 @@
           <por-access-control-form form-data="$ctrl.formValues.AccessControlData"></por-access-control-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
@@ -132,7 +118,7 @@
                 <span ng-hide="$ctrl.state.actionInProgress">Create custom template</span>
                 <span ng-show="$ctrl.state.actionInProgress">Creation 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/portainer/views/custom-templates/custom-templates-view/customTemplatesView.html b/app/portainer/views/custom-templates/custom-templates-view/customTemplatesView.html
index 68742e506..50301d032 100644
--- a/app/portainer/views/custom-templates/custom-templates-view/customTemplatesView.html
+++ b/app/portainer/views/custom-templates/custom-templates-view/customTemplatesView.html
@@ -29,15 +29,11 @@
       </div>
       <div ng-if="$ctrl.state.showAdvancedOptions">
         <!-- web-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">
           <span class="col-sm-12 text-muted small">
             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>
             .
           </span>
         </div>
diff --git a/app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateView.html b/app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateView.html
index 66fbb57f1..1c221cb35 100644
--- a/app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateView.html
+++ b/app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateView.html
@@ -15,15 +15,11 @@
           <custom-template-common-fields form-values="$ctrl.formValues" show-platform-field="true" show-type-field="true"></custom-template-common-fields>
 
           <!-- web-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">
             <span class="col-sm-12 text-muted small">
               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>
               .
             </span>
           </div>
@@ -42,9 +38,7 @@
 
           <por-access-control-form form-data="$ctrl.formValues.AccessControlData" resource-control="$ctrl.formValues.ResourceControl"></por-access-control-form>
 
-          <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
@@ -59,7 +53,7 @@
                 <span ng-hide="$ctrl.actionInProgress">Update the template</span>
                 <span ng-show="$ctrl.actionInProgress">Update 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/portainer/views/endpoints/create/createEndpointController.js b/app/portainer/views/endpoints/create/createEndpointController.js
index a2543e95f..0e97b6533 100644
--- a/app/portainer/views/endpoints/create/createEndpointController.js
+++ b/app/portainer/views/endpoints/create/createEndpointController.js
@@ -5,122 +5,170 @@ import { EndpointSecurityFormData } from '../../../components/endpointSecurity/p
 
 angular
   .module('portainer.app')
-  .controller('CreateEndpointController', function CreateEndpointController(
-    $async,
-    $analytics,
-    $q,
-    $scope,
-    $state,
-    $filter,
-    clipboard,
-    EndpointService,
-    GroupService,
-    TagService,
-    SettingsService,
-    Notifications,
-    Authentication,
-    StateManager
-  ) {
-    $scope.state = {
-      EnvironmentType: 'agent',
-      PlatformType: 'linux',
-      actionInProgress: false,
-      deploymentTab: 0,
-      allowCreateTag: Authentication.isAdmin(),
-      availableEdgeAgentCheckinOptions: [
-        { key: 'Use default interval', value: 0 },
-        {
-          key: '5 seconds',
-          value: 5,
-        },
-        {
-          key: '10 seconds',
-          value: 10,
-        },
-        {
-          key: '30 seconds',
-          value: 30,
-        },
-        { key: '5 minutes', value: 300 },
-        { key: '1 hour', value: 3600 },
-        { key: '1 day', value: 86400 },
-      ],
-    };
+  .controller(
+    'CreateEndpointController',
+    function CreateEndpointController(
+      $async,
+      $analytics,
+      $q,
+      $scope,
+      $state,
+      $filter,
+      clipboard,
+      EndpointService,
+      GroupService,
+      TagService,
+      SettingsService,
+      Notifications,
+      Authentication,
+      StateManager
+    ) {
+      $scope.state = {
+        EnvironmentType: 'agent',
+        PlatformType: 'linux',
+        actionInProgress: false,
+        deploymentTab: 0,
+        allowCreateTag: Authentication.isAdmin(),
+        availableEdgeAgentCheckinOptions: [
+          { key: 'Use default interval', value: 0 },
+          {
+            key: '5 seconds',
+            value: 5,
+          },
+          {
+            key: '10 seconds',
+            value: 10,
+          },
+          {
+            key: '30 seconds',
+            value: 30,
+          },
+          { key: '5 minutes', value: 300 },
+          { key: '1 hour', value: 3600 },
+          { key: '1 day', value: 86400 },
+        ],
+      };
 
-    const agentVersion = StateManager.getState().application.version;
-    const agentShortVersion = getAgentShortVersion(agentVersion);
+      const agentVersion = StateManager.getState().application.version;
+      const agentShortVersion = getAgentShortVersion(agentVersion);
 
-    const deployCommands = {
-      kubeLoadBalancer: `curl -L https://downloads.portainer.io/portainer-agent-ce${agentShortVersion}-k8s-lb.yaml -o portainer-agent-k8s.yaml; kubectl apply -f portainer-agent-k8s.yaml`,
-      kubeNodePort: `curl -L https://downloads.portainer.io/portainer-agent-ce${agentShortVersion}-k8s-nodeport.yaml -o portainer-agent-k8s.yaml; kubectl apply -f portainer-agent-k8s.yaml`,
-      agentLinux: `curl -L https://downloads.portainer.io/agent-stack-ce${agentShortVersion}.yml -o agent-stack.yml && docker stack deploy --compose-file=agent-stack.yml portainer-agent`,
-      agentWindows: `curl -L https://downloads.portainer.io/agent-stack-ce${agentShortVersion}-windows.yml -o agent-stack-windows.yml && docker stack deploy --compose-file=agent-stack-windows.yml portainer-agent`,
-    };
-    $scope.deployCommands = deployCommands;
+      const deployCommands = {
+        kubeLoadBalancer: `curl -L https://downloads.portainer.io/portainer-agent-ce${agentShortVersion}-k8s-lb.yaml -o portainer-agent-k8s.yaml; kubectl apply -f portainer-agent-k8s.yaml`,
+        kubeNodePort: `curl -L https://downloads.portainer.io/portainer-agent-ce${agentShortVersion}-k8s-nodeport.yaml -o portainer-agent-k8s.yaml; kubectl apply -f portainer-agent-k8s.yaml`,
+        agentLinux: `curl -L https://downloads.portainer.io/agent-stack-ce${agentShortVersion}.yml -o agent-stack.yml && docker stack deploy --compose-file=agent-stack.yml portainer-agent`,
+        agentWindows: `curl -L https://downloads.portainer.io/agent-stack-ce${agentShortVersion}-windows.yml -o agent-stack-windows.yml && docker stack deploy --compose-file=agent-stack-windows.yml portainer-agent`,
+      };
+      $scope.deployCommands = deployCommands;
 
-    $scope.formValues = {
-      Name: '',
-      URL: '',
-      PublicURL: '',
-      GroupId: 1,
-      SecurityFormData: new EndpointSecurityFormData(),
-      AzureApplicationId: '',
-      AzureTenantId: '',
-      AzureAuthenticationKey: '',
-      TagIds: [],
-      CheckinInterval: $scope.state.availableEdgeAgentCheckinOptions[0].value,
-    };
+      $scope.formValues = {
+        Name: '',
+        URL: '',
+        PublicURL: '',
+        GroupId: 1,
+        SecurityFormData: new EndpointSecurityFormData(),
+        AzureApplicationId: '',
+        AzureTenantId: '',
+        AzureAuthenticationKey: '',
+        TagIds: [],
+        CheckinInterval: $scope.state.availableEdgeAgentCheckinOptions[0].value,
+      };
 
-    $scope.copyAgentCommand = function () {
-      if ($scope.state.deploymentTab === 2 && $scope.state.PlatformType === 'linux') {
-        clipboard.copyText(deployCommands.agentLinux);
-      } else if ($scope.state.deploymentTab === 2 && $scope.state.PlatformType === 'windows') {
-        clipboard.copyText(deployCommands.agentWindows);
-      } else if ($scope.state.deploymentTab === 1) {
-        clipboard.copyText(deployCommands.kubeNodePort);
-      } else {
-        clipboard.copyText(deployCommands.kubeLoadBalancer);
-      }
-      $('#copyNotification').show().fadeOut(2500);
-    };
+      $scope.copyAgentCommand = function () {
+        if ($scope.state.deploymentTab === 2 && $scope.state.PlatformType === 'linux') {
+          clipboard.copyText(deployCommands.agentLinux);
+        } else if ($scope.state.deploymentTab === 2 && $scope.state.PlatformType === 'windows') {
+          clipboard.copyText(deployCommands.agentWindows);
+        } else if ($scope.state.deploymentTab === 1) {
+          clipboard.copyText(deployCommands.kubeNodePort);
+        } else {
+          clipboard.copyText(deployCommands.kubeLoadBalancer);
+        }
+        $('#copyNotification').show().fadeOut(2500);
+      };
 
-    $scope.setDefaultPortainerInstanceURL = function () {
-      const baseHREF = baseHref();
-      $scope.formValues.URL = window.location.origin + (baseHREF !== '/' ? baseHREF : '');
-    };
+      $scope.setDefaultPortainerInstanceURL = function () {
+        const baseHREF = baseHref();
+        $scope.formValues.URL = window.location.origin + (baseHREF !== '/' ? baseHREF : '');
+      };
 
-    $scope.resetEndpointURL = function () {
-      $scope.formValues.URL = '';
-    };
+      $scope.resetEndpointURL = function () {
+        $scope.formValues.URL = '';
+      };
 
-    $scope.onCreateTag = function onCreateTag(tagName) {
-      return $async(onCreateTagAsync, tagName);
-    };
+      $scope.onCreateTag = function onCreateTag(tagName) {
+        return $async(onCreateTagAsync, tagName);
+      };
 
-    async function onCreateTagAsync(tagName) {
-      try {
-        const tag = await TagService.createTag(tagName);
-        $scope.availableTags = $scope.availableTags.concat(tag);
-        $scope.formValues.TagIds = $scope.formValues.TagIds.concat(tag.Id);
-      } catch (err) {
-        Notifications.error('Failure', err, 'Unable to create tag');
+      async function onCreateTagAsync(tagName) {
+        try {
+          const tag = await TagService.createTag(tagName);
+          $scope.availableTags = $scope.availableTags.concat(tag);
+          $scope.formValues.TagIds = $scope.formValues.TagIds.concat(tag.Id);
+        } catch (err) {
+          Notifications.error('Failure', err, 'Unable to create tag');
+        }
       }
-    }
 
-    $scope.addDockerEndpoint = function () {
-      var name = $scope.formValues.Name;
-      var URL = $filter('stripprotocol')($scope.formValues.URL);
-      var publicURL = $scope.formValues.PublicURL;
-      var groupId = $scope.formValues.GroupId;
-      var tagIds = $scope.formValues.TagIds;
+      $scope.addDockerEndpoint = function () {
+        var name = $scope.formValues.Name;
+        var URL = $filter('stripprotocol')($scope.formValues.URL);
+        var publicURL = $scope.formValues.PublicURL;
+        var groupId = $scope.formValues.GroupId;
+        var tagIds = $scope.formValues.TagIds;
+
+        if ($scope.formValues.ConnectSocket) {
+          URL = $scope.formValues.SocketPath;
+          $scope.state.actionInProgress = true;
+          EndpointService.createLocalEndpoint(name, URL, publicURL, groupId, tagIds)
+            .then(function success() {
+              Notifications.success('Environment created', name);
+              $state.go('portainer.endpoints', {}, { reload: true });
+            })
+            .catch(function error(err) {
+              Notifications.error('Failure', err, 'Unable to create environment');
+            })
+            .finally(function final() {
+              $scope.state.actionInProgress = false;
+            });
+        } else {
+          if (publicURL === '') {
+            publicURL = URL.split(':')[0];
+          }
+
+          var securityData = $scope.formValues.SecurityFormData;
+          var TLS = securityData.TLS;
+          var TLSMode = securityData.TLSMode;
+          var TLSSkipVerify = TLS && (TLSMode === 'tls_client_noca' || TLSMode === 'tls_only');
+          var TLSSkipClientVerify = TLS && (TLSMode === 'tls_ca' || TLSMode === 'tls_only');
+          var TLSCAFile = TLSSkipVerify ? null : securityData.TLSCACert;
+          var TLSCertFile = TLSSkipClientVerify ? null : securityData.TLSCert;
+          var TLSKeyFile = TLSSkipClientVerify ? null : securityData.TLSKey;
+
+          addEndpoint(
+            name,
+            PortainerEndpointCreationTypes.LocalDockerEnvironment,
+            URL,
+            publicURL,
+            groupId,
+            tagIds,
+            TLS,
+            TLSSkipVerify,
+            TLSSkipClientVerify,
+            TLSCAFile,
+            TLSCertFile,
+            TLSKeyFile
+          );
+        }
+      };
 
-      if ($scope.formValues.ConnectSocket) {
-        URL = $scope.formValues.SocketPath;
+      $scope.addKubernetesEndpoint = function () {
+        var name = $scope.formValues.Name;
+        var tagIds = $scope.formValues.TagIds;
         $scope.state.actionInProgress = true;
-        EndpointService.createLocalEndpoint(name, URL, publicURL, groupId, tagIds)
-          .then(function success() {
+        EndpointService.createLocalKubernetesEndpoint(name, tagIds)
+          .then(function success(result) {
             Notifications.success('Environment created', name);
-            $state.go('portainer.endpoints', {}, { reload: true });
+            $state.go('portainer.k8sendpoint.kubernetesConfig', { id: result.Id });
           })
           .catch(function error(err) {
             Notifications.error('Failure', err, 'Unable to create environment');
@@ -128,176 +176,145 @@ angular
           .finally(function final() {
             $scope.state.actionInProgress = false;
           });
-      } else {
-        if (publicURL === '') {
-          publicURL = URL.split(':')[0];
-        }
+      };
 
-        var securityData = $scope.formValues.SecurityFormData;
-        var TLS = securityData.TLS;
-        var TLSMode = securityData.TLSMode;
-        var TLSSkipVerify = TLS && (TLSMode === 'tls_client_noca' || TLSMode === 'tls_only');
-        var TLSSkipClientVerify = TLS && (TLSMode === 'tls_ca' || TLSMode === 'tls_only');
-        var TLSCAFile = TLSSkipVerify ? null : securityData.TLSCACert;
-        var TLSCertFile = TLSSkipClientVerify ? null : securityData.TLSCert;
-        var TLSKeyFile = TLSSkipClientVerify ? null : securityData.TLSKey;
+      $scope.addAgentEndpoint = addAgentEndpoint;
+      async function addAgentEndpoint() {
+        return $async(async () => {
+          const name = $scope.formValues.Name;
+          const URL = $scope.formValues.URL;
+          const publicURL = $scope.formValues.PublicURL === '' ? URL.split(':')[0] : $scope.formValues.PublicURL;
+          const groupId = $scope.formValues.GroupId;
+          const tagIds = $scope.formValues.TagIds;
 
-        addEndpoint(
-          name,
-          PortainerEndpointCreationTypes.LocalDockerEnvironment,
-          URL,
-          publicURL,
-          groupId,
-          tagIds,
-          TLS,
-          TLSSkipVerify,
-          TLSSkipClientVerify,
-          TLSCAFile,
-          TLSCertFile,
-          TLSKeyFile
-        );
-      }
-    };
-
-    $scope.addKubernetesEndpoint = function () {
-      var name = $scope.formValues.Name;
-      var tagIds = $scope.formValues.TagIds;
-      $scope.state.actionInProgress = true;
-      EndpointService.createLocalKubernetesEndpoint(name, tagIds)
-        .then(function success(result) {
-          Notifications.success('Environment created', name);
-          $state.go('portainer.k8sendpoint.kubernetesConfig', { id: result.Id });
-        })
-        .catch(function error(err) {
-          Notifications.error('Failure', err, 'Unable to create environment');
-        })
-        .finally(function final() {
-          $scope.state.actionInProgress = false;
+          const endpoint = await addEndpoint(name, PortainerEndpointCreationTypes.AgentEnvironment, URL, publicURL, groupId, tagIds, true, true, true, null, null, null);
+          $analytics.eventTrack('portainer-endpoint-creation', { category: 'portainer', metadata: { type: 'agent', platform: platformLabel(endpoint.Type) } });
         });
-    };
-
-    $scope.addAgentEndpoint = addAgentEndpoint;
-    async function addAgentEndpoint() {
-      return $async(async () => {
-        const name = $scope.formValues.Name;
-        const URL = $scope.formValues.URL;
-        const publicURL = $scope.formValues.PublicURL === '' ? URL.split(':')[0] : $scope.formValues.PublicURL;
-        const groupId = $scope.formValues.GroupId;
-        const tagIds = $scope.formValues.TagIds;
-
-        const endpoint = await addEndpoint(name, PortainerEndpointCreationTypes.AgentEnvironment, URL, publicURL, groupId, tagIds, true, true, true, null, null, null);
-        $analytics.eventTrack('portainer-endpoint-creation', { category: 'portainer', metadata: { type: 'agent', platform: platformLabel(endpoint.Type) } });
-      });
 
-      function platformLabel(type) {
-        switch (type) {
-          case PortainerEndpointTypes.DockerEnvironment:
-          case PortainerEndpointTypes.AgentOnDockerEnvironment:
-          case PortainerEndpointTypes.EdgeAgentOnDockerEnvironment:
-            return 'docker';
-          case PortainerEndpointTypes.KubernetesLocalEnvironment:
-          case PortainerEndpointTypes.AgentOnKubernetesEnvironment:
-          case PortainerEndpointTypes.EdgeAgentOnKubernetesEnvironment:
-            return 'kubernetes';
+        function platformLabel(type) {
+          switch (type) {
+            case PortainerEndpointTypes.DockerEnvironment:
+            case PortainerEndpointTypes.AgentOnDockerEnvironment:
+            case PortainerEndpointTypes.EdgeAgentOnDockerEnvironment:
+              return 'docker';
+            case PortainerEndpointTypes.KubernetesLocalEnvironment:
+            case PortainerEndpointTypes.AgentOnKubernetesEnvironment:
+            case PortainerEndpointTypes.EdgeAgentOnKubernetesEnvironment:
+              return 'kubernetes';
+          }
         }
       }
-    }
 
-    $scope.addEdgeAgentEndpoint = function () {
-      var name = $scope.formValues.Name;
-      var groupId = $scope.formValues.GroupId;
-      var tagIds = $scope.formValues.TagIds;
-      var URL = $scope.formValues.URL;
+      $scope.addEdgeAgentEndpoint = function () {
+        var name = $scope.formValues.Name;
+        var groupId = $scope.formValues.GroupId;
+        var tagIds = $scope.formValues.TagIds;
+        var URL = $scope.formValues.URL;
 
-      addEndpoint(name, PortainerEndpointCreationTypes.EdgeAgentEnvironment, URL, '', groupId, tagIds, false, false, false, null, null, null, $scope.formValues.CheckinInterval);
-    };
+        addEndpoint(name, PortainerEndpointCreationTypes.EdgeAgentEnvironment, URL, '', groupId, tagIds, false, false, false, null, null, null, $scope.formValues.CheckinInterval);
+      };
 
-    $scope.addAzureEndpoint = function () {
-      var name = $scope.formValues.Name;
-      var applicationId = $scope.formValues.AzureApplicationId;
-      var tenantId = $scope.formValues.AzureTenantId;
-      var authenticationKey = $scope.formValues.AzureAuthenticationKey;
-      var groupId = $scope.formValues.GroupId;
-      var tagIds = $scope.formValues.TagIds;
+      $scope.addAzureEndpoint = function () {
+        var name = $scope.formValues.Name;
+        var applicationId = $scope.formValues.AzureApplicationId;
+        var tenantId = $scope.formValues.AzureTenantId;
+        var authenticationKey = $scope.formValues.AzureAuthenticationKey;
+        var groupId = $scope.formValues.GroupId;
+        var tagIds = $scope.formValues.TagIds;
 
-      createAzureEndpoint(name, applicationId, tenantId, authenticationKey, groupId, tagIds);
-    };
-
-    function createAzureEndpoint(name, applicationId, tenantId, authenticationKey, groupId, tagIds) {
-      $scope.state.actionInProgress = true;
-      EndpointService.createAzureEndpoint(name, applicationId, tenantId, authenticationKey, groupId, tagIds)
-        .then(function success() {
-          Notifications.success('Environment created', name);
-          $state.go('portainer.endpoints', {}, { reload: true });
-        })
-        .catch(function error(err) {
-          Notifications.error('Failure', err, 'Unable to create environment');
-        })
-        .finally(function final() {
-          $scope.state.actionInProgress = false;
-        });
-    }
+        createAzureEndpoint(name, applicationId, tenantId, authenticationKey, groupId, tagIds);
+      };
 
-    async function addEndpoint(name, creationType, URL, PublicURL, groupId, tagIds, TLS, TLSSkipVerify, TLSSkipClientVerify, TLSCAFile, TLSCertFile, TLSKeyFile, CheckinInterval) {
-      return $async(async () => {
+      function createAzureEndpoint(name, applicationId, tenantId, authenticationKey, groupId, tagIds) {
         $scope.state.actionInProgress = true;
-        try {
-          const endpoint = await EndpointService.createRemoteEndpoint(
-            name,
-            creationType,
-            URL,
-            PublicURL,
-            groupId,
-            tagIds,
-            TLS,
-            TLSSkipVerify,
-            TLSSkipClientVerify,
-            TLSCAFile,
-            TLSCertFile,
-            TLSKeyFile,
-            CheckinInterval
-          );
+        EndpointService.createAzureEndpoint(name, applicationId, tenantId, authenticationKey, groupId, tagIds)
+          .then(function success() {
+            Notifications.success('Environment created', name);
+            $state.go('portainer.endpoints', {}, { reload: true });
+          })
+          .catch(function error(err) {
+            Notifications.error('Failure', err, 'Unable to create environment');
+          })
+          .finally(function final() {
+            $scope.state.actionInProgress = false;
+          });
+      }
 
-          Notifications.success('Environment created', name);
-          switch (endpoint.Type) {
-            case PortainerEndpointTypes.EdgeAgentOnDockerEnvironment:
-            case PortainerEndpointTypes.EdgeAgentOnKubernetesEnvironment:
-              $state.go('portainer.endpoints.endpoint', { id: endpoint.Id });
-              break;
-            case PortainerEndpointTypes.AgentOnKubernetesEnvironment:
-              $state.go('portainer.k8sendpoint.kubernetesConfig', { id: endpoint.Id });
-              break;
-            default:
-              $state.go('portainer.endpoints', {}, { reload: true });
-              break;
-          }
+      async function addEndpoint(
+        name,
+        creationType,
+        URL,
+        PublicURL,
+        groupId,
+        tagIds,
+        TLS,
+        TLSSkipVerify,
+        TLSSkipClientVerify,
+        TLSCAFile,
+        TLSCertFile,
+        TLSKeyFile,
+        CheckinInterval
+      ) {
+        return $async(async () => {
+          $scope.state.actionInProgress = true;
+          try {
+            const endpoint = await EndpointService.createRemoteEndpoint(
+              name,
+              creationType,
+              URL,
+              PublicURL,
+              groupId,
+              tagIds,
+              TLS,
+              TLSSkipVerify,
+              TLSSkipClientVerify,
+              TLSCAFile,
+              TLSCertFile,
+              TLSKeyFile,
+              CheckinInterval
+            );
 
-          return endpoint;
-        } catch (err) {
-          Notifications.error('Failure', err, 'Unable to create environment');
-        } finally {
-          $scope.state.actionInProgress = false;
-        }
-      });
-    }
+            Notifications.success('Environment created', name);
+            switch (endpoint.Type) {
+              case PortainerEndpointTypes.EdgeAgentOnDockerEnvironment:
+              case PortainerEndpointTypes.EdgeAgentOnKubernetesEnvironment:
+                $state.go('portainer.endpoints.endpoint', { id: endpoint.Id });
+                break;
+              case PortainerEndpointTypes.AgentOnKubernetesEnvironment:
+                $state.go('portainer.k8sendpoint.kubernetesConfig', { id: endpoint.Id });
+                break;
+              default:
+                $state.go('portainer.endpoints', {}, { reload: true });
+                break;
+            }
 
-    function initView() {
-      $q.all({
-        groups: GroupService.groups(),
-        tags: TagService.tags(),
-        settings: SettingsService.settings(),
-      })
-        .then(function success(data) {
-          $scope.groups = data.groups;
-          $scope.availableTags = data.tags;
+            return endpoint;
+          } catch (err) {
+            Notifications.error('Failure', err, 'Unable to create environment');
+          } finally {
+            $scope.state.actionInProgress = false;
+          }
+        });
+      }
 
-          const settings = data.settings;
-          $scope.state.availableEdgeAgentCheckinOptions[0].key += ` (${settings.EdgeAgentCheckinInterval} seconds)`;
+      function initView() {
+        $q.all({
+          groups: GroupService.groups(),
+          tags: TagService.tags(),
+          settings: SettingsService.settings(),
         })
-        .catch(function error(err) {
-          Notifications.error('Failure', err, 'Unable to load groups');
-        });
-    }
+          .then(function success(data) {
+            $scope.groups = data.groups;
+            $scope.availableTags = data.tags;
+
+            const settings = data.settings;
+            $scope.state.availableEdgeAgentCheckinOptions[0].key += ` (${settings.EdgeAgentCheckinInterval} seconds)`;
+          })
+          .catch(function error(err) {
+            Notifications.error('Failure', err, 'Unable to load groups');
+          });
+      }
 
-    initView();
-  });
+      initView();
+    }
+  );
diff --git a/app/portainer/views/endpoints/create/createendpoint.html b/app/portainer/views/endpoints/create/createendpoint.html
index 8029aea7f..3183d5be8 100644
--- a/app/portainer/views/endpoints/create/createendpoint.html
+++ b/app/portainer/views/endpoints/create/createendpoint.html
@@ -8,17 +8,15 @@
     <rd-widget>
       <rd-widget-body>
         <form class="form-horizontal" name="endpointCreationForm">
-          <div class="col-sm-12 form-section-title">
-            Environment type
-          </div>
+          <div class="col-sm-12 form-section-title"> Environment type </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 ng-click="resetEndpointURL()">
                 <input type="radio" id="agent_endpoint" ng-model="state.EnvironmentType" value="agent" />
                 <label for="agent_endpoint" data-cy="endpointCreate-agentSelectButton">
                   <div class="boxselector_header">
-                    <i class="fa fa-bolt" aria-hidden="true" style="margin-right: 2px;"></i>
+                    <i class="fa fa-bolt" aria-hidden="true" style="margin-right: 2px"></i>
                     Agent
                   </div>
                   <p>Portainer agent</p>
@@ -28,7 +26,7 @@
                 <input type="radio" id="edge_agent_endpoint" ng-model="state.EnvironmentType" value="edge_agent" />
                 <label for="edge_agent_endpoint" data-cy="endpointCreate-edgeAgentSelectButton">
                   <div class="boxselector_header">
-                    <i class="fa fa-cloud" aria-hidden="true" style="margin-right: 2px;"></i>
+                    <i class="fa fa-cloud" aria-hidden="true" style="margin-right: 2px"></i>
                     Edge Agent
                   </div>
                   <p>Portainer Edge agent</p>
@@ -38,7 +36,7 @@
                 <input type="radio" id="docker_endpoint" ng-model="state.EnvironmentType" value="docker" />
                 <label for="docker_endpoint" data-cy="endpointCreate-dockerSelectButton">
                   <div class="boxselector_header">
-                    <i class="fab fa-docker" aria-hidden="true" style="margin-right: 2px;"></i>
+                    <i class="fab fa-docker" aria-hidden="true" style="margin-right: 2px"></i>
                     Docker
                   </div>
                   <p>Directly connect to the Docker API</p>
@@ -48,7 +46,7 @@
                 <input type="radio" id="kubernetes_endpoint" ng-model="state.EnvironmentType" value="kubernetes" />
                 <label for="kubernetes_endpoint" data-cy="endpointCreate-kubeSelectButton">
                   <div class="boxselector_header">
-                    <i class="fas fa-dharmachakra" aria-hidden="true" style="margin-right: 2px;"></i>
+                    <i class="fas fa-dharmachakra" aria-hidden="true" style="margin-right: 2px"></i>
                     Kubernetes
                   </div>
                   <p>Local Kubernetes environment</p>
@@ -58,7 +56,7 @@
                 <input type="radio" id="azure_endpoint" ng-model="state.EnvironmentType" value="azure" />
                 <label for="azure_endpoint" data-cy="endpointCreate-azureSelectButton">
                   <div class="boxselector_header">
-                    <i class="fab fa-microsoft" aria-hidden="true" style="margin-right: 2px;"></i>
+                    <i class="fab fa-microsoft" aria-hidden="true" style="margin-right: 2px"></i>
                     Azure
                   </div>
                   <p>Connect to Microsoft Azure ACI</p>
@@ -67,9 +65,7 @@
             </div>
           </div>
           <div ng-if="state.EnvironmentType === 'docker'">
-            <div class="col-sm-12 form-section-title">
-              Important notice
-            </div>
+            <div class="col-sm-12 form-section-title"> Important notice </div>
             <div class="form-group">
               <p class="col-sm-12 text-muted small">
                 You can connect Portainer to a Docker environment via socket or via TCP. You can find more information about how to expose the Docker API over TCP
@@ -86,37 +82,35 @@
             </div>
           </div>
           <div ng-if="state.EnvironmentType === 'agent'">
-            <div class="col-sm-12 form-section-title">
-              Information
-            </div>
+            <div class="col-sm-12 form-section-title"> Information </div>
             <div class="form-group">
               <span class="col-sm-12 text-muted small">
                 Ensure that you have deployed the Portainer agent in your cluster first. Refer to the platform related command below to deploy it.
-                <div class="input-group input-group-sm" style="margin-top: 10px; margin-bottom: 10px;">
+                <div class="input-group input-group-sm" style="margin-top: 10px; margin-bottom: 10px">
                   <div class="btn-group btn-group-sm">
-                    <label class="btn btn-primary" ng-model="state.PlatformType" uib-btn-radio="'linux'"><i class="fab fa-linux" style="margin-right: 2px;"></i> Linux</label>
-                    <label class="btn btn-primary" ng-model="state.PlatformType" uib-btn-radio="'windows'"><i class="fab fa-windows" style="margin-right: 2px;"></i> Windows</label>
+                    <label class="btn btn-primary" ng-model="state.PlatformType" uib-btn-radio="'linux'"><i class="fab fa-linux" style="margin-right: 2px"></i> Linux</label>
+                    <label class="btn btn-primary" ng-model="state.PlatformType" uib-btn-radio="'windows'"><i class="fab fa-windows" style="margin-right: 2px"></i> Windows</label>
                   </div>
                 </div>
-                <div style="margin-top: 10px;">
+                <div style="margin-top: 10px">
                   <uib-tabset active="state.deploymentTab">
                     <uib-tab index="0" ng-if="state.PlatformType === 'linux'" heading="Kubernetes via load balancer">
-                      <code style="display: block; white-space: pre-wrap; padding: 16px 90px;">{{ deployCommands.kubeLoadBalancer }}</code>
+                      <code style="display: block; white-space: pre-wrap; padding: 16px 90px">{{ deployCommands.kubeLoadBalancer }}</code>
                     </uib-tab>
 
                     <uib-tab index="1" ng-if="state.PlatformType === 'linux'" heading="Kubernetes via node port">
-                      <code style="display: block; white-space: pre-wrap; padding: 16px 90px;">{{ deployCommands.kubeNodePort }}</code>
+                      <code style="display: block; white-space: pre-wrap; padding: 16px 90px">{{ deployCommands.kubeNodePort }}</code>
                     </uib-tab>
 
                     <uib-tab index="2" heading="Docker Swarm">
-                      <code ng-if="state.PlatformType === 'linux'" style="display: block; white-space: pre-wrap; padding: 16px 90px;">{{ deployCommands.agentLinux }}</code>
-                      <code ng-if="state.PlatformType === 'windows'" style="display: block; white-space: pre-wrap; padding: 16px 90px;">{{ deployCommands.agentWindows }}</code>
+                      <code ng-if="state.PlatformType === 'linux'" style="display: block; white-space: pre-wrap; padding: 16px 90px">{{ deployCommands.agentLinux }}</code>
+                      <code ng-if="state.PlatformType === 'windows'" style="display: block; white-space: pre-wrap; padding: 16px 90px">{{ deployCommands.agentWindows }}</code>
                     </uib-tab>
                   </uib-tabset>
-                  <div style="margin-top: 10px;">
+                  <div style="margin-top: 10px">
                     <span class="btn btn-primary btn-sm space-left" ng-click="copyAgentCommand()"><i class="fa fa-copy space-right" aria-hidden="true"></i>Copy command</span>
                     <span>
-                      <i id="copyNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none;"></i>
+                      <i id="copyNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none"></i>
                     </span>
                   </div>
                 </div>
@@ -124,9 +118,7 @@
             </div>
           </div>
           <div ng-if="state.EnvironmentType === 'edge_agent'">
-            <div class="col-sm-12 form-section-title">
-              Information
-            </div>
+            <div class="col-sm-12 form-section-title"> Information </div>
             <div class="form-group">
               <span class="col-sm-12 text-muted small">
                 <p>
@@ -138,33 +130,25 @@
             </div>
           </div>
           <div ng-if="state.EnvironmentType === 'kubernetes'">
-            <div class="col-sm-12 form-section-title">
-              Important notice
-            </div>
+            <div class="col-sm-12 form-section-title"> Important notice </div>
             <div class="form-group">
-              <p class="col-sm-12 text-muted small">
-                This will allow you to manage the Kubernetes environment where Portainer is running.
-              </p>
+              <p class="col-sm-12 text-muted small"> This will allow you to manage the Kubernetes environment where Portainer is running. </p>
 
               <p class="col-sm-12 text-muted small">
-                <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>
                 In order to manage a remote Kubernetes environment, please use the Agent or Edge agent options.
               </p>
             </div>
           </div>
           <div ng-if="state.EnvironmentType === 'azure'">
-            <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">
                 <span class="small">
-                  <p class="text-muted"> <i class="fa fa-flask orange-icon" aria-hidden="true" style="margin-right: 2px;"></i> This feature is experimental. </p>
-                  <p class="text-primary">
-                    Connect to Microsoft Azure to manage Azure Container Instances (ACI).
-                  </p>
+                  <p class="text-muted"> <i class="fa fa-flask orange-icon" aria-hidden="true" style="margin-right: 2px"></i> This feature is experimental. </p>
+                  <p class="text-primary"> Connect to Microsoft Azure to manage Azure Container Instances (ACI). </p>
                   <p class="text-muted">
-                    <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>
                     Have a look at
                     <a href="https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-create-service-principal-portal" target="_blank"
                       >the Azure documentation</a
@@ -175,9 +159,7 @@
               </div>
             </div>
           </div>
-          <div class="col-sm-12 form-section-title">
-            Environment details
-          </div>
+          <div class="col-sm-12 form-section-title"> Environment details </div>
           <!-- name-input -->
           <div class="form-group">
             <label for="container_name" class="col-sm-3 col-lg-2 control-label text-left">Name</label>
@@ -204,22 +186,18 @@
           <!-- !name-input -->
           <!-- connect-via-socket-input -->
           <div ng-if="state.EnvironmentType === 'docker'">
-            <div class="form-group" style="padding-left: 15px;">
-              <label for="connect_socket" class="col-sm_12 control-label text-left">
-                Connect via socket
-              </label>
-              <label class="switch" style="margin-left: 20px;">
+            <div class="form-group" style="padding-left: 15px">
+              <label for="connect_socket" class="col-sm_12 control-label text-left"> Connect via socket </label>
+              <label class="switch" style="margin-left: 20px">
                 <input type="checkbox" ng-model="formValues.ConnectSocket" /><i data-cy="endpointCreate-connectSocketSwitch"></i>
               </label>
             </div>
           </div>
 
           <div ng-if="state.EnvironmentType === 'docker' && formValues.ConnectSocket">
-            <div class="form-group" style="padding-left: 15px;">
-              <label for="override_socket" class="col-sm_12 control-label text-left">
-                Override default socket path
-              </label>
-              <label class="switch" style="margin-left: 20px;">
+            <div class="form-group" style="padding-left: 15px">
+              <label for="override_socket" class="col-sm_12 control-label text-left"> Override default socket path </label>
+              <label class="switch" style="margin-left: 20px">
                 <input type="checkbox" ng-model="formValues.OverrideSocket" /><i data-cy="endpointCreate-overrideSocketSwitch"></i>
               </label>
             </div>
@@ -443,14 +421,10 @@
           <!-- endpoint-security -->
           <por-endpoint-security ng-if="state.EnvironmentType === 'docker' && !formValues.ConnectSocket" form-data="formValues.SecurityFormData"></por-endpoint-security>
           <!-- !endpoint-security -->
-          <div class="col-sm-12 form-section-title">
-            Metadata
-          </div>
+          <div class="col-sm-12 form-section-title"> Metadata </div>
           <!-- group -->
           <div class="form-group">
-            <label for="endpoint_group" class="col-sm-3 col-lg-2 control-label text-left">
-              Group
-            </label>
+            <label for="endpoint_group" class="col-sm-3 col-lg-2 control-label text-left"> Group </label>
             <div class="col-sm-9 col-lg-10">
               <select
                 ng-options="group.Id as group.Name for group in groups"
@@ -468,9 +442,7 @@
             </tag-selector>
           </div>
           <!-- !tags -->
-          <div class="col-sm-12 form-section-title">
-            Actions
-          </div>
+          <div class="col-sm-12 form-section-title"> Actions </div>
           <!-- actions -->
           <div class="form-group">
             <div class="col-sm-12">
diff --git a/app/portainer/views/endpoints/edit/endpoint.html b/app/portainer/views/endpoints/edit/endpoint.html
index 64e7ee1b9..267518131 100644
--- a/app/portainer/views/endpoints/edit/endpoint.html
+++ b/app/portainer/views/endpoints/edit/endpoint.html
@@ -13,7 +13,7 @@
   <information-panel ng-if="state.edgeEndpoint && endpoint.EdgeID" title-text="Edge information">
     <span class="small text-muted">
       <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 Edge environment is associated to an Edge environment {{ state.kubernetesEndpoint ? '(Kubernetes)' : '(Docker)' }}.
       </p>
       <p>
@@ -41,16 +41,16 @@
   <information-panel ng-if="state.edgeEndpoint && !endpoint.EdgeID" title-text="Deploy an agent">
     <span class="small text-muted">
       <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>
         Refer to the platform related command below to deploy the Edge agent in your remote cluster.
       </p>
       <p>
         The agent will communicate with Portainer via <u>{{ edgeKeyDetails.instanceURL }}</u> and <u>tcp://{{ edgeKeyDetails.tunnelServerAddr }}</u>
       </p>
-      <div class="input-group input-group-sm" style="margin-top: 10px; margin-bottom: 10px;">
+      <div class="input-group input-group-sm" style="margin-top: 10px; margin-bottom: 10px">
         <div class="btn-group btn-group-sm">
-          <label class="btn btn-primary" ng-model="state.platformType" uib-btn-radio="'linux'"><i class="fab fa-linux" style="margin-right: 2px;"></i> Linux</label>
-          <label class="btn btn-primary" ng-model="state.platformType" uib-btn-radio="'windows'"><i class="fab fa-windows" style="margin-right: 2px;"></i> Windows</label>
+          <label class="btn btn-primary" ng-model="state.platformType" uib-btn-radio="'linux'"><i class="fab fa-linux" style="margin-right: 2px"></i> Linux</label>
+          <label class="btn btn-primary" ng-model="state.platformType" uib-btn-radio="'windows'"><i class="fab fa-windows" style="margin-right: 2px"></i> Windows</label>
         </div>
       </div>
 
@@ -61,51 +61,49 @@
         on-change="(onToggleAllowSelfSignedCerts)"
       ></por-switch-field>
 
-      <div style="margin-top: 10px;">
+      <div style="margin-top: 10px">
         <uib-tabset active="state.deploymentTab">
           <uib-tab index="'kubernetes'" heading="Kubernetes" ng-if="state.platformType === 'linux'">
-            <code style="display: block; white-space: pre-wrap; padding: 16px 45px;">
+            <code style="display: block; white-space: pre-wrap; padding: 16px 45px">
               {{ dockerCommands[state.deploymentTab][state.platformType](agentVersion, agentShortVersion, randomEdgeID, endpoint.EdgeKey, state.allowSelfSignedCerts) }}
             </code>
           </uib-tab>
           <uib-tab index="'swarm'" heading="Docker Swarm">
-            <code style="display: block; white-space: pre-wrap; padding: 16px 45px;">
+            <code style="display: block; white-space: pre-wrap; padding: 16px 45px">
               {{ dockerCommands[state.deploymentTab][state.platformType](agentVersion, agentShortVersion, randomEdgeID, endpoint.EdgeKey, state.allowSelfSignedCerts) }}
             </code>
           </uib-tab>
           <uib-tab index="'standalone'" heading="Docker Standalone">
-            <code style="display: block; white-space: pre-wrap; padding: 16px 45px;">
+            <code style="display: block; white-space: pre-wrap; padding: 16px 45px">
               {{ dockerCommands[state.deploymentTab][state.platformType](agentVersion, agentShortVersion, randomEdgeID, endpoint.EdgeKey, state.allowSelfSignedCerts) }}
             </code>
           </uib-tab>
         </uib-tabset>
-        <div style="margin-top: 10px;">
+        <div style="margin-top: 10px">
           <span class="btn btn-primary btn-sm" ng-click="copyEdgeAgentDeploymentCommand()"><i class="fa fa-copy space-right" aria-hidden="true"></i>Copy command</span>
-          <span id="copyNotificationDeploymentCommand" style="margin-left: 7px; display: none; color: #23ae89;"> <i class="fa fa-check" aria-hidden="true"></i> copied </span>
+          <span id="copyNotificationDeploymentCommand" style="margin-left: 7px; display: none; color: #23ae89"> <i class="fa fa-check" aria-hidden="true"></i> copied </span>
         </div>
       </div>
-      <div class="col-sm-12 form-section-title" style="margin-top: 25px;">
-        Join token
-      </div>
+      <div class="col-sm-12 form-section-title" style="margin-top: 25px"> Join token </div>
       <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>
         For those prestaging the edge agent, use the following join token to associate the Edge agent with this environment.
       </p>
       <p> You can read more about pre-staging in the userguide available <a href="https://downloads.portainer.io/edge_agent_guide.pdf">here.</a> </p>
-      <div style="margin-top: 10px; overflow-wrap: break-word;">
+      <div style="margin-top: 10px; overflow-wrap: break-word">
         <code>
           {{ endpoint.EdgeKey }}
         </code>
-        <div style="margin-top: 10px;">
+        <div style="margin-top: 10px">
           <span class="btn btn-primary btn-sm" ng-click="copyEdgeAgentKey()"><i class="fa fa-copy space-right" aria-hidden="true"></i>Copy token</span>
-          <span id="copyNotificationEdgeKey" style="margin-left: 7px; display: none; color: #23ae89;"> <i class="fa fa-check" aria-hidden="true"></i> copied </span>
+          <span id="copyNotificationEdgeKey" style="margin-left: 7px; display: none; color: #23ae89"> <i class="fa fa-check" aria-hidden="true"></i> copied </span>
         </div>
       </div>
     </span>
   </information-panel>
   <information-panel ng-if="state.kubernetesEndpoint && (!state.edgeEndpoint || (state.edgeEndpoint && endpoint.EdgeID))" title-text="Kubernetes features configuration">
     <span class="small text-muted">
-      <i class="fa fa-tools blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+      <i class="fa fa-tools blue-icon" aria-hidden="true" style="margin-right: 2px"></i>
       You should configure the features available in this Kubernetes environment in the
       <a ui-sref="portainer.k8sendpoint.kubernetesConfig({id: endpoint.Id})">Kubernetes configuration</a> view.
     </span>
@@ -117,9 +115,7 @@
     <rd-widget>
       <rd-widget-body>
         <form class="form-horizontal">
-          <div class="col-sm-12 form-section-title">
-            Configuration
-          </div>
+          <div class="col-sm-12 form-section-title"> Configuration </div>
           <!-- name-input -->
           <div class="form-group">
             <label for="container_name" class="col-sm-3 col-lg-2 control-label text-left">Name</label>
@@ -188,14 +184,10 @@
             tenant-id="endpoint.AzureCredentials.TenantID"
             authentication-key="endpoint.AzureCredentials.AuthenticationKey"
           ></azure-endpoint-config>
-          <div class="col-sm-12 form-section-title">
-            Metadata
-          </div>
+          <div class="col-sm-12 form-section-title"> Metadata </div>
           <!-- group -->
           <div class="form-group">
-            <label for="endpoint_group" class="col-sm-3 col-lg-2 control-label text-left">
-              Group
-            </label>
+            <label for="endpoint_group" class="col-sm-3 col-lg-2 control-label text-left"> Group </label>
             <div class="col-sm-9 col-lg-10">
               <select ng-options="group.Id as group.Name for group in groups" ng-model="endpoint.GroupId" id="endpoint_group" class="form-control"></select>
             </div>
@@ -208,9 +200,7 @@
           <!-- !tags -->
           <!-- endpoint-security -->
           <div ng-if="endpointType === 'remote' && !state.azureEndpoint && !state.kubernetesEndpoint && !state.edgeEndpoint && endpoint.Type !== 6">
-            <div class="col-sm-12 form-section-title">
-              Security
-            </div>
+            <div class="col-sm-12 form-section-title"> Security </div>
             <por-endpoint-security form-data="formValues.SecurityFormData" endpoint="endpoint"></por-endpoint-security>
           </div>
           <!-- !endpoint-security -->
diff --git a/app/portainer/views/home/home.html b/app/portainer/views/home/home.html
index 3e26f3d69..0db84548d 100644
--- a/app/portainer/views/home/home.html
+++ b/app/portainer/views/home/home.html
@@ -17,7 +17,7 @@
 <information-panel ng-if="!isAdmin && endpoints.length === 0" title-text="Information">
   <span class="small text-muted">
     <p>
-      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
       You do not have access to any environment. Please contact your administrator.
     </p>
   </span>
@@ -25,17 +25,17 @@
 
 <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="state.connectingToEdgeEndpoint"
 >
   Connecting to the Edge environment...
-  <i class="fa fa-cog fa-spin" style="margin-left: 5px;"></i>
+  <i class="fa fa-cog fa-spin" style="margin-left: 5px"></i>
 </div>
 
 <information-panel ng-if="isAdmin && endpoints.length === 0" title-text="Information">
   <span class="small text-muted">
     <p>
-      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
       No environment available for management. Please head over the
       <a ui-sref="portainer.endpoints.new"> environments view </a>
       to add an environment.
diff --git a/app/portainer/views/home/homeController.js b/app/portainer/views/home/homeController.js
index 9fa9a1da8..51cf5afa4 100644
--- a/app/portainer/views/home/homeController.js
+++ b/app/portainer/views/home/homeController.js
@@ -2,110 +2,100 @@ import EndpointHelper from 'Portainer/helpers/endpointHelper';
 
 angular
   .module('portainer.app')
-  .controller('HomeController', function (
-    $q,
-    $scope,
-    $state,
-    TagService,
-    Authentication,
-    EndpointService,
-    GroupService,
-    Notifications,
-    EndpointProvider,
-    StateManager,
-    ModalService,
-    MotdService
-  ) {
-    $scope.state = {
-      connectingToEdgeEndpoint: false,
-      homepageLoadTime: '',
-    };
+  .controller(
+    'HomeController',
+    function ($q, $scope, $state, TagService, Authentication, EndpointService, GroupService, Notifications, EndpointProvider, StateManager, ModalService, MotdService) {
+      $scope.state = {
+        connectingToEdgeEndpoint: false,
+        homepageLoadTime: '',
+      };
 
-    $scope.goToEdit = function (id) {
-      $state.go('portainer.endpoints.endpoint', { id: id });
-    };
+      $scope.goToEdit = function (id) {
+        $state.go('portainer.endpoints.endpoint', { id: id });
+      };
 
-    $scope.goToDashboard = function (endpoint) {
-      if (endpoint.Type === 3) {
-        $state.go('azure.dashboard', { endpointId: endpoint.Id });
-        return;
-      }
-      if (endpoint.Type === 4 || endpoint.Type === 7) {
-        if (!endpoint.EdgeID) {
-          $state.go('portainer.endpoints.endpoint', { id: endpoint.Id });
+      $scope.goToDashboard = function (endpoint) {
+        if (endpoint.Type === 3) {
+          $state.go('azure.dashboard', { endpointId: endpoint.Id });
           return;
         }
-        $scope.state.connectingToEdgeEndpoint = true;
-      }
-      if (endpoint.Type === 5 || endpoint.Type === 6 || endpoint.Type === 7) {
-        $state.go('kubernetes.dashboard', { endpointId: endpoint.Id });
-        return;
-      }
-      $state.go('docker.dashboard', { endpointId: endpoint.Id });
-    };
-
-    $scope.dismissImportantInformation = function (hash) {
-      StateManager.dismissImportantInformation(hash);
-    };
-
-    $scope.dismissInformationPanel = function (id) {
-      StateManager.dismissInformationPanel(id);
-    };
-
-    $scope.triggerSnapshot = function () {
-      ModalService.confirmEndpointSnapshot(function (result) {
-        if (!result) {
+        if (endpoint.Type === 4 || endpoint.Type === 7) {
+          if (!endpoint.EdgeID) {
+            $state.go('portainer.endpoints.endpoint', { id: endpoint.Id });
+            return;
+          }
+          $scope.state.connectingToEdgeEndpoint = true;
+        }
+        if (endpoint.Type === 5 || endpoint.Type === 6 || endpoint.Type === 7) {
+          $state.go('kubernetes.dashboard', { endpointId: endpoint.Id });
           return;
         }
-        triggerSnapshot();
-      });
-    };
+        $state.go('docker.dashboard', { endpointId: endpoint.Id });
+      };
 
-    function triggerSnapshot() {
-      EndpointService.snapshotEndpoints()
-        .then(function success() {
-          Notifications.success('Success', 'Environments updated');
-          $state.reload();
-        })
-        .catch(function error(err) {
-          Notifications.error('Failure', err, 'An error occured during environment snapshot');
+      $scope.dismissImportantInformation = function (hash) {
+        StateManager.dismissImportantInformation(hash);
+      };
+
+      $scope.dismissInformationPanel = function (id) {
+        StateManager.dismissInformationPanel(id);
+      };
+
+      $scope.triggerSnapshot = function () {
+        ModalService.confirmEndpointSnapshot(function (result) {
+          if (!result) {
+            return;
+          }
+          triggerSnapshot();
         });
-    }
+      };
+
+      function triggerSnapshot() {
+        EndpointService.snapshotEndpoints()
+          .then(function success() {
+            Notifications.success('Success', 'Environments updated');
+            $state.reload();
+          })
+          .catch(function error(err) {
+            Notifications.error('Failure', err, 'An error occured during environment snapshot');
+          });
+      }
 
-    $scope.getPaginatedEndpoints = getPaginatedEndpoints;
-    function getPaginatedEndpoints(lastId, limit, search) {
-      const deferred = $q.defer();
-      $q.all({
-        endpoints: EndpointService.endpoints(lastId, limit, { search }),
-        groups: GroupService.groups(),
-      })
-        .then(function success(data) {
-          var endpoints = data.endpoints.value;
-          var groups = data.groups;
-          EndpointHelper.mapGroupNameToEndpoint(endpoints, groups);
-          EndpointProvider.setEndpoints(endpoints);
-          deferred.resolve({ endpoints: endpoints, totalCount: data.endpoints.totalCount });
+      $scope.getPaginatedEndpoints = getPaginatedEndpoints;
+      function getPaginatedEndpoints(lastId, limit, search) {
+        const deferred = $q.defer();
+        $q.all({
+          endpoints: EndpointService.endpoints(lastId, limit, { search }),
+          groups: GroupService.groups(),
         })
-        .catch(function error(err) {
-          Notifications.error('Failure', err, 'Unable to retrieve environment information');
-        });
-      return deferred.promise;
-    }
+          .then(function success(data) {
+            var endpoints = data.endpoints.value;
+            var groups = data.groups;
+            EndpointHelper.mapGroupNameToEndpoint(endpoints, groups);
+            EndpointProvider.setEndpoints(endpoints);
+            deferred.resolve({ endpoints: endpoints, totalCount: data.endpoints.totalCount });
+          })
+          .catch(function error(err) {
+            Notifications.error('Failure', err, 'Unable to retrieve environment information');
+          });
+        return deferred.promise;
+      }
 
-    async function initView() {
-      $scope.state.homepageLoadTime = Math.floor(Date.now() / 1000);
-      $scope.isAdmin = Authentication.isAdmin();
+      async function initView() {
+        $scope.state.homepageLoadTime = Math.floor(Date.now() / 1000);
+        $scope.isAdmin = Authentication.isAdmin();
 
-      MotdService.motd().then(function success(data) {
-        $scope.motd = data;
-      });
+        MotdService.motd().then(function success(data) {
+          $scope.motd = data;
+        });
 
-      try {
-        $scope.tags = await TagService.tags();
-      } catch (err) {
-        Notifications.error('Failed loading page data', err);
+        try {
+          $scope.tags = await TagService.tags();
+        } catch (err) {
+          Notifications.error('Failed loading page data', err);
+        }
       }
-    }
 
-    initView();
-  });
+      initView();
+    }
+  );
diff --git a/app/portainer/views/init/admin/initAdmin.html b/app/portainer/views/init/admin/initAdmin.html
index aad4b127d..872652cb6 100644
--- a/app/portainer/views/init/admin/initAdmin.html
+++ b/app/portainer/views/init/admin/initAdmin.html
@@ -12,30 +12,26 @@
       <div class="panel panel-default">
         <div class="panel-body">
           <!-- toggle -->
-          <div style="padding-bottom: 12px;">
+          <div style="padding-bottom: 12px">
             <a ng-click="togglePanel()">
               <i ng-class="{ true: 'glyphicon glyphicon-chevron-down', false: 'glyphicon glyphicon-chevron-right' }[state.showInitPassword]" aria-hidden="true"></i
-              ><span style="padding-left: 10px;">New Portainer installation</span>
+              ><span style="padding-left: 10px">New Portainer installation</span>
             </a>
           </div>
           <!-- !toggle -->
 
           <!-- init password form -->
-          <form class="simple-box-form form-horizontal" style="padding-left: 30px;" ng-if="state.showInitPassword">
+          <form class="simple-box-form form-horizontal" style="padding-left: 30px" ng-if="state.showInitPassword">
             <!-- note -->
             <div class="form-group">
               <div class="col-sm-12">
-                <span class="small text-muted">
-                  Please create the initial administrator user.
-                </span>
+                <span class="small text-muted"> Please create the initial administrator user. </span>
               </div>
             </div>
             <!-- !note -->
             <!-- username-input -->
             <div class="form-group">
-              <label for="username" class="col-sm-4 control-label text-left">
-                Username
-              </label>
+              <label for="username" class="col-sm-4 control-label text-left"> Username </label>
               <div class="col-sm-8">
                 <input type="text" class="form-control" id="username" ng-model="formValues.Username" placeholder="e.g. admin" />
               </div>
@@ -95,7 +91,7 @@
             <div class="form-group">
               <div class="col-sm-12">
                 <input type="checkbox" name="toggle_enableTelemetry" ng-model="formValues.enableTelemetry" />
-                <span class="text-muted small" style="margin-left: 2px;"
+                <span class="text-muted small" style="margin-left: 2px"
                   >Allow collection of anonymous statistics. You can find more information about this in our
                   <a href="https://www.portainer.io/documentation/in-app-analytics-and-privacy-policy/" target="_blank">privacy policy</a>.</span
                 >
@@ -112,16 +108,16 @@
       <div class="panel panel-default">
         <div class="panel-body">
           <!-- toggle -->
-          <div style="padding-bottom: 12px;">
+          <div style="padding-bottom: 12px">
             <a ng-click="togglePanel()">
               <i ng-class="{ true: 'glyphicon glyphicon-chevron-down', false: 'glyphicon glyphicon-chevron-right' }[state.showRestorePortainer]" aria-hidden="true"></i
-              ><span style="padding-left: 10px;">Restore Portainer from backup</span>
+              ><span style="padding-left: 10px">Restore Portainer from backup</span>
             </a>
           </div>
           <!-- !toggle -->
 
           <!-- restore form -->
-          <form class="simple-box-form form-horizontal" style="padding-left: 30px;" ng-if="state.showRestorePortainer">
+          <form class="simple-box-form form-horizontal" style="padding-left: 30px" ng-if="state.showRestorePortainer">
             <!-- note -->
             <div class="form-group">
               <div class="col-sm-9">
@@ -135,9 +131,9 @@
               <div class="boxselector_wrapper">
                 <div>
                   <input type="radio" id="restore_file" checked="checked" />
-                  <label for="restore_file" style="padding-bottom: 20px;">
+                  <label for="restore_file" style="padding-bottom: 20px">
                     <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 backup file
                     </div>
                     <p></p>
@@ -145,9 +141,9 @@
                 </div>
                 <div>
                   <input type="radio" id="restore_s3" disabled />
-                  <label for="restore_s3" class="boxselector_disabled" style="background-color: #ffffff;">
+                  <label for="restore_s3" class="boxselector_disabled" style="background-color: #ffffff">
                     <div class="boxselector_header">
-                      <i class="fa fa-download" aria-hidden="true" style="margin-right: 2px;"></i>
+                      <i class="fa fa-download" aria-hidden="true" style="margin-right: 2px"></i>
                       Retrieve from S3
                     </div>
                     <p>This feature is available in <a href="https://www.portainer.io/business-upsell?from=restore-s3-form" target="_blank"> Portainer Business Edition</a></p>
@@ -158,9 +154,7 @@
             <!-- note -->
             <div class="form-group">
               <div class="col-sm-12">
-                <span class="small text-muted">
-                  You can upload a backup file from your computer.
-                </span>
+                <span class="small text-muted"> You can upload a backup file from your computer. </span>
               </div>
             </div>
             <!-- !note -->
@@ -168,15 +162,15 @@
             <div class="form-group">
               <div class="col-sm-12">
                 <button
-                    class="btn btn-sm btn-primary"
-                    ngf-select
-                    accept=".gz,.encrypted"
-                    ngf-accept="'application/x-tar,application/x-gzip'"
-                    ng-model="formValues.BackupFile"
-                    auto-focus
-                    >Select file</button
-                  >
-                <span style="margin-left: 5px;">
+                  class="btn btn-sm btn-primary"
+                  ngf-select
+                  accept=".gz,.encrypted"
+                  ngf-accept="'application/x-tar,application/x-gzip'"
+                  ng-model="formValues.BackupFile"
+                  auto-focus
+                  >Select file</button
+                >
+                <span style="margin-left: 5px">
                   {{ formValues.BackupFile.name }}
                   <i class="fa fa-times red-icon" ng-if="!formValues.BackupFile" aria-hidden="true"></i>
                 </span>
@@ -200,14 +194,10 @@
             <!-- note -->
             <div class="form-group">
               <div class="col-sm-12">
-                <span class="small text-muted">
-                  You are about to restore Portainer from this backup.
-                </span>
+                <span class="small text-muted"> You are about to restore Portainer from this backup. </span>
               </div>
               <div class="col-sm-12">
-                <span class="small text-muted">
-                  After restoring has completed, please log in as a user that was known by the Portainer that was restored.
-                </span>
+                <span class="small text-muted"> After restoring has completed, please log in as a user that was known by the Portainer that was restored. </span>
               </div>
             </div>
             <!-- !note -->
diff --git a/app/portainer/views/init/endpoint/includes/agent.html b/app/portainer/views/init/endpoint/includes/agent.html
index 535355cdd..61984073e 100644
--- a/app/portainer/views/init/endpoint/includes/agent.html
+++ b/app/portainer/views/init/endpoint/includes/agent.html
@@ -1,18 +1,12 @@
-<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">
     <span class="small">
-      <p class="text-primary">
-        Connect directly to a Portainer agent running inside a Docker or Kubernetes environment.
-      </p>
+      <p class="text-primary"> Connect directly to a Portainer agent running inside a Docker or Kubernetes environment. </p>
     </span>
   </div>
 </div>
-<div class="col-sm-12 form-section-title">
-  Environment
-</div>
+<div class="col-sm-12 form-section-title"> Environment </div>
 <!-- name-input -->
 <div class="form-group">
   <label for="endpoint_name" class="col-sm-4 col-lg-3 control-label text-left">Name</label>
diff --git a/app/portainer/views/init/endpoint/includes/localDocker.html b/app/portainer/views/init/endpoint/includes/localDocker.html
index aea934557..3b3e890b1 100644
--- a/app/portainer/views/init/endpoint/includes/localDocker.html
+++ b/app/portainer/views/init/endpoint/includes/localDocker.html
@@ -1,20 +1,14 @@
-<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">
     <span class="small">
-      <p class="text-primary">
-        Manage the Docker environment where Portainer is running.
-      </p>
+      <p class="text-primary"> Manage the Docker environment where Portainer is running. </p>
       <p class="text-muted">
-        <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+        <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
         Ensure that you have started the Portainer container with the following Docker flag:
       </p>
       <p class="text-muted"> <code>-v "/var/run/docker.sock:/var/run/docker.sock"</code> (Linux). </p>
-      <p class="text-muted">
-        or
-      </p>
+      <p class="text-muted"> or </p>
       <p class="text-muted"> <code>-v \\.\pipe\docker_engine:\\.\pipe\docker_engine</code> (Windows). </p>
     </span>
   </div>
diff --git a/app/portainer/views/init/endpoint/includes/localKubernetes.html b/app/portainer/views/init/endpoint/includes/localKubernetes.html
index 8c2204f56..bdc9277ac 100644
--- a/app/portainer/views/init/endpoint/includes/localKubernetes.html
+++ b/app/portainer/views/init/endpoint/includes/localKubernetes.html
@@ -1,12 +1,8 @@
-<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">
     <span class="small">
-      <p class="text-primary">
-        Manage the Kubernetes environment where Portainer is running.
-      </p>
+      <p class="text-primary"> Manage the Kubernetes environment where Portainer is running. </p>
     </span>
   </div>
 </div>
diff --git a/app/portainer/views/init/endpoint/initEndpoint.html b/app/portainer/views/init/endpoint/initEndpoint.html
index 4d0e2e1cb..c67c96171 100644
--- a/app/portainer/views/init/endpoint/initEndpoint.html
+++ b/app/portainer/views/init/endpoint/initEndpoint.html
@@ -16,20 +16,18 @@
             <!-- note -->
             <div class="form-group">
               <div class="col-sm-12">
-                <span class="small text-muted">
-                  Connect Portainer to the container environment you want to manage.
-                </span>
+                <span class="small text-muted"> Connect Portainer to the container environment you want to manage. </span>
               </div>
             </div>
             <!-- !note -->
             <!-- environment-type -->
-            <div class="form-group" style="margin-bottom: 0;">
+            <div class="form-group" style="margin-bottom: 0">
               <div class="boxselector_wrapper">
                 <div ng-repeat="type in ctrl.endpointSections">
                   <input type="radio" id="{{ type.Id }}" ng-model="ctrl.formValues.ConnectionType" ng-value="type.Value" />
                   <label for="{{ type.Id }}">
                     <div class="boxselector_header">
-                      <i ng-class="type.Classes" aria-hidden="true" style="margin-right: 2px;"></i>
+                      <i ng-class="type.Classes" aria-hidden="true" style="margin-right: 2px"></i>
                       {{ type.Title }}
                     </div>
                     <p>{{ type.Description }}</p>
diff --git a/app/portainer/views/logout/logout.html b/app/portainer/views/logout/logout.html
index 151c04427..2256ffaf3 100644
--- a/app/portainer/views/logout/logout.html
+++ b/app/portainer/views/logout/logout.html
@@ -7,9 +7,9 @@
         <img ng-if="!ctrl.logo" src="~@/assets/images/logo_alt.svg" class="simple-box-logo" alt="Portainer" />
         <img ng-if="ctrl.logo" ng-src="{{ ctrl.logo }}" class="simple-box-logo" />
       </div>
-      <div class="row" style="text-align: center;">
+      <div class="row" style="text-align: center">
         Logout in progress...
-        <i class="fa fa-cog fa-spin" style="margin-left: 5px;"></i>
+        <i class="fa fa-cog fa-spin" style="margin-left: 5px"></i>
       </div>
     </div>
   </div>
diff --git a/app/portainer/views/registries/create/createRegistry.html b/app/portainer/views/registries/create/createRegistry.html
index 98b7e6384..45a58d08f 100644
--- a/app/portainer/views/registries/create/createRegistry.html
+++ b/app/portainer/views/registries/create/createRegistry.html
@@ -8,19 +8,17 @@
     <rd-widget>
       <rd-widget-body>
         <form class="form-horizontal">
-          <div class="col-sm-12 form-section-title">
-            Registry provider
-          </div>
+          <div class="col-sm-12 form-section-title"> Registry provider </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="registry_dockerhub" ng-model="$ctrl.model.Type" ng-value="$ctrl.RegistryTypes.DOCKERHUB" />
                 <label for="registry_dockerhub" ng-click="$ctrl.selectDockerHub()">
                   <div class="boxselector_header">
-                    <i class="fa fa-database" aria-hidden="true" style="margin-right: 2px;"></i>
+                    <i class="fa fa-database" aria-hidden="true" style="margin-right: 2px"></i>
                     DockerHub
                   </div>
                   <p>DockerHub authenticated account</p>
@@ -30,7 +28,7 @@
                 <input type="radio" id="registry_aws_ecr" ng-model="$ctrl.model.Type" ng-value="$ctrl.RegistryTypes.ECR" />
                 <label for="registry_aws_ecr" ng-click="$ctrl.selectEcr()">
                   <div class="boxselector_header">
-                    <i class="fab fa-aws" aria-hidden="true" style="margin-right: 2px;"></i>
+                    <i class="fab fa-aws" aria-hidden="true" style="margin-right: 2px"></i>
                     AWS ECR
                   </div>
                   <p>Amazon elastic container registry</p>
@@ -40,7 +38,7 @@
                 <input type="radio" id="registry_quay" ng-model="$ctrl.model.Type" ng-value="$ctrl.RegistryTypes.QUAY" />
                 <label for="registry_quay" ng-click="$ctrl.selectQuayRegistry()">
                   <div class="boxselector_header">
-                    <i class="fa fa-database" aria-hidden="true" style="margin-right: 2px;"></i>
+                    <i class="fa fa-database" aria-hidden="true" style="margin-right: 2px"></i>
                     Quay.io
                   </div>
                   <p>Quay container registry</p>
@@ -50,7 +48,7 @@
                 <input type="radio" id="registry_proget" ng-model="$ctrl.model.Type" ng-value="$ctrl.RegistryTypes.PROGET" />
                 <label for="registry_proget" ng-click="$ctrl.selectProGetRegistry()">
                   <div class="boxselector_header">
-                    <i class="fa fa-database" aria-hidden="true" style="margin-right: 2px;"></i>
+                    <i class="fa fa-database" aria-hidden="true" style="margin-right: 2px"></i>
                     ProGet
                   </div>
                   <p>ProGet container registry</p>
@@ -60,7 +58,7 @@
                 <input type="radio" id="registry_azure" ng-model="$ctrl.model.Type" ng-value="$ctrl.RegistryTypes.AZURE" />
                 <label for="registry_azure" ng-click="$ctrl.selectAzureRegistry()">
                   <div class="boxselector_header">
-                    <i class="fab fa-microsoft" aria-hidden="true" style="margin-right: 2px;"></i>
+                    <i class="fab fa-microsoft" aria-hidden="true" style="margin-right: 2px"></i>
                     Azure
                   </div>
                   <p>Azure container registry</p>
@@ -70,7 +68,7 @@
                 <input type="radio" id="registry_gitlab" ng-model="$ctrl.model.Type" ng-value="$ctrl.RegistryTypes.GITLAB" />
                 <label for="registry_gitlab" ng-click="$ctrl.selectGitlabRegistry()">
                   <div class="boxselector_header">
-                    <i class="fab fa-gitlab" aria-hidden="true" style="margin-right: 2px;"></i>
+                    <i class="fab fa-gitlab" aria-hidden="true" style="margin-right: 2px"></i>
                     Gitlab
                   </div>
                   <p>Gitlab container registry</p>
@@ -80,7 +78,7 @@
                 <input type="radio" id="registry_custom" ng-model="$ctrl.model.Type" ng-value="$ctrl.RegistryTypes.CUSTOM" />
                 <label for="registry_custom" ng-click="$ctrl.selectCustomRegistry()">
                   <div class="boxselector_header">
-                    <i class="fa fa-database" aria-hidden="true" style="margin-right: 2px;"></i>
+                    <i class="fa fa-database" aria-hidden="true" style="margin-right: 2px"></i>
                     Custom registry
                   </div>
                   <p>Define your own registry</p>
diff --git a/app/portainer/views/registries/edit/registry.html b/app/portainer/views/registries/edit/registry.html
index 7a79deda8..249336c42 100644
--- a/app/portainer/views/registries/edit/registry.html
+++ b/app/portainer/views/registries/edit/registry.html
@@ -40,7 +40,7 @@
                 Authentication
                 <portainer-tooltip position="bottom" message="Enable this option if you need to specify credentials to connect to this registry."></portainer-tooltip>
               </label>
-              <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="registry.Authentication" /><i></i> </label>
+              <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="registry.Authentication" /><i></i> </label>
             </div>
           </div>
           <!-- !authentication-checkbox -->
@@ -74,10 +74,8 @@
             <!-- organisation-checkbox -->
             <div class="form-group">
               <div class="col-sm-12">
-                <label class="control-label text-left">
-                  Use organisation registry
-                </label>
-                <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="registry.Quay.UseOrganisation" /><i></i> </label>
+                <label class="control-label text-left"> Use organisation registry </label>
+                <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="registry.Quay.UseOrganisation" /><i></i> </label>
               </div>
             </div>
             <!-- !organisation-checkbox -->
diff --git a/app/portainer/views/registries/registries.html b/app/portainer/views/registries/registries.html
index 3daf4862b..c42ad6389 100644
--- a/app/portainer/views/registries/registries.html
+++ b/app/portainer/views/registries/registries.html
@@ -8,9 +8,7 @@
 </rd-header>
 
 <information-panel title-text="Information">
-  <span class="small text-muted">
-    View registries via an environment to manage access for user(s) and/or team(s)
-  </span>
+  <span class="small text-muted"> View registries via an environment to manage access for user(s) and/or team(s) </span>
 </information-panel>
 
 <div class="row">
diff --git a/app/portainer/views/settings/authentication/settingsAuthentication.html b/app/portainer/views/settings/authentication/settingsAuthentication.html
index fb8f65639..8ffda0ce0 100644
--- a/app/portainer/views/settings/authentication/settingsAuthentication.html
+++ b/app/portainer/views/settings/authentication/settingsAuthentication.html
@@ -9,9 +9,7 @@
       <rd-widget-header icon="fa-users" title-text="Authentication"></rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal" name="authSettingsForm">
-          <div class="col-sm-12 form-section-title">
-            Configuration
-          </div>
+          <div class="col-sm-12 form-section-title"> Configuration </div>
           <div class="form-group">
             <label for="user_timeout" class="col-sm-2 control-label text-left">
               Session lifetime
@@ -27,14 +25,10 @@
             </div>
           </div>
           <div class="form-group">
-            <span class="col-sm-12 text-muted small">
-              Changing from default is only recommended if you have additional layers of authentication in front of Portainer.
-            </span>
+            <span class="col-sm-12 text-muted small"> Changing from default is only recommended if you have additional layers of authentication in front of Portainer. </span>
           </div>
 
-          <div class="col-sm-12 form-section-title">
-            Authentication method
-          </div>
+          <div class="col-sm-12 form-section-title"> Authentication method </div>
           <box-selector radio-name="'authOptions'" value="authMethod" options="authOptions" on-change="(onChangeAuthMethod)"></box-selector>
 
           <internal-auth ng-if="authenticationMethodSelected(1)" on-save-settings="(saveSettings)" save-button-state="state.actionInProgress"></internal-auth>
diff --git a/app/portainer/views/settings/settings.html b/app/portainer/views/settings/settings.html
index 313f118b1..213a80505 100644
--- a/app/portainer/views/settings/settings.html
+++ b/app/portainer/views/settings/settings.html
@@ -20,22 +20,16 @@
           <!-- logo -->
           <div class="form-group">
             <div class="col-sm-12">
-              <label for="toggle_logo" class="control-label text-left">
-                Use custom logo
-              </label>
-              <label class="switch" style="margin-left: 20px;"> <input type="checkbox" name="toggle_logo" ng-model="formValues.customLogo" /><i></i> </label>
+              <label for="toggle_logo" class="control-label text-left"> Use custom logo </label>
+              <label class="switch" style="margin-left: 20px"> <input type="checkbox" name="toggle_logo" ng-model="formValues.customLogo" /><i></i> </label>
             </div>
           </div>
           <div ng-if="formValues.customLogo">
             <div class="form-group">
-              <span class="col-sm-12 text-muted small">
-                You can specify the URL to your logo here. For an optimal display, logo dimensions should be 155px by 55px.
-              </span>
+              <span class="col-sm-12 text-muted small"> You can specify the URL to your logo here. For an optimal display, logo dimensions should be 155px by 55px. </span>
             </div>
             <div class="form-group">
-              <label for="logo_url" class="col-sm-1 control-label text-left">
-                URL
-              </label>
+              <label for="logo_url" class="col-sm-1 control-label text-left"> URL </label>
               <div class="col-sm-11">
                 <input type="text" class="form-control" ng-model="settings.LogoURL" id="logo_url" placeholder="https://mycompany.com/logo.png" />
               </div>
@@ -45,21 +39,17 @@
           <!-- analytics -->
           <div class="form-group">
             <div class="col-sm-12">
-              <label for="toggle_enableTelemetry" class="control-label text-left">
-                Allow the collection of anonymous statistics
-              </label>
-              <label class="switch" style="margin-left: 20px;"> <input type="checkbox" name="toggle_enableTelemetry" ng-model="formValues.enableTelemetry" /><i></i> </label>
+              <label for="toggle_enableTelemetry" class="control-label text-left"> Allow the collection of anonymous statistics </label>
+              <label class="switch" style="margin-left: 20px"> <input type="checkbox" name="toggle_enableTelemetry" ng-model="formValues.enableTelemetry" /><i></i> </label>
             </div>
-            <div class="col-sm-12 text-muted small" style="margin-top: 10px;">
+            <div class="col-sm-12 text-muted small" style="margin-top: 10px">
               You can find more information about this in our
               <a href="https://www.portainer.io/documentation/in-app-analytics-and-privacy-policy/" target="_blank">privacy policy</a>.
             </div>
           </div>
           <!-- !analytics -->
           <!-- templates -->
-          <div class="col-sm-12 form-section-title">
-            App Templates
-          </div>
+          <div class="col-sm-12 form-section-title"> App Templates </div>
           <div>
             <div class="form-group">
               <span class="col-sm-12 text-muted small">
@@ -68,9 +58,7 @@
               </span>
             </div>
             <div class="form-group">
-              <label for="templates_url" class="col-sm-1 control-label text-left">
-                URL
-              </label>
+              <label for="templates_url" class="col-sm-1 control-label text-left"> URL </label>
               <div class="col-sm-11">
                 <input
                   type="text"
@@ -86,9 +74,7 @@
           </div>
           <!-- !templates -->
           <!-- helm charts -->
-          <div class="col-sm-12 form-section-title">
-            Helm Repository
-          </div>
+          <div class="col-sm-12 form-section-title"> Helm Repository </div>
           <div>
             <div class="form-group">
               <span class="col-sm-12 text-muted small">
@@ -97,9 +83,7 @@
               </span>
             </div>
             <div class="form-group">
-              <label for="helmrepository_url" class="col-sm-1 control-label text-left">
-                URL
-              </label>
+              <label for="helmrepository_url" class="col-sm-1 control-label text-left"> URL </label>
               <div class="col-sm-11">
                 <input type="text" class="form-control" ng-model="settings.HelmRepositoryURL" id="helmrepository_url" placeholder="https://charts.bitnami.com/bitnami" required />
               </div>
@@ -109,9 +93,7 @@
           <!-- host-filesystem -->
 
           <!-- edge -->
-          <div class="col-sm-12 form-section-title">
-            Edge Compute
-          </div>
+          <div class="col-sm-12 form-section-title"> Edge Compute </div>
           <div class="form-group">
             <label for="edge_checkin" class="col-sm-2 control-label text-left">
               Edge agent default poll frequency
@@ -132,23 +114,17 @@
           </div>
           <div class="form-group">
             <div class="col-sm-12">
-              <label for="toggle_enableEdgeComputeFeatures" class="control-label text-left">
-                Enable edge compute features
-              </label>
-              <label class="switch" style="margin-left: 20px;" data-cy="settings-edgeToggle">
+              <label for="toggle_enableEdgeComputeFeatures" class="control-label text-left"> Enable edge compute features </label>
+              <label class="switch" style="margin-left: 20px" data-cy="settings-edgeToggle">
                 <input type="checkbox" name="toggle_enableEdgeComputeFeatures" ng-model="formValues.enableEdgeComputeFeatures" /><i></i>
               </label>
             </div>
           </div>
           <!-- !edge -->
           <!-- kube -->
-          <div class="col-sm-12 form-section-title">
-            Kubernetes
-          </div>
+          <div class="col-sm-12 form-section-title"> Kubernetes </div>
           <div class="form-group">
-            <label for="edge_checkin" class="col-sm-2 control-label text-left">
-              Kubeconfig expiry
-            </label>
+            <label for="edge_checkin" class="col-sm-2 control-label text-left"> Kubeconfig expiry </label>
             <div class="col-sm-10">
               <select
                 id="kubeconfig_expiry"
@@ -193,9 +169,7 @@
       <rd-widget-body>
         <form class="form-horizontal" ng-submit="addFilteredContainerLabel()" name="addTagForm">
           <div class="form-group">
-            <span class="col-sm-12 text-muted small">
-              You can hide containers with specific labels from Portainer UI. You need to specify the label name and value.
-            </span>
+            <span class="col-sm-12 text-muted small"> You can hide containers with specific labels from Portainer UI. You need to specify the label name and value. </span>
           </div>
           <div class="form-group">
             <label for="header_name" class="col-sm-1 control-label text-left">Name</label>
@@ -253,9 +227,7 @@
       <rd-widget-header icon="fa-download" title-text="Backup Portainer"></rd-widget-header>
       <rd-widget-body>
         <form class="form-horizontal" ng-submit="backupPortainer()" name="backupPortainerForm">
-          <div class="col-sm-12 form-section-title">
-            Backup configuration
-          </div>
+          <div class="col-sm-12 form-section-title"> Backup configuration </div>
           <box-selector options="backupOptions" value="formValues.backupFormType" on-change="(onBackupOptionsChange)" radio-name="'backupOptions'"></box-selector>
           <div ng-if="formValues.backupFormType === BACKUP_FORM_TYPES.S3">
             <!-- Schedule automatic backups -->
@@ -365,9 +337,7 @@
               </div>
             </div>
             <!-- !Bucket name -->
-            <div class="col-sm-12 form-section-title">
-              Security settings
-            </div>
+            <div class="col-sm-12 form-section-title"> Security settings </div>
             <!-- Password protect S3 -->
             <div class="form-group">
               <label for="password_protect" class="col-sm-1 control-label text-left">Password protect</label>
@@ -426,9 +396,7 @@
             </div>
           </div>
           <div ng-if="formValues.backupFormType === BACKUP_FORM_TYPES.FILE">
-            <div class="col-sm-12 form-section-title">
-              Security settings
-            </div>
+            <div class="col-sm-12 form-section-title"> Security settings </div>
             <!-- Password protect -->
             <div class="form-group">
               <label for="password_protect" class="col-sm-1 control-label text-left">Password protect</label>
diff --git a/app/portainer/views/sidebar/sidebar.html b/app/portainer/views/sidebar/sidebar.html
index f3a7a8c4b..ba9854099 100644
--- a/app/portainer/views/sidebar/sidebar.html
+++ b/app/portainer/views/sidebar/sidebar.html
@@ -109,8 +109,8 @@
     </ul>
     <div class="sidebar-footer-content">
       <div class="update-notification" ng-if="applicationState.application.versionStatus.UpdateAvailable">
-        <a target="_blank" href="https://github.com/portainer/portainer/releases/tag/{{ applicationState.application.versionStatus.LatestVersion }}" style="color: #091e5d;">
-          <i class="fa-lg fas fa-cloud-download-alt" style="margin-right: 2px;"></i> A new version is available
+        <a target="_blank" href="https://github.com/portainer/portainer/releases/tag/{{ applicationState.application.versionStatus.LatestVersion }}" style="color: #091e5d">
+          <i class="fa-lg fas fa-cloud-download-alt" style="margin-right: 2px"></i> A new version is available
         </a>
       </div>
       <div>
diff --git a/app/portainer/views/stacks/create/createStackController.js b/app/portainer/views/stacks/create/createStackController.js
index 56a14f8da..31f4e4244 100644
--- a/app/portainer/views/stacks/create/createStackController.js
+++ b/app/portainer/views/stacks/create/createStackController.js
@@ -7,325 +7,328 @@ import { RepositoryMechanismTypes } from '@/kubernetes/models/deploy';
 
 angular
   .module('portainer.app')
-  .controller('CreateStackController', function (
-    $scope,
-    $state,
-    $async,
-    $window,
-    ModalService,
-    StackService,
-    Authentication,
-    Notifications,
-    FormValidator,
-    ResourceControlService,
-    FormHelper,
-    StackHelper,
-    ContainerHelper,
-    CustomTemplateService,
-    ContainerService,
-    WebhookHelper,
-    clipboard,
-    endpoint
-  ) {
-    $scope.onChangeTemplateId = onChangeTemplateId;
-    $scope.buildAnalyticsProperties = buildAnalyticsProperties;
-
-    $scope.STACK_NAME_VALIDATION_REGEX = STACK_NAME_VALIDATION_REGEX;
-
-    $scope.formValues = {
-      Name: '',
-      StackFileContent: '',
-      StackFile: null,
-      RepositoryURL: '',
-      RepositoryReferenceName: '',
-      RepositoryAuthentication: false,
-      RepositoryUsername: '',
-      RepositoryPassword: '',
-      Env: [],
-      AdditionalFiles: [],
-      ComposeFilePathInRepository: 'docker-compose.yml',
-      AccessControlData: new AccessControlFormData(),
-      RepositoryAutomaticUpdates: false,
-      RepositoryMechanism: RepositoryMechanismTypes.INTERVAL,
-      RepositoryFetchInterval: '5m',
-      RepositoryWebhookURL: WebhookHelper.returnStackWebhookUrl(uuidv4()),
-    };
-
-    $scope.state = {
-      Method: 'editor',
-      formValidationError: '',
-      actionInProgress: false,
-      StackType: null,
-      editorYamlValidationError: '',
-      uploadYamlValidationError: '',
-      isEditorDirty: false,
-      selectedTemplate: null,
-      selectedTemplateId: null,
-    };
-
-    $window.onbeforeunload = () => {
-      if ($scope.state.Method === 'editor' && $scope.formValues.StackFileContent && $scope.state.isEditorDirty) {
-        return '';
-      }
-    };
+  .controller(
+    'CreateStackController',
+    function (
+      $scope,
+      $state,
+      $async,
+      $window,
+      ModalService,
+      StackService,
+      Authentication,
+      Notifications,
+      FormValidator,
+      ResourceControlService,
+      FormHelper,
+      StackHelper,
+      ContainerHelper,
+      CustomTemplateService,
+      ContainerService,
+      WebhookHelper,
+      clipboard,
+      endpoint
+    ) {
+      $scope.onChangeTemplateId = onChangeTemplateId;
+      $scope.buildAnalyticsProperties = buildAnalyticsProperties;
+
+      $scope.STACK_NAME_VALIDATION_REGEX = STACK_NAME_VALIDATION_REGEX;
+
+      $scope.formValues = {
+        Name: '',
+        StackFileContent: '',
+        StackFile: null,
+        RepositoryURL: '',
+        RepositoryReferenceName: '',
+        RepositoryAuthentication: false,
+        RepositoryUsername: '',
+        RepositoryPassword: '',
+        Env: [],
+        AdditionalFiles: [],
+        ComposeFilePathInRepository: 'docker-compose.yml',
+        AccessControlData: new AccessControlFormData(),
+        RepositoryAutomaticUpdates: false,
+        RepositoryMechanism: RepositoryMechanismTypes.INTERVAL,
+        RepositoryFetchInterval: '5m',
+        RepositoryWebhookURL: WebhookHelper.returnStackWebhookUrl(uuidv4()),
+      };
+
+      $scope.state = {
+        Method: 'editor',
+        formValidationError: '',
+        actionInProgress: false,
+        StackType: null,
+        editorYamlValidationError: '',
+        uploadYamlValidationError: '',
+        isEditorDirty: false,
+        selectedTemplate: null,
+        selectedTemplateId: null,
+      };
+
+      $window.onbeforeunload = () => {
+        if ($scope.state.Method === 'editor' && $scope.formValues.StackFileContent && $scope.state.isEditorDirty) {
+          return '';
+        }
+      };
 
-    $scope.$on('$destroy', function () {
-      $scope.state.isEditorDirty = false;
-    });
+      $scope.$on('$destroy', function () {
+        $scope.state.isEditorDirty = false;
+      });
 
-    $scope.onChangeFormValues = onChangeFormValues;
+      $scope.onChangeFormValues = onChangeFormValues;
 
-    $scope.addAdditionalFiles = function () {
-      $scope.formValues.AdditionalFiles.push('');
-    };
+      $scope.addAdditionalFiles = function () {
+        $scope.formValues.AdditionalFiles.push('');
+      };
 
-    $scope.removeAdditionalFiles = function (index) {
-      $scope.formValues.AdditionalFiles.splice(index, 1);
-    };
+      $scope.removeAdditionalFiles = function (index) {
+        $scope.formValues.AdditionalFiles.splice(index, 1);
+      };
 
-    function buildAnalyticsProperties() {
-      const metadata = { type: methodLabel($scope.state.Method) };
+      function buildAnalyticsProperties() {
+        const metadata = { type: methodLabel($scope.state.Method) };
 
-      if ($scope.state.Method === 'repository') {
-        metadata.automaticUpdates = 'off';
-        if ($scope.formValues.RepositoryAutomaticUpdates) {
-          metadata.automaticUpdates = autoSyncLabel($scope.formValues.RepositoryMechanism);
+        if ($scope.state.Method === 'repository') {
+          metadata.automaticUpdates = 'off';
+          if ($scope.formValues.RepositoryAutomaticUpdates) {
+            metadata.automaticUpdates = autoSyncLabel($scope.formValues.RepositoryMechanism);
+          }
+          metadata.auth = $scope.formValues.RepositoryAuthentication;
         }
-        metadata.auth = $scope.formValues.RepositoryAuthentication;
-      }
 
-      if ($scope.state.Method === 'template') {
-        metadata.templateName = $scope.state.selectedTemplate.Title;
-      }
+        if ($scope.state.Method === 'template') {
+          metadata.templateName = $scope.state.selectedTemplate.Title;
+        }
 
-      return { metadata };
-
-      function methodLabel(method) {
-        switch (method) {
-          case 'editor':
-            return 'web-editor';
-          case 'repository':
-            return 'git';
-          case 'upload':
-            return 'file-upload';
-          case 'template':
-            return 'custom-template';
+        return { metadata };
+
+        function methodLabel(method) {
+          switch (method) {
+            case 'editor':
+              return 'web-editor';
+            case 'repository':
+              return 'git';
+            case 'upload':
+              return 'file-upload';
+            case 'template':
+              return 'custom-template';
+          }
         }
-      }
 
-      function autoSyncLabel(type) {
-        switch (type) {
-          case RepositoryMechanismTypes.INTERVAL:
-            return 'polling';
-          case RepositoryMechanismTypes.WEBHOOK:
-            return 'webhook';
+        function autoSyncLabel(type) {
+          switch (type) {
+            case RepositoryMechanismTypes.INTERVAL:
+              return 'polling';
+            case RepositoryMechanismTypes.WEBHOOK:
+              return 'webhook';
+          }
+          return 'off';
         }
-        return 'off';
       }
-    }
 
-    function validateForm(accessControlData, isAdmin) {
-      $scope.state.formValidationError = '';
-      var error = '';
-      error = FormValidator.validateAccessControl(accessControlData, isAdmin);
+      function validateForm(accessControlData, isAdmin) {
+        $scope.state.formValidationError = '';
+        var error = '';
+        error = FormValidator.validateAccessControl(accessControlData, isAdmin);
 
-      if (error) {
-        $scope.state.formValidationError = error;
-        return false;
+        if (error) {
+          $scope.state.formValidationError = error;
+          return false;
+        }
+        return true;
       }
-      return true;
-    }
 
-    function createSwarmStack(name, method) {
-      var env = FormHelper.removeInvalidEnvVars($scope.formValues.Env);
-      const endpointId = +$state.params.endpointId;
+      function createSwarmStack(name, method) {
+        var env = FormHelper.removeInvalidEnvVars($scope.formValues.Env);
+        const endpointId = +$state.params.endpointId;
 
-      if (method === 'template' || method === 'editor') {
-        var stackFileContent = $scope.formValues.StackFileContent;
-        return StackService.createSwarmStackFromFileContent(name, stackFileContent, env, endpointId);
-      }
+        if (method === 'template' || method === 'editor') {
+          var stackFileContent = $scope.formValues.StackFileContent;
+          return StackService.createSwarmStackFromFileContent(name, stackFileContent, env, endpointId);
+        }
 
-      if (method === 'upload') {
-        var stackFile = $scope.formValues.StackFile;
-        return StackService.createSwarmStackFromFileUpload(name, stackFile, env, endpointId);
-      }
+        if (method === 'upload') {
+          var stackFile = $scope.formValues.StackFile;
+          return StackService.createSwarmStackFromFileUpload(name, stackFile, env, endpointId);
+        }
 
-      if (method === 'repository') {
-        var repositoryOptions = {
-          AdditionalFiles: $scope.formValues.AdditionalFiles,
-          RepositoryURL: $scope.formValues.RepositoryURL,
-          RepositoryReferenceName: $scope.formValues.RepositoryReferenceName,
-          ComposeFilePathInRepository: $scope.formValues.ComposeFilePathInRepository,
-          RepositoryAuthentication: $scope.formValues.RepositoryAuthentication,
-          RepositoryUsername: $scope.formValues.RepositoryUsername,
-          RepositoryPassword: $scope.formValues.RepositoryPassword,
-        };
+        if (method === 'repository') {
+          var repositoryOptions = {
+            AdditionalFiles: $scope.formValues.AdditionalFiles,
+            RepositoryURL: $scope.formValues.RepositoryURL,
+            RepositoryReferenceName: $scope.formValues.RepositoryReferenceName,
+            ComposeFilePathInRepository: $scope.formValues.ComposeFilePathInRepository,
+            RepositoryAuthentication: $scope.formValues.RepositoryAuthentication,
+            RepositoryUsername: $scope.formValues.RepositoryUsername,
+            RepositoryPassword: $scope.formValues.RepositoryPassword,
+          };
 
-        getAutoUpdatesProperty(repositoryOptions);
+          getAutoUpdatesProperty(repositoryOptions);
 
-        return StackService.createSwarmStackFromGitRepository(name, repositoryOptions, env, endpointId);
+          return StackService.createSwarmStackFromGitRepository(name, repositoryOptions, env, endpointId);
+        }
       }
-    }
 
-    function getAutoUpdatesProperty(repositoryOptions) {
-      if ($scope.formValues.RepositoryAutomaticUpdates) {
-        repositoryOptions.AutoUpdate = {};
-        if ($scope.formValues.RepositoryMechanism === RepositoryMechanismTypes.INTERVAL) {
-          repositoryOptions.AutoUpdate.Interval = $scope.formValues.RepositoryFetchInterval;
-        } else if ($scope.formValues.RepositoryMechanism === RepositoryMechanismTypes.WEBHOOK) {
-          repositoryOptions.AutoUpdate.Webhook = $scope.formValues.RepositoryWebhookURL.split('/').reverse()[0];
+      function getAutoUpdatesProperty(repositoryOptions) {
+        if ($scope.formValues.RepositoryAutomaticUpdates) {
+          repositoryOptions.AutoUpdate = {};
+          if ($scope.formValues.RepositoryMechanism === RepositoryMechanismTypes.INTERVAL) {
+            repositoryOptions.AutoUpdate.Interval = $scope.formValues.RepositoryFetchInterval;
+          } else if ($scope.formValues.RepositoryMechanism === RepositoryMechanismTypes.WEBHOOK) {
+            repositoryOptions.AutoUpdate.Webhook = $scope.formValues.RepositoryWebhookURL.split('/').reverse()[0];
+          }
         }
       }
-    }
 
-    function createComposeStack(name, method) {
-      var env = FormHelper.removeInvalidEnvVars($scope.formValues.Env);
-      const endpointId = +$state.params.endpointId;
-
-      if (method === 'editor' || method === 'template') {
-        var stackFileContent = $scope.formValues.StackFileContent;
-        return StackService.createComposeStackFromFileContent(name, stackFileContent, env, endpointId);
-      } else if (method === 'upload') {
-        var stackFile = $scope.formValues.StackFile;
-        return StackService.createComposeStackFromFileUpload(name, stackFile, env, endpointId);
-      } else if (method === 'repository') {
-        var repositoryOptions = {
-          AdditionalFiles: $scope.formValues.AdditionalFiles,
-          RepositoryURL: $scope.formValues.RepositoryURL,
-          RepositoryReferenceName: $scope.formValues.RepositoryReferenceName,
-          ComposeFilePathInRepository: $scope.formValues.ComposeFilePathInRepository,
-          RepositoryAuthentication: $scope.formValues.RepositoryAuthentication,
-          RepositoryUsername: $scope.formValues.RepositoryUsername,
-          RepositoryPassword: $scope.formValues.RepositoryPassword,
-        };
-
-        getAutoUpdatesProperty(repositoryOptions);
-
-        return StackService.createComposeStackFromGitRepository(name, repositoryOptions, env, endpointId);
+      function createComposeStack(name, method) {
+        var env = FormHelper.removeInvalidEnvVars($scope.formValues.Env);
+        const endpointId = +$state.params.endpointId;
+
+        if (method === 'editor' || method === 'template') {
+          var stackFileContent = $scope.formValues.StackFileContent;
+          return StackService.createComposeStackFromFileContent(name, stackFileContent, env, endpointId);
+        } else if (method === 'upload') {
+          var stackFile = $scope.formValues.StackFile;
+          return StackService.createComposeStackFromFileUpload(name, stackFile, env, endpointId);
+        } else if (method === 'repository') {
+          var repositoryOptions = {
+            AdditionalFiles: $scope.formValues.AdditionalFiles,
+            RepositoryURL: $scope.formValues.RepositoryURL,
+            RepositoryReferenceName: $scope.formValues.RepositoryReferenceName,
+            ComposeFilePathInRepository: $scope.formValues.ComposeFilePathInRepository,
+            RepositoryAuthentication: $scope.formValues.RepositoryAuthentication,
+            RepositoryUsername: $scope.formValues.RepositoryUsername,
+            RepositoryPassword: $scope.formValues.RepositoryPassword,
+          };
+
+          getAutoUpdatesProperty(repositoryOptions);
+
+          return StackService.createComposeStackFromGitRepository(name, repositoryOptions, env, endpointId);
+        }
       }
-    }
 
-    $scope.copyWebhook = function () {
-      clipboard.copyText($scope.formValues.RepositoryWebhookURL);
-      $('#copyNotification').show();
-      $('#copyNotification').fadeOut(2000);
-    };
+      $scope.copyWebhook = function () {
+        clipboard.copyText($scope.formValues.RepositoryWebhookURL);
+        $('#copyNotification').show();
+        $('#copyNotification').fadeOut(2000);
+      };
 
-    $scope.handleEnvVarChange = handleEnvVarChange;
-    function handleEnvVarChange(value) {
-      $scope.formValues.Env = value;
-    }
+      $scope.handleEnvVarChange = handleEnvVarChange;
+      function handleEnvVarChange(value) {
+        $scope.formValues.Env = value;
+      }
 
-    $scope.deployStack = function () {
-      var name = $scope.formValues.Name;
-      var method = $scope.state.Method;
+      $scope.deployStack = function () {
+        var name = $scope.formValues.Name;
+        var method = $scope.state.Method;
 
-      var accessControlData = $scope.formValues.AccessControlData;
-      var userDetails = Authentication.getUserDetails();
-      var isAdmin = Authentication.isAdmin();
+        var accessControlData = $scope.formValues.AccessControlData;
+        var userDetails = Authentication.getUserDetails();
+        var isAdmin = Authentication.isAdmin();
 
-      if (method === 'editor' && $scope.formValues.StackFileContent === '') {
-        $scope.state.formValidationError = 'Stack file content must not be empty';
-        return;
-      }
+        if (method === 'editor' && $scope.formValues.StackFileContent === '') {
+          $scope.state.formValidationError = 'Stack file content must not be empty';
+          return;
+        }
 
-      if (!validateForm(accessControlData, isAdmin)) {
-        return;
-      }
+        if (!validateForm(accessControlData, isAdmin)) {
+          return;
+        }
 
-      var type = $scope.state.StackType;
-      var action = createSwarmStack;
-      if (type === 2) {
-        action = createComposeStack;
+        var type = $scope.state.StackType;
+        var action = createSwarmStack;
+        if (type === 2) {
+          action = createComposeStack;
+        }
+        $scope.state.actionInProgress = true;
+        action(name, method)
+          .then(function success(data) {
+            if (data.data) {
+              data = data.data;
+            }
+            const userId = userDetails.ID;
+            const resourceControl = data.ResourceControl;
+            return ResourceControlService.applyResourceControl(userId, accessControlData, resourceControl);
+          })
+          .then(function success() {
+            Notifications.success('Stack successfully deployed');
+            $scope.state.isEditorDirty = false;
+            $state.go('docker.stacks');
+          })
+          .catch(function error(err) {
+            Notifications.error('Deployment error', err, 'Unable to deploy stack');
+          })
+          .finally(function final() {
+            $scope.state.actionInProgress = false;
+          });
+      };
+
+      $scope.onChangeFileContent = function onChangeFileContent(value) {
+        $scope.formValues.StackFileContent = value;
+        $scope.state.editorYamlValidationError = StackHelper.validateYAML($scope.formValues.StackFileContent, $scope.containerNames);
+        $scope.state.isEditorDirty = true;
+      };
+
+      async function onFileLoadAsync(event) {
+        $scope.state.uploadYamlValidationError = StackHelper.validateYAML(event.target.result, $scope.containerNames);
       }
-      $scope.state.actionInProgress = true;
-      action(name, method)
-        .then(function success(data) {
-          if (data.data) {
-            data = data.data;
-          }
-          const userId = userDetails.ID;
-          const resourceControl = data.ResourceControl;
-          return ResourceControlService.applyResourceControl(userId, accessControlData, resourceControl);
-        })
-        .then(function success() {
-          Notifications.success('Stack successfully deployed');
-          $scope.state.isEditorDirty = false;
-          $state.go('docker.stacks');
-        })
-        .catch(function error(err) {
-          Notifications.error('Deployment error', err, 'Unable to deploy stack');
-        })
-        .finally(function final() {
-          $scope.state.actionInProgress = false;
-        });
-    };
 
-    $scope.onChangeFileContent = function onChangeFileContent(value) {
-      $scope.formValues.StackFileContent = value;
-      $scope.state.editorYamlValidationError = StackHelper.validateYAML($scope.formValues.StackFileContent, $scope.containerNames);
-      $scope.state.isEditorDirty = true;
-    };
+      function onFileLoad(event) {
+        return $async(onFileLoadAsync, event);
+      }
 
-    async function onFileLoadAsync(event) {
-      $scope.state.uploadYamlValidationError = StackHelper.validateYAML(event.target.result, $scope.containerNames);
-    }
+      $scope.uploadFile = function (file) {
+        $scope.formValues.StackFile = file;
 
-    function onFileLoad(event) {
-      return $async(onFileLoadAsync, event);
-    }
+        if (file) {
+          const temporaryFileReader = new FileReader();
+          temporaryFileReader.fileName = file.name;
+          temporaryFileReader.onload = onFileLoad;
+          temporaryFileReader.readAsText(file);
+        }
+      };
+
+      function onChangeTemplateId(templateId, template) {
+        return $async(async () => {
+          try {
+            $scope.state.selectedTemplateId = templateId;
+            $scope.state.selectedTemplate = template;
+
+            const fileContent = await CustomTemplateService.customTemplateFile(templateId);
+            $scope.onChangeFileContent(fileContent);
+          } catch (err) {
+            this.Notifications.error('Failure', err, 'Unable to retrieve Custom Template file');
+          }
+        });
+      }
 
-    $scope.uploadFile = function (file) {
-      $scope.formValues.StackFile = file;
+      async function initView() {
+        var endpointMode = $scope.applicationState.endpoint.mode;
+        $scope.state.StackType = 2;
+        if (endpointMode.provider === 'DOCKER_SWARM_MODE' && endpointMode.role === 'MANAGER') {
+          $scope.state.StackType = 1;
+        }
 
-      if (file) {
-        const temporaryFileReader = new FileReader();
-        temporaryFileReader.fileName = file.name;
-        temporaryFileReader.onload = onFileLoad;
-        temporaryFileReader.readAsText(file);
-      }
-    };
+        $scope.composeSyntaxMaxVersion = endpoint.ComposeSyntaxMaxVersion;
 
-    function onChangeTemplateId(templateId, template) {
-      return $async(async () => {
         try {
-          $scope.state.selectedTemplateId = templateId;
-          $scope.state.selectedTemplate = template;
-
-          const fileContent = await CustomTemplateService.customTemplateFile(templateId);
-          $scope.onChangeFileContent(fileContent);
+          const containers = await ContainerService.containers(true);
+          $scope.containerNames = ContainerHelper.getContainerNames(containers);
         } catch (err) {
-          this.Notifications.error('Failure', err, 'Unable to retrieve Custom Template file');
+          Notifications.error('Failure', err, 'Unable to retrieve Containers');
         }
-      });
-    }
-
-    async function initView() {
-      var endpointMode = $scope.applicationState.endpoint.mode;
-      $scope.state.StackType = 2;
-      if (endpointMode.provider === 'DOCKER_SWARM_MODE' && endpointMode.role === 'MANAGER') {
-        $scope.state.StackType = 1;
       }
 
-      $scope.composeSyntaxMaxVersion = endpoint.ComposeSyntaxMaxVersion;
+      this.uiCanExit = async function () {
+        if ($scope.state.Method === 'editor' && $scope.formValues.StackFileContent && $scope.state.isEditorDirty) {
+          return ModalService.confirmWebEditorDiscard();
+        }
+      };
 
-      try {
-        const containers = await ContainerService.containers(true);
-        $scope.containerNames = ContainerHelper.getContainerNames(containers);
-      } catch (err) {
-        Notifications.error('Failure', err, 'Unable to retrieve Containers');
-      }
-    }
+      initView();
 
-    this.uiCanExit = async function () {
-      if ($scope.state.Method === 'editor' && $scope.formValues.StackFileContent && $scope.state.isEditorDirty) {
-        return ModalService.confirmWebEditorDiscard();
+      function onChangeFormValues(newValues) {
+        $scope.formValues = newValues;
       }
-    };
-
-    initView();
-
-    function onChangeFormValues(newValues) {
-      $scope.formValues = newValues;
     }
-  });
+  );
diff --git a/app/portainer/views/stacks/create/createstack.html b/app/portainer/views/stacks/create/createstack.html
index 58db1fe3e..04f4a8dc3 100644
--- a/app/portainer/views/stacks/create/createstack.html
+++ b/app/portainer/views/stacks/create/createstack.html
@@ -40,10 +40,10 @@
               This stack will be deployed using the equivalent of the <code>docker stack deploy</code> command.
             </span>
             <div class="col-sm-12 text-muted small" ng-if="state.StackType === 2 && composeSyntaxMaxVersion == 2">
-              <div style="margin-bottom: 7px;">
+              <div style="margin-bottom: 7px">
                 This stack will be deployed using the equivalent of <code>docker-compose</code>. Only Compose file format version <b>2</b> is supported at the moment.
               </div>
-              <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+              <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
               Note: Due to a limitation of libcompose, the name of the stack will be standardized to remove all special characters and uppercase letters.
             </div>
             <span class="col-sm-12 text-muted small" ng-if="state.StackType === 2 && composeSyntaxMaxVersion > 2">
@@ -51,17 +51,15 @@
             </span>
           </div>
           <!-- build-method -->
-          <div class="col-sm-12 form-section-title">
-            Build method
-          </div>
+          <div class="col-sm-12 form-section-title"> Build method </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="state.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>
@@ -71,7 +69,7 @@
                 <input type="radio" id="method_upload" ng-model="state.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>
@@ -81,7 +79,7 @@
                 <input type="radio" id="method_repository" ng-model="state.Method" value="repository" />
                 <label for="method_repository">
                   <div class="boxselector_header">
-                    <i class="fab fa-git" aria-hidden="true" style="margin-right: 2px;"></i>
+                    <i class="fab fa-git" aria-hidden="true" style="margin-right: 2px"></i>
                     Repository
                   </div>
                   <p>Use a git repository</p>
@@ -91,7 +89,7 @@
                 <input type="radio" id="method_template" ng-model="state.Method" value="template" />
                 <label for="method_template">
                   <div class="boxselector_header">
-                    <i class="fa fa-rocket" aria-hidden="true" style="margin-right: 2px;"></i>
+                    <i class="fa fa-rocket" aria-hidden="true" style="margin-right: 2px"></i>
                     Custom template
                   </div>
                   <p>Use a custom template</p>
@@ -103,13 +101,9 @@
 
           <!-- upload -->
           <div ng-show="state.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 Compose file from your computer.
-              </span>
+              <span class="col-sm-12 text-muted small"> You can upload a Compose file from your computer. </span>
               <div class="col-sm-12" ng-if="state.uploadYamlValidationError"
                 ><span class="text-danger small">{{ state.uploadYamlValidationError }}</span></div
               >
@@ -117,7 +111,7 @@
             <div class="form-group">
               <div class="col-sm-12">
                 <button type="button" class="btn btn-sm btn-primary" ngf-select="uploadFile($file)">Select file</button>
-                <span style="margin-left: 5px;">
+                <span style="margin-left: 5px">
                   {{ formValues.StackFile.name }}
                   <i class="fa fa-times red-icon" ng-if="!formValues.StackFile" aria-hidden="true"></i>
                 </span>
@@ -169,9 +163,7 @@
           <!-- !environment-variables -->
           <por-access-control-form form-data="formValues.AccessControlData"></por-access-control-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
@@ -193,7 +185,7 @@
                 <span ng-hide="state.actionInProgress">Deploy the stack</span>
                 <span ng-show="state.actionInProgress">Deployment in progress...</span>
               </button>
-              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px;">{{ state.formValidationError }}</span>
+              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px">{{ state.formValidationError }}</span>
             </div>
           </div>
           <!-- !actions -->
diff --git a/app/portainer/views/tags/tags.html b/app/portainer/views/tags/tags.html
index 803f453f1..ce547d8cc 100644
--- a/app/portainer/views/tags/tags.html
+++ b/app/portainer/views/tags/tags.html
@@ -15,9 +15,7 @@
         <form class="form-horizontal" name="tagCreationForm" ng-submit="createTag()">
           <!-- name-input -->
           <div class="form-group">
-            <label for="name" class="col-sm-2 control-label text-left">
-              Name
-            </label>
+            <label for="name" class="col-sm-2 control-label text-left"> Name </label>
             <div class="col-sm-10">
               <input
                 type="text"
diff --git a/app/portainer/views/teams/edit/team.html b/app/portainer/views/teams/edit/team.html
index c7b0c98a5..a7a74c814 100644
--- a/app/portainer/views/teams/edit/team.html
+++ b/app/portainer/views/teams/edit/team.html
@@ -82,7 +82,7 @@
               >
                 <td>
                   {{ user.Username }}
-                  <span style="margin-left: 5px;">
+                  <span style="margin-left: 5px">
                     <a ng-click="addUser(user)"><i class="fa fa-plus-circle space-right" aria-hidden="true"></i>Add</a>
                   </span>
                 </td>
@@ -154,19 +154,19 @@
               >
                 <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 ng-click="removeUser(user)"><i class="fa fa-minus-circle space-right" aria-hidden="true"></i>Remove</a>
                   </span>
                 </td>
                 <td>
-                  <i ng-if="user.TeamRole === 'Leader'" class="fa fa-user-plus" aria-hidden="true" style="margin-right: 2px;"></i>
-                  <i ng-if="user.TeamRole === 'Member'" class="fa fa-user" aria-hidden="true" style="margin-right: 2px;"></i>
+                  <i ng-if="user.TeamRole === 'Leader'" class="fa fa-user-plus" aria-hidden="true" style="margin-right: 2px"></i>
+                  <i ng-if="user.TeamRole === 'Member'" class="fa fa-user" aria-hidden="true" style="margin-right: 2px"></i>
                   {{ user.TeamRole }}
-                  <span style="margin-left: 5px;" ng-if="isAdmin">
-                    <a style="margin-left: 5px;" ng-click="promoteToLeader(user)" ng-if="user.TeamRole === 'Member'"
+                  <span style="margin-left: 5px" ng-if="isAdmin">
+                    <a style="margin-left: 5px" ng-click="promoteToLeader(user)" ng-if="user.TeamRole === 'Member'"
                       ><i class="fa fa-user-plus space-right" aria-hidden="true"></i>Leader</a
                     >
-                    <a style="margin-left: 5px;" ng-click="demoteToMember(user)" ng-if="user.TeamRole === 'Leader'"
+                    <a style="margin-left: 5px" ng-click="demoteToMember(user)" ng-if="user.TeamRole === 'Leader'"
                       ><i class="fa fa-user-times space-right" aria-hidden="true"></i>Member</a
                     >
                   </span>
diff --git a/app/portainer/views/templates/templates.html b/app/portainer/views/templates/templates.html
index 07b269074..7a065343b 100644
--- a/app/portainer/views/templates/templates.html
+++ b/app/portainer/views/templates/templates.html
@@ -27,9 +27,7 @@
         <form class="form-horizontal" name="selectedTemplateType1">
           <!-- description -->
           <div ng-if="state.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-if="state.selectedTemplate.Note" ng-bind-html="state.selectedTemplate.Note"></div>
@@ -37,9 +35,7 @@
             </div>
           </div>
           <!-- !description -->
-          <div class="col-sm-12 form-section-title">
-            Configuration
-          </div>
+          <div class="col-sm-12 form-section-title"> Configuration </div>
           <!-- name-input -->
           <div class="form-group">
             <label for="container_name" class="col-sm-2 control-label text-left">Name</label>
@@ -89,27 +85,27 @@
           <div ng-if="state.showAdvancedOptions">
             <!-- port-mapping -->
             <div class="form-group">
-              <div class="col-sm-12" style="margin-top: 5px;">
+              <div class="col-sm-12" style="margin-top: 5px">
                 <label class="control-label text-left">Port mapping</label>
-                <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addPortBinding()">
+                <span class="label label-default interactive" style="margin-left: 10px" ng-click="addPortBinding()">
                   <i class="fa fa-plus-circle" aria-hidden="true"></i> map additional port
                 </span>
               </div>
-              <div class="col-sm-12" style="margin-top: 10px;" ng-if="state.selectedTemplate.Ports.length > 0">
+              <div class="col-sm-12" style="margin-top: 10px" ng-if="state.selectedTemplate.Ports.length > 0">
                 <span class="small text-muted">Portainer will automatically assign a port if you leave the host port empty.</span>
               </div>
               <!-- !port-mapping -->
               <!-- port-mapping-input-list -->
               <div class="col-sm-12">
-                <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-                  <div ng-repeat="portBinding in state.selectedTemplate.Ports" style="margin-top: 2px;">
+                <div class="col-sm-12 form-inline" style="margin-top: 10px">
+                  <div ng-repeat="portBinding in state.selectedTemplate.Ports" style="margin-top: 2px">
                     <!-- host-port -->
                     <div class="input-group col-sm-4 input-group-sm">
                       <span class="input-group-addon">host</span>
                       <input type="text" class="form-control" ng-model="portBinding.hostPort" placeholder="e.g. 80 or 1.2.3.4:80 (optional)" />
                     </div>
                     <!-- !host-port -->
-                    <span style="margin: 0 10px 0 10px;">
+                    <span style="margin: 0 10px 0 10px">
                       <i class="fa fa-long-arrow-alt-right" aria-hidden="true"></i>
                     </span>
                     <!-- container-port -->
@@ -136,17 +132,17 @@
             <!-- !port-mapping-input-list -->
             <!-- volume-mapping -->
             <div class="form-group">
-              <div class="col-sm-12" style="margin-top: 5px;">
+              <div class="col-sm-12" style="margin-top: 5px">
                 <label class="control-label text-left">Volume mapping</label>
-                <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addVolume()">
+                <span class="label label-default interactive" style="margin-left: 10px" ng-click="addVolume()">
                   <i class="fa fa-plus-circle" aria-hidden="true"></i> map additional volume
                 </span>
               </div>
-              <div class="col-sm-12" style="margin-top: 10px;" ng-if="state.selectedTemplate.Volumes.length > 0">
+              <div class="col-sm-12" style="margin-top: 10px" ng-if="state.selectedTemplate.Volumes.length > 0">
                 <span class="small text-muted">Portainer will automatically create and map a local volume when using the <b>auto</b> option.</span>
               </div>
               <div ng-repeat="volume in state.selectedTemplate.Volumes">
-                <div class="col-sm-12" style="margin-top: 10px;">
+                <div class="col-sm-12" style="margin-top: 10px">
                   <!-- volume-line1 -->
                   <div class="col-sm-12 form-inline">
                     <!-- container-path -->
@@ -156,7 +152,7 @@
                     </div>
                     <!-- !container-path -->
                     <!-- volume-type -->
-                    <div class="input-group col-sm-5" style="margin-left: 5px;">
+                    <div class="input-group col-sm-5" style="margin-left: 5px">
                       <div class="btn-group btn-group-sm">
                         <label class="btn btn-primary" ng-model="volume.type" uib-btn-radio="'auto'" ng-click="volume.bind = ''">Auto</label>
                         <label class="btn btn-primary" ng-model="volume.type" uib-btn-radio="'volume'" ng-click="volume.bind = ''">Volume</label>
@@ -170,7 +166,7 @@
                   </div>
                   <!-- !volume-line1 -->
                   <!-- volume-line2 -->
-                  <div class="col-sm-12 form-inline" style="margin-top: 5px;" ng-if="volume.type !== 'auto'">
+                  <div class="col-sm-12 form-inline" style="margin-top: 5px" ng-if="volume.type !== 'auto'">
                     <i class="fa fa-long-arrow-alt-right" aria-hidden="true"></i>
                     <!-- volume -->
                     <div class="input-group input-group-sm col-sm-6" ng-if="volume.type === 'volume'">
@@ -191,7 +187,7 @@
                     </div>
                     <!-- !bind -->
                     <!-- read-only -->
-                    <div class="input-group input-group-sm col-sm-5" style="margin-left: 5px;">
+                    <div class="input-group input-group-sm col-sm-5" style="margin-left: 5px">
                       <div class="btn-group btn-group-sm">
                         <label class="btn btn-primary" ng-model="volume.readonly" uib-btn-radio="false">Writable</label>
                         <label class="btn btn-primary" ng-model="volume.readonly" uib-btn-radio="true">Read-only</label>
@@ -206,16 +202,16 @@
             <!-- !volume-mapping -->
             <!-- extra-host -->
             <div class="form-group">
-              <div class="col-sm-12" style="margin-top: 5px;">
+              <div class="col-sm-12" style="margin-top: 5px">
                 <label class="control-label text-left">Hosts file entries</label>
-                <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addExtraHost()">
+                <span class="label label-default interactive" style="margin-left: 10px" ng-click="addExtraHost()">
                   <i class="fa fa-plus-circle" aria-hidden="true"></i> add additional entry
                 </span>
               </div>
               <!-- extra-host-input-list -->
               <div class="col-sm-12">
-                <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-                  <div ng-repeat="(idx, host) in state.selectedTemplate.Hosts track by $index" style="margin-top: 2px;">
+                <div class="col-sm-12 form-inline" style="margin-top: 10px">
+                  <div ng-repeat="(idx, host) in state.selectedTemplate.Hosts track by $index" style="margin-top: 2px">
                     <div class="input-group col-sm-5 input-group-sm">
                       <span class="input-group-addon">value</span>
                       <input type="text" class="form-control" ng-model="state.selectedTemplate.Hosts[idx]" placeholder="e.g. host:IP" />
@@ -230,16 +226,16 @@
             <!-- !extra-host -->
             <!-- labels -->
             <div class="form-group">
-              <div class="col-sm-12" style="margin-top: 5px;">
+              <div class="col-sm-12" style="margin-top: 5px">
                 <label class="control-label text-left">Labels</label>
-                <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addLabel()">
+                <span class="label label-default interactive" style="margin-left: 10px" ng-click="addLabel()">
                   <i class="fa fa-plus-circle" aria-hidden="true"></i> add label
                 </span>
               </div>
               <!-- labels-input-list -->
               <div class="col-sm-12">
-                <div class="col-sm-12 form-inline" style="margin-top: 10px;">
-                  <div ng-repeat="label in state.selectedTemplate.Labels" style="margin-top: 2px;">
+                <div class="col-sm-12 form-inline" style="margin-top: 10px">
+                  <div ng-repeat="label in state.selectedTemplate.Labels" style="margin-top: 2px">
                     <div class="input-group col-sm-5 input-group-sm">
                       <span class="input-group-addon">name</span>
                       <input type="text" class="form-control" ng-model="label.name" placeholder="e.g. com.example.foo" />
@@ -268,9 +264,7 @@
           </div>
           <!-- !advanced-options -->
           <!-- 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
@@ -284,7 +278,7 @@
                 <span ng-show="state.actionInProgress">Deployment in progress...</span>
               </button>
               <button type="button" class="btn btn-sm btn-default" ng-click="unselectTemplate(state.selectedTemplate)">Hide</button>
-              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px;">{{ state.formValidationError }}</span>
+              <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px">{{ state.formValidationError }}</span>
             </div>
           </div>
           <!-- !actions -->
diff --git a/app/portainer/views/users/edit/user.html b/app/portainer/views/users/edit/user.html
index 1dbc16fcf..b8e33fee8 100644
--- a/app/portainer/views/users/edit/user.html
+++ b/app/portainer/views/users/edit/user.html
@@ -10,7 +10,7 @@
     <rd-widget>
       <rd-widget-header icon="fa-user" title-text="User details"></rd-widget-header>
       <rd-widget-body>
-        <form class="form-horizontal" style="margin-top: 15px;">
+        <form class="form-horizontal" style="margin-top: 15px">
           <div class="form-group">
             <label for="username_field" class="col-sm-2 control-label text-left">Username</label>
             <div class="col-sm-8">
@@ -27,7 +27,7 @@
                   message="Administrators have access to Portainer settings management as well as full control over all defined environments and their resources."
                 ></portainer-tooltip>
               </label>
-              <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="formValues.Administrator" /><i></i> </label>
+              <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="formValues.Administrator" /><i></i> </label>
             </div>
           </div>
 
@@ -50,7 +50,7 @@
     <rd-widget>
       <rd-widget-header icon="fa-lock" title-text="Change user password"></rd-widget-header>
       <rd-widget-body>
-        <form class="form-horizontal" style="margin-top: 15px;">
+        <form class="form-horizontal" style="margin-top: 15px">
           <!-- new-password-input -->
           <div class="form-group">
             <label for="new_password" class="col-sm-2 control-label text-left">New password</label>
diff --git a/app/portainer/views/users/users.html b/app/portainer/views/users/users.html
index 70ddb8ba4..e783afe87 100644
--- a/app/portainer/views/users/users.html
+++ b/app/portainer/views/users/users.html
@@ -78,17 +78,15 @@
                   message="Administrators have access to Portainer settings management as well as full control over all defined environments and their resources."
                 ></portainer-tooltip>
               </label>
-              <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="formValues.Administrator" data-cy="user-adminCheckbox" /><i></i> </label>
+              <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="formValues.Administrator" data-cy="user-adminCheckbox" /><i></i> </label>
             </div>
           </div>
           <!-- !admin-checkbox -->
           <!-- teams -->
           <div class="form-group" ng-if="!formValues.Administrator">
             <div class="col-sm-12">
-              <label class="control-label text-left">
-                Add to team(s)
-              </label>
-              <span class="small text-muted" style="margin-left: 20px;" ng-if="teams.length === 0">
+              <label class="control-label text-left"> Add to team(s) </label>
+              <span class="small text-muted" style="margin-left: 20px" ng-if="teams.length === 0">
                 You don't seem to have any teams to add users into. Head over to the <a ui-sref="portainer.teams">Teams view</a> to create some.
               </span>
               <span
@@ -102,7 +100,7 @@
                 helper-elements="filter"
                 search-property="Name"
                 translation="{nothingSelected: 'Select one or more teams', search: 'Search...'}"
-                style="margin-left: 20px;"
+                style="margin-left: 20px"
                 data-cy="user-teamSelect"
               >
               </span>
@@ -130,7 +128,7 @@
                 <span ng-hide="state.actionInProgress"><i class="fa fa-plus" aria-hidden="true"></i> Create user</span>
                 <span ng-show="state.actionInProgress">Creating user...</span>
               </button>
-              <span class="text-danger" ng-if="state.userCreationError" style="margin: 5px;">
+              <span class="text-danger" ng-if="state.userCreationError" style="margin: 5px">
                 <i class="fa fa-exclamation-circle" aria-hidden="true"></i> {{ state.userCreationError }}
               </span>
             </div>
diff --git a/app/portainer/views/wizard/wizard-endpoints/wizard-endpoint-aci/wizard-aci.html b/app/portainer/views/wizard/wizard-endpoints/wizard-endpoint-aci/wizard-aci.html
index fc3e3836e..fc40fb8d7 100644
--- a/app/portainer/views/wizard/wizard-endpoints/wizard-endpoint-aci/wizard-aci.html
+++ b/app/portainer/views/wizard/wizard-endpoints/wizard-endpoint-aci/wizard-aci.html
@@ -3,14 +3,14 @@
   <!-- docker form section-->
   <div class="form-group wizard-form">
     <label for="acir_name" class="col-sm-3 col-lg-2 control-label text-left">Name<span class="wizard-form-required">*</span></label>
-    <div class="col-sm-9 col-lg-10" style="margin-bottom: 15px;">
+    <div class="col-sm-9 col-lg-10" style="margin-bottom: 15px">
       <input type="text" class="form-control" name="aci_name" ng-model="$ctrl.formValues.name" placeholder="e.g. docker-prod01 / kubernetes-cluster01" required auto-focus />
     </div>
   </div>
 
   <div class="form-group">
     <label for="azure_credential_appid" class="col-sm-3 col-lg-2 control-label text-left">Application ID:<span class="wizard-form-required">*</span></label>
-    <div class="col-sm-9 col-lg-10" style="margin-bottom: 15px;">
+    <div class="col-sm-9 col-lg-10" style="margin-bottom: 15px">
       <input
         type="text"
         class="form-control"
@@ -24,7 +24,7 @@
 
   <div class="form-group">
     <label for="azure_credential_tenantid" class="col-sm-3 col-lg-2 control-label text-left">Tenant ID:<span class="wizard-form-required">*</span></label>
-    <div class="col-sm-9 col-lg-10" style="margin-bottom: 15px;">
+    <div class="col-sm-9 col-lg-10" style="margin-bottom: 15px">
       <input
         type="text"
         class="form-control"
@@ -59,7 +59,7 @@
         ng-click="$ctrl.addAciEndpoint()"
         button-spinner="$ctrl.state.actionInProgress"
       >
-        <span ng-hide="$ctrl.state.actionInProgress"><i class="fa fa-plug" style="margin-right: 5px;"></i> Connect </span>
+        <span ng-hide="$ctrl.state.actionInProgress"><i class="fa fa-plug" style="margin-right: 5px"></i> Connect </span>
         <span ng-show="$ctrl.state.actionInProgress">Connecting environment...</span>
       </button>
     </div>
diff --git a/app/portainer/views/wizard/wizard-endpoints/wizard-endpoint-docker/wizard-docker.html b/app/portainer/views/wizard/wizard-endpoints/wizard-endpoint-docker/wizard-docker.html
index bb3816d1d..4994fa2ee 100644
--- a/app/portainer/views/wizard/wizard-endpoints/wizard-endpoint-docker/wizard-docker.html
+++ b/app/portainer/views/wizard/wizard-endpoints/wizard-endpoint-docker/wizard-docker.html
@@ -8,23 +8,23 @@
     on-change="($ctrl.onChangeEndpointType)"
   ></box-selector>
   <!-- docker tab selection -->
-  <div style="padding-left: 10px;">
+  <div style="padding-left: 10px">
     <div class="form-group">
       <div ng-if="$ctrl.state.endpointType === 'agent'" class="wizard-code">
         <uib-tabset>
           <uib-tab index="0" heading="Linux">
-            <code style="display: block; white-space: pre-wrap; padding: 16px 10px;"
-              ><h6 style="color: #000;">CLI script for installing agent on your Linux environment with Docker Swarm</h6>{{ $ctrl.command.linuxCommand
+            <code style="display: block; white-space: pre-wrap; padding: 16px 10px"
+              ><h6 style="color: #000">CLI script for installing agent on your Linux environment with Docker Swarm</h6>{{ $ctrl.command.linuxCommand
               }}<i class="fas fa-copy wizard-copy-button" ng-click="$ctrl.copyLinuxCommand()"></i
-              ><i id="linuxCommandNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none;"></i
+              ><i id="linuxCommandNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none"></i
             ></code>
           </uib-tab>
 
           <uib-tab index="1" heading="Windows">
-            <code style="display: block; white-space: pre-wrap; padding: 16px 10px;"
-              ><h6 style="color: #000;">CLI script for installing agent on your Windows environment with Docker Swarm</h6>{{ $ctrl.command.winCommand
+            <code style="display: block; white-space: pre-wrap; padding: 16px 10px"
+              ><h6 style="color: #000">CLI script for installing agent on your Windows environment with Docker Swarm</h6>{{ $ctrl.command.winCommand
               }}<i class="fas fa-copy wizard-copy-button" ng-click="$ctrl.copyWinCommand()"></i
-              ><i id="winCommandNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none;"></i
+              ><i id="winCommandNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none"></i
             ></code>
           </uib-tab>
         </uib-tabset>
@@ -33,18 +33,18 @@
       <div ng-if="$ctrl.state.endpointType === 'api' || $ctrl.state.endpointType === 'socket'" class="wizard-code">
         <uib-tabset active="state.deploymentTab">
           <uib-tab index="0" heading="Linux">
-            <code style="display: block; white-space: pre-wrap; padding: 16px 10px;"
-              ><h6 style="color: #000;">When using the socket, ensure that you have started the Portainer container with the following Docker flag on Linux</h6
+            <code style="display: block; white-space: pre-wrap; padding: 16px 10px"
+              ><h6 style="color: #000">When using the socket, ensure that you have started the Portainer container with the following Docker flag on Linux</h6
               >{{ $ctrl.command.linuxSocket }}<i class="fas fa-copy wizard-copy-button" ng-click="$ctrl.copyLinuxSocket()"></i
-              ><i id="linuxSocketNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none;"></i
+              ><i id="linuxSocketNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none"></i
             ></code>
           </uib-tab>
 
           <uib-tab index="1" heading="Windows">
-            <code style="display: block; white-space: pre-wrap; padding: 16px 10px;"
-              ><h6 style="color: #000;">When using the socket, ensure that you have started the Portainer container with the following Docker flag on Windows</h6
+            <code style="display: block; white-space: pre-wrap; padding: 16px 10px"
+              ><h6 style="color: #000">When using the socket, ensure that you have started the Portainer container with the following Docker flag on Windows</h6
               >{{ $ctrl.command.winSocket }}<i class="fas fa-copy wizard-copy-button" ng-click="$ctrl.copyWinSocket()"></i
-              ><i id="winSocketNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none;"></i
+              ><i id="winSocketNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none"></i
             ></code>
           </uib-tab>
         </uib-tabset>
@@ -63,7 +63,7 @@
   <div ng-if="$ctrl.state.endpointType === 'agent'" class="form-group">
     <label for="endpoint_url" class="col-sm-3 col-lg-2 control-label text-left"> Environments URL<span class="wizard-form-required">*</span> </label>
 
-    <div class="col-sm-9 col-lg-10" style="margin-bottom: 15px;">
+    <div class="col-sm-9 col-lg-10" style="margin-bottom: 15px">
       <input
         ng-if="$ctrl.state.endpointType === 'agent'"
         type="text"
@@ -79,7 +79,7 @@
     <div class="form-group">
       <label for="dockerapi_url" class="col-sm-3 col-lg-2 control-label text-left"> Docker API URL<span class="wizard-form-required">*</span> </label>
 
-      <div class="col-sm-9 col-lg-10" style="margin-bottom: 15px;">
+      <div class="col-sm-9 col-lg-10" style="margin-bottom: 15px">
         <input
           ng-if="$ctrl.state.endpointType === 'api'"
           type="text"
@@ -91,11 +91,11 @@
       </div>
     </div>
 
-    <div class="form-group" style="padding-left: 15px; width: 15%;">
+    <div class="form-group" style="padding-left: 15px; width: 15%">
       <por-switch-field checked="$ctrl.formValues.tls" name="'connect_socket'" label="'TLS'" label-class="'col-sm-12 col-lg-4'" on-change="($ctrl.onToggleTls)"></por-switch-field>
     </div>
 
-    <div class="form-group" style="padding-left: 15px; width: 40%;">
+    <div class="form-group" style="padding-left: 15px; width: 40%">
       <por-switch-field
         ng-if="$ctrl.formValues.tls"
         checked="$ctrl.formValues.skipCertification"
@@ -111,12 +111,10 @@
     </div>
   </div>
 
-  <div ng-if="$ctrl.state.endpointType === 'socket'" class="form-group" style="padding-left: 15px;">
-    <div class="form-group" style="padding-left: 15px;">
-      <label for="override_socket" class="col-sm_12 control-label text-left">
-        Override default socket path
-      </label>
-      <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="$ctrl.formValues.overrideSocket" /><i></i></label>
+  <div ng-if="$ctrl.state.endpointType === 'socket'" class="form-group" style="padding-left: 15px">
+    <div class="form-group" style="padding-left: 15px">
+      <label for="override_socket" class="col-sm_12 control-label text-left"> Override default socket path </label>
+      <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="$ctrl.formValues.overrideSocket" /><i></i></label>
     </div>
 
     <div ng-if="$ctrl.formValues.overrideSocket">
@@ -149,7 +147,7 @@
         ng-click="$ctrl.connectEnvironment('agent')"
         button-spinner="$ctrl.state.actionInProgress"
       >
-        <span ng-hide="$ctrl.state.actionInProgress"><i class="fa fa-plug" style="margin-right: 5px;"></i>Connect </span>
+        <span ng-hide="$ctrl.state.actionInProgress"><i class="fa fa-plug" style="margin-right: 5px"></i>Connect </span>
         <span ng-show="$ctrl.state.actionInProgress">Connecting environment...</span>
       </button>
       <button
@@ -160,7 +158,7 @@
         ng-click="$ctrl.connectEnvironment('api')"
         button-spinner="$ctrl.state.actionInProgress"
       >
-        <span ng-hide="$ctrl.state.actionInProgress"><i class="fa fa-plug" style="margin-right: 5px;"></i>Connect </span>
+        <span ng-hide="$ctrl.state.actionInProgress"><i class="fa fa-plug" style="margin-right: 5px"></i>Connect </span>
         <span ng-show="$ctrl.state.actionInProgress">Connecting environment...</span>
       </button>
       <button
@@ -171,7 +169,7 @@
         ng-click="$ctrl.connectEnvironment('socket')"
         button-spinner="$ctrl.state.actionInProgress"
       >
-        <span ng-hide="$ctrl.state.actionInProgress"><i class="fa fa-plug" style="margin-right: 5px;"></i>Connect </span>
+        <span ng-hide="$ctrl.state.actionInProgress"><i class="fa fa-plug" style="margin-right: 5px"></i>Connect </span>
         <span ng-show="$ctrl.state.actionInProgress">Connecting environment...</span>
       </button>
     </div>
diff --git a/app/portainer/views/wizard/wizard-endpoints/wizard-endpoint-kubernetes/wizard-kubernetes.html b/app/portainer/views/wizard/wizard-endpoints/wizard-endpoint-kubernetes/wizard-kubernetes.html
index 335ce587f..c17ed4dd8 100644
--- a/app/portainer/views/wizard/wizard-endpoints/wizard-endpoint-kubernetes/wizard-kubernetes.html
+++ b/app/portainer/views/wizard/wizard-endpoints/wizard-endpoint-kubernetes/wizard-kubernetes.html
@@ -1,23 +1,23 @@
 <form class="form-horizontal" name="kubernetesWizardForm">
   <box-selector radio-name="'Kubernetes'" value="$ctrl.state.endpointType" options="$ctrl.state.availableOptions" on-change="($ctrl.onChangeEndpointType)"></box-selector>
   <!-- docker tab selection -->
-  <div style="padding-left: 10px;">
+  <div style="padding-left: 10px">
     <div class="form-group">
       <div class="wizard-code">
         <uib-tabset active="state.deploymentTab">
           <uib-tab index="0" heading="Kubernetes via load balancer">
-            <code style="display: block; white-space: pre-wrap; padding: 16px 10px;"
-              ><h6 style="color: #000;">CLI script for installing agent on your endpoint</h6>{{ $ctrl.command.loadBalancer
+            <code style="display: block; white-space: pre-wrap; padding: 16px 10px"
+              ><h6 style="color: #000">CLI script for installing agent on your endpoint</h6>{{ $ctrl.command.loadBalancer
               }}<i class="fas fa-copy wizard-copy-button" ng-click="$ctrl.copyLoadBalancer()"></i
-              ><i id="loadBalancerNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none;"></i
+              ><i id="loadBalancerNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none"></i
             ></code>
           </uib-tab>
 
           <uib-tab index="1" heading="Kubernetes via node port">
-            <code style="display: block; white-space: pre-wrap; padding: 16px 10px;"
-              ><h6 style="color: #000;">CLI script for installing agent on your endpoint</h6>{{ $ctrl.command.nodePort
+            <code style="display: block; white-space: pre-wrap; padding: 16px 10px"
+              ><h6 style="color: #000">CLI script for installing agent on your endpoint</h6>{{ $ctrl.command.nodePort
               }}<i class="fas fa-copy wizard-copy-button" ng-click="$ctrl.copyNodePort()"></i
-              ><i id="nodePortNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none;"></i
+              ><i id="nodePortNotification" class="fa fa-check green-icon" aria-hidden="true" style="margin-left: 7px; display: none"></i
             ></code>
           </uib-tab>
         </uib-tabset>
@@ -27,7 +27,7 @@
 
   <div class="form-group wizard-form">
     <label for="endpoint_name" class="col-sm-3 col-lg-2 control-label text-left">Name<span class="wizard-form-required">*</span></label>
-    <div class="col-sm-9 col-lg-10" style="margin-bottom: 15px;">
+    <div class="col-sm-9 col-lg-10" style="margin-bottom: 15px">
       <input
         type="text"
         class="form-control"
@@ -43,7 +43,7 @@
   <div class="form-group">
     <label for="endpoint_url" class="col-sm-3 col-lg-2 control-label text-left"> Environments URL<span class="wizard-form-required">*</span> </label>
 
-    <div class="col-sm-9 col-lg-10" style="margin-bottom: 15px;">
+    <div class="col-sm-9 col-lg-10" style="margin-bottom: 15px">
       <input type="text" class="form-control" name="endpoint_url" ng-model="$ctrl.state.formValues.url" placeholder="e.g. 10.0.0.10:9001 or tasks.portainer_agent:9001" required />
     </div>
   </div>
@@ -57,7 +57,7 @@
         ng-click="$ctrl.addKubernetesAgent()"
         button-spinner="$ctrl.state.actionInProgress"
       >
-        <span ng-hide="$ctrl.state.actionInProgress"><i class="fa fa-plug" style="margin-right: 5px;"></i> Connect </span>
+        <span ng-hide="$ctrl.state.actionInProgress"><i class="fa fa-plug" style="margin-right: 5px"></i> Connect </span>
         <span ng-show="$ctrl.state.actionInProgress">Connecting environment...</span>
       </button>
     </div>
diff --git a/app/portainer/views/wizard/wizard-endpoints/wizard-endpoint-list/wizard-endpoint-list.html b/app/portainer/views/wizard/wizard-endpoints/wizard-endpoint-list/wizard-endpoint-list.html
index 2feaa7c74..ede4f3548 100644
--- a/app/portainer/views/wizard/wizard-endpoints/wizard-endpoint-list/wizard-endpoint-list.html
+++ b/app/portainer/views/wizard/wizard-endpoints/wizard-endpoint-list/wizard-endpoint-list.html
@@ -2,7 +2,7 @@
   <rd-widget-header icon="fa-plug" title-text="Connected Environments"> </rd-widget-header>
   <rd-widget-body>
     <div class="wizard-list-wrapper" ng-repeat="endpoint in $ctrl.endpointList">
-      <div class="wizard-list-image"><i ng-class="endpoint.Type | endpointtypeicon" aria-hidden="true" style="margin-right: 2px;"></i></div>
+      <div class="wizard-list-image"><i ng-class="endpoint.Type | endpointtypeicon" aria-hidden="true" style="margin-right: 2px"></i></div>
       <div class="wizard-list-title">{{ endpoint.Name }}</div>
       <div class="wizard-list-subtitle">URL: {{ endpoint.URL | stripprotocol }}</div>
       <div class="wizard-list-type">Type: {{ endpoint.Type | endpointtypename }}</div>
diff --git a/app/portainer/views/wizard/wizard-endpoints/wizard-endpoints.html b/app/portainer/views/wizard/wizard-endpoints/wizard-endpoints.html
index d54eb5bd7..8bbd1a3b0 100644
--- a/app/portainer/views/wizard/wizard-endpoints/wizard-endpoints.html
+++ b/app/portainer/views/wizard/wizard-endpoints/wizard-endpoints.html
@@ -52,9 +52,7 @@
       <rd-widget-header icon="fa-magic" title-text="Environment Wizard"> </rd-widget-header>
       <rd-widget-body>
         <div class="row">
-          <div class="col-sm-12 form-section-title">
-            Select your environment(s)
-          </div>
+          <div class="col-sm-12 form-section-title"> Select your environment(s) </div>
           <div>
             <span class="text-muted small">You can onboard different types of environments, select all that apply.</span>
           </div>
diff --git a/app/portainer/views/wizard/wizard-endpoints/wizard-stepper/wizard-endpoint-type/wizard-endpoint-type.html b/app/portainer/views/wizard/wizard-endpoints/wizard-stepper/wizard-endpoint-type/wizard-endpoint-type.html
index 3088e3616..cd112934f 100644
--- a/app/portainer/views/wizard/wizard-endpoints/wizard-stepper/wizard-endpoint-type/wizard-endpoint-type.html
+++ b/app/portainer/views/wizard/wizard-endpoints/wizard-stepper/wizard-endpoint-type/wizard-endpoint-type.html
@@ -1,9 +1,9 @@
 <div>
   <div ng-click="$ctrl.endpointSelect('docker')">
     <div class="wizard-endpoints {{ $ctrl.active }}">
-      <div style="text-align: center; padding: 10px;"><i class="{{ $ctrl.icon }}" style="font-size: 80px;"></i></div>
+      <div style="text-align: center; padding: 10px"><i class="{{ $ctrl.icon }}" style="font-size: 80px"></i></div>
 
-      <div style="margin-top: 15px; text-align: center;">
+      <div style="margin-top: 15px; text-align: center">
         <h3>{{ $ctrl.endpointTitle }}</h3>
         <h5>{{ $ctrl.description }}</h5>
       </div>
diff --git a/app/portainer/views/wizard/wizard-link/wizard-link.html b/app/portainer/views/wizard/wizard-link/wizard-link.html
index 5f32b07ca..0a219da97 100644
--- a/app/portainer/views/wizard/wizard-link/wizard-link.html
+++ b/app/portainer/views/wizard/wizard-link/wizard-link.html
@@ -1,6 +1,6 @@
 <div class="wizard-button">
-  <div style="text-align: center; padding: 10px;"><i class="{{ $ctrl.icon }}" style="font-size: 80px;"></i></div>
-  <div style="margin-top: 15px; text-align: center;">
+  <div style="text-align: center; padding: 10px"><i class="{{ $ctrl.icon }}" style="font-size: 80px"></i></div>
+  <div style="margin-top: 15px; text-align: center">
     <h3>{{ $ctrl.linkTitle }}</h3>
     <h5>{{ $ctrl.description }}</h5>
   </div>
diff --git a/app/portainer/views/wizard/wizard-view.html b/app/portainer/views/wizard/wizard-view.html
index 5df89cc93..211fbbefa 100644
--- a/app/portainer/views/wizard/wizard-view.html
+++ b/app/portainer/views/wizard/wizard-view.html
@@ -9,9 +9,7 @@
       <rd-widget-header icon="fa-magic" title-text="Environment Wizard"> </rd-widget-header>
       <rd-widget-body>
         <div class="row">
-          <div class="col-sm-12 form-section-title">
-            Welcome to Portainer
-          </div>
+          <div class="col-sm-12 form-section-title"> Welcome to Portainer </div>
           <div>
             <span class="text-muted small" ng-show="$ctrl.state.endpoint.added">
               We have connected your local environment of {{ $ctrl.state.endpoint.connected }} to Portainer. <br
@@ -21,9 +19,7 @@
               Please ensure your environment is correctly exposed. For help with installation vist
               <a href="https://documentation.portainer.io/quickstart/">https://documentation.portainer.io/quickstart</a><br />
             </span>
-            <span class="text-muted small">
-              Get started below with your local portainer or connect more container environments.
-            </span>
+            <span class="text-muted small"> Get started below with your local portainer or connect more container environments. </span>
           </div>
 
           <wizard-link
diff --git a/app/react-table-config.d.ts b/app/react-table-config.d.ts
index f40127e96..f1b309993 100644
--- a/app/react-table-config.d.ts
+++ b/app/react-table-config.d.ts
@@ -52,8 +52,9 @@ import { UseSelectColumnTableOptions } from '@lineup-lite/hooks';
 declare module 'react-table' {
   // take this file as-is, or comment out the sections that don't apply to your plugin configuration
 
-  export interface TableOptions<D extends Record<string, unknown>>
-    extends UseExpandedOptions<D>,
+  export interface TableOptions<
+    D extends Record<string, unknown>
+  > extends UseExpandedOptions<D>,
       UseFiltersOptions<D>,
       UseGlobalFiltersOptions<D>,
       UseGroupByOptions<D>,
@@ -71,16 +72,14 @@ declare module 'react-table' {
 
   export interface Hooks<
     D extends Record<string, unknown> = Record<string, unknown>
-  >
-    extends UseExpandedHooks<D>,
+  > extends UseExpandedHooks<D>,
       UseGroupByHooks<D>,
       UseRowSelectHooks<D>,
       UseSortByHooks<D> {}
 
   export interface TableInstance<
     D extends Record<string, unknown> = Record<string, unknown>
-  >
-    extends UseColumnOrderInstanceProps<D>,
+  > extends UseColumnOrderInstanceProps<D>,
       UseExpandedInstanceProps<D>,
       UseFiltersInstanceProps<D>,
       UseGlobalFiltersInstanceProps<D>,
@@ -92,8 +91,7 @@ declare module 'react-table' {
 
   export interface TableState<
     D extends Record<string, unknown> = Record<string, unknown>
-  >
-    extends UseColumnOrderState<D>,
+  > extends UseColumnOrderState<D>,
       UseExpandedState<D>,
       UseFiltersState<D>,
       UseGlobalFiltersState<D>,
@@ -106,8 +104,7 @@ declare module 'react-table' {
 
   export interface ColumnInterface<
     D extends Record<string, unknown> = Record<string, unknown>
-  >
-    extends UseFiltersColumnOptions<D>,
+  > extends UseFiltersColumnOptions<D>,
       UseGlobalFiltersColumnOptions<D>,
       UseGroupByColumnOptions<D>,
       UseResizeColumnsColumnOptions<D>,
@@ -118,8 +115,7 @@ declare module 'react-table' {
 
   export interface ColumnInstance<
     D extends Record<string, unknown> = Record<string, unknown>
-  >
-    extends UseFiltersColumnProps<D>,
+  > extends UseFiltersColumnProps<D>,
       UseGroupByColumnProps<D>,
       UseResizeColumnsColumnProps<D>,
       UseSortByColumnProps<D> {
@@ -130,8 +126,7 @@ declare module 'react-table' {
     D extends Record<string, unknown> = Record<string, unknown>,
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     V = any
-  >
-    extends UseTableCellProps<D, V>,
+  > extends UseTableCellProps<D, V>,
       UseGroupByCellProps<D>,
       UseRowStateCellProps<D> {
     className?: string;
@@ -139,8 +134,7 @@ declare module 'react-table' {
 
   export interface Row<
     D extends Record<string, unknown> = Record<string, unknown>
-  >
-    extends UseExpandedRowProps<D>,
+  > extends UseExpandedRowProps<D>,
       UseGroupByRowProps<D>,
       UseRowSelectRowProps<D>,
       UseRowStateRowProps<D> {}
diff --git a/jsconfig.json b/jsconfig.json
index 8a4e0b153..6ce590ff7 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -10,7 +10,7 @@
       "Docker/*": ["docker/*"],
       "Kubernetes/*": ["kubernetes/*"],
       "Portainer/*": ["portainer/*"],
-      "@/*": ["../app/*"],
+      "@/*": ["../app/*"]
     }
   },
   "exclude": ["api", "build", "dist", "distribution", "node_modules", "test", "webpack"],
diff --git a/lint-staged.config.js b/lint-staged.config.js
index ba250c9d4..488d1e385 100644
--- a/lint-staged.config.js
+++ b/lint-staged.config.js
@@ -1,5 +1,5 @@
 module.exports = {
   '*.(js|ts){,x}': 'eslint --cache --fix',
   '*.(ts){,x}': () => 'tsc --noEmit',
-  '*.{js,ts,tsx,css,md,html}': 'prettier --write',
+  '*.{js,ts,tsx,css,md,html,json}': 'prettier --write',
 };
diff --git a/package.json b/package.json
index d0aafc7a6..d2b386b52 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "start:toolkit": "grunt start:toolkit",
     "build:server:offline": "cd ./api/cmd/portainer && CGO_ENABLED=0 go build --installsuffix cgo --ldflags '-s' && mv -f portainer ../../../dist/portainer",
     "clean:all": "grunt clean:all",
-    "format": "prettier --loglevel warn --write \"**/*.{js,css,html,jsx,tsx,ts}\"",
+    "format": "prettier --loglevel warn --write \"**/*.{js,css,html,jsx,tsx,ts,json}\"",
     "lint": "yarn lint:client; yarn lint:server",
     "lint:server": "cd api && golangci-lint run -E exportloopref",
     "lint:client": "eslint --cache --fix './**/*.{js,jsx,ts,tsx}'",
@@ -253,4 +253,4 @@
       "pre-commit": "lint-staged"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/test/e2e/cypress/support/commands.js b/test/e2e/cypress/support/commands.js
index ac1fa819d..93cda055d 100644
--- a/test/e2e/cypress/support/commands.js
+++ b/test/e2e/cypress/support/commands.js
@@ -554,9 +554,9 @@ Cypress.Commands.add('modifyResource', (location, action, resourceType, resource
 // Method for modifying all resources in an endpoint with the default names
 Cypress.Commands.add('modifyResources', (location, action) => {
   const associatedResources = {
-    '1': ['Stack', 'Container', 'Network', 'Volume'],
-    '2': ['Stack', 'Service', 'Container', 'Network', 'Volume', 'Config', 'Secret'],
-    '3': ['Application'],
+    1: ['Stack', 'Container', 'Network', 'Volume'],
+    2: ['Stack', 'Service', 'Container', 'Network', 'Volume', 'Config', 'Secret'],
+    3: ['Application'],
   };
   for (var res in associatedResources[ACTIVE_ENDPOINT_TYPE]) {
     let resource = associatedResources[ACTIVE_ENDPOINT_TYPE][res];
diff --git a/tool-versions.json b/tool-versions.json
index 8aa2060cf..bed3f2ffb 100644
--- a/tool-versions.json
+++ b/tool-versions.json
@@ -1,6 +1,6 @@
 {
-    "description": "This file contains current tool versions",
-    "go_version": "v1.17.6",
-    "node_version": "12.x",
-    "yarn_version": "1.x"
+  "description": "This file contains current tool versions",
+  "go_version": "v1.17.6",
+  "node_version": "12.x",
+  "yarn_version": "1.x"
 }
diff --git a/translations/en/translation.json b/translations/en/translation.json
index ed0e25ecf..8ef348a7a 100644
--- a/translations/en/translation.json
+++ b/translations/en/translation.json
@@ -27,4 +27,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/tsconfig.json b/tsconfig.json
index a5f6838b2..d3d1ad0eb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -33,7 +33,7 @@
       "Azure/*": ["azure/*"],
       "Docker/*": ["docker/*"],
       "Kubernetes/*": ["kubernetes/*"],
-      "Portainer/*": ["portainer/*"],
+      "Portainer/*": ["portainer/*"]
     }
   },
   "exclude": ["api", "build", "dist", "distribution", "node_modules", "test", "webpack"],
diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js
index 999cf7bb2..63a18323b 100644
--- a/webpack/webpack.common.js
+++ b/webpack/webpack.common.js
@@ -14,7 +14,6 @@ const CopyPlugin = require('copy-webpack-plugin');
 const pkg = require('../package.json');
 const projectRoot = path.resolve(__dirname, '..');
 
-
 module.exports = {
   entry: {
     main: './app',