diff --git a/Dockerfile b/Dockerfile
index 44813c35..32a5cbb4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 FROM node:14.21.2 as build
 WORKDIR /app
 COPY package.json .
+COPY package-lock.json .
 RUN npm install --legacy-peer-deps
 COPY . .
 RUN npm run build --prod
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..3377758a
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,12958 @@
+{
+  "name": "ncert",
+  "version": "0.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "ncert",
+      "version": "0.0.0",
+      "dependencies": {
+        "@angular/animations": "^14.0.0",
+        "@angular/cdk": "^14.0.4",
+        "@angular/common": "^14.0.0",
+        "@angular/compiler": "^14.0.0",
+        "@angular/core": "^14.0.0",
+        "@angular/forms": "^14.0.0",
+        "@angular/material": "^14.2.7",
+        "@angular/platform-browser": "^14.0.0",
+        "@angular/platform-browser-dynamic": "^14.0.0",
+        "@angular/router": "^14.0.0",
+        "@fortawesome/angular-fontawesome": "^0.11.1",
+        "@fortawesome/fontawesome-svg-core": "^6.1.1",
+        "@fortawesome/free-solid-svg-icons": "^6.1.1",
+        "@ng-bootstrap/ng-bootstrap": "^8.0.0",
+        "@ng-select/ng-select": "^9.0.2",
+        "@ngneat/transloco": "^4.1.0",
+        "@ngx-translate/core": "^14.0.0",
+        "@ngx-translate/http-loader": "^7.0.0",
+        "@project-sunbird/sb-dashlet": "6.0.3",
+        "@project-sunbird/sb-themes": "^0.0.78",
+        "@types/jspdf": "^2.0.0",
+        "angular-material-datepicker": "^1.0.2",
+        "apexcharts": "^3.35.5",
+        "bootstrap": "^4.3.1",
+        "chart.js": "^2.9.4",
+        "chartjs-plugin-trendline": "^2.0.2",
+        "color2k": "^2.0.0",
+        "cqube-library": "^4.10.25",
+        "crypto-js": "^4.1.1",
+        "datatables.net": "^1.10.20",
+        "datatables.net-dt": "^1.10.20",
+        "file-saver": "^2.0.5",
+        "highcharts": "^10.1.0",
+        "html2pdf.js": "^0.10.1",
+        "invert-color": "^2.0.0",
+        "jquery": "^3.5.1",
+        "json2csv": "^5.0.7",
+        "leaflet": "^1.6.0",
+        "leaflet-responsive-popup": "^1.0.0",
+        "lodash": "^4.17.21",
+        "ng-apexcharts": "^1.7.1",
+        "ng-circle-progress": "^1.6.0",
+        "ngx-bootstrap": "^9.0.0",
+        "ngx-daterangepicker-material": "^6.0.4",
+        "ngx-spinner": "^14.0.0",
+        "rxjs": "~7.5.0",
+        "tslib": "^2.3.0",
+        "xlsx": "^0.18.5",
+        "zone.js": "~0.11.4"
+      },
+      "devDependencies": {
+        "@angular-devkit/build-angular": "^14.0.3",
+        "@angular/cli": "~14.0.3",
+        "@angular/compiler-cli": "^14.0.3",
+        "@types/datatables.net": "^1.10.19",
+        "@types/jasmine": "~4.0.0",
+        "@types/jquery": "^3.5.14",
+        "@types/lodash": "^4.14.191",
+        "autoprefixer": "^10.4.7",
+        "jasmine-core": "~4.1.0",
+        "karma": "~6.3.0",
+        "karma-chrome-launcher": "~3.1.0",
+        "karma-coverage": "~2.2.0",
+        "karma-jasmine": "~5.0.0",
+        "karma-jasmine-html-reporter": "~1.7.0",
+        "postcss": "^8.4.16",
+        "postcss-loader": "^7.0.1",
+        "tailwindcss": "^3.1.4",
+        "typescript": "~4.7.2"
+      }
+    },
+    "node_modules/@adobe/css-tools": {
+      "version": "4.3.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@alloc/quick-lru": {
+      "version": "5.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.2.0",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/architect": {
+      "version": "0.1402.12",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@angular-devkit/core": "14.2.12",
+        "rxjs": "6.6.7"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/architect/node_modules/rxjs": {
+      "version": "6.6.7",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/architect/node_modules/tslib": {
+      "version": "1.14.1",
+      "dev": true,
+      "license": "0BSD"
+    },
+    "node_modules/@angular-devkit/build-angular": {
+      "version": "14.2.12",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@ampproject/remapping": "2.2.0",
+        "@angular-devkit/architect": "0.1402.12",
+        "@angular-devkit/build-webpack": "0.1402.12",
+        "@angular-devkit/core": "14.2.12",
+        "@babel/core": "7.18.10",
+        "@babel/generator": "7.18.12",
+        "@babel/helper-annotate-as-pure": "7.18.6",
+        "@babel/plugin-proposal-async-generator-functions": "7.18.10",
+        "@babel/plugin-transform-async-to-generator": "7.18.6",
+        "@babel/plugin-transform-runtime": "7.18.10",
+        "@babel/preset-env": "7.18.10",
+        "@babel/runtime": "7.18.9",
+        "@babel/template": "7.18.10",
+        "@discoveryjs/json-ext": "0.5.7",
+        "@ngtools/webpack": "14.2.12",
+        "ansi-colors": "4.1.3",
+        "babel-loader": "8.2.5",
+        "babel-plugin-istanbul": "6.1.1",
+        "browserslist": "^4.9.1",
+        "cacache": "16.1.2",
+        "copy-webpack-plugin": "11.0.0",
+        "critters": "0.0.16",
+        "css-loader": "6.7.1",
+        "esbuild-wasm": "0.15.5",
+        "glob": "8.0.3",
+        "https-proxy-agent": "5.0.1",
+        "inquirer": "8.2.4",
+        "jsonc-parser": "3.1.0",
+        "karma-source-map-support": "1.4.0",
+        "less": "4.1.3",
+        "less-loader": "11.0.0",
+        "license-webpack-plugin": "4.0.2",
+        "loader-utils": "3.2.1",
+        "mini-css-extract-plugin": "2.6.1",
+        "minimatch": "5.1.0",
+        "open": "8.4.0",
+        "ora": "5.4.1",
+        "parse5-html-rewriting-stream": "6.0.1",
+        "piscina": "3.2.0",
+        "postcss": "8.4.16",
+        "postcss-import": "15.0.0",
+        "postcss-loader": "7.0.1",
+        "postcss-preset-env": "7.8.0",
+        "regenerator-runtime": "0.13.9",
+        "resolve-url-loader": "5.0.0",
+        "rxjs": "6.6.7",
+        "sass": "1.54.4",
+        "sass-loader": "13.0.2",
+        "semver": "7.5.3",
+        "source-map-loader": "4.0.0",
+        "source-map-support": "0.5.21",
+        "stylus": "0.59.0",
+        "stylus-loader": "7.0.0",
+        "terser": "5.14.2",
+        "text-table": "0.2.0",
+        "tree-kill": "1.2.2",
+        "tslib": "2.4.0",
+        "webpack": "5.76.1",
+        "webpack-dev-middleware": "5.3.3",
+        "webpack-dev-server": "4.11.0",
+        "webpack-merge": "5.8.0",
+        "webpack-subresource-integrity": "5.1.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "optionalDependencies": {
+        "esbuild": "0.15.5"
+      },
+      "peerDependencies": {
+        "@angular/compiler-cli": "^14.0.0",
+        "@angular/localize": "^14.0.0",
+        "@angular/service-worker": "^14.0.0",
+        "karma": "^6.3.0",
+        "ng-packagr": "^14.0.0",
+        "protractor": "^7.0.0",
+        "tailwindcss": "^2.0.0 || ^3.0.0",
+        "typescript": ">=4.6.2 <4.9"
+      },
+      "peerDependenciesMeta": {
+        "@angular/localize": {
+          "optional": true
+        },
+        "@angular/service-worker": {
+          "optional": true
+        },
+        "karma": {
+          "optional": true
+        },
+        "ng-packagr": {
+          "optional": true
+        },
+        "protractor": {
+          "optional": true
+        },
+        "tailwindcss": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/cosmiconfig": {
+      "version": "7.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/postcss": {
+      "version": "8.4.16",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.4",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/postcss-loader": {
+      "version": "7.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cosmiconfig": "^7.0.0",
+        "klona": "^2.0.5",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "postcss": "^7.0.0 || ^8.0.1",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/rxjs": {
+      "version": "6.6.7",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/rxjs/node_modules/tslib": {
+      "version": "1.14.1",
+      "dev": true,
+      "license": "0BSD"
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/tslib": {
+      "version": "2.4.0",
+      "dev": true,
+      "license": "0BSD"
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/yaml": {
+      "version": "1.10.2",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@angular-devkit/build-webpack": {
+      "version": "0.1402.12",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@angular-devkit/architect": "0.1402.12",
+        "rxjs": "6.6.7"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "webpack": "^5.30.0",
+        "webpack-dev-server": "^4.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-webpack/node_modules/rxjs": {
+      "version": "6.6.7",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-webpack/node_modules/tslib": {
+      "version": "1.14.1",
+      "dev": true,
+      "license": "0BSD"
+    },
+    "node_modules/@angular-devkit/core": {
+      "version": "14.2.12",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "8.11.0",
+        "ajv-formats": "2.1.1",
+        "jsonc-parser": "3.1.0",
+        "rxjs": "6.6.7",
+        "source-map": "0.7.4"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^3.5.2"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/core/node_modules/ajv": {
+      "version": "8.11.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-devkit/core/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@angular-devkit/core/node_modules/rxjs": {
+      "version": "6.6.7",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/core/node_modules/tslib": {
+      "version": "1.14.1",
+      "dev": true,
+      "license": "0BSD"
+    },
+    "node_modules/@angular-devkit/schematics": {
+      "version": "14.0.7",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@angular-devkit/core": "14.0.7",
+        "jsonc-parser": "3.0.0",
+        "magic-string": "0.26.1",
+        "ora": "5.4.1",
+        "rxjs": "6.6.7"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": {
+      "version": "14.0.7",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "8.11.0",
+        "ajv-formats": "2.1.1",
+        "jsonc-parser": "3.0.0",
+        "rxjs": "6.6.7",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^3.5.2"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/ajv": {
+      "version": "8.11.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/jsonc-parser": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/rxjs": {
+      "version": "6.6.7",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/source-map": {
+      "version": "0.7.3",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@angular-devkit/schematics/node_modules/tslib": {
+      "version": "1.14.1",
+      "dev": true,
+      "license": "0BSD"
+    },
+    "node_modules/@angular/animations": {
+      "version": "14.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "14.3.0"
+      }
+    },
+    "node_modules/@angular/cdk": {
+      "version": "14.2.7",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "optionalDependencies": {
+        "parse5": "^5.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "^14.0.0 || ^15.0.0",
+        "@angular/core": "^14.0.0 || ^15.0.0",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@angular/cli": {
+      "version": "14.0.7",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@angular-devkit/architect": "0.1400.7",
+        "@angular-devkit/core": "14.0.7",
+        "@angular-devkit/schematics": "14.0.7",
+        "@schematics/angular": "14.0.7",
+        "@yarnpkg/lockfile": "1.1.0",
+        "ansi-colors": "4.1.1",
+        "debug": "4.3.4",
+        "ini": "3.0.0",
+        "inquirer": "8.2.4",
+        "jsonc-parser": "3.0.0",
+        "npm-package-arg": "9.0.2",
+        "npm-pick-manifest": "7.0.1",
+        "open": "8.4.0",
+        "ora": "5.4.1",
+        "pacote": "13.3.0",
+        "resolve": "1.22.0",
+        "semver": "7.3.7",
+        "symbol-observable": "4.0.0",
+        "uuid": "8.3.2",
+        "yargs": "17.4.1"
+      },
+      "bin": {
+        "ng": "bin/ng.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/@angular-devkit/architect": {
+      "version": "0.1400.7",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@angular-devkit/core": "14.0.7",
+        "rxjs": "6.6.7"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/@angular-devkit/core": {
+      "version": "14.0.7",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "8.11.0",
+        "ajv-formats": "2.1.1",
+        "jsonc-parser": "3.0.0",
+        "rxjs": "6.6.7",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^3.5.2"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular/cli/node_modules/ajv": {
+      "version": "8.11.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@angular/cli/node_modules/jsonc-parser": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@angular/cli/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/rxjs": {
+      "version": "6.6.7",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/semver": {
+      "version": "7.3.7",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/source-map": {
+      "version": "0.7.3",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@angular/cli/node_modules/tslib": {
+      "version": "1.14.1",
+      "dev": true,
+      "license": "0BSD"
+    },
+    "node_modules/@angular/cli/node_modules/yallist": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/@angular/common": {
+      "version": "14.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "14.3.0",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@angular/compiler": {
+      "version": "14.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "14.3.0"
+      },
+      "peerDependenciesMeta": {
+        "@angular/core": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular/compiler-cli": {
+      "version": "14.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.17.2",
+        "chokidar": "^3.0.0",
+        "convert-source-map": "^1.5.1",
+        "dependency-graph": "^0.11.0",
+        "magic-string": "^0.26.0",
+        "reflect-metadata": "^0.1.2",
+        "semver": "^7.0.0",
+        "sourcemap-codec": "^1.4.8",
+        "tslib": "^2.3.0",
+        "yargs": "^17.2.1"
+      },
+      "bin": {
+        "ng-xi18n": "bundles/src/bin/ng_xi18n.js",
+        "ngc": "bundles/src/bin/ngc.js",
+        "ngcc": "bundles/ngcc/main-ngcc.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler": "14.3.0",
+        "typescript": ">=4.6.2 <4.9"
+      }
+    },
+    "node_modules/@angular/core": {
+      "version": "14.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0"
+      },
+      "peerDependencies": {
+        "rxjs": "^6.5.3 || ^7.4.0",
+        "zone.js": "~0.11.4 || ~0.12.0"
+      }
+    },
+    "node_modules/@angular/forms": {
+      "version": "14.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "14.3.0",
+        "@angular/core": "14.3.0",
+        "@angular/platform-browser": "14.3.0",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@angular/http": {
+      "version": "2.4.10",
+      "license": "MIT",
+      "peerDependencies": {
+        "@angular/core": "2.4.10",
+        "@angular/platform-browser": "2.4.10",
+        "rxjs": "^5.0.1"
+      }
+    },
+    "node_modules/@angular/localize": {
+      "version": "10.2.5",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@babel/core": "7.8.3",
+        "glob": "7.1.2",
+        "yargs": "^16.1.1"
+      },
+      "bin": {
+        "localize-extract": "src/tools/src/extract/main.js",
+        "localize-translate": "src/tools/src/translate/main.js"
+      },
+      "engines": {
+        "node": ">=8.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler": "10.2.5",
+        "@angular/compiler-cli": "10.2.5"
+      }
+    },
+    "node_modules/@angular/localize/node_modules/@babel/core": {
+      "version": "7.8.3",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.8.3",
+        "@babel/generator": "^7.8.3",
+        "@babel/helpers": "^7.8.3",
+        "@babel/parser": "^7.8.3",
+        "@babel/template": "^7.8.3",
+        "@babel/traverse": "^7.8.3",
+        "@babel/types": "^7.8.3",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.1",
+        "json5": "^2.1.0",
+        "lodash": "^4.17.13",
+        "resolve": "^1.3.2",
+        "semver": "^5.4.1",
+        "source-map": "^0.5.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@angular/localize/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/@angular/localize/node_modules/glob": {
+      "version": "7.1.2",
+      "license": "ISC",
+      "peer": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@angular/localize/node_modules/minimatch": {
+      "version": "3.1.2",
+      "license": "ISC",
+      "peer": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@angular/localize/node_modules/semver": {
+      "version": "5.7.2",
+      "license": "ISC",
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/@angular/localize/node_modules/source-map": {
+      "version": "0.5.7",
+      "license": "BSD-3-Clause",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@angular/localize/node_modules/yargs": {
+      "version": "16.2.0",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@angular/localize/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "license": "ISC",
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@angular/material": {
+      "version": "14.2.7",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/animations": "^14.0.0 || ^15.0.0",
+        "@angular/cdk": "14.2.7",
+        "@angular/common": "^14.0.0 || ^15.0.0",
+        "@angular/core": "^14.0.0 || ^15.0.0",
+        "@angular/forms": "^14.0.0 || ^15.0.0",
+        "@angular/platform-browser": "^14.0.0 || ^15.0.0",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@angular/platform-browser": {
+      "version": "14.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0"
+      },
+      "peerDependencies": {
+        "@angular/animations": "14.3.0",
+        "@angular/common": "14.3.0",
+        "@angular/core": "14.3.0"
+      },
+      "peerDependenciesMeta": {
+        "@angular/animations": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular/platform-browser-dynamic": {
+      "version": "14.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "14.3.0",
+        "@angular/compiler": "14.3.0",
+        "@angular/core": "14.3.0",
+        "@angular/platform-browser": "14.3.0"
+      }
+    },
+    "node_modules/@angular/router": {
+      "version": "14.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "14.3.0",
+        "@angular/core": "14.3.0",
+        "@angular/platform-browser": "14.3.0",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@assemblyscript/loader": {
+      "version": "0.10.1",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.22.10",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/highlight": "^7.22.10",
+        "chalk": "^2.4.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.22.9",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.18.10",
+      "license": "MIT",
+      "dependencies": {
+        "@ampproject/remapping": "^2.1.0",
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.18.10",
+        "@babel/helper-compilation-targets": "^7.18.9",
+        "@babel/helper-module-transforms": "^7.18.9",
+        "@babel/helpers": "^7.18.9",
+        "@babel/parser": "^7.18.10",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.18.10",
+        "@babel/types": "^7.18.10",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.1",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/core/node_modules/semver": {
+      "version": "6.3.1",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.18.12",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.18.10",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.18.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.22.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.22.10"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.22.10",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/compat-data": "^7.22.9",
+        "@babel/helper-validator-option": "^7.22.5",
+        "browserslist": "^4.21.9",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+      "version": "6.3.1",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-create-class-features-plugin": {
+      "version": "7.22.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": {
+      "version": "6.3.1",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-create-regexp-features-plugin": {
+      "version": "7.22.9",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "regexpu-core": "^5.3.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": {
+      "version": "6.3.1",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.3.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.17.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0-0"
+      }
+    },
+    "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": {
+      "version": "6.3.1",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.22.5",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.22.5",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/template": "^7.22.5",
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-function-name/node_modules/@babel/template": {
+      "version": "7.22.5",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.22.5",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-member-expression-to-functions": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.22.5",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.22.9",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-validator-identifier": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-optimise-call-expression": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-remap-async-to-generator": {
+      "version": "7.22.9",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-wrap-function": "^7.22.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-replace-supers": {
+      "version": "7.22.9",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.22.5",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.22.6",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.22.5",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.22.5",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.22.5",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-wrap-function": {
+      "version": "7.22.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/types": "^7.22.10"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.22.10",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.10",
+        "@babel/types": "^7.22.10"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers/node_modules/@babel/template": {
+      "version": "7.22.5",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.22.10",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.22.10",
+      "license": "MIT",
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.13.0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.18.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-remap-async-to-generator": "^7.18.9",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-class-properties": {
+      "version": "7.18.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-class-static-block": {
+      "version": "7.21.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.21.0",
+        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.12.0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-dynamic-import": {
+      "version": "7.18.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-export-namespace-from": {
+      "version": "7.18.9",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-json-strings": {
+      "version": "7.18.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
+      "version": "7.20.7",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.18.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-numeric-separator": {
+      "version": "7.18.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.20.7",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/compat-data": "^7.20.5",
+        "@babel/helper-compilation-targets": "^7.20.7",
+        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.20.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.18.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-optional-chaining": {
+      "version": "7.21.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-private-methods": {
+      "version": "7.18.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.21.11",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-create-class-features-plugin": "^7.21.0",
+        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.18.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-assertions": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-arrow-functions": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-async-to-generator": {
+      "version": "7.18.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/helper-remap-async-to-generator": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoping": {
+      "version": "7.22.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-classes": {
+      "version": "7.22.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-computed-properties": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/template": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-computed-properties/node_modules/@babel/template": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-destructuring": {
+      "version": "7.22.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dotall-regex": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-duplicate-keys": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-for-of": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-function-name": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-literals": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-member-expression-literals": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-amd": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-commonjs": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-systemjs": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-umd": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-new-target": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-super": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-optional-chaining": {
+      "version": "7.22.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-parameters": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-property-literals": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-regenerator": {
+      "version": "7.22.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "regenerator-transform": "^0.15.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-reserved-words": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-runtime": {
+      "version": "7.18.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "babel-plugin-polyfill-corejs2": "^0.3.2",
+        "babel-plugin-polyfill-corejs3": "^0.5.3",
+        "babel-plugin-polyfill-regenerator": "^0.4.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
+      "version": "6.3.1",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/plugin-transform-shorthand-properties": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-spread": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-sticky-regex": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-template-literals": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-typeof-symbol": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-escapes": {
+      "version": "7.22.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-regex": {
+      "version": "7.22.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-env": {
+      "version": "7.18.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/compat-data": "^7.18.8",
+        "@babel/helper-compilation-targets": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-validator-option": "^7.18.6",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
+        "@babel/plugin-proposal-async-generator-functions": "^7.18.10",
+        "@babel/plugin-proposal-class-properties": "^7.18.6",
+        "@babel/plugin-proposal-class-static-block": "^7.18.6",
+        "@babel/plugin-proposal-dynamic-import": "^7.18.6",
+        "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
+        "@babel/plugin-proposal-json-strings": "^7.18.6",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
+        "@babel/plugin-proposal-numeric-separator": "^7.18.6",
+        "@babel/plugin-proposal-object-rest-spread": "^7.18.9",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
+        "@babel/plugin-proposal-optional-chaining": "^7.18.9",
+        "@babel/plugin-proposal-private-methods": "^7.18.6",
+        "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-import-assertions": "^7.18.6",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-transform-arrow-functions": "^7.18.6",
+        "@babel/plugin-transform-async-to-generator": "^7.18.6",
+        "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
+        "@babel/plugin-transform-block-scoping": "^7.18.9",
+        "@babel/plugin-transform-classes": "^7.18.9",
+        "@babel/plugin-transform-computed-properties": "^7.18.9",
+        "@babel/plugin-transform-destructuring": "^7.18.9",
+        "@babel/plugin-transform-dotall-regex": "^7.18.6",
+        "@babel/plugin-transform-duplicate-keys": "^7.18.9",
+        "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
+        "@babel/plugin-transform-for-of": "^7.18.8",
+        "@babel/plugin-transform-function-name": "^7.18.9",
+        "@babel/plugin-transform-literals": "^7.18.9",
+        "@babel/plugin-transform-member-expression-literals": "^7.18.6",
+        "@babel/plugin-transform-modules-amd": "^7.18.6",
+        "@babel/plugin-transform-modules-commonjs": "^7.18.6",
+        "@babel/plugin-transform-modules-systemjs": "^7.18.9",
+        "@babel/plugin-transform-modules-umd": "^7.18.6",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.18.6",
+        "@babel/plugin-transform-new-target": "^7.18.6",
+        "@babel/plugin-transform-object-super": "^7.18.6",
+        "@babel/plugin-transform-parameters": "^7.18.8",
+        "@babel/plugin-transform-property-literals": "^7.18.6",
+        "@babel/plugin-transform-regenerator": "^7.18.6",
+        "@babel/plugin-transform-reserved-words": "^7.18.6",
+        "@babel/plugin-transform-shorthand-properties": "^7.18.6",
+        "@babel/plugin-transform-spread": "^7.18.9",
+        "@babel/plugin-transform-sticky-regex": "^7.18.6",
+        "@babel/plugin-transform-template-literals": "^7.18.9",
+        "@babel/plugin-transform-typeof-symbol": "^7.18.9",
+        "@babel/plugin-transform-unicode-escapes": "^7.18.10",
+        "@babel/plugin-transform-unicode-regex": "^7.18.6",
+        "@babel/preset-modules": "^0.1.5",
+        "@babel/types": "^7.18.10",
+        "babel-plugin-polyfill-corejs2": "^0.3.2",
+        "babel-plugin-polyfill-corejs3": "^0.5.3",
+        "babel-plugin-polyfill-regenerator": "^0.4.0",
+        "core-js-compat": "^3.22.1",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-env/node_modules/semver": {
+      "version": "6.3.1",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/preset-modules": {
+      "version": "0.1.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/@babel/regjsgen": {
+      "version": "0.8.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.18.9",
+      "license": "MIT",
+      "dependencies": {
+        "regenerator-runtime": "^0.13.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.18.10",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.18.6",
+        "@babel/parser": "^7.18.10",
+        "@babel/types": "^7.18.10"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.22.10",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.22.10",
+        "@babel/generator": "^7.22.10",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.22.10",
+        "@babel/types": "^7.22.10",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse/node_modules/@babel/generator": {
+      "version": "7.22.10",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.22.10",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.22.10",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@colors/colors": {
+      "version": "1.5.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/@csstools/postcss-cascade-layers": {
+      "version": "1.1.1",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "@csstools/selector-specificity": "^2.0.2",
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-color-function": {
+      "version": "1.1.1",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-font-format-keywords": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-hwb-function": {
+      "version": "1.0.2",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-ic-unit": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-is-pseudo-class": {
+      "version": "2.0.7",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "@csstools/selector-specificity": "^2.0.0",
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-nested-calc": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-normalize-display-values": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-oklab-function": {
+      "version": "1.1.1",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-progressive-custom-properties": {
+      "version": "1.3.0",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/@csstools/postcss-stepped-value-functions": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-text-decoration-shorthand": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-trigonometric-functions": {
+      "version": "1.0.2",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-unset-value": {
+      "version": "1.0.2",
+      "dev": true,
+      "license": "CC0-1.0",
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/selector-specificity": {
+      "version": "2.2.0",
+      "dev": true,
+      "license": "CC0-1.0",
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      }
+    },
+    "node_modules/@discoveryjs/json-ext": {
+      "version": "0.5.7",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/@fortawesome/angular-fontawesome": {
+      "version": "0.11.1",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.4.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "^14.0.0",
+        "@fortawesome/fontawesome-svg-core": "~1.2.27 || ~1.3.0-beta2 || ^6.1.0"
+      }
+    },
+    "node_modules/@fortawesome/fontawesome-common-types": {
+      "version": "6.4.2",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@fortawesome/fontawesome-svg-core": {
+      "version": "6.4.2",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "@fortawesome/fontawesome-common-types": "6.4.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@fortawesome/free-solid-svg-icons": {
+      "version": "6.4.2",
+      "hasInstallScript": true,
+      "license": "(CC-BY-4.0 AND MIT)",
+      "dependencies": {
+        "@fortawesome/fontawesome-common-types": "6.4.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@gar/promisify": {
+      "version": "1.1.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@hapi/hoek": {
+      "version": "9.3.0",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@hapi/topo": {
+      "version": "5.1.0",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@hapi/hoek": "^9.0.0"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.1.1",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "license": "MIT"
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.19",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@leichtgewicht/ip-codec": {
+      "version": "2.0.4",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@ng-bootstrap/ng-bootstrap": {
+      "version": "8.0.4",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "^10.0.0",
+        "@angular/core": "^10.0.0",
+        "@angular/forms": "^10.0.0",
+        "@angular/localize": "^10.0.0",
+        "rxjs": "^6.5.5"
+      }
+    },
+    "node_modules/@ng-select/ng-select": {
+      "version": "9.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.1"
+      },
+      "engines": {
+        "node": ">= 12.20.0",
+        "npm": ">= 6.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "<15.0.0",
+        "@angular/core": "<15.0.0",
+        "@angular/forms": "<15.0.0"
+      }
+    },
+    "node_modules/@ngneat/transloco": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "@ngneat/transloco-utils": "3.0.5",
+        "flat": "5.0.2",
+        "lodash.kebabcase": "^4.1.1",
+        "ora": "^5.4.1",
+        "replace-in-file": "^6.2.0",
+        "tslib": "^2.2.0"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=13.0.0",
+        "fs-extra": ">=9.1.0",
+        "glob": ">=7.1.7",
+        "rxjs": ">=6.0.0"
+      }
+    },
+    "node_modules/@ngneat/transloco-utils": {
+      "version": "3.0.5",
+      "license": "MIT",
+      "dependencies": {
+        "cosmiconfig": "^8.1.3",
+        "tslib": "^2.3.0"
+      }
+    },
+    "node_modules/@ngtools/webpack": {
+      "version": "14.2.12",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler-cli": "^14.0.0",
+        "typescript": ">=4.6.2 <4.9",
+        "webpack": "^5.54.0"
+      }
+    },
+    "node_modules/@ngx-translate/core": {
+      "version": "14.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=13.0.0",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@ngx-translate/http-loader": {
+      "version": "7.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=13.0.0",
+        "@ngx-translate/core": ">=14.0.0",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@npmcli/fs": {
+      "version": "2.1.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@gar/promisify": "^1.1.3",
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@npmcli/git": {
+      "version": "3.0.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/promise-spawn": "^3.0.0",
+        "lru-cache": "^7.4.4",
+        "mkdirp": "^1.0.4",
+        "npm-pick-manifest": "^7.0.0",
+        "proc-log": "^2.0.0",
+        "promise-inflight": "^1.0.1",
+        "promise-retry": "^2.0.1",
+        "semver": "^7.3.5",
+        "which": "^2.0.2"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@npmcli/git/node_modules/which": {
+      "version": "2.0.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@npmcli/installed-package-contents": {
+      "version": "1.0.7",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "npm-bundled": "^1.1.1",
+        "npm-normalize-package-bin": "^1.0.1"
+      },
+      "bin": {
+        "installed-package-contents": "index.js"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@npmcli/move-file": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mkdirp": "^1.0.4",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@npmcli/node-gyp": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@npmcli/promise-spawn": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "infer-owner": "^1.0.4"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@npmcli/run-script": {
+      "version": "3.0.3",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/node-gyp": "^2.0.0",
+        "@npmcli/promise-spawn": "^3.0.0",
+        "node-gyp": "^8.4.1",
+        "read-package-json-fast": "^2.0.3"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@project-sunbird/sb-dashlet": {
+      "version": "6.0.3",
+      "license": "MIT",
+      "dependencies": {
+        "@types/datatables.net": "1.10.19",
+        "angular-datatables": "14.0.2",
+        "chart.js": "2.9.4",
+        "chartjs-plugin-annotation": "^0.5.7",
+        "datatables.net": "1.10.20",
+        "datatables.net-dt": "1.10.20",
+        "joi": "17.4.0",
+        "jquery": "3.4.1",
+        "jsonexport": "3.2.0",
+        "lodash-es": "4.17.21",
+        "ng-multiselect-dropdown": "0.3.4",
+        "ng2-charts": "2.4.2",
+        "ngx-daterangepicker-material": "6.0.4",
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "14.3.0",
+        "@angular/core": "14.3.0",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@project-sunbird/sb-dashlet/node_modules/@types/datatables.net": {
+      "version": "1.10.19",
+      "license": "MIT",
+      "dependencies": {
+        "@types/jquery": "*"
+      }
+    },
+    "node_modules/@project-sunbird/sb-dashlet/node_modules/datatables.net": {
+      "version": "1.10.20",
+      "license": "MIT",
+      "dependencies": {
+        "jquery": ">=1.7"
+      }
+    },
+    "node_modules/@project-sunbird/sb-dashlet/node_modules/datatables.net-dt": {
+      "version": "1.10.20",
+      "license": "MIT",
+      "dependencies": {
+        "datatables.net": "1.10.20",
+        "jquery": ">=1.7"
+      }
+    },
+    "node_modules/@project-sunbird/sb-dashlet/node_modules/jquery": {
+      "version": "3.4.1",
+      "license": "MIT"
+    },
+    "node_modules/@project-sunbird/sb-themes": {
+      "version": "0.0.78",
+      "license": "MIT"
+    },
+    "node_modules/@schematics/angular": {
+      "version": "14.0.7",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@angular-devkit/core": "14.0.7",
+        "@angular-devkit/schematics": "14.0.7",
+        "jsonc-parser": "3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      }
+    },
+    "node_modules/@schematics/angular/node_modules/@angular-devkit/core": {
+      "version": "14.0.7",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "8.11.0",
+        "ajv-formats": "2.1.1",
+        "jsonc-parser": "3.0.0",
+        "rxjs": "6.6.7",
+        "source-map": "0.7.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || >=16.10.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^3.5.2"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@schematics/angular/node_modules/ajv": {
+      "version": "8.11.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@schematics/angular/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@schematics/angular/node_modules/jsonc-parser": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@schematics/angular/node_modules/rxjs": {
+      "version": "6.6.7",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/@schematics/angular/node_modules/source-map": {
+      "version": "0.7.3",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@schematics/angular/node_modules/tslib": {
+      "version": "1.14.1",
+      "dev": true,
+      "license": "0BSD"
+    },
+    "node_modules/@sideway/address": {
+      "version": "4.1.4",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@hapi/hoek": "^9.0.0"
+      }
+    },
+    "node_modules/@sideway/formula": {
+      "version": "3.0.1",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@sideway/pinpoint": {
+      "version": "2.0.0",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@socket.io/component-emitter": {
+      "version": "3.1.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "1.1.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@types/body-parser": {
+      "version": "1.19.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/connect": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/bonjour": {
+      "version": "3.5.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/chart.js": {
+      "version": "2.9.37",
+      "license": "MIT",
+      "dependencies": {
+        "moment": "^2.10.2"
+      }
+    },
+    "node_modules/@types/connect": {
+      "version": "3.4.35",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/connect-history-api-fallback": {
+      "version": "1.5.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/express-serve-static-core": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/cookie": {
+      "version": "0.4.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/cors": {
+      "version": "2.8.13",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/datatables.net": {
+      "version": "1.10.24",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/jquery": "*"
+      }
+    },
+    "node_modules/@types/eslint": {
+      "version": "8.44.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "0.0.51",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/express": {
+      "version": "4.17.17",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "^4.17.33",
+        "@types/qs": "*",
+        "@types/serve-static": "*"
+      }
+    },
+    "node_modules/@types/express-serve-static-core": {
+      "version": "4.17.35",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*",
+        "@types/send": "*"
+      }
+    },
+    "node_modules/@types/http-errors": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/http-proxy": {
+      "version": "1.17.11",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/jasmine": {
+      "version": "4.0.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/jquery": {
+      "version": "3.5.16",
+      "license": "MIT",
+      "dependencies": {
+        "@types/sizzle": "*"
+      }
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.12",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/jspdf": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "jspdf": "*"
+      }
+    },
+    "node_modules/@types/lodash": {
+      "version": "4.14.197",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/mime": {
+      "version": "1.3.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "20.5.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/parse-json": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/qs": {
+      "version": "6.9.7",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/raf": {
+      "version": "3.4.0",
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/@types/range-parser": {
+      "version": "1.2.4",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/retry": {
+      "version": "0.12.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/send": {
+      "version": "0.17.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mime": "^1",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/serve-index": {
+      "version": "1.9.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/express": "*"
+      }
+    },
+    "node_modules/@types/serve-static": {
+      "version": "1.15.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/http-errors": "*",
+        "@types/mime": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/sizzle": {
+      "version": "2.3.3",
+      "license": "MIT"
+    },
+    "node_modules/@types/sockjs": {
+      "version": "0.3.33",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/ws": {
+      "version": "8.5.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.11.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.11.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.11.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.11.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
+        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.11.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.11.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.11.1",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.11.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.11.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/helper-wasm-section": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1",
+        "@webassemblyjs/wasm-opt": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1",
+        "@webassemblyjs/wast-printer": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.11.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/ieee754": "1.11.1",
+        "@webassemblyjs/leb128": "1.11.1",
+        "@webassemblyjs/utf8": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.11.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.11.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/ieee754": "1.11.1",
+        "@webassemblyjs/leb128": "1.11.1",
+        "@webassemblyjs/utf8": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.11.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/@yarnpkg/lockfile": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/abab": {
+      "version": "2.0.6",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/abbrev": {
+      "version": "1.1.1",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/accepts": {
+      "version": "1.3.8",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "8.10.0",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-import-assertions": {
+      "version": "1.9.0",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "acorn": "^8"
+      }
+    },
+    "node_modules/adjust-sourcemap-loader": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "regex-parser": "^2.2.11"
+      },
+      "engines": {
+        "node": ">=8.9"
+      }
+    },
+    "node_modules/adjust-sourcemap-loader/node_modules/loader-utils": {
+      "version": "2.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/adler-32": {
+      "version": "1.3.1",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/agentkeepalive": {
+      "version": "4.5.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "humanize-ms": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ajv-formats/node_modules/ajv": {
+      "version": "8.12.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/angular-datatables": {
+      "version": "14.0.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/angular-material-datepicker": {
+      "version": "1.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "@angular/common": "^2.3.1",
+        "@angular/compiler": "^2.3.1",
+        "@angular/core": "^2.3.1",
+        "@angular/forms": "^2.3.1",
+        "@angular/http": "^2.3.1",
+        "@angular/material": "^2.0.0-beta.1",
+        "@angular/platform-browser": "^2.3.1",
+        "@angular/platform-browser-dynamic": "^2.3.1",
+        "@angular/router": "^3.3.1",
+        "core-js": "^2.4.1",
+        "rxjs": "^5.0.1",
+        "ts-helpers": "^1.1.1",
+        "zone.js": "^0.7.2"
+      }
+    },
+    "node_modules/angular-material-datepicker/node_modules/@angular/cdk": {
+      "version": "2.0.0-beta.12",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^1.7.1"
+      },
+      "peerDependencies": {
+        "@angular/common": "~4.4.4",
+        "@angular/core": "~4.4.4"
+      }
+    },
+    "node_modules/angular-material-datepicker/node_modules/@angular/common": {
+      "version": "2.4.10",
+      "license": "MIT",
+      "peerDependencies": {
+        "@angular/core": "2.4.10"
+      }
+    },
+    "node_modules/angular-material-datepicker/node_modules/@angular/compiler": {
+      "version": "2.4.10",
+      "license": "MIT",
+      "peerDependencies": {
+        "@angular/core": "2.4.10"
+      }
+    },
+    "node_modules/angular-material-datepicker/node_modules/@angular/core": {
+      "version": "2.4.10",
+      "license": "MIT",
+      "peerDependencies": {
+        "rxjs": "^5.0.1",
+        "zone.js": "^0.7.2"
+      }
+    },
+    "node_modules/angular-material-datepicker/node_modules/@angular/forms": {
+      "version": "2.4.10",
+      "license": "MIT",
+      "peerDependencies": {
+        "@angular/common": "2.4.10",
+        "@angular/core": "2.4.10"
+      }
+    },
+    "node_modules/angular-material-datepicker/node_modules/@angular/material": {
+      "version": "2.0.0-beta.12",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^1.7.1"
+      },
+      "peerDependencies": {
+        "@angular/cdk": "2.0.0-beta.12",
+        "@angular/common": "~4.4.4",
+        "@angular/core": "~4.4.4"
+      }
+    },
+    "node_modules/angular-material-datepicker/node_modules/@angular/platform-browser": {
+      "version": "2.4.10",
+      "license": "MIT",
+      "peerDependencies": {
+        "@angular/common": "2.4.10",
+        "@angular/core": "2.4.10"
+      }
+    },
+    "node_modules/angular-material-datepicker/node_modules/@angular/platform-browser-dynamic": {
+      "version": "2.4.10",
+      "license": "MIT",
+      "peerDependencies": {
+        "@angular/common": "2.4.10",
+        "@angular/compiler": "2.4.10",
+        "@angular/core": "2.4.10",
+        "@angular/platform-browser": "2.4.10"
+      }
+    },
+    "node_modules/angular-material-datepicker/node_modules/@angular/router": {
+      "version": "3.4.10",
+      "license": "MIT",
+      "peerDependencies": {
+        "@angular/common": "2.4.10",
+        "@angular/core": "2.4.10",
+        "@angular/platform-browser": "2.4.10",
+        "rxjs": "^5.0.1"
+      }
+    },
+    "node_modules/angular-material-datepicker/node_modules/rxjs": {
+      "version": "5.5.12",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "symbol-observable": "1.0.1"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/angular-material-datepicker/node_modules/symbol-observable": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/angular-material-datepicker/node_modules/tslib": {
+      "version": "1.14.1",
+      "license": "0BSD"
+    },
+    "node_modules/angular-material-datepicker/node_modules/zone.js": {
+      "version": "0.7.8",
+      "license": "MIT"
+    },
+    "node_modules/ansi-colors": {
+      "version": "4.1.3",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-html-community": {
+      "version": "0.0.8",
+      "dev": true,
+      "engines": [
+        "node >= 0.8.0"
+      ],
+      "license": "Apache-2.0",
+      "bin": {
+        "ansi-html": "bin/ansi-html"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/any-promise": {
+      "version": "1.3.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/apexcharts": {
+      "version": "3.41.1",
+      "license": "MIT",
+      "dependencies": {
+        "svg.draggable.js": "^2.2.2",
+        "svg.easing.js": "^2.0.0",
+        "svg.filter.js": "^2.0.2",
+        "svg.pathmorphing.js": "^0.1.3",
+        "svg.resize.js": "^1.4.3",
+        "svg.select.js": "^3.0.1"
+      }
+    },
+    "node_modules/aproba": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/are-we-there-yet": {
+      "version": "3.0.1",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/arg": {
+      "version": "5.0.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/array-flatten": {
+      "version": "2.1.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/atob": {
+      "version": "2.1.2",
+      "license": "(MIT OR Apache-2.0)",
+      "bin": {
+        "atob": "bin/atob.js"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/autoprefixer": {
+      "version": "10.4.15",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.21.10",
+        "caniuse-lite": "^1.0.30001520",
+        "fraction.js": "^4.2.0",
+        "normalize-range": "^0.1.2",
+        "picocolors": "^1.0.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "bin": {
+        "autoprefixer": "bin/autoprefixer"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/babel-loader": {
+      "version": "8.2.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-cache-dir": "^3.3.1",
+        "loader-utils": "^2.0.0",
+        "make-dir": "^3.1.0",
+        "schema-utils": "^2.6.5"
+      },
+      "engines": {
+        "node": ">= 8.9"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0",
+        "webpack": ">=2"
+      }
+    },
+    "node_modules/babel-loader/node_modules/loader-utils": {
+      "version": "2.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs2": {
+      "version": "0.3.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/compat-data": "^7.17.7",
+        "@babel/helper-define-polyfill-provider": "^0.3.3",
+        "semver": "^6.1.1"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
+      "version": "6.3.1",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs3": {
+      "version": "0.5.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.3.2",
+        "core-js-compat": "^3.21.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-regenerator": {
+      "version": "0.4.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.3.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "license": "MIT"
+    },
+    "node_modules/base64-arraybuffer": {
+      "version": "1.0.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/base64id": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^4.5.0 || >= 5.9"
+      }
+    },
+    "node_modules/batch": {
+      "version": "0.6.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/big.js": {
+      "version": "5.2.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/bl": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/body-parser": {
+      "version": "1.20.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.5",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.2",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/body-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/bonjour-service": {
+      "version": "1.1.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-flatten": "^2.1.2",
+        "dns-equal": "^1.0.0",
+        "fast-deep-equal": "^3.1.3",
+        "multicast-dns": "^7.2.5"
+      }
+    },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/bootstrap": {
+      "version": "4.6.2",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/twbs"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/bootstrap"
+        }
+      ],
+      "license": "MIT",
+      "peerDependencies": {
+        "jquery": "1.9.1 - 3",
+        "popper.js": "^1.16.1"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.21.10",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001517",
+        "electron-to-chromium": "^1.4.477",
+        "node-releases": "^2.0.13",
+        "update-browserslist-db": "^1.0.11"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/btoa": {
+      "version": "1.2.1",
+      "license": "(MIT OR Apache-2.0)",
+      "bin": {
+        "btoa": "bin/btoa.js"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/builtins": {
+      "version": "5.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.0.0"
+      }
+    },
+    "node_modules/bytes": {
+      "version": "3.1.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/cacache": {
+      "version": "16.1.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/fs": "^2.1.0",
+        "@npmcli/move-file": "^2.0.0",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.1.0",
+        "glob": "^8.0.1",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^7.7.1",
+        "minipass": "^3.1.6",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "mkdirp": "^1.0.4",
+        "p-map": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^9.0.0",
+        "tar": "^6.1.11",
+        "unique-filename": "^1.1.1"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/cacache/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase-css": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001521",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "CC-BY-4.0"
+    },
+    "node_modules/canvg": {
+      "version": "3.0.10",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "@types/raf": "^3.4.0",
+        "core-js": "^3.8.3",
+        "raf": "^3.4.1",
+        "regenerator-runtime": "^0.13.7",
+        "rgbcolor": "^1.0.1",
+        "stackblur-canvas": "^2.0.0",
+        "svg-pathdata": "^6.0.3"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/canvg/node_modules/core-js": {
+      "version": "3.32.0",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/cfb": {
+      "version": "1.2.2",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "adler-32": "~1.3.0",
+        "crc-32": "~1.2.0"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/chardet": {
+      "version": "0.7.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/chart.js": {
+      "version": "2.9.4",
+      "license": "MIT",
+      "dependencies": {
+        "chartjs-color": "^2.1.0",
+        "moment": "^2.10.2"
+      }
+    },
+    "node_modules/chartjs-color": {
+      "version": "2.4.1",
+      "license": "MIT",
+      "dependencies": {
+        "chartjs-color-string": "^0.6.0",
+        "color-convert": "^1.9.3"
+      }
+    },
+    "node_modules/chartjs-color-string": {
+      "version": "0.6.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "^1.0.0"
+      }
+    },
+    "node_modules/chartjs-plugin-annotation": {
+      "version": "0.5.7",
+      "license": "MIT",
+      "dependencies": {
+        "chart.js": "^2.4.0"
+      }
+    },
+    "node_modules/chartjs-plugin-trendline": {
+      "version": "2.0.3",
+      "license": "MIT"
+    },
+    "node_modules/chokidar": {
+      "version": "3.5.3",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.3",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cli-spinners": {
+      "version": "2.9.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-width": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "7.0.4",
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/clone": {
+      "version": "1.0.4",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/clone-deep": {
+      "version": "4.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/codepage": {
+      "version": "1.15.0",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-convert/node_modules/color-name": {
+      "version": "1.1.3",
+      "license": "MIT"
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
+    "node_modules/color2k": {
+      "version": "2.0.2",
+      "license": "MIT"
+    },
+    "node_modules/colorette": {
+      "version": "2.0.20",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/commander": {
+      "version": "6.2.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/compressible": {
+      "version": "2.0.18",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": ">= 1.43.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/compression": {
+      "version": "1.7.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/compression/node_modules/bytes": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/compression/node_modules/debug": {
+      "version": "2.6.9",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/compression/node_modules/ms": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/compression/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "license": "MIT"
+    },
+    "node_modules/connect": {
+      "version": "3.7.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "2.6.9",
+        "finalhandler": "1.1.2",
+        "parseurl": "~1.3.3",
+        "utils-merge": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/connect-history-api-fallback": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/connect/node_modules/debug": {
+      "version": "2.6.9",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/connect/node_modules/ms": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/content-type": {
+      "version": "1.0.5",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "license": "MIT"
+    },
+    "node_modules/cookie": {
+      "version": "0.4.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/copy-anything": {
+      "version": "2.0.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-what": "^3.14.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
+      }
+    },
+    "node_modules/copy-webpack-plugin": {
+      "version": "11.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-glob": "^3.2.11",
+        "glob-parent": "^6.0.1",
+        "globby": "^13.1.1",
+        "normalize-path": "^3.0.0",
+        "schema-utils": "^4.0.0",
+        "serialize-javascript": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/ajv": {
+      "version": "8.12.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/copy-webpack-plugin/node_modules/schema-utils": {
+      "version": "4.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/core-js": {
+      "version": "2.6.12",
+      "hasInstallScript": true,
+      "license": "MIT"
+    },
+    "node_modules/core-js-compat": {
+      "version": "3.32.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.21.9"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "object-assign": "^4",
+        "vary": "^1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/cosmiconfig": {
+      "version": "8.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      }
+    },
+    "node_modules/cosmiconfig/node_modules/argparse": {
+      "version": "2.0.1",
+      "license": "Python-2.0"
+    },
+    "node_modules/cosmiconfig/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/cqube-library": {
+      "version": "4.10.26",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "^14.0.0",
+        "@angular/core": "^14.0.0"
+      }
+    },
+    "node_modules/crc-32": {
+      "version": "1.2.2",
+      "license": "Apache-2.0",
+      "bin": {
+        "crc32": "bin/crc32.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/critters": {
+      "version": "0.0.16",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "css-select": "^4.2.0",
+        "parse5": "^6.0.1",
+        "parse5-htmlparser2-tree-adapter": "^6.0.1",
+        "postcss": "^8.3.7",
+        "pretty-bytes": "^5.3.0"
+      }
+    },
+    "node_modules/critters/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/critters/node_modules/chalk": {
+      "version": "4.1.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/critters/node_modules/color-convert": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/critters/node_modules/has-flag": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/critters/node_modules/parse5": {
+      "version": "6.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/critters/node_modules/supports-color": {
+      "version": "7.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/cross-spawn/node_modules/which": {
+      "version": "2.0.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/crypto-js": {
+      "version": "4.1.1",
+      "license": "MIT"
+    },
+    "node_modules/css-blank-pseudo": {
+      "version": "3.0.3",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "bin": {
+        "css-blank-pseudo": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/css-has-pseudo": {
+      "version": "3.0.4",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "bin": {
+        "css-has-pseudo": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/css-line-break": {
+      "version": "2.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
+    "node_modules/css-loader": {
+      "version": "6.7.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.7",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.0",
+        "postcss-modules-scope": "^3.0.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/css-prefers-color-scheme": {
+      "version": "6.0.3",
+      "dev": true,
+      "license": "CC0-1.0",
+      "bin": {
+        "css-prefers-color-scheme": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/css-select": {
+      "version": "4.3.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css-what": {
+      "version": "6.1.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/cssdb": {
+      "version": "7.7.0",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        }
+      ],
+      "license": "CC0-1.0"
+    },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/custom-event": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/datatables.net": {
+      "version": "1.13.6",
+      "license": "MIT",
+      "dependencies": {
+        "jquery": ">=1.7"
+      }
+    },
+    "node_modules/datatables.net-dt": {
+      "version": "1.13.6",
+      "license": "MIT",
+      "dependencies": {
+        "datatables.net": ">=1.13.4",
+        "jquery": ">=1.7"
+      }
+    },
+    "node_modules/date-format": {
+      "version": "4.0.14",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/dayjs": {
+      "version": "1.11.9",
+      "license": "MIT"
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/default-gateway": {
+      "version": "6.0.3",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "execa": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/defaults": {
+      "version": "1.0.4",
+      "license": "MIT",
+      "dependencies": {
+        "clone": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/dependency-graph": {
+      "version": "0.11.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/detect-node": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/di": {
+      "version": "0.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/didyoumean": {
+      "version": "1.2.2",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/dlv": {
+      "version": "1.1.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/dns-equal": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/dns-packet": {
+      "version": "5.6.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@leichtgewicht/ip-codec": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/dom-serialize": {
+      "version": "2.2.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "custom-event": "~1.0.0",
+        "ent": "~2.2.0",
+        "extend": "^3.0.0",
+        "void-elements": "^2.0.0"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "1.4.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/domhandler": {
+      "version": "4.3.1",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/dompurify": {
+      "version": "2.4.7",
+      "license": "(MPL-2.0 OR Apache-2.0)",
+      "optional": true
+    },
+    "node_modules/domutils": {
+      "version": "2.8.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.492",
+      "license": "ISC"
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "license": "MIT"
+    },
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/encoding": {
+      "version": "0.1.13",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "iconv-lite": "^0.6.2"
+      }
+    },
+    "node_modules/encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/engine.io": {
+      "version": "6.5.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/cookie": "^0.4.1",
+        "@types/cors": "^2.8.12",
+        "@types/node": ">=10.0.0",
+        "accepts": "~1.3.4",
+        "base64id": "2.0.0",
+        "cookie": "~0.4.1",
+        "cors": "~2.8.5",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.11.0"
+      },
+      "engines": {
+        "node": ">=10.2.0"
+      }
+    },
+    "node_modules/engine.io-parser": {
+      "version": "5.2.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.15.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/ent": {
+      "version": "2.2.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/entities": {
+      "version": "2.2.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/env-paths": {
+      "version": "2.2.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/err-code": {
+      "version": "2.0.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/errno": {
+      "version": "0.1.8",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "prr": "~1.0.1"
+      },
+      "bin": {
+        "errno": "cli.js"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "license": "MIT",
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-module-lexer": {
+      "version": "0.9.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/es6-promise": {
+      "version": "4.2.8",
+      "license": "MIT"
+    },
+    "node_modules/esbuild": {
+      "version": "0.15.5",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/linux-loong64": "0.15.5",
+        "esbuild-android-64": "0.15.5",
+        "esbuild-android-arm64": "0.15.5",
+        "esbuild-darwin-64": "0.15.5",
+        "esbuild-darwin-arm64": "0.15.5",
+        "esbuild-freebsd-64": "0.15.5",
+        "esbuild-freebsd-arm64": "0.15.5",
+        "esbuild-linux-32": "0.15.5",
+        "esbuild-linux-64": "0.15.5",
+        "esbuild-linux-arm": "0.15.5",
+        "esbuild-linux-arm64": "0.15.5",
+        "esbuild-linux-mips64le": "0.15.5",
+        "esbuild-linux-ppc64le": "0.15.5",
+        "esbuild-linux-riscv64": "0.15.5",
+        "esbuild-linux-s390x": "0.15.5",
+        "esbuild-netbsd-64": "0.15.5",
+        "esbuild-openbsd-64": "0.15.5",
+        "esbuild-sunos-64": "0.15.5",
+        "esbuild-windows-32": "0.15.5",
+        "esbuild-windows-64": "0.15.5",
+        "esbuild-windows-arm64": "0.15.5"
+      }
+    },
+    "node_modules/esbuild-linux-64": {
+      "version": "0.15.5",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-wasm": {
+      "version": "0.15.5",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.3.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/eventemitter-asyncresource": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/execa": {
+      "version": "5.1.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/express": {
+      "version": "4.18.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.5.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.2.0",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/express/node_modules/array-flatten": {
+      "version": "1.1.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/express/node_modules/body-parser": {
+      "version": "1.20.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/express/node_modules/cookie": {
+      "version": "0.5.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/express/node_modules/debug": {
+      "version": "2.6.9",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/express/node_modules/finalhandler": {
+      "version": "1.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/express/node_modules/ms": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/express/node_modules/raw-body": {
+      "version": "2.5.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/express/node_modules/statuses": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/external-editor": {
+      "version": "3.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-glob": {
+      "version": "3.3.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fastq": {
+      "version": "1.15.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/faye-websocket": {
+      "version": "0.11.4",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "websocket-driver": ">=0.5.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/fflate": {
+      "version": "0.4.8",
+      "license": "MIT"
+    },
+    "node_modules/figures": {
+      "version": "3.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/file-saver": {
+      "version": "2.0.5",
+      "license": "MIT"
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/finalhandler": {
+      "version": "1.1.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/finalhandler/node_modules/debug": {
+      "version": "2.6.9",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/finalhandler/node_modules/on-finished": {
+      "version": "2.3.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/find-cache-dir": {
+      "version": "3.3.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/flat": {
+      "version": "5.0.2",
+      "license": "BSD-3-Clause",
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.7",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.15.2",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/frac": {
+      "version": "1.1.2",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/fraction.js": {
+      "version": "4.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://www.patreon.com/infusion"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fs-extra": {
+      "version": "11.1.1",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/fs-monkey": {
+      "version": "1.0.4",
+      "dev": true,
+      "license": "Unlicense"
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "license": "ISC"
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "license": "MIT"
+    },
+    "node_modules/gauge": {
+      "version": "4.0.4",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.3",
+        "console-control-strings": "^1.1.0",
+        "has-unicode": "^2.0.1",
+        "signal-exit": "^3.0.7",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.5"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "license": "ISC",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.2.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/glob": {
+      "version": "8.0.3",
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/globby": {
+      "version": "13.2.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.3.0",
+        "ignore": "^5.2.4",
+        "merge2": "^1.4.1",
+        "slash": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "license": "ISC"
+    },
+    "node_modules/handle-thing": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-unicode": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/hdr-histogram-js": {
+      "version": "2.0.3",
+      "dev": true,
+      "license": "BSD",
+      "dependencies": {
+        "@assemblyscript/loader": "^0.10.1",
+        "base64-js": "^1.2.0",
+        "pako": "^1.0.3"
+      }
+    },
+    "node_modules/hdr-histogram-percentiles-obj": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/highcharts": {
+      "version": "10.3.3",
+      "license": "https://www.highcharts.com/license"
+    },
+    "node_modules/hosted-git-info": {
+      "version": "5.2.1",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^7.5.1"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/hosted-git-info/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/hpack.js": {
+      "version": "2.1.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      }
+    },
+    "node_modules/hpack.js/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/hpack.js/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/hpack.js/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/html-entities": {
+      "version": "2.4.0",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/mdevils"
+        },
+        {
+          "type": "patreon",
+          "url": "https://patreon.com/mdevils"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/html2canvas": {
+      "version": "1.4.1",
+      "license": "MIT",
+      "dependencies": {
+        "css-line-break": "^2.1.0",
+        "text-segmentation": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/html2pdf.js": {
+      "version": "0.10.1",
+      "license": "MIT",
+      "dependencies": {
+        "es6-promise": "^4.2.5",
+        "html2canvas": "^1.0.0",
+        "jspdf": "^2.3.1"
+      }
+    },
+    "node_modules/http-cache-semantics": {
+      "version": "4.1.1",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/http-deceiver": {
+      "version": "1.2.7",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-errors/node_modules/statuses": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-parser-js": {
+      "version": "0.5.8",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/http-proxy": {
+      "version": "1.18.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/http-proxy-middleware": {
+      "version": "2.0.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/http-proxy": "^1.17.8",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.1",
+        "is-plain-obj": "^3.0.0",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@types/express": "^4.17.13"
+      },
+      "peerDependenciesMeta": {
+        "@types/express": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/humanize-ms": {
+      "version": "1.2.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.0.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/icss-utils": {
+      "version": "5.1.0",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/ignore": {
+      "version": "5.2.4",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/ignore-walk": {
+      "version": "5.0.1",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minimatch": "^5.0.1"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/image-size": {
+      "version": "0.5.5",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "bin": {
+        "image-size": "bin/image-size.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/immutable": {
+      "version": "4.3.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-fresh/node_modules/resolve-from": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/infer-owner": {
+      "version": "1.0.4",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "license": "ISC",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "license": "ISC"
+    },
+    "node_modules/ini": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/inquirer": {
+      "version": "8.2.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.1",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.21",
+        "mute-stream": "0.0.8",
+        "ora": "^5.4.1",
+        "run-async": "^2.4.0",
+        "rxjs": "^7.5.5",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/inquirer/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/inquirer/node_modules/chalk": {
+      "version": "4.1.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/inquirer/node_modules/color-convert": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/inquirer/node_modules/has-flag": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/inquirer/node_modules/supports-color": {
+      "version": "7.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/invert-color": {
+      "version": "2.0.0",
+      "license": "MIT"
+    },
+    "node_modules/ip": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ipaddr.js": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "license": "MIT"
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.13.0",
+      "license": "MIT",
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-interactive": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-lambda": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-what": {
+      "version": "3.14.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/isbinaryfile": {
+      "version": "4.0.10",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/gjtorikian/"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.0",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument/node_modules/semver": {
+      "version": "6.3.1",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/has-flag": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/make-dir": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/supports-color": {
+      "version": "7.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
+      "version": "0.6.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.1.6",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jasmine-core": {
+      "version": "4.1.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jest-worker": {
+      "version": "27.5.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/jiti": {
+      "version": "1.19.1",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "jiti": "bin/jiti.js"
+      }
+    },
+    "node_modules/joi": {
+      "version": "17.4.0",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@hapi/hoek": "^9.0.0",
+        "@hapi/topo": "^5.0.0",
+        "@sideway/address": "^4.1.0",
+        "@sideway/formula": "^3.0.0",
+        "@sideway/pinpoint": "^2.0.0"
+      }
+    },
+    "node_modules/jquery": {
+      "version": "3.7.0",
+      "license": "MIT"
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "license": "MIT"
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "license": "MIT",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "license": "MIT"
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json2csv": {
+      "version": "5.0.7",
+      "license": "MIT",
+      "dependencies": {
+        "commander": "^6.1.0",
+        "jsonparse": "^1.3.1",
+        "lodash.get": "^4.4.2"
+      },
+      "bin": {
+        "json2csv": "bin/json2csv.js"
+      },
+      "engines": {
+        "node": ">= 10",
+        "npm": ">= 6.13.0"
+      }
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "license": "MIT",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonc-parser": {
+      "version": "3.1.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jsonexport": {
+      "version": "3.2.0",
+      "license": "Apache-2.0",
+      "bin": {
+        "jsonexport": "bin/jsonexport.js"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jsonparse": {
+      "version": "1.3.1",
+      "engines": [
+        "node >= 0.2.0"
+      ],
+      "license": "MIT"
+    },
+    "node_modules/jspdf": {
+      "version": "2.5.1",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.14.0",
+        "atob": "^2.1.2",
+        "btoa": "^1.2.1",
+        "fflate": "^0.4.8"
+      },
+      "optionalDependencies": {
+        "canvg": "^3.0.6",
+        "core-js": "^3.6.0",
+        "dompurify": "^2.2.0",
+        "html2canvas": "^1.0.0-rc.5"
+      }
+    },
+    "node_modules/jspdf/node_modules/core-js": {
+      "version": "3.32.0",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/karma": {
+      "version": "6.3.20",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@colors/colors": "1.5.0",
+        "body-parser": "^1.19.0",
+        "braces": "^3.0.2",
+        "chokidar": "^3.5.1",
+        "connect": "^3.7.0",
+        "di": "^0.0.1",
+        "dom-serialize": "^2.2.1",
+        "glob": "^7.1.7",
+        "graceful-fs": "^4.2.6",
+        "http-proxy": "^1.18.1",
+        "isbinaryfile": "^4.0.8",
+        "lodash": "^4.17.21",
+        "log4js": "^6.4.1",
+        "mime": "^2.5.2",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.5",
+        "qjobs": "^1.2.0",
+        "range-parser": "^1.2.1",
+        "rimraf": "^3.0.2",
+        "socket.io": "^4.4.1",
+        "source-map": "^0.6.1",
+        "tmp": "^0.2.1",
+        "ua-parser-js": "^0.7.30",
+        "yargs": "^16.1.1"
+      },
+      "bin": {
+        "karma": "bin/karma"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/karma-chrome-launcher": {
+      "version": "3.1.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "which": "^1.2.1"
+      }
+    },
+    "node_modules/karma-coverage": {
+      "version": "2.2.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.2.0",
+        "istanbul-lib-instrument": "^5.1.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.1",
+        "istanbul-reports": "^3.0.5",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/karma-coverage/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/karma-coverage/node_modules/minimatch": {
+      "version": "3.1.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/karma-jasmine": {
+      "version": "5.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "jasmine-core": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "karma": "^6.0.0"
+      }
+    },
+    "node_modules/karma-jasmine-html-reporter": {
+      "version": "1.7.0",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "jasmine-core": ">=3.8",
+        "karma": ">=0.9",
+        "karma-jasmine": ">=1.1"
+      }
+    },
+    "node_modules/karma-source-map-support": {
+      "version": "1.4.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "source-map-support": "^0.5.5"
+      }
+    },
+    "node_modules/karma/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/karma/node_modules/glob": {
+      "version": "7.2.3",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/karma/node_modules/minimatch": {
+      "version": "3.1.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/karma/node_modules/mkdirp": {
+      "version": "0.5.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/karma/node_modules/source-map": {
+      "version": "0.6.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/karma/node_modules/tmp": {
+      "version": "0.2.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "rimraf": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.17.0"
+      }
+    },
+    "node_modules/karma/node_modules/yargs": {
+      "version": "16.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/karma/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/klona": {
+      "version": "2.0.6",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/leaflet": {
+      "version": "1.9.4",
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/leaflet-responsive-popup": {
+      "version": "1.0.0",
+      "license": "MIT"
+    },
+    "node_modules/less": {
+      "version": "4.1.3",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "copy-anything": "^2.0.1",
+        "parse-node-version": "^1.0.1",
+        "tslib": "^2.3.0"
+      },
+      "bin": {
+        "lessc": "bin/lessc"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "optionalDependencies": {
+        "errno": "^0.1.1",
+        "graceful-fs": "^4.1.2",
+        "image-size": "~0.5.0",
+        "make-dir": "^2.1.0",
+        "mime": "^1.4.1",
+        "needle": "^3.1.0",
+        "source-map": "~0.6.0"
+      }
+    },
+    "node_modules/less-loader": {
+      "version": "11.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "klona": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "less": "^3.5.0 || ^4.0.0",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/less/node_modules/make-dir": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/less/node_modules/mime": {
+      "version": "1.6.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/less/node_modules/pify": {
+      "version": "4.0.1",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/less/node_modules/semver": {
+      "version": "5.7.2",
+      "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/less/node_modules/source-map": {
+      "version": "0.6.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/license-webpack-plugin": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "webpack-sources": "^3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack": {
+          "optional": true
+        },
+        "webpack-sources": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/lilconfig": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "license": "MIT"
+    },
+    "node_modules/loader-runner": {
+      "version": "4.3.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.11.5"
+      }
+    },
+    "node_modules/loader-utils": {
+      "version": "3.2.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12.13.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "license": "MIT"
+    },
+    "node_modules/lodash-es": {
+      "version": "4.17.21",
+      "license": "MIT"
+    },
+    "node_modules/lodash.debounce": {
+      "version": "4.0.8",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.get": {
+      "version": "4.4.2",
+      "license": "MIT"
+    },
+    "node_modules/lodash.kebabcase": {
+      "version": "4.1.1",
+      "license": "MIT"
+    },
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-symbols/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/log-symbols/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/log-symbols/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/log-symbols/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/log4js": {
+      "version": "6.9.1",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "date-format": "^4.0.14",
+        "debug": "^4.3.4",
+        "flatted": "^3.2.7",
+        "rfdc": "^1.3.0",
+        "streamroller": "^3.1.5"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/magic-string": {
+      "version": "0.26.1",
+      "license": "MIT",
+      "dependencies": {
+        "sourcemap-codec": "^1.4.8"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "3.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.1",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/make-fetch-happen": {
+      "version": "9.1.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "agentkeepalive": "^4.1.3",
+        "cacache": "^15.2.0",
+        "http-cache-semantics": "^4.1.0",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-lambda": "^1.0.1",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.3",
+        "minipass-collect": "^1.0.2",
+        "minipass-fetch": "^1.3.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.2",
+        "promise-retry": "^2.0.1",
+        "socks-proxy-agent": "^6.0.0",
+        "ssri": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/@npmcli/fs": {
+      "version": "1.1.1",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@gar/promisify": "^1.0.1",
+        "semver": "^7.3.5"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/@npmcli/move-file": {
+      "version": "1.1.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mkdirp": "^1.0.4",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/cacache": {
+      "version": "15.3.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/fs": "^1.0.0",
+        "@npmcli/move-file": "^1.0.1",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "glob": "^7.1.4",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.1",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.2",
+        "mkdirp": "^1.0.3",
+        "p-map": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.1",
+        "tar": "^6.0.2",
+        "unique-filename": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/glob": {
+      "version": "7.2.3",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/minimatch": {
+      "version": "3.1.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/ssri": {
+      "version": "8.0.1",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.1.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/yallist": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/memfs": {
+      "version": "3.5.3",
+      "dev": true,
+      "license": "Unlicense",
+      "dependencies": {
+        "fs-monkey": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mime": {
+      "version": "2.6.0",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mini-css-extract-plugin": {
+      "version": "2.6.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/ajv": {
+      "version": "8.12.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+      "version": "4.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/minimatch": {
+      "version": "5.1.0",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "3.3.6",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-collect": {
+      "version": "1.0.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minipass-fetch": {
+      "version": "1.4.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^3.1.0",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "optionalDependencies": {
+        "encoding": "^0.1.12"
+      }
+    },
+    "node_modules/minipass-flush": {
+      "version": "1.0.5",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minipass-json-stream": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "jsonparse": "^1.3.1",
+        "minipass": "^3.0.0"
+      }
+    },
+    "node_modules/minipass-pipeline": {
+      "version": "1.2.4",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-sized": {
+      "version": "1.0.3",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass/node_modules/yallist": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minizlib/node_modules/yallist": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/mkdirp": {
+      "version": "1.0.4",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/moment": {
+      "version": "2.29.4",
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "license": "MIT"
+    },
+    "node_modules/multicast-dns": {
+      "version": "7.2.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dns-packet": "^5.2.2",
+        "thunky": "^1.0.2"
+      },
+      "bin": {
+        "multicast-dns": "cli.js"
+      }
+    },
+    "node_modules/mute-stream": {
+      "version": "0.0.8",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/mz": {
+      "version": "2.7.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.6",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/needle": {
+      "version": "3.2.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "debug": "^3.2.6",
+        "iconv-lite": "^0.6.3",
+        "sax": "^1.2.4"
+      },
+      "bin": {
+        "needle": "bin/needle"
+      },
+      "engines": {
+        "node": ">= 4.4.x"
+      }
+    },
+    "node_modules/needle/node_modules/debug": {
+      "version": "3.2.7",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/needle/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ng-apexcharts": {
+      "version": "1.8.0",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=13.0.0",
+        "@angular/core": ">=13.0.0",
+        "apexcharts": "^3.41.0",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/ng-circle-progress": {
+      "version": "1.7.1",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=14.0.0",
+        "@angular/core": ">=14.0.0",
+        "rxjs": ">=6.4.0"
+      }
+    },
+    "node_modules/ng-multiselect-dropdown": {
+      "version": "0.3.4",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=2.0.0",
+        "@angular/core": ">=2.0.0"
+      }
+    },
+    "node_modules/ng-multiselect-dropdown/node_modules/tslib": {
+      "version": "1.14.1",
+      "license": "0BSD"
+    },
+    "node_modules/ng2-charts": {
+      "version": "2.4.2",
+      "license": "ISC",
+      "dependencies": {
+        "@types/chart.js": "^2.9.24",
+        "lodash-es": "^4.17.15",
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=7.2.0",
+        "@angular/core": ">=7.2.0",
+        "chart.js": "^2.9.3",
+        "rxjs": "^6.3.3"
+      }
+    },
+    "node_modules/ngx-bootstrap": {
+      "version": "9.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/animations": "^14.0.0",
+        "@angular/common": "^14.0.0",
+        "@angular/core": "^14.0.0",
+        "@angular/forms": "^14.0.0",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/ngx-daterangepicker-material": {
+      "version": "6.0.4",
+      "license": "MIT",
+      "dependencies": {
+        "dayjs": "^1.11.5",
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "dayjs": "^1.11.4"
+      }
+    },
+    "node_modules/ngx-spinner": {
+      "version": "14.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "^14.0.0",
+        "@angular/core": "^14.0.0"
+      }
+    },
+    "node_modules/nice-napi": {
+      "version": "1.0.2",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "!win32"
+      ],
+      "dependencies": {
+        "node-addon-api": "^3.0.0",
+        "node-gyp-build": "^4.2.2"
+      }
+    },
+    "node_modules/node-addon-api": {
+      "version": "3.2.1",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/node-forge": {
+      "version": "1.3.1",
+      "dev": true,
+      "license": "(BSD-3-Clause OR GPL-2.0)",
+      "engines": {
+        "node": ">= 6.13.0"
+      }
+    },
+    "node_modules/node-gyp": {
+      "version": "8.4.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "env-paths": "^2.2.0",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.2.6",
+        "make-fetch-happen": "^9.1.0",
+        "nopt": "^5.0.0",
+        "npmlog": "^6.0.0",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.2",
+        "which": "^2.0.2"
+      },
+      "bin": {
+        "node-gyp": "bin/node-gyp.js"
+      },
+      "engines": {
+        "node": ">= 10.12.0"
+      }
+    },
+    "node_modules/node-gyp-build": {
+      "version": "4.6.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
+    "node_modules/node-gyp/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/node-gyp/node_modules/glob": {
+      "version": "7.2.3",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/node-gyp/node_modules/minimatch": {
+      "version": "3.1.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/node-gyp/node_modules/which": {
+      "version": "2.0.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.13",
+      "license": "MIT"
+    },
+    "node_modules/nopt": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/normalize-package-data": {
+      "version": "4.0.1",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "hosted-git-info": "^5.0.0",
+        "is-core-module": "^2.8.1",
+        "semver": "^7.3.5",
+        "validate-npm-package-license": "^3.0.4"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-range": {
+      "version": "0.1.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/npm-bundled": {
+      "version": "1.1.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
+    "node_modules/npm-install-checks": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "semver": "^7.1.1"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/npm-normalize-package-bin": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/npm-package-arg": {
+      "version": "9.0.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "hosted-git-info": "^5.0.0",
+        "semver": "^7.3.5",
+        "validate-npm-package-name": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/npm-packlist": {
+      "version": "5.1.3",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^8.0.1",
+        "ignore-walk": "^5.0.1",
+        "npm-bundled": "^2.0.0",
+        "npm-normalize-package-bin": "^2.0.0"
+      },
+      "bin": {
+        "npm-packlist": "bin/index.js"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/npm-packlist/node_modules/npm-bundled": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "npm-normalize-package-bin": "^2.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/npm-packlist/node_modules/npm-normalize-package-bin": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/npm-pick-manifest": {
+      "version": "7.0.1",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "npm-install-checks": "^5.0.0",
+        "npm-normalize-package-bin": "^1.0.1",
+        "npm-package-arg": "^9.0.0",
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/npm-registry-fetch": {
+      "version": "13.3.1",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "make-fetch-happen": "^10.0.6",
+        "minipass": "^3.1.6",
+        "minipass-fetch": "^2.0.3",
+        "minipass-json-stream": "^1.0.1",
+        "minizlib": "^2.1.2",
+        "npm-package-arg": "^9.0.1",
+        "proc-log": "^2.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/@tootallnate/once": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/make-fetch-happen": {
+      "version": "10.2.1",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "agentkeepalive": "^4.2.1",
+        "cacache": "^16.1.0",
+        "http-cache-semantics": "^4.1.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "is-lambda": "^1.0.1",
+        "lru-cache": "^7.7.1",
+        "minipass": "^3.1.6",
+        "minipass-collect": "^1.0.2",
+        "minipass-fetch": "^2.0.3",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.3",
+        "promise-retry": "^2.0.1",
+        "socks-proxy-agent": "^7.0.0",
+        "ssri": "^9.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/minipass-fetch": {
+      "version": "2.1.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^3.1.6",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^2.1.2"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      },
+      "optionalDependencies": {
+        "encoding": "^0.1.13"
+      }
+    },
+    "node_modules/npm-registry-fetch/node_modules/socks-proxy-agent": {
+      "version": "7.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^6.0.2",
+        "debug": "^4.3.3",
+        "socks": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npmlog": {
+      "version": "6.0.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "are-we-there-yet": "^3.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^4.0.3",
+        "set-blocking": "^2.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-hash": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.12.3",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/obuf": {
+      "version": "1.1.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/on-finished": {
+      "version": "2.4.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/on-headers": {
+      "version": "1.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "license": "ISC",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "license": "MIT",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/open": {
+      "version": "8.4.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora": {
+      "version": "5.4.1",
+      "license": "MIT",
+      "dependencies": {
+        "bl": "^4.1.0",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.5.0",
+        "is-interactive": "^1.0.0",
+        "is-unicode-supported": "^0.1.0",
+        "log-symbols": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "wcwidth": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/ora/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/ora/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/ora/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ora/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "2.3.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-retry": {
+      "version": "4.6.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/retry": "0.12.0",
+        "retry": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-retry/node_modules/retry": {
+      "version": "0.13.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pacote": {
+      "version": "13.3.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/git": "^3.0.0",
+        "@npmcli/installed-package-contents": "^1.0.7",
+        "@npmcli/promise-spawn": "^3.0.0",
+        "@npmcli/run-script": "^3.0.1",
+        "cacache": "^16.0.0",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.1.0",
+        "infer-owner": "^1.0.4",
+        "minipass": "^3.1.6",
+        "mkdirp": "^1.0.4",
+        "npm-package-arg": "^9.0.0",
+        "npm-packlist": "^5.0.0",
+        "npm-pick-manifest": "^7.0.0",
+        "npm-registry-fetch": "^13.0.1",
+        "proc-log": "^2.0.0",
+        "promise-retry": "^2.0.1",
+        "read-package-json": "^5.0.0",
+        "read-package-json-fast": "^2.0.3",
+        "rimraf": "^3.0.2",
+        "ssri": "^9.0.0",
+        "tar": "^6.1.11"
+      },
+      "bin": {
+        "pacote": "lib/bin.js"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/pako": {
+      "version": "1.0.11",
+      "dev": true,
+      "license": "(MIT AND Zlib)"
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse-node-version": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/parse5": {
+      "version": "5.1.1",
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/parse5-html-rewriting-stream": {
+      "version": "6.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "parse5": "^6.0.1",
+        "parse5-sax-parser": "^6.0.1"
+      }
+    },
+    "node_modules/parse5-html-rewriting-stream/node_modules/parse5": {
+      "version": "6.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/parse5-htmlparser2-tree-adapter": {
+      "version": "6.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "parse5": "^6.0.1"
+      }
+    },
+    "node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": {
+      "version": "6.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/parse5-sax-parser": {
+      "version": "6.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "parse5": "^6.0.1"
+      }
+    },
+    "node_modules/parse5-sax-parser/node_modules/parse5": {
+      "version": "6.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "license": "MIT"
+    },
+    "node_modules/path-to-regexp": {
+      "version": "0.1.7",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/performance-now": {
+      "version": "2.1.0",
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "license": "ISC"
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "2.3.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pirates": {
+      "version": "4.0.6",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/piscina": {
+      "version": "3.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eventemitter-asyncresource": "^1.0.0",
+        "hdr-histogram-js": "^2.0.1",
+        "hdr-histogram-percentiles-obj": "^3.0.0"
+      },
+      "optionalDependencies": {
+        "nice-napi": "^1.0.2"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/popper.js": {
+      "version": "1.16.1",
+      "license": "MIT",
+      "peer": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.4.28",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.6",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-attribute-case-insensitive": {
+      "version": "5.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-clamp": {
+      "version": "4.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=7.6.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.6"
+      }
+    },
+    "node_modules/postcss-color-functional-notation": {
+      "version": "4.2.4",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-color-hex-alpha": {
+      "version": "8.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-color-rebeccapurple": {
+      "version": "7.1.1",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-custom-media": {
+      "version": "8.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/postcss-custom-properties": {
+      "version": "12.1.11",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-custom-selectors": {
+      "version": "6.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/postcss-dir-pseudo-class": {
+      "version": "6.0.5",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-double-position-gradients": {
+      "version": "3.1.2",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-env-function": {
+      "version": "4.0.6",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-focus-visible": {
+      "version": "6.0.4",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-focus-within": {
+      "version": "5.0.4",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-font-variant": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-gap-properties": {
+      "version": "3.0.5",
+      "dev": true,
+      "license": "CC0-1.0",
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-image-set-function": {
+      "version": "4.0.7",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-import": {
+      "version": "15.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.0.0",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.0"
+      }
+    },
+    "node_modules/postcss-initial": {
+      "version": "4.0.1",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "postcss": "^8.0.0"
+      }
+    },
+    "node_modules/postcss-js": {
+      "version": "4.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "camelcase-css": "^2.0.1"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >= 16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.21"
+      }
+    },
+    "node_modules/postcss-lab-function": {
+      "version": "4.2.1",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-load-config": {
+      "version": "4.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "lilconfig": "^2.0.5",
+        "yaml": "^2.1.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": ">=8.0.9",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "postcss": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/postcss-loader": {
+      "version": "7.3.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cosmiconfig": "^8.2.0",
+        "jiti": "^1.18.2",
+        "semver": "^7.3.8"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "postcss": "^7.0.0 || ^8.0.1",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/postcss-logical": {
+      "version": "5.0.4",
+      "dev": true,
+      "license": "CC0-1.0",
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-media-minmax": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-extract-imports": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default": {
+      "version": "4.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-scope": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-values": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "icss-utils": "^5.0.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-nested": {
+      "version": "6.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.11"
+      },
+      "engines": {
+        "node": ">=12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.14"
+      }
+    },
+    "node_modules/postcss-nesting": {
+      "version": "10.2.0",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "@csstools/selector-specificity": "^2.0.0",
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-opacity-percentage": {
+      "version": "1.1.3",
+      "dev": true,
+      "funding": [
+        {
+          "type": "kofi",
+          "url": "https://ko-fi.com/mrcgrtz"
+        },
+        {
+          "type": "liberapay",
+          "url": "https://liberapay.com/mrcgrtz"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-overflow-shorthand": {
+      "version": "3.0.4",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-page-break": {
+      "version": "3.0.4",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "postcss": "^8"
+      }
+    },
+    "node_modules/postcss-place": {
+      "version": "7.0.5",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-preset-env": {
+      "version": "7.8.0",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "@csstools/postcss-cascade-layers": "^1.0.5",
+        "@csstools/postcss-color-function": "^1.1.1",
+        "@csstools/postcss-font-format-keywords": "^1.0.1",
+        "@csstools/postcss-hwb-function": "^1.0.2",
+        "@csstools/postcss-ic-unit": "^1.0.1",
+        "@csstools/postcss-is-pseudo-class": "^2.0.7",
+        "@csstools/postcss-nested-calc": "^1.0.0",
+        "@csstools/postcss-normalize-display-values": "^1.0.1",
+        "@csstools/postcss-oklab-function": "^1.1.1",
+        "@csstools/postcss-progressive-custom-properties": "^1.3.0",
+        "@csstools/postcss-stepped-value-functions": "^1.0.1",
+        "@csstools/postcss-text-decoration-shorthand": "^1.0.0",
+        "@csstools/postcss-trigonometric-functions": "^1.0.2",
+        "@csstools/postcss-unset-value": "^1.0.2",
+        "autoprefixer": "^10.4.8",
+        "browserslist": "^4.21.3",
+        "css-blank-pseudo": "^3.0.3",
+        "css-has-pseudo": "^3.0.4",
+        "css-prefers-color-scheme": "^6.0.3",
+        "cssdb": "^7.0.0",
+        "postcss-attribute-case-insensitive": "^5.0.2",
+        "postcss-clamp": "^4.1.0",
+        "postcss-color-functional-notation": "^4.2.4",
+        "postcss-color-hex-alpha": "^8.0.4",
+        "postcss-color-rebeccapurple": "^7.1.1",
+        "postcss-custom-media": "^8.0.2",
+        "postcss-custom-properties": "^12.1.8",
+        "postcss-custom-selectors": "^6.0.3",
+        "postcss-dir-pseudo-class": "^6.0.5",
+        "postcss-double-position-gradients": "^3.1.2",
+        "postcss-env-function": "^4.0.6",
+        "postcss-focus-visible": "^6.0.4",
+        "postcss-focus-within": "^5.0.4",
+        "postcss-font-variant": "^5.0.0",
+        "postcss-gap-properties": "^3.0.5",
+        "postcss-image-set-function": "^4.0.7",
+        "postcss-initial": "^4.0.1",
+        "postcss-lab-function": "^4.2.1",
+        "postcss-logical": "^5.0.4",
+        "postcss-media-minmax": "^5.0.0",
+        "postcss-nesting": "^10.1.10",
+        "postcss-opacity-percentage": "^1.1.2",
+        "postcss-overflow-shorthand": "^3.0.4",
+        "postcss-page-break": "^3.0.4",
+        "postcss-place": "^7.0.5",
+        "postcss-pseudo-class-any-link": "^7.1.6",
+        "postcss-replace-overflow-wrap": "^4.0.0",
+        "postcss-selector-not": "^6.0.1",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-pseudo-class-any-link": {
+      "version": "7.1.6",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-replace-overflow-wrap": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "postcss": "^8.0.3"
+      }
+    },
+    "node_modules/postcss-selector-not": {
+      "version": "6.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "6.0.13",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/pretty-bytes": {
+      "version": "5.6.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/proc-log": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/promise-inflight": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/promise-retry": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.7",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/proxy-addr/node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/prr": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/punycode": {
+      "version": "2.3.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/qjobs": {
+      "version": "1.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.9"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.11.0",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/raf": {
+      "version": "3.4.1",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "performance-now": "^2.1.0"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.5.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/read-cache": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pify": "^2.3.0"
+      }
+    },
+    "node_modules/read-package-json": {
+      "version": "5.0.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^8.0.1",
+        "json-parse-even-better-errors": "^2.3.1",
+        "normalize-package-data": "^4.0.0",
+        "npm-normalize-package-bin": "^2.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/read-package-json-fast": {
+      "version": "2.0.3",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "json-parse-even-better-errors": "^2.3.0",
+        "npm-normalize-package-bin": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/read-package-json/node_modules/npm-normalize-package-bin": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "license": "MIT",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/reflect-metadata": {
+      "version": "0.1.13",
+      "license": "Apache-2.0"
+    },
+    "node_modules/regenerate": {
+      "version": "1.4.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/regenerate-unicode-properties": {
+      "version": "10.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "regenerate": "^1.4.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.13.9",
+      "license": "MIT"
+    },
+    "node_modules/regenerator-transform": {
+      "version": "0.15.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.8.4"
+      }
+    },
+    "node_modules/regex-parser": {
+      "version": "2.2.11",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/regexpu-core": {
+      "version": "5.3.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/regjsgen": "^0.8.0",
+        "regenerate": "^1.4.2",
+        "regenerate-unicode-properties": "^10.1.0",
+        "regjsparser": "^0.9.1",
+        "unicode-match-property-ecmascript": "^2.0.0",
+        "unicode-match-property-value-ecmascript": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regjsparser": {
+      "version": "0.9.1",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "jsesc": "~0.5.0"
+      },
+      "bin": {
+        "regjsparser": "bin/parser"
+      }
+    },
+    "node_modules/regjsparser/node_modules/jsesc": {
+      "version": "0.5.0",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      }
+    },
+    "node_modules/replace-in-file": {
+      "version": "6.3.5",
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.2",
+        "glob": "^7.2.0",
+        "yargs": "^17.2.1"
+      },
+      "bin": {
+        "replace-in-file": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/replace-in-file/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/replace-in-file/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/replace-in-file/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/replace-in-file/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/replace-in-file/node_modules/glob": {
+      "version": "7.2.3",
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/replace-in-file/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/replace-in-file/node_modules/minimatch": {
+      "version": "3.1.2",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/replace-in-file/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/resolve": {
+      "version": "1.22.0",
+      "license": "MIT",
+      "dependencies": {
+        "is-core-module": "^2.8.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-url-loader": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "adjust-sourcemap-loader": "^4.0.0",
+        "convert-source-map": "^1.7.0",
+        "loader-utils": "^2.0.0",
+        "postcss": "^8.2.14",
+        "source-map": "0.6.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/loader-utils": {
+      "version": "2.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/resolve-url-loader/node_modules/source-map": {
+      "version": "0.6.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/retry": {
+      "version": "0.12.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rfdc": {
+      "version": "1.3.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/rgbcolor": {
+      "version": "1.0.1",
+      "license": "MIT OR SEE LICENSE IN FEEL-FREE.md",
+      "optional": true,
+      "engines": {
+        "node": ">= 0.8.15"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/rimraf/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/rimraf/node_modules/glob": {
+      "version": "7.2.3",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/rimraf/node_modules/minimatch": {
+      "version": "3.1.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/run-async": {
+      "version": "2.4.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/rxjs": {
+      "version": "7.5.7",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/sass": {
+      "version": "1.54.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chokidar": ">=3.0.0 <4.0.0",
+        "immutable": "^4.0.0",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/sass-loader": {
+      "version": "13.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "klona": "^2.0.4",
+        "neo-async": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "fibers": ">= 3.1.0",
+        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
+        "sass": "^1.3.0",
+        "sass-embedded": "*",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "fibers": {
+          "optional": true
+        },
+        "node-sass": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/sax": {
+      "version": "1.2.4",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/schema-utils": {
+      "version": "2.7.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.5",
+        "ajv": "^6.12.4",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/select-hose": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/selfsigned": {
+      "version": "2.1.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "node-forge": "^1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.5.3",
+      "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver/node_modules/yallist": {
+      "version": "4.0.0",
+      "license": "ISC"
+    },
+    "node_modules/send": {
+      "version": "0.18.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/debug": {
+      "version": "2.6.9",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/send/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/send/node_modules/mime": {
+      "version": "1.6.0",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/send/node_modules/ms": {
+      "version": "2.1.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/send/node_modules/statuses": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/serve-index": {
+      "version": "1.9.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/serve-index/node_modules/debug": {
+      "version": "2.6.9",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/serve-index/node_modules/depd": {
+      "version": "1.1.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/http-errors": {
+      "version": "1.6.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/inherits": {
+      "version": "2.0.3",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/serve-index/node_modules/ms": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/serve-index/node_modules/setprototypeof": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/serve-static": {
+      "version": "1.15.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.18.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/shallow-clone": {
+      "version": "3.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "license": "ISC"
+    },
+    "node_modules/slash": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socket.io": {
+      "version": "4.7.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "base64id": "~2.0.0",
+        "cors": "~2.8.5",
+        "debug": "~4.3.2",
+        "engine.io": "~6.5.2",
+        "socket.io-adapter": "~2.5.2",
+        "socket.io-parser": "~4.2.4"
+      },
+      "engines": {
+        "node": ">=10.2.0"
+      }
+    },
+    "node_modules/socket.io-adapter": {
+      "version": "2.5.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ws": "~8.11.0"
+      }
+    },
+    "node_modules/socket.io-parser": {
+      "version": "4.2.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/sockjs": {
+      "version": "0.3.24",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "faye-websocket": "^0.11.3",
+        "uuid": "^8.3.2",
+        "websocket-driver": "^0.7.4"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.7.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ip": "^2.0.0",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "6.2.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^6.0.2",
+        "debug": "^4.3.3",
+        "socks": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.7.4",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.0.2",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-loader": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "abab": "^2.0.6",
+        "iconv-lite": "^0.6.3",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.72.1"
+      }
+    },
+    "node_modules/source-map-loader/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sourcemap-codec": {
+      "version": "1.4.8",
+      "license": "MIT"
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.2.0",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.3.0",
+      "dev": true,
+      "license": "CC-BY-3.0"
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.13",
+      "dev": true,
+      "license": "CC0-1.0"
+    },
+    "node_modules/spdy": {
+      "version": "4.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/spdy-transport": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/ssf": {
+      "version": "0.11.2",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "frac": "~1.1.2"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/ssri": {
+      "version": "9.0.1",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/stackblur-canvas": {
+      "version": "2.6.0",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.1.14"
+      }
+    },
+    "node_modules/statuses": {
+      "version": "1.5.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/streamroller": {
+      "version": "3.1.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "date-format": "^4.0.14",
+        "debug": "^4.3.4",
+        "fs-extra": "^8.1.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/streamroller/node_modules/fs-extra": {
+      "version": "8.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
+    "node_modules/streamroller/node_modules/jsonfile": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/streamroller/node_modules/universalify": {
+      "version": "0.1.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/stylus": {
+      "version": "0.59.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@adobe/css-tools": "^4.0.1",
+        "debug": "^4.3.2",
+        "glob": "^7.1.6",
+        "sax": "~1.2.4",
+        "source-map": "^0.7.3"
+      },
+      "bin": {
+        "stylus": "bin/stylus"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://opencollective.com/stylus"
+      }
+    },
+    "node_modules/stylus-loader": {
+      "version": "7.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-glob": "^3.2.11",
+        "klona": "^2.0.5",
+        "normalize-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "stylus": ">=0.52.4",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/stylus/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/stylus/node_modules/glob": {
+      "version": "7.2.3",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/stylus/node_modules/minimatch": {
+      "version": "3.1.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/sucrase": {
+      "version": "3.34.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "commander": "^4.0.0",
+        "glob": "7.1.6",
+        "lines-and-columns": "^1.1.6",
+        "mz": "^2.7.0",
+        "pirates": "^4.0.1",
+        "ts-interface-checker": "^0.1.9"
+      },
+      "bin": {
+        "sucrase": "bin/sucrase",
+        "sucrase-node": "bin/sucrase-node"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/sucrase/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/sucrase/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/sucrase/node_modules/commander": {
+      "version": "4.1.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/sucrase/node_modules/glob": {
+      "version": "7.1.6",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/sucrase/node_modules/minimatch": {
+      "version": "3.1.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/svg-pathdata": {
+      "version": "6.0.3",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/svg.draggable.js": {
+      "version": "2.2.2",
+      "license": "MIT",
+      "dependencies": {
+        "svg.js": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/svg.easing.js": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "svg.js": ">=2.3.x"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/svg.filter.js": {
+      "version": "2.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "svg.js": "^2.2.5"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/svg.js": {
+      "version": "2.7.1",
+      "license": "MIT"
+    },
+    "node_modules/svg.pathmorphing.js": {
+      "version": "0.1.3",
+      "license": "MIT",
+      "dependencies": {
+        "svg.js": "^2.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/svg.resize.js": {
+      "version": "1.4.3",
+      "license": "MIT",
+      "dependencies": {
+        "svg.js": "^2.6.5",
+        "svg.select.js": "^2.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/svg.resize.js/node_modules/svg.select.js": {
+      "version": "2.1.2",
+      "license": "MIT",
+      "dependencies": {
+        "svg.js": "^2.2.5"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/svg.select.js": {
+      "version": "3.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "svg.js": "^2.6.5"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/symbol-observable": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/tailwindcss": {
+      "version": "3.3.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@alloc/quick-lru": "^5.2.0",
+        "arg": "^5.0.2",
+        "chokidar": "^3.5.3",
+        "didyoumean": "^1.2.2",
+        "dlv": "^1.1.3",
+        "fast-glob": "^3.2.12",
+        "glob-parent": "^6.0.2",
+        "is-glob": "^4.0.3",
+        "jiti": "^1.18.2",
+        "lilconfig": "^2.1.0",
+        "micromatch": "^4.0.5",
+        "normalize-path": "^3.0.0",
+        "object-hash": "^3.0.0",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.23",
+        "postcss-import": "^15.1.0",
+        "postcss-js": "^4.0.1",
+        "postcss-load-config": "^4.0.1",
+        "postcss-nested": "^6.0.1",
+        "postcss-selector-parser": "^6.0.11",
+        "resolve": "^1.22.2",
+        "sucrase": "^3.32.0"
+      },
+      "bin": {
+        "tailwind": "lib/cli.js",
+        "tailwindcss": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/tailwindcss/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/tailwindcss/node_modules/postcss-import": {
+      "version": "15.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.0.0",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.0"
+      }
+    },
+    "node_modules/tailwindcss/node_modules/resolve": {
+      "version": "1.22.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/tapable": {
+      "version": "2.2.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tar": {
+      "version": "6.1.15",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^5.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/tar/node_modules/minipass": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tar/node_modules/yallist": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/terser": {
+      "version": "5.14.2",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.2",
+        "acorn": "^8.5.0",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.3.9",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.1",
+        "terser": "^5.16.8"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/commander": {
+      "version": "2.20.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/terser": {
+      "version": "5.19.2",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/test-exclude/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/test-exclude/node_modules/glob": {
+      "version": "7.2.3",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/test-exclude/node_modules/minimatch": {
+      "version": "3.1.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/text-segmentation": {
+      "version": "1.0.3",
+      "license": "MIT",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/thenify": {
+      "version": "3.3.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "node_modules/thenify-all": {
+      "version": "1.6.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "thenify": ">= 3.1.0 < 4"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/thunky": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tmp": {
+      "version": "0.0.33",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/tree-kill": {
+      "version": "1.2.2",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "tree-kill": "cli.js"
+      }
+    },
+    "node_modules/ts-helpers": {
+      "version": "1.1.2",
+      "license": "MIT",
+      "peerDependencies": {
+        "typescript": ">=1.8.0  <2.1.0 || >=1.9.0-dev || >=2.0.0-dev || || >=2.1.0-dev"
+      }
+    },
+    "node_modules/ts-interface-checker": {
+      "version": "0.1.13",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/tslib": {
+      "version": "2.6.1",
+      "license": "0BSD"
+    },
+    "node_modules/type-fest": {
+      "version": "0.21.3",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/typed-assert": {
+      "version": "1.0.9",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/typescript": {
+      "version": "4.7.4",
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
+    "node_modules/ua-parser-js": {
+      "version": "0.7.35",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/ua-parser-js"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/faisalman"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/unicode-canonical-property-names-ecmascript": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-ecmascript": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "unicode-canonical-property-names-ecmascript": "^2.0.0",
+        "unicode-property-aliases-ecmascript": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-value-ecmascript": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-property-aliases-ecmascript": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unique-filename": {
+      "version": "1.1.1",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "node_modules/unique-slug": {
+      "version": "2.0.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "node_modules/universalify": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.0.11",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "license": "MIT"
+    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/utrie": {
+      "version": "1.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "base64-arraybuffer": "^1.0.2"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/validate-npm-package-name": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "builtins": "^5.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/void-elements": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/watchpack": {
+      "version": "2.4.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/wbuf": {
+      "version": "1.7.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/wcwidth": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "defaults": "^1.0.3"
+      }
+    },
+    "node_modules/webpack": {
+      "version": "5.76.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^0.0.51",
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/wasm-edit": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1",
+        "acorn": "^8.7.1",
+        "acorn-import-assertions": "^1.7.6",
+        "browserslist": "^4.14.5",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.10.0",
+        "es-module-lexer": "^0.9.0",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.9",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.1.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.1.3",
+        "watchpack": "^2.4.0",
+        "webpack-sources": "^3.2.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-middleware": {
+      "version": "5.3.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "colorette": "^2.0.10",
+        "memfs": "^3.4.3",
+        "mime-types": "^2.1.31",
+        "range-parser": "^1.2.1",
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/webpack-dev-middleware/node_modules/ajv": {
+      "version": "8.12.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
+      "version": "4.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/webpack-dev-server": {
+      "version": "4.11.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/bonjour": "^3.5.9",
+        "@types/connect-history-api-fallback": "^1.3.5",
+        "@types/express": "^4.17.13",
+        "@types/serve-index": "^1.9.1",
+        "@types/serve-static": "^1.13.10",
+        "@types/sockjs": "^0.3.33",
+        "@types/ws": "^8.5.1",
+        "ansi-html-community": "^0.0.8",
+        "bonjour-service": "^1.0.11",
+        "chokidar": "^3.5.3",
+        "colorette": "^2.0.10",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^2.0.0",
+        "default-gateway": "^6.0.3",
+        "express": "^4.17.3",
+        "graceful-fs": "^4.2.6",
+        "html-entities": "^2.3.2",
+        "http-proxy-middleware": "^2.0.3",
+        "ipaddr.js": "^2.0.1",
+        "open": "^8.0.9",
+        "p-retry": "^4.5.0",
+        "rimraf": "^3.0.2",
+        "schema-utils": "^4.0.0",
+        "selfsigned": "^2.0.1",
+        "serve-index": "^1.9.1",
+        "sockjs": "^0.3.24",
+        "spdy": "^4.0.2",
+        "webpack-dev-middleware": "^5.3.1",
+        "ws": "^8.4.2"
+      },
+      "bin": {
+        "webpack-dev-server": "bin/webpack-dev-server.js"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.37.0 || ^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/ajv": {
+      "version": "8.12.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/webpack-dev-server/node_modules/schema-utils": {
+      "version": "4.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/webpack-merge": {
+      "version": "5.8.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "clone-deep": "^4.0.1",
+        "wildcard": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack-subresource-integrity": {
+      "version": "5.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "typed-assert": "^1.0.8"
+      },
+      "engines": {
+        "node": ">= 12"
+      },
+      "peerDependencies": {
+        "html-webpack-plugin": ">= 5.0.0-beta.1 < 6",
+        "webpack": "^5.12.0"
+      },
+      "peerDependenciesMeta": {
+        "html-webpack-plugin": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/websocket-driver": {
+      "version": "0.7.4",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "http-parser-js": ">=0.5.1",
+        "safe-buffer": ">=5.1.0",
+        "websocket-extensions": ">=0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/websocket-extensions": {
+      "version": "0.1.4",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "1.3.1",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/wide-align": {
+      "version": "1.1.5",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^1.0.2 || 2 || 3 || 4"
+      }
+    },
+    "node_modules/wildcard": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/wmf": {
+      "version": "1.0.2",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/word": {
+      "version": "0.3.0",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "license": "ISC"
+    },
+    "node_modules/ws": {
+      "version": "8.11.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xlsx": {
+      "version": "0.18.5",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "adler-32": "~1.3.0",
+        "cfb": "~1.2.1",
+        "codepage": "~1.15.0",
+        "crc-32": "~1.2.1",
+        "ssf": "~0.11.2",
+        "wmf": "~1.0.1",
+        "word": "~0.3.0"
+      },
+      "bin": {
+        "xlsx": "bin/xlsx.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "license": "ISC"
+    },
+    "node_modules/yaml": {
+      "version": "2.3.1",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "17.4.1",
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/zone.js": {
+      "version": "0.11.8",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
index 241c3bfe..46ea6640 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "leaflet": "^1.6.0",
     "leaflet-responsive-popup": "^1.0.0",
     "lodash": "^4.17.21",
-    "ng-apexcharts": "^1.7.1",
+    "ng-apexcharts": "1.7.1",
     "ng-circle-progress": "^1.6.0",
     "ngx-bootstrap": "^9.0.0",
     "ngx-daterangepicker-material": "^6.0.4",
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 06cd7514..95fe3893 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -4,6 +4,8 @@ import { LayoutComponent } from './core/components/layout/layout.component';
 import { RbacDialogComponent } from './shared/components/rbac-dialog/rbac-dialog.component';
 import { HomePageComponent } from './views/home-page/home-page.component';
 import { AuthGuard } from './core/guards/auth.guard';
+import { AboutPageComponent } from './views/about-page/about-page.component';
+import { ContactPageComponent } from './views/contact-page/contact-page.component';
 
 var routes: Routes = [];
 
@@ -12,30 +14,37 @@ routes = [
   {
     path: '', redirectTo: `home`, pathMatch: 'full'
   },
-  {
-    path: '',
-    loadChildren: () => import('./views/authentication/authentication.module').then(module => module.AuthenticationModule)
-  },
+//   {
+//     path: '',
+//     loadChildren: () => import('./views/authentication/authentication.module').then(module => module.AuthenticationModule)
+//   },
   {
     path: '',
     component: LayoutComponent,
     children: [
       {
         path: 'rbac', component: RbacDialogComponent,
-        canActivate: [AuthGuard]
+        // canActivate: [AuthGuard]
 
       },
       {
         path: 'home', component: HomePageComponent,
-        canActivate: [AuthGuard]
+        // canActivate: [AuthGuard]
       },
+      {
+        path: 'about-us', component: AboutPageComponent,
+      },
+      {
+        path: 'contact-us', component: ContactPageComponent,
+      },
+      
       {
         path: 'summary-statistics',
         loadChildren: () =>
           import('./views/dashboard/dashboard.module').then(
             (module) => module.DashboardModule
           ),
-        canLoad: [AuthGuard]
+        // canLoad: [AuthGuard]
       },
       {
         path: 'student-attendance',
@@ -43,7 +52,7 @@ routes = [
           import('./views/student-attendance/student-attendance.module').then(
             (module) => module.StudentAttendanceModule
           ),
-        canLoad: [AuthGuard]
+        // canLoad: [AuthGuard]
       },
       {
         path: 'teacher-attendance',
@@ -51,7 +60,7 @@ routes = [
           import('./views/teacher-attendance/teacher-attendance.module').then(
             (module) => module.TeacherAttendanceModule
           ),
-        canLoad: [AuthGuard]
+        // canLoad: [AuthGuard]
       },
       {
         path: 'review-meetings',
@@ -59,7 +68,7 @@ routes = [
           import('./views/review-meetings/review-meetings.module').then(
             (module) => module.ReviewMeetingsModule
           ),
-        canLoad: [AuthGuard]
+        // canLoad: [AuthGuard]
       },
       {
         path: 'udise',
@@ -67,7 +76,7 @@ routes = [
           import('./views/udise/udise.module').then(
             (module) => module.UdiseModule
           ),
-        canLoad: [AuthGuard]
+        // canLoad: [AuthGuard]
       },
       {
         path: 'nishtha',
@@ -75,7 +84,7 @@ routes = [
           import('./views/nishtha/nishtha.module').then(
             (module) => module.NishthaModule
           ),
-        canLoad: [AuthGuard]
+        // canLoad: [AuthGuard]
       },
       {
         path: 'pgi',
@@ -83,7 +92,7 @@ routes = [
           import('./views/pgi/pgi.module').then(
             (module) => module.PgiModule
           ),
-        canLoad: [AuthGuard]
+        // canLoad: [AuthGuard]
       },
       {
         path: 'pmposhan',
@@ -91,7 +100,7 @@ routes = [
           import('./views/pmposhan/pmposhan.module').then(
             (module) => module.PmPoshanModule
           ),
-        canLoad: [AuthGuard]
+        // canLoad: [AuthGuard]
       },
       {
         path: 'nas',
@@ -99,7 +108,7 @@ routes = [
           import('./views/nas/nas.module').then(
             (module) => module.NasModule
           ),
-        canLoad: [AuthGuard]
+        // canLoad: [AuthGuard]
       },
       {
         path: 'diksha',
@@ -107,7 +116,7 @@ routes = [
           import('./views/diksha/diksha.module').then(
             (module) => module.DikshaModule
           ),
-        canLoad: [AuthGuard]
+        // canLoad: [AuthGuard]
       },
       {
         path: 'student-assessment',
@@ -115,7 +124,7 @@ routes = [
             import('./views/student-assessment/student-assessment.module').then(
                 (module) => module.StudentAssessmentModule
             ),
-        canLoad: [AuthGuard]
+        // canLoad: [AuthGuard]
       },
       {
         path: 'school-infrastructure',
@@ -123,7 +132,7 @@ routes = [
             import('./views/school-infrastructure/school-infrastructure.module').then(
                 (module) => module.SchoolInfrastructureModule
             ),
-        canLoad: [AuthGuard]
+        // canLoad: [AuthGuard]
       },
       {
         path: 'school-progression',
@@ -131,7 +140,7 @@ routes = [
             import('./views/school-progression/school-progression.module').then(
                 (module) => module.SchoolProgressionModule
             ),
-        canLoad: [AuthGuard]
+        // canLoad: [AuthGuard]
       },
       {
         path: 'student-assessments',
@@ -139,7 +148,7 @@ routes = [
             import('./views/student-assessments/student-assessments.module').then(
                 (module) => module.StudentAssessmentsModule
             ),
-        canLoad: [AuthGuard]
+        // canLoad: [AuthGuard]
       },
       {
         path: 'ncf',
@@ -147,7 +156,7 @@ routes = [
           import('./views/ncf/ncf.module').then(
             (module) => module.NcfModule
           ),
-        canLoad: [AuthGuard]
+        // canLoad: [AuthGuard]
       },
       {
         path: 'quizzes',
@@ -155,7 +164,7 @@ routes = [
           import('./views/ncert-quiz/ncert-quiz.module').then(
             (module) => module.NcertQuizModule
           ),
-        canLoad: [AuthGuard]
+        // canLoad: [AuthGuard]
       },
       {
         path: 'microimprovement',
@@ -163,7 +172,7 @@ routes = [
           import('./views/micro-improvements/micro-improvements.module').then(
             (module) => module.MicroImprovementsModule
           ),
-        canLoad: [AuthGuard]
+        // canLoad: [AuthGuard]
       },
       {
         path: 'nipunBharat',
@@ -171,7 +180,7 @@ routes = [
           import('./views/nipun-bharat/nipun-bharat.module').then(
             (module) => module.NipunBharatModule
           ),
-        canLoad: [AuthGuard]
+        // canLoad: [AuthGuard]
       },
       {
         path: 'pmShri',
@@ -179,14 +188,49 @@ routes = [
           import('./views/pm-shri/pm-shri.module').then(
             (module) => module.PmShriModule
           ),
-        canLoad: [AuthGuard]
+        // canLoad: [AuthGuard]
+      },
+      {
+        path: 'prashast',
+        loadChildren: () =>
+          import('./views/prashast/prashast.module').then(
+            (module) => module.PrashastModule
+          ),
+        // canLoad: [AuthGuard]
       },
+      {
+        path: 'udiseApex',
+        loadChildren: () =>
+          import('./views/udise-apex/udise-apex.module').then(
+            (module) => module.UdiseApexModule
+          ),
+        // canLoad: [AuthGuard]
+      },
+      {
+        path: 'nasApex',
+        loadChildren: () =>
+          import('./views/nas-apex/nas-apex.module').then(
+            (module) => module.NasApexModule
+          ),
+        // canLoad: [AuthGuard]
+      },
+      {
+        path: 'pgiApex',
+        loadChildren: () =>
+          import('./views/pgi-apex/pgi-apex.module').then(
+            (module) => module.PgiApexModule
+          ),
+        // canLoad: [AuthGuard]
+      }
     ],
   },
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes, { useHash: true })],
+  imports: [RouterModule.forRoot(routes, {
+    scrollPositionRestoration: 'enabled',
+    useHash: true })],
+  
   exports: [RouterModule],
 })
 export class AppRoutingModule { }
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 331dd732..699f1b49 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -22,6 +22,8 @@ import { MatToolbarModule } from '@angular/material/toolbar';
 import { MetadataInterceptor } from './core/interceptors/metadata-interceptor/metadata-interceptor.service';
 import { JwtInterceptor } from './utilities/jwtInterceptor';
 import { AppConfig }  from './app.config';
+import { AboutPageComponent } from './views/about-page/about-page.component';
+import { ContactPageComponent } from './views/contact-page/contact-page.component';
 
 //Add this function as initiating load method first
 
@@ -31,7 +33,9 @@ function initConfig(config: AppConfig){
 @NgModule({
   declarations: [
     AppComponent,
-    HomePageComponent
+    HomePageComponent,
+    AboutPageComponent,
+    ContactPageComponent
    
   ],
   imports: [
diff --git a/src/app/core/components/footer/footer.component.html b/src/app/core/components/footer/footer.component.html
index 6ff6699b..08857e46 100644
--- a/src/app/core/components/footer/footer.component.html
+++ b/src/app/core/components/footer/footer.component.html
@@ -1,16 +1,55 @@
 
-<section class="text-white app-footer-bar">
-    
-    <div class="footer">
-        <p class="data xmd:col-span-4 xmd:py-4 py-1 px-2 col-span-full text-center" *ngIf="lastModified">Data updated as of {{ lastModified | date: 'dd MMM, YYYY' }}</p>
-
-        <!-- <img src="../../../../assets/images/NIC.png" alt="NIC Image">
-        <div class="grid grid-cols-12">
-            <div class="copyright pt-3 col-span-full text-center">
-                Copyright ©  2022
-                National Information Centre All Rights Reserved
-            </div>
-        </div> -->
-            
+<section class="app-footer-bar">
+	<div class="top-section">
+        <div class="container">
+            <!-- <div class="logo-wrapper">
+				<img src="assets/images/footer-logo.png" alt="logo">
+			</div> -->
+			<div class="footer-items">
+				<div class="footer-item">
+					<a href="https://www.education.gov.in/" target="_blank">
+					  <img src="assets/images/Ministry_of_Education_India 1.png" alt="gov of india" class="gov-footer-logo"> 
+					</a>
+				</div>
+				<div class="footer-item">
+				  <a href="https://ciet.ncert.gov.in/" target="_blank">
+					<img src="assets/images/ncert-logo 1.png" alt="ciet" class="ciet-footer-logo"> 
+				  </a>
+				</div>
+				<div class="footer-item">
+					<a href="https://digitalindia.gov.in/" target="_blank">
+					  <img src="assets/images/digital-india 1.png" alt="digital-india" class="digital-india"> 
+					</a>
+				</div>
+				<div class="footer-item">
+				  <a href="https://www.mygov.in/" target="_blank"> 
+					<img src="assets/images/my-gov.png" alt="my-gov" class="my-gov"> 
+				  </a>
+				</div>
+				<div class="footer-item">
+					<a href="https://diksha.gov.in/" target="_blank"> 
+					  <img src="assets/images/diksha-logo 1.png" alt="diksha" class="diksha"> 
+					</a>
+				</div>
+				<div class="footer-item">
+					<a href="https://ejaaduipitara.ncert.gov.in/" target="_blank"> 
+					  <img src="assets/images/jaduyi-pitra.png" alt="Jaadui Pitara" class="jaadui-pitara"> 
+					</a>
+				</div>
+			</div>
+		</div> 
+	</div>
+    <div class="black-bg">
+		<div class="info-section">
+            <div class="container">
+			  <p class="info-p">National Council of Educational Research And Training (NCERT),
+				Sri Aurobindo Marg, New Delhi-110016</p>
+			</div> 
+		</div>
+        <div class="copyright-section">
+            <div class="container">
+				<p class="copyright">&#169; 2024 - Copyright NCERT. All rights reserved. Powered by NeGD | MeitY Government of India® 2024</p>
+			</div> 
+		</div>
     </div>
-</section>
\ No newline at end of file
+</section>
diff --git a/src/app/core/components/footer/footer.component.scss b/src/app/core/components/footer/footer.component.scss
index aae892a4..d8599178 100644
--- a/src/app/core/components/footer/footer.component.scss
+++ b/src/app/core/components/footer/footer.component.scss
@@ -1,16 +1,16 @@
 @import './../../../../assets/styles/variables';
-.app-footer-bar{
-    background-color:rgba(19,36,93,255);
-    min-height: 7rem;
-    // min-height: 100%;
-}
+// .app-footer-bar{
+//     // background-color:rgba(19,36,93,255);
+//     // min-height: 7rem;
+//     // min-height: 100%;
+// }
 
-img {
-    align-self: center;
-    padding-top: 12px;
-    height: 43px;
-    width: 192px;
-}
+// img {
+//     align-self: center;
+//     padding-top: 12px;
+//     height: 43px;
+//     width: 192px;
+// }
 .footer{
     align-items: stretch;
     display: flex;
@@ -33,4 +33,48 @@ img {
     .footer{
         width: 100vw !important;
     }
+}
+.top-section {
+  background-color: #fff;
+  padding: 60px 0px 20px;
+}
+.logo-wrappe{
+	padding: 0 15px;
+}
+.top-section .footer-items {
+    display: flex;
+    justify-content: space-between;
+    padding: 2.5rem 0;
+    align-items: center;
+	width: 94%;
+}
+
+.black-bg {
+  margin-top: 0px;
+  background-color: #20242A;
+  color: #FFFFFF;
+  line-height: 1.5;
+  font-size: 14px;
+  font-weight: 500;
+  text-align: center;
+}
+.info-section {
+   padding:15px;
+}
+.info-p {
+   text-align: left;
+}
+
+.copyright-section {
+	padding: 10px;
+	border-top: 1px solid #FFFFFF;
+}
+
+@media (max-width: 768px) {
+	.top-section {
+		padding: 20px 0px 20px;
+	}
+	.info-p {
+		text-align: center;
+	}
 }
\ No newline at end of file
diff --git a/src/app/core/components/header-v2/header-v2.component.html b/src/app/core/components/header-v2/header-v2.component.html
new file mode 100644
index 00000000..ec7251af
--- /dev/null
+++ b/src/app/core/components/header-v2/header-v2.component.html
@@ -0,0 +1,84 @@
+<div class="bg-white app-nav-bar">
+	<div class="custom-container">
+    <div class="flex header-wrapper">
+        <div class="headerSideWidth">
+            <div class="flex items-center bg-white justify-between">
+					<img src="assets/images/Ministry_of_Education_India.png" class="h-8 sm:h-11 left-logo"
+                    alt="MOI Logo" />
+                <img src="assets/images/{{title.dashboard_header2_image2}}" class="h-full logo" alt="NCERT Logo"
+                    *ngIf="title.dashboard_header2_image2 && title.dashboard_header2_image2 !== ''">
+ 
+                        <a href="https://www.education.gov.in/en" class="hidden" target="_blank">
+                            <img src="assets/images/moi_logo.png" class="mr-3 h-6 sm:h-9" alt="MOI Logo" />
+                        </a>
+ 
+            </div>
+        </div>
+			<div class="rightContent">
+				<div class="" *ngIf="NVSK">
+					<h1 class="">NDEAR VIDYA SAMIKSHA KENDRA</h1>
+            </div>
+            <div class="justify-left items-center md:flex" *ngIf="!NVSK">
+                <h1 class="font-medium leading-tight lg:text-4xl md:text-2xl xs:text-sm sm:text-1xl mt-0">
+                    {{title.dashboard_header2_title ? title.dashboard_header2_title : stateName + ' - VIDYA SAMIKSHA KENDRA (VSK)'}}</h1>
+            </div>
+            <div class="">
+ 
+                        <div *ngIf="!NVSK">
+                            <!-- <img src="../../../../assets/images/user.png" class="user-icon ml-5" (mouseover)="onMouseOver()"
+                        (mouseout)="onMouseOut()"> -->
+                            <!-- <div *ngIf="dropdown" class="dropdown" (mouseover)="withinTime = true;" [@fadeInOut] (mouseout)="onMouseOut()">
+                        <a href="#" (click)="logout()" id="logout" name="logout"> logout</a>
+                    </div> -->
+                        </div>
+ 
+                    </div>
+                </div>
+            </div>
+        </div>
+    <!--<div class="flex justify-between items-center xs:px-2 md:container md:mx-auto h-full">
+        <div class="flex items-center">
+ 
+            <img src="assets/images/MoE.png" class=" h-6 sm:h-9 left-logo" alt="MOI Logo" />
+ 
+            <a href="https://www.education.gov.in/en" class="hidden" target="_blank">
+                <img src="assets/images/moi_logo.png" class="mr-3 h-6 sm:h-9" alt="MOI Logo" />
+            </a>
+        </div>
+        <div class="justify-between items-center md:flex" *ngIf="config == 'NVSK'">
+            <h1 class="font-medium leading-tight lg:text-4xl md:text-2xl xs:text-sm sm:text-1xl mt-0">NDEAR VIDYA SAMIKSHA KENDRA</h1>
+        </div>
+        <div class="justify-between items-center md:flex" *ngIf="config == 'VSK'">
+            <h1 class="font-medium leading-tight lg:text-4xl md:text-2xl xs:text-sm sm:text-1xl mt-0">VIDYA SAMIKSHA KENDRA</h1>
+        </div>
+        <div class="d-flex justify-between items-center h-full">
+            <img src="assets/images/NCERT_logo-01.png" class="h-full logo" alt="NCERT Logo">
+ 
+            <div *ngIf="!NVSK">
+                <img src="../../../../assets/images/user.png" class="user-icon ml-5" (mouseover)="onMouseOver()"
+                    (mouseout)="onMouseOut()">
+                <div *ngIf="dropdown" class="dropdown" (mouseover)="withinTime = true;" [@fadeInOut] (mouseout)="onMouseOut()">
+                    <a href="#" (click)="logout()"> logout</a>
+                </div>
+            </div>
+ 
+        </div>
+ 
+    </div>-->
+    
+</div>
+ 
+<!--<div class="rbac-detail-box" *ngIf="!hideDiv">
+    <img *ngIf="rbacDetails && rbacDetails.roleDetail" id="cQb_dhsbrd" class="btn" src="assets/images/{{rbacDetails.roleDetail.imageUrl}}">
+    <div class="cornerText">
+        <p>You have logged in at this level:</p>
+    </div>
+    <div *ngIf="newData">
+        <ul>
+            <li *ngFor="let key of sequence" class="record">
+                <span *ngIf="newData[key] !== undefined" class="key">{{ key }}:</span>
+                <span *ngIf="newData[key] !== undefined" class="value">{{ newData[key] }}</span>
+            </li>
+        </ul>
+    </div>
+</div>-->
\ No newline at end of file
diff --git a/src/app/core/components/header-v2/header-v2.component.scss b/src/app/core/components/header-v2/header-v2.component.scss
new file mode 100644
index 00000000..c2c60f6b
--- /dev/null
+++ b/src/app/core/components/header-v2/header-v2.component.scss
@@ -0,0 +1,190 @@
+@media(max-width:435px) {
+    .leading-tight {
+        padding: none;
+        margin-left: 20px;
+        font-size: 10px;
+        text-align: center;
+    }
+ 
+    .fa {
+        padding: none !important;
+        margin: none;
+        margin-left: 10px;
+    }
+ 
+    .logo {
+        margin-top: 10px;
+        margin-left: 20px;
+        height: 45px;
+        width: 45px;
+    }
+ 
+    .left-logo{
+        height: auto;
+        width: auto;
+    }
+}
+ 
+.header-wrapper{
+    align-items: center;
+	width: 100%;
+    padding: 10px 0;
+}
+ 
+.left-logo {
+    height: auto;
+    width: auto;
+}
+ 
+.logo {
+    height: 45px;
+    width: 45px;
+}
+ 
+.fa {
+    margin-top: 15px;
+}
+ 
+.user-icon {
+    cursor: pointer;
+    height: 35px;
+    width: 35px;
+}
+ 
+.dropdown {
+    background-color: rgb(255, 255, 255) !important;
+    // border-radius: 20px !important;
+    border: 1px solid rgb(230, 230, 230);
+    max-width: fit-content;
+    position: absolute;
+    z-index: 2;
+    padding-top: 15px;
+    padding-left: 10px;
+    padding-right: 10px;
+    padding-bottom: 15px;
+    margin-left: 25px;
+    // right: 10px;
+    // bottom: $app-nav-bar-height;
+}
+ 
+@media(max-width: 435px) {
+    .dropdown {
+        margin: none;
+        right: 10px;
+    }
+}
+ 
+.leading-tight {
+    color: #67bbe1;
+}
+ 
+.h-full {
+    height: 50px;
+    margin-left: 10px;
+}
+ 
+.headerSideWidth {
+	width: 50%;
+}
+ 
+.mainHeaderContent {
+    width: calc(100vw - 18rem)
+}
+ 
+::ng-deep {
+ 
+    html[data-layout=cQubeDefault] h1.leading-tight,
+    html[data-layout=cQubeDefault] .metric-card-wrapper .h4 {
+        font-size: 28px;
+    }
+}
+ 
+ 
+.rbac-detail-box {
+    position: fixed;
+    height: auto;
+    right: 0;
+    top: 3rem;
+    padding: 16px;
+    border-radius: 4px;
+    img {
+        max-height: 100px;
+    }
+}
+ 
+ 
+ 
+p {
+    font-family: "Poppins";
+    font-style: normal;
+    font-weight: 800;
+    font-size: 15.4133px;
+    line-height: 7px;
+    color: #555555;
+    margin-bottom: 5px;
+}
+ 
+// @media (max-width: 600px) {
+//     .white-box {
+//         top: 50%;
+//         right: 50%;
+//         transform: translate(50%, -50%);
+//     }
+// }
+.record {
+    margin-bottom: -3px;
+}
+ 
+.key {
+    font-family: 'Poppins';
+    font-style: normal;
+    font-weight: 600;
+    font-size: 12.4133px;
+    line-height: 19px
+}
+ 
+.value {
+    font-family: 'Poppins';
+    font-style: normal;
+    font-weight: 600;
+    font-size: 12.4133px;
+    line-height: 19px
+}
+.custom-container {
+    width: calc(100% - 14rem);
+    margin: 0 auto;
+    display: flex;
+	padding: 0 8px;
+}
+.rightContent {
+    display: flex;
+    width: 50%;
+    align-items: flex-end;
+    justify-content: end;
+    gap: 0.5rem;
+
+	h1{
+		font-family: "Outfit", sans-serif;
+		font-size: 24px;
+		line-height: 30px;
+		font-weight: 500;
+
+	}
+}
+
+@media (max-width:992px) {
+	.custom-container{
+		width: 100%;
+		padding: 0 1rem;
+	}
+	.rightContent h1{
+		font-size: 20px;
+	}
+}
+@media (max-width:768px) {
+	.rightContent h1 {
+		font-size: 13px;
+		line-height: 15px;
+	}
+}
+
diff --git a/src/app/core/components/header-v2/header-v2.component.spec.ts b/src/app/core/components/header-v2/header-v2.component.spec.ts
new file mode 100644
index 00000000..b4e64e5e
--- /dev/null
+++ b/src/app/core/components/header-v2/header-v2.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HeaderV2Component } from './header-v2.component';
+
+describe('HeaderV2Component', () => {
+  let component: HeaderV2Component;
+  let fixture: ComponentFixture<HeaderV2Component>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ HeaderV2Component ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(HeaderV2Component);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/core/components/header-v2/header-v2.component.ts b/src/app/core/components/header-v2/header-v2.component.ts
new file mode 100644
index 00000000..ede8b8a8
--- /dev/null
+++ b/src/app/core/components/header-v2/header-v2.component.ts
@@ -0,0 +1,109 @@
+import { animate, style, transition, trigger } from '@angular/animations';
+import { Component, OnInit } from '@angular/core';
+import { faBars } from '@fortawesome/free-solid-svg-icons';
+import { environment } from 'src/environments/environment';
+import * as Title from '../../../../assets/config/ui_config.json'
+import { stateNames } from '../../config/StateCodes';
+import { AuthenticationService } from '../../services/authentication/authentication.service';
+import { RbacService } from '../../services/rbac-service.service';
+import { ActivatedRouteSnapshot, Router, NavigationEnd, NavigationStart } from '@angular/router';
+
+@Component({
+  selector: 'app-header-v2',
+  templateUrl: './header-v2.component.html',
+  styleUrls: ['./header-v2.component.scss'],
+  animations: [
+    trigger('fadeInOut', [
+      transition(':enter', [
+        style({ opacity: 0 }),
+        animate(500, style({ opacity: 1 }))
+      ]),
+      transition(':leave', [
+        animate(500, style({ opacity: 0 }))
+      ])
+    ])
+  ]
+})
+export class HeaderV2Component implements OnInit {
+
+	stateName: any;
+	config: string = environment.config
+	NVSK: boolean = true;
+  
+	faBars = faBars;
+	sequence: string[] = ['State', 'District', 'Block', 'Cluster', 'School', 'Grade'];
+	drop: boolean = false;
+	withinTime: boolean = false;
+	dropdown: boolean = false;
+	environment = environment;
+	title: any;
+	rbacDetails: any;
+	newData: any;
+	hideDiv: boolean = true;
+  
+	constructor(private router: Router, private _rbacService: RbacService) {
+  
+	  this.title = Title
+  
+	}
+  
+  
+	ngOnInit(): void {
+	  if (this.config === 'VSK') {
+		this.NVSK = false
+		let names: any = stateNames;
+		names.every((state: any) => {
+		  if (state.stateCode == environment.stateCode) {
+			this.stateName = state.stateName.toUpperCase();
+			return false;
+		  }
+		  return true;
+		});
+  
+	  }
+	  else {
+		this.stateName = 'India'
+	  }
+	  this.router.events.subscribe((event) => {
+		this._rbacService.getRbacDetails().subscribe((rbacDetails: any) => {
+		  this.rbacDetails = rbacDetails
+		})
+  
+		let result = {
+		  "State": this.rbacDetails?.state_name,
+		  "District": this.rbacDetails[this.rbacDetails["district"]],
+		  "Block": this.rbacDetails[this.rbacDetails["block"]],
+		  "Cluster": this.rbacDetails[this.rbacDetails["cluster"]],
+		  "School": this.rbacDetails[this.rbacDetails["school"]],
+		  "Grade": this.rbacDetails[this.rbacDetails["grade"]],
+		}
+		this.newData = result;
+		if (event instanceof NavigationStart) {
+		  const currentRoute = event.url;
+		  if (currentRoute === '/home' || currentRoute === '/rbac') {
+			this.hideDiv = true;
+		  } else {
+			this.hideDiv = false;
+		  }
+		}
+	  });
+	  
+	}
+  
+  
+	onMouseOver() {
+	  this.withinTime = true;
+	  this.dropdown = true;
+	}
+  
+	onMouseOut() {
+	  this.withinTime = false;
+	  setTimeout(() => {
+		if (!this.withinTime) {
+		  this.dropdown = false;
+		}
+	  }, 3000)
+	}
+  
+
+}
diff --git a/src/app/core/components/header-v3/header-v3.component.html b/src/app/core/components/header-v3/header-v3.component.html
new file mode 100644
index 00000000..a9d5ce39
--- /dev/null
+++ b/src/app/core/components/header-v3/header-v3.component.html
@@ -0,0 +1,38 @@
+<div class="menu-header">
+	<div class="container mob-container">
+	   <nav class="navbar navbar-expand-lg navbar-light">
+		  <div class="container-fluid">
+			 <a class="navbar-brand" routerLink="/home">
+			   <img src="assets/images/Ministry_of_Education_India.png" alt="logo">
+			 </a>
+			 <span class="nat-text nat-text-tab">NDEAR VIDYA SAMIKSHA KENDRA</span>
+			 <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+			 <span class="navbar-toggler-icon"></span>
+			 </button>
+			 <div class="collapse navbar-collapse" id="navbarNav">
+				<ul class="navbar-nav">
+				   <li class="nav-item">
+					  <a class="nav-link" routerLink="/home" routerLinkActive="active">Home</a>
+				   </li>
+				   <li class="nav-item">
+					  <a class="nav-link"  routerLink="/about-us" routerLinkActive="active">About</a>
+				   </li>
+				   <li class="nav-item dropdown dashboard-dropdown">
+					  <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+					     Dashboard
+					  </a>
+					  <ul class="dropdown-menu">
+						 <li><a class="dropdown-item" routerLink="/summary-statistics">National Data Sets</a></li>
+						 <li><a class="dropdown-item" href="http://dashboard.national-vsk.org/#/" target="_blank">Integrated State Data Sets</a></li>
+					  </ul>
+				   </li>
+				   <li class="nav-item">
+					  <a class="nav-link" routerLink="/contact-us" routerLinkActive="active">Contact</a>
+				   </li>
+				</ul>
+			 </div>
+			 <span class="nat-text nat-text-lg">NDEAR VIDYA SAMIKSHA KENDRA</span>
+		  </div>
+	   </nav>
+	</div>
+ </div>
\ No newline at end of file
diff --git a/src/app/core/components/header-v3/header-v3.component.scss b/src/app/core/components/header-v3/header-v3.component.scss
new file mode 100644
index 00000000..094918bf
--- /dev/null
+++ b/src/app/core/components/header-v3/header-v3.component.scss
@@ -0,0 +1,138 @@
+.menu-header {
+	padding-top: 45px;
+	position: relative;
+	box-shadow: 0px 4px 16px 0px rgba(0, 0, 0, 0.1);
+}
+
+.nat-text-tab {
+    display: none;
+}
+
+.nat-text {
+    font-size: 24px;
+    font-weight: 500;
+    color: #434141;
+    font-family: 'Outfit';
+}
+.menu-header .navbar-nav {
+    justify-content: center;
+    width: 100%;
+}
+
+.dropdown:hover > .dropdown-menu {
+    display: block;
+    margin-top: 0.125em;
+    margin-left: 0.125em;
+    top: 34px;
+}
+.dashboard-dropdown .dropdown-item:hover {
+    background-color: #4C30F5;
+    color: #fff !important;
+}
+.container-fluid {
+     overflow-y: visible !important; 
+}
+
+@media (min-width: 992px){
+	.navbar-expand-lg .navbar-toggler {
+		display: none;
+	}
+	.navbar-expand-lg .navbar-collapse {
+		display: flex !important;
+		flex-basis: auto;
+	}
+	.collapse {
+		visibility: visible;
+	}
+	.dropdown {
+		bottom: 0;
+	}
+	.menu-header .navbar-nav {
+		justify-content: center;
+		width: 100%;
+	}
+	.menu-header .navbar-nav li a.active, .menu-header .navbar-nav .show>.nav-link {
+		color: #4C30F5;
+	}
+	.menu-header .navbar-nav li a {
+		font-size: 15px;
+		color: #434141;
+		padding-right: 20px !important;
+		padding-left: 20px !important;
+	}
+	.dashboard-dropdown .dropdown-toggle::after {
+		height: 100%;
+		border: 0;
+		background: url(../../../../assets/images/dropdown-arrow1.svg) no-repeat;
+		width: 20%;
+		position: absolute;
+	}
+	
+}
+
+@media (max-width: 991px){
+	.nat-text-tab {
+		display: block;
+	}
+	.nat-text-lg {
+		display: none;
+	}
+	.nat-text {
+		font-size: 16px;
+	}
+	.collapse {
+		visibility: visible;
+	}
+	.menu-header .navbar-nav li a.active, .menu-header .navbar-nav .show>.nav-link {
+		color: #4C30F5;
+	}
+	.menu-header .navbar-nav li a {
+		font-size: 15px;
+		color: #434141;
+		padding-right: 20px !important;
+		padding-left: 20px !important;
+	}
+	.dashboard-dropdown .dropdown-toggle::after {
+		height: 100%;
+		border: 0;
+		background: url(../../../../assets/images/dropdown-arrow1.svg) no-repeat;
+		width: 20%;
+		position: absolute;
+	}
+	.dropdown {
+		bottom:0;
+	}
+}
+
+
+@media (max-width:768px) {
+	.navbar{
+		padding: 0.5rem 0rem;
+	}
+	.container.mob-container {
+		padding: 0;
+	}
+	.menu-header {
+		padding-top: 0px;
+	}
+	
+}
+
+@media (max-width: 576px){
+	.nat-text {
+		font-size: 11px;
+	}
+	a.navbar-brand{
+		margin-right: 0rem;
+	}
+	a.navbar-brand img {
+		max-width: 70%;
+	}
+}
+
+@media (max-width: 420px){
+	.nat-text-tab {
+		display: none;
+	}
+}
+
diff --git a/src/app/core/components/header-v3/header-v3.component.spec.ts b/src/app/core/components/header-v3/header-v3.component.spec.ts
new file mode 100644
index 00000000..a69753a9
--- /dev/null
+++ b/src/app/core/components/header-v3/header-v3.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HeaderV3Component } from './header-v3.component';
+
+describe('HeaderV3Component', () => {
+  let component: HeaderV3Component;
+  let fixture: ComponentFixture<HeaderV3Component>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ HeaderV3Component ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(HeaderV3Component);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/core/components/header-v3/header-v3.component.ts b/src/app/core/components/header-v3/header-v3.component.ts
new file mode 100644
index 00000000..267a9e3a
--- /dev/null
+++ b/src/app/core/components/header-v3/header-v3.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-header-v3',
+  templateUrl: './header-v3.component.html',
+  styleUrls: ['./header-v3.component.scss']
+})
+export class HeaderV3Component implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
diff --git a/src/app/core/components/header/header.component.html b/src/app/core/components/header/header.component.html
index ef471060..333141f1 100644
--- a/src/app/core/components/header/header.component.html
+++ b/src/app/core/components/header/header.component.html
@@ -1,4 +1,4 @@
-<div class="bg-white border-gray-200 py-1 dark:bg-gray-800  app-nav-bar">
+<div class="container">
     <!--<div class="flex justify-between items-center xs:px-2 md:container md:mx-auto h-full">
         <div class="flex items-center">
 
@@ -29,28 +29,26 @@ <h1 class="font-medium leading-tight lg:text-4xl md:text-2xl xs:text-sm sm:text-
 
     </div>-->
     <div class="flex header-wrapper">
-        <div class="headerSideWidth">
+        <div class="logo-wrapper">
             <div class="flex items-center bg-white justify-between">
-                <img src="assets/images/{{title.dashboard_header2_image1}}" class="h-8 sm:h-11 left-logo"
+                <img src="assets/images/Ministry_of_Education_India.png" class="h-8 sm:h-11 left-logo"
                     alt="MOI Logo" />
                 <img src="assets/images/{{title.dashboard_header2_image2}}" class="h-full logo" alt="NCERT Logo"
                     *ngIf="title.dashboard_header2_image2 && title.dashboard_header2_image2 !== ''">
 
-
                         <a href="https://www.education.gov.in/en" class="hidden" target="_blank">
                             <img src="assets/images/moi_logo.png" class="mr-3 h-6 sm:h-9" alt="MOI Logo" />
                         </a>
-
             </div>
         </div>
-        <div class="mainHeaderContent d-flex justify-between items-center h-full px-2">
-            <div class="justify-left items-center md:flex" *ngIf="NVSK">
-                <h1 class="font-medium leading-tight lg:text-4xl md:text-2xl xs:text-sm sm:text-1xl mt-0">NDEAR VIDYA
-                    SAMIKSHA KENDRA</h1>
+        <div class="rightContent">
+            <div class="" *ngIf="NVSK">
+                <h1 class="">NDEAR VIDYA SAMIKSHA KENDRA</h1>
             </div>
             <div class="justify-left items-center md:flex" *ngIf="!NVSK">
                 <h1 class="font-medium leading-tight lg:text-4xl md:text-2xl xs:text-sm sm:text-1xl mt-0">
-                    {{title.dashboard_header2_title ? title.dashboard_header2_title : stateName + ' - VIDYA SAMIKSHA KENDRA (VSK)'}}</h1>
+                    {{title.dashboard_header2_title ? title.dashboard_header2_title : stateName + ' - VIDYA SAMIKSHA KENDRA (VSK)'}}
+				</h1>
             </div>
             <div class="">
 
@@ -81,3 +79,4 @@ <h1 class="font-medium leading-tight lg:text-4xl md:text-2xl xs:text-sm sm:text-
         </ul>
     </div>-->
 </div>
+
diff --git a/src/app/core/components/header/header.component.scss b/src/app/core/components/header/header.component.scss
index a1268c5e..bc14bb26 100644
--- a/src/app/core/components/header/header.component.scss
+++ b/src/app/core/components/header/header.component.scss
@@ -1,3 +1,25 @@
+.container{
+	padding-top: 48px;
+}
+.header-wrapper{
+  padding: 10px 0;
+}
+.logo-wrapper {
+  width: 50%;
+}
+.rightContent{
+	display: flex;
+	width: 50%;
+    align-items: flex-end;
+    justify-content: end;
+    gap: 0.5rem;
+}
+.rightContent h1{
+	font-size: 24px;
+	font-weight: 500;
+	color: #010101;
+	line-height: 1.2;
+}
 @media(max-width:435px) {
     .leading-tight {
         padding: none;
@@ -30,8 +52,9 @@
 }
 
 .left-logo {
-    height: 70px;
-    width: auto;
+    height: auto;
+    width: 131px;
+	max-width: 100%;
 }
 
 .logo {
@@ -157,3 +180,12 @@ p {
 //         display: none;
 //     }
 // }
+
+@media (max-width: 768px){
+	.rightContent h1 {
+		font-size: 16px;
+	}
+	.container {
+		padding-top: 0px;
+	}
+}
diff --git a/src/app/core/components/layout/layout.component.html b/src/app/core/components/layout/layout.component.html
index 92231575..42413e3a 100644
--- a/src/app/core/components/layout/layout.component.html
+++ b/src/app/core/components/layout/layout.component.html
@@ -1,11 +1,12 @@
+<ng-container *ngIf="isDashboard">
 <div>
     <div class="fontBar">
+			<div class="container">
         <div class="flagArea"><img title=""
                 src="assets/images/{{title?.dashboard_header1_image}}" width="32"
                 [alt]="title?.dashboard_header1_title">
             <span data-translate="govofIndia">{{ title?.dashboard_header1_title }}</span>
         </div>
-
         <div class="btnGroup">
             <i *ngIf="showBackBtn" class="fa fa-home" aria-hidden="true" routerLink="/home" id="homeButton"></i>
             <button type="button" [attr.aria-pressed]="false" tabindex="0" attr.aria-label="A-"
@@ -20,8 +21,8 @@
             <i *ngIf="role==='report_viewer'" class="fa fa-key" aria-hidden="true"
                 [routerLink]="['change-password']" matTooltip="Change Password"></i>
             
-            <i *ngIf="!NVSK" class="fa fa-sign-out" aria-hidden="true" matTooltip="Logout" (click)="signOut()" id="signOut"
-                name="signOut"></i>
+					<!-- <i *ngIf="!NVSK" class="fa fa-sign-out" aria-hidden="true" matTooltip="Logout" (click)="signOut()" id="signOut"
+						name="signOut"></i> -->
             <!-- <button id="dark-mode-toggle" class="dark-mode-toggle" tabindex="0"
              title="{{resourceService?.frmelmnts?.lbl?.accessibilitytheme}}" (click)="changeTheme()"
              (keydown.enter)="changeTheme();" #darkModeToggle>
@@ -33,12 +34,147 @@
            </button> -->
         </div>
     </div>
+		</div>
+		<div class="bg-white">
     <app-header></app-header>
-    <app-side-nav [isHome]="isHome" [menu]="menu" [isSummary]="isSummary"></app-side-nav>
+		</div>
+		<div >
+			<div  #contentElement>
+				<router-outlet (activate)="activate($event)"></router-outlet>
+			</div>
+			<app-footer></app-footer>
+		</div>
+	</div>
+</ng-container>
+
+<ng-container *ngIf="!isDashboard && !isLandingPages">
+	<div>
+		<div class="fontBar">
+			<div class="custom-container">
+		  <div class="flagArea">
+			<img
+			  title=""
+			  src="assets/images/{{ title?.dashboard_header1_image }}"
+			  width="32"
+			  [alt]="title?.dashboard_header1_title"
+			/>
+			<span data-translate="govofIndia">{{
+			  title?.dashboard_header1_title
+			}}</span>
+		  </div>
+		  <div class="btnGroup">
+			<i
+			  *ngIf="showBackBtn"
+			  class="fa fa-home"
+			  aria-hidden="true"
+			  routerLink="/home"
+			  id="homeButton"
+			></i>
+			<button
+			  type="button"
+			  [attr.aria-pressed]="false"
+			  tabindex="0"
+			  attr.aria-label="A-"
+			  class="fontResizeBtn fontResizeBtn_A-"
+			  title="Decrease font size"
+			  (click)="changeFontSize('decrease')"
+			  id="font-size-decrease"
+			  name="font-size-decrease"
+			  #decreaseFontSize
+			>
+			  A-
+			</button>
+			<button
+			  [attr.aria-pressed]="false"
+			  type="button"
+			  tabindex="0"
+			  attr.aria-label="A"
+			  class="fontResizeBtn fontResizeBtn_A"
+			  title="Default Font size"
+			  (click)="changeFontSize('reset')"
+			  id="font-size-reset"
+			  name="font-size-reset"
+			  #resetFontSize
+			>
+			  A
+			</button>
+			<button
+			  [attr.aria-pressed]="false"
+			  type="button"
+			  tabindex="0"
+			  attr.aria-label="A+"
+			  class="fontResizeBtn fontResizeBtn_A+"
+			  title="Increase font size"
+			  (click)="changeFontSize('increase')"
+			  id="font-size-increase"
+			  name="font-size-increase"
+			  #increaseFontSize
+			>
+			  A+
+			</button>
+			<i
+			  *ngIf="role === 'report_viewer'"
+			  class="fa fa-key"
+			  aria-hidden="true"
+			  [routerLink]="['change-password']"
+			  matTooltip="Change Password"
+			></i>
+	   
+			<!-- <i
+			  *ngIf="!NVSK"
+			  class="fa fa-sign-out"
+			  aria-hidden="true"
+			  matTooltip="Logout"
+			  (click)="signOut()"
+			  id="signOut"
+			  name="signOut"
+			></i> -->
+			<!-- <button id="dark-mode-toggle" class="dark-mode-toggle" tabindex="0"
+				   title="{{resourceService?.frmelmnts?.lbl?.accessibilitytheme}}" (click)="changeTheme()"
+				   (keydown.enter)="changeTheme();" #darkModeToggle>
+				   <svg width="20" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 496">
+					 <path fill="var(--white)"
+					   d="M8,256C8,393,119,504,256,504S504,393,504,256,393,8,256,8,8,119,8,256ZM256,440V72a184,184,0,0,1,0,368Z"
+					   transform="translate(-8 -8)" />
+				   </svg>
+				 </button> -->
+		  </div>
+			</div>  
+		</div>
+		<app-header-v2></app-header-v2>
+		<app-side-nav
+		  [isHome]="isHome"
+		  [menu]="menu"
+		  [isSummary]="isSummary"
+		></app-side-nav>
     <div class="app-content-wrapper">
         <div class="app-content" #contentElement>
             <router-outlet (activate)="activate($event)"></router-outlet>
         </div>
-        <app-footer></app-footer>
+		  <!-- <app-footer></app-footer> -->
+		</div>
     </div>
-</div>
\ No newline at end of file
+</ng-container>
+
+<ng-container *ngIf="isLandingPages">
+	<div>
+		<div class="fontBar">
+			<div class="container">
+				<div class="flagArea landing-pages"><img title=""
+						src="assets/images/{{title?.dashboard_header1_image}}" width="32"
+						[alt]="title?.dashboard_header1_title">
+					<span data-translate="govofIndia">{{ title?.dashboard_header1_title }}</span>
+				</div>
+			</div>
+		</div>
+		<div class="bg-white">
+			<app-header-v3></app-header-v3>
+		</div>
+		<div >
+			<div  #contentElement>
+				<router-outlet (activate)="activate($event)"></router-outlet>
+			</div>
+			<app-footer></app-footer>
+		</div>
+	</div>
+</ng-container>
diff --git a/src/app/core/components/layout/layout.component.scss b/src/app/core/components/layout/layout.component.scss
index 3e97f578..5748d728 100644
--- a/src/app/core/components/layout/layout.component.scss
+++ b/src/app/core/components/layout/layout.component.scss
@@ -1,6 +1,6 @@
 .fontBar {
     min-height: 3rem;
-   background: var(--cQ-primary);
+   background: #20242A;
    z-index: 999;
    display: flex;
    align-items: center;
@@ -13,17 +13,25 @@
    width: 100%;
    .flagArea {
     display: flex;
-    align-items: center;
-    justify-content: center;
+    align-items: flex-start;
+	width: 50%;
+	padding-top: 5px;
+    justify-content: start;
     img {
         margin-right: 0.5rem;
     }
+	
+   }
+
+   .container {
+	display: flex;
    }
 
    .btnGroup {
     display: flex;
-    align-items: center;
-    justify-content: center; 
+	width: 50%;
+    align-items: flex-end;
+    justify-content: end; 
     gap:0.5rem;
    
     button, .fa-sign-out, .fa-home, .fa-key{
@@ -51,6 +59,11 @@
 
 }
 
+.flagArea.landing-pages{
+	width: 95% !important;
+	margin: 0 auto;
+}
+
 ::ng-deep{
     .mat-tab-nav-bar, .mat-tab-header{
         border-bottom: none !important;
@@ -91,20 +104,35 @@
 }
 ::ng-deep{
     .legend{
-        background-color: rgb(238, 235, 235);
-        border: solid 1px black;
-        padding: 10px;
+        background-color: #FCFBFF;
+        border: solid 1px #C9C0FF;
+        border-radius: 4px;
+		max-width: 340px;
+		padding-bottom: 8px;
+		strong{
+			width: 100%;
+			background-color: #4C30F5;
+			color: #FFFFFF;
+			font-weight: 500;
+			font-size: 16px;
+			line-height: 1.5;
+			letter-spacing: 0.1px;
+			font-family: "Lato", sans-serif;
+			padding: 7px 15px;
+            border-radius: 4px 4px 0 0;
+			display: block;
+			margin-bottom: 8px 
+		}
     }
     .sb-cQ-card{
         z-index: 100;
     }
 }
-@media(min-width: 916px) and (max-width:1380px){
-    ::ng-deep{
-        .legend{
-            //margin-right: 100px !important;
-        }
-    }
+
+.custom-container {
+    width: calc(100% - 14rem);
+    margin: 0 auto;
+    display: flex;
 }
 
 @media(min-width: 436px) and  (max-width:915px){
@@ -141,4 +169,87 @@
             font-size: 25px;
         }
     }
+}
+
+@media (max-width: 992px){
+	.custom-container {
+		width: 100%;
+		margin: 0 auto;
+		display: flex;
+		padding: 0 1rem;
+	}
+	.fontBar {
+		position: static;
+		padding: 0;
+	}
+	.custom-container{
+		display: block;
+		.flagArea{
+			align-items: center;
+			width: 100%;
+			justify-content: center;
+			span{
+				font-size: 14px;
+			}
+		}
+		.btnGroup {
+			align-items: center;
+			width: 100%;
+			justify-content: center;
+			padding: 5px 0;
+		}
+     }
+
+}
+
+@media (max-width: 768px){
+	.fontBar {
+		position: static;
+        .custom-container,
+		.container {
+			display: block;
+		}
+
+	 .flagArea{
+		align-items: center;
+		width: 100%;
+		justify-content: center;
+		span{
+			font-size: 14px;
+		}
+	}
+	.btnGroup {
+		align-items: center;
+		width: 100%;
+		justify-content: center;
+		padding: 5px 0;
+	}
+  }
+  .flagArea.landing-pages{
+	width: 100% !important;
+	margin: 0 auto;
+  }
+
+}
+.program-banner-wrapper{
+	margin-bottom: 25px;
+	img{
+	  width: 100%;
+	  border-radius: 5px;
+	}
+}
+
+@media (max-width: 479px){
+	
+.fontBar {
+	.custom-container {
+		width: calc(100% - 4rem);
+	}
+
+    .flagArea{
+		span{
+			font-size: 8px;
+		}
+	}
+}
 }
\ No newline at end of file
diff --git a/src/app/core/components/layout/layout.component.ts b/src/app/core/components/layout/layout.component.ts
index 7a2786e8..b1a78bd6 100644
--- a/src/app/core/components/layout/layout.component.ts
+++ b/src/app/core/components/layout/layout.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, ElementRef, Renderer2, ViewChild, ChangeDetectorRef } from '@angular/core';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import * as Title from '../../../../assets/config/ui_config.json'
 import { environment } from 'src/environments/environment';
 import { IDashboardMenu } from '../../models/IDashboardCard';
@@ -34,11 +34,22 @@ export class LayoutComponent implements OnInit {
   environment = environment;
   title: any;
   hierarchyLevel: any;
+  isDashboard: boolean = false;
+  isLandingPages: boolean = false;
   // @ViewChild('darkModeToggle') darkModeToggle: ElementRef;
   @ViewChild('contentElement', { static: true }) contentElementRef!: ElementRef;
   // @ViewChild('darkModeToggle') darkModeToggle: ElementRef;
-  constructor(private readonly _commonService: CommonService, private renderer: Renderer2, private _router: Router, private rbac: RbacService, private _authService: AuthenticationService,
-    private pdfDownloadService: PdfDownloadService, private cdr: ChangeDetectorRef) {
+  //tempPrashast: any = { "label": "PRASHAST", "path": "/prashast", "icon": "prashast.png", "isSelected": false }
+  constructor(
+	private readonly _commonService: CommonService, 
+	private renderer: Renderer2, 
+	private _router: Router, 
+	private rbac: RbacService, 
+	private _authService: AuthenticationService,
+    private pdfDownloadService: PdfDownloadService, 
+	private cdr: ChangeDetectorRef,
+	private route: ActivatedRoute
+	) {
 
     if (this._router.url === '/home' || this._router.url === '/rbac') {
       this.isHome = true;
@@ -46,7 +57,6 @@ export class LayoutComponent implements OnInit {
     else {
       this.isHome = false;
     }
-
     if (this._router.url !== '/home') {
       this.showBackBtn = true
     }
@@ -62,6 +72,11 @@ export class LayoutComponent implements OnInit {
       this.NVSK = false;
     }
     this.role = localStorage.getItem('role');
+	if(this._router.url === "/home"){
+		this.isLandingPages = true;
+	  }else{
+		this.isLandingPages = false;
+	  }
   }
 
 
@@ -102,22 +117,28 @@ export class LayoutComponent implements OnInit {
       menuToDisplay.icon = 'dashboard.png';
       menuToDisplay.isSelected = true;
       this.menu?.push(menuToDisplay);
-      console.log("cvbn:", { menuResult })
-      menuResult?.data?.forEach((dasboardMenu: IDashboardMenu | any) => {
-
-        if (hierarchyLevels[dasboardMenu.programID]?.includes(String(rbacRole))) {
 
+	  if(this._router.url === "/summary-statistics"){
+		this.isDashboard = true;
+	  }else{
+		this.isDashboard = false;
+	  }
+      menuResult?.data?.forEach((dasboardMenu: IDashboardMenu | any) => {
           let menuToDisplay: IMenuItem | any = {};
           menuToDisplay.label = dasboardMenu.programName;
           menuToDisplay.path = dasboardMenu.navigationUrl;
           menuToDisplay.icon = dasboardMenu.imageUrl;
           menuToDisplay.isSelected = false;
-
           this.menu?.push(menuToDisplay);
-        }
+        // if (hierarchyLevels[dasboardMenu.programID]?.includes(String(rbacRole))) {
+          
+        // }
 
       });
-
+      //Prashast static changes
+      //this.menu.push(this.tempPrashast);
+      //Prashast static changes
+      
       this.fetchMenu();
     })
 
@@ -221,11 +242,14 @@ export class LayoutComponent implements OnInit {
   activate(componentRef: any) {
     const copyOfContentElementRef = (this.contentElementRef);
     this.pdfDownloadService.contentElementRef = copyOfContentElementRef;
-    if (this._router.url === '/home' || this._router.url === '/rbac') {
+    if (this._router.url === '/home' || this._router.url === '/rbac'|| this._router.url === '/about-us' || this._router.url === '/contact-us') {
       this.isHome = true;
+		this.isLandingPages = true;
+		this.isDashboard = false;
     }
     else {
       this.isHome = false;
+	  this.isLandingPages = false;
       this.checkRbacLevel();
     }
     if (this._router.url !== '/home') {
diff --git a/src/app/core/components/side-nav/side-nav.component.ts b/src/app/core/components/side-nav/side-nav.component.ts
index 9713a1f7..9287e0c6 100644
--- a/src/app/core/components/side-nav/side-nav.component.ts
+++ b/src/app/core/components/side-nav/side-nav.component.ts
@@ -22,6 +22,9 @@ export class SideNavComponent implements OnInit, OnChanges {
    }
 
   ngOnInit(): void {
+    if (!this.isHome && document.body.classList.contains("sidebaractive")){
+      document.body.classList.remove("sidebaractive")
+   }
   }
   ngOnChanges(changes: SimpleChanges): void {
 
@@ -29,9 +32,9 @@ export class SideNavComponent implements OnInit, OnChanges {
       document.body.classList.remove("sidebaractive")
     }
     if (changes?.['isSummary']?.currentValue !== changes?.['isSummary']?.previousValue && !this.isHome && !this.isSummary){
-      let ckbox = document.getElementById('openSidebarMenu') as HTMLInputElement;
-      document.body.classList.add("sidebaractive");
-      ckbox.checked = true;
+    //   let ckbox = document.getElementById('openSidebarMenu') as HTMLInputElement;
+    //   document.body.classList.add("sidebaractive");
+    //   ckbox.checked = true;
     }
     if (this.isHome) {
       document.body.classList.add("sidebaractive");
@@ -56,7 +59,7 @@ export class SideNavComponent implements OnInit, OnChanges {
     });
     menuItemSelected.isSelected = true;
     // document.body.classList.add("sidebaractive");
-    this.toggleSideBar();
+    //this.toggleSideBar();
   }
 
   toggleSideBar(menuIconclicked?: string): void {
diff --git a/src/app/core/config/ChartjsConfig.ts b/src/app/core/config/ChartjsConfig.ts
index 50a4a45b..675427e2 100644
--- a/src/app/core/config/ChartjsConfig.ts
+++ b/src/app/core/config/ChartjsConfig.ts
@@ -58,7 +58,7 @@ export const ChartJSConfig = {
     },
     colors: [
         "#6C63F0",
-        "#ED589D",
+        "#808080",
         "#2171b5",
         "#ddd"
     ]
diff --git a/src/app/core/config/configMapping.ts b/src/app/core/config/configMapping.ts
index 833ec696..89ae3b50 100644
--- a/src/app/core/config/configMapping.ts
+++ b/src/app/core/config/configMapping.ts
@@ -15,7 +15,10 @@ import {config as quiz} from '../../views/ncert-quiz/config/quiz_config';
 import{config as microImprovement} from '../../views/micro-improvements/config/microimprovements_config';
 import {config as nipunBharatConfig } from '../../views/nipun-bharat/config/nipun_bharat_config';
 import {config as pmShriConfig } from '../../views/pm-shri/config/pm_shri_config';
-
+import{config as prashastConfig} from '../../views/prashast/config/prashast_config';
+import { config as udiseApexConfig } from '../../views/udise-apex/config/udise_apex_config';
+import { config as nasApexConfig } from '../../views/nas-apex/config/nas_apex_config';
+import { config as pgiApexConfig } from '../../views/pgi-apex/config/pgi_apex_config';
 export const configFiles = {
   studentAttendance: studentAttendaceConfig,
   reviewMeetings: reviewMeetingsConfig,
@@ -33,7 +36,11 @@ export const configFiles = {
   quiz:quiz,
   microImprovement:microImprovement,
   nipunBharat:nipunBharatConfig,
-  pmShri: pmShriConfig
+  pmShri: pmShriConfig,
+  prashast:prashastConfig,
+  udiseApex:udiseApexConfig,
+  nasApex:nasApexConfig,
+  pgiApex:pgiApexConfig
 };
 
 export const programFolderNames = {
@@ -50,7 +57,10 @@ export const programFolderNames = {
   ncf:'ncf',
   quiz:'quiz',
   microImprovement:'microImprovement',
-  pmShri: 'pm_shri'
+  pmShri: 'pm_shri',
+  nipunBharat: 'nipun-bharat',
+  prashast: 'prashast',
+  udiseApex: 'udise-apex',
 }
 
 export const stateProgramsFolderNames = {
@@ -67,5 +77,8 @@ export const stateProgramsFolderNames = {
   ncf:'',
   quiz:'',
   microImprovement:'',
-  pmShri: ''
+  pmShri: '',
+  nipunBharat: '',
+  prashast: '',
+  udiseApex: ''
 }
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 94e108a3..24fddb30 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -10,6 +10,8 @@ import { HeaderComponent } from './components/header/header.component';
 import { SideNavComponent } from './components/side-nav/side-nav.component';
 import { NgxSpinnerModule } from 'ngx-spinner';
 import { FooterComponent } from './components/footer/footer.component';
+import { HeaderV2Component } from './components/header-v2/header-v2.component';
+import { HeaderV3Component } from './components/header-v3/header-v3.component';
 
 export const OtherOptions: MatTooltipDefaultOptions = {
   showDelay: 0,
@@ -33,7 +35,9 @@ const DECLARATIONS = [
 @NgModule({
   declarations: [
     DECLARATIONS,
-    FooterComponent
+    FooterComponent,
+    HeaderV2Component,
+    HeaderV3Component
   ],
   imports: [
     CommonModule,
diff --git a/src/app/core/services/common/common.service.ts b/src/app/core/services/common/common.service.ts
index bba6af52..bbca31c3 100644
--- a/src/app/core/services/common/common.service.ts
+++ b/src/app/core/services/common/common.service.ts
@@ -37,5 +37,10 @@ export class CommonService {
     return this._http.get<ResponseType<any>>(`${environment.apiURL}/lastmodified?ProgramName=${ProgramFolderName}`);
   }
   
+  scrollInto(el:any){
+	setTimeout(()=>{
+		el.scrollIntoView({behavior:'smooth', block:'center', inline:'nearest'})
+	},5000)
+  }
 
 }
diff --git a/src/app/core/services/data.service.ts b/src/app/core/services/data.service.ts
index cf0108be..9d975515 100644
--- a/src/app/core/services/data.service.ts
+++ b/src/app/core/services/data.service.ts
@@ -217,12 +217,30 @@ export class DataService {
                   if (isMultibar) {
                     data.datasets.forEach((dataset: any, index: any) => {
                       if (index === tooltipItem.datasetIndex) {
-                        multistringText.push(`${dataset.label} : ${tooltipItem.value} ${valueSuffix !== undefined ? valueSuffix : ''}`)
+                        if(dataset.tooltipValue === undefined){
+                          multistringText.push(`${dataset.tooltipLabel} : ${tooltipItem.value} ${valueSuffix !== undefined ? valueSuffix : '\n'}`)
+                        }
+                        else{
+                          for (let i = 0; i < reportData.values.length; i++) {
+                            if(reportData.values[i].state_name === tooltipItem.yLabel){
+                              multistringText.push(`${dataset.tooltipLabel} : ${reportData.values[i].actual_certificates}`)
+                              break;
+                            }
+                          }
+                        }
+                        if(dataset.tooltipValue1 !== undefined){
+                          for (let i = 0; i < reportData.values.length; i++) {
+                            if(reportData.values[i].state_name === tooltipItem.yLabel){
+                              multistringText.push(`${dataset.tooltipLabel1} : ${reportData.values[i].expected_certificates}`)
+                              break;
+                            }
+                          }
+                        }
                       }
                     })
                   }
                   else {
-                    multistringText.push(`${data.datasets[0].label} : ${tooltipItem.value} ${valueSuffix !== undefined ? valueSuffix : ''}`)
+                    multistringText.push(`${data.datasets[0].tooltipLabel} : ${tooltipItem.value} ${valueSuffix !== undefined ? valueSuffix : '\n'}, ${data.datasets[0].tooltipLabel2} : ${tooltipItem.value}`)
                   }
                   return multistringText;
                 }
@@ -270,7 +288,11 @@ export class DataService {
         xAxis?.metrics.map((metric: any) => {
           return {
             dataExpr: metric.value,
-            label: metric.label
+            label: metric.label,
+            tooltipLabel:metric.tooltipLabel,
+            tooltipValue:metric.tooltipValue,
+            tooltipLabel1:metric.tooltipLabel1,
+            tooltipValue1:metric.tooltipValue1
           }
         }),
         type,
@@ -297,7 +319,7 @@ export class DataService {
           metricFilter = filters.filter((filter: any) => {
             return filter.filterType === 'metric'
           })[0]
-          rows = this.mapGroupBy(rows, groupByColumn, metricLabelProp, metricValueProp, tooltipMetrics, metricFilter.value)
+          rows = this.mapGroupBy(rows, groupByColumn, metricLabelProp, metricValueProp, tooltipMetrics, metricFilter?.value)
         }
 
         reportData = {
diff --git a/src/app/core/services/wrapper.service.ts b/src/app/core/services/wrapper.service.ts
index 33e00d27..9b6b1681 100644
--- a/src/app/core/services/wrapper.service.ts
+++ b/src/app/core/services/wrapper.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { parseQueryParam } from 'src/app/utilities/QueryBuilder';
+import { parseQueryParam, parseFilterToQuery} from 'src/app/utilities/QueryBuilder';
 import { CommonService } from './common/common.service';
 import { NgxSpinnerService } from 'ngx-spinner';
 
@@ -47,7 +47,54 @@ export class WrapperService {
     return filters;
   }
 
-  async constructCommonFilters(filterConfig: any, tabLabel?: any, updatedFilter?: any, changedInd?: any) {
+  async updateDependantFilters(filters: any, updatedIndex: any){
+    this.spinner.show();
+    let query
+    let filterParams: any = []
+    for (let index = 0; index < filters.length; index++) {
+        let filter = filters[index]
+        if (index > updatedIndex && filterParams.length > 0) {
+            let whereIndex = filter.query.toLowerCase().indexOf('where');
+            let orderByIndex = filter.query.toLowerCase().indexOf('order by');
+            if(whereIndex !== -1){
+                if(orderByIndex !== -1)
+                    query = filter.query.substring(0, whereIndex).trim() + " " + filter.query.substring(orderByIndex).trim();
+                else
+                    query = filter.query.substring(0, whereIndex).trim();
+            }
+            else
+                query = filter.query.trim();
+
+            filter.query = query
+
+            filterParams.forEach((filterParam: any) => {
+                filter.query = parseFilterToQuery(filter.query, filterParam)
+            });
+
+            let res = await this.runQuery(filter.query);
+            if (res) {
+              let rows = res;
+              filter.options = rows.map((row) => {
+                return {
+                  value: row?.[filter.valueProp],
+                  label: row?.[filter.labelProp]
+                }
+              })
+              if(filter.selectDefaultValue != false){
+                filter.value = filter.options?.[0]?.value
+              }
+              else{
+                filter.value = null
+              }
+            }
+      }
+      filterParams.push(filter)
+    }
+    this.spinner.hide()
+    return filters
+  }
+
+  async constructCommonFilters(filterConfig: any, tabLabel?: any, updatedFilter?: any, changedInd?: any, defaultFilterApplied?:boolean) {
     this.spinner.show();
     let filters: any = []
     if (tabLabel) {
@@ -91,7 +138,9 @@ export class WrapperService {
             })
           }
         }
-        filter.value = (changedInd === index && filterConfig[index]?.dependentFilter) ? updatedFilter[index].value : filter.options?.[0]?.value
+        if(defaultFilterApplied != true){
+            filter.value = (changedInd === index && filterConfig[index]?.dependentFilter) ? updatedFilter[index].value : filter.options?.[0]?.value
+        }
         filters.push(filter)
       }
       else {
diff --git a/src/app/shared/components/big-number/big-number.component.scss b/src/app/shared/components/big-number/big-number.component.scss
index cb3f4789..d7671256 100644
--- a/src/app/shared/components/big-number/big-number.component.scss
+++ b/src/app/shared/components/big-number/big-number.component.scss
@@ -51,21 +51,19 @@
 }
 
 .average-percentage {
-    // font-family: 'Poppins', sans-serif;
-    // font-style: normal;
+	font-family: "Lato", sans-serif;
     font-style: normal;
-    font-weight: 400;
-    font-size: 30.0896px;
-    line-height: 87px;
+    font-weight: 700;
+    font-size: 24px;
+    line-height: 32px;
     color: var(--cQ-secondary) !important;
     text-align: justify;
-    height: 85px;
+    height: 32px;
 }
 
 .report-name {
-//     font-family: 'Poppins', sans-serif;
-//     font-style: normal;
-//     font-weight: 500;
-//     font-size: 20px;
-//     line-height: 30px;
+    font-family: "Lato", sans-serif;
+    font-weight: 500;
+    font-size: 14px;
+    line-height: 19px;
 }
\ No newline at end of file
diff --git a/src/app/shared/components/big-number/big-number.component.ts b/src/app/shared/components/big-number/big-number.component.ts
index dd4e66d8..e415c632 100644
--- a/src/app/shared/components/big-number/big-number.component.ts
+++ b/src/app/shared/components/big-number/big-number.component.ts
@@ -44,7 +44,11 @@ export class BigNumberComponent implements OnInit, OnChanges {
   }
 
   formatNumber(input: any) {
-    return formatNumberForReport(Number(input), this.formatter);
+     if(isNaN(input)){
+      return input;
+      }else{
+        return formatNumberForReport(Number(input), this.formatter);
+      }
   }
 
 }
diff --git a/src/app/shared/components/buttons/download-button/download-button.component.html b/src/app/shared/components/buttons/download-button/download-button.component.html
index 3b40a08d..e24fcd19 100644
--- a/src/app/shared/components/buttons/download-button/download-button.component.html
+++ b/src/app/shared/components/buttons/download-button/download-button.component.html
@@ -12,8 +12,8 @@
 </div>
 
 <ng-template #templateName>
-    <button class="btn" (click)="onDownload()" id="downloadButton">
-        <span class="button-text">Unit level report</span>
+    <button class="btn" title="Unit level report" (click)="onDownload()" id="downloadButton">
+        <span class="button-text"><i class="fa-download fa"></i></span>
     </button>
 </ng-template>
 
diff --git a/src/app/shared/components/filter-panel/filter-panel.component.scss b/src/app/shared/components/filter-panel/filter-panel.component.scss
index ae29cf96..8e403dda 100644
--- a/src/app/shared/components/filter-panel/filter-panel.component.scss
+++ b/src/app/shared/components/filter-panel/filter-panel.component.scss
@@ -26,6 +26,7 @@
     }
     .ng-select{
         overflow: visible !important;
+		padding-bottom: 0 !important;
     }
 
     .ng-has-value .ng-arrow {
diff --git a/src/app/shared/components/filter-panel/filter-panel.component.ts b/src/app/shared/components/filter-panel/filter-panel.component.ts
index 5c364093..672e290f 100644
--- a/src/app/shared/components/filter-panel/filter-panel.component.ts
+++ b/src/app/shared/components/filter-panel/filter-panel.component.ts
@@ -40,7 +40,13 @@ export class FilterPanelComponent implements OnInit, OnChanges {
         this.filters[i].value = null;
       }
     }
-
+    for (let i = 0; i < this.filters.length; i++) {
+      if(i === ind)
+        this.filters[i].isUpdated = true;
+      else
+        this.filters[i].isUpdated = false;
+    }
+    
     this.filtersUpdated.emit(this.filters);
     this.filterIndexUpdated.emit(ind);
 
@@ -67,6 +73,6 @@ export class FilterPanelComponent implements OnInit, OnChanges {
       return label;
     }
     
-    return label.split('_').map(word => word[0]?.toUpperCase() + word?.substring(1).toLowerCase()).join(' ')
+    return label.split('_').map(word => word[0]?.toUpperCase() + word?.substring(1)).join(' ')
   }
 }
diff --git a/src/app/shared/components/maps/leaflet-map/leaflet-map.component.scss b/src/app/shared/components/maps/leaflet-map/leaflet-map.component.scss
index b6aeaa8a..88073ce6 100644
--- a/src/app/shared/components/maps/leaflet-map/leaflet-map.component.scss
+++ b/src/app/shared/components/maps/leaflet-map/leaflet-map.component.scss
@@ -13,9 +13,9 @@
 // }
 ::ng-deep {
     .leaflet-popup {
-        // word-break: break-all;
         word-wrap: break-word;
-    }
+        pointer-events: none !important;
+      }
 
     .leaflet-notification {
         background-color: white;
@@ -35,14 +35,25 @@
     }
 
     .legend-range {
-        margin-top: 10px;
         padding: 5px;
-        height: 4.5vh;
-        font-size: 0.75rem;
-        text-align: center;
-        border-radius: 10px;
-        font-weight: bold;
+        font-size: 12px;
+        font-weight: 500;
         width: 100%;
+		line-height:2;
+		letter-spacing: 0.1px;
+		font-family: "Lato", sans-serif;
+		text-align: left;
+		.button-content {
+			display: flex;
+			align-items: center;
+			span.marker {
+				width: 16px;
+				height: 16px;
+				border-radius: 50%;
+				display: inline-flex;
+				margin: 0 10px;
+			}
+		}
     }
 
     .leaflet-interactive:focus,
diff --git a/src/app/shared/components/maps/leaflet-map/leaflet-map.component.ts b/src/app/shared/components/maps/leaflet-map/leaflet-map.component.ts
index 03db084c..922c37ff 100644
--- a/src/app/shared/components/maps/leaflet-map/leaflet-map.component.ts
+++ b/src/app/shared/components/maps/leaflet-map/leaflet-map.component.ts
@@ -115,7 +115,7 @@ export class LeafletMapComponent implements OnInit, AfterViewInit, OnChanges {
       }
       else if (Number(lev) > 1 || this.hierarchyLevel > 1) {
         this.map?.removeLayer(this.layerGroup);
-        // await this.applyStateBorder();
+        await this.applyStateBorder();
         this.applyDistrictBorder();
         this.createMarkers(this.mapData);
       }
@@ -143,7 +143,7 @@ export class LeafletMapComponent implements OnInit, AfterViewInit, OnChanges {
     this.createMarkers(this.mapData);
   }
 
-  getLayerColor(e: any, legend?: boolean, values?: number[]) {
+  getLayerColor(e: any, legend?: boolean, values?: number[] ,program ?: string) {
     if (((this.config === 'NVSK' && this.hierarchyLevel === 0) && this.level === 'district' && !legend) || (this.hierarchyLevel > 1 || this.drillDownLevel > 1) && !legend) {
       return '#fff'
     }
@@ -152,11 +152,22 @@ export class LeafletMapComponent implements OnInit, AfterViewInit, OnChanges {
     }
     else {
       let value = e;
-      let colors = ["#007000", "#FFBF00", "#D2222D"];
+    //   let colors ; //Uncomment for circle on map
+    //   if(program !== undefined && program!== null && program === 'microimprovement'){
+    //     colors = ["#007000", "#4CBB17", "#0BDA51"];
+    //   }else{
+    //    colors = ["#007000", "#FFBF00", "#D2222D"];
+    //  }
+     //let colors = ["#1D4586", "#1156CC", "#6D9FEB"];
+    // let colors = ["#7E4EB0", "#586FC1", "#7CA3F4", "#82D4CA", "#3F9F67"]
+     //let colors = ["#3F9F67", "#82D4CA", "#7CA3F4", "#586FC1", "#7E4EB0"];
+     let colors = ["#5E6EFF", "#8571FB", "#7CA3F4", "#586FC1", "#AFCFFF"];
       let color = "#fff";
       value = Number(value);
       for (let i = 0; i < values.length - 1; i++) {
-        if (value <= values[i] && value >= values[i + 1]) {
+        if(value == 0){
+          color = colors[values.length - 1];
+        }else if (value <= values[i] && value > values[i + 1]) {
           color = colors[i];
         }
       }
@@ -192,7 +203,7 @@ export class LeafletMapComponent implements OnInit, AfterViewInit, OnChanges {
             max = max >= data.indicator ? max : data.indicator;
           });
 
-          let parts = 3;
+          let parts = 4;
           max = max > 0 ? max : parts;
           let range = max - min;
 
@@ -207,8 +218,9 @@ export class LeafletMapComponent implements OnInit, AfterViewInit, OnChanges {
           }
 
           values.push(0);
+          console.log("values:", values);
         } else if (reportTypeIndicator === 'percent') {
-          values = [100, 70, 40, 0];
+          values = [100, 75, 50, 25, 0];
         }
 
         function styleStates(feature: any) {
@@ -293,7 +305,7 @@ export class LeafletMapComponent implements OnInit, AfterViewInit, OnChanges {
         // });
 
         if (this.hierarchyLevel < 3 && !singleColor) {
-          this.createLegend(reportTypeIndicator, this.mapData.options, values);
+          this.createLegend(reportTypeIndicator, this.mapData, values);
         }
         resolve('India map borders plotted successfully');
       } catch (e) {
@@ -362,6 +374,7 @@ export class LeafletMapComponent implements OnInit, AfterViewInit, OnChanges {
     return new Promise(async (resolve, reject) => {
       try {
         const data = await this._mapService.getCountryGeoJSON();
+        console.log(data, 'data')
         const geoJSON = data.features.find(feature => {
           let state_code = feature.properties.state_code_2 || feature.properties.state_code;
           return state_code === this.rbacDetails.state;
@@ -376,13 +389,14 @@ export class LeafletMapComponent implements OnInit, AfterViewInit, OnChanges {
           //   dashArray: '0',
           //   fillOpacity: 1
           // },
-          color: "#6e6d6d",
+          data: data,
+          color: "#ffffff",
           weight: 2,
           fillOpacity: 0,
           fontWeight: "bold"
         });
         this.stateGeoJSON.addTo(this.map);
-        resolve('State borders are applied successfully!');
+        resolve({ message: 'State borders are applied successfully!', data: this.stateGeoJSON });
       } catch (e) {
         reject(e);
       }
@@ -404,7 +418,7 @@ export class LeafletMapComponent implements OnInit, AfterViewInit, OnChanges {
           //   dashArray: '0',
           //   fillOpacity: 1
           // },
-          color: "#6e6d6d",
+          color: "#ffffff",
           weight: 2,
           fillOpacity: 0,
           fontWeight: "bold"
@@ -431,7 +445,7 @@ export class LeafletMapComponent implements OnInit, AfterViewInit, OnChanges {
           //   dashArray: '0',
           //   fillOpacity: 1
           // },
-          color: "#6e6d6d",
+          color: "#ffffff",
           weight: 2,
           fillOpacity: 0,
           fontWeight: "bold"
@@ -454,7 +468,7 @@ export class LeafletMapComponent implements OnInit, AfterViewInit, OnChanges {
       //   dashArray: '0',
       //   fillOpacity: 1
       // },
-      color: "#6e6d6d",
+      color: "#ffffff",
       weight: 2,
       fillOpacity: 0,
       fontWeight: "bold"
@@ -484,184 +498,482 @@ export class LeafletMapComponent implements OnInit, AfterViewInit, OnChanges {
       });
     }
   }
+// new code for higlight marker according to geojosn 
+async createMarkers(mapData: any, prevValues?: any): Promise<void> {
+  let reportTypeIndicator = this.mapData?.options && this.mapData.options.reportIndicatorType ? this.mapData.options.reportIndicatorType : (typeof this.mapData.data[0].indicator === 'string') ? 'boolean' : 'value'
 
-  createMarkers(mapData: any, prevValues?: any): void {
-    let reportTypeIndicator = this.mapData?.options && this.mapData.options.reportIndicatorType ? this.mapData.options.reportIndicatorType : (typeof this.mapData.data[0].indicator === 'string') ? 'boolean' : 'value'
-    mapData.data = mapData.data.filter(data => data.indicator !== undefined && data.indicator !== null)
-    if (mapData) {
-      let min!: number, max!: number, values: any[] = [];
-      if (reportTypeIndicator === 'value' && !prevValues) {
-        mapData.data.forEach((data: any, index: number) => {
-          if (index === 0) {
-            min = data.indicator;
-            max = data.indicator;
-            return;
-          }
+  mapData.data = mapData.data.filter(data => data.indicator !== undefined && data.indicator !== null)
 
-          min = min <= data.indicator ? min : data.indicator;
-          max = max >= data.indicator ? max : data.indicator;
-        });
+  // console.log(mapData.data)
+  if (mapData) {
+    // 
+    const mapdataArry = mapData.data
+
+    const stateBorderResult = await this.applyStateBorder();
+
+    const stateBorder = stateBorderResult.data.options.data
+    // console.log(mapdataArry, 'mapdataArry');
+    // console.log(stateBorder.features, 'stateborder')
+    const newArray = [];
+    if (this.markers) {
+      this.markers.clearLayers();
+    }
+    this.markers = L.layerGroup().addTo(this.map);
 
-        let parts = 3;
-        max = max > 0 ? max : parts;
-        let range = max - min;
+    mapdataArry.forEach(obj1 => {
+      // console.log(obj1, 'obj1')
+      // Find the corresponding object in array2 based on state_id and state_code
+      // console.log(stateBorder.features.find(item => item.properties.state_code.toString() === obj1.state_id))
+      const obj2 = stateBorder.features.find(item => item.properties.state_code.toString() === obj1.state_id);
+      // console.log(obj2)
+      // If a matching object is found, replace latitude and longitude
+      if (obj2) {
+        const updatedObject = {
+          ...obj1,
+          coordinates: obj2.geometry,
 
-        if (range == 0) {
-          values.push(min)
+
+        };
+        // Add the updated object to the new array
+        newArray.push(updatedObject);
+      } else {
+        // If no matching object is found, add the original object to the new array
+        newArray.push(obj1);
+      }
+    });
+    // Now, array1 has updated latitude and longitude for matching state_id and state_code
+    // console.log(newArray,);
+    // 
+    let min!: number, max!: number, values: any[] = [];
+    // % boolen=an {yes,NO}
+    if (reportTypeIndicator === 'value' && !prevValues) {
+      mapData.data.forEach((data: any, index: number) => {
+        if (index === 0) {
+          min = data.indicator;
+          max = data.indicator;
+          return;
         }
-        else {
-          let partSize = (range / parts % 1 === 0) ? range / parts : Number((range / parts).toFixed(0));
-          for (let i = 0; i < parts; i++) {
-            if (i === 0) {
-              values.push(max);
-            }
-            else {
-              let value = Number((max - partSize * i).toFixed(0));
-              values.push(value);
-            }
-          }
 
-          values.push(0);
+        min = min <= data.indicator ? min : data.indicator;
+        max = max >= data.indicator ? max : data.indicator;
+      });
+      console.log("min:" + min);
+      console.log("max:" + max);
+      let parts = 4;
+      max = max > 0 ? max : parts;
+      let range = max - min;
+
+      if (range == 0) {
+        values.push(min)
+      }
+      else {
+        let partSize = (range / parts % 1 === 0) ? range / parts : Number((range / parts).toFixed(0));
+        //let partSize = (range / parts % 1 === 0) ? range / parts : Math.floor(range / parts);
+        for (let i = 0; i < parts; i++) {
+          if (i === 0) {
+            values.push(max);
+          }/*else if(i=== (parts-1)){
+            values.push(min);
+          }*/else {
+            let value = Number((max - partSize * i).toFixed(0));
+            values.push(value);
+          }
         }
-      } else if (reportTypeIndicator === 'percent') {
-        values = [100, 70, 40, 0];
+        values.push(0);
+        console.log("values1111:", values);
       }
-      else if (prevValues) {
-        values = prevValues
+    } else if (reportTypeIndicator === 'percent') {
+      values = [100, 75, 50, 25, 0];
+    }
+    else if (prevValues) {
+      values = prevValues
+    }
+    let level = this.drillDownLevel ? this.drillDownLevel : this.hierarchyLevel
+    var idProp;
+    var nameProp;
+    switch (Number(level)) {
+      case 0:
+        nameProp = 'state_name'
+        idProp = 'state_id'
+        break;
+      case 1:
+        nameProp = 'district_name'
+        idProp = 'district_id'
+        break;
+      case 2:
+        nameProp = 'block_name'
+        idProp = 'block_id'
+        break;
+      case 3:
+        nameProp = 'cluster_name'
+        idProp = 'cluster_id'
+        break;
+    }
+
+    newArray.forEach((data: any) => {
+      if(data.state_id != undefined && data.state_name!=null){
+      // Create a GeoJSON object for the state.
+      // console.log(data.coordinates.coordinates, data, 'data')
+      const stateGeoJSON = {
+        type: 'Feature',
+        geometry: {
+          type: data.coordinates.type,
+          coordinates: data.coordinates.coordinates
+        },
+        properties: {
+          state_id: data.state_id,
+          state_name: data.state_name,
+         }
+      };
+      
+      // Determine the color of the state.
+      let fillColor;
+      if (String(data.program_status).toLowerCase() === "yes. implemented in online mode") {
+        // fillColor = "#29c0c2";
+        fillColor='#5E6EFF'
+      } else if (String(data.program_status).toLowerCase() === "yes. implemented in only online mode") {
+        // fillColor = "#29c0c2";
+        fillColor='#5E6EFF'
+      }      else if (String(data.program_status).toLowerCase() === "yes. implemented in only face-to-face mode") {
+        // fillColor = "#705000";
+        fillColor='#8571FB'
+      } else if (String(data.program_status).toLowerCase() === "no. not applicable") {
+        // fillColor = "#fff400";
+        fillColor='#7CA3F4'
+      } else if (String(data.program_status).toLowerCase() === "no. not implemented") {
+        // fillColor = "#fff400";
+        fillColor='#586FC1'
+      } 
+      else if (String(data.program_status).toLowerCase() === "yes. implemented in both face-to-face and online modes") {
+        // fillColor = "#705000";
+        fillColor='#AFCFFF'
       }
-      let level = this.drillDownLevel ? this.drillDownLevel : this.hierarchyLevel
-      var idProp;
-      var nameProp;
-      switch (Number(level)) {
-        case 0:
-          nameProp = 'state_name'
-          idProp = 'state_id'
-          break;
-        case 1:
-          nameProp = 'district_name'
-          idProp = 'district_id'
-          break;
-        case 2:
-          nameProp = 'block_name'
-          idProp = 'block_id'
-          break;
-        case 3:
-          nameProp = 'cluster_name'
-          idProp = 'cluster_id'
-          break;
+      else {
+        fillColor = this.getZoneColor(reportTypeIndicator, data.indicator, values);
       }
-      mapData.data.forEach((data: any) => {
-        let re = new RegExp("_id$");
-        // let filterIds = {};
-        var id;
-
-
-        // Object.keys(data).forEach((prop: any) => {
-        //   // if(re.test(prop)){
-        //   //   idProp = prop;
-        //   //   return false;
-        //   // }
-        //   // return true;
-        //   // if (prop.match(re)) {
-        //   //   id = data[prop.match(re)?.input]
-        //   // filterIds = {
-        //   //   ...filterIds,
-        //   //   [prop.match(re).input]: data[prop.match(re)?.input]
-        //   // }
-        //   // }
-        //   id = data[idProp]
-        //   console.log(data[nameProp])
-        // })
-        let markerIcon = L.circleMarker([data.Latitude, data.Longitude], {
-          id: data[idProp],
-          name: data[nameProp],
-          hierarchyLevel: data.hierarchyLevel,
-          color: "gray",
-          // fillColor: this.getZoneColor(reportTypeIndicator, data.indicator >= 1 ? (max - min ? (data.indicator - min) / (max - min) * 100 : data.indicator) : -1),
-          fillColor: this.getZoneColor(reportTypeIndicator, data.indicator, values),
+      console.log(data.program_status);
+      console.log("Fillcolor:" + data.state_name + "::" + fillColor);
+      // Create a GeoJSON layer for the state and add it to the map.
+      L.geoJSON(stateGeoJSON, {
+        style: {
+          color: "white",
+          fillColor: fillColor,
           fillOpacity: 1,
-          strokeWeight: 0.01,
           weight: 1
-        }).addTo(this.map);
-
-        markerIcon._path.id = StateCodes[Number(data.state_code)];
-
-        markerIcon.setRadius(5);
+        },
+        onEachFeature: (feature, layer) => {
+          layer.on({
+            mouseover: (e) => {
+              var popup = e.target.getPopup();
+               popup.setLatLng(e.latlng).openOn(this.map);
+            },
+            mouseout: (e) => {
+              e.target.closePopup();
+            },
+            mousemove: (e) => {
+              var popup = e.target.getPopup();
+               popup.setLatLng(e.latlng).openOn(this.map);
+            },
+            click: async (e) => {
+              if (level < 4 && mapData?.options?.drillDownConfig?.enableDrillDown && mapData?.options?.drillDownConfig?.allowedLevels.includes(level)) {
+                this.applyDrillDown({ name: e.target.options.name, id: e.target.options.id, hierarchyLevel: this.drillDownLevel ? this.drillDownLevel + 1 : this.rbacDetails.role + 1 });
+              }
+            }
+          });
 
-        const popup = R.responsivePopup({
-          hasTip: false,
-          autoPan: true,
-          offset: [15, 20],
-        }).setContent(
-          data.tooltip
-        );
+          const popup = R.responsivePopup({
+            hasTip: false,
+            autoPan: true,
+            offset: [15, 20],
+          }).setContent(data.tooltip);
 
-        markerIcon.on("mouseover", (e: any) => {
-          e.target.openPopup();
-        });
+          layer.bindPopup(popup, { closeButton: false });
+        }
+      }).addTo(this.markers);
+    }
+    
+    });
 
-        markerIcon.on("mouseout", (e: any) => {
-          e.target.closePopup();
-        });
+    mapData.data.forEach((data: any) => {
+      if (data.district_id != undefined && data.district_name != null){
+      let re = new RegExp("_id$");
+      var id;
+      let fillColor = this.getZoneColor(reportTypeIndicator, data.indicator, values)
+      console.log("District fillColor:" + data.district_name + "::" + fillColor);
+      
+      let markerIcon = L.circleMarker([data.Latitude, data.Longitude], {
+        id: data[idProp],
+        name: data[nameProp],
+        hierarchyLevel: data.hierarchyLevel,
+        color: "white",
+        fillColor: fillColor,
+        fillOpacity: 1,
+        strokeWeight: 0.01,
+        weight: 1
+      }).addTo(this.map);
+
+      markerIcon._path.id = StateCodes[Number(data.state_code)];
+
+      markerIcon.setRadius(5);
+
+      const popup = R.responsivePopup({
+        hasTip: false,
+        autoPan: true,
+        offset: [15, 20],
+      }).setContent(
+        data.tooltip
+      );
+
+      markerIcon.on("mouseover", (e: any) => {
+        e.target.openPopup();
+      });
 
-        markerIcon.on("click", async (e: any) => {
-          // if (Number(lev) == 1) {
-          //   let stateGeoJSON = await this._mapService.getStateGeoJSON();
-
-          //   this.districtGeoJSON = stateGeoJSON.features.find(feature => {
-          //     return feature.properties['ID_2'] == e.target.options.id;
-          //   });
-          //   this.applyDrillDown({ id: e.target.options.id, hierarchyLevel: this.rbacDetails.role + 1, name: e.target.options.name })
-          // }
-          console.log(mapData?.options?.drillDownConfig?.allowedLevels.includes(level))
-          if (level < 4 && mapData?.options?.drillDownConfig?.enableDrillDown && mapData?.options?.drillDownConfig?.allowedLevels.includes(level)) {
-            console.log(mapData?.options?.drillDownConfig?.enableDrillDown)
-            this.applyDrillDown({ name: e.target.options.name, id: e.target.options.id, hierarchyLevel: this.drillDownLevel ? this.drillDownLevel + 1 : this.rbacDetails.role + 1 })
-          }
-        })
+      markerIcon.on("mouseout", (e: any) => {
+        e.target.closePopup();
+      });
 
-        markerIcon.addTo(this.map).bindPopup(popup, { closeButton: false });
+      markerIcon.on("click", async (e: any) => {
+         console.log(mapData?.options?.drillDownConfig?.allowedLevels.includes(level))
+        if (level < 4 && mapData?.options?.drillDownConfig?.enableDrillDown && mapData?.options?.drillDownConfig?.allowedLevels.includes(level)) {
+          console.log(mapData?.options?.drillDownConfig?.enableDrillDown)
+          this.applyDrillDown({ name: e.target.options.name, id: e.target.options.id, hierarchyLevel: this.drillDownLevel ? this.drillDownLevel + 1 : this.rbacDetails.role + 1 })
+        }
+      })
 
-        this.markers.addLayer(markerIcon);
-      });
+      markerIcon.addTo(this.map).bindPopup(popup, { closeButton: false });
 
-      this.map.addLayer(this.markers);
-      if (!prevValues) {
-        if (this.config === 'VSK' || level > 0) {
-          if(level === 1) {
-            this.fitToStateBorder();
-          }
-          else {
-            this.fitToMarkers()
-          }
-          
+      this.markers.addLayer(markerIcon);
+    }
+   });
+
+    this.map.addLayer(this.markers);
+       
+    if (!prevValues) {
+      if (this.config === 'VSK' || level > 0) {
+        if (level === 1) {
+          this.fitToStateBorder();
         }
-        else if (this.config === 'NVSK' && level === 0) {
-          this.fitBoundsToCountryBorder();
+        else {
+          this.fitToMarkers()
         }
-        this.createLegend(reportTypeIndicator, this.mapData.options, values);
-      }
-      else if (prevValues && mapData?.data?.length === 0) {
-        const NotificationControl = L.Control.extend({
-          onAdd: function (map) {
-            const container = L.DomUtil.create('div', 'leaflet-notification');
-            container.innerHTML = 'No Data for selected legends !';
-            return container;
-          },
 
-          onRemove: function (map) {
-          }
-        });
-        const notificationControl = new NotificationControl({ position: 'topright' });
-        notificationControl.addTo(this.map);
-        setTimeout(() => {
-          notificationControl.remove()
-        }, 2000);
       }
+      else if (this.config === 'NVSK' && level === 0) {
+        this.fitBoundsToCountryBorder();
+        this.applyStateBorder()
+      }
+      this.createLegend(reportTypeIndicator, this.mapData, values);
+    }
+    else if (prevValues && mapData?.data?.length === 0) {
+      const NotificationControl = L.Control.extend({
+        onAdd: function (map) {
+          const container = L.DomUtil.create('div', 'leaflet-notification');
+          container.innerHTML = 'No Data for selected legends !';
+          return container;
+        },
+
+        onRemove: function (map) {
+        }
+      });
+      const notificationControl = new NotificationControl({ position: 'topright' });
+      notificationControl.addTo(this.map);
+      setTimeout(() => {
+        notificationControl.remove()
+      }, 2000);
     }
   }
-
-  createLegend(reportTypeIndicator: string, mapOptions: any, values: any): void {
+} 
+  // old function circle marker 
+  //Uncomment for circle on map
+  // createMarkers(mapData: any, prevValues?: any): void {
+  //   let reportTypeIndicator = this.mapData?.options && this.mapData.options.reportIndicatorType ? this.mapData.options.reportIndicatorType : (typeof this.mapData.data[0].indicator === 'string') ? 'boolean' : 'value'
+  //   mapData.data = mapData.data.filter(data => data.indicator !== undefined && data.indicator !== null)
+  //   if (mapData) {
+  //     let min!: number, max!: number, values: any[] = [];
+  //     if (reportTypeIndicator === 'value' && !prevValues) {
+  //       mapData.data.forEach((data: any, index: number) => {
+  //         if (index === 0) {
+  //           min = data.indicator;
+  //           max = data.indicator;
+  //           return;
+  //         }
+
+  //         min = min <= data.indicator ? min : data.indicator;
+  //         max = max >= data.indicator ? max : data.indicator;
+  //       });
+
+  //       let parts = 3;
+  //       max = max > 0 ? max : parts;
+  //       let range = max - min;
+
+  //       if (range == 0) {
+  //         values.push(min)
+  //       }
+  //       else {
+  //         let partSize = (range / parts % 1 === 0) ? range / parts : Number((range / parts).toFixed(0));
+  //         for (let i = 0; i < parts; i++) {
+  //           if (i === 0) {
+  //             values.push(max);
+  //           }
+  //           else {
+  //             let value = Number((max - partSize * i).toFixed(0));
+  //             values.push(value);
+  //           }
+  //         }
+
+  //         values.push(0);
+  //       }
+  //     } else if (reportTypeIndicator === 'percent') {
+  //       values = [100, 70, 40, 0];
+  //     }
+  //     else if (prevValues) {
+  //       values = prevValues
+  //     }
+  //     let level = this.drillDownLevel ? this.drillDownLevel : this.hierarchyLevel
+  //     var idProp;
+  //     var nameProp;
+  //     switch (Number(level)) {
+  //       case 0:
+  //         nameProp = 'state_name'
+  //         idProp = 'state_id'
+  //         break;
+  //       case 1:
+  //         nameProp = 'district_name'
+  //         idProp = 'district_id'
+  //         break;
+  //       case 2:
+  //         nameProp = 'block_name'
+  //         idProp = 'block_id'
+  //         break;
+  //       case 3:
+  //         nameProp = 'cluster_name'
+  //         idProp = 'cluster_id'
+  //         break;
+  //     }
+  //     mapData.data.forEach((data: any) => {
+  //       let re = new RegExp("_id$");
+  //       // let filterIds = {};
+  //       var id;
+
+
+  //       // Object.keys(data).forEach((prop: any) => {
+  //       //   // if(re.test(prop)){
+  //       //   //   idProp = prop;
+  //       //   //   return false;
+  //       //   // }
+  //       //   // return true;
+  //       //   // if (prop.match(re)) {
+  //       //   //   id = data[prop.match(re)?.input]
+  //       //   // filterIds = {
+  //       //   //   ...filterIds,
+  //       //   //   [prop.match(re).input]: data[prop.match(re)?.input]
+  //       //   // }
+  //       //   // }
+  //       //   id = data[idProp]
+  //       //   console.log(data[nameProp])
+  //       // })
+  // 	let fillColor
+  // 	if(String(data.program_status).toLowerCase() === "yes. implemented in online mode"){
+  //         fillColor = "#29c0c2"
+  // 	} else if(String(data.program_status).toLowerCase() === "yes. implemented in only face-to-face mode"){
+  // 		fillColor = "#705000"
+  // 	} else if(String(data.program_status).toLowerCase() === "no. not applicable"){
+  // 		fillColor = "#fff400"
+  // 	} else{
+  //         fillColor = this.getZoneColor(reportTypeIndicator, data.indicator, values,data)
+  // 	}
+  //       let markerIcon = L.circleMarker([data.Latitude, data.Longitude], {
+  //         id: data[idProp],
+  //         name: data[nameProp],
+  //         hierarchyLevel: data.hierarchyLevel,
+  //         color: "gray",
+  //         // fillColor: this.getZoneColor(reportTypeIndicator, data.indicator >= 1 ? (max - min ? (data.indicator - min) / (max - min) * 100 : data.indicator) : -1),
+  //         fillColor: fillColor,
+  //         fillOpacity: 1,
+  //         strokeWeight: 0.01,
+  //         weight: 1
+  //       }).addTo(this.map);
+
+  //       markerIcon._path.id = StateCodes[Number(data.state_code)];
+
+  //       markerIcon.setRadius(5);
+
+  //       const popup = R.responsivePopup({
+  //         hasTip: false,
+  //         autoPan: true,
+  //         offset: [15, 20],
+  //       }).setContent(
+  //         data.tooltip
+  //       );
+
+  //       markerIcon.on("mouseover", (e: any) => {
+  //         e.target.openPopup();
+  //       });
+
+  //       markerIcon.on("mouseout", (e: any) => {
+  //         e.target.closePopup();
+  //       });
+
+  //       markerIcon.on("click", async (e: any) => {
+  //         // if (Number(lev) == 1) {
+  //         //   let stateGeoJSON = await this._mapService.getStateGeoJSON();
+
+  //         //   this.districtGeoJSON = stateGeoJSON.features.find(feature => {
+  //         //     return feature.properties['ID_2'] == e.target.options.id;
+  //         //   });
+  //         //   this.applyDrillDown({ id: e.target.options.id, hierarchyLevel: this.rbacDetails.role + 1, name: e.target.options.name })
+  //         // }
+  //         console.log(mapData?.options?.drillDownConfig?.allowedLevels.includes(level))
+  //         if (level < 4 && mapData?.options?.drillDownConfig?.enableDrillDown && mapData?.options?.drillDownConfig?.allowedLevels.includes(level)) {
+  //           console.log(mapData?.options?.drillDownConfig?.enableDrillDown)
+  //           this.applyDrillDown({ name: e.target.options.name, id: e.target.options.id, hierarchyLevel: this.drillDownLevel ? this.drillDownLevel + 1 : this.rbacDetails.role + 1 })
+  //         }
+  //       })
+
+  //       markerIcon.addTo(this.map).bindPopup(popup, { closeButton: false });
+
+  //       this.markers.addLayer(markerIcon);
+  //     });
+
+  //     this.map.addLayer(this.markers);
+  //     if (!prevValues) {
+  //       if (this.config === 'VSK' || level > 0) {
+  //         if(level === 1) {
+  //           this.fitToStateBorder();
+  //         }
+  //         else {
+  //           this.fitToMarkers()
+  //         }
+
+  //       }
+  //       else if (this.config === 'NVSK' && level === 0) {
+  //         this.fitBoundsToCountryBorder();
+  //       }
+  //       this.createLegend(reportTypeIndicator, this.mapData, values);
+  //     }
+  //     else if (prevValues && mapData?.data?.length === 0) {
+  //       const NotificationControl = L.Control.extend({
+  //         onAdd: function (map) {
+  //           const container = L.DomUtil.create('div', 'leaflet-notification');
+  //           container.innerHTML = 'No Data for selected legends !';
+  //           return container;
+  //         },
+
+  //         onRemove: function (map) {
+  //         }
+  //       });
+  //       const notificationControl = new NotificationControl({ position: 'topright' });
+  //       notificationControl.addTo(this.map);
+  //       setTimeout(() => {
+  //         notificationControl.remove()
+  //       }, 2000);
+  //     }
+  //   }
+  // }
+
+  //new changes create lenged 
+  createLegend(reportTypeIndicator: string, mapData: any, values: any): void {
+    let mapOptions = mapData.options;
     let legend = L.control({ position: 'topright' });
     let ref = this;
     let labels: any[] = [];
@@ -670,15 +982,38 @@ export class LeafletMapComponent implements OnInit, AfterViewInit, OnChanges {
       let div = L.DomUtil.create('div', 'info legend text-center');
       let clickable = false;
       if (mapOptions.legend && mapOptions.legend.title) {
-        labels.push(`<strong>${mapOptions.selectedMetric ? mapOptions.selectedMetric : mapOptions.legend.title}:</strong>`)
+        labels.push(`<strong>${mapOptions.selectedMetric ? mapOptions.legend.title + mapOptions.selectedMetric : mapOptions.legend.title}:</strong>`)
       }
 
       if (reportTypeIndicator === 'boolean') {
-        values = ["Yes", "No"];
+
+        // console.log('mapData.data[0].program', mapData.data[0].program_name)
+        // console.log('mapOptions.legend.title', mapOptions.legend)
+        // if (mapOptions.legend && mapOptions.legend.title && mapOptions.legend.title == 'Implemented Nishtha'){
+        //   if(mapData.data[0].program == 'NISHTHA Elementary'){
+        //     values = ["Implemented in online mode","Implemented in only face-to-face mode","Implemented in both face-to-face and online modes","Not implemented"];
+        //   }else if(mapData.data[0].program == 'NISHTHA Secondary' || mapData.data[0].program == 'NISHTHA FLN'){
+        //     values = ["Implemented in online mode","Implemented in only face-to-face mode","Not implemented"];
+        //   }else if(mapData.data[0].program == 'NISHTHA ECCE'){
+        //     values = ["Implemented in online mode","Not implemented"];
+        //   }else{}
+        // }
+        if (mapData.data[0].program_name == 'NISHTHA Elementary (Online)') {
+          mapData.data[0].program_name = 'NISHTHA Elementary';
+          values = ["Implemented in online mode", "Implemented in only face-to-face mode", "Implemented in both face-to-face and online modes", "Not implemented", "Not applicable"];
+        } else if (mapData.data[0].program_name == 'NISHTHA Secondary' || mapData.data[0].program_name == 'NISHTHA FLN') {
+          values = ["Implemented in online mode", "Implemented in only face-to-face mode", "Not implemented"];
+        } else if (mapData.data[0].program_name == 'NISHTHA ECCE') {
+          values = ["Implemented in online mode", "Not implemented"];
+        }
+        else {
+          values = ["Yes", "No"];
+        }
         for (let i = 0; i < values.length; i++) {
           // labels.push(`<i class="fa fa-square" style="color:${ref.getLayerColor(values[i])}"></i> ${values[i]}`);
-          labels.push(`<button class="legend-range" style="background-color: ${ref.getZoneColor(reportTypeIndicator, values[i], values)}; color: ${invert(ref.getZoneColor(reportTypeIndicator, values[i], values), true)}">
+          labels.push(`<button class="legend-range">
           <div class="button-content">
+		     <span class="marker" style="background-color: ${ref.getZoneColor(reportTypeIndicator, values[i], values)};"></span>
          <span class="value">${values[i]}</span>
         </div>
      </button>`);
@@ -686,19 +1021,22 @@ export class LeafletMapComponent implements OnInit, AfterViewInit, OnChanges {
       }
       else if (values.length <= 1 && reportTypeIndicator !== 'boolean') {
         // labels.push(`<i class="fa fa-square" style="color:${ref.getLayerColor(values[0] ? values[0] : -1, true)}"></i> ${formatNumberForReport(values[0])}`);
-        labels.push(`<button class="legend-range" style="background-color: ${ref.getLayerColor(values[0], true, values)}; color: ${invert(ref.getLayerColor(values[0], true, values), true)}">
+        labels.push(`<button class="legend-range">
           <div class="button-content">
+		  <span class="marker" style="background-color: ${ref.getLayerColor(values[0], true, values)};"></span>
           <span class="value">${values[0] ? values[0] : 0}${reportTypeIndicator === 'percent' ? '%' : ''}</span>
           </div>
-          </button><br>`)
+          </button>`)
       }
       else {
         ref.legendForm = {
           range1: true,
           range2: true,
-          range3: true
+          range3: true,
+          range4: true,
+          range5: true
         };
-        values = values && values.length > 0 && reportTypeIndicator !== 'percent' ? values : [100, 70, 40, 0];
+        values = values && values.length > 0 && reportTypeIndicator !== 'percent' ? values : [100, 75, 50, 25, 0];
         // div.innerHTML = labels[0] + '</br>';
         div.innerHTML = labels[0];
 
@@ -721,20 +1059,53 @@ export class LeafletMapComponent implements OnInit, AfterViewInit, OnChanges {
         //   clickable = true;
         // }
 
-        for (let i = 0; i < values.length - 1; i++) {
+        for (let i = 0; i <=values.length - 1; i++) {
           let span = L.DomUtil.create('span', 'clickable-range');
-          const lowerValue = values[i + 1];
+          const lowerValue = values[i + 1]?values[i + 1] : 0;
           const upperValue = values[i] ? values[i] : 0;
-          const formattedLowerValue = formatNumberForReport(lowerValue);
-          const formattedUpperValue = formatNumberForReport(upperValue);
-          span.innerHTML = `
-            <button class="legend-range" style="background-color: ${ref.getLayerColor(values[i], true, values)}; color: ${invert(ref.getLayerColor(values[i], true, values), true)}">
-                 <div class="button-content">
-                <input type="checkbox" id="checkbox-${i + 1}" class="legend-checkbox" checked />
-                <span class="value">${formattedLowerValue} &ndash; ${formattedUpperValue}${reportTypeIndicator === 'percent' ? '%' : ''}</span>
-               </div>
-            </button><br>`;
-
+          let formattedLowerValue = formatNumberForReport(lowerValue);
+          let formattedUpperValue = formatNumberForReport(upperValue);
+
+          if(i==0){
+            span.innerHTML = `
+              <button class="legend-range">
+                  <div class="button-content">
+				  <span class="marker" style="background-color: ${ref.getLayerColor(values[i], true, values)};"></span>
+                  <input type="checkbox" id="checkbox-${i + 1}" class="legend-checkbox" checked />
+                  <span class="value">${formattedLowerValue} &ndash; ${formattedUpperValue}${reportTypeIndicator === 'percent' ? '%' : ''}</span>
+                </div>
+              </button>`;
+          }else if(i==values.length - 1){
+            span.innerHTML = `
+              <button class="legend-range">
+                  <div class="button-content">
+				  <span class="marker" style="background-color: ${ref.getLayerColor(values[i], true, values)};"></span>
+                  <input type="checkbox" id="checkbox-${i + 1}" class="legend-checkbox" checked />
+                  <span class="value">${formattedUpperValue}${reportTypeIndicator === 'percent' ? '%' : ''}</span>
+                </div>
+              </button>`;
+          }else if(i==values.length - 2){
+            formattedUpperValue = formatNumberForReport(upperValue-1);
+            formattedLowerValue = formatNumberForReport(lowerValue+1);
+            span.innerHTML = `
+              <button class="legend-range">
+                  <div class="button-content">
+				  <span class="marker" style="background-color: ${ref.getLayerColor(values[i], true, values)};"></span>
+                  <input type="checkbox" id="checkbox-${i + 1}" class="legend-checkbox" checked />
+                  <span class="value">${formattedLowerValue} &ndash; ${formattedUpperValue}${reportTypeIndicator === 'percent' ? '%' : ''}</span>
+                </div>
+              </button>`;
+          }else{
+            formattedUpperValue = formatNumberForReport(upperValue-1);
+            span.innerHTML = `
+              <button class="legend-range" >
+                  <div class="button-content">
+				  <span class="marker" style="background-color: ${ref.getLayerColor(values[i], true, values)};"></span>
+                  <input type="checkbox" id="checkbox-${i + 1}" class="legend-checkbox" checked />
+                  <span class="value">${formattedLowerValue} &ndash; ${formattedUpperValue}${reportTypeIndicator === 'percent' ? '%' : ''}</span>
+                </div>
+              </button>`;
+          }
           L.DomEvent.addListener(span, 'click', () => {
             ref.applyRange(i + 1, Number(values[values.length - 1]), ref.getLayerColor(values[i], true, values), values)
           });
@@ -743,7 +1114,7 @@ export class LeafletMapComponent implements OnInit, AfterViewInit, OnChanges {
         }
       }
       if (!clickable) {
-        div.innerHTML = labels.join('<br>');
+        div.innerHTML = labels.join('');
       }
       return div;
     };
@@ -752,38 +1123,219 @@ export class LeafletMapComponent implements OnInit, AfterViewInit, OnChanges {
     this.legend = legend;
   }
 
-  getZoneColor(reportTypeIndicator: string, value: string | number, values?: number[]) {
-    if (reportTypeIndicator === 'boolean') {
-      if (String(value).toLowerCase() == "yes") {
-        return "#007000";
-      } else {
-        return "#D2222D";
-      }
+//   //Uncomment for circle on map
+// createLegend(reportTypeIndicator: string, mapData: any, values: any): void {
+//   let mapOptions = mapData.options;
+//   let legend = L.control({ position: 'topright' });
+//   let ref = this;
+//   let labels: any[] = [];
+//   let program ;
+//   legend.onAdd = function (map: any) {
+//     let div = L.DomUtil.create('div', 'info legend text-center');
+//     let clickable = false;
+//     if (mapOptions.legend && mapOptions.legend.title) {
+//       labels.push(`<strong>${mapOptions.selectedMetric ? mapOptions.legend.title + mapOptions.selectedMetric : mapOptions.legend.title}:</strong>`)
+//     }
+//     if (reportTypeIndicator === 'boolean') {
+
+//       // console.log('mapData.data[0].program', mapData.data[0].program_name)
+//       // console.log('mapOptions.legend.title', mapOptions.legend)
+//       // if (mapOptions.legend && mapOptions.legend.title && mapOptions.legend.title == 'Implemented Nishtha'){
+//       //   if(mapData.data[0].program == 'NISHTHA Elementary'){
+//       //     values = ["Implemented in online mode","Implemented in only face-to-face mode","Implemented in both face-to-face and online modes","Not implemented"];
+//       //   }else if(mapData.data[0].program == 'NISHTHA Secondary' || mapData.data[0].program == 'NISHTHA FLN'){
+//       //     values = ["Implemented in online mode","Implemented in only face-to-face mode","Not implemented"];
+//       //   }else if(mapData.data[0].program == 'NISHTHA ECCE'){
+//       //     values = ["Implemented in online mode","Not implemented"];
+//       //   }else{}
+//       // }
+//       if (mapData.data[0].program_name == 'NISHTHA Elementary (Online)') {
+//         mapData.data[0].program_name = 'NISHTHA Elementary';
+//         values = ["Implemented in online mode", "Implemented in only face-to-face mode", "Implemented in both face-to-face and online modes", "Not implemented", "Not applicable"];
+//       } else if (mapData.data[0].program_name == 'NISHTHA Secondary' || mapData.data[0].program_name == 'NISHTHA FLN') {
+//         values = ["Implemented in online mode", "Implemented in only face-to-face mode", "Not implemented"];
+//       } else if (mapData.data[0].program_name == 'NISHTHA ECCE') {
+//         values = ["Implemented in online mode", "Not implemented"];
+//       }
+//       else {
+//         values = ["Yes", "No"];
+//       }
+//       for (let i = 0; i < values.length; i++) {
+//         // labels.push(`<i class="fa fa-square" style="color:${ref.getLayerColor(values[i])}"></i> ${values[i]}`);
+//         labels.push(`<button class="legend-range" style="background-color: ${ref.getZoneColor(reportTypeIndicator, values[i], values ,mapData.data[0])}; color: ${invert(ref.getZoneColor(reportTypeIndicator, values[i], values), true)}">
+//         <div class="button-content">
+//        <span class="value">${values[i]}</span>
+//       </div>
+//    </button>`);
+//       }
+//     }
+//     else if (values.length <= 1 && reportTypeIndicator !== 'boolean') {
+//       if(String(mapData.data[0].category_name)!== undefined && String(mapData.data[0].category_name)!== null && String(mapData.data[0].category_name).includes("microimprovement")){
+//         program = "microimprovement";       
+//      }
+//       // labels.push(`<i class="fa fa-square" style="color:${ref.getLayerColor(values[0] ? values[0] : -1, true)}"></i> ${formatNumberForReport(values[0])}`);
+//       labels.push(`<button class="legend-range" style="background-color: ${ref.getLayerColor(values[0], true, values,program)}; color: ${invert(ref.getLayerColor(values[0], true, values,program), true)}">
+//         <div class="button-content">
+//         <span class="value">${values[0] ? values[0] : 0}${reportTypeIndicator === 'percent' ? '%' : ''}</span>
+//         </div>
+//         </button><br>`)
+//     }
+//     else {
+//       if(String(mapData.data[0].category_name)!== undefined && String(mapData.data[0].category_name)!== null && String(mapData.data[0].category_name).includes("microimprovement")){
+//         program = "microimprovement";       
+//      }
+//       ref.legendForm = {
+//         range1: true,
+//         range2: true,
+//         range3: true
+//       };
+//       values = values && values.length > 0 && reportTypeIndicator !== 'percent' ? values : [100, 70, 40, 0];
+//       // div.innerHTML = labels[0] + '</br>';
+//       div.innerHTML = labels[0];
+
+//       // Create the reset button element
+//       const resetButton = L.DomUtil.create('button', 'legend-range-reset pull-right');
+//       resetButton.innerHTML = '<i class="fa fa-refresh"></i>';
+//       L.DomEvent.addListener(resetButton, 'click', () => {
+//         ref.resetRange();
+//       });
+//       div.insertBefore(resetButton, div.previousSibling);
+
+//       // for (let i = 0; i < values.length - 1; i++) {
+//       //   let span = L.DomUtil.create('span', 'clickable-range');
+//       //   span.innerHTML = `<button class="legend-range" style="background-color: ${ref.getLayerColor(values[i], true, values)}; color: ${invert(ref.getLayerColor(values[i], true, values), true)}"><div class="button-content"><input type="checkbox" id="checkbox-${i + 1}" class="legend-checkbox" checked />${values[i + 1]} &dash; ${values[i] ? values[i] : 0}${reportTypeIndicator === 'percent' ? '%' : ''}</div></button><br>`;
+//       //   L.DomEvent.addListener(span, 'click', () => {
+//       //     // ref.applyRange(Number(values[i] ? values[i] : 0), Number(values[i + 1]), Number(values[values.length - 1]), ref.getLayerColor(values[i], true, values));
+//       //     ref.applyRange(i + 1, Number(values[values.length - 1]), ref.getLayerColor(values[i], true, values), Number(values[i] ? values[i] : 0), Number(values[i + 1]))
+//       //   });
+//       //   div.appendChild(span);
+//       //   clickable = true;
+//       // }
+
+//       for (let i = 0; i < values.length - 1; i++) {
+//         let span = L.DomUtil.create('span', 'clickable-range');
+//         const lowerValue = values[i + 1];
+//         const upperValue = values[i] ? values[i] : 0;
+//         const formattedLowerValue = formatNumberForReport(lowerValue);
+//         const formattedUpperValue = formatNumberForReport(upperValue);
+//         span.innerHTML = `
+//           <button class="legend-range" style="background-color: ${ref.getLayerColor(values[i], true, values,program)}; color: ${invert(ref.getLayerColor(values[i], true, values,program), true)}">
+//                <div class="button-content">
+//               <input type="checkbox" id="checkbox-${i + 1}" class="legend-checkbox" checked />
+//               <span class="value">${formattedLowerValue} &ndash; ${formattedUpperValue}${reportTypeIndicator === 'percent' ? '%' : ''}</span>
+//              </div>
+//           </button><br>`;
+
+//         L.DomEvent.addListener(span, 'click', () => {
+//           ref.applyRange(i + 1, Number(values[values.length - 1]), ref.getLayerColor(values[i], true, values), values)
+//         });
+//         div.appendChild(span);
+//         clickable = true;
+//       }
+//     }
+//     if (!clickable) {
+//       div.innerHTML = labels.join('<br>');
+//     }
+//     return div;
+//   };
+//   legend.addTo(this.map);
+//   this.legend?.remove();
+//   this.legend = legend;
+// }
+
+  
+
+ 
+ // new get zonecolor 
+ getZoneColor(reportTypeIndicator: string, value: string | number, values?: number[]) {
+  if (reportTypeIndicator === 'boolean') {
+    if (String(value).toLowerCase() == "yes") {
+      return "#7CA3F4"; // Blue
+    } else if (String(value).toLowerCase() == "implemented in online mode") {
+      return "#5E6EFF"; // Deep Sky Blue
+    } else if (String(value).toLowerCase() == "implemented in only online mode") {
+      return "#5E6EFF"; // Deep Sky Blue
+    }else if (String(value).toLowerCase() == "implemented in only face-to-face mode") {
+      return "#8571FB"; // Dodger Blue
+    } else if (String(value).toLowerCase() == "implemented in both face-to-face and online modes") {
+      return "#7CA3F4"; // Royal Blue
+    } else if (String(value).toLowerCase() == "not implemented") {
+      return "#586FC1"; // Dark Blue
+    } else if (String(value).toLowerCase() == "not applicable") {
+      return "#AFCFFF"; // Light Sky Blue
+    } else {
+      return "#586FC1"; // Dark Blue
     }
-    else if (values && values.length === 1) {
-      return "#007000"
-    }
-    else {
-      let colors = ["#007000", "#FFBF00", "#D2222D"];
-      let color = "#fff";
-      value = Number(value);
-      for (let i = 0; i < values.length - 1; i++) {
-        if (value <= values[i] && value >= values[i + 1]) {
-          color = colors[i];
-        }
+  }
+  else if (values && values.length === 1) {
+    return "#7CA3F4"; // Royal Blue
+  }
+  else {
+    //let colors = ["#1D4586", "#1156CC", "#6D9FEB"];
+    let colors = ["#5E6EFF", "#8571FB", "#7CA3F4", "#586FC1", "#AFCFFF"];
+    let color = "#fff";
+    value = Number(value);
+    for (let i = 0; i < values.length - 1; i++) {
+      if(value == 0){
+        color = colors[values.length - 1];
+      }else if (i==0 && value <= values[i] && value >= values[i + 1]) {
+        color = colors[i];
+      }else if(value < values[i] && value >= values[i + 1]) {
+        color = colors[i];
       }
-
-      return color;
     }
-  }
 
+    return color;
+  }
+}
+
+// //Uncomment for circle on map
+// getZoneColor(reportTypeIndicator: string, value: string | number, values?: number[] ,data ?: any) {
+//     if (reportTypeIndicator === 'boolean') {
+//     if (String(value).toLowerCase() == "yes") {
+//       return "#007000";
+//     } else if (String(value).toLowerCase() == "implemented in online mode") {
+//       return "#29c0c2";
+//     } else if (String(value).toLowerCase() == "implemented in only face-to-face mode") {
+//       return "#705000";
+//     } else if (String(value).toLowerCase() == "implemented in both face-to-face and online modes") {
+//       return "#007000";
+//     } else if (String(value).toLowerCase() == "not implemented") {
+//       return "#D2222D";
+//     } else if (String(value).toLowerCase() == "not applicable") {
+//       return "#fff400";
+//     } else {
+//       return "#D2222D";
+//     }
+//   }
+//   else if (values && values.length === 1) {
+//     return "#007000"
+//   }
+//   else {
+//     let colors;
+//     if(String(data.category_name)!== undefined && String(data.category_name)!== null && String(data.category_name).includes("microimprovement")){
+//      colors = ["#007000", "#4CBB17", "#0BDA51"];
+//     }else{
+//      colors = ["#007000", "#FFBF00", "#D2222D"];
+//     }
+//     let color = "#fff";
+//     value = Number(value);
+//     for (let i = 0; i < values.length - 1; i++) {
+//       if (value <= values[i] && value >= values[i + 1]) {
+//         color = colors[i];
+//       }
+//     }
+
+//     return color;
+//   }
+// }
   resetRange() {
     // this.applyCountryBorder(this.mapData)
     this.createMarkers(this.mapData)
   }
 
   applyRange(index: any, baseValue: any, rangeColour: any, values: any) {
-    let range1Data = [], range2Data = [], range3Data = []
+    let range1Data = [], range2Data = [], range3Data = [], range4Data = [], range5Data = []
     switch (index) {
       case 1:
         let checkbox1 = <HTMLInputElement>document.getElementById('checkbox-1');
@@ -800,6 +1352,16 @@ export class LeafletMapComponent implements OnInit, AfterViewInit, OnChanges {
         checkbox3.checked = !this.legendForm.range3
         this.legendForm.range3 = !this.legendForm.range3
         break;
+      case 4:
+          let checkbox4 = <HTMLInputElement>document.getElementById('checkbox-4');
+          checkbox4.checked = !this.legendForm.range4
+          this.legendForm.range4 = !this.legendForm.range4
+          break;
+      case 5:
+            let checkbox5 = <HTMLInputElement>document.getElementById('checkbox-5');
+            checkbox5.checked = !this.legendForm.range5
+            this.legendForm.range5 = !this.legendForm.range5
+            break;
     }
     if (this.legendForm.range1) {
       range1Data = this.mapData.data.filter((obj: any) => {
@@ -816,10 +1378,19 @@ export class LeafletMapComponent implements OnInit, AfterViewInit, OnChanges {
         return obj.indicator <= values[2] && (values[3] === baseValue ? obj.indicator >= values[3] : obj.indicator > values[3])
       });
     }
-
+    if (this.legendForm.range4) {
+      range4Data = this.mapData.data.filter((obj: any) => {
+        return obj.indicator <= values[3] && (values[4] === baseValue ? obj.indicator >= values[4] : obj.indicator > values[4])
+      });
+    }
+    if (this.legendForm.range5) {
+      range5Data = this.mapData.data.filter((obj: any) => {
+        return obj.indicator <= values[4] && (values[5] === baseValue ? obj.indicator >= values[5] : obj.indicator > values[5])
+      });
+    }
     let filteredData = {
       ...this.mapData,
-      data: [range1Data, range2Data, range3Data].flat()
+      data: [range1Data, range2Data, range3Data, range4Data, range5Data].flat()
     };
 
     this.markers.clearLayers();
diff --git a/src/app/shared/components/rbac-dialog/rbac-dialog.component.html b/src/app/shared/components/rbac-dialog/rbac-dialog.component.html
index 8b787e8f..e708bb7b 100644
--- a/src/app/shared/components/rbac-dialog/rbac-dialog.component.html
+++ b/src/app/shared/components/rbac-dialog/rbac-dialog.component.html
@@ -29,7 +29,7 @@
     <span> {{'Please select your ' + availableFilters}}</span>
 </div>
 
-<div class="grid grid-cols-6">
+<div class="custom-rbac-dialog grid grid-cols-6">
     <div class="xmd:col-start-2 xmd:col-end-6 md:col-start-3 md:col-end-5 col-start-1 col-end-7 wrapper">
         <form class="form theme-form" style="color:white" [formGroup]="rbacForm" (ngSubmit)="onSubmit()"
             enctype="multipart/form-data">
diff --git a/src/app/shared/components/rbac-dialog/rbac-dialog.component.scss b/src/app/shared/components/rbac-dialog/rbac-dialog.component.scss
index 46e03c04..5869f1c3 100644
--- a/src/app/shared/components/rbac-dialog/rbac-dialog.component.scss
+++ b/src/app/shared/components/rbac-dialog/rbac-dialog.component.scss
@@ -5,43 +5,45 @@
     border-radius: 10px;
 }
 
-::ng-deep {
-    ng-select {
-        padding-bottom: 0px !important;
-        border: none !important;
-        width: -webkit-fill-available;
-        background-color: #FFFFFF;
-        border-radius: 5px;
-        padding-left: 10px;
-        padding-right: 10px;
-    }
-
-    .ng-placeholder {
-        margin-bottom: 5px;
-        position: relative !important;
-        font-family: 'Mulish', sans-serif;
-        font-style: normal;
-        color: #333333 !important;
-    }
-    .ng-value-container{
-        padding: 0px !important;
-    }
-    .ng-select.ng-select-single .ng-select-container .ng-clear-wrapper {
-        align-self: auto !important;
-        bottom: 0px !important;
-    }
-    .ng-select.ng-select-single .ng-select-container .ng-arrow-wrapper{
-        align-self: auto !important;
-        bottom: 2px !important;
-    }
-    .ng-select .ng-has-value .ng-placeholder, .ng-select.ng-select-opened .ng-placeholder{
-    display: none !important;
-    }
-    .ng-dropdown-panel {
-        top: 100% !important;
-    }
-    .ng-dropdown-panel .ng-dropdown-panel-items .ng-option {
-        background-color: white !important;
+.custom-rbac-dialog {
+    ::ng-deep {
+        ng-select {
+            padding-bottom: 0px !important;
+            border: none !important;
+            width: -webkit-fill-available;
+            background-color: #FFFFFF;
+            border-radius: 5px;
+            padding-left: 10px;
+            padding-right: 10px;
+        }
+   
+        .ng-placeholder {
+            margin-bottom: 5px;
+            position: relative !important;
+            font-family: 'Mulish', sans-serif;
+            font-style: normal;
+            color: #333333 !important;
+        }
+        .ng-value-container{
+            padding: 0px !important;
+        }
+        .ng-select.ng-select-single .ng-select-container .ng-clear-wrapper {
+            align-self: auto !important;
+            bottom: 0px !important;
+        }
+        .ng-select.ng-select-single .ng-select-container .ng-arrow-wrapper{
+            align-self: auto !important;
+            bottom: 2px !important;
+        }
+        .ng-select .ng-has-value .ng-placeholder, .ng-select.ng-select-opened .ng-placeholder{
+        display: none !important;
+        }
+        .ng-dropdown-panel {
+            top: 100% !important;
+        }
+        .ng-dropdown-panel .ng-dropdown-panel-items .ng-option {
+            background-color: white !important;
+        }
     }
 }
 
@@ -140,13 +142,3 @@
     font-size: 40px;
     line-height: 60px
 }
-
-::ng-deep {
-    .ng-select.ng-select-focused .ng-select-container:after{
-        border-color: transparent;
-        border-width: 0px;
-    }
-        .ng-select .ng-select-container:after {
-        border-bottom : 0px solid rgba(0,0,0,0.42);
-    }
-}
\ No newline at end of file
diff --git a/src/app/utilities/NumberFomatter.ts b/src/app/utilities/NumberFomatter.ts
index c9695954..80f8b1e3 100644
--- a/src/app/utilities/NumberFomatter.ts
+++ b/src/app/utilities/NumberFomatter.ts
@@ -1,13 +1,17 @@
 import { environment } from "src/environments/environment";
+import { FormControl } from '@angular/forms';
 
-function formatNumber(number: number, formatter: any): string {
-
+function formatNumber(number: number, formatter: any): string {    
+    if(isNaN(number)){
+        return `${number}`;
+    }
     if (formatter.format === 'short') {
         if (formatter.locale === 'en-IN') {
             if (number < 1000) {
                 return `${number}`;
             } else if (number > 999 && number <= 99999) {
-                return `${(number / 1000).toFixed(2)}K`;
+                //return `${(number / 1000).toFixed(2)}K`;
+                return `${number}`;
             } else if (number > 99999 && number <= 9999999) {
                 return `${(number / 100000).toFixed(2)}L`;
             } else {
@@ -17,7 +21,8 @@ function formatNumber(number: number, formatter: any): string {
             if (number < 1000) {
                 return `${number}`;
             } else if (number > 999 && number <= 999999) {
-                return `${(number / 100000).toFixed(2)}K`;
+                //return `${(number / 100000).toFixed(2)}K`;
+                return `${number}`;
             } else if (number > 999999 && number <= 999999999) {
                 return `${(number / 1000000).toFixed(2)}M`;
             } else {
diff --git a/src/app/views/about-page/about-page.component.html b/src/app/views/about-page/about-page.component.html
new file mode 100644
index 00000000..467e8f5f
--- /dev/null
+++ b/src/app/views/about-page/about-page.component.html
@@ -0,0 +1,28 @@
+<div class="about-sec section-padding">
+	<div class="container">
+	   <div class="row">
+		  <div class="col-md-12 col-lg-6 col-xl-7">
+			 <div class="content">
+				<div class="head-title">
+				   <h1 class="text">About NVSK</h1>
+				</div>
+				<div>
+				   <p>
+					  Vidya Samiksha Kendra (VSK), an initiative under the aegis of Ministry of Education, Govt of India, is an institutional setup that aims to enable integrated and shared 'seeing' for amplifying data-driven decision making and actioning by key stakeholders for academic and administrative activities, thereby improving learning outcomes. 
+					  The principal rationale behind this initiative was to design a comprehensive system through which the relevant stakeholders will be able to track the progress of various educational programs under one roof.
+					  The VSK was conceived in such a way that would optimally utilize modern technologies to provide insights on different educational programs and to facilitate integrated functioning towards a common goal. 
+					  The objectives of VSK include observing the real-time status of various projects/activities under the ambit of Samagra Shiksha, improving the academic performance of students, and enhancing the accountability of teachers in schools.
+					  To attain these objectives, the VSK encompasses features such as administrative reforms, digital education, centralized dashboard, tracking and monitoring, and data-driven approach towards enrollment
+				   </p>
+				</div>
+			 </div>
+		  </div>
+		  <div class="col-md-12 col-lg-6 col-xl-5">
+			 <div class="content misstion-visstion">
+				<img src="assets/images/about-image.png" alt="vision" class="img-fluid">
+			 </div>
+		  </div>
+	   </div>
+	</div>
+ </div>
+
diff --git a/src/app/views/about-page/about-page.component.scss b/src/app/views/about-page/about-page.component.scss
new file mode 100644
index 00000000..995f9e0c
--- /dev/null
+++ b/src/app/views/about-page/about-page.component.scss
@@ -0,0 +1,51 @@
+.about-sec{
+	background-color: #FFFFFF !important;
+}
+.section-padding {
+    padding: 40px 0;
+}
+.about-sec .container{
+  max-width: 90%;
+}
+.head-title {
+    margin-bottom: 1.5rem;
+}
+.head-title h1 {
+    font-size: 3.45rem;
+    color: #434141;
+    line-height: 80px;
+    font-family: 'Outfit';
+}
+.about-sec p {
+    line-height: 26px;
+    text-align: justify;
+	margin-bottom: 1rem;
+}
+
+@media (min-width:992px) {
+	.about-sec .container{
+		max-width: 90%;
+	  }
+}
+
+@media (max-width:991px) {
+	.misstion-visstion img {
+		display: block;
+		margin: 10px auto;
+	}
+}
+
+@media (max-width:768px) {
+	  .section-padding {
+		padding: 20px 0;
+	 }
+	 .head-title {
+		margin-bottom: 1rem;
+	}
+	 .head-title h1 {
+		font-size: 40px;
+		line-height: 1.25;
+	}
+}
+
+
diff --git a/src/app/views/about-page/about-page.component.spec.ts b/src/app/views/about-page/about-page.component.spec.ts
new file mode 100644
index 00000000..398ac87f
--- /dev/null
+++ b/src/app/views/about-page/about-page.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AboutPageComponent } from './about-page.component';
+
+describe('AboutPageComponent', () => {
+  let component: AboutPageComponent;
+  let fixture: ComponentFixture<AboutPageComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ AboutPageComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AboutPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/views/about-page/about-page.component.ts b/src/app/views/about-page/about-page.component.ts
new file mode 100644
index 00000000..7a0ea3da
--- /dev/null
+++ b/src/app/views/about-page/about-page.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-about-page',
+  templateUrl: './about-page.component.html',
+  styleUrls: ['./about-page.component.scss']
+})
+export class AboutPageComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
diff --git a/src/app/views/contact-page/contact-page.component.html b/src/app/views/contact-page/contact-page.component.html
new file mode 100644
index 00000000..3fcd828f
--- /dev/null
+++ b/src/app/views/contact-page/contact-page.component.html
@@ -0,0 +1,32 @@
+<div class="contact-sec section-padding">
+	<div class="container">
+		<div class="row">
+			<div class="col-md-5 col-sm-12">
+				<div class="head-title">
+					<h1 class="text" > Contact Us</h1>
+				</div>
+				<div class="content">
+					<div class="cont-detail">
+						<p class="d-flex align-items-center">
+						<span class="cont-icon icon"><img src="assets/images/location_on.svg" width="24" height="24"></span>
+						<span class="cont-icon">National Council of Education And Research Training(NCERT), Sri Aurobindo Marg, New Delhi-110016 </span>
+					</p>
+					<p class="d-flex align-items-center">
+						<span class="cont-icon"><img src="assets/images/phone_in_talk.svg"></span>
+						<span class="cont-icon">Telephone No.- 011-2696 2580</span>
+					</p>
+					<p class="d-flex align-items-center">
+						<span class="cont-icon"><img src="assets/images/mail.svg"></span>
+						<span class="cont-icon">Email - dceta.ncert@nic.in</span>
+					</p>
+					</div>
+				</div>
+			</div>
+			<div class="col-md-7 col-sm-12">
+				<div class="map px-lg-5">
+					<iframe [src]="urlSafe" width="100%" height="325px" frameborder="0" style="border:0" allowfullscreen></iframe>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/src/app/views/contact-page/contact-page.component.scss b/src/app/views/contact-page/contact-page.component.scss
new file mode 100644
index 00000000..82c21f2d
--- /dev/null
+++ b/src/app/views/contact-page/contact-page.component.scss
@@ -0,0 +1,52 @@
+.contact-sec{
+	background-color: #fff !important;
+}
+.section-padding {
+    padding: 40px 0;
+}
+.head-title {
+    margin-bottom: 1.5rem;
+}
+.head-title h1 {
+    font-size: 3.45rem;
+    color: #434141;
+    line-height: 80px;
+    font-family: 'Outfit';
+}
+p {
+	margin-top: 0;
+	margin-bottom: 1rem;
+}
+.cont-detail .cont-icon {
+    margin-right: 5px;
+	
+}
+
+img, video {
+    max-width: unset;
+    height: auto;
+}
+
+.cont-detail span {
+    font-size: 15px;
+    line-height: 26px;
+}
+
+
+
+@media (min-width: 992px){
+	.contact-sec .container {
+		max-width: 90%;
+	}
+}
+
+@media (max-width: 768px){
+	.section-padding {
+		padding: 20px 0;
+	}
+	.head-title h1{
+		font-size: 40px;
+		line-height: 1.25;
+	}
+}
+
diff --git a/src/app/views/contact-page/contact-page.component.spec.ts b/src/app/views/contact-page/contact-page.component.spec.ts
new file mode 100644
index 00000000..4880ae1a
--- /dev/null
+++ b/src/app/views/contact-page/contact-page.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ContactPageComponent } from './contact-page.component';
+
+describe('ContactPageComponent', () => {
+  let component: ContactPageComponent;
+  let fixture: ComponentFixture<ContactPageComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ContactPageComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(ContactPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/views/contact-page/contact-page.component.ts b/src/app/views/contact-page/contact-page.component.ts
new file mode 100644
index 00000000..47fa33f0
--- /dev/null
+++ b/src/app/views/contact-page/contact-page.component.ts
@@ -0,0 +1,20 @@
+import { Component, OnInit } from '@angular/core';
+import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
+
+@Component({
+  selector: 'app-contact-page',
+  templateUrl: './contact-page.component.html',
+  styleUrls: ['./contact-page.component.scss']
+})
+export class ContactPageComponent implements OnInit {
+
+ url:string = 'https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3504.9497659892027!2d77.18913067374815!3d28.54122958822413!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x390d1df782972747%3A0x7aaf3441a298471c!2sNational%20Council%20of%20Educational%20Research%20and%20Training!5e0!3m2!1sen!2sin!4v1710402248432!5m2!1sen!2sin';
+ urlSafe: SafeResourceUrl;
+
+  constructor(private sanitizer: DomSanitizer,) { }
+
+  ngOnInit(): void {
+	this.urlSafe = this.sanitizer.bypassSecurityTrustResourceUrl(this.url);
+  }
+
+}
diff --git a/src/app/views/dashboard/dashboard.component.html b/src/app/views/dashboard/dashboard.component.html
index ae8424ac..ef6d09a9 100644
--- a/src/app/views/dashboard/dashboard.component.html
+++ b/src/app/views/dashboard/dashboard.component.html
@@ -1,10 +1,43 @@
-<p class="h3 font-weight-bold mb-0">Summary Statistics</p>
-<div class="grid gap-4 sm:grid-cols-2 md:grid-cols-3 xs:gap-y-6 md:gap-y-16 dashboard 4k:grid-cols-4 4k:gap-8"
+<div class="sp-dashboard-wrapper">
+<div class="banner-wrapper">
+	<img src="assets/images/banner-1.png" alt="Banner">
+</div>
+<div class="container">
+	<!-- <div class="top-section">
+		<h2 class="page-title">
+			About NVSK
+		</h2>
+		<p class="page-dec">Vidya Samiksha Kendra (VSKs) is a data repository which will have data from all schemes run by the Ministry of Education (MoE). It is an institutional setup that is part of the National Digital Education Architecture (NDEAR). The Ministry of Education is pushing states to open VSKs under the NDEAR. VSKs are data repositories that store and analyze data from various sources. They help the Ministry of Education (MoE) monitor the progress and impact of its policies and programs. VSKs can help identify weak spots in learning outcomes, assessment, or teachers. VSKs are designed to improve learning outcomes by Amplifying data-based decision making, Enabling actioning by key stakeholders, Providing actionable insights from aggregated data. VSKs can also amplify the existing capabilities of people or systems and enable transformative impact towards outcomes. </p>
+	</div> -->
+	<div class="main-content">
+		<h2 class="page-title ">Programs</h2>
+		<div class="grid gap-4 sm:grid-cols-2 md:grid-cols-3 xs:gap-y-6 dashboard 4k:grid-cols-4 4k:gap-8"
      *ngIf="dashboardMenu">
     <ng-container *ngFor="let menuInfo of dashboardMenu; let i = index">
         <div id="dashboard-item-{{i}}">
-            <sb-cqube-program-card [cardInfo]="menuInfo" id="dashboard-item-{{i}}"
-                                   (onProgramClick)="onClickOfDashboardItem($event)"></sb-cqube-program-card>
+					<div class="sb-cQ-card sb-cQ-card_2 custom-card">
+					<div  class="brand">
+						<div class="logo">
+							<img alt="icon here" class="mg-0" src="assets/images/{{menuInfo?.icon}}">
+						</div>
+						<div class="title">{{menuInfo?.title}}</div>
+					</div>
+					<P class="card-dec">{{menuInfo?.tooltip}}</P>
+					<div class="dataContainer">
+						<div class="sb-cQ-card__data ng-star-inserted">
+							<span class="Value">{{menuInfo?.metrics[0].value}}</span>
+							<span class="Title">{{menuInfo?.metrics[0].name}}</span>
+						</div>
+						<div class="sb-cQ-card__data ng-star-inserted">
+							<span class="Value">{{menuInfo?.metrics[1].value}}</span>
+							<span class="Title">{{menuInfo?.metrics[1].name}}</span>
+						</div>
+					</div>
+						<a class="card-btn" (click)="onClickOfDashboardItem(menuInfo?.navigationURL)">Explore</a>
+					</div>
         </div>
     </ng-container>
+		</div>
+	</div>
+</div>
 </div>
diff --git a/src/app/views/dashboard/dashboard.component.scss b/src/app/views/dashboard/dashboard.component.scss
index a587b88c..f5ef34d4 100644
--- a/src/app/views/dashboard/dashboard.component.scss
+++ b/src/app/views/dashboard/dashboard.component.scss
@@ -1,8 +1,130 @@
-::ng-deep {
-    .Value{
-        font-size: 2 !important;
+.sp-dashboard-wrapper{
+	background-color: #FFFFFF !important;
     }
-    .Title{
-        font-size: 0.875rem !important;
+.banner-wrapper{
+	margin-bottom: 25px;
     }
+.banner-wrapper img{
+	width: 100%;
+}
+.top-section {
+  margin:35px 0 25px;
+}
+.page-title {
+   color: #434141;	 
+   font-size: 60px;
+   font-weight: 600;
+   line-height: 1.1;
+   letter-spacing:-0.1px;
+   margin-bottom: 10px;
+}
+.page-dec{
+	color: #434141;
+	font-size: 16px;
+	line-height: 2.2;
+	font-weight: 500;
+	letter-spacing: 0.1px;
+}
+.main-content .dashboard {
+	margin-top: 35px;
+}
+
+.sb-cQ-card_2.custom-card {
+  background-color: #FCFBFF;
+  border: 1px solid #DED2FF;
+  border-radius: 10px;
+  height: 23.625rem;
+  padding: 5px;
+  box-shadow: 4px 4px 9px 0 rgba(67, 65, 65, 0.2);
+}
+
+.sb-cQ-card_2.custom-card:hover {
+	background-color: #FCFBFF !important;
+    border: 1px solid #DED2FF;
+	box-shadow: 4px 4px 22px 0 rgba(67, 65, 65, 0.2);
+}
+.sb-cQ-card_2.custom-card .brand {
+    justify-content: start;
+}
+.sb-cQ-card_2.custom-card .brand .title {
+   color: #4C30F5;
+   font-size: 22px;
+   line-height: 1.5;
+}
+.card-dec{
+	display: flex;
+	width: 100%;
+	color: #434141;
+	font-size: 12px;
+	line-height: 1.5;
+	text-align: left;
+	padding: 0 10px;
+}
+
+.custom-card .dataContainer{
+	padding: 0 10px;
+}
+.custom-card .sb-cQ-card__data {
+	background-color:#FFFFFF;
+	border: 1px solid #C5BCFF;
+	padding: 5px 10px 10px;
+	border-radius: 5px;
+}
+.custom-card .sb-cQ-card__data .Value{
+   font-size: 24px;
+   font-weight: 700;
+   line-height: 1.5;
+   color: #434141 !important;
+}
+.custom-card .sb-cQ-card__data .Title{
+	font-size: 12px;
+	font-weight: 400;
+	line-height: 1.2;
+	color: #434141;
+ }
+ .card-btn {
+	margin-bottom: 20px;
+	width: 95%;
+	margin-top: 15px;
+	background-color: #4C30F5;
+	border-radius: 5px;
+	color: #FFFFFF;
+	font-size: 16px;
+	line-height: 1.25;
+	font-weight: 500;
+	padding: 10px;
+	text-emphasis: none;
+	cursor: pointer;
+ }
+ .sb-cQ-card_2.custom-card:hover .card-btn {
+   text-decoration: none;
+   background-color: #1901AB;
+ }
+ .sb-cQ-card_2custom .brand .logo {
+    width: 100%;
+    height:auto;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 10px;
+}
+
+@media (max-width: 768px){
+	.banner-wrapper{
+		margin-bottom: 15px;
+	}
+	.page-title {
+		font-size: 40px;
+	 }
+	 .main-content .dashboard {
+		margin-top: 20px;
+	}
+	.sb-cQ-card_2.custom-card .brand .title {
+		font-size: 18px;
+	}
+	.card-btn {
+		margin-bottom: 10px;
+        margin-top: 5px;
+	}
+	
 }
\ No newline at end of file
diff --git a/src/app/views/dashboard/dashboard.component.ts b/src/app/views/dashboard/dashboard.component.ts
index 9f7baf99..4ac14dd6 100644
--- a/src/app/views/dashboard/dashboard.component.ts
+++ b/src/app/views/dashboard/dashboard.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { reject } from 'lodash';
 import { NgxSpinnerService } from 'ngx-spinner';
+import { rbacConfig } from 'src/app/shared/components/rbac-dialog/rbacConfig';
 import { configFiles } from 'src/app/core/config/configMapping';
 
 import { IDashboardMenu } from 'src/app/core/models/IDashboardCard';
@@ -23,8 +24,30 @@ export class DashboardComponent implements OnInit {
   dashboardMenu: IDashboardMenu[] | any;
   // isNvsk = environment.config.toLocaleLowerCase() === 'nvsk';
   isNvsk = false;
+  roles: any;
   rbacDetails: any;
-  constructor(private spinner: NgxSpinnerService,private readonly _commonService: CommonService, private readonly _router: Router, private readonly rbac: RbacService, private _wrapperService: WrapperService) {
+ // tempPrashast: any = { "title": "PRASHAST", "navigationURL": "/prashast", "icon": "prashast.png", "tooltip": "Prashast is a pre assessment holistic screening tool for preliminary screening of students in schools to facilitate further referral to assessment camps for disability certification.", "metrics": [{ "value": "6.99L", "name": "Total Registered Users" },{ "value": "34.1L", "name": "Total Students" }] }
+  constructor(private spinner: NgxSpinnerService,
+	private readonly _commonService: CommonService, 
+	private readonly _router: Router, 
+	private readonly rbac: RbacService, 
+	public router: Router,
+	private _wrapperService: WrapperService) {
+	this.roles = rbacConfig.roles.filter((role: any, index: any) => {
+		return rbacConfig.roles[index - 1]?.['skipNext'] !== true
+	  })
+	  if(environment.config === 'VSK') {
+		this.roles = this.roles.filter((role: any, index: any) => {
+		  return role.value !== 0
+		})
+	  }
+	  else {
+		this.roles = this.roles.filter((role: any, index: any) => {
+		  return role.value === 0
+		})
+
+	  }
+	  //console.log('roles', this.roles)
     this.rbac.getRbacDetails().subscribe((rbacDetails: any) => {
       this.rbacDetails = rbacDetails
     })
@@ -32,12 +55,24 @@ export class DashboardComponent implements OnInit {
 
   ngOnInit(): void {
     this.checkRbacLevel();
+	this.onRoleSelect(this.roles[0]);
+  }
+
+  onRoleSelect(role: any) {
+    this.rbac.setRbacDetails({ role: role.value, roleDetail: role })
+    // this.router.navigate(['/rbac'])
   }
 
-  onClickOfDashboardItem(cardInfo: IDashboardMenu | undefined): void {
+  /* onClickOfDashboardItem(cardInfo: IDashboardMenu | undefined): void {
     if (cardInfo) {
       this._router.navigate([cardInfo.navigationURL.trim()]);
     }
+  } */
+
+  onClickOfDashboardItem(cardInfo:any): void {
+    if (cardInfo) {
+      this._router.navigate([cardInfo.trim()]);
+    }
   }
 
   checkRbacLevel() {
@@ -70,8 +105,6 @@ export class DashboardComponent implements OnInit {
       let rbacDetails;
       let menuData = menuResult?.data
       for (let i = 0; i < menuData?.length; i++) {
-        if (hierarchyLevels[menuData[i].programID]?.includes(String(this.rbacDetails?.role))) {
-
           let menuToDisplay: IMenuItem | any = {};
           menuToDisplay.title = menuData[i].programName;
           menuToDisplay.navigationURL = menuData[i].navigationUrl;
@@ -82,9 +115,13 @@ export class DashboardComponent implements OnInit {
                  menuToDisplay.metrics = d;
                });
           this.dashboardMenu.push(menuToDisplay);
+        // if (hierarchyLevels[menuData[i].programID]?.includes(String(this.rbacDetails?.role))) {
 
-        }
+        // }
       }
+      //Prashast static changes
+      //this.dashboardMenu.push(this.tempPrashast);
+      //Prashast static changes
     })
 
   }
@@ -145,22 +182,22 @@ export class DashboardComponent implements OnInit {
             if (currentLevelFilter !== undefined) {
               let metricQueries = currentLevelFilter?.actions?.queries;
               let metricQueriesKeys = Object.keys(metricQueries);
-              console.log("cvbn:",{metricQueriesKeys,currentLevelFilter,metricQueries})
               for (let k = 0; k < metricQueriesKeys?.length; k++) {
                 if (metrics.length >= 2) {
                   break;
                 }
                 else if (metricQueriesKeys[k].indexOf('bigNumber') > -1) {
                   let query = parseRbacFilter(metricQueries[metricQueriesKeys[k]], rbacDetails);
+                  let bigNumberOptions = Array.isArray(programConfig[reports[i]]?.options?.bigNumber) ? programConfig[reports[i]]?.options?.bigNumber[rbacDetails.role] : programConfig[reports[i]]?.options?.bigNumber;
                   if (query === "" || isNaN(Number(query))) {
                     let res = await this._wrapperService.runQuery(query)
                     if (res && res.length > 0) {
                       let metricData = {
-                        value: Array.isArray(programConfig[reports[i]]?.options?.bigNumber?.property) ? String(formatNumberForReport(res[0]?.[programConfig[reports[i]]?.options?.bigNumber?.property[k]])) + [programConfig[reports[i]]?.options?.bigNumber?.valueSuffix[k]] : String(formatNumberForReport(res[0]?.[programConfig[reports[i]]?.options?.bigNumber?.property])) + [programConfig[reports[i]]?.options?.bigNumber?.valueSuffix],
-                        name: Array.isArray(programConfig[reports[i]]?.options?.bigNumber?.title) ? programConfig[reports[i]]?.options?.bigNumber?.title[k] : programConfig[reports[i]]?.options?.bigNumber?.title
+                        value: Array.isArray(bigNumberOptions?.property) ? String(formatNumberForReport(res[0]?.[bigNumberOptions?.property[k]])) + [bigNumberOptions?.valueSuffix[k]] : String(formatNumberForReport(res[0]?.[bigNumberOptions?.property])) + [bigNumberOptions?.valueSuffix],
+                        name: Array.isArray(bigNumberOptions?.title) ? bigNumberOptions?.title[k] : bigNumberOptions?.title
                       }
-                      if((Array.isArray(programConfig[reports[i]]?.options?.bigNumber?.property) ? res?.[0]?.[programConfig[reports[i]]?.options?.bigNumber?.property[k]] : res?.[0]?.[programConfig[reports[i]]?.options?.bigNumber?.property]) === null) {
-                        metricData.value = Array.isArray(programConfig[reports[i]]?.options?.bigNumber?.valueSuffix) ? '0' + programConfig[reports[i]]?.options?.bigNumber?.valueSuffix[k] : '0' + programConfig[reports[i]]?.options?.bigNumber?.valueSuffix
+                      if((Array.isArray(bigNumberOptions?.property) ? res?.[0]?.[bigNumberOptions?.property[k]] : res?.[0]?.[bigNumberOptions?.property]) === null) {
+                        metricData.value = Array.isArray(bigNumberOptions?.valueSuffix) ? '0' + bigNumberOptions?.valueSuffix[k] : '0' + bigNumberOptions?.valueSuffix
                       } 
                       if (metricData.value !== null && metricData !== undefined) {
                         metrics.push(metricData)
@@ -168,10 +205,10 @@ export class DashboardComponent implements OnInit {
                       }
                     }
                   } else {
-                    const formatter = programConfig[reports[i]]?.options?.bigNumber?.formatter[k] ? programConfig[reports[i]]?.options?.bigNumber?.formatter[k] : programConfig[reports[i]]?.options?.bigNumber?.formatter;
+                    const formatter = bigNumberOptions?.formatter[k] ? bigNumberOptions?.formatter[k] : bigNumberOptions?.formatter;
                     metrics.push({
                       value: !isNaN(metricQueries[metricQueriesKeys[k]]) ? formatNumberForReport(metricQueries[metricQueriesKeys[k]], formatter) : metricQueries[metricQueriesKeys[k]],
-                      name: programConfig[reports[i]]?.options?.bigNumber?.title[k]
+                      name: bigNumberOptions?.title[k]
                     });
                   }
                 }
diff --git a/src/app/views/diksha/config/diksha_config.ts b/src/app/views/diksha/config/diksha_config.ts
index a527bc0b..ae1fa8c5 100644
--- a/src/app/views/diksha/config/diksha_config.ts
+++ b/src/app/views/diksha/config/diksha_config.ts
@@ -79,7 +79,7 @@ export const config = {
         }
     },
 
-    etb_coverage_status_bignumber: {
+    etb_overall_coverage_percentage: {
         "label": "ETB Coverage Status",
         "filters": [
             {
@@ -202,15 +202,18 @@ export const config = {
                             type: "percentage",
                             values: [
                                 {
-                                    color: "#007000",
+                                    //color: "#007000",
+                                    color: "#1D4586",
                                     breakPoint: 70
                                 },
                                 {
-                                    color: "#FFBF00",
+                                    //color: "#FFBF00",
+                                    color: "#1156CC",
                                     breakPoint: 40
                                 },
                                 {
-                                    color: "#D2222D",
+                                    //color: "#D2222D",
+                                    color: "#6D9FEB",
                                     breakPoint: 0
                                 }
                             ]
@@ -222,7 +225,7 @@ export const config = {
         }
     },
 
-    content_coverage_bignumber:
+    content_coverage_qr_percentage:
     {
         "label": "Content Coverage on QR",
         "filters": [
@@ -293,15 +296,18 @@ export const config = {
                             type: "percentage",
                             values: [
                                 {
-                                    color: "#007000",
+                                    //color: "#007000",
+                                    color: "#1D4586",
                                     breakPoint: 70
                                 },
                                 {
-                                    color: "#FFBF00",
+                                    //color: "#FFBF00",
+                                    color: "#1156CC",
                                     breakPoint: 40
                                 },
                                 {
-                                    color: "#D2222D",
+                                    //color: "#D2222D",
+                                    color: "#6D9FEB",
                                     breakPoint: 0
                                 }
                             ]
@@ -324,6 +330,7 @@ export const config = {
                     "barChart": "select s.state_name, round(cast(avg(t.sum) as numeric),2) as content_coverage from datasets.diksha_content_coverage_on_qr_state as t join dimensions.state as s on t.state_id = s.state_id group by t.state_id, s.state_name order by s.state_name"
                 },
                 "level": "State"
+                
             }
         }],
         "options": {
@@ -357,9 +364,10 @@ export const config = {
             "hierarchyLevel": "0",
             "actions": {
                 "queries": {
-                    "map": "select latitude, longitude, s.state_name, round(cast(avg(t.sum) as numeric),2) as content_coverage from datasets.diksha_content_coverage_on_qr_state as t join dimensions.state as s on t.state_id = s.state_id group by t.state_id, s.state_name, latitude, longitude order by s.state_name"
+                    "map": "select latitude, longitude, s.state_name,t.state_id, round(cast(avg(t.sum) as numeric),2) as content_coverage from datasets.diksha_content_coverage_on_qr_state as t join dimensions.state as s on t.state_id = s.state_id group by t.state_id, s.state_name, latitude, longitude order by s.state_name"
                 },
-                "level": "State",
+                "level": "state",
+                "nextLevel": "district"
             }
         }],
         "options": {
@@ -462,7 +470,7 @@ export const config = {
     // },
 
     learning_sessions_on_potential_users: {
-        "label": "Learning Sessions on Potential Users",
+        "label": "Learning Sessions per Capita",
         "filters": [
             {
                 "name": "State",
@@ -479,7 +487,7 @@ export const config = {
                 "hierarchyLevel": "0",
                 "actions": {
                     "queries": {
-                        "map": "select latitude, longitude, t2.state_name, round(cast(sum(t1.sum) as numeric),2) as users from datasets.diksha_learning_session_on_potential_user_state as t1 join dimensions.state as t2 on t1.state_id = t2.state_id group by t1.state_id, t2.state_name, latitude, longitude"
+                        "map": "select latitude, longitude, t2.state_name, t1.state_id,round(cast(sum(t1.sum) as numeric),2) as users from datasets.diksha_learning_session_on_potential_user_state as t1 join dimensions.state as t2 on t1.state_id = t2.state_id group by t1.state_id, t2.state_name, latitude, longitude"
                     },
                     "level": "State",
                 }
@@ -487,7 +495,7 @@ export const config = {
         ],
         "options": {
             "bigNumber": {
-                "title": "Learning Sessions On Potential Users",
+                "title": "Learning Sessions per Capita",
                 "valueSuffix": '',
                 "property": 'users'
             },
@@ -495,7 +503,7 @@ export const config = {
                 "metricFilterNeeded": false,
                 "indicator": "users",
                 "legend": {
-                    "title": "Learning Sessions on Potential Users"
+                    "title": "Learning Sessions per Capita"
                 },
                 "tooltipMetrics": [
                     {
@@ -504,7 +512,7 @@ export const config = {
                         "valueSuffix": "\n"
                     },
                     {
-                        "valuePrefix": "Learning Sessions on Potential Users: ",
+                        "valuePrefix": "Learning Sessions per Capita: ",
                         "value": "users",
                         "valueSuffix": "\n"
                     }
@@ -512,7 +520,28 @@ export const config = {
             }
         }
     },
-
+    summary_metrics: {
+        "filters": [
+        {
+            "name": "National",
+            "hierarchyLevel": "0",
+            "actions": {
+                "queries": {
+                    "bigNumber1": `select dm.metric_value as total_content from dimensions.mainmetrics dm where  dm.program_id='etb' and dm.metric_name ='Total Content' and dm.metric_type ='Key Metric'`,
+                    "bigNumber2": "select dm.metric_value  as total_etbs from dimensions.mainmetrics dm where  dm.program_id='etb' and dm.metric_name ='Total ETBs' and dm.metric_type ='Key Metric'"
+                },
+                "level": "state"
+            }
+        },
+    ],
+    "options": {
+        "bigNumber": {
+            "title": ['Total Content','Total ETBs'],
+            "property": ['total_content', 'total_etbs'],
+            "valueSuffix": ['', '']
+        }
+    }
+},
     diksha_metrics: {
         "label": "ETB Coverage Status",
         "filters": [
@@ -521,12 +550,12 @@ export const config = {
                 "hierarchyLevel": "0",
                 "actions": {
                     "queries": {
-                        "bigNumber1": "select sum(sum) as total_etbs from datasets.diksha_resourcecount_textbookdiksha0grade0subject0medium",
-                        "bigNumber2": "select sum(sum) as total_qr_codes from datasets.diksha_totalqrcodes_textbookdiksha0grade0subject0medium",
-                        "bigNumber3": "select round(cast(avg(sum) as numeric),2) as content_coverage from datasets.diksha_qrcoverage_textbookdiksha0grade0subject0medium",
-                        "bigNumber4": "select count(distinct state_id) as total_states from datasets.diksha_energized_textbooks_state where sum > 0",
-                        "bigNumber5": ""
-                    },
+                        "bigNumber1": "select dm.metric_value  as total_states from dimensions.mainmetrics dm where  dm.program_id='etb' and dm.metric_name ='Total States/UTs Participating' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber2": "select dm.metric_value  as total_etbs from dimensions.mainmetrics dm where  dm.program_id='etb' and dm.metric_name ='Total ETBs' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber3": "select dm.metric_value  as total_qr_codes from dimensions.mainmetrics dm where  dm.program_id='etb' and dm.metric_name ='Total QR Codes' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber4": "select dm.metric_value  as total_content from dimensions.mainmetrics dm where  dm.program_id='etb' and dm.metric_name ='Total Content' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber5": "select dm.metric_value  as total_time_spent from dimensions.mainmetrics dm where  dm.program_id='etb' and dm.metric_name ='Total Time Spent (mins)'"
+                   },
                     "level": "district"
                 }
             },
@@ -537,21 +566,23 @@ export const config = {
                 "hierarchyLevel": "1",
                 "actions": {
                     "queries": {
-                        "bigNumber1": "select sum(sum) as total_etbs from datasets.diksha_resourcecount_textbookdiksha0grade0subject0medium",
-                        "bigNumber2": "select sum(sum) as total_qr_codes from datasets.diksha_totalqrcodes_textbookdiksha0grade0subject0medium",
-                        "bigNumber3": "select round(cast(avg(sum) as numeric),2) as content_coverage from datasets.diksha_qrcoverage_textbookdiksha0grade0subject0medium",
-                        "bigNumber4": ""
-                    },
+                        "bigNumber1": "select dm.metric_value  as total_states from dimensions.mainmetrics dm where  dm.program_id='etb' and dm.metric_name ='Total States/UTs Participating' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber2": "select dm.metric_value  as total_etbs from dimensions.mainmetrics dm where  dm.program_id='etb' and dm.metric_name ='Total ETBs' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber3": "select dm.metric_value  as total_qr_codes from dimensions.mainmetrics dm where  dm.program_id='etb' and dm.metric_name ='Total QR Codes' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber4": "select dm.metric_value  as total_content from dimensions.mainmetrics dm where  dm.program_id='etb' and dm.metric_name ='Total Content' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber5": "select dm.metric_value  as total_time_spent from dimensions.mainmetrics dm where  dm.program_id='etb' and dm.metric_name ='Total Time Spent (mins)'"
+                       },
                     "level": "district"
                 }
             },
         ],
         "options": {
-            "bigNumber": {
-                "title": ['Total ETBs', 'Total QR Codes', 'Content Coverage on QR', 'Total States/UTs Participating', 'Total Content'],
-                "valueSuffix": ['', '', '%', '', ''],
-                "property": ['total_etbs', 'total_qr_codes', 'content_coverage', 'total_states', '']
-            }
+            "bigNumber": [ {
+                "title": ['Total States/UTs Participating', 'Total ETBs', 'Total QR Codes', 'Total Content', 'Total Time Spent (mins)'],
+                "property": ['total_states', 'total_etbs', 'total_qr_codes', 'total_content', 'total_time_spent'],
+                "valueSuffix": ['', '', '', '', '']
+                
+            }]
         }
     }
 
diff --git a/src/app/views/diksha/diksha.component.html b/src/app/views/diksha/diksha.component.html
index d6f85c14..46fd577f 100644
--- a/src/app/views/diksha/diksha.component.html
+++ b/src/app/views/diksha/diksha.component.html
@@ -1,14 +1,32 @@
+<div class="program-banner-wrapper">
+	<img src="assets/images/diksha-etb-banner.png" alt="diksha etb banner">
+</div>
 <div class="metric-card-wrapper">
     <div class="grid gap-4 grid-cols-6 xmd:grid-cols-12">
         <div class="col-span-12">
-            <p class="program-title">DIKSHA- ETB and eContent <em><small>(ETB : Energized Textbook)</small></em></p>
-            <p class="program-desc ">The Digital Infrastructure for Knowledge Sharing is an initiative of the National
+            <p class="program-title">
+				<img src="assets/images/diksha.png" alt="logo"> DIKSHA- ETB and eContent <em><small>(ETB : Energized Textbook)</small></em></p>
+            <p  #target class="program-desc ">The Digital Infrastructure for Knowledge Sharing is an initiative of the National
                 Council of Educational Research and Training (Ministry of Education, Govt. of India). This platform
                 enables implementation of two key programs- NISHTHA and Energized Textbooks.</p>
         </div>
     </div>
 </div>
 
+<div class="custom-tab-group-wrapper" style="height: 1200px; max-height: 1500px; min-height: 300px;">
+    <iframe width="100%" height="100%" frameBorder="0" [src]="urlSafe" 	target="_parent" loading="lazy"> </iframe>
+</div>
+<!-- <div class="col-span-full tab-wrapper"  #target>
+     <div class="row-wrapper grid grid-cols-5 gap-4">
+        
+        <div class="col-span-2 xmd:col-span-1  bignumber-container" id="bignumber2"
+            *ngFor="let bigNumberData of bigNumberMetrics; let index = index">
+            <div *ngIf="checkReport('diksha_metrics', 'bigNumber'+(index+1))">
+                <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
+            </div>
+        </div>
+    </div>
+</div>
 <div class="custom-tab-group-wrapper">
     <mat-tab-group [selectedIndex]="tabIndex" mat-align-tabs="start" animationDuration="0ms"
         (selectedTabChange)="onTabChanged($event)" appFullScreen>
@@ -34,11 +52,11 @@
             <app-learning-sessions-tab *ngIf="selectedTabLabel === 'Learning Sessions'"></app-learning-sessions-tab>
         </mat-tab>
 
-        <mat-tab label='Learning Sessions on Potential Users'
-            *ngIf="tabs.includes('Learning Sessions on Potential Users')">
+        <mat-tab label='Learning Sessions per Capita'
+            *ngIf="tabs.includes('Learning Sessions per Capita')">
             <app-learning-sessions-on-potential-users-tab
-                *ngIf="selectedTabLabel === 'Learning Sessions on Potential Users'"></app-learning-sessions-on-potential-users-tab>
+                *ngIf="selectedTabLabel === 'Learning Sessions per Capita'"></app-learning-sessions-on-potential-users-tab>
         </mat-tab>
 
     </mat-tab-group>
-</div>
\ No newline at end of file
+</div> -->
\ No newline at end of file
diff --git a/src/app/views/diksha/diksha.component.ts b/src/app/views/diksha/diksha.component.ts
index 1e434172..cb8a9321 100644
--- a/src/app/views/diksha/diksha.component.ts
+++ b/src/app/views/diksha/diksha.component.ts
@@ -1,16 +1,17 @@
 
-import { Component, OnInit } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { CommonService } from 'src/app/core/services/common/common.service';
 import { RbacService } from 'src/app/core/services/rbac-service.service';
 import { config } from './config/diksha_config';
+import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
 
 @Component({
     selector: 'app-diksha',
     templateUrl: './diksha.component.html',
     styleUrls: ['./diksha.component.scss']
 })
-export class DikshaComponent implements OnInit {
+export class DikshaComponent implements OnInit, AfterViewInit {
     loadTabs = false;
     rbacDetails: any;
     tabIndex;
@@ -18,8 +19,12 @@ export class DikshaComponent implements OnInit {
     tabs: any = [];
     programName: any = 'diksha'
     bigNumberMetrics: any = [];
+    NVSK: boolean = true;
+    url:string = 'https://nvsk.diksha.gov.in/ords/r/vskdev/diksha-etb';
+    urlSafe: SafeResourceUrl;
+	@ViewChild('target') private myTarget:ElementRef;
     
-constructor(private route: ActivatedRoute, private _rbacService: RbacService, private _commonService: CommonService) { 
+constructor(private route: ActivatedRoute, private sanitizer: DomSanitizer, private _rbacService: RbacService, private _commonService: CommonService) { 
     this.route.queryParams.subscribe((param: any) => {
         this.tabIndex = param.tab ? Number(param.tab) : 0;
     })
@@ -41,10 +46,12 @@ constructor(private route: ActivatedRoute, private _rbacService: RbacService, pr
     }
 
     ngOnInit(): void {
+        this.urlSafe = this.sanitizer.bypassSecurityTrustResourceUrl(this.url);
         this._commonService.getMetaData(this.programName).subscribe()
     }
 
     ngAfterViewInit(): void {
+	this._commonService.scrollInto(this.myTarget.nativeElement);
     setTimeout(() => {
         this.selectedTabLabel = this.tabs.length > 0 ? this.tabs[0] : undefined
     });
@@ -74,4 +81,9 @@ constructor(private route: ActivatedRoute, private _rbacService: RbacService, pr
         this.bigNumberMetrics[bigNumberMetric.ind] = bigNumberMetric.data
     }
 
+    getMetricsArray() {
+        return this.bigNumberMetrics.filter((data) => {
+          return data.averagePercentage !== null || data.averagePercentage !== undefined
+        }) 
+      }
 }
diff --git a/src/app/views/diksha/pages/content-coverage-tab/content-coverage-tab.component.html b/src/app/views/diksha/pages/content-coverage-tab/content-coverage-tab.component.html
index c4ba384c..bb091fb5 100644
--- a/src/app/views/diksha/pages/content-coverage-tab/content-coverage-tab.component.html
+++ b/src/app/views/diksha/pages/content-coverage-tab/content-coverage-tab.component.html
@@ -12,7 +12,7 @@
         <div class="row-wrapper grid grid-cols-2 gap-4">
 
             <div class="col-span-2 xmd:col-span-1 div-shadow"
-                *ngIf="checkReport('content_coverage_bignumber', 'bigNumber')" id="bignumber">
+                *ngIf="checkReport('content_coverage_qr_percentage', 'bigNumber')" id="bignumber">
                 <app-content-coverage-bignumber #contentCoverageBigNumber
                     (exportReportData)="csvDownload($event)"></app-content-coverage-bignumber>
             </div>
diff --git a/src/app/views/diksha/pages/content-coverage-tab/reports/content-coverage-bar/content-coverage-bar.component.html b/src/app/views/diksha/pages/content-coverage-tab/reports/content-coverage-bar/content-coverage-bar.component.html
index 2c4e5a79..bfea1a0c 100644
--- a/src/app/views/diksha/pages/content-coverage-tab/reports/content-coverage-bar/content-coverage-bar.component.html
+++ b/src/app/views/diksha/pages/content-coverage-tab/reports/content-coverage-bar/content-coverage-bar.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.values && reportData?.values?.length > 0)">
-        <p class="text-center font-medium py-2 filename" >{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p> -->
         <app-sb-bar-chart type="horizontalBar" [data]="reportData" [config]="config" ></app-sb-bar-chart>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.values && reportData?.values?.length > 0)">
diff --git a/src/app/views/diksha/pages/content-coverage-tab/reports/content-coverage-bignumber/content-coverage-bignumber.component.ts b/src/app/views/diksha/pages/content-coverage-tab/reports/content-coverage-bignumber/content-coverage-bignumber.component.ts
index ac3f0ca9..a682e140 100644
--- a/src/app/views/diksha/pages/content-coverage-tab/reports/content-coverage-bignumber/content-coverage-bignumber.component.ts
+++ b/src/app/views/diksha/pages/content-coverage-tab/reports/content-coverage-bignumber/content-coverage-bignumber.component.ts
@@ -12,7 +12,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
               styleUrls: ['./content-coverage-bignumber.component.scss']
             })
             export class ContentCoverageComponentBignumber implements OnInit {
-              reportName: string = 'content_coverage_bignumber';
+              reportName: string = 'content_coverage_qr_percentage';
               filters: any = [];
               levels: any;
               reportData: any = {
diff --git a/src/app/views/diksha/pages/content-coverage-tab/reports/content-coverage-map/content-coverage-map.component.html b/src/app/views/diksha/pages/content-coverage-tab/reports/content-coverage-map/content-coverage-map.component.html
index 8a178bce..1daea77d 100644
--- a/src/app/views/diksha/pages/content-coverage-tab/reports/content-coverage-map/content-coverage-map.component.html
+++ b/src/app/views/diksha/pages/content-coverage-tab/reports/content-coverage-map/content-coverage-map.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename" >{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p> -->
         <app-leaflet-map [mapData]="reportData"></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/diksha/pages/etb-coverage-status-tab/reports/etb-bignumbers/etb-bignumbers.component.ts b/src/app/views/diksha/pages/etb-coverage-status-tab/reports/etb-bignumbers/etb-bignumbers.component.ts
index 2a95bd44..efd0196b 100644
--- a/src/app/views/diksha/pages/etb-coverage-status-tab/reports/etb-bignumbers/etb-bignumbers.component.ts
+++ b/src/app/views/diksha/pages/etb-coverage-status-tab/reports/etb-bignumbers/etb-bignumbers.component.ts
@@ -61,6 +61,7 @@ export class EtbBignumbersComponent implements OnInit {
         return true
       })
     }
+    
     Object.keys(queries).forEach(async (key: any, index: any) => {
       if (key.toLowerCase().includes('comparison')) {
         let endDate = new Date();
@@ -75,6 +76,10 @@ export class EtbBignumbersComponent implements OnInit {
       let query = buildQuery(onLoadQuery, defaultLevel, this.levels, this.filters, this.startDate, this.endDate, key, this.compareDateRange);
 
       if (query && key.indexOf('bigNumber') > -1) {
+        if (Array.isArray(options?.bigNumber)) {
+          options.bigNumber = options?.bigNumber[Number(this.rbacDetails?.role)];
+        }
+
         let metricOptions = {
           bigNumber: {
             title: Array.isArray(options?.bigNumber?.title) ? options?.bigNumber?.title?.[index] : options?.bigNumber?.title,
diff --git a/src/app/views/diksha/pages/etb-coverage-status-tab/reports/etb-coverage-status-bignumber/etb-coverage-status-bignumber.component.ts b/src/app/views/diksha/pages/etb-coverage-status-tab/reports/etb-coverage-status-bignumber/etb-coverage-status-bignumber.component.ts
index 3619a48c..335b7967 100644
--- a/src/app/views/diksha/pages/etb-coverage-status-tab/reports/etb-coverage-status-bignumber/etb-coverage-status-bignumber.component.ts
+++ b/src/app/views/diksha/pages/etb-coverage-status-tab/reports/etb-coverage-status-bignumber/etb-coverage-status-bignumber.component.ts
@@ -12,11 +12,11 @@ import { config } from 'src/app/views/diksha/config/diksha_config';
   styleUrls: ['./etb-coverage-status-bignumber.component.scss']
 })
 export class EtbCoverageStatusComponentBignumber implements OnInit {
-  reportName: string = 'etb_coverage_status_bignumber';
+  reportName: string = 'etb_overall_coverage_percentage';
   filters: any = [];
   levels: any;
   reportData: any = {
-    reportName: "etb_coverage_status_bignumber"
+    reportName: "etb_overall_coverage_percentage"
   };
   title: string = 'Overall ETB Coverage '
   selectedYear: any;
diff --git a/src/app/views/diksha/pages/implementation-status-tab/implementation-status-tab.component.html b/src/app/views/diksha/pages/implementation-status-tab/implementation-status-tab.component.html
index 1dfdb040..d4542705 100644
--- a/src/app/views/diksha/pages/implementation-status-tab/implementation-status-tab.component.html
+++ b/src/app/views/diksha/pages/implementation-status-tab/implementation-status-tab.component.html
@@ -6,15 +6,7 @@
         </div>
     </div>
     <div class="reports-row" >
-        <div class="row-wrapper grid grid-cols-5 gap-4" *ngIf="NVSK">
-            <div class="col-span-2 xmd:col-span-1  bignumber-container" id="bignumber2"
-                *ngFor="let bigNumberData of getMetricsArray(); let index = index">
-                <div *ngIf="checkReport('diksha_metrics', 'bigNumber'+(index+1))">
-                    <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
-                </div>
-            </div>
-        </div>
-        <div class="row-wrapper grid grid-cols-1 gap-4">
+    <div class="row-wrapper grid grid-cols-1 gap-4">
             <div class="col-span-2 xmd:col-span-1 div-shadow" *ngIf="checkReport('implementation_status', 'map')"
                 id="map">
                 <app-implementation-status #implementationstatus
diff --git a/src/app/views/diksha/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html b/src/app/views/diksha/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
index 8a178bce..1daea77d 100644
--- a/src/app/views/diksha/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
+++ b/src/app/views/diksha/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename" >{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p> -->
         <app-leaflet-map [mapData]="reportData"></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/diksha/pages/learning-sessions-on-potential-users-tab/learning-sessions-on-potential-users-tab.component.ts b/src/app/views/diksha/pages/learning-sessions-on-potential-users-tab/learning-sessions-on-potential-users-tab.component.ts
index 0a00208b..489a8c55 100644
--- a/src/app/views/diksha/pages/learning-sessions-on-potential-users-tab/learning-sessions-on-potential-users-tab.component.ts
+++ b/src/app/views/diksha/pages/learning-sessions-on-potential-users-tab/learning-sessions-on-potential-users-tab.component.ts
@@ -29,7 +29,7 @@ export class LearningSessionsOnPotentialUsersTabComponent implements OnInit, Aft
     hasTimeSeriesFilters: boolean = false;
     hasCommonFilters: boolean = true;
     NVSK:boolean = true;
-    matLabel:any ="Learning Sessions on Potential Users"
+    matLabel:any ="Learning Sessions per Capita"
     @ViewChild('learningSessionsOnPotentialUsers') learningSessionsOnPotentialUsers: LearningSessionsOnPotentialUsersComponent;
 
     constructor(private _wrapperService: WrapperService, private _rbacService: RbacService) {
diff --git a/src/app/views/diksha/pages/learning-sessions-on-potential-users-tab/reports/learning-sessions-on-potential-users/learning-sessions-on-potential-users.component.html b/src/app/views/diksha/pages/learning-sessions-on-potential-users-tab/reports/learning-sessions-on-potential-users/learning-sessions-on-potential-users.component.html
index 9b06e2e2..cf6a3d07 100644
--- a/src/app/views/diksha/pages/learning-sessions-on-potential-users-tab/reports/learning-sessions-on-potential-users/learning-sessions-on-potential-users.component.html
+++ b/src/app/views/diksha/pages/learning-sessions-on-potential-users-tab/reports/learning-sessions-on-potential-users/learning-sessions-on-potential-users.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="reportData">
-        <p class="text-center font-medium py-2 filename"></p><br>
+        <!-- <p class="text-center font-medium py-2 filename"></p> -->
         <app-leaflet-map [mapData]="reportData" *ngIf="NVSK"></app-leaflet-map>
         <app-big-number [bigNumberReportData]="reportData" *ngIf="!NVSK"></app-big-number>    
     </ng-container>
diff --git a/src/app/views/diksha/pages/learning-sessions-on-potential-users-tab/reports/learning-sessions-on-potential-users/learning-sessions-on-potential-users.component.ts b/src/app/views/diksha/pages/learning-sessions-on-potential-users-tab/reports/learning-sessions-on-potential-users/learning-sessions-on-potential-users.component.ts
index e6964dfe..286bb915 100644
--- a/src/app/views/diksha/pages/learning-sessions-on-potential-users-tab/reports/learning-sessions-on-potential-users/learning-sessions-on-potential-users.component.ts
+++ b/src/app/views/diksha/pages/learning-sessions-on-potential-users-tab/reports/learning-sessions-on-potential-users/learning-sessions-on-potential-users.component.ts
@@ -19,7 +19,7 @@ export class LearningSessionsOnPotentialUsersComponent implements OnInit {
   reportData: any = {
     reportName: "learning_sessions_on_potential_users"
   };
-  title: string = 'Learning Sessions on Potential Users'
+  title: string = 'Learning Sessions per Capita'
   selectedYear: any;
   selectedMonth: any;
   startDate: any;
diff --git a/src/app/views/diksha/pages/learning-sessions-tab/learning-sessions-tab.component.html b/src/app/views/diksha/pages/learning-sessions-tab/learning-sessions-tab.component.html
index 6edf4ecb..05dab2da 100644
--- a/src/app/views/diksha/pages/learning-sessions-tab/learning-sessions-tab.component.html
+++ b/src/app/views/diksha/pages/learning-sessions-tab/learning-sessions-tab.component.html
@@ -10,10 +10,10 @@
         </div>
     </div>
             <div class="reports-row" >
-                <div class="row-wrapper grid grid-cols-2 gap-4">
-                
+                <div class="row-wrapper grid grid-cols-1 gap-4">
                     <div class="col-span-2 xmd:col-span-1 div-shadow" *ngIf="checkReport('learning_sessions', 'barChart')" id="chart">
                         <app-learning-sessions #learningSessions (exportReportData)="csvDownload($event)"></app-learning-sessions>
-                    </div></div>
+                    </div>
+				</div>
             </div>
         </div>
\ No newline at end of file
diff --git a/src/app/views/diksha/pages/learning-sessions-tab/learning-sessions-tab.component.ts b/src/app/views/diksha/pages/learning-sessions-tab/learning-sessions-tab.component.ts
index 83915b02..47ebda4e 100644
--- a/src/app/views/diksha/pages/learning-sessions-tab/learning-sessions-tab.component.ts
+++ b/src/app/views/diksha/pages/learning-sessions-tab/learning-sessions-tab.component.ts
@@ -42,7 +42,7 @@ constructor(private _wrapperService: WrapperService, private _rbacService: RbacS
 
     async ngAfterViewInit(): Promise<void> {
     if (this.hasCommonFilters) {
-        this.filters = await this._wrapperService.constructCommonFilters(config.filters,this.matLabel);
+        this.filters = await this._wrapperService.constructCommonFilters(config.filters,this.matLabel,undefined,undefined, true);
         this.learningSessions?.getReportData({ filterValues: this.filters.map((filter) => { return { ...filter, columnName: filter.valueProp, filterType: filter.id} }) });
         }
     if (this.startDate === undefined && this.endDate === undefined && this.hasTimeSeriesFilters) {
diff --git a/src/app/views/diksha/pages/learning-sessions-tab/reports/learning-sessions/learning-sessions.component.html b/src/app/views/diksha/pages/learning-sessions-tab/reports/learning-sessions/learning-sessions.component.html
index e2eecfe2..d7565557 100644
--- a/src/app/views/diksha/pages/learning-sessions-tab/reports/learning-sessions/learning-sessions.component.html
+++ b/src/app/views/diksha/pages/learning-sessions-tab/reports/learning-sessions/learning-sessions.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
                 <ng-container *ngIf="(reportData?.values && reportData?.values?.length > 0)">
-                    <p class="text-center font-medium py-2 filename" >{{title}}</p><br>
+                    <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p> -->
                     <sb-dashlet type="horizontalBar" [data]="reportData" [config]="config"></sb-dashlet>
                 </ng-container>
                 <div class="noData" *ngIf="!(reportData?.values && reportData?.values?.length > 0)">
diff --git a/src/app/views/home-page/home-page-old.component.html b/src/app/views/home-page/home-page-old.component.html
new file mode 100644
index 00000000..d9b53d8c
--- /dev/null
+++ b/src/app/views/home-page/home-page-old.component.html
@@ -0,0 +1,33 @@
+<div class="container-fluid" style=" height: 100%;">
+    <div class="justify-center">
+        <div class="row ">
+            <div class="col-2"></div>
+            <div class="col-2">
+                <div class="pull-right">
+                    <img src="../../../assets/images/left-lines.png" alt="" srcset="">
+                </div>
+            </div>
+            <div class="col-4 text-center">
+                <span class="welcometxt">Welcome</span><br>
+                <span class="tostyle">to</span>
+            </div>
+            <div class="col-2">
+                <img src="../../../assets/images/right-lines.png" alt="" srcset="">
+            </div>
+            <div class="col-2"></div>
+        </div>
+    </div>
+    <div class="flex justify-center mb-2">
+        <div class="text-center">
+            <span class="samikshadiv">NDEAR</span><br>
+            <span class="samikshadiv">VIDYA SAMIKSHA KENDRA</span><br>
+            <span class="selectRole">Please select your role</span>
+        </div>
+    </div>
+    <div class="flex flex-wrap justify-center">
+        <div class="" *ngFor="let role of roles">
+            <img id="cQb_dhsbrd" class="btn " class="officers" (click)="onRoleSelect(role)"
+                src="../../../assets//images/{{role.imageUrl}}" alt="" srcset="" id="{{role.id}}">
+        </div>
+    </div>
+</div>
diff --git a/src/app/views/home-page/home-page.component.html b/src/app/views/home-page/home-page.component.html
index d9b53d8c..b3275983 100644
--- a/src/app/views/home-page/home-page.component.html
+++ b/src/app/views/home-page/home-page.component.html
@@ -1,33 +1,125 @@
-<div class="container-fluid" style=" height: 100%;">
-    <div class="justify-center">
-        <div class="row ">
-            <div class="col-2"></div>
-            <div class="col-2">
-                <div class="pull-right">
-                    <img src="../../../assets/images/left-lines.png" alt="" srcset="">
-                </div>
-            </div>
-            <div class="col-4 text-center">
-                <span class="welcometxt">Welcome</span><br>
-                <span class="tostyle">to</span>
-            </div>
-            <div class="col-2">
-                <img src="../../../assets/images/right-lines.png" alt="" srcset="">
-            </div>
-            <div class="col-2"></div>
-        </div>
-    </div>
-    <div class="flex justify-center mb-2">
-        <div class="text-center">
-            <span class="samikshadiv">NDEAR</span><br>
-            <span class="samikshadiv">VIDYA SAMIKSHA KENDRA</span><br>
-            <span class="selectRole">Please select your role</span>
-        </div>
-    </div>
-    <div class="flex flex-wrap justify-center">
-        <div class="" *ngFor="let role of roles">
-            <img id="cQb_dhsbrd" class="btn " class="officers" (click)="onRoleSelect(role)"
-                src="../../../assets//images/{{role.imageUrl}}" alt="" srcset="" id="{{role.id}}">
-        </div>
-    </div>
-</div>
+<div class="home-wrapper">
+	<!-- Banner section starts -->
+	<div class="banner-sec">
+		 <img src="assets/images/banner-1.png" alt="banner" class="img-fluid">
+	</div>
+	<!-- Banner section ends -->
+	<section class="emp-sec section-padding">
+		<div class="container">
+			<div class="row">
+				<div class="col-md-12">
+					<!-- <div class="sub-heading-gradient">
+						<h2>Empowering Education Initiatives: Addressing the Imperatives</h2>
+					</div> -->
+					<img src="assets/images/head1.png" alt="heading" class="img-fluid">
+					<div class="emp-desc">
+						<p>Addressing the Imperatives of Education Initiatives The National Education Policy (NEP) 2020, alongside numerous schemes and programs administered by the Ministry of Education, encompasses diverse requirements aimed at benefiting various aspects of education and stakeholders. However, these initiatives encounter challenges in their implementation due to the absence of:
+						</p>
+						<ul class="blue-dot-list">
+							<li><span class="blue-text"> Real-time Visibility and Relevant Metrics: </span>The ability for stakeholders to gain timely insight into the progress of initiatives and access relevant metrics, enabling them to comprehend the ongoing developments effectively.</li>
+							<li><span class="blue-text">Insights into Effectiveness: </span>The capability to discern what aspects are functioning efficiently and what areas require improvement, facilitating informed decision-making and course corrections.</li>
+							<li><span class="blue-text">Coordination for Improvement: </span>The capacity to synchronise efforts across stakeholders for driving enhancements based on data-driven insights, fostering cohesive and timely actions.</li>
+						</ul>
+						<div class="text-center mb-4">
+							<img src="assets/images/emp.png" class="img-fluid" alt="empower">
+						</div>
+						<p>To address these challenges, there arises a pressing need for a comprehensive system that empowers stakeholders to monitor the progress of various education initiatives. Data emerges as the pivotal asset in the successful execution of these schemes at scale. <span class="blue-text">Efficient data collection, monitoring, correlation, and analysis are paramount,</span> as they enable prompt actions for the implementation of initiatives.</p>
+					</div>
+				</div>
+			</div>
+		</div>
+	</section>
+	<!-- Solution section -->
+	<section class="emp-sec">
+		<div class="container">
+			<div class="row">
+				<div class="col-md-12">
+					<img src="assets/images/head2-new.png" alt="heading" class="img-fluid">
+					<!-- <div class="sub-heading-gradient">
+						<h2>NDEAR-Compliant VSK</h2>
+					</div> -->
+					<!-- <div class="emp-desc">
+						<div>
+							<img src="assets/img/image-key.png" class="img-fluid" alt="key">
+						</div>
+					</div> -->
+				</div>
+			</div>
+			<div class="row">
+				<div class="col-md-12 col-lg-6 col-height-flex">
+					<img src="assets/images/key-xl-img.png" class="img-fluid key-img" alt="key">
+					<!-- <img src="assets/img/key-lg-image.png" class="img-fluid key-lg-img" alt="key"> -->
+					<img src="assets/images/key-mob-3.png" class="img-fluid key-tab-img" alt="key">
+					<img src="assets/images/key-mob.png" class="img-fluid key-mob-img" alt="key">
+				</div>   
+				<div class="col-md-12 col-lg-6 col-cust-height">
+					<div class="key-ben-box peach cust-lh">
+						<h3>Actionable Insights</h3>
+						<ul>
+							<li>Harnessing aggregated data from diverse schemes/programs under Samagra Siksha to visualize actionable insights.</li>
+							<li>Empowering administrators and teachers with data-driven decision-making capabilities at central and state levels.</li>
+						</ul>
+					</div>
+					<div class="key-ben-box yellow cust-lh">
+						<h3>Comprehensive Student Registry</h3>
+						<ul>
+							<li>Maintaining a student registry to track enrolled students, monitor learning at home, address dropouts, mainstream, and manage out-of-school children.
+							</li>
+							<li>Ensuring efficient delivery of textbooks and uniforms, managing scholarships and allowances, conducting school-based assessments, 
+								and providing necessary support to teachers and schools. </li>
+						</ul>
+					</div>
+					<div class="key-ben-box orange">
+						<h3>Enhanced Academic Performance</h3>
+						<ul>
+							<li>Improving academic performance by empowering teachers and schools through effective resource utilization. </li>
+							<li>Identifying and analyzing areas for improvement, addressing program gaps promptly.
+							</li>
+						</ul>
+					</div>
+					<div class="key-ben-box purple">
+						<h3>Centralized and Localized Dashboards</h3>
+						<ul>
+							<li>	Developing centralized and localized dashboards to provide continuous, updated insights into school performance indicators.</li>
+						</ul>
+					</div>
+					<div class="key-ben-box pink">
+						<h3>Empowering Field-Level Staff</h3>
+						<ul>
+							<li>Empowering field-level staff with insights relevant to their programs/schemes, guiding them to take actions that positively impact educational outcomes.</li>
+						</ul>
+					</div>
+					<div class="key-ben-box lpurple">
+						<h3>Efficient Data Capture</h3>
+						<ul>
+							<li>Implementing data phygitisation for efficient data capture, digitizing information from physical documents like attendance registers and mark sheets. This significantly reduces the time from data collection to entry, streamlining the process.</li>
+						</ul>
+					</div>
+				</div>    
+			</div>
+		</div>
+	</section>
+	<!-- Adoption section -->
+	<section class="adopt-sec section-padding">
+		<div class="container">
+			<div class="row">
+				<div class="col-md-12">
+					<img src="assets/images/head3.png" alt="heading" class="img-fluid">
+					<!-- <div class="sub-heading-gradient">
+						<h2>Adoption Across States</h2>
+					</div> -->
+					<div class="emp-desc">
+						<ul class="blue-dot-list">
+							<li>In collaboration with DIC, CIET-NCERT is spearheading the establishment of a dedicated team and a standardized package to facilitate the seamless adoption of NDEAR VSK across states and Union Territories (UTs). </li>
+							<li>This comprehensive package focuses on addressing the software aspect of VSK, offering versions equipped with standardized data integration and visualization features for key programs such as DIKSHA, UDISE, NAS, PM Poshan, and PGI. </li>
+							<li>This widespread adoption across diverse regions underscores the commitment to leveraging  VSK as a transformative tool for advancing education and improving learning outcomes on a national scale.</li>
+						</ul>
+						<div class="text-center map-img my-4">
+							<img src="assets/images/india-map3.png" class="img-fluid" alt="Map">
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</section>
+</div>
\ No newline at end of file
diff --git a/src/app/views/home-page/home-page.component.scss b/src/app/views/home-page/home-page.component.scss
index e15ba098..e1ed5f9c 100644
--- a/src/app/views/home-page/home-page.component.scss
+++ b/src/app/views/home-page/home-page.component.scss
@@ -1,299 +1,193 @@
-  .headerBtn {
-      color: #24223e;
-  }
-
-  .headerBtn:hover {
-      transition: transform .1s;
-      -ms-transform: scale(1.12);
-      -webkit-transform: scale(1.12);
-      transform: scale(1.12);
-      color: rgb(66, 148, 241);
-  }
-
-
-
-  #header {
-      height: 35px;
-  }
-
-  #logout {
-      padding: 1.5px;
-      cursor: pointer;
-      font-size: 13px;
-  }
-
-  .fa-sign-out {
-      font-size: 10px;
-  }
-
-  #cQb_dhsbrd_outer,
-  #admin_console_outer {
-      padding: 10px;
-      width: 250px;
-      margin: 0px auto;
-  }
-
-  #cQb_dhsbrd,
-  #admin_console {
-      width: 100%;
-      color: #fff;
-      font-family: 'Poppins', sans-serif;
-      font-style: normal;
-      font-size: 15px;
-  }
-
-
-  #admin_console:hover {
-      transition: transform .1s;
-      -ms-transform: scale(1.12);
-      -webkit-transform: scale(1.12);
-      transform: scale(1.12);
-      color: rgb(66, 148, 241);
-  }
-
-  .outer {
-      margin-top: 150px;
-  }
-
-  @media screen and (min-width: 1920px) {
-      #header {
-          height: 50px;
-      }
-
-      img {
-          height: 45px;
-          width: 120px;
-      }
-
-      #logout {
-          padding: 1.5px;
-          cursor: pointer;
-          font-size: 16px;
-      }
-
-      .fa-sign-out {
-          font-size: 14px;
-      }
-
-      #cQb_dhsbrd_outer,
-      #admin_console_outer {
-          padding: 14px;
-          width: 350px;
-          margin: 0px auto;
-      }
-
-      #cQb_dhsbrd {
-          width: 100%;
-          color: #ffff;
-          font-family: 'Poppins', sans-serif;
-          font-style: normal;
-          font-size: 18px;
-      }
-
-      #admin_console {
-          width: 100%;
-          border: 1px solid gray;
-          color: #284d8a;
-          font-size: 18px;
-      }
-
-      .outer {
-          margin-top: 220px;
-      }
-  }
-
-  @media screen and (min-width: 2520px) {
-      #header {
-          height: 60px;
-      }
-
-      img {
-          height: 55px;
-          width: 140px;
-      }
-
-      #logout {
-          padding: 2px;
-          cursor: pointer;
-          font-size: 22px;
-      }
-
-      .fa-sign-out {
-          font-size: 20px;
-      }
-
-      #cQb_dhsbrd_outer,
-      #admin_console_outer {
-          padding: 17px;
-          width: 450px;
-          margin: 0px auto;
-      }
-
-      #cQb_dhsbrd {
-          width: 100%;
-          color: #FFFFFF;
-          font-family: 'Poppins', sans-serif;
-          font-style: normal;
-          font-size: 26px;
-      }
-
-      #admin_console {
-          width: 100%;
-          border: 1px solid gray;
-          color: #284d8a;
-          font-size: 26px;
-      }
-
-      .outer {
-          margin-top: 300px;
-      }
-  }
-
-  @media screen and (min-width: 3820px) {
-      #header {
-          height: 65px !important;
-      }
-
-      img {
-          height: 60px !important;
-          width: 160px !important;
-      }
-
-      #logout {
-          padding: 2.2px !important;
-          cursor: pointer;
-          font-size: 28px !important;
-      }
-
-      .fa-sign-out {
-          font-size: 36px !important;
-      }
-
-      #cQb_dhsbrd_outer,
-      #admin_console_outer {
-          padding: 20px !important;
-          width: 550px !important;
-          margin: 0px auto;
-      }
-
-      #cQb_dhsbrd {
-          width: 100%;
-          color: #fff;
-          font-size: 38px !important;
-          font-family: 'Poppins', sans-serif;
-          font-style: normal;
-      }
-
-      #admin_console {
-          width: 100%;
-          border: 1px solid gray;
-          color: #284d8a;
-          font-size: 38px !important;
-      }
-
-      .outer {
-          margin-top: 550px !important;
-      }
-  }
-
-  .officers {
-      cursor: pointer;
-      width: 129px;
-      height: 145.23px;
-      margin-top: 70px;
-  }
-
-  .selectRole {
-      font-family: 'Poppins', sans-serif;
-      font-style: normal;
-      font-weight: 400;
-      font-size: 20px;
-      line-height: 30px;
-      color: #FFFFFF;
-  }
-
-  .naming {
-      font-family: 'Poppins', sans-serif;
-      font-style: normal;
-      font-weight: 400;
-      font-size: 20px;
-      color: #FFFFFF;
-  }
-
-  .message {
-      font-weight: 700;
-      font-size: 40px;
-  }
-
-  .row {
-      justify-content: space-around
-  }
-
-  .imagediv {
-      gap: 50px;
-  }
-
-  .text-center {
-    font-family: 'Poppins', sans-serif;
-    font-style: normal;
-    font-weight: 400;
-    font-size: 1.5rem;
-    color: #FFFFFF;
+.home-wrapper{
+	background-color: #fff !important;
 }
 
-  .selectRole {
-      font-family: 'Poppins', sans-serif;
-      font-style: normal;
-      font-weight: 400;
-      font-size: 20px;
-      line-height: 30px;
-      padding-top: 100px;
-  }
-
+.banner-sec img{
+  width: 100%;
+}
+p {
+    margin-top: 0;
+    margin-bottom: 1rem;
+}
+.section-padding {
+    padding: 40px 0;
+}
+.emp-desc p{
+	margin-bottom: 1rem;
+}
+.blue-dot-list li::marker {
+    color: #4C30F5;
+    font-size: 17px;
+}
+.blue-text {
+    color: #4C30F5;
+}
+.blue-dot-list::marker {
+    unicode-bidi: isolate;
+    font-variant-numeric: tabular-nums;
+    text-transform: none;
+    text-indent: 0px !important;
+    text-align: start !important;
+    text-align-last: start !important;
+}
+ul {
+    padding-left: 2rem;
+	margin-bottom: 1rem;
+	list-style-type: disc;
+}
 
-  .welcometxt {
-    font-family: 'Poppins', sans-serif;
-    font-style: normal;
-    font-weight: 400;
-    font-size: 2rem;
-    color: #FFFFFF;
+.col-height-flex {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.key-img {
+    display: block;
+}
+.key-img {
+    height: 900px;
+}
+.key-mob-img, .key-tab-img {
+    display: none;
+}
+.col-cust-height {
+    min-height: 923px;
 }
 
-.tostyle {
-    font-family: 'Samarkan', sans-serif;
-    font-style: normal;
-    font-weight: 400;
-    font-size: 20px;
-    line-height: 25px;
+.key-ben-box {
+    background-color: #ffffff;
+    box-shadow: 0px 0px 50px 0px rgba(210, 206, 233, 1);
+    position: relative;
+    padding: 10px 20px 5px 0;
+    margin-bottom: 15px;
+}
+.key-ben-box::before {
+    position: absolute;
+    content: ' ';
+    height: 100%;
+    width: 12px;
+    left: 0;
+    top: 0;
+}
+.key-ben-box h3 {
+    font-size: 18px;
+    font-weight: 700;
+    line-height: 23.4px;
+    border-bottom: 1px solid #EBEBEB;
+    margin-left: 2rem;
+    padding-bottom: 0.475rem;
+	margin-bottom: 8px;
+}
+.key-ben-box ul li {
+    position: relative;
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 18px;
+    padding-left: 20px;
+    list-style: none;
+    margin-bottom: 0.2rem;
+}
+.key-ben-box ul li::before {
+    height: 12px;
+    width: 12px;
+    position: absolute;
+    content: ' ';
+    left: 0;
+    border-radius: 50%;
+    top: 7px;
+}
+.key-ben-box.peach::before {
+    background-color: #F5845B;
+}
+li::before {
+    background-color: #F5845B;
+}
+.key-ben-box.yellow::before {
+    background-color: #FFB543;
+}
+.key-ben-box.yellow ul li::before {
+    background-color: #FFB543;
 }
 
-  .justify-center {
-      gap: 2rem;
-  }
+.key-ben-box.peach h3 {
+    color: #F5845B;
+}
+.key-ben-box.yellow h3 {
+    color: #FFB543;
+}
 
-  @media only screen and (max-width: 768px) {
+.key-ben-box.orange::before {
+    background-color: #D96C24;
+}
+.key-ben-box.orange h3 {
+    color: #D96C24;
+}
+.key-ben-box.orange ul li::before {
+    background-color: #D96C24;
+}
+.key-ben-box.purple::before {
+    background-color: #70367A;
+}
+.key-ben-box.purple h3 {
+    color: #70367A;
+}
+.key-ben-box.purple ul li::before {
+    background-color: #70367A;
+}
+.key-ben-box.pink::before {
+    background-color: #E3007B;
+}
+.key-ben-box.pink h3 {
+    color: #E3007B;
+}
+.key-ben-box.pink ul li::before {
+    background-color: #E3007B;
+}
+.key-ben-box.lpurple::before {
+    background-color: #A500C0;
+}
+.key-ben-box.lpurple h3 {
+    color: #A500C0;
+}
+.key-ben-box.lpurple ul li::before {
+    background-color: #A500C0;
+}
+.key-ben-box.lpurple h3 {
+    color: #A500C0;
+}
+.map-img {
+    margin: 0 auto;
+}
+.map-img img {
+    max-width: 50%;
+	margin: 0 auto;
+}
+@media (min-width: 1400px){
+	.container {
+		max-width: 1320px !important;
+	}
+}
 
-      /* For mobile phones: */
-      .text-center {
-          font-family: 'Poppins', sans-serif;
-          font-style: normal;
-          font-weight: 400;
-          font-size: 25px;
-          line-height: 54px;
-          color: #FFFFFF;
-      }
+@media (min-width: 768px) and (max-width: 991.98px){
+	.key-img {
+		display: none !important;
+	}
+}
 
-      .selectRole {
-          font-family: 'Poppins', sans-serif;
-          font-style: normal;
-          font-weight: 400;
-          font-size: 15px;
-          line-height: 30px;
-      }
-  }
+@media (min-width: 576px) and (max-width: 991px){
+	.key-img {
+		display: none !important;
+	}
+	.key-tab-img {
+		display: block !important;
+	}
+}
 
-  .samikshadiv {
-    font-weight: 700;
-    font-size: 40px;
-    line-height: 60px;
+@media (max-width: 576px){
+	.key-img {
+		display: none !important;
+	}
+	.key-mob-img {
+		display: block !important;
+	}
 }
diff --git a/src/app/views/home-page/hpme-page-old.component.scss b/src/app/views/home-page/hpme-page-old.component.scss
new file mode 100644
index 00000000..a588e839
--- /dev/null
+++ b/src/app/views/home-page/hpme-page-old.component.scss
@@ -0,0 +1,299 @@
+.headerBtn {
+	color: #24223e;
+}
+
+.headerBtn:hover {
+	transition: transform .1s;
+	-ms-transform: scale(1.12);
+	-webkit-transform: scale(1.12);
+	transform: scale(1.12);
+	color: rgb(66, 148, 241);
+}
+
+
+
+#header {
+	height: 35px;
+}
+
+#logout {
+	padding: 1.5px;
+	cursor: pointer;
+	font-size: 13px;
+}
+
+.fa-sign-out {
+	font-size: 10px;
+}
+
+#cQb_dhsbrd_outer,
+#admin_console_outer {
+	padding: 10px;
+	width: 250px;
+	margin: 0px auto;
+}
+
+#cQb_dhsbrd,
+#admin_console {
+	width: 100%;
+	color: #fff;
+	font-family: 'Poppins', sans-serif;
+	font-style: normal;
+	font-size: 15px;
+}
+
+
+#admin_console:hover {
+	transition: transform .1s;
+	-ms-transform: scale(1.12);
+	-webkit-transform: scale(1.12);
+	transform: scale(1.12);
+	color: rgb(66, 148, 241);
+}
+
+.outer {
+	margin-top: 150px;
+}
+
+@media screen and (min-width: 1920px) {
+	#header {
+		height: 50px;
+	}
+
+	img {
+		height: 45px;
+		width: 120px;
+	}
+
+	#logout {
+		padding: 1.5px;
+		cursor: pointer;
+		font-size: 16px;
+	}
+
+	.fa-sign-out {
+		font-size: 14px;
+	}
+
+	#cQb_dhsbrd_outer,
+	#admin_console_outer {
+		padding: 14px;
+		width: 350px;
+		margin: 0px auto;
+	}
+
+	#cQb_dhsbrd {
+		width: 100%;
+		color: #ffff;
+		font-family: 'Poppins', sans-serif;
+		font-style: normal;
+		font-size: 18px;
+	}
+
+	#admin_console {
+		width: 100%;
+		border: 1px solid gray;
+		color: #284d8a;
+		font-size: 18px;
+	}
+
+	.outer {
+		margin-top: 220px;
+	}
+}
+
+@media screen and (min-width: 2520px) {
+	#header {
+		height: 60px;
+	}
+
+	img {
+		height: 55px;
+		width: 140px;
+	}
+
+	#logout {
+		padding: 2px;
+		cursor: pointer;
+		font-size: 22px;
+	}
+
+	.fa-sign-out {
+		font-size: 20px;
+	}
+
+	#cQb_dhsbrd_outer,
+	#admin_console_outer {
+		padding: 17px;
+		width: 450px;
+		margin: 0px auto;
+	}
+
+	#cQb_dhsbrd {
+		width: 100%;
+		color: #FFFFFF;
+		font-family: 'Poppins', sans-serif;
+		font-style: normal;
+		font-size: 26px;
+	}
+
+	#admin_console {
+		width: 100%;
+		border: 1px solid gray;
+		color: #284d8a;
+		font-size: 26px;
+	}
+
+	.outer {
+		margin-top: 300px;
+	}
+}
+
+@media screen and (min-width: 3820px) {
+	#header {
+		height: 65px !important;
+	}
+
+	img {
+		height: 60px !important;
+		width: 160px !important;
+	}
+
+	#logout {
+		padding: 2.2px !important;
+		cursor: pointer;
+		font-size: 28px !important;
+	}
+
+	.fa-sign-out {
+		font-size: 36px !important;
+	}
+
+	#cQb_dhsbrd_outer,
+	#admin_console_outer {
+		padding: 20px !important;
+		width: 550px !important;
+		margin: 0px auto;
+	}
+
+	#cQb_dhsbrd {
+		width: 100%;
+		color: #fff;
+		font-size: 38px !important;
+		font-family: 'Poppins', sans-serif;
+		font-style: normal;
+	}
+
+	#admin_console {
+		width: 100%;
+		border: 1px solid gray;
+		color: #284d8a;
+		font-size: 38px !important;
+	}
+
+	.outer {
+		margin-top: 550px !important;
+	}
+}
+
+.officers {
+	cursor: pointer;
+	width: 129px;
+	height: 145.23px;
+	margin-top: 70px;
+}
+
+.selectRole {
+	font-family: 'Poppins', sans-serif;
+	font-style: normal;
+	font-weight: 400;
+	font-size: 20px;
+	line-height: 30px;
+	color: #FFFFFF;
+}
+
+.naming {
+	font-family: 'Poppins', sans-serif;
+	font-style: normal;
+	font-weight: 400;
+	font-size: 20px;
+	color: #FFFFFF;
+}
+
+.message {
+	font-weight: 700;
+	font-size: 40px;
+}
+
+.row {
+	justify-content: space-around
+}
+
+.imagediv {
+	gap: 50px;
+}
+
+.text-center {
+  font-family: 'Poppins', sans-serif;
+  font-style: normal;
+  font-weight: 400;
+  font-size: 1.5rem;
+  color: #FFFFFF;
+}
+
+.selectRole {
+	font-family: 'Poppins', sans-serif;
+	font-style: normal;
+	font-weight: 400;
+	font-size: 20px;
+	line-height: 30px;
+	padding-top: 100px;
+}
+
+
+.welcometxt {
+  font-family: 'Poppins', sans-serif;
+  font-style: normal;
+  font-weight: 400;
+  font-size: 2rem;
+  color: #FFFFFF;
+}
+
+.tostyle {
+  font-family: 'Samarkan', sans-serif;
+  font-style: normal;
+  font-weight: 400;
+  font-size: 20px;
+  line-height: 25px;
+}
+
+.justify-center {
+	gap: 2rem;
+}
+
+@media only screen and (max-width: 768px) {
+
+	/* For mobile phones: */
+	.text-center {
+		font-family: 'Poppins', sans-serif;
+		font-style: normal;
+		font-weight: 400;
+		font-size: 25px;
+		line-height: 54px;
+		color: #FFFFFF;
+	}
+
+	.selectRole {
+		font-family: 'Poppins', sans-serif;
+		font-style: normal;
+		font-weight: 400;
+		font-size: 15px;
+		line-height: 30px;
+	}
+}
+
+.samikshadiv {
+  font-weight: 700;
+  font-size: 40px;
+  line-height: 60px;
+}
diff --git a/src/app/views/micro-improvements/config/microimprovements_config.ts b/src/app/views/micro-improvements/config/microimprovements_config.ts
index e5ba35aa..d244c4c0 100644
--- a/src/app/views/micro-improvements/config/microimprovements_config.ts
+++ b/src/app/views/micro-improvements/config/microimprovements_config.ts
@@ -99,7 +99,31 @@ export const config = {
                 }
             }
     },
-
+    summary_metrics: {
+        "filters": [
+        {
+            "name": "National",
+            "hierarchyLevel": "0",
+            "actions": {
+                "queries": {
+                    // "bigNumber1": "select sum(sum) as total_states_uts from datasets.micro_improvements_started_state",
+                    "bigNumber1": "select dm.metric_value as total_states_uts from dimensions.mainmetrics dm where  dm.program_id='mip' and dm.metric_name ='Total States/UTs Participating' and dm.metric_type ='Key Metric'",
+                    // "bigNumber2": "select sum(sum) as total_mi_ongoing from datasets.micro_improvements_categorymicro_state0categorymicro where category_name = 'total_microimprovement_projects'",
+                    "bigNumber2": "select dm.metric_value as total_mi_ongoing from dimensions.mainmetrics dm where  dm.program_id='mip' and dm.metric_name ='Total Micro-Improvement Projects' and dm.metric_type ='Key Metric'",
+                },
+                "level": "state"
+            }
+        },
+    ],
+    "options": {
+        "bigNumber": {
+            "title": ['Total States/UTs Participating','Total Micro-Improvement Projects'],
+            "valueSuffix": ['',''],
+            "property": ['total_states_uts','total_mi_ongoing']
+      
+        }
+    }
+},
     micro_improvements_metrics: {
         "label": "Progress Status",
         "filters": [
@@ -108,11 +132,18 @@ export const config = {
                 "hierarchyLevel": "0",
                 "actions": {
                     "queries": {
-                        "bigNumber1": "select sum(sum) as total_mi_ongoing from datasets.micro_improvements_categorymicro_state0categorymicro where category_name = 'total_microimprovement_projects'",
-                        "bigNumber2": "select sum(sum) as total_mi_started from datasets.micro_improvements_categorymicro_state0categorymicro where category_name = 'total_microimprovement_started'",
-                        "bigNumber3": "select sum(sum) as total_mi_inprogress from datasets.micro_improvements_categorymicro_state0categorymicro where category_name = 'total_microimprovement_inprogress'",
-                        "bigNumber4": "select sum(sum) as total_mi_submitted from datasets.micro_improvements_categorymicro_state0categorymicro where category_name = 'total_microimprovement_submitted'",
-                        "bigNumber5": "select sum(sum) as total_mi_submitted_with_evidence from datasets.micro_improvements_categorymicro_state0categorymicro where category_name = 'total_microimprovement_submitted_with_evidence'",
+                        // "bigNumber1": "select sum(sum) as total_mi_ongoing from datasets.micro_improvements_categorymicro_state0categorymicro where category_name = 'total_microimprovement_projects'",
+                        // "bigNumber2": "select sum(sum) as total_mi_started from datasets.micro_improvements_categorymicro_state0categorymicro where category_name = 'total_microimprovement_started'",
+                        // "bigNumber3": "select sum(sum) as total_mi_inprogress from datasets.micro_improvements_categorymicro_state0categorymicro where category_name = 'total_microimprovement_inprogress'",
+                        // "bigNumber4": "select sum(sum) as total_mi_submitted from datasets.micro_improvements_categorymicro_state0categorymicro where category_name = 'total_microimprovement_submitted'",
+                        // "bigNumber5": "select sum(sum) as total_mi_submitted_with_evidence from datasets.micro_improvements_categorymicro_state0categorymicro where category_name = 'total_microimprovement_submitted_with_evidence'",
+
+                        "bigNumber1": "select dm.metric_value as total_mi_ongoing from dimensions.mainmetrics dm where  dm.program_id='mip' and dm.metric_name ='Total Micro Improvements Ongoing' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber2": "select dm.metric_value as total_mi_started from dimensions.mainmetrics dm where  dm.program_id='mip' and dm.metric_name ='Total Micro Improvements Started' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber3": "select dm.metric_value as total_mi_inprogress from dimensions.mainmetrics dm where  dm.program_id='mip' and dm.metric_name ='Total Micro Improvements In Progress' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber4": "select dm.metric_value as total_mi_submitted from dimensions.mainmetrics dm where  dm.program_id='mip' and dm.metric_name ='Total Micro Improvements Submitted' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber5": "select dm.metric_value as total_mi_submitted_with_evidence from dimensions.mainmetrics dm where  dm.program_id='mip' and dm.metric_name ='Total Micro Improvements Submitted with Evidence' and dm.metric_type ='Vanity Metric'",
+
                     },
                     "level": "state"
                 }
@@ -120,7 +151,7 @@ export const config = {
         ],
         "options": {
             "bigNumber": {
-                "title": ['Total Micro Improvements Ongoing', 'Total Micro Improvements Started', 'Total Micro Improvements In Progress', 'Total Micro Improvements Submitted', 'Total Micro Improvements Submitted with Evidence'],
+                "title": ['Total MicroImprovements Projects', 'Total MicroImprovements Started', 'Total MicroImprovements InProgress', 'Total MicroImprovements Submitted', 'Total MicroImprovements Submitted With Evidence'],
                 "valueSuffix": ['','','','',''],
                 "property": ['total_mi_ongoing', 'total_mi_started', 'total_mi_inprogress', 'total_mi_submitted', 'total_mi_submitted_with_evidence']
             }
diff --git a/src/app/views/micro-improvements/micro-improvements.component.html b/src/app/views/micro-improvements/micro-improvements.component.html
index 3781036a..95ce53c4 100644
--- a/src/app/views/micro-improvements/micro-improvements.component.html
+++ b/src/app/views/micro-improvements/micro-improvements.component.html
@@ -1,11 +1,28 @@
+<div class="program-banner-wrapper">
+	<img src="assets/images/micro-improvements-banner.png" alt="Micro Improvements Banner">
+</div>
 <div class="metric-card-wrapper">
     <div class="grid gap-4 grid-cols-6 xmd:grid-cols-12">
         <div class="col-span-12">
-            <p class="program-title">Micro-Improvements<em></em></p>
+            <p class="program-title">
+				<img src="assets/images/Micro%20Improvement.png" alt="logo">	Micro-Improvements<em></em>
+			</p>
+        </div>
+    </div>
+</div>
+<div class="col-span-full tab-wrapper" #target>
+    <div *ngIf="checkReport('micro_improvements_metrics', 'bigNumber1')" id="bignumber1">
+        <app-micro-improvements-metrics (exportReportData)="importBigNumberMetrics($event)"></app-micro-improvements-metrics>
+    </div>
+    <div class="row-wrapper grid grid-cols-5 gap-4">
+        <div class="col-span-2 xmd:col-span-1  bignumber-container" id="bignumber1"
+            *ngFor="let bigNumberData of bigNumberMetrics; let index = index">
+            <div *ngIf="checkReport('micro_improvements_metrics', 'bigNumber'+(index+1))">
+                <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
+            </div>
         </div>
     </div>
 </div>
-
 <div class="custom-tab-group-wrapper">
     <mat-tab-group [selectedIndex]="tabIndex" mat-align-tabs="start" animationDuration="0ms"
         (selectedTabChange)="onTabChanged($event)" appFullScreen>
diff --git a/src/app/views/micro-improvements/micro-improvements.component.ts b/src/app/views/micro-improvements/micro-improvements.component.ts
index 161796b1..4abff4af 100644
--- a/src/app/views/micro-improvements/micro-improvements.component.ts
+++ b/src/app/views/micro-improvements/micro-improvements.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { CommonService } from 'src/app/core/services/common/common.service';
 import { RbacService } from 'src/app/core/services/rbac-service.service';
@@ -8,7 +8,7 @@ import { config } from './config/microimprovements_config';
   templateUrl: './micro-improvements.component.html',
   styleUrls: ['./micro-improvements.component.scss']
 })
-export class MicroImprovementsComponent implements OnInit {
+export class MicroImprovementsComponent implements OnInit, AfterViewInit {
 
   loadTabs = false;
   rbacDetails: any;
@@ -16,6 +16,8 @@ export class MicroImprovementsComponent implements OnInit {
   selectedTabLabel;
   tabs: any = [];
   programName: any = 'pgi'
+  bigNumberMetrics: any = [];
+  @ViewChild('target') private myTarget:ElementRef;
 
   constructor(private route: ActivatedRoute, private _rbacService: RbacService, private _commonService: CommonService) {
     this.route.queryParams.subscribe((param: any) => {
@@ -43,6 +45,7 @@ export class MicroImprovementsComponent implements OnInit {
   }
 
   ngAfterViewInit(): void {
+	this._commonService.scrollInto(this.myTarget.nativeElement);
     setTimeout(() => {
       this.selectedTabLabel = this.tabs.length > 0 ? this.tabs[0] : undefined
     });
@@ -56,4 +59,24 @@ export class MicroImprovementsComponent implements OnInit {
       console.log('resize');
     }, 100);
   }
+
+checkReport(key: string, reportType: string): Boolean {
+    let reportConfig = config;
+    let flag = false;
+    reportConfig[key]?.filters?.forEach((filter: any) => {
+        if (Number(filter.hierarchyLevel) === Number(this.rbacDetails?.role) && Object.keys(filter?.actions?.queries).includes(reportType)) {
+        flag = true
+        }
+    })
+    return flag
+  }
+importBigNumberMetrics(bigNumberMetric: any) {
+    this.bigNumberMetrics[bigNumberMetric.ind] = bigNumberMetric.data
+}
+
+getMetricsArray() {
+    return this.bigNumberMetrics.filter((data) => {
+      return data.averagePercentage !== null || data.averagePercentage !== undefined
+    }) 
+  }
 }
diff --git a/src/app/views/micro-improvements/pages/implementation-status-tab/implementation-status-tab.component.html b/src/app/views/micro-improvements/pages/implementation-status-tab/implementation-status-tab.component.html
index 81a2ae1c..cd4484f4 100644
--- a/src/app/views/micro-improvements/pages/implementation-status-tab/implementation-status-tab.component.html
+++ b/src/app/views/micro-improvements/pages/implementation-status-tab/implementation-status-tab.component.html
@@ -6,17 +6,6 @@
         </div>
     </div>
     <div class="reports-row" >
-        <div *ngIf="checkReport('micro_improvements_metrics', 'bigNumber1')" id="bignumber1">
-            <app-micro-improvements-metrics (exportReportData)="importBigNumberMetrics($event)"></app-micro-improvements-metrics>
-        </div>
-        <div class="row-wrapper grid grid-cols-5 gap-4">
-            <div class="col-span-2 xmd:col-span-1  bignumber-container" id="bignumber1"
-                *ngFor="let bigNumberData of bigNumberMetrics; let index = index">
-                <div *ngIf="checkReport('micro_improvements_metrics', 'bigNumber'+(index+1))">
-                    <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
-                </div>
-            </div>
-        </div>
         <div class="row-wrapper grid grid-cols-1 gap-4">
             <div class="col-span-2 xmd:col-span-1 div-shadow" *ngIf="checkReport('implementation_status', 'map')" id="map">
                 <app-implementation-status #implementationstatus
diff --git a/src/app/views/micro-improvements/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html b/src/app/views/micro-improvements/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
index 289b8747..beb9650c 100644
--- a/src/app/views/micro-improvements/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
+++ b/src/app/views/micro-improvements/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename">{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename">{{title}}</p> -->
         <app-leaflet-map [mapData]="reportData" ></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/micro-improvements/pages/improvements-status-tab/reports/improvements-status/improvements-status.component.html b/src/app/views/micro-improvements/pages/improvements-status-tab/reports/improvements-status/improvements-status.component.html
index 289b8747..beb9650c 100644
--- a/src/app/views/micro-improvements/pages/improvements-status-tab/reports/improvements-status/improvements-status.component.html
+++ b/src/app/views/micro-improvements/pages/improvements-status-tab/reports/improvements-status/improvements-status.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename">{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename">{{title}}</p> -->
         <app-leaflet-map [mapData]="reportData" ></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/nas-apex/config/nas_apex_config.ts b/src/app/views/nas-apex/config/nas_apex_config.ts
new file mode 100644
index 00000000..af079ef8
--- /dev/null
+++ b/src/app/views/nas-apex/config/nas_apex_config.ts
@@ -0,0 +1,24 @@
+export const config = {     
+    summary_metrics: {
+        "filters": [
+            {
+                "name": "National",
+                "hierarchyLevel": "0",
+                "actions": {
+                    "queries": {
+                        "bigNumber1": "select dm.metric_value as total_school_served from dimensions.mainmetrics dm where  dm.program_id='nas' and dm.metric_name ='Total Schools Surveyed' and dm.metric_type ='Key Metric'",
+                        "bigNumber2": "select dm.metric_value as total_student_served from dimensions.mainmetrics dm where  dm.program_id='nas' and dm.metric_name ='Total Students Surveyed' and dm.metric_type ='Key Metric'",
+                    },
+                    "level": "state"
+                }
+            },
+        ],
+        "options": {
+            "bigNumber": {
+                "title": ['Total Schools Surveyed', 'Total Students Surveyed'],
+                "valueSuffix": ['', ''],
+                "property": ['total_school_served', 'total_student_served'],
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/app/views/nas-apex/nas-apex-routing.module.ts b/src/app/views/nas-apex/nas-apex-routing.module.ts
new file mode 100644
index 00000000..14da405b
--- /dev/null
+++ b/src/app/views/nas-apex/nas-apex-routing.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { NasComponent } from './nas-apex.component';           
+const routes: Routes = [
+    {
+        path:'',
+        component: NasComponent
+    }
+];
+@NgModule({
+    imports: [RouterModule.forChild(routes)],
+    exports: [RouterModule]
+})
+export class NasApexRoutingComponent { }
\ No newline at end of file
diff --git a/src/app/views/nas-apex/nas-apex.component.html b/src/app/views/nas-apex/nas-apex.component.html
new file mode 100644
index 00000000..f2b8cd4b
--- /dev/null
+++ b/src/app/views/nas-apex/nas-apex.component.html
@@ -0,0 +1,18 @@
+<div class="program-banner-wrapper">
+	<img src="assets/images/nas-banner.png" alt="NAS Banner">
+</div>
+<div class="metric-card-wrapper" #target>
+    <div class="grid gap-4 grid-cols-6 xmd:grid-cols-12">
+        <div class="col-span-12">
+            <p class="program-title ">
+			  <img src="assets/images/nas.png" alt="logo"> National Achievement Survey <em><small>(NAS)</small></em>
+			</p>
+            <p class="program-desc">The National Achievement Survey (NAS) is a nationally representative large-scale
+                survey of students' learning undertaken by the Ministry of Education, Government of India.</p>
+        </div>
+    </div>
+</div>
+
+<div class="custom-tab-group-wrapper" style="height: 1200px; max-height: 1500px; min-height: 300px;">
+    <iframe width="100%" height="100%" frameBorder="0" [src]="urlSafe" 	target="_parent" loading="lazy"> </iframe>
+</div>
\ No newline at end of file
diff --git a/src/app/views/nas-apex/nas-apex.component.scss b/src/app/views/nas-apex/nas-apex.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/views/nas-apex/nas-apex.component.spec.ts b/src/app/views/nas-apex/nas-apex.component.spec.ts
new file mode 100644
index 00000000..de6a2bb8
--- /dev/null
+++ b/src/app/views/nas-apex/nas-apex.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NasComponent } from './nas-apex.component';
+
+describe('NasComponent', () => {
+    let component: NasComponent;
+    let fixture: ComponentFixture<NasComponent>;
+
+    beforeEach(async () => {
+    await TestBed.configureTestingModule({
+        declarations: [ NasComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(NasComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    });
+
+    it('should create', () => {
+    expect(component).toBeTruthy();
+    });
+});
diff --git a/src/app/views/nas-apex/nas-apex.component.ts b/src/app/views/nas-apex/nas-apex.component.ts
new file mode 100644
index 00000000..b95efd7b
--- /dev/null
+++ b/src/app/views/nas-apex/nas-apex.component.ts
@@ -0,0 +1,88 @@
+
+import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { CommonService } from 'src/app/core/services/common/common.service';
+import { RbacService } from 'src/app/core/services/rbac-service.service';
+import { config } from './config/nas_apex_config';
+import { environment } from 'src/environments/environment';
+import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
+
+@Component({
+    selector: 'app-nas',
+    templateUrl: './nas-apex.component.html',
+    styleUrls: ['./nas-apex.component.scss']
+})
+export class NasComponent implements OnInit, AfterViewInit {
+    loadTabs = false;
+    rbacDetails: any;
+    tabIndex;
+    selectedTabLabel;
+    tabs: any = [];
+    programName: any = 'nas-apex';
+    bigNumberMetrics: any = [];
+    NVSK: boolean = true;
+    url:string = 'https://vskdev-apex.diksha.gov.in/ords/r/vskdev/nas';
+    urlSafe: SafeResourceUrl;
+	@ViewChild('target') private myTarget:ElementRef;
+
+    constructor(private route: ActivatedRoute, private sanitizer: DomSanitizer, private _rbacService: RbacService, private _commonService: CommonService) {
+        this.route.queryParams.subscribe((param: any) => {
+            this.tabIndex = param.tab ? Number(param.tab) : 0;
+        })
+        this._rbacService.getRbacDetails().subscribe((rbacDetails: any) => {
+            this.rbacDetails = rbacDetails;
+        })
+        let allTabs = [...Object.keys(config)]
+        allTabs.forEach((tab: any) => {
+            config?.[tab]?.filters?.every((filter) => {
+                if ((Number(filter?.hierarchyLevel) === this.rbacDetails?.role) || this.rbacDetails?.role === 0) {
+                    if (!(this.tabs.includes(config?.[tab]?.label))) {
+                        this.tabs.push(config?.[tab]?.label)
+                    }
+                    return false
+                }
+                return true
+            })
+        })
+        if(environment.config === 'VSK') {
+            this.NVSK = false;
+        }
+    }
+
+    ngOnInit(): void {
+        this.urlSafe = this.sanitizer.bypassSecurityTrustResourceUrl(this.url);
+        this._commonService.getMetaData(this.programName).subscribe()
+    }
+
+    ngAfterViewInit(): void {
+		this._commonService.scrollInto(this.myTarget.nativeElement);
+        setTimeout(() => {
+            this.selectedTabLabel = this.tabs.length > 0 ? this.tabs[0] : undefined
+        });
+    }
+
+    onTabChanged($event: any): void {
+        this.selectedTabLabel = $event?.tab?.textLabel;
+        this.tabIndex = $event.index;
+        setTimeout(() => {
+            window.dispatchEvent(new Event('resize'));
+            console.log('resize');
+        }, 100);
+    }
+
+    checkReport(key: string, reportType: string): Boolean {
+        let reportConfig = config;
+        let flag = false;
+        reportConfig[key]?.filters?.forEach((filter: any) => {
+            if (Number(filter.hierarchyLevel) === Number(this.rbacDetails?.role) && Object.keys(filter?.actions?.queries).includes(reportType)) {
+                flag = true
+            }
+        })
+        return flag
+    }
+
+    importBigNumberMetrics(bigNumberMetric: any) {
+        this.bigNumberMetrics[bigNumberMetric.ind] = bigNumberMetric.data
+    }
+
+}
diff --git a/src/app/views/nas-apex/nas-apex.module.ts b/src/app/views/nas-apex/nas-apex.module.ts
new file mode 100644
index 00000000..b5167f8a
--- /dev/null
+++ b/src/app/views/nas-apex/nas-apex.module.ts
@@ -0,0 +1,23 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MatTabsModule } from '@angular/material/tabs';
+import { SharedModule } from 'src/app/shared/shared.module';
+import { DashletModule, DataService } from '@project-sunbird/sb-dashlet';
+import {NasApexRoutingComponent} from './nas-apex-routing.module';
+import {NasComponent} from './nas-apex.component';
+
+@NgModule({
+declarations: [
+    NasComponent,
+   ],
+imports: [
+    DashletModule.forRoot({
+        dataService: DataService
+    }),
+    MatTabsModule,
+    SharedModule,
+    CommonModule,
+    NasApexRoutingComponent
+]
+})
+export class NasApexModule { }
diff --git a/src/app/views/nas/config/nas_config.ts b/src/app/views/nas/config/nas_config.ts
index cb30ce6d..96f7482b 100644
--- a/src/app/views/nas/config/nas_config.ts
+++ b/src/app/views/nas/config/nas_config.ts
@@ -7,7 +7,8 @@ export const config = {
             "tableAlias": "t",
             "labelProp": "grade",
             "valueProp": "grade",
-            "query": "select grade from datasets.nas_performance_grade"
+            "columnName": "grade",
+            "query": "select grade from datasets.nas_performance_grade as t"
         },
         {
             "label": "District Wise Performance",
@@ -16,7 +17,8 @@ export const config = {
             "tableAlias": "t",
             "labelProp": "subject",
             "valueProp": "subject",
-            "query": "select subject from datasets.nas_performance_subject"
+            "columnName": "subject",
+            "query": "select distinct(subject) from datasets.nas_performance_district0lonas0subject0grade as t order by subject"
         },
         {
             "label": "District Wise Performance",
@@ -25,25 +27,49 @@ export const config = {
             "id": "lo_code",
             "labelProp": "lo_code",
             "valueProp": "lo_code",
-            "query": "select lo_code from datasets.nas_performance_lonas"
+            "columnName": "lo_code",
+            "query": "select distinct(lo_code) from datasets.nas_performance_district0lonas0subject0grade as t order by lo_code"
+        },
+        {
+            "label": "District Wise Performance",
+            "name": "State",
+            "id": "state_name",
+            "labelProp": "state_name",
+            "valueProp": "state_name",
+            "columnName": "state_name",
+            "selectDefaultValue": false,
+            "query": "select distinct(state_name) from datasets.nas_performance_state0lonas0subject0grade as t join dimensions.state as d on d.state_id = t.state_id order by state_name"
         },
         {
             "label": "Grade & Subject Performance",
             "name": "Grade",
+            "tableAlias": "t",
             "id": "grade",
             "labelProp": "grade",
             "valueProp": "grade",
-            "query": "select grade from datasets.nas_performance_grade"
+            "columnName": "grade",
+            "query": "select grade from datasets.nas_performance_grade as t"
         },
         {
             "label": "Grade & Subject Performance",      
             "name": "Subject",
             "id": "subject",
+            "tableAlias": "t",
             "labelProp": "subject",
             "valueProp": "subject",
-            "query": "select subject from datasets.nas_performance_subject"
+            "columnName": "subject",
+            "query": "select distinct(subject) from datasets.nas_performance_state0lonas0subject0grade as t order by subject"
+        },
+        {
+            "label": "Grade & Subject Performance",
+            "name": "State",
+            "id": "state_name",
+            "labelProp": "state_name",
+            "valueProp": "state_name",
+            "columnName": "state_name",
+            "selectDefaultValue": false,
+            "query": "select distinct(state_name) from datasets.nas_performance_state0lonas0subject0grade as t join dimensions.state as d on d.state_id = t.state_id order by state_name"
         },
-      
         {
             "label": "State Wise Performance",
             "name": "Grade",
@@ -51,7 +77,8 @@ export const config = {
             "tableAlias": "t",
             "labelProp": "grade",
             "valueProp": "grade",
-            "query": "select grade from datasets.nas_performance_grade"
+            "columnName": "grade",
+            "query": "select grade from datasets.nas_performance_grade as t"
         },
         {
             "label": "State Wise Performance",
@@ -60,16 +87,18 @@ export const config = {
             "tableAlias": "t",
             "labelProp": "subject",
             "valueProp": "subject",
-            "query": "select subject from datasets.nas_performance_subject"
+            "columnName": "subject",
+            "query": "select distinct(subject) from datasets.nas_performance_state0lonas0subject0grade as t order by subject"
         },
         {
             "label": "State Wise Performance",
             "name": "Learning Outcome Code",
-            "tableAlias": "t",
             "id": "lo_code",
+            "tableAlias": "t",
             "labelProp": "lo_code",
             "valueProp": "lo_code",
-            "query": "select lo_code from datasets.nas_performance_lonas"
+            "columnName": "lo_code",
+            "query": "select distinct(lo_code) from datasets.nas_performance_state0lonas0subject0grade as t order by lo_code"
         },
 
     ],
@@ -93,7 +122,7 @@ export const config = {
                 "metricFilterNeeded": false,
                 "indicator": "status",
                 "legend": {
-                    "title": "Implemented NAs"
+                    "title": "Implemented NAS"
                 },
                 "tooltipMetrics": [
                     {
@@ -189,6 +218,9 @@ export const config = {
                     "queries": {
                         "table": "select t.lo_code, grade, subject, round(cast(avg(t.sum) as numeric),2) as performance, state_name, state_name as location from datasets.nas_performance_state0lonas0subject0grade as t join dimensions.state as d on t.state_id = d.state_id group by t.state_id, state_name, subject, grade, t.lo_code"
                     },
+                    "queriesState": {
+                        "table": "select t.lo_code, grade, subject, ROUND(CAST(avg(t.sum) AS numeric), 2) AS performance, district_name, district_name as location from datasets.nas_performance_district0lonas0subject0grade as t join dimensions.district as d on t.district_id = d.district_id group by t.district_id, district_name, subject, grade, t.lo_code, t.lo_code"
+                    },
                     "level": "district",
                     "nextLevel": "block"
                 }
@@ -237,15 +269,18 @@ export const config = {
                             type: "percentage",
                             values: [
                                 {
-                                    color: "#007000",
+                                   // color: "#007000",
+                                    color: "#1D4586",
                                     breakPoint: 70
                                 },
                                 {
-                                    color: "#FFBF00",
+                                  //  color: "#FFBF00",
+                                    color: "#1156CC",
                                     breakPoint: 40
                                 },
                                 {
-                                    color: "#D2222D",
+                                  //  color: "#D2222D",
+                                    color: "#6D9FEB",
                                     breakPoint: 0
                                 }
                             ]
@@ -258,6 +293,29 @@ export const config = {
         }
     },
 
+    summary_metrics: {
+        "filters": [
+        {
+            "name": "National",
+            "hierarchyLevel": "0",
+            "actions": {
+                "queries": {
+                    "bigNumber1": "select dm.metric_value as total_school_served from dimensions.mainmetrics dm where  dm.program_id='nas' and dm.metric_name ='Total Schools Surveyed' and dm.metric_type ='Key Metric'",
+                    "bigNumber2": "select dm.metric_value as total_student_served from dimensions.mainmetrics dm where  dm.program_id='nas' and dm.metric_name ='Total Students Surveyed' and dm.metric_type ='Key Metric'",
+                    },
+                "level": "state"
+            }
+        },
+    ],
+    "options": {
+        "bigNumber": {
+            "title": ['Total Schools Surveyed','Total Students Surveyed'],
+            //"valueSuffix": ['L', 'L'],
+            "valueSuffix": ['', ''],
+            "property": ['total_school_served', 'total_student_served'],          
+        }
+    }
+},
     nas_metrics: {
         "label": "District Wise Performance",
         "filters": [
@@ -266,12 +324,10 @@ export const config = {
                 "hierarchyLevel": "0",
                 "actions": {
                     "queries": {
-                        "bigNumber1": "",
-                        "bigNumber2": "",
-                        "bigNumber3": "select sum(sum) as total_teachers from datasets.nas_no_of_teachers_state",
-                        "bigNumber4": "select count(distinct state_id) as total_states from datasets.nas_started_state where sum > 0",
-                        "bigNumber5": ""
-                    },
+                        "bigNumber1": "select count(distinct state_id) as total_states from datasets.nas_started_state where sum > 0",
+                        "bigNumber2": "select count(lo_code) as total_lo_tested from datasets.nas_no_of_teachers_lonas",
+                        "bigNumber3": "select dm.metric_value as total_teachers from dimensions.mainmetrics dm where  dm.program_id='nas' and dm.metric_name ='Total Teachers' and dm.metric_type ='Vanity Metric'"
+                        },
                     "level": "State"
                 }
             },
@@ -280,19 +336,20 @@ export const config = {
                 "hierarchyLevel": "1",
                 "actions": {
                     "queries": {
-                        "bigNumber1": "select sum(a.sum) as total_schools from datasets.nas_schools_fmfdoxoqhb0gdwdvfaya as a",
-                        "bigNumber2": "select sum(a.sum) as students_surveyed from datasets.nas_students_surveyed_state as a",
-                        "bigNumber3": "select sum(a.sum) as total_teachers from datasets.nas_teachers_bnfzbxamehcadbehbxqg as a",
-                    },
+                        "bigNumber1": "select count(distinct state_id) as total_states from datasets.nas_started_state where sum > 0",
+                        "bigNumber2": "select count(lo_code) as total_lo_tested from datasets.nas_no_of_teachers_lonas",
+                        "bigNumber3": "select dm.metric_value as total_teachers from dimensions.mainmetrics dm where  dm.program_id='nas' and dm.metric_name ='Total Teachers' and dm.metric_type ='Vanity Metric'"
+                        },
                     "level": "district"
                 }
             },
         ],
         "options": {
             "bigNumber": {
-                "title": ['Total Schools', 'Total Students Surveyed', 'Total Teachers', 'Total States/UTs Participating', 'Total LOs Tested'],
-                "valueSuffix": ['', '', '', '', ''],
-                "property": ['total_schools', 'students_surveyed', 'total_teachers', 'total_states', 'total_lo_tested']
+                "title": ['Total States/UTs Participating', 'Total LOs Tested', 'Total Teachers'],
+				//"valueSuffix": ['', '','L'],
+                "valueSuffix": ['', '',''],
+                "property": ['total_states', 'total_lo_tested','total_teachers']
             }
         }
     },
@@ -308,7 +365,7 @@ export const config = {
                     {
                         "queries":
                         {
-                            "map":"select latitude, longitude, t.state_id, state_name,lo_name, round(cast(avg(t.sum) as numeric ),2) as performance from datasets.nas_performance_state0lonas0subject0grade as t join dimensions.state as s on t.state_id = s.state_id join dimensions.lonas as lo on t.lo_code = lo.lo_code group by t.state_id, state_name, lo_name, latitude, longitude"
+                            "map":"select latitude, longitude, t.state_id, state_name,lo_name, round(cast(avg(t.avg) as numeric ),2) as performance from datasets.nas_performance_state0lonas0subject0grade as t join dimensions.state as s on t.state_id = s.state_id join dimensions.lonas as lo on t.lo_code = lo.lo_code group by t.state_id, state_name, lo_name, latitude, longitude"
                         },
                         "level": "state",
                         "nextLevel": "district"
diff --git a/src/app/views/nas/nas.component.html b/src/app/views/nas/nas.component.html
index 5cb8aac2..f948a19c 100644
--- a/src/app/views/nas/nas.component.html
+++ b/src/app/views/nas/nas.component.html
@@ -1,41 +1,48 @@
+<div class="program-banner-wrapper">
+	<img src="assets/images/nas-banner.png" alt="NAS Banner">
+</div>
 <div class="metric-card-wrapper">
     <div class="grid gap-4 grid-cols-6 xmd:grid-cols-12">
         <div class="col-span-12">
-            <p class="program-title ">National Achievement Survey <em><small>(NAS)</small></em></p>
+            <p class="program-title ">
+			  <img src="assets/images/nas.png" alt="logo"> National Achievement Survey <em><small>(NAS)</small></em>
+			</p>
             <p class="program-desc">The National Achievement Survey (NAS) is a nationally representative large-scale
                 survey of students' learning undertaken by the Ministry of Education, Government of India.</p>
+    </div>
+    </div>
+</div>
+<div class="col-span-full tab-wrapper" *ngIf="NVSK" #target>
+    <div *ngIf="checkReport('nas_metrics', 'bigNumber1')" id="bignumber1">
+        <app-nas-bignumber-metrics (exportReportData)="importBigNumberMetrics($event)"></app-nas-bignumber-metrics>
+    </div>
+    <div class="row-wrapper grid grid-cols-5 gap-4">
+        <div class="col-span-2 xmd:col-span-1  bignumber-container" id="bignumber1"
+            *ngFor="let bigNumberData of bigNumberMetrics; let index = index">
+            <div *ngIf="checkReport('nas_metrics', 'bigNumber'+(index+1))">
+                <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
+            </div>
         </div>
     </div>
 </div>
-
 <div class="custom-tab-group-wrapper">
     <mat-tab-group [selectedIndex]="tabIndex" mat-align-tabs="start" animationDuration="0ms"
         (selectedTabChange)="onTabChanged($event)" appFullScreen>
-        <div *ngIf="checkReport('nas_metrics', 'bigNumber1')" id="bignumber1">
-            <app-nas-bignumber-metrics
-                (exportReportData)="importBigNumberMetrics($event)"></app-nas-bignumber-metrics>
-        </div>
-
         <mat-tab label='Implementation Status' *ngIf="tabs.includes('Implementation Status')">
             <app-nas-implementation-status-tab [bigNumberMetrics]="bigNumberMetrics"
                 *ngIf="selectedTabLabel === 'Implementation Status'"></app-nas-implementation-status-tab>
         </mat-tab>
-
-
         <mat-tab label='State Wise Performance' *ngIf="tabs.includes('State Wise Performance')">
             <app-nas-state-wise-performance-tab
                 *ngIf="selectedTabLabel === 'State Wise Performance'"></app-nas-state-wise-performance-tab>
         </mat-tab>
-
         <mat-tab label='District Wise Performance' *ngIf="tabs.includes('District Wise Performance')">
             <app-district-wise-performance-tab [bigNumberMetrics]="bigNumberMetrics"
                 *ngIf="selectedTabLabel === 'District Wise Performance'"></app-district-wise-performance-tab>
         </mat-tab>
-
         <mat-tab label='Grade & Subject Performance' *ngIf="tabs.includes('Grade & Subject Performance')">
             <app-grade-and-subject-performance-tab
                 *ngIf="selectedTabLabel === 'Grade & Subject Performance'"></app-grade-and-subject-performance-tab>
         </mat-tab>       
-
     </mat-tab-group>
 </div>
\ No newline at end of file
diff --git a/src/app/views/nas/nas.component.ts b/src/app/views/nas/nas.component.ts
index beb06f1d..5c768988 100644
--- a/src/app/views/nas/nas.component.ts
+++ b/src/app/views/nas/nas.component.ts
@@ -1,16 +1,17 @@
 
-import { Component, OnInit } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { CommonService } from 'src/app/core/services/common/common.service';
 import { RbacService } from 'src/app/core/services/rbac-service.service';
 import { config } from './config/nas_config';
+import { environment } from 'src/environments/environment';
 
 @Component({
     selector: 'app-nas',
     templateUrl: './nas.component.html',
     styleUrls: ['./nas.component.scss']
 })
-export class NasComponent implements OnInit {
+export class NasComponent implements OnInit, AfterViewInit {
     loadTabs = false;
     rbacDetails: any;
     tabIndex;
@@ -18,7 +19,9 @@ export class NasComponent implements OnInit {
     tabs: any = [];
     programName: any = 'nas';
     bigNumberMetrics: any = [];
-    
+    NVSK: boolean = true;
+    @ViewChild('target') private myTarget:ElementRef;
+
 constructor(private route: ActivatedRoute, private _rbacService: RbacService, private _commonService: CommonService) { 
     this.route.queryParams.subscribe((param: any) => {
         this.tabIndex = param.tab ? Number(param.tab) : 0;
@@ -38,13 +41,20 @@ constructor(private route: ActivatedRoute, private _rbacService: RbacService, pr
         return true
         })
     })
+
+    if(environment.config === 'VSK') {
+        this.NVSK = false;
+    }
+
     }
 
+
     ngOnInit(): void {
         this._commonService.getMetaData(this.programName).subscribe()
     }
 
     ngAfterViewInit(): void {
+		this._commonService.scrollInto(this.myTarget.nativeElement);
     setTimeout(() => {
         this.selectedTabLabel = this.tabs.length > 0 ? this.tabs[0] : undefined
     });
@@ -55,7 +65,6 @@ constructor(private route: ActivatedRoute, private _rbacService: RbacService, pr
     this.tabIndex = $event.index;
     setTimeout(() => {
         window.dispatchEvent(new Event('resize'));
-        console.log('resize');
     }, 100);
     }
 
@@ -73,5 +82,4 @@ constructor(private route: ActivatedRoute, private _rbacService: RbacService, pr
     importBigNumberMetrics(bigNumberMetric: any) {
         this.bigNumberMetrics[bigNumberMetric.ind] = bigNumberMetric.data
     }
-
 }
diff --git a/src/app/views/nas/pages/district-wise-performance-tab/district-wise-performance-tab.component.html b/src/app/views/nas/pages/district-wise-performance-tab/district-wise-performance-tab.component.html
index 6edb8e0d..24d04e01 100644
--- a/src/app/views/nas/pages/district-wise-performance-tab/district-wise-performance-tab.component.html
+++ b/src/app/views/nas/pages/district-wise-performance-tab/district-wise-performance-tab.component.html
@@ -2,7 +2,7 @@
     <div class="filter-row grid grid-cols-5">
         <div class="xmd:col-span-3 col-span-5">
             <app-filter-panel  [filters]="filters" (filtersUpdated)="filtersUpdated($event)"
-                colSize="lg:col-span-4 col-span-6"></app-filter-panel>
+                colSize="lg:col-span-3 col-span-6"></app-filter-panel>
         </div>
         <div class="download-button xmd:col-start-4 xmd:col-end-6 col-span-5 flex">
             <!-- <app-popup-options [data]="reportsData" [reportName]="'nas_district_wise'" ></app-popup-options> -->
diff --git a/src/app/views/nas/pages/district-wise-performance-tab/district-wise-performance-tab.component.ts b/src/app/views/nas/pages/district-wise-performance-tab/district-wise-performance-tab.component.ts
index e7197a7e..0b137b21 100644
--- a/src/app/views/nas/pages/district-wise-performance-tab/district-wise-performance-tab.component.ts
+++ b/src/app/views/nas/pages/district-wise-performance-tab/district-wise-performance-tab.component.ts
@@ -51,23 +51,7 @@ export class DistrictWisePerformanceTabComponent implements OnInit, AfterViewIni
     async ngAfterViewInit(): Promise<void> {
         if (this.hasCommonFilters) {
             this.filters = await this._wrapperService.constructCommonFilters(config.filters, this.tabLabel);
-            // this.filters.map((a) => {
-            //     let allObj = {
-            //         "value": "all",
-            //         "label": "All"
-            //     }
-            //     var index = a.options.findIndex(x => x.value == "all");
-            //     if (index === -1) {
-            //         a.options.push(allObj)
-            //         a.options.map((item, i) => {
-            //             if (item.value === "all") {
-            //                 a.options.splice(i, 1);
-            //                 a.options.unshift(item);
-            //             }
-            //         })
-            //         a.value = "all"
-            //     }
-            // })
+            this.filters = await this._wrapperService.updateDependantFilters(this.filters,0);
             this.districtWisePerformance?.getReportData({ filterValues: this.filters.map((filter) => { return { ...filter, columnName: filter.valueProp, filterType: filter.id } }) });
             this.nasMetrics?.getReportData({ filterValues: this.filters.map((filter) => { return { ...filter, columnName: filter.valueProp, filterType: filter.id } }) });
         }
@@ -98,7 +82,16 @@ export class DistrictWisePerformanceTabComponent implements OnInit, AfterViewIni
         }
     }
 
-    filtersUpdated(filters: any) {
+    async filtersUpdated(filters: any) {
+        let updatedIndex = 0;
+        for (let index = 0; index < filters.length; index++) {
+            if(filters[index].isUpdated){
+                updatedIndex = index;
+                break;
+            }
+        };
+        this.filters = await this._wrapperService.updateDependantFilters(this.filters, updatedIndex);
+        
         this.reportsData = [];
         this.districtWisePerformance?.getReportData({ filterValues: filters.map((filter) => { return { ...filter, columnName: filter.valueProp, filterType: filter.id } }) });
         // this.nasMetrics?.getReportData({ filterValues: filters.map((filter) => { return { ...filter, columnName: filter.valueProp, filterType: filter.id } }) });
diff --git a/src/app/views/nas/pages/district-wise-performance-tab/reports/district-wise-performance/district-wise-performance.component.html b/src/app/views/nas/pages/district-wise-performance-tab/reports/district-wise-performance/district-wise-performance.component.html
index 9ad51506..74eab893 100644
--- a/src/app/views/nas/pages/district-wise-performance-tab/reports/district-wise-performance/district-wise-performance.component.html
+++ b/src/app/views/nas/pages/district-wise-performance-tab/reports/district-wise-performance/district-wise-performance.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename">{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename">{{title}}</p> -->
         <app-leaflet-map [mapData]="reportData" level="district"></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/nas/pages/grade-and-subject-performance-tab/grade-and-subject-performance-tab.component.ts b/src/app/views/nas/pages/grade-and-subject-performance-tab/grade-and-subject-performance-tab.component.ts
index b2c06a6e..5b1de9bb 100644
--- a/src/app/views/nas/pages/grade-and-subject-performance-tab/grade-and-subject-performance-tab.component.ts
+++ b/src/app/views/nas/pages/grade-and-subject-performance-tab/grade-and-subject-performance-tab.component.ts
@@ -43,6 +43,7 @@ constructor(private _wrapperService: WrapperService, private _rbacService: RbacS
     async ngAfterViewInit(): Promise<void> {
     if (this.hasCommonFilters) {
         this.filters = await this._wrapperService.constructCommonFilters(config.filters, this.tabLabel);
+        this.filters = await this._wrapperService.updateDependantFilters(this.filters, 0);
         this.gradeAndSubjectPerformance?.getReportData({ filterValues: this.filters.map((filter) => { return { ...filter, columnName: filter.valueProp, filterType: filter.id} }) });
         }
     if (this.startDate === undefined && this.endDate === undefined && this.hasTimeSeriesFilters) {
@@ -71,7 +72,16 @@ constructor(private _wrapperService: WrapperService, private _rbacService: RbacS
     }
     }
 
-    filtersUpdated(filters: any) {
+    async filtersUpdated(filters: any) {
+        let updatedIndex = 0;
+        for (let index = 0; index < filters.length; index++) {
+            if(filters[index].isUpdated){
+                updatedIndex = index;
+                break;
+            }
+        };
+        this.filters = await this._wrapperService.updateDependantFilters(this.filters, updatedIndex);
+
     this.reportsData = [];
     this.gradeAndSubjectPerformance?.getReportData({ filterValues: filters.map((filter) => { return { ...filter, columnName: filter.valueProp, filterType: filter.id} }) });
         }
diff --git a/src/app/views/nas/pages/grade-and-subject-performance-tab/reports/grade-and-subject-performance/grade-and-subject-performance.component.ts b/src/app/views/nas/pages/grade-and-subject-performance-tab/reports/grade-and-subject-performance/grade-and-subject-performance.component.ts
index fc2ca701..83f973c1 100644
--- a/src/app/views/nas/pages/grade-and-subject-performance-tab/reports/grade-and-subject-performance/grade-and-subject-performance.component.ts
+++ b/src/app/views/nas/pages/grade-and-subject-performance-tab/reports/grade-and-subject-performance/grade-and-subject-performance.component.ts
@@ -44,7 +44,14 @@ export class GradeAndSubjectPerformanceComponent implements OnInit {
     this.startDate = timeSeriesValues?.startDate;
     this.endDate = timeSeriesValues?.endDate;
     let reportConfig = config
+    let isStateSelected = false
 
+    for (let i = 0; i < filterValues.length; i++) {
+      if(filterValues[i].id === 'state_name' && filterValues[i].value != null){
+        isStateSelected = true
+      }
+    }
+    
     let { timeSeriesQueries, queries, levels, defaultLevel, filters, options } = reportConfig[this.reportName];
     let onLoadQuery;
     let currentLevel;
@@ -52,7 +59,10 @@ export class GradeAndSubjectPerformanceComponent implements OnInit {
     if (this.rbacDetails?.role !== null && this.rbacDetails.role !== undefined) {
       filters.every((filter: any) => {
         if (Number(this.rbacDetails?.role) === Number(filter.hierarchyLevel)) {
-          queries = { ...filter?.actions?.queries }
+          if(isStateSelected)
+            queries = { ...filter?.actions?.queriesState}
+          else
+            queries = { ...filter?.actions?.queries }
           currentLevel = filter?.actions?.level;
           this.reportData = {
             ...this.reportData,
diff --git a/src/app/views/nas/pages/nas-implementation-status-tab/nas-implementation-status-tab.component.html b/src/app/views/nas/pages/nas-implementation-status-tab/nas-implementation-status-tab.component.html
index 4d3b9289..423c6539 100644
--- a/src/app/views/nas/pages/nas-implementation-status-tab/nas-implementation-status-tab.component.html
+++ b/src/app/views/nas/pages/nas-implementation-status-tab/nas-implementation-status-tab.component.html
@@ -6,14 +6,6 @@
         </div>
     </div>
     <div class="reports-row" >
-        <div class="row-wrapper grid grid-cols-5 gap-4" *ngIf="NVSK">
-            <div class="col-span-2 xmd:col-span-1  bignumber-container" id="bignumber1"
-                *ngFor="let bigNumberData of getMetricsArray(); let index = index">
-                <div *ngIf="checkReport('nas_metrics', 'bigNumber'+(index+1))">
-                    <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
-                </div>
-            </div>
-        </div>
         <div class="row-wrapper grid grid-cols-1 gap-4">
             <div class="col-span-2 xmd:col-span-1 div-shadow" *ngIf="checkReport('nas_implementation_status', 'map')" id="map">
                 <app-nas-implementation-status #nasimplementationstatus
diff --git a/src/app/views/nas/pages/nas-implementation-status-tab/reports/nas-implementation-status/nas-implementation-status.component.html b/src/app/views/nas/pages/nas-implementation-status-tab/reports/nas-implementation-status/nas-implementation-status.component.html
index 289b8747..beb9650c 100644
--- a/src/app/views/nas/pages/nas-implementation-status-tab/reports/nas-implementation-status/nas-implementation-status.component.html
+++ b/src/app/views/nas/pages/nas-implementation-status-tab/reports/nas-implementation-status/nas-implementation-status.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename">{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename">{{title}}</p> -->
         <app-leaflet-map [mapData]="reportData" ></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/nas/pages/nas-state-wise-performance-tab/nas-state-wise-performance-tab.component.ts b/src/app/views/nas/pages/nas-state-wise-performance-tab/nas-state-wise-performance-tab.component.ts
index 084740c9..edde16a3 100644
--- a/src/app/views/nas/pages/nas-state-wise-performance-tab/nas-state-wise-performance-tab.component.ts
+++ b/src/app/views/nas/pages/nas-state-wise-performance-tab/nas-state-wise-performance-tab.component.ts
@@ -44,6 +44,7 @@ constructor(private _wrapperService: WrapperService, private _rbacService: RbacS
   async ngAfterViewInit(): Promise<void> {
   if (this.hasCommonFilters) {
       this.filters = await this._wrapperService.constructCommonFilters(config.filters, this.tabLabel);
+      this.filters = await this._wrapperService.updateDependantFilters(this.filters, 0);
       this.nasstatewiseperformance?.getReportData({ filterValues: this.filters.map((filter) => { return { ...filter, columnName: filter.valueProp, filterType: filter.id} }) });
       }
   if (this.startDate === undefined && this.endDate === undefined && this.hasTimeSeriesFilters) {
@@ -55,6 +56,7 @@ constructor(private _wrapperService: WrapperService, private _rbacService: RbacS
       }
   }
 
+
   checkReport(key: string, reportType: string): Boolean {
   let reportConfig = config;
   let flag = false;
@@ -72,7 +74,16 @@ constructor(private _wrapperService: WrapperService, private _rbacService: RbacS
   }
   }
 
-  filtersUpdated(filters: any) {
+  async filtersUpdated(filters: any) {
+    let updatedIndex = 0;
+    for (let index = 0; index < filters.length; index++) {
+        if(filters[index].isUpdated){
+            updatedIndex = index;
+            break;
+        }
+    };
+    this.filters = await this._wrapperService.updateDependantFilters(this.filters, updatedIndex);
+
   this.reportsData = [];
   this.nasstatewiseperformance?.getReportData({ filterValues: filters.map((filter) => { return { ...filter, columnName: filter.valueProp, filterType: filter.id} }) });
       }
diff --git a/src/app/views/nas/pages/nas-state-wise-performance-tab/reports/nas-state-wise-performance/nas-state-wise-performance.component.html b/src/app/views/nas/pages/nas-state-wise-performance-tab/reports/nas-state-wise-performance/nas-state-wise-performance.component.html
index 289b8747..beb9650c 100644
--- a/src/app/views/nas/pages/nas-state-wise-performance-tab/reports/nas-state-wise-performance/nas-state-wise-performance.component.html
+++ b/src/app/views/nas/pages/nas-state-wise-performance-tab/reports/nas-state-wise-performance/nas-state-wise-performance.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename">{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename">{{title}}</p> -->
         <app-leaflet-map [mapData]="reportData" ></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/ncert-quiz/config/quiz_config.ts b/src/app/views/ncert-quiz/config/quiz_config.ts
index c249ed89..8a4fa4a3 100644
--- a/src/app/views/ncert-quiz/config/quiz_config.ts
+++ b/src/app/views/ncert-quiz/config/quiz_config.ts
@@ -7,7 +7,7 @@ export const config = {
             "id": "",
             "labelProp": "quiz_name",
             "valueProp": "quiz_name",
-            "query": "SELECT quiz_name FROM dimensions.quizncert ORDER BY id ASC "
+            "query": "SELECT distinct quiz_name FROM dimensions.quizncert ORDER BY quiz_name ASC "
         },
     ],
     implementation_status: {
@@ -34,7 +34,7 @@ export const config = {
                 "metricFilterNeeded": false,
                 "indicator": "status",
                 "legend": {
-                    "title": "NCERT Quizes Started"
+                    "title": "NCERT Quizzes Started"
                 },
                 "tooltipMetrics": [
                     {
@@ -43,7 +43,7 @@ export const config = {
                         "valueSuffix": "\n"
                     },
                     {
-                        "valuePrefix": "NCERT Quizes Started :",
+                        "valuePrefix": "NCERT Quizzes Started :",
                         "value": "status",
                         "valueSuffix": "\n"
                     }
@@ -146,15 +146,18 @@ export const config = {
                             type: "percentage",
                             values: [
                                 {
-                                    color: "#007000",
+                                    //color: "#007000",
+                                    color: "#1D4586",
                                     breakPoint: 70
                                 },
                                 {
-                                    color: "#FFBF00",
+                                   // color: "#FFBF00",
+                                    color: "#1156CC",
                                     breakPoint: 40
                                 },
                                 {
-                                    color: "#D2222D",
+                                   // color: "#D2222D",
+                                    color: "#6D9FEB",
                                     breakPoint: 0
                                 }
                             ]
@@ -169,6 +172,28 @@ export const config = {
             }
         }
     },
+    summary_metrics: {
+        "filters": [
+        {
+            "name": "National",
+            "hierarchyLevel": "0",
+            "actions": {
+                "queries": {
+                    "bigNumber1": "select dm.metric_value as total_enrolment from dimensions.mainmetrics dm where  dm.program_id='quiz' and dm.metric_name ='Total Enrolment' and dm.metric_type ='Key Metric';",
+                    "bigNumber2": "select sum(sum) as total_certification from datasets.ncert_quiz_certificate_issued_100_perc_completion_medium",
+                    },
+                "level": "state"
+            }
+        },
+    ],
+    "options": {
+        "bigNumber": {
+            "title": ['Total Enrolment','Total Certification'],
+            "valueSuffix": ['',''],
+            "property": ['total_enrolment','total_certification']
+        }
+    }
+},
     quiz_metrics: {
         "label": "Progress Status",
         "filters": [
@@ -181,8 +206,8 @@ export const config = {
                     "queries": {
                         "bigNumber1": "select count(distinct quiz_name) as total_quizzes from dimensions.quizncert",
                         "bigNumber2": "select count(distinct medium) as total_medium from datasets.ncert_quiz_completion_perc_medium;",
-                        "bigNumber3": "select count(distinct state_id) as total_states from datasets.micro_improvements_started_state where sum > 0;",
-                        "bigNumber4": "select sum(sum) as total_enrolment from datasets.ncert_quiz_total_enrollments_state;",
+                        "bigNumber3": "select count(distinct state_id) as total_states from datasets.ncert_quiz_started_state where sum > 0;",
+                        "bigNumber4": "select dm.metric_value as total_enrolment from dimensions.mainmetrics dm where  dm.program_id='quiz' and dm.metric_name ='Total Enrolment' and dm.metric_type ='Vanity Metric';",
                         "bigNumber5": "select sum(sum) as total_certification from datasets.ncert_quiz_certificate_issued_100_perc_completion_medium",
                     },
                     "level": "state"
diff --git a/src/app/views/ncert-quiz/ncert-quiz.component.html b/src/app/views/ncert-quiz/ncert-quiz.component.html
index 61c43ce4..f7fd19c4 100644
--- a/src/app/views/ncert-quiz/ncert-quiz.component.html
+++ b/src/app/views/ncert-quiz/ncert-quiz.component.html
@@ -1,12 +1,27 @@
+<div class="program-banner-wrapper">
+	<img src="assets/images/ncert-quizzes-banner.png" alt="NCERT Quizzes Banner">
+</div>
 <div class="metric-card-wrapper">
     <div class="grid gap-4 grid-cols-6 xmd:grid-cols-12">
         <div class="col-span-12">
-            <p class="program-title ">NCERT Quiz</p>
+            <p class="program-title ">
+				<img src="assets/images/Quizzes.png" alt="logo"> NCERT Quiz
+			</p>
             
         </div>
     </div>
 </div>
-
+<div *ngIf="checkReport('quiz_metrics', 'bigNumber1')" id="bignumber1">
+    <app-quiz-bignumber-metrics (exportReportData)="importBigNumberMetrics($event)"></app-quiz-bignumber-metrics>
+</div>
+<div class="row-wrapper grid grid-cols-5 gap-4" #target>
+    <div class="col-span-2 xmd:col-span-1  bignumber-container" id="bignumber2"
+        *ngFor="let bigNumberData of bigNumberMetrics; let index = index">
+        <div *ngIf="checkReport('quiz_metrics', 'bigNumber'+(index+1))">
+            <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
+        </div>
+    </div>
+</div>
 <div class="custom-tab-group-wrapper">
     <mat-tab-group [selectedIndex]="tabIndex" mat-align-tabs="start" animationDuration="0ms"
         (selectedTabChange)="onTabChanged($event)" appFullScreen>
diff --git a/src/app/views/ncert-quiz/ncert-quiz.component.ts b/src/app/views/ncert-quiz/ncert-quiz.component.ts
index 2fe6fbfb..eab7765b 100644
--- a/src/app/views/ncert-quiz/ncert-quiz.component.ts
+++ b/src/app/views/ncert-quiz/ncert-quiz.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { CommonService } from 'src/app/core/services/common/common.service';
 import { RbacService } from 'src/app/core/services/rbac-service.service';
@@ -8,7 +8,7 @@ import {config} from './config/quiz_config';
   templateUrl: './ncert-quiz.component.html',
   styleUrls: ['./ncert-quiz.component.scss']
 })
-export class NcertQuizComponent implements OnInit {
+export class NcertQuizComponent implements OnInit, AfterViewInit {
 
   loadTabs = false;
   rbacDetails: any;
@@ -16,6 +16,8 @@ export class NcertQuizComponent implements OnInit {
   selectedTabLabel;
   tabs: any = [];
   programName: any = 'nas'
+  bigNumberMetrics: any = [];
+  @ViewChild('target') private myTarget:ElementRef;
   
 constructor(private route: ActivatedRoute, private _rbacService: RbacService, private _commonService: CommonService) { 
   this.route.queryParams.subscribe((param: any) => {
@@ -43,6 +45,7 @@ constructor(private route: ActivatedRoute, private _rbacService: RbacService, pr
   }
 
   ngAfterViewInit(): void {
+	this._commonService.scrollInto(this.myTarget.nativeElement);
   setTimeout(() => {
       this.selectedTabLabel = this.tabs.length > 0 ? this.tabs[0] : undefined
   });
@@ -56,6 +59,19 @@ constructor(private route: ActivatedRoute, private _rbacService: RbacService, pr
       console.log('resize');
   }, 100);
   }
+  checkReport(key: string, reportType: string): Boolean {
+    let reportConfig = config;
+    let flag = false;
+    reportConfig[key]?.filters?.forEach((filter: any) => {
+        if (Number(filter.hierarchyLevel) === Number(this.rbacDetails?.role) && Object.keys(filter?.actions?.queries).includes(reportType)) {
+            flag = true
+        }
+    })
+    return flag
+}
 
+importBigNumberMetrics(bigNumberMetric: any) {
+    this.bigNumberMetrics[bigNumberMetric.ind] = bigNumberMetric.data
+}
 
 }
diff --git a/src/app/views/ncert-quiz/pages/implementation-status-tab/implementation-status-tab.component.html b/src/app/views/ncert-quiz/pages/implementation-status-tab/implementation-status-tab.component.html
index 3fb52655..ac64fa68 100644
--- a/src/app/views/ncert-quiz/pages/implementation-status-tab/implementation-status-tab.component.html
+++ b/src/app/views/ncert-quiz/pages/implementation-status-tab/implementation-status-tab.component.html
@@ -6,17 +6,7 @@
         </div>
     </div>
     <div class="reports-row" >
-        <div *ngIf="checkReport('quiz_metrics', 'bigNumber1')" id="bignumber1">
-            <app-quiz-bignumber-metrics (exportReportData)="importBigNumberMetrics($event)"></app-quiz-bignumber-metrics>
-        </div>
-        <div class="row-wrapper grid grid-cols-5 gap-4">
-            <div class="col-span-2 xmd:col-span-1  bignumber-container" id="bignumber2"
-                *ngFor="let bigNumberData of bigNumberMetrics; let index = index">
-                <div *ngIf="checkReport('quiz_metrics', 'bigNumber'+(index+1))">
-                    <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
-                </div>
-            </div>
-        </div>
+        
         <div class="row-wrapper grid grid-cols-1 gap-4">
             <div class="col-span-2 xmd:col-span-1 div-shadow" *ngIf="checkReport('implementation_status', 'map')" id="map">
                 <app-implementation-status #implementationstatus
diff --git a/src/app/views/ncert-quiz/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html b/src/app/views/ncert-quiz/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
index 289b8747..beb9650c 100644
--- a/src/app/views/ncert-quiz/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
+++ b/src/app/views/ncert-quiz/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename">{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename">{{title}}</p> -->
         <app-leaflet-map [mapData]="reportData" ></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/ncert-quiz/pages/participation-status-tab/reports/participation-status/participation-status.component.html b/src/app/views/ncert-quiz/pages/participation-status-tab/reports/participation-status/participation-status.component.html
index 289b8747..beb9650c 100644
--- a/src/app/views/ncert-quiz/pages/participation-status-tab/reports/participation-status/participation-status.component.html
+++ b/src/app/views/ncert-quiz/pages/participation-status-tab/reports/participation-status/participation-status.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename">{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename">{{title}}</p> -->
         <app-leaflet-map [mapData]="reportData" ></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/ncf/config/ncf_config.ts b/src/app/views/ncf/config/ncf_config.ts
index d4ce0553..7e966324 100644
--- a/src/app/views/ncf/config/ncf_config.ts
+++ b/src/app/views/ncf/config/ncf_config.ts
@@ -7,7 +7,7 @@ export const config = {
             "id": "metric",
             "labelProp": "category_name",
             "valueProp": "category_name",
-            "query": "SELECT category_name FROM dimensions.categoryncf"
+            "query": "SELECT category_name FROM dimensions.categoryncf order by category_name"
         },
     ],
  
@@ -20,7 +20,7 @@ export const config = {
                 "actions": {
                     "queries":
                     {
-                        "map":"select t2.latitude, t2.longitude, t.state_id,state_name,t.category_name,sum(sum) as performance from datasets.ncf_categoryncf_state0categoryncf as t join dimensions.state as t2 on t.state_id = t2.state_id group by t.state_id,state_name,t.category_name, t2.latitude, t2.longitude"
+                        "map":"select t2.latitude, t2.longitude, t.state_id,state_name,t.category_name,sum(sum) as performance from datasets.ncf_category_dxcdbwaaaaaaaaaamras as t join dimensions.state as t2 on t.state_id = t2.state_id group by t.state_id,state_name,t.category_name, t2.latitude, t2.longitude order by category_name"
                     },
                     "level": "state",
                     "nextLevel": "district"
@@ -134,7 +134,28 @@ export const config = {
             }
         }
     },
-
+summary_metrics: {
+        "filters": [
+        {
+            "name": "National",
+            "hierarchyLevel": "0",
+            "actions": {
+                "queries": {
+                    "bigNumber1": "select count(distinct state_id) as total_states from datasets.ncf_number_of_participants_state where sum > 0",
+                    "bigNumber2": "select sum(sum) as total_state_position_paper from datasets.ncf_category_value_categoryncf where category_name = 'state_position_paper_e-template_submitted'",
+                    },
+                "level": "state"
+            }
+        },
+    ],
+    "options": {
+        "bigNumber": {
+            "title": ['Total States/UTs Participating','Total State Position Paper'],
+            "valueSuffix": ['',''],
+            "property": ['total_states','total_state_position_paper']
+        }
+    }
+},
     ncf_metrics: {
         "label": "Progress Status",
         "filters": [
@@ -145,9 +166,9 @@ export const config = {
                 "hierarchyLevel": "0",
                 "actions": {
                     "queries": {
-                        "bigNumber1": "select sum(sum) as total_dcr from datasets.ncf_categoryncf_state0categoryncf where category_name = 'dcr_completed_uploaded'",
-                        "bigNumber2": "select sum(sum) as total_mobile_survey from datasets.ncf_categoryncf_state0categoryncf where category_name = 'mobile_survey_completed'",
-                        "bigNumber3": "select sum(sum) as total_ndg from datasets.ncf_categoryncf_state0categoryncf where category_name = 'national_district_groups_created'",
+                        "bigNumber1": "select sum(sum) as total_dcr from datasets.ncf_category_value_categoryncf where category_name = 'dcr_completed_uploaded'",
+                        "bigNumber2": "select sum(sum) as total_mobile_survey from datasets.ncf_category_value_categoryncf where category_name = 'mobile_survey_completed'",
+                        "bigNumber3": "select sum(sum) as total_ndg from datasets.ncf_category_value_categoryncf where category_name = 'national_district_groups_created'",
                         "bigNumber4": "select sum(sum) as participants from datasets.ncf_number_of_participants_languagencf",
                     },
                     "level": "state"
@@ -157,7 +178,7 @@ export const config = {
         "options": {
             "bigNumber": {
                 "title": ['Total District Consultation Report (DCR) Completed/Uploaded', 'Total Mobile Survey', 'Total National District Groups (NDGs) created', 'Total Digital Survey for National Curriculum (DiSaNC) Survey'],
-                "valueSuffix": ['','','',''],
+                "valueSuffix": ['','','','','',''],
                 "property": ['total_dcr', 'total_mobile_survey', 'total_ndg', 'participants']
             }
         }
diff --git a/src/app/views/ncf/ncf.component.html b/src/app/views/ncf/ncf.component.html
index 8cfbf2ad..ee7f6805 100644
--- a/src/app/views/ncf/ncf.component.html
+++ b/src/app/views/ncf/ncf.component.html
@@ -1,11 +1,29 @@
+<div class="program-banner-wrapper">
+	<img src="assets/images/ncf-banner.png" alt="NCF Banner">
+</div>
 <div class="metric-card-wrapper">
     <div class="grid gap-4 grid-cols-6 xmd:grid-cols-12">
         <div class="col-span-12">
-            <p class="program-title ">National Curriculum Framework (NCF)</p>
+            <p class="program-title ">
+				<img src="assets/images/NCF.png" alt="logo">
+				National Curriculum Framework (NCF)
+			</p>
             
     </div>
 </div>
-
+<div class="col-span-full tab-wrapper" #target>
+    <div *ngIf="checkReport('ncf_metrics', 'bigNumber1')" id="bignumber1">
+        <app-ncf-bignumber (exportReportData)="importBigNumberMetrics($event)"></app-ncf-bignumber>
+    </div>
+    <div class="row-wrapper grid grid-cols-5 gap-4">
+        <div class="col-span-2 xmd:col-span-1  bignumber-container" id="bignumber2"
+            *ngFor="let bigNumberData of bigNumberMetrics; let index = index">
+            <div *ngIf="checkReport('ncf_metrics', 'bigNumber'+(index+1))">
+                <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
+            </div>
+        </div>
+    </div>
+</div>
 <div class="custom-tab-group-wrapper">
     <mat-tab-group [selectedIndex]="tabIndex" mat-align-tabs="start" animationDuration="0ms"
         (selectedTabChange)="onTabChanged($event)" appFullScreen>
diff --git a/src/app/views/ncf/ncf.component.ts b/src/app/views/ncf/ncf.component.ts
index ad2ea4ac..bef2dee9 100644
--- a/src/app/views/ncf/ncf.component.ts
+++ b/src/app/views/ncf/ncf.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { CommonService } from 'src/app/core/services/common/common.service';
 import { RbacService } from 'src/app/core/services/rbac-service.service';
@@ -8,7 +8,7 @@ import {config} from '../ncf/config/ncf_config';
   templateUrl: './ncf.component.html',
   styleUrls: ['./ncf.component.scss']
 })
-export class NcfComponent implements OnInit {
+export class NcfComponent implements OnInit, AfterViewInit {
 
   loadTabs = false;
   rbacDetails: any;
@@ -16,6 +16,8 @@ export class NcfComponent implements OnInit {
   selectedTabLabel;
   tabs: any = [];
   programName: any = 'nas'
+  bigNumberMetrics: any = [];
+  @ViewChild('target') private myTarget:ElementRef;
 
   constructor(private route: ActivatedRoute, private _rbacService: RbacService, private _commonService: CommonService) {
     this.route.queryParams.subscribe((param: any) => {
@@ -43,6 +45,7 @@ export class NcfComponent implements OnInit {
   }
 
   ngAfterViewInit(): void {
+	this._commonService.scrollInto(this.myTarget.nativeElement);
     setTimeout(() => {
       this.selectedTabLabel = this.tabs.length > 0 ? this.tabs[0] : undefined
     });
@@ -57,4 +60,23 @@ export class NcfComponent implements OnInit {
     }, 100);
   }
 
+checkReport(key: string, reportType: string): Boolean {
+    let reportConfig = config;
+    let flag = false;
+    reportConfig[key]?.filters?.forEach((filter: any) => {
+        if (Number(filter.hierarchyLevel) === Number(this.rbacDetails?.role) && Object.keys(filter?.actions?.queries).includes(reportType)) {
+        flag = true
+        }
+    })
+    return flag
+  }
+importBigNumberMetrics(bigNumberMetric: any) {
+    this.bigNumberMetrics[bigNumberMetric.ind] = bigNumberMetric.data
+}
+
+getMetricsArray() {
+    return this.bigNumberMetrics.filter((data) => {
+      return data.averagePercentage !== null || data.averagePercentage !== undefined
+    }) 
+  }
 }
diff --git a/src/app/views/ncf/pages/disanc-survey-tab/reports/disanc-survey-bar/disanc-survey-bar.component.html b/src/app/views/ncf/pages/disanc-survey-tab/reports/disanc-survey-bar/disanc-survey-bar.component.html
index 186b62f0..f9d9479b 100644
--- a/src/app/views/ncf/pages/disanc-survey-tab/reports/disanc-survey-bar/disanc-survey-bar.component.html
+++ b/src/app/views/ncf/pages/disanc-survey-tab/reports/disanc-survey-bar/disanc-survey-bar.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.values && reportData?.values?.length > 0)">
-        <p class="text-center font-medium py-2 filename" >{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p><br> -->
         <!-- <sb-dashlet type="bar" [data]="reportData" [config]="config"></sb-dashlet> -->
         <app-sb-bar-chart type="horizontalBar" [data]="reportData" [config]="config" ></app-sb-bar-chart>
     </ng-container>
diff --git a/src/app/views/ncf/pages/disanc-survey-tab/reports/disanc-survey-map/disanc-survey-map.component.html b/src/app/views/ncf/pages/disanc-survey-tab/reports/disanc-survey-map/disanc-survey-map.component.html
index 289b8747..f0092893 100644
--- a/src/app/views/ncf/pages/disanc-survey-tab/reports/disanc-survey-map/disanc-survey-map.component.html
+++ b/src/app/views/ncf/pages/disanc-survey-tab/reports/disanc-survey-map/disanc-survey-map.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename">{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename">{{title}}</p><br> -->
         <app-leaflet-map [mapData]="reportData" ></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/ncf/pages/progress-status-tab/progress-status-tab.component.html b/src/app/views/ncf/pages/progress-status-tab/progress-status-tab.component.html
index 2c6bbd27..b7e9a699 100644
--- a/src/app/views/ncf/pages/progress-status-tab/progress-status-tab.component.html
+++ b/src/app/views/ncf/pages/progress-status-tab/progress-status-tab.component.html
@@ -10,18 +10,7 @@
         </div>
     </div>
     <div class="reports-row" >
-        <div *ngIf="checkReport('ncf_metrics', 'bigNumber1')" id="bignumber1">
-            <app-ncf-bignumber (exportReportData)="importBigNumberMetrics($event)"></app-ncf-bignumber>
-        </div>
-        <div class="row-wrapper grid grid-cols-5 gap-4">
-            <div class="col-span-2 xmd:col-span-1  bignumber-container" id="bignumber2"
-                *ngFor="let bigNumberData of bigNumberMetrics; let index = index">
-                <div *ngIf="checkReport('ncf_metrics', 'bigNumber'+(index+1))">
-                    <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
-                </div>
-            </div>
-        </div>
-        <div class="row-wrapper grid">
+          <div class="row-wrapper grid">
             <div class="col-span-1 xmd:col-span-1 div-shadow" *ngIf="checkReport('progress_status', 'map')" id="map">
                 <app-progress-status #progresStatus
                     (exportReportData)="csvDownload($event)"></app-progress-status>
diff --git a/src/app/views/ncf/pages/progress-status-tab/reports/progress-status/progress-status.component.html b/src/app/views/ncf/pages/progress-status-tab/reports/progress-status/progress-status.component.html
index 289b8747..f0092893 100644
--- a/src/app/views/ncf/pages/progress-status-tab/reports/progress-status/progress-status.component.html
+++ b/src/app/views/ncf/pages/progress-status-tab/reports/progress-status/progress-status.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename">{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename">{{title}}</p><br> -->
         <app-leaflet-map [mapData]="reportData" ></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/nipun-bharat/config/nipun_bharat_config.ts b/src/app/views/nipun-bharat/config/nipun_bharat_config.ts
index cc83ce11..ec1e8d99 100644
--- a/src/app/views/nipun-bharat/config/nipun_bharat_config.ts
+++ b/src/app/views/nipun-bharat/config/nipun_bharat_config.ts
@@ -7,8 +7,148 @@ export const config = {
             "valueProp": "subject",
             "id": "subject",
             "query": "select distinct(subject) from datasets.nipun_bharat_totallearningsessions_grade0subject order by subject"
-        }
+        },
+        {
+            "label": "Module-wide Status",
+            "name": "Module",
+            "labelProp": "module",
+            "valueProp": "module",
+            "id": "module",
+            "query": "select m.module from dimensions.modulesnipun m order by m.module"
+         },
+         {
+            "label": "Module-wide Status",
+            "name": "Quarter",
+            "labelProp": "quarter",
+            "valueProp": "quarter",
+            "id": "quarter",
+            "query": "select q.quarter from dimensions.modulesnipunquarter q order by q.quarter"
+         },
+        {
+            "label": "Detailed Status",
+            "name": "Quarter",
+            "labelProp": "quarter",
+            "valueProp": "quarter",
+            "id": "quarter",
+            "query": "select q.quarter from dimensions.modulesnipunquarter q order by q.quarter"
+         },
+         
     ],
+    
+    module_wide_status: {
+        "label": "Module-wide Status",
+        "filters": [
+            {
+                "name": "National",
+                "hierarchyLevel": "0",
+                "actions": {
+                    "queries": {
+                        "map": "select s2.state_id,s2.latitude, s2.longitude,s2.state_name ,sum(tnm.sum) as total_modules, round(cast(avg(tnm.sum) as numeric), 2) * 100 as modules_completed,tnm.quarter as quarter from datasets.nipun_bharat_totalnoofmodules_bbyptg51gxhubgstibks tnm join datasets.nipun_bharat_entry_value_state  s on s.state_id = tnm.state_id join dimensions.state s2 on s2.state_id =s.state_id group by s2.state_name,s2.state_id,s2.latitude, s2.longitude,tnm.quarter,s2.state_id order by s2.state_id",
+                     },
+                    "level": "state",
+                    "nextLevel": "district"
+                }
+            }
+        ],
+        "options": {
+            "downloadConfig": {
+                "fileName": "Module-wide Status",
+                "excludeColumns": ['indicator', 'tooltip', 'Latitude', 'Longitude']
+            },
+                "map":
+                {
+                "indicatorType": "percent",
+                "indicator": "modules_completed",
+                "metricFilterNeeded": true,
+                "groupByColumn": "state_id",
+                "legend": { "title": "Modules Completed" },
+                "drillDownConfig": {
+                    "enableDrillDown": true,
+                    "allowedLevels": [0]
+                },
+                   "tooltipMetrics":
+                        [
+                            {
+                                "valuePrefix": "State/UT Name: ",
+                                "value": "state_name",
+                                "valueSuffix": "\n"
+                            },
+                            {
+                                "valuePrefix": "Quarter: ",
+                                "value": "quarter",
+                                "valueSuffix": "\n"
+                            },
+                            {
+                                "valuePrefix": "Total Modules: ",
+                                "value": "total_modules",
+                                "valueSuffix": "\n"
+                            },
+                            {
+                                "valuePrefix": "Modules Completed : ",
+                                "value": "modules_completed",
+                                "valueSuffix": "%\n"
+                            }
+                        ]
+                }
+            }
+    },
+    detailed_status: {
+        "label": "Detailed Status",
+        "filters": [
+            {
+                "name": "National",
+                "hierarchyLevel": "0",
+                "actions": {
+                    "queries": {
+                        "table": "select s.state_name,nbtbg.module,nbtbg.sub_module,nbtbg.quarter,case when nbtbg.sum = 1 then  'Yes' else 'No' end as status from datasets.nipun_bharat_totalnoofmodules_bbyptg51gxhubgstibks nbtbg join dimensions.state s on 	s.state_id = nbtbg.state_id group by s.state_name,nbtbg.sum,nbtbg.quarter,nbtbg.module,nbtbg.sub_module order by s.state_name",
+                    },
+                    "level": "district",
+                    "nextLevel": "block"
+                }
+            }
+        ],
+        "options": {
+            "table": {
+                "groupByNeeded": true,
+                "metricLabelProp": "state_name",
+                "metricValueProp": "status",
+                "columns": [
+                    {
+                        name: "Module",
+                        property: "module",
+                        class: "text-center"
+                    },
+                    {
+                        name: "Sub Module",
+                        property: "sub_module",
+                        class: "text-center"
+                    },
+                    {
+                        name: "state_name",
+                        groupByNeeded: true,
+                        property: "state_name",
+                        class: "text-center",
+                        isHeatMapRequired: true,
+                        color: {
+                            type: "status",
+                            values: [
+                                {
+                                    color: "#007000",
+                                    value: 'yes'
+                                },
+                                {
+                                    color: "#D2222D",
+                                    value: 'no'
+                                }
+                            ]
+                        },
+                     }
+                ],
+                "sortByProperty": "state_name",
+                "sortDirection": "asc"
+        }
+    }
+},
     textbook_status:{
         "label": "Textbook Status",
         "filters": [
@@ -19,7 +159,8 @@ export const config = {
                 "valueProp": "state_id",
                 "actions": {
                     "queries": {
-                        "barChart": "select textbook_name as textbook, round(cast(avg(sum) as numeric),2) as lo_covered from datasets.nipun_bharat_perc_los_covered_textbooknipun group by textbook order by textbook",
+                        //"barChart": "select textbook_name as textbook, round(cast(avg(sum) as numeric),2) as lo_covered from datasets.nipun_bharat_perc_los_covered_textbooknipun group by textbook order by textbook",
+                        "barChart": "select concat(txtbk.textbook_name, '-', txtbk.grade) as textbook, round(cast(avg(los.sum) as numeric),2) as lo_covered from datasets.nipun_bharat_perc_los_covered_textbooknipun los join dimensions.textbooknipun txtbk on txtbk.textbook_id = los.textbook_id  group by textbook order by textbook"
                     },
                     "level": "state"
                 }
@@ -87,31 +228,55 @@ export const config = {
             }
         }
     },
-    nipun_bharat_metrics: {
-        "label": "Textbook Status",
+    summary_metrics: {
         "filters": [
-            {
-                "name": "National",
-                "labelProp": "state_name",
-                "valueProp": "state_id",
-                "hierarchyLevel": "0",
-                "actions": {
-                    "queries": {
-                        "bigNumber1": "select sum(sum) as total_learning_sessions from datasets.nipun_bharat_totallearningsessions_grade0subject",
-                        "bigNumber2": "",
-                        "bigNumber3": "",
-                        "bigNumber4": "",
+        {
+            "name": "National",
+            "hierarchyLevel": "0",
+            "actions": {
+                "queries": {
+                    "bigNumber1": "select dm.metric_value as total_learning_sessions from dimensions.mainmetrics dm where  dm.program_id='nib' and dm.metric_name ='Total Learning Sessions' and dm.metric_type ='Key Metric'",
+                    "bigNumber2": "select dm.metric_value as total_content from dimensions.mainmetrics dm where  dm.program_id='nib' and dm.metric_name ='Total Content' and dm.metric_type ='Key Metric'",
+                  },
+                "level": "state"
+            }
+        },
+    ],
+    "options": {
+        "bigNumber": {
+            "title": ['Total Learning Sessions','Total Content'],
+            //"valueSuffix": ['L', ''],
+            "valueSuffix": ['', ''],
+            "property": ['total_learning_sessions','total_content']
+      
+        }
+    }
+},
+nipun_bharat_metrics: {
+        "filters": [
+        {
+            "name": "National",
+            "labelProp": "state_name",
+            "valueProp": "state_id",
+            "hierarchyLevel": "0",
+            "actions": {
+                "queries": {
+                    "bigNumber1": "select sum(sum) as total_los_covered from datasets.nipun_bharat_los_covered_textbooknipun",
+                    "bigNumber2": "select count(*) as total_digital_books from dimensions.textbooknipun",
+                    "bigNumber3": "select dm.metric_value as total_content from dimensions.mainmetrics dm where  dm.program_id='nib' and dm.metric_name ='Total Content' and dm.metric_type ='Vanity Metric'",
+                    "bigNumber4": "select dm.metric_value as total_learning_sessions from dimensions.mainmetrics dm where  dm.program_id='nib' and dm.metric_name ='Total Learning Sessions' and dm.metric_type ='Vanity Metric'",
                     },
-                    "level": "state"
-                }
-            },
-        ],
-        "options": {
-            "bigNumber": {
-                "title": ['Total Learning Sessions','Total Digital Books','Total Content', 'Total Learning Outcomes (LOs) Covered'],
-                "valueSuffix": ['','','',''],
-                "property": ['total_learning_sessions','','','']
+                "level": "state"
             }
+        },
+    ],
+    "options": {
+        "bigNumber": {
+            "title": ['Total Learning Outcomes (LOs) Covered','Total Digital Books','Total Content','Total Learning Sessions' ],
+            //"valueSuffix": ['', '','','L'],
+            "valueSuffix": ['', '','',''],
+            "property": ['total_los_covered','total_digital_books','total_content','total_learning_sessions']
         }
     }
+}
 }
\ No newline at end of file
diff --git a/src/app/views/nipun-bharat/nipun-bharat.component.html b/src/app/views/nipun-bharat/nipun-bharat.component.html
index 1f39aea5..35162f2c 100644
--- a/src/app/views/nipun-bharat/nipun-bharat.component.html
+++ b/src/app/views/nipun-bharat/nipun-bharat.component.html
@@ -1,15 +1,47 @@
+<div class="program-banner-wrapper">
+	<img src="assets/images/nipun-bharat-banner.jpg" alt="Nipun Bharat Banner">
+</div>
 <div class="metric-card-wrapper">
     <div class="grid gap-4 grid-cols-6 xmd:grid-cols-12">
         <div class="col-span-12">
-            <p class="program-title ">NIPUN Bharat</p>
+            <p class="program-title ">
+				<img src="assets/images/NIPUN%20BHARAT.png" alt="logo">
+				NIPUN Bharat
+			</p>
             
     </div>
 </div>
-
+</div>
+<div class="col-span-full tab-wrapper" #target>
+    <div class="reports-row" >
+    <div *ngIf="checkReport('nipun_bharat_metrics', 'bigNumber1')" id="bignumber1">
+        <app-nipun-bharat-metrics (exportReportData)="importBigNumberMetrics($event)"></app-nipun-bharat-metrics>
+    </div>
+    <div class="row-wrapper grid grid-cols-5 gap-4">
+        <div class="col-span-2 xmd:col-span-1  bignumber-container" id="bignumber2"
+            *ngFor="let bigNumberData of bigNumberMetrics; let index = index">
+            <div *ngIf="checkReport('nipun_bharat_metrics', 'bigNumber'+(index+1))">
+                <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
+            </div>
+        </div>
+    </div>
+    </div>
+</div>
 <div class="custom-tab-group-wrapper">
     <mat-tab-group [selectedIndex]="tabIndex" mat-align-tabs="start" animationDuration="0ms"
         (selectedTabChange)="onTabChanged($event)" appFullScreen>
+          
+        <!-- Removed below two tabs as requested by NCERT on 15-jan-2024 -->
+        <!-- <mat-tab label='Module-wide Status' *ngIf="tabs.includes('Module-wide Status')">
+            <app-module-wide-status-tab
+                *ngIf="selectedTabLabel === 'Module-wide Status'"></app-module-wide-status-tab>
+        </mat-tab>
 
+        <mat-tab label='Detailed Status' *ngIf="tabs.includes('Detailed Status')">
+            <app-detailed-status-tab
+                *ngIf="selectedTabLabel === 'Detailed Status'"></app-detailed-status-tab>
+        </mat-tab> -->
+        
         <mat-tab label='Textbook Status' *ngIf="tabs.includes('Textbook Status')">
             <app-textbook-status-tab
                 *ngIf="selectedTabLabel === 'Textbook Status'"></app-textbook-status-tab>
@@ -20,5 +52,6 @@
                 *ngIf="selectedTabLabel === 'Learning Sessions'"></app-learning-sessions-tab>
         </mat-tab>
         
+
     </mat-tab-group>
 </div>
\ No newline at end of file
diff --git a/src/app/views/nipun-bharat/nipun-bharat.component.ts b/src/app/views/nipun-bharat/nipun-bharat.component.ts
index 6c48fa94..77b9c200 100644
--- a/src/app/views/nipun-bharat/nipun-bharat.component.ts
+++ b/src/app/views/nipun-bharat/nipun-bharat.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { CommonService } from 'src/app/core/services/common/common.service';
 import { RbacService } from 'src/app/core/services/rbac-service.service';
@@ -9,14 +9,16 @@ import { config } from './config/nipun_bharat_config';
   templateUrl: './nipun-bharat.component.html',
   styleUrls: ['./nipun-bharat.component.scss']
 })
-export class NipunBharatComponent implements OnInit {
+export class NipunBharatComponent implements OnInit, AfterViewInit {
 
   loadTabs = false;
   rbacDetails: any;
   tabIndex;
   selectedTabLabel;
   tabs: any = [];
-  programName: any = 'nas'
+  programName: any = 'nipunBharat'
+  bigNumberMetrics: any = [];
+  @ViewChild('target') private myTarget:ElementRef;
 
   constructor(private route: ActivatedRoute, private _rbacService: RbacService, private _commonService: CommonService) {
     this.route.queryParams.subscribe((param: any) => {
@@ -44,8 +46,11 @@ export class NipunBharatComponent implements OnInit {
   }
 
   ngAfterViewInit(): void {
+	this._commonService.scrollInto(this.myTarget.nativeElement);
     setTimeout(() => {
-      this.selectedTabLabel = this.tabs.length > 0 ? this.tabs[0] : undefined
+      // making textbook status tab as default
+      //this.selectedTabLabel = this.tabs.length > 0 ? this.tabs[0] : undefined
+      this.selectedTabLabel = this.tabs.length > 0 ? this.tabs[2] : undefined
     });
   }
 
@@ -54,9 +59,28 @@ export class NipunBharatComponent implements OnInit {
     this.tabIndex = $event.index;
     setTimeout(() => {
       window.dispatchEvent(new Event('resize'));
-      console.log('resize');
-    }, 100);
+      }, 100);
   }
+    checkReport(key: string, reportType: string): Boolean {
+      let reportConfig = config;
+      let flag = false;
+      reportConfig[key]?.filters?.forEach((filter: any) => {
+          if (Number(filter.hierarchyLevel) === Number(this.rbacDetails?.role) && Object.keys(filter?.actions?.queries).includes(reportType)) {
+          flag = true
+          }
+      })
+      return flag
+    }
+
+    importBigNumberMetrics(bigNumberMetric: any) {
+      this.bigNumberMetrics[bigNumberMetric.ind] = bigNumberMetric.data
+  }
+
+  getMetricsArray() {
+      return this.bigNumberMetrics.filter((data) => {
+        return data.averagePercentage !== null || data.averagePercentage !== undefined
+      }) 
+    }
 
 }
 
diff --git a/src/app/views/nipun-bharat/nipun-bharat.module.ts b/src/app/views/nipun-bharat/nipun-bharat.module.ts
index a95b4917..82a2d4f7 100644
--- a/src/app/views/nipun-bharat/nipun-bharat.module.ts
+++ b/src/app/views/nipun-bharat/nipun-bharat.module.ts
@@ -11,6 +11,11 @@ import { MatTabsModule } from '@angular/material/tabs';
 import { SharedModule } from 'src/app/shared/shared.module';
 import { LearningSessionsComponent } from './pages/learning-sessions-tab/reports/learning-sessions/learning-sessions.component';
 import { NipunBharatMetricsComponent } from './pages/textbook-status-tab/reports/nipun-bharat-metrics/nipun-bharat-metrics.component';
+import { ModuleWideStatusTabComponent } from './pages/module-wide-status-tab/module-wide-status-tab.component';
+import { ModuleWideStatusComponent } from './pages/module-wide-status-tab/reports/module-wide-status/module-wide-status.component';
+import { DetailedStatusTabComponent } from './pages/detailed-status-tab/detailed-status-tab.component';
+import { DetailedStatusComponent } from './pages/detailed-status-tab/reports/detailed-status/detailed-status.component';
+
 
 
 @NgModule({
@@ -20,7 +25,11 @@ import { NipunBharatMetricsComponent } from './pages/textbook-status-tab/reports
     LearningSessionsTabComponent,
     TextbookStatusComponent,
     LearningSessionsComponent,
-    NipunBharatMetricsComponent
+    NipunBharatMetricsComponent,
+    ModuleWideStatusTabComponent,
+    ModuleWideStatusComponent,
+    DetailedStatusTabComponent,
+    DetailedStatusComponent
   ],
   imports: [
     CommonModule,
diff --git a/src/app/views/nipun-bharat/pages/detailed-status-tab/detailed-status-tab.component.html b/src/app/views/nipun-bharat/pages/detailed-status-tab/detailed-status-tab.component.html
new file mode 100644
index 00000000..09b657e2
--- /dev/null
+++ b/src/app/views/nipun-bharat/pages/detailed-status-tab/detailed-status-tab.component.html
@@ -0,0 +1,21 @@
+<div class="col-span-full tab-wrapper">
+        <div class="filter-row grid grid-cols-5">
+            <div class="xmd:col-span-3 col-span-5">
+                <app-filter-panel  [filters]="filters" (filtersUpdated)="filtersUpdated($event)"
+                    colSize="lg:col-span-4 col-span-6"></app-filter-panel>
+            </div>
+            <div class="download-button xmd:col-start-4 xmd:col-end-6 col-span-5 flex">
+                <app-download-button [data]="reportsData"></app-download-button>
+            </div>
+        </div>
+        <div class="reports-row">
+            <div class="row-wrapper grid grid-cols-2 gap-4">
+    
+                <div class="col-span-2 xmd:col-span-2 div-shadow"
+                    *ngIf="checkReport('detailed_status', 'table')" id="table">
+                    <app-detailed-status #detailedStatus
+                        (exportReportData)="csvDownload($event)"></app-detailed-status >
+                </div>
+            </div>
+        </div>
+    </div>
\ No newline at end of file
diff --git a/src/app/views/nipun-bharat/pages/detailed-status-tab/detailed-status-tab.component.scss b/src/app/views/nipun-bharat/pages/detailed-status-tab/detailed-status-tab.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/views/nipun-bharat/pages/detailed-status-tab/detailed-status-tab.component.spec.ts b/src/app/views/nipun-bharat/pages/detailed-status-tab/detailed-status-tab.component.spec.ts
new file mode 100644
index 00000000..d12cd48d
--- /dev/null
+++ b/src/app/views/nipun-bharat/pages/detailed-status-tab/detailed-status-tab.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DetailedStatusTabComponent } from './detailed-status-tab.component';
+
+describe('DetailedStatusTabComponent', () => {
+  let component: DetailedStatusTabComponent;
+  let fixture: ComponentFixture<DetailedStatusTabComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ DetailedStatusTabComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(DetailedStatusTabComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/views/nipun-bharat/pages/detailed-status-tab/detailed-status-tab.component.ts b/src/app/views/nipun-bharat/pages/detailed-status-tab/detailed-status-tab.component.ts
new file mode 100644
index 00000000..160e1468
--- /dev/null
+++ b/src/app/views/nipun-bharat/pages/detailed-status-tab/detailed-status-tab.component.ts
@@ -0,0 +1,100 @@
+import { Component, OnInit ,ViewChild} from '@angular/core';
+import { RbacService } from 'src/app/core/services/rbac-service.service';
+import { WrapperService } from 'src/app/core/services/wrapper.service';
+import { config } from '../../config/nipun_bharat_config';
+import { DetailedStatusComponent } from './reports/detailed-status/detailed-status.component';
+
+
+@Component({
+  selector: 'app-detailed-status-tab',
+  templateUrl: './detailed-status-tab.component.html',
+  styleUrls: ['./detailed-status-tab.component.scss']
+})
+export class DetailedStatusTabComponent implements OnInit {
+
+  
+  minYear: any;
+  maxYear: any;
+  minMonth: any;
+  maxMonth: any;
+  academicYear: any = [];
+  months: any = [];
+  filters: any;
+  reportsToBeShown: any = [];
+  rbacDetails: any;
+  reportsData: any = [];
+  startDate: any;
+  endDate: any;
+  defaultSelectedDays: any;
+  hasTimeSeriesFilters: boolean = false;
+  hasCommonFilters: boolean = true;
+  tabLabel: any = 'Detailed Status';
+  bigNumberMetrics: any = [];
+
+ 
+
+  @ViewChild('detailedStatus') detailedStatus: DetailedStatusComponent;
+
+  constructor(private _wrapperService: WrapperService, private _rbacService: RbacService) {
+    this._rbacService.getRbacDetails().subscribe((rbacDetails: any) => {
+      this.rbacDetails = rbacDetails;
+    })
+  }
+
+  ngOnInit(): void {
+  }
+
+  async ngAfterViewInit(): Promise<void> {
+    if (this.hasCommonFilters) {
+      this.filters = await this._wrapperService.constructCommonFilters(config.filters, this.tabLabel);
+      this.detailedStatus?.getReportData({ filterValues: this.filters.map((filter) => { return { ...filter, columnName: filter.valueProp, filterType: filter.id } }) });
+
+    }
+    if (this.startDate === undefined && this.endDate === undefined && this.hasTimeSeriesFilters) {
+      let endDate = new Date();
+      let days = endDate.getDate() - this.defaultSelectedDays;
+      let startDate = new Date();
+      startDate.setDate(days);
+      this.detailedStatus?.getReportData({ timeSeriesValues: { startDate: startDate?.toISOString().split('T')[0], endDate: endDate?.toISOString().split('T')[0] } });
+
+    }
+  }
+
+  checkReport(key: string, reportType: string): Boolean {
+    let reportConfig = config;
+    let flag = false;
+    reportConfig[key]?.filters?.forEach((filter: any) => {
+      if (Number(filter.hierarchyLevel) === Number(this.rbacDetails?.role) && Object.keys(filter?.actions?.queries).includes(reportType)) {
+        flag = true
+      }
+    })
+    return flag
+  }
+
+  csvDownload(csvData: any) {
+    if (csvData) {
+      this.reportsData.push(csvData)
+    }
+  }
+
+  filtersUpdated(filters: any) {
+    this.reportsData = [];
+    this.detailedStatus?.getReportData({ filterValues: filters.map((filter) => { return { ...filter, columnName: filter.valueProp, filterType: filter.id } }) });
+
+  }
+  timeSeriesUpdated(event: any): void {
+    this.startDate = event?.startDate?.toDate().toISOString().split('T')[0]
+    this.endDate = event?.endDate?.toDate().toISOString().split('T')[0]
+    if (event?.startDate !== null && event?.endDate !== null) {
+      this.reportsData = [];
+      this.detailedStatus?.getReportData({ timeSeriesValues: { startDate: this.startDate, endDate: this.endDate } });
+
+    }
+  }
+
+  importBigNumberMetrics(bigNumberMetric: any) {
+    this.bigNumberMetrics[bigNumberMetric.ind] = bigNumberMetric.data
+  }
+
+
+}
diff --git a/src/app/views/nipun-bharat/pages/detailed-status-tab/reports/detailed-status/detailed-status.component.html b/src/app/views/nipun-bharat/pages/detailed-status-tab/reports/detailed-status/detailed-status.component.html
new file mode 100644
index 00000000..da758dcf
--- /dev/null
+++ b/src/app/views/nipun-bharat/pages/detailed-status-tab/reports/detailed-status/detailed-status.component.html
@@ -0,0 +1,8 @@
+<div class="grid grid-cols-12" *ngIf="reportData?.data?.length > 0">
+    <div class="xs:col-span-full">
+        <app-material-heat-chart-table [tableData]="reportData" [title]="title"></app-material-heat-chart-table>
+    </div>
+</div>
+<div class="noData" *ngIf="reportData?.data?.length <= 0">
+    No Data Found
+</div>
\ No newline at end of file
diff --git a/src/app/views/nipun-bharat/pages/detailed-status-tab/reports/detailed-status/detailed-status.component.scss b/src/app/views/nipun-bharat/pages/detailed-status-tab/reports/detailed-status/detailed-status.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/views/nipun-bharat/pages/detailed-status-tab/reports/detailed-status/detailed-status.component.spec.ts b/src/app/views/nipun-bharat/pages/detailed-status-tab/reports/detailed-status/detailed-status.component.spec.ts
new file mode 100644
index 00000000..05a7b93b
--- /dev/null
+++ b/src/app/views/nipun-bharat/pages/detailed-status-tab/reports/detailed-status/detailed-status.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DetailedStatusComponent } from './detailed-status.component';
+
+describe('DetailedStatusComponent', () => {
+  let component: DetailedStatusComponent;
+  let fixture: ComponentFixture<DetailedStatusComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ DetailedStatusComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(DetailedStatusComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/views/nipun-bharat/pages/detailed-status-tab/reports/detailed-status/detailed-status.component.ts b/src/app/views/nipun-bharat/pages/detailed-status-tab/reports/detailed-status/detailed-status.component.ts
new file mode 100644
index 00000000..a1cf8060
--- /dev/null
+++ b/src/app/views/nipun-bharat/pages/detailed-status-tab/reports/detailed-status/detailed-status.component.ts
@@ -0,0 +1,127 @@
+import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+import { DataService } from 'src/app/core/services/data.service';
+import { RbacService } from 'src/app/core/services/rbac-service.service';
+import { WrapperService } from 'src/app/core/services/wrapper.service';
+import { buildQuery, parseFilterToQuery, parseRbacFilter, parseTimeSeriesQuery } from 'src/app/utilities/QueryBuilder';
+import { config } from 'src/app/views/nipun-bharat/config/nipun_bharat_config';
+
+@Component({
+  selector: 'app-detailed-status',
+  templateUrl: './detailed-status.component.html',
+  styleUrls: ['./detailed-status.component.scss']
+})
+export class DetailedStatusComponent implements OnInit {
+
+  reportName: string = 'detailed_status';
+  filters: any = [];
+  levels: any;
+  reportData: any = {
+    reportName: "Detailed Status"
+  };
+  title: string = 'Detailed Status'
+  selectedYear: any;
+  selectedMonth: any;
+  startDate: any;
+  endDate: any;
+  config: any;
+  compareDateRange: any = 30;
+  filterIndex: any;
+  rbacDetails: any;
+
+  @Output() exportReportData = new EventEmitter<any>();
+
+  constructor(private readonly _dataService: DataService, private readonly _wrapperService: WrapperService, private _rbacService: RbacService) {
+    this._rbacService.getRbacDetails().subscribe((rbacDetails: any) => {
+      this.rbacDetails = rbacDetails;
+    })
+  }
+
+  ngOnInit(): void {
+  }
+
+  getReportData(values: any): void {
+    let { filterValues, timeSeriesValues } = values ?? {};
+    this.startDate = timeSeriesValues?.startDate;
+    this.endDate = timeSeriesValues?.endDate;
+    let reportConfig = config
+    let { timeSeriesQueries, queries, levels, defaultLevel, filters, options } = reportConfig[this.reportName];
+    let onLoadQuery;
+    let currentLevel;
+
+    if (this.rbacDetails?.role !== null && this.rbacDetails.role !== undefined) {
+      filters.every((filter: any) => {
+        if (Number(this.rbacDetails?.role) === Number(filter.hierarchyLevel)) {
+          queries = { ...filter?.actions?.queries }
+          currentLevel = filter?.actions?.level;
+          this.reportData = {
+            ...this.reportData,
+            reportName: `% ${currentLevel[0].toUpperCase() + currentLevel.substring(1)}s which conducted meeting`
+          }
+          Object.keys(queries).forEach((key) => {
+            queries[key] = parseRbacFilter(queries[key], this.rbacDetails)
+          });
+          return false
+        }
+        return true
+      })
+    }
+
+    Object.keys(queries).forEach(async (key: any) => {
+      if (key.toLowerCase().includes('comparison')) {
+        let endDate = new Date();
+        let days = endDate.getDate() - this.compareDateRange;
+        let startDate = new Date();
+        startDate.setDate(days)
+        onLoadQuery = parseTimeSeriesQuery(queries[key], startDate.toISOString().split('T')[0], endDate.toISOString().split('T')[0])
+      }
+      else {
+        onLoadQuery = queries[key]
+      }
+      let query = buildQuery(onLoadQuery, defaultLevel, this.levels, this.filters, this.startDate, this.endDate, key, this.compareDateRange);
+
+      let metricFilter = [...filterValues].filter((filter: any) => {
+        return filter.filterType === 'metric'
+      })
+
+      filterValues = [...filterValues].filter((filter: any) => {
+        return filter.filterType !== 'metric'
+      })
+
+      filterValues.forEach((filterParams: any) => {
+         query = parseFilterToQuery(query, filterParams)
+      });
+
+      if (query && key === 'table') {
+       this.reportData = await this._dataService.getTableReportData(query, options);
+        if (this.reportData?.data?.length > 0) {
+          let reportsData = { reportData: this.reportData.data, reportType: 'table', reportName: this.title }
+          this.exportReportData.emit(reportsData)
+        }
+      }
+      else if (query && key === 'bigNumber') {
+        this.reportData = await this._dataService.getBigNumberReportData(query, options, 'averagePercentage', this.reportData);
+      }
+      else if (query && key === 'bigNumberComparison') {
+        this.reportData = await this._dataService.getBigNumberReportData(query, options, 'differencePercentage', this.reportData);
+      }
+      else if (query && key === 'barChart') {
+        let { reportData, config } = await this._dataService.getBarChartReportData(query, options, filters, defaultLevel);
+        this.reportData = reportData
+        this.config = config;
+        console.log(config)
+        if (this.reportData?.values?.length > 0) {
+          let reportsData = { reportData: this.reportData.values, reportType: 'dashletBar', reportName: this.title, downloadConfig: options?.downloadConfig }
+          this.exportReportData.emit(reportsData)
+        }
+      }
+      else if (query && key === 'map') {
+        this.reportData = await this._dataService.getMapReportData(query, options, metricFilter)
+        if (this.reportData?.data?.length > 0) {
+          let reportsData = { reportData: this.reportData.data, reportType: 'map', reportName: this.title }
+          this.exportReportData.emit(reportsData)
+        }
+      }
+    })
+  }
+
+}
diff --git a/src/app/views/nipun-bharat/pages/learning-sessions-tab/reports/learning-sessions/learning-sessions.component.html b/src/app/views/nipun-bharat/pages/learning-sessions-tab/reports/learning-sessions/learning-sessions.component.html
index 2c4e5a79..bfea1a0c 100644
--- a/src/app/views/nipun-bharat/pages/learning-sessions-tab/reports/learning-sessions/learning-sessions.component.html
+++ b/src/app/views/nipun-bharat/pages/learning-sessions-tab/reports/learning-sessions/learning-sessions.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.values && reportData?.values?.length > 0)">
-        <p class="text-center font-medium py-2 filename" >{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p> -->
         <app-sb-bar-chart type="horizontalBar" [data]="reportData" [config]="config" ></app-sb-bar-chart>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.values && reportData?.values?.length > 0)">
diff --git a/src/app/views/nipun-bharat/pages/module-wide-status-tab/module-wide-status-tab.component.html b/src/app/views/nipun-bharat/pages/module-wide-status-tab/module-wide-status-tab.component.html
new file mode 100644
index 00000000..f4add05c
--- /dev/null
+++ b/src/app/views/nipun-bharat/pages/module-wide-status-tab/module-wide-status-tab.component.html
@@ -0,0 +1,19 @@
+<div class="col-span-full tab-wrapper">
+    <div class="filter-row grid grid-cols-5">
+        <div class="xmd:col-span-3 col-span-5">
+            <app-filter-panel [filters]="filters" (filtersUpdated)="filtersUpdated($event)"
+                colSize="lg:col-span-4 col-span-6"></app-filter-panel>
+        </div>
+        <div class="download-button xmd:col-start-4 xmd:col-end-6 col-span-5 flex" id="downloadbutton" #downloadbutton>
+            <app-download-button [data]="reportsData"></app-download-button>
+        </div>
+    </div>
+<div class="reports-row">
+    <div class="row-wrapper grid grid-cols-1 gap-4">
+        <div class="col-span-2 xmd:col-span-2 div-shadow" *ngIf="checkReport('module_wide_status', 'map')" id="map">
+            <app-module-wide-status #moduleWideStatusComponent
+                (exportReportData)="csvDownload($event)"></app-module-wide-status>
+        </div>
+    </div>
+</div>
+</div>
diff --git a/src/app/views/nipun-bharat/pages/module-wide-status-tab/module-wide-status-tab.component.scss b/src/app/views/nipun-bharat/pages/module-wide-status-tab/module-wide-status-tab.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/views/nipun-bharat/pages/module-wide-status-tab/module-wide-status-tab.component.spec.ts b/src/app/views/nipun-bharat/pages/module-wide-status-tab/module-wide-status-tab.component.spec.ts
new file mode 100644
index 00000000..8ce1cd0a
--- /dev/null
+++ b/src/app/views/nipun-bharat/pages/module-wide-status-tab/module-wide-status-tab.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ModuleWideStatusTabComponent } from './module-wide-status-tab.component';
+
+describe('ModuleWideStatusTabComponent', () => {
+  let component: ModuleWideStatusTabComponent;
+  let fixture: ComponentFixture<ModuleWideStatusTabComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ModuleWideStatusTabComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(ModuleWideStatusTabComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/views/nipun-bharat/pages/module-wide-status-tab/module-wide-status-tab.component.ts b/src/app/views/nipun-bharat/pages/module-wide-status-tab/module-wide-status-tab.component.ts
new file mode 100644
index 00000000..6259a03f
--- /dev/null
+++ b/src/app/views/nipun-bharat/pages/module-wide-status-tab/module-wide-status-tab.component.ts
@@ -0,0 +1,95 @@
+import { Component, OnInit,ViewChild ,AfterViewInit} from '@angular/core';
+import { RbacService } from 'src/app/core/services/rbac-service.service';
+import { WrapperService } from 'src/app/core/services/wrapper.service';
+import { config } from '../../config/nipun_bharat_config';
+import { ModuleWideStatusComponent } from './reports/module-wide-status/module-wide-status.component';
+
+@Component({
+  selector: 'app-module-wide-status-tab',
+  templateUrl: './module-wide-status-tab.component.html',
+  styleUrls: ['./module-wide-status-tab.component.scss']
+})
+
+export class ModuleWideStatusTabComponent implements OnInit , AfterViewInit {
+
+  bigNumberReports: any = {};
+  minYear: any;
+  maxYear: any;
+  minMonth: any;
+  maxMonth: any;
+  academicYear: any = [];
+  months: any = [];
+  filters: any ;
+  reportsToBeShown: any = [];
+  rbacDetails: any;
+  reportsData: any = [];
+  startDate: any;
+  endDate: any;
+  defaultSelectedDays: any;
+  hasTimeSeriesFilters: boolean = false;
+  hasCommonFilters: boolean = true;
+  tabLabel: any = "Module-wide Status";
+  bigNumberMetrics: any = [];
+
+@ViewChild('moduleWideStatusComponent') moduleWideStatusComponent: ModuleWideStatusComponent;
+      
+constructor(private _wrapperService: WrapperService, private _rbacService: RbacService) {
+  this._rbacService.getRbacDetails().subscribe((rbacDetails: any) => {
+      this.rbacDetails = rbacDetails;
+  })
+  }
+
+  async ngOnInit(): Promise<void> {
+  // this.renderReports();
+  }
+
+  async ngAfterViewInit(): Promise<void> {
+   
+  if (this.hasCommonFilters) {
+      this.filters = await this._wrapperService.constructCommonFilters(config.filters, this.tabLabel,undefined,undefined,true);
+      this.moduleWideStatusComponent?.getReportData({ filterValues: this.filters.map((filter) => { return { ...filter, columnName: filter.valueProp, filterType: filter.id} }) });
+      }
+  if (this.startDate === undefined && this.endDate === undefined && this.hasTimeSeriesFilters) {
+      let endDate = new Date();
+      let days = endDate.getDate() - this.defaultSelectedDays;
+      let startDate = new Date();
+      startDate.setDate(days);
+      this.moduleWideStatusComponent?.getReportData({ timeSeriesValues: { startDate: startDate?.toISOString().split('T')[0], endDate: endDate?.toISOString().split('T')[0] } });
+      }
+  }
+
+  checkReport(key: string, reportType: string): Boolean {
+  let reportConfig = config;
+  let flag = false;
+  reportConfig[key]?.filters?.forEach((filter: any) => {
+      if (Number(filter.hierarchyLevel) === Number(this.rbacDetails?.role) && Object.keys(filter?.actions?.queries).includes(reportType)) {
+      flag = true
+      }
+  })
+  return flag
+  }
+
+  csvDownload(csvData: any) {
+  if (csvData) {
+      this.reportsData.push(csvData)
+  }
+  }
+
+  filtersUpdated(filters: any) {
+  this.reportsData = [];
+  this.moduleWideStatusComponent?.getReportData({ filterValues: filters.map((filter) => { return { ...filter, columnName: filter.valueProp, filterType: filter.id} }) });
+      }
+
+  timeSeriesUpdated(event: any): void {
+  this.startDate = event?.startDate?.toDate().toISOString().split('T')[0]
+  this.endDate = event?.endDate?.toDate().toISOString().split('T')[0]
+  if (event?.startDate !== null && event?.endDate !== null) {
+      this.reportsData = [];
+      this.moduleWideStatusComponent?.getReportData({timeSeriesValues: {startDate: this.startDate, endDate: this.endDate}});
+      }
+  }
+
+  importBigNumberMetrics(bigNumberMetric: any) {
+      this.bigNumberMetrics[bigNumberMetric.ind] = bigNumberMetric.data
+  }
+}
diff --git a/src/app/views/nipun-bharat/pages/module-wide-status-tab/reports/module-wide-status/module-wide-status.component.html b/src/app/views/nipun-bharat/pages/module-wide-status-tab/reports/module-wide-status/module-wide-status.component.html
new file mode 100644
index 00000000..3e22e9a5
--- /dev/null
+++ b/src/app/views/nipun-bharat/pages/module-wide-status-tab/reports/module-wide-status/module-wide-status.component.html
@@ -0,0 +1,10 @@
+<div class="grid grid-cols-12" *ngIf="reportData?.data?.length > 0">
+    <div class="xs:col-span-full">
+                   <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p><br> -->
+            <app-leaflet-map [mapData]="reportData"></app-leaflet-map>
+                
+    </div>
+</div>
+<div class="noData" *ngIf="reportData?.data?.length <= 0">
+    No Data Found
+</div>
\ No newline at end of file
diff --git a/src/app/views/nipun-bharat/pages/module-wide-status-tab/reports/module-wide-status/module-wide-status.component.scss b/src/app/views/nipun-bharat/pages/module-wide-status-tab/reports/module-wide-status/module-wide-status.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/views/nipun-bharat/pages/module-wide-status-tab/reports/module-wide-status/module-wide-status.component.spec.ts b/src/app/views/nipun-bharat/pages/module-wide-status-tab/reports/module-wide-status/module-wide-status.component.spec.ts
new file mode 100644
index 00000000..9c822d1e
--- /dev/null
+++ b/src/app/views/nipun-bharat/pages/module-wide-status-tab/reports/module-wide-status/module-wide-status.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ModuleWideStatusComponent } from './module-wide-status.component';
+
+describe('ModuleWideStatusComponent', () => {
+  let component: ModuleWideStatusComponent;
+  let fixture: ComponentFixture<ModuleWideStatusComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ModuleWideStatusComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(ModuleWideStatusComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/views/nipun-bharat/pages/module-wide-status-tab/reports/module-wide-status/module-wide-status.component.ts b/src/app/views/nipun-bharat/pages/module-wide-status-tab/reports/module-wide-status/module-wide-status.component.ts
new file mode 100644
index 00000000..21aa7de4
--- /dev/null
+++ b/src/app/views/nipun-bharat/pages/module-wide-status-tab/reports/module-wide-status/module-wide-status.component.ts
@@ -0,0 +1,163 @@
+import { Component, EventEmitter, OnInit, Output ,OnDestroy} from '@angular/core';
+import { DataService } from 'src/app/core/services/data.service';
+import { RbacService } from 'src/app/core/services/rbac-service.service';
+import { WrapperService } from 'src/app/core/services/wrapper.service';
+import { buildQuery, parseFilterToQuery, parseRbacFilter, parseTimeSeriesQuery } from 'src/app/utilities/QueryBuilder';
+import { config } from 'src/app/views/nipun-bharat/config/nipun_bharat_config';
+import { ReportDrilldownService } from 'src/app/core/services/report-drilldown/report-drilldown.service';
+import { CommonService } from 'src/app/core/services/common/common.service';
+
+
+@Component({
+  selector: 'app-module-wide-status',
+  templateUrl: './module-wide-status.component.html',
+  styleUrls: ['./module-wide-status.component.scss']
+})
+export class ModuleWideStatusComponent  implements OnInit, OnDestroy {
+  reportName: string = 'module_wide_status';
+  filters: any = [];
+  levels: any;
+  reportData: any = {
+    reportName: "Module-wide Status"
+  };
+  title: string = 'Module-wide Status'
+  selectedYear: any;
+  selectedMonth: any;
+  startDate: any;
+  endDate: any;
+  config: any;
+  compareDateRange: any = 30;
+  filterIndex: any;
+  rbacDetails: any;
+  currentHierarchyLevel: any;
+  drillDownSubscription: any;
+  drillDownLevel: any;
+  drillDownDetails: any;
+  metricFilter: any;
+  commonFilter: any;
+
+  @Output() exportReportData = new EventEmitter<any>();
+
+  constructor(private readonly _dataService: DataService, private readonly _wrapperService: WrapperService, private _rbacService: RbacService, private _drillDownService: ReportDrilldownService) {
+    this._rbacService.getRbacDetails().subscribe((rbacDetails: any) => {
+      this.rbacDetails = rbacDetails;
+      this.currentHierarchyLevel = rbacDetails.role
+    })
+    this.drillDownSubscription = this._drillDownService.drilldownData.subscribe(async (data) => {
+      if (data && data !== 'reset') {
+        this.drillDownLevel = data.hierarchyLevel
+        // this.drilldownData({
+        //   ...data
+        // })
+        let result: any = await this._drillDownService.drilldown(data, this.rbacDetails, config[this.reportName], this.startDate, this.endDate, this.drillDownDetails, this.metricFilter, this.commonFilter)
+        this.drillDownDetails = result?.drillDownDetails
+        this.reportData = result?.reportData
+      }
+    })
+  }
+
+  ngOnInit(): void {
+  }
+
+  async getReportData(values: any): Promise<void> {
+    let { filterValues, timeSeriesValues } = values ?? {};
+    this.startDate = timeSeriesValues?.startDate;
+    this.endDate = timeSeriesValues?.endDate;
+    let metricFilter = [...filterValues].filter((filter: any) => {
+      return filter.filterType === 'metric'
+    })
+    this.metricFilter = metricFilter
+
+    filterValues = [...filterValues].filter((filter: any) => {
+      return filter.filterType !== 'metric'
+    })
+
+    this.commonFilter = filterValues
+    if (this.drillDownDetails !== undefined) {
+      let result: any = await this._drillDownService.drilldown({ hierarchyLevel: this.drillDownLevel }, this.rbacDetails, config[this.reportName], this.startDate, this.endDate, this.drillDownDetails, this.metricFilter, this.commonFilter)
+      this.drillDownDetails = result?.drillDownDetails
+      this.reportData = result?.reportData
+    }
+    else {
+      let reportConfig = config
+
+      let { timeSeriesQueries, queries, levels, defaultLevel, filters, options } = reportConfig[this.reportName];
+      let onLoadQuery;
+      let currentLevel;
+
+      if (this.rbacDetails?.role !== null && this.rbacDetails !== undefined) {
+        filters.every((filter: any) => {
+          if (Number(this.rbacDetails?.role) === Number(filter.hierarchyLevel)) {
+            queries = { ...filter?.actions?.queries }
+            currentLevel = filter?.actions?.level;
+            this.reportData = {
+              ...this.reportData,
+              reportName: `% ${currentLevel[0].toUpperCase() + currentLevel.substring(1)}s which conducted meeting`
+            }
+            Object.keys(queries).forEach((key) => {
+              queries[key] = parseRbacFilter(queries[key], this.rbacDetails)
+            });
+            return false
+          }
+          return true
+        })
+      }
+
+      Object.keys(queries).forEach(async (key: any) => {
+        if (key.toLowerCase().includes('comparison')) {
+          let endDate = new Date();
+          let days = endDate.getDate() - this.compareDateRange;
+          let startDate = new Date();
+          startDate.setDate(days)
+          onLoadQuery = parseTimeSeriesQuery(queries[key], startDate.toISOString().split('T')[0], endDate.toISOString().split('T')[0])
+        }
+        else {
+          onLoadQuery = queries[key]
+        }
+        let query = buildQuery(onLoadQuery, defaultLevel, this.levels, this.filters, this.startDate, this.endDate, key, this.compareDateRange);
+       
+        filterValues.forEach((filterParams: any) => {
+          if(filterParams.id ==='quarter' &&  (filterParams.value === null || filterParams.value === undefined )){
+            filterParams.value='2021-22 Q4';
+          }
+          query = parseFilterToQuery(query, filterParams)
+        });
+
+        if (query && key === 'table') {
+          this.reportData = await this._dataService.getTableReportData(query, options);
+          if (this.reportData?.data?.length > 0) {
+            let reportsData = { reportData: this.reportData.data, reportType: 'table', reportName: this.title }
+            this.exportReportData.emit(reportsData)
+          }
+        }
+        else if (query && key === 'bigNumber') {
+          this.reportData = await this._dataService.getBigNumberReportData(query, options, 'averagePercentage', this.reportData);
+        }
+        else if (query && key === 'bigNumberComparison') {
+          this.reportData = await this._dataService.getBigNumberReportData(query, options, 'differencePercentage', this.reportData);
+        }
+        else if (query && key === 'barChart') {
+          let { reportData, config } = await this._dataService.getBarChartReportData(query, options, filters, defaultLevel);
+          this.reportData = reportData
+          this.config = config;
+          if (this.reportData?.values?.length > 0) {
+            let reportsData = { reportData: this.reportData.values, reportType: 'dashletBar', reportName: this.title }
+            this.exportReportData.emit(reportsData)
+          }
+        }
+        else if (query && key === 'map') {
+          this.reportData = await this._dataService.getMapReportData(query, options, metricFilter)
+          if (this.reportData?.data?.length > 0) {
+            let reportsData = { reportData: this.reportData.data, reportType: 'map', reportName: this.title, downloadConfig: options?.downloadConfig }
+            this.exportReportData.emit(reportsData)
+          }
+        }
+      })
+    }
+  }
+  ngOnDestroy(): void {
+    this._drillDownService.emit('reset')
+    this.drillDownSubscription.unsubscribe()
+  }
+
+}
diff --git a/src/app/views/nipun-bharat/pages/textbook-status-tab/reports/nipun-bharat-metrics/nipun-bharat-metrics.component.ts b/src/app/views/nipun-bharat/pages/textbook-status-tab/reports/nipun-bharat-metrics/nipun-bharat-metrics.component.ts
index b8a6b374..dc29904e 100644
--- a/src/app/views/nipun-bharat/pages/textbook-status-tab/reports/nipun-bharat-metrics/nipun-bharat-metrics.component.ts
+++ b/src/app/views/nipun-bharat/pages/textbook-status-tab/reports/nipun-bharat-metrics/nipun-bharat-metrics.component.ts
@@ -25,7 +25,7 @@ export class NipunBharatMetricsComponent implements OnInit {
   compareDateRange: any = 30;
   filterIndex: any;
   rbacDetails: any;
-
+  bigNumberMetrics: any = [];
   @Output() exportReportData = new EventEmitter<any>();
 
   constructor(private readonly _dataService: DataService, private readonly _wrapperService: WrapperService, private _rbacService: RbacService) {
@@ -38,6 +38,15 @@ export class NipunBharatMetricsComponent implements OnInit {
     this.getReportData();
   }
 
+  importBigNumberMetrics(bigNumberMetric: any) {
+    this.bigNumberMetrics[bigNumberMetric.ind] = bigNumberMetric.data
+}
+
+getMetricsArray() {
+    return this.bigNumberMetrics.filter((data) => {
+      return data.averagePercentage !== null || data.averagePercentage !== undefined
+    }) 
+  }
   getReportData(values?: any): void {
     let { filterValues, timeSeriesValues } = values ?? {};
     this.startDate = timeSeriesValues?.startDate;
diff --git a/src/app/views/nipun-bharat/pages/textbook-status-tab/reports/textbook-status/textbook-status.component.html b/src/app/views/nipun-bharat/pages/textbook-status-tab/reports/textbook-status/textbook-status.component.html
index 2c4e5a79..d9e6262e 100644
--- a/src/app/views/nipun-bharat/pages/textbook-status-tab/reports/textbook-status/textbook-status.component.html
+++ b/src/app/views/nipun-bharat/pages/textbook-status-tab/reports/textbook-status/textbook-status.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.values && reportData?.values?.length > 0)">
-        <p class="text-center font-medium py-2 filename" >{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p><br> -->
         <app-sb-bar-chart type="horizontalBar" [data]="reportData" [config]="config" ></app-sb-bar-chart>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.values && reportData?.values?.length > 0)">
diff --git a/src/app/views/nipun-bharat/pages/textbook-status-tab/textbook-status-tab.component.html b/src/app/views/nipun-bharat/pages/textbook-status-tab/textbook-status-tab.component.html
index 04f6f0b6..67f094f7 100644
--- a/src/app/views/nipun-bharat/pages/textbook-status-tab/textbook-status-tab.component.html
+++ b/src/app/views/nipun-bharat/pages/textbook-status-tab/textbook-status-tab.component.html
@@ -10,18 +10,7 @@
         </div>
     </div>
     <div class="reports-row" >
-        <div *ngIf="checkReport('nipun_bharat_metrics', 'bigNumber1')" id="bignumber1">
-            <app-nipun-bharat-metrics (exportReportData)="importBigNumberMetrics($event)"></app-nipun-bharat-metrics>
-        </div>
-        <div class="row-wrapper grid grid-cols-5 gap-4">
-            <div class="col-span-2 xmd:col-span-1  bignumber-container" id="bignumber2"
-                *ngFor="let bigNumberData of bigNumberMetrics; let index = index">
-                <div *ngIf="checkReport('nipun_bharat_metrics', 'bigNumber'+(index+1))">
-                    <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
-                </div>
-            </div>
-        </div>
-        <div class="row-wrapper grid grid-cols-1 gap-4">
+            <div class="row-wrapper grid grid-cols-1 gap-4">
             <div class="col-span-2 xmd:col-span-2 div-shadow" *ngIf="checkReport('textbook_status', 'barChart')" id="bar">
                 <app-textbook-status #textbookStatus
                     (exportReportData)="csvDownload($event)"></app-textbook-status>
diff --git a/src/app/views/nishtha/config/nishtha_config.ts b/src/app/views/nishtha/config/nishtha_config.ts
index 7185dd14..fba31a5b 100644
--- a/src/app/views/nishtha/config/nishtha_config.ts
+++ b/src/app/views/nishtha/config/nishtha_config.ts
@@ -16,7 +16,12 @@ export const config = {
             "valueProp": "program_name",
             "id": "program_name",
             "tableAlias": "t1",
-            "query": "select program_name from dimensions.programnishtha order by program_name"
+            //"query": "select program_name from dimensions.programnishtha order by program_name"
+            "query": `SELECT DISTINCT CASE
+              WHEN program_name LIKE 'NISHTHA_Elementary%' THEN 'NISHTHA Elementary (Online)'
+              ELSE program_name
+              END AS program_name
+              FROM dimensions.programnishtha;`
         },
         {
             "label": "Implementation Status",
@@ -24,7 +29,12 @@ export const config = {
             "labelProp": "program_name",
             "valueProp": "program_name",
             "id": "metric",
-            "query": "select program_name from dimensions.programnishtha order by program_name"
+            //"query": "select program_name from dimensions.programnishtha order by program_name"
+            "query": `SELECT DISTINCT CASE
+              WHEN program_name LIKE 'NISHTHA_Elementary%' THEN 'NISHTHA Elementary'
+              ELSE program_name
+              END AS program_name
+              FROM dimensions.programnishtha;`
         },
         {
             "label": "Courses and Medium Status",
@@ -58,7 +68,12 @@ export const config = {
             "labelProp": "program_name",
             "valueProp": "program_name",
             "id": "program_name",
-            "query": "select program_name from dimensions.programnishtha order by program_name"
+            //"query": "select program_name from dimensions.programnishtha order by program_name"
+            "query": `SELECT DISTINCT CASE
+              WHEN program_name LIKE 'NISHTHA_Elementary%' THEN 'NISHTHA Elementary (Online)'
+              ELSE program_name
+              END AS program_name
+              FROM dimensions.programnishtha;`
         },
     ],
     implementation_status: {
@@ -69,7 +84,7 @@ export const config = {
                 "hierarchyLevel": "0",
                 "actions": {
                     "queries": {
-                        "map": "select d.latitude, d.longitude, t.state_id, t.program_name, state_name ,t.status from dimensions.state as d join (select state_id, program_name, case when sum > 0 then 'YES' else 'NO' end as status from datasets.nishtha_programstarted_state0programnishtha) as t on  d.state_id = t.state_id order by d.state_name asc"
+                        "map": "select d.latitude, d.longitude, t.state_id, t.program_name, t.program_status, state_name, t.status from dimensions.state as d join (select state_id, program_name, case when sum > 0 then CONCAT('YES. ', program_status) else CONCAT('NO. ', program_status) end as program_status, case when sum > 0 then 'YES' else 'NO' end as status from datasets.nishtha_programstarted_dwl6ewangb0rgg8igage) as t on  d.state_id = t.state_id order by d.state_name asc"  
                     },
                     "level": "state",
                     "nextLevel": "district"
@@ -126,7 +141,7 @@ export const config = {
                 "groupByColumn": "state_id",
                 "metricFilterNeeded": true,
                 "legend": {
-                    "title": "Implemented Nishtha"
+                    "title": "Implemented " 
                 },
                 "tooltipMetrics": [
                     {
@@ -136,7 +151,7 @@ export const config = {
                     },
                     {
                         "valuePrefix": "",
-                        "value": "program_name",
+                        "value": "program_status",
                         "valueSuffix": "\n"
                     }
                 ]
@@ -204,7 +219,7 @@ export const config = {
                 "hierarchyLevel": "0",
                 "actions": {
                     "queries": {
-                        "table": "SELECT st.state_name, SUM(count) as no_of_languages, string_agg(language, ',' order by language) as list_of_languages FROM datasets.nishtha_totalmedium_dqamdiwbdiicaxv9f2xl as ntm JOIN dimensions.state as st ON st.state_id = ntm.state_id GROUP BY ntm.state_id, st.state_name ORDER BY st.state_name"
+                        "table": "SELECT st.state_name, SUM(sum) as no_of_languages, string_agg(language, ', ' order by language) as list_of_languages FROM datasets.nishtha_totalmedium_dqamdiwbdiicaxv9f2xl as ntm JOIN dimensions.state as st ON st.state_id = ntm.state_id GROUP BY ntm.state_id, st.state_name ORDER BY st.state_name"
                     },
                     "level": "state",
                     "nextLevel": "district"
@@ -390,32 +405,63 @@ export const config = {
                 "hierarchyLevel": "0",
                 "actions": {
                     "queries": {
-                        "barChart": "select s.state_name, sum(ntae.sum) as achieved_certifications from datasets.nishtha_achievedcertification_chydbgqxd0rtzw5hz3zt as ntae JOIN dimensions.state as s ON s.state_id = ntae.state_id group by s.state_name ORDER BY s.state_name;",
+                        //"barChart": "SELECT s.state_name as state_name, ntae.sum AS achieved_certifications,nttcs.sum AS target_certifications, ntae.program_name AS program_name, CASE WHEN ntae.sum > nttcs.sum THEN 100 WHEN ntae.sum =0 and  nttcs.sum = 0 THEN 0 ELSE round(cast(ntae.sum/nttcs.sum*100 as numeric), 2) END AS percentage_achieved FROM datasets.nishtha_achievedcertification_chydbgqxd0rtzw5hz3zt AS ntae JOIN datasets.nishtha_targetcertification_hgcdmwjzbvlyaxbnu3r_ AS nttcs ON ntae.state_id = nttcs.state_id AND ntae.program_name = nttcs.program_name JOIN dimensions.state AS s ON s.state_id = ntae.state_id ORDER BY s.state_name ASC",
+                        "stackedBarChart": "select s.state_id, s.state_name, CASE WHEN ntae.sum > nttcs.sum THEN 100 WHEN ntae.sum =0 and  nttcs.sum = 0 THEN 0 ELSE round(cast(ntae.sum/nttcs.sum*100 as numeric), 2) END as achieved_certificates_per, (100 -  CASE WHEN ntae.sum > nttcs.sum THEN 100 WHEN ntae.sum =0 and  nttcs.sum = 0 THEN 0 ELSE round(cast(ntae.sum/nttcs.sum*100 as numeric), 2) END ) as incomplete_certificates_per, ntae.sum as actual_certificates, nttcs.sum as expected_certificates FROM datasets.nishtha_achievedcertification_chydbgqxd0rtzw5hz3zt AS ntae JOIN datasets.nishtha_targetcertification_hgcdmwjzbvlyaxbnu3r_ AS nttcs ON ntae.state_id = nttcs.state_id AND ntae.program_name = nttcs.program_name JOIN dimensions.state AS s ON s.state_id = ntae.state_id ORDER BY s.state_name ASC;"
                     },
                     "level": "district"
                 }
             },
         ],
         "options": {
-            "barChart": {
+            // "barChart": {
+            //     "isMultibar": true,
+            //     "valueSuffix": "%",
+            //     "type": "horizontal",
+            //     "yAxis": {
+            //         "title": "States"
+            //     },
+            //     "xAxis": {
+            //         "title": "Achieved Certifications",
+            //         "label": "state_name",
+            //         "value": "state_name",
+            //         "metrics": [
+                        
+            //             {
+            //                 "label": "Percentage of Certifications achieved",
+            //                 "value": "percentage_achieved",
+
+            //             },
+            //         ]
+            //     }
+            // },
+            "stackedBarChart": {
                 "isMultibar": true,
+                "valueSuffix": "%",
                 "type": "horizontal",
                 "yAxis": {
-                    "title": "States"
+                    "title": "States",
+                    "label": "state_name",
+                    "value": "state_name",
                 },
                 "xAxis": {
                     "title": "Achieved Certifications",
-                    "label": "state_name",
-                    "value": "state_name",
                     "metrics": [
                         {
-                            "label": "Achieved Certifications",
-                            "value": "achieved_certifications"
+                            "label": "Percentage of Certifications Achieved",
+                            "value": "achieved_certificates_per",
+                            "tooltipLabel":"Target Achieved",
                         },
-                        
+                        {
+                            "label": "Percentage of Certifications Remaining to be Achieved",
+                            "value": "incomplete_certificates_per",
+                            "tooltipLabel":"Actual Certification",
+                            "tooltipValue": "actual_certificates",
+                            "tooltipLabel1":"Total Expected Certification",
+                            "tooltipValue1":"expected_certificates"
+                        }
                     ]
                 }
-            },
+            }
         }
     },
     course_wise_status: {
@@ -479,7 +525,7 @@ export const config = {
                     "title": "Courses"
                 },
                 "xAxis": {
-                    "title": " Total Enrolement and Certifications",
+                    "title": "Total Certifications",
                     "label": "course_name",
                     "value": "course_name",
                     "metrics": [
@@ -572,7 +618,11 @@ export const config = {
                 "hierarchyLevel": "0",
                 "actions": {
                     "queries": {
-                        "bigNumber1": "select count(program_id) as programs from dimensions.programnishtha",
+                        "bigNumber1": `SELECT count(program_name) as programs FROM( SELECT DISTINCT CASE
+                                      WHEN program_name LIKE 'NISHTHA_Elementary%' THEN 'NISHTHA Elementary'
+                                      ELSE program_name
+                                      END AS program_name
+                                      FROM dimensions.programnishtha) as programnishtha;`,
                         "bigNumber2": "select sum(sum) as beneficiaries from datasets.nishtha_total_participants_programnishtha"
                     },
                     "level": "state"
@@ -581,7 +631,7 @@ export const config = {
         ],
         "options": {
             "bigNumber": {
-                "title": ['No. of Programs', 'No. of benefeciaries'],
+                "title": ['No. of Programs', 'No. of beneficiaries'],
                 "valueSuffix": ['', ''],
                 "property": ['programs', 'beneficiaries']
             }
@@ -600,8 +650,8 @@ export const config = {
                         "bigNumber3": "",
                         "bigNumber4": "",
                         "bigNumber5": "",
-                        "bigNumber6": "",
-                        "bigNumber7": "",
+                        "bigNumber6": "select sum(sum) as participants_1 from datasets.nishtha_total_participants_programnishtha where program_name = 'NISHTHA Elementary (Face-to-face)'",
+                        "bigNumber7": "select sum(sum) as participants_2 from datasets.nishtha_total_participants_programnishtha where program_name = 'NISHTHA Elementary (Online)'",
                         "bigNumber8": "select sum(sum) as participants_3 from datasets.nishtha_total_participants_programnishtha where program_name = 'NISHTHA Secondary'",
                         "bigNumber9": "select sum(sum) as participants_4 from datasets.nishtha_total_participants_programnishtha where program_name = 'NISHTHA FLN'",
                         "bigNumber10": "select sum(sum) as participants_5 from datasets.nishtha_total_participants_programnishtha where program_name = 'NISHTHA ECCE'",
@@ -627,7 +677,7 @@ export const config = {
         ],
         "options": {
             "bigNumber": {
-                "title": ['Total Enrolment', 'Total Completion', 'Total Certification', 'Total Mediums', 'Total States/UTs Participating', 'NISHTHA Elementary (Face-to-face)', 'NISHTHA Elementary (Online)', 'NISHTHA Secondary', 'NISHTHA FLN', 'NISHTHA ECCE'],
+                "title": ['Total Enrolment', 'Total Completion', 'Total Certification', 'Total Mediums', 'Total States/UTs Participating', 'NISHTHA Elementary (Face-to-face)', 'NISHTHA Elementary (Online)', 'NISHTHA Secondary (Online)', 'NISHTHA FLN (Online)', 'NISHTHA ECCE (Online)'],
                 "valueSuffix": ['', '', '', '', '', '', '', '', '', ''],
                 "property": ['total_enrolment', 'total_completion', 'total_certification', 'total_mediums', 'total_states', 'participants_1', 'participants_2', 'participants_3', 'participants_4', 'participants_5']
             }
diff --git a/src/app/views/nishtha/nishtha.component.html b/src/app/views/nishtha/nishtha.component.html
index 04a5fa32..6df9cfe4 100644
--- a/src/app/views/nishtha/nishtha.component.html
+++ b/src/app/views/nishtha/nishtha.component.html
@@ -1,12 +1,35 @@
+<div class="program-banner-wrapper">
+	<img src="assets/images/nishtha-banner.png" alt="Nishtha Banner">
+</div>
 <div class="metric-card-wrapper">
     <div class="grid gap-4 grid-cols-6 xmd:grid-cols-12">
         <div class="col-span-12">
-            <p class="program-title">NISHTHA</p>
+            <p class="program-title">
+				<img src="assets/images/nishtha.png" alt="logo"> NISHTHA
+			</p>
             <p class="program-desc">NISHTHA is a capacity building programme for "Improving Quality of School Education
                 through Integrated Teacher Training". It aims to build competencies among all the teachers and school
                 principals at the elementary stage. NISHTHA is the world's largest teachers' training program.</p>
         </div>
     </div>
+</div><br>
+
+<div class="col-span-full tab-wrapper" #target>
+    <div class="reports-row" >
+        <div *ngIf="checkReport('nishtha_metrics', 'bigNumber1')" id="bignumber1">
+            <app-nishtha-bignumber-metrics (exportReportData)="importBigNumberMetrics($event)"></app-nishtha-bignumber-metrics>
+        </div>
+        <div class="row-wrapper grid grid-cols-5 gap-4">
+            <h2 *ngIf="NVSK" class="col-span-5 ml-3 program-desc"><b>NISHTHA Coverage (No. of participants):</b></h2>
+            <div class="col-span-2 xmd:col-span-1 bignumber-container" id="bignumber2"
+                *ngFor="let bigNumberData of getMetricsArray(); let index = index">
+                <div *ngIf="checkReport('nishtha_metrics', 'bigNumber'+(index+1))">
+                    <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
+                </div>
+            </div>
+
+        </div>
+    </div>
 </div>
 
 <div class="custom-tab-group-wrapper">
diff --git a/src/app/views/nishtha/nishtha.component.ts b/src/app/views/nishtha/nishtha.component.ts
index 950e0d3c..88a165c3 100644
--- a/src/app/views/nishtha/nishtha.component.ts
+++ b/src/app/views/nishtha/nishtha.component.ts
@@ -1,5 +1,5 @@
 
-import { Component, OnInit } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { CommonService } from 'src/app/core/services/common/common.service';
 import { RbacService } from 'src/app/core/services/rbac-service.service';
@@ -11,7 +11,7 @@ import { environment } from 'src/environments/environment';
     templateUrl: './nishtha.component.html',
     styleUrls: ['./nishtha.component.scss']
 })
-export class NishthaComponent implements OnInit {
+export class NishthaComponent implements OnInit, AfterViewInit {
     loadTabs = false;
     rbacDetails: any;
     tabIndex;
@@ -19,6 +19,8 @@ export class NishthaComponent implements OnInit {
     tabs: any = [];
     programName: any = 'nishtha';
     NVSK = true;
+    bigNumberMetrics: any = [];
+	@ViewChild('target') private myTarget:ElementRef;
 
     constructor(private route: ActivatedRoute, private _rbacService: RbacService, private _commonService: CommonService) {
         this.route.queryParams.subscribe((param: any) => {
@@ -51,6 +53,7 @@ export class NishthaComponent implements OnInit {
     }
 
     ngAfterViewInit(): void {
+		this._commonService.scrollInto(this.myTarget.nativeElement);
         setTimeout(() => {
             this.selectedTabLabel = this.tabs.length > 0 ? this.tabs[0] : undefined
         });
@@ -65,4 +68,24 @@ export class NishthaComponent implements OnInit {
         }, 100);
     }
 
+    importBigNumberMetrics(bigNumberMetric: any) {
+        this.bigNumberMetrics[bigNumberMetric.ind] = bigNumberMetric.data
+    }
+
+    getMetricsArray() {
+        return this.bigNumberMetrics.filter((data) => {
+          return data.averagePercentage !== null || data.averagePercentage !== undefined
+        }) 
+      }
+
+      checkReport(key: string, reportType: string): Boolean {
+        let reportConfig = config;
+        let flag = false;
+        reportConfig[key]?.filters?.forEach((filter: any) => {
+            if (Number(filter.hierarchyLevel) === Number(this.rbacDetails?.role) && Object.keys(filter?.actions?.queries).includes(reportType)) {
+            flag = true
+            }
+        })
+        return flag
+        }
 }
diff --git a/src/app/views/nishtha/pages/course-wise-status-tab/reports/course-wise-status/course-wise-status.component.html b/src/app/views/nishtha/pages/course-wise-status-tab/reports/course-wise-status/course-wise-status.component.html
index 79420bff..ed2df25b 100644
--- a/src/app/views/nishtha/pages/course-wise-status-tab/reports/course-wise-status/course-wise-status.component.html
+++ b/src/app/views/nishtha/pages/course-wise-status-tab/reports/course-wise-status/course-wise-status.component.html
@@ -1,7 +1,7 @@
 <ng-container *ngIf="NVSK">
     <div class="col-span-full">
         <ng-container *ngIf="(reportData?.values && reportData?.values?.length > 0)">
-            <p class="text-center font-medium py-2 filename" >{{title}}</p><br>
+            <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p> -->
             <app-sb-bar-chart type="horizontalBar" [data]="reportData" [config]="config" ></app-sb-bar-chart>
         </ng-container>
         <div class="noData" *ngIf="!(reportData?.values && reportData?.values?.length > 0)">
diff --git a/src/app/views/nishtha/pages/course-wise-status-tab/reports/course-wise-status/course-wise-status.component.ts b/src/app/views/nishtha/pages/course-wise-status-tab/reports/course-wise-status/course-wise-status.component.ts
index 64fe697c..5e9b0ba6 100644
--- a/src/app/views/nishtha/pages/course-wise-status-tab/reports/course-wise-status/course-wise-status.component.ts
+++ b/src/app/views/nishtha/pages/course-wise-status-tab/reports/course-wise-status/course-wise-status.component.ts
@@ -93,6 +93,9 @@ export class CourseWiseStatusComponent implements OnInit {
       let query = buildQuery(onLoadQuery, defaultLevel, this.levels, this.filters, this.startDate, this.endDate, key, this.compareDateRange);
 
       filterValues.forEach((filterParams: any) => {
+        if(filterParams.value == "NISHTHA Elementary"){
+          filterParams.value = "NISHTHA Elementary (Online)"
+        }
         query = parseFilterToQuery(query, filterParams)
       });
 
diff --git a/src/app/views/nishtha/pages/district-wise-status-tab/reports/district-wise-status/district-wise-status.component.html b/src/app/views/nishtha/pages/district-wise-status-tab/reports/district-wise-status/district-wise-status.component.html
index 5d1b26f7..c08e6d0c 100644
--- a/src/app/views/nishtha/pages/district-wise-status-tab/reports/district-wise-status/district-wise-status.component.html
+++ b/src/app/views/nishtha/pages/district-wise-status-tab/reports/district-wise-status/district-wise-status.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.values && reportData?.values?.length > 0)">
-        <p class="text-center font-medium py-2 filename" >{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p> -->
         <!-- <sb-dashlet type="horizontalBar" [data]="reportData" [config]="config"></sb-dashlet> -->
         <app-sb-bar-chart type="horizontalBar" [data]="reportData" [config]="config" ></app-sb-bar-chart>
     </ng-container>
diff --git a/src/app/views/nishtha/pages/implementation-status-tab/implementation-status-tab.component.html b/src/app/views/nishtha/pages/implementation-status-tab/implementation-status-tab.component.html
index a94ef953..660ccbb0 100644
--- a/src/app/views/nishtha/pages/implementation-status-tab/implementation-status-tab.component.html
+++ b/src/app/views/nishtha/pages/implementation-status-tab/implementation-status-tab.component.html
@@ -13,7 +13,7 @@
         <div *ngIf="checkReport('nishtha_metrics', 'bigNumber1')" id="bignumber1">
             <app-nishtha-bignumber-metrics (exportReportData)="importBigNumberMetrics($event)"></app-nishtha-bignumber-metrics>
         </div>
-        <div class="row-wrapper grid grid-cols-5 gap-4">
+        <!-- <div class="row-wrapper grid grid-cols-5 gap-4">
             <h2 *ngIf="NVSK" class="col-span-5 ml-3"><b>NISHTHA Coverage (No. of participants):</b></h2>
             <div class="col-span-2 xmd:col-span-1 bignumber-container" id="bignumber2"
                 *ngFor="let bigNumberData of getMetricsArray(); let index = index">
@@ -22,7 +22,7 @@ <h2 *ngIf="NVSK" class="col-span-5 ml-3"><b>NISHTHA Coverage (No. of participant
                 </div>
             </div>
 
-        </div>
+        </div> -->
         <div class="row-wrapper grid ">
             <div class="col-span-1 xmd:col-span-1 div-shadow" *ngIf="checkReport('implementation_status', 'table') || checkReport('implementation_status', 'map')"
             id="table">
diff --git a/src/app/views/nishtha/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html b/src/app/views/nishtha/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
index 4036a888..7e79fbfe 100644
--- a/src/app/views/nishtha/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
+++ b/src/app/views/nishtha/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
@@ -1,7 +1,7 @@
 <div class="grid grid-cols-12" *ngIf="reportData?.data?.length > 0">
     <div class="xs:col-span-full">
         <ng-container *ngIf="NVSK">
-            <p class="text-center font-medium py-2 filename" >{{title}}</p><br>
+            <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p> -->
             <app-leaflet-map [mapData]="reportData"></app-leaflet-map>
         </ng-container>
         <ng-container *ngIf="!NVSK">
diff --git a/src/app/views/nishtha/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.ts b/src/app/views/nishtha/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.ts
index 0b191d48..0a139873 100644
--- a/src/app/views/nishtha/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.ts
+++ b/src/app/views/nishtha/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.ts
@@ -110,6 +110,11 @@ export class ImplementationStatusComponent implements OnInit {
           this.csv.csvDownload(reportsData);
         }
       } else if (query && key === 'map') {
+        metricFilter.filter((filter: any) => {
+          if(filter.value == "NISHTHA Elementary"){
+            filter.value = "NISHTHA Elementary (Online)"
+          }
+        });
         this.spinner.show();
         this.reportData = await this._dataService.getMapReportData(query, options, metricFilter);
         console.log(this.reportData)
diff --git a/src/app/views/nishtha/pages/medium-of-instruction-tab/reports/medium-of-instruction/medium-of-instruction.component.ts b/src/app/views/nishtha/pages/medium-of-instruction-tab/reports/medium-of-instruction/medium-of-instruction.component.ts
index 9c8ad6fb..e60f5251 100644
--- a/src/app/views/nishtha/pages/medium-of-instruction-tab/reports/medium-of-instruction/medium-of-instruction.component.ts
+++ b/src/app/views/nishtha/pages/medium-of-instruction-tab/reports/medium-of-instruction/medium-of-instruction.component.ts
@@ -93,6 +93,9 @@ export class MediumOfInstructionComponent implements OnInit {
       let query = buildQuery(onLoadQuery, defaultLevel, this.levels, this.filters, this.startDate, this.endDate, key, this.compareDateRange);
 
       filterValues.forEach((filterParams: any) => {
+        if(filterParams.value == "NISHTHA Elementary"){
+          filterParams.value = "NISHTHA Elementary (Online)"
+        }
         query = parseFilterToQuery(query, filterParams)
       });
 
diff --git a/src/app/views/nishtha/pages/potential-base-tab/potential-base-tab.component.html b/src/app/views/nishtha/pages/potential-base-tab/potential-base-tab.component.html
index 27f50bab..66ccff68 100644
--- a/src/app/views/nishtha/pages/potential-base-tab/potential-base-tab.component.html
+++ b/src/app/views/nishtha/pages/potential-base-tab/potential-base-tab.component.html
@@ -19,7 +19,7 @@
             </div>
         </div>
         <div class="row-wrapper grid grid-cols-1 gap-4" *ngIf="NVSK">
-            <div class="col-span-1 div-shadow" *ngIf="checkReport('potential_base_nvsk', 'barChart')" id="chart1">
+            <div class="col-span-1 div-shadow" *ngIf="checkReport('potential_base_nvsk', 'stackedBarChart')" id="chart1">
                 <app-potential-base-nvsk #potentialBaseNVSK (exportReportData)="csvDownload($event)"></app-potential-base-nvsk>
             </div>
         </div>
diff --git a/src/app/views/nishtha/pages/potential-base-tab/reports/potential-base-certificates/potential-base-certificates.component.html b/src/app/views/nishtha/pages/potential-base-tab/reports/potential-base-certificates/potential-base-certificates.component.html
index c6b6945b..5d618172 100644
--- a/src/app/views/nishtha/pages/potential-base-tab/reports/potential-base-certificates/potential-base-certificates.component.html
+++ b/src/app/views/nishtha/pages/potential-base-tab/reports/potential-base-certificates/potential-base-certificates.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.values && reportData?.values?.length > 0)">
-        <p class="text-center font-medium py-2 filename" >{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p> -->
         <sb-dashlet [type]="!NVSK ? 'bar' : 'horizontalBar'" [data]="reportData" [config]="config"></sb-dashlet>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.values && reportData?.values?.length > 0)">
diff --git a/src/app/views/nishtha/pages/potential-base-tab/reports/potential-base-nvsk/potential-base-nvsk.component.html b/src/app/views/nishtha/pages/potential-base-tab/reports/potential-base-nvsk/potential-base-nvsk.component.html
index 186b62f0..728ec6d3 100644
--- a/src/app/views/nishtha/pages/potential-base-tab/reports/potential-base-nvsk/potential-base-nvsk.component.html
+++ b/src/app/views/nishtha/pages/potential-base-tab/reports/potential-base-nvsk/potential-base-nvsk.component.html
@@ -1,6 +1,11 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.values && reportData?.values?.length > 0)">
-        <p class="text-center font-medium py-2 filename" >{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p> -->
+		<p class="text-center font-small py-2 filename" 
+		 *ngIf="currentFilterValue == 'NISHTHA Elementary (Face-to-face)'" 
+		>
+		   {{subTitle}}
+	    </p>
         <!-- <sb-dashlet type="bar" [data]="reportData" [config]="config"></sb-dashlet> -->
         <app-sb-bar-chart type="horizontalBar" [data]="reportData" [config]="config" ></app-sb-bar-chart>
     </ng-container>
diff --git a/src/app/views/nishtha/pages/potential-base-tab/reports/potential-base-nvsk/potential-base-nvsk.component.ts b/src/app/views/nishtha/pages/potential-base-tab/reports/potential-base-nvsk/potential-base-nvsk.component.ts
index d951fc39..09c5e7db 100644
--- a/src/app/views/nishtha/pages/potential-base-tab/reports/potential-base-nvsk/potential-base-nvsk.component.ts
+++ b/src/app/views/nishtha/pages/potential-base-tab/reports/potential-base-nvsk/potential-base-nvsk.component.ts
@@ -19,6 +19,7 @@ export class PotentialBaseNvskComponent implements OnInit {
     reportName: "% against Potential Base"
   };
   title: string = '% against Potential Base'
+  subTitle: string = 'For NISHTHA Elementary (Face-to-face) program, the certification numbers correspond to certificate of participation.'
   selectedYear: any;
   selectedMonth: any;
   startDate: any;
@@ -27,6 +28,7 @@ export class PotentialBaseNvskComponent implements OnInit {
   compareDateRange: any = 30;
   filterIndex: any;
   rbacDetails: any;
+  currentFilterValue: any;
 
   @Output() exportReportData = new EventEmitter<any>();
 
@@ -48,7 +50,7 @@ export class PotentialBaseNvskComponent implements OnInit {
     let { timeSeriesQueries, queries, levels, defaultLevel, filters, options } = reportConfig[this.reportName];
     let onLoadQuery;
     let currentLevel;
-
+    this.currentFilterValue = onLoadQuery;
     if (this.rbacDetails?.role !== null && this.rbacDetails.role !== undefined) {
       filters.every((filter: any) => {
         if (Number(this.rbacDetails?.role) === Number(filter.hierarchyLevel)) {
@@ -85,11 +87,13 @@ export class PotentialBaseNvskComponent implements OnInit {
       })
 
       filterValues = [...filterValues].filter((filter: any) => {
+		this.currentFilterValue = filter.filterType;
         return filter.filterType !== 'metric'
       })
 
       filterValues.forEach((filterParams: any) => {
         query = parseFilterToQuery(query, filterParams)
+		this.currentFilterValue = filterParams.value;
       });
 
       if (query && key === 'table') {
@@ -114,6 +118,18 @@ export class PotentialBaseNvskComponent implements OnInit {
           this.exportReportData.emit(reportsData)
         }
       }
+      else if (query && key === 'stackedBarChart') {
+        let { reportData, config } = await this._dataService.getStackedBarChartReportData(query, options, filters, defaultLevel);
+        config.options.scales.yAxes[0].scaleLabel.fontSize = 10;
+
+        this.reportData = reportData
+        this.config = config;
+        if (this.reportData?.values?.length > 0) {
+          let reportsData = { reportData: this.reportData.values, reportType: 'dashletBar', reportName: this.title }
+          this.exportReportData.emit(reportsData)
+          //this.csv.csvDownload(reportsData)
+        }
+      }
       else if (query && key === 'map') {
         console.log('quary', query);
         this.reportData = await this._dataService.getMapReportData(query, options, metricFilter)
diff --git a/src/app/views/nishtha/pages/potential-base-tab/reports/potential-base/potential-base.component.html b/src/app/views/nishtha/pages/potential-base-tab/reports/potential-base/potential-base.component.html
index c6b6945b..5d618172 100644
--- a/src/app/views/nishtha/pages/potential-base-tab/reports/potential-base/potential-base.component.html
+++ b/src/app/views/nishtha/pages/potential-base-tab/reports/potential-base/potential-base.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.values && reportData?.values?.length > 0)">
-        <p class="text-center font-medium py-2 filename" >{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p> -->
         <sb-dashlet [type]="!NVSK ? 'bar' : 'horizontalBar'" [data]="reportData" [config]="config"></sb-dashlet>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.values && reportData?.values?.length > 0)">
diff --git a/src/app/views/pgi-apex/config/pgi_apex_config.ts b/src/app/views/pgi-apex/config/pgi_apex_config.ts
new file mode 100644
index 00000000..654b9081
--- /dev/null
+++ b/src/app/views/pgi-apex/config/pgi_apex_config.ts
@@ -0,0 +1,25 @@
+export const config = {     
+    summary_metrics: {
+        "filters": [
+            {
+                "name": "National",
+                "hierarchyLevel": "0",
+                "actions": {
+                    "queries": {
+                        "bigNumber1": `select count(state_id) as total_state from datasets.pgi_started_state`,
+                        //hardcoded value '70' is written for second main metrics 'Total parameters', as raw data file does not have total parameters list
+                        "bigNumber2": "select dm.metric_value as total_parameters from dimensions.mainmetrics dm where  dm.program_id='pgi' and dm.metric_name ='Total Parameters' and dm.metric_type ='Key Metric'"
+                    },
+                    "level": "state"
+                }
+            },
+        ],
+        "options": {
+            "bigNumber": {
+                "title": ['Total States/UTs', 'Total Parameters'],
+                "valueSuffix": ['', ''],
+                "property": ['total_state', 'total_parameters']
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/app/views/pgi-apex/pgi-apex-routing.module.ts b/src/app/views/pgi-apex/pgi-apex-routing.module.ts
new file mode 100644
index 00000000..30bcf175
--- /dev/null
+++ b/src/app/views/pgi-apex/pgi-apex-routing.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { PgiComponent } from './pgi-apex.component';           
+const routes: Routes = [
+    {
+        path:'',
+        component: PgiComponent
+    }
+];
+@NgModule({
+    imports: [RouterModule.forChild(routes)],
+    exports: [RouterModule]
+})
+export class PgiApexRoutingComponent { }
\ No newline at end of file
diff --git a/src/app/views/pgi-apex/pgi-apex.component.html b/src/app/views/pgi-apex/pgi-apex.component.html
new file mode 100644
index 00000000..3c1dcc79
--- /dev/null
+++ b/src/app/views/pgi-apex/pgi-apex.component.html
@@ -0,0 +1,20 @@
+<div class="program-banner-wrapper">
+	<img src="assets/images/pgi-banner.png" alt="PGI Banner">
+</div>
+<div class="metric-card-wrapper">
+    <div class="grid gap-4 grid-cols-6 xmd:grid-cols-12">
+        <div class="col-span-12">
+            <p class="program-title" #target>
+				<img src="assets/images/pgi.png" alt="logo">
+				Performance Grading Index <em><small>(PGI)</small></em>
+			</p>
+            <p class="program-desc ">The Performance Grading Index (PGI) is a tool to provide insights on the status of
+                school education in States and Union territories including key levers that drive their performance and
+                critical areas for improvement.</p>
+        </div>
+    </div>
+</div>
+
+<div class="custom-tab-group-wrapper" style="height: 1200px; max-height: 1500px; min-height: 300px;">
+    <iframe width="100%" height="100%" frameBorder="0" [src]="urlSafe" 	target="_parent" loading="lazy"> </iframe>
+</div>
\ No newline at end of file
diff --git a/src/app/views/pgi-apex/pgi-apex.component.scss b/src/app/views/pgi-apex/pgi-apex.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/views/pgi-apex/pgi-apex.component.spec.ts b/src/app/views/pgi-apex/pgi-apex.component.spec.ts
new file mode 100644
index 00000000..ac4ea872
--- /dev/null
+++ b/src/app/views/pgi-apex/pgi-apex.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PgiComponent } from './pgi-apex.component';
+
+describe('NasComponent', () => {
+    let component: PgiComponent;
+    let fixture: ComponentFixture<PgiComponent>;
+
+    beforeEach(async () => {
+    await TestBed.configureTestingModule({
+        declarations: [ PgiComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(PgiComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    });
+
+    it('should create', () => {
+    expect(component).toBeTruthy();
+    });
+});
diff --git a/src/app/views/pgi-apex/pgi-apex.component.ts b/src/app/views/pgi-apex/pgi-apex.component.ts
new file mode 100644
index 00000000..6f2d5771
--- /dev/null
+++ b/src/app/views/pgi-apex/pgi-apex.component.ts
@@ -0,0 +1,88 @@
+
+import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { CommonService } from 'src/app/core/services/common/common.service';
+import { RbacService } from 'src/app/core/services/rbac-service.service';
+import { config } from './config/pgi_apex_config';
+import { environment } from 'src/environments/environment';
+import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
+
+@Component({
+    selector: 'app-pgi',
+    templateUrl: './pgi-apex.component.html',
+    styleUrls: ['./pgi-apex.component.scss']
+})
+export class PgiComponent implements OnInit, AfterViewInit {
+    loadTabs = false;
+    rbacDetails: any;
+    tabIndex;
+    selectedTabLabel;
+    tabs: any = [];
+    programName: any = 'pgi-apex';
+    bigNumberMetrics: any = [];
+    NVSK: boolean = true;
+    url:string = 'https://vskdev-apex.diksha.gov.in/ords/r/vskdev/pgi';
+    urlSafe: SafeResourceUrl;
+	@ViewChild('target') private myTarget:ElementRef;
+
+    constructor(private route: ActivatedRoute, private sanitizer: DomSanitizer, private _rbacService: RbacService, private _commonService: CommonService) {
+        this.route.queryParams.subscribe((param: any) => {
+            this.tabIndex = param.tab ? Number(param.tab) : 0;
+        })
+        this._rbacService.getRbacDetails().subscribe((rbacDetails: any) => {
+            this.rbacDetails = rbacDetails;
+        })
+        let allTabs = [...Object.keys(config)]
+        allTabs.forEach((tab: any) => {
+            config?.[tab]?.filters?.every((filter) => {
+                if ((Number(filter?.hierarchyLevel) === this.rbacDetails?.role) || this.rbacDetails?.role === 0) {
+                    if (!(this.tabs.includes(config?.[tab]?.label))) {
+                        this.tabs.push(config?.[tab]?.label)
+                    }
+                    return false
+                }
+                return true
+            })
+        })
+        if(environment.config === 'VSK') {
+            this.NVSK = false;
+        }
+    }
+
+    ngOnInit(): void {
+        this.urlSafe = this.sanitizer.bypassSecurityTrustResourceUrl(this.url);
+        this._commonService.getMetaData(this.programName).subscribe()
+    }
+
+    ngAfterViewInit(): void {
+		this._commonService.scrollInto(this.myTarget.nativeElement);
+        setTimeout(() => {
+            this.selectedTabLabel = this.tabs.length > 0 ? this.tabs[0] : undefined
+        });
+    }
+
+    onTabChanged($event: any): void {
+        this.selectedTabLabel = $event?.tab?.textLabel;
+        this.tabIndex = $event.index;
+        setTimeout(() => {
+            window.dispatchEvent(new Event('resize'));
+            console.log('resize');
+        }, 100);
+    }
+
+    checkReport(key: string, reportType: string): Boolean {
+        let reportConfig = config;
+        let flag = false;
+        reportConfig[key]?.filters?.forEach((filter: any) => {
+            if (Number(filter.hierarchyLevel) === Number(this.rbacDetails?.role) && Object.keys(filter?.actions?.queries).includes(reportType)) {
+                flag = true
+            }
+        })
+        return flag
+    }
+
+    importBigNumberMetrics(bigNumberMetric: any) {
+        this.bigNumberMetrics[bigNumberMetric.ind] = bigNumberMetric.data
+    }
+
+}
diff --git a/src/app/views/pgi-apex/pgi-apex.module.ts b/src/app/views/pgi-apex/pgi-apex.module.ts
new file mode 100644
index 00000000..97b8c255
--- /dev/null
+++ b/src/app/views/pgi-apex/pgi-apex.module.ts
@@ -0,0 +1,23 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MatTabsModule } from '@angular/material/tabs';
+import { SharedModule } from 'src/app/shared/shared.module';
+import { DashletModule, DataService } from '@project-sunbird/sb-dashlet';
+import {PgiApexRoutingComponent} from './pgi-apex-routing.module';
+import {PgiComponent} from './pgi-apex.component';
+
+@NgModule({
+declarations: [
+    PgiComponent,
+   ],
+imports: [
+    DashletModule.forRoot({
+        dataService: DataService
+    }),
+    MatTabsModule,
+    SharedModule,
+    CommonModule,
+    PgiApexRoutingComponent
+]
+})
+export class PgiApexModule { }
diff --git a/src/app/views/pgi/config/pgi_config.ts b/src/app/views/pgi/config/pgi_config.ts
index 0f8c60a4..38652984 100644
--- a/src/app/views/pgi/config/pgi_config.ts
+++ b/src/app/views/pgi/config/pgi_config.ts
@@ -6,7 +6,15 @@ export const config = {
             "labelProp": "category_name",
             "valueProp": "category_name",
             "id": "metric",
-            "query": "select category_name from dimensions.categorypgi"
+            "query": "select category_name from dimensions.categorypgi order by category_name"
+        },
+        {
+            "label": "District Wise Performance",
+            "name": "State",
+            "labelProp": "state_name",
+            "valueProp": "state_id",
+            "id": "state_name",
+            "query": "select state_id,state_name from dimensions.state order by state_name"
         },
         {
             "label": "State Wise Performance",
@@ -14,7 +22,7 @@ export const config = {
             "labelProp": "category_name",
             "valueProp": "category_name",
             "id": "metric",
-            "query": "select category_name from dimensions.categorypgi"
+            "query": "select category_name from dimensions.performancecategorypgi order by category_name"
         },
     ],
     implementation_status:{
@@ -68,7 +76,7 @@ export const config = {
                 {
                     "queries":
                     {
-                        "map": "select t2.district_name, t1.district_id ,latitude, longitude, t1.category_name,round(cast(sum(t1.sum) as numeric ),2) as performance from datasets.pgi_category_district0categorypgi as t1 join dimensions.district as t2 on t2.district_id = t1.district_id group by t1.district_id, t2.district_name,t1.category_name, latitude, longitude"
+                        "map": "select t2.district_name, t1.district_id ,latitude, longitude, t1.category_name,round(cast(sum(t1.sum) as numeric ),2) as performance from datasets.pgi_category_district0categorypgi as t1 join dimensions.district as t2 on t2.district_id = t1.district_id group by t1.district_id, t2.district_name,t1.category_name, latitude, longitude order by t1.category_name"
                     },
                     "level": "state",
                     "nextLevel": "district"
@@ -80,7 +88,7 @@ export const config = {
                 "actions": {
                     "queries":
                     {
-                        "map": "select category_name, d.district_name,latitude, longitude,t.district_id, cast(sum(t.sum) as numeric) as performance FROM datasets.pgi_category_district0categorypgi as t join dimensions.district as d on t.district_id = d.district_id group by t.district_id, d.district_name, category_name, latitude, longitude"
+                        "map": "select category_name, d.district_name,latitude, longitude,t.district_id, cast(sum(t.sum) as numeric) as performance FROM datasets.pgi_category_district0categorypgi as t join dimensions.district as d on t.district_id = d.district_id group by t.district_id, d.district_name, category_name, latitude, longitude order by category_name"
                     },
                     "level": "district",
                     "nextLevel": "block"
@@ -98,7 +106,7 @@ export const config = {
                 "metricValueProp": "performance",
                 "groupByColumn": "district_id",
                 "metricFilterNeeded": true,
-                "legend": { "title": "District-wise Performance" },
+                "legend": { "title": "District-wise Performance " },
                 "tooltipMetrics": [
                     {
                         "valuePrefix": "District Name: ",
@@ -114,6 +122,29 @@ export const config = {
             }
         }
     },
+    summary_metrics: {
+        "filters": [
+            {
+                "name": "National",
+                "hierarchyLevel": "0",
+                "actions": {
+                    "queries": {
+                        "bigNumber1": `select count(state_id) as total_state from datasets.pgi_started_state`,
+                        //hardcoded value '70' is written for second main metrics 'Total parameters', as raw data file does not have total parameters list
+                        "bigNumber2": "select dm.metric_value as total_parameters from dimensions.mainmetrics dm where  dm.program_id='pgi' and dm.metric_name ='Total Parameters' and dm.metric_type ='Key Metric'"
+                    },
+                    "level": "state"
+                }
+            },
+        ],
+        "options": {
+            "bigNumber": {
+                "title": ['Total States/UTs', 'Total Parameters'],
+                "valueSuffix": ['', ''],
+                "property": ['total_state', 'total_parameters']
+            }
+        }
+    },
     pgi_metrics: {
         "label": "Progress Status",
         "filters": [
@@ -122,12 +153,12 @@ export const config = {
                 "hierarchyLevel": "0",
                 "actions": {
                     "queries": {
-                        "bigNumber1": "select sum(sum) as outcome from datasets.pgi_category_state0categorypgi as t where category_name = 'outcome'",
-                        "bigNumber2": "select sum(sum) as infra_score from datasets.pgi_category_state0categorypgi as t where category_name = 'infrastructure_facilities_studententitlements'",
-                        "bigNumber3": "select sum(sum) as governance_processes from datasets.pgi_category_state0categorypgi as t where category_name = 'governance_processes'",
-                        "bigNumber4": "",
-                        "bigNumber5": ""
-                    },
+                        "bigNumber1": "select dm.metric_value as outcome from dimensions.mainmetrics dm where  dm.program_id='pgi' and dm.metric_name ='Learning Outcomes & Quality' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber2": "select dm.metric_value as access from dimensions.mainmetrics dm where  dm.program_id='pgi' and dm.metric_name ='Access' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber3": "select dm.metric_value as infra_score from dimensions.mainmetrics dm where  dm.program_id='pgi' and dm.metric_name ='Infastructure & Facilities' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber4": "select dm.metric_value as equity from  dimensions.mainmetrics dm where  dm.program_id='pgi' and dm.metric_name ='Equity' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber5": "select dm.metric_value as governance_processes from dimensions.mainmetrics dm where  dm.program_id='pgi' and dm.metric_name ='Governance Processes' and dm.metric_type ='Vanity Metric'",
+                     },
                     "level": "state"
                 }
             },
@@ -138,21 +169,23 @@ export const config = {
                 "hierarchyLevel": "1",
                 "actions": {
                     "queries": {
-                        "bigNumber1": "select sum(sum) as outcome from datasets.pgi_category_district0categorypgi as t where category_name = 'outcome'",
-                        "bigNumber2": "select sum(sum) as infra_score from datasets.pgi_category_district0categorypgi as t where category_name = 'infrastructure_facilities_studententitlements'",
-                        "bigNumber3": "select sum(sum) as governance_processes from datasets.pgi_category_district0categorypgi as t where category_name = 'governance_processes'",
-                        "bigNumber4": "",
-                        "bigNumber5": ""
-                    },
+                        "bigNumber1": "select dm.metric_value as outcome from dimensions.mainmetrics dm where  dm.program_id='pgi' and dm.metric_name ='Learning Outcomes & Quality' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber2": "select dm.metric_value as access from dimensions.mainmetrics dm where  dm.program_id='pgi' and dm.metric_name ='Access' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber3": "select dm.metric_value as infra_score from dimensions.mainmetrics dm where  dm.program_id='pgi' and dm.metric_name ='Infastructure & Facilities' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber4": "select dm.metric_value as equity from  dimensions.mainmetrics dm where  dm.program_id='pgi' and dm.metric_name ='Equity' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber5": "select dm.metric_value as governance_processes from dimensions.mainmetrics dm where  dm.program_id='pgi' and dm.metric_name ='Governance Processes' and dm.metric_type ='Vanity Metric'",
+                      },
                     "level": "district"
                 }
             },
         ],
         "options": {
             "bigNumber": {
-                "title": ['Learning Outcomes & Quality', 'Infrastructure & Facilities', 'Governance Processes', 'Access', 'Equity',],
-                "valueSuffix": ['', '', '', '', ''],
-                "property": ['outcome', 'infra_score', 'governance_processes', '', '']
+                "title": ['Learning Outcomes & Quality', 'Access','Infrastructure & Facilities', 'Equity', 'Governance Processes' ],
+                "property": ['outcome','access', 'infra_score','equity', 'governance_processes'],
+                //"valueSuffix": ['/180', '/80', '/150', '/230', '/360']
+                "valueSuffix": ['', '', '', '', '']
+              
             }
         }
     },
@@ -165,7 +198,7 @@ export const config = {
                 "actions": {
                     "queries":
                     {
-                        "map": "SELECT s.latitude, s.longitude, s.state_name, s.state_id, s.state_id as level, c.category_name, sum(c.sum) as performance FROM dimensions.state s JOIN datasets.pgi_category_state0categorypgi c ON s.state_id = c.state_id GROUP BY s.state_id,s.state_name, c.category_name, s.latitude, s.longitude"
+                        "map": "SELECT s.latitude, s.longitude, s.state_name, s.state_id, s.state_id as level, c.category_name, c.sum as performance FROM dimensions.state s JOIN datasets.pgi_performancecategory_bawdjqgfbh5eynxje3iw c ON s.state_id = c.state_id GROUP BY s.state_id,s.state_name, c.category_name, s.latitude, s.longitude,c.sum  order by c.category_name"
                     },
                     "level": "state",
                     "nextLevel": "district"
@@ -177,7 +210,7 @@ export const config = {
                 "actions": {
                     "queries":
                     {
-                        "map": "select category_name, d.district_name,latitude, longitude,t.district_id, t.district_id as level, cast(sum(t.sum) as numeric) as performance FROM datasets.pgi_category_district0categorypgi as t join dimensions.district as d on t.district_id = d.district_id where d.state_id = {state_id} group by t.district_id, d.district_name, category_name, latitude, longitude"
+                        "map": "select category_name, d.district_name,latitude, longitude,t.district_id, t.district_id as level, cast(sum(t.sum) as numeric) as performance FROM datasets.pgi_category_district0categorypgi as t join dimensions.district as d on t.district_id = d.district_id where d.state_id = {state_id} group by t.district_id, d.district_name, category_name, latitude, longitude order by category_name"
                     },
                     "level": "district",
                     "nextLevel": "block"
@@ -194,7 +227,7 @@ export const config = {
                 "metricValueProp": "performance",
                 "groupByColumn": "level",
                 "metricFilterNeeded": true,
-                "legend": { "title": "State-wise Performance" },
+                "legend": { "title": "State-wise Performance " },
                 "drillDownConfig": {
                     "enableDrillDown": true,
                     "allowedLevels": [0]
diff --git a/src/app/views/pgi/pages/district-wise-performance-tab/district-wise-performance-tab.component.html b/src/app/views/pgi/pages/district-wise-performance-tab/district-wise-performance-tab.component.html
index 8d51e4e7..adafc19b 100644
--- a/src/app/views/pgi/pages/district-wise-performance-tab/district-wise-performance-tab.component.html
+++ b/src/app/views/pgi/pages/district-wise-performance-tab/district-wise-performance-tab.component.html
@@ -8,9 +8,9 @@
         <div class="download-button xmd:col-start-4 xmd:col-end-6 col-span-5 flex" id="downloadbutton" #downloadbutton>
             <app-download-button [data]="reportsData"></app-download-button>
         </div>
-        <div class="col-span-5"> 
+        <!-- <div class="col-span-5"> 
             <app-breadcrumb-component></app-breadcrumb-component>
-        </div>
+        </div> -->
     </div>
     <div class="reports-row" >
         <!-- <div *ngIf="checkReport('pgi_metrics', 'bigNumber1')" id="bignumber1">
diff --git a/src/app/views/pgi/pages/district-wise-performance-tab/reports/district-wise-performance/district-wise-performance.component.html b/src/app/views/pgi/pages/district-wise-performance-tab/reports/district-wise-performance/district-wise-performance.component.html
index 59228af4..b9962c45 100644
--- a/src/app/views/pgi/pages/district-wise-performance-tab/reports/district-wise-performance/district-wise-performance.component.html
+++ b/src/app/views/pgi/pages/district-wise-performance-tab/reports/district-wise-performance/district-wise-performance.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename" >{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p> -->
         <app-leaflet-map [mapData]="reportData" level="district" ></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/pgi/pages/implementation-status-tab/implementation-status-tab.component.html b/src/app/views/pgi/pages/implementation-status-tab/implementation-status-tab.component.html
index ce238960..b5b4002d 100644
--- a/src/app/views/pgi/pages/implementation-status-tab/implementation-status-tab.component.html
+++ b/src/app/views/pgi/pages/implementation-status-tab/implementation-status-tab.component.html
@@ -1,22 +1,14 @@
 <div class="col-span-full tab-wrapper">
     <div class="filter-row grid grid-cols-4">
-        <div class="col-span-3"> 
+        <!-- <div class="col-span-3"> 
             <app-breadcrumb-component></app-breadcrumb-component>
-        </div>
+        </div> -->
         <div class="col-start-4 col-end-5 download-button" id="downloadbutton" >
             <!-- <app-popup-options [data]="reportsData" [reportName]="'pgi'" ></app-popup-options> -->
             <app-download-button [data]="reportsData"></app-download-button>
         </div>
     </div>
     <div class="reports-row" >
-        <div class="row-wrapper grid grid-cols-5 gap-4" *ngIf="NVSK">
-            <div class="col-span-2 xmd:col-span-1  bignumber-container" id="bignumber2"
-                *ngFor="let bigNumberData of bigNumberMetrics; let index = index">
-                <div *ngIf="checkReport('pgi_metrics', 'bigNumber'+(index+1))">
-                    <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
-                </div>
-            </div>
-        </div>
         <div class="row-wrapper grid grid-cols-1 gap-4">
             <div class="col-span-2 xmd:col-span-1 div-shadow" *ngIf="checkReport('implementation_status', 'map')"
                 id="map">
diff --git a/src/app/views/pgi/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html b/src/app/views/pgi/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
index 8a178bce..1daea77d 100644
--- a/src/app/views/pgi/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
+++ b/src/app/views/pgi/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename" >{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p> -->
         <app-leaflet-map [mapData]="reportData"></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/pgi/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.html b/src/app/views/pgi/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.html
index d8ee104e..942e28e3 100644
--- a/src/app/views/pgi/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.html
+++ b/src/app/views/pgi/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename" >{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p> -->
         <app-leaflet-map [mapData]="reportData" [drillDownLevel]="drillDownLevel"></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/pgi/pages/state-wise-performance-tab/state-wise-performance-tab.component.html b/src/app/views/pgi/pages/state-wise-performance-tab/state-wise-performance-tab.component.html
index f1ad4ac9..7b600da4 100644
--- a/src/app/views/pgi/pages/state-wise-performance-tab/state-wise-performance-tab.component.html
+++ b/src/app/views/pgi/pages/state-wise-performance-tab/state-wise-performance-tab.component.html
@@ -7,9 +7,9 @@
         <div class="download-button xmd:col-start-4 xmd:col-end-6 col-span-5 flex" id="downloadbutton" #downloadbutton>
             <app-download-button [data]="reportsData"></app-download-button>
         </div>
-        <div class="col-span-5"> 
+       <!--  <div class="col-span-5"> 
             <app-breadcrumb-component></app-breadcrumb-component>
-        </div>
+        </div> -->
     </div>
     <div class="reports-row" >
         <div class="row-wrapper grid grid-cols-1 gap-4">
diff --git a/src/app/views/pgi/pgi.component.html b/src/app/views/pgi/pgi.component.html
index 74f219c1..d5372164 100644
--- a/src/app/views/pgi/pgi.component.html
+++ b/src/app/views/pgi/pgi.component.html
@@ -1,7 +1,13 @@
+<div class="program-banner-wrapper">
+	<img src="assets/images/pgi-banner.png" alt="PGI Banner">
+</div>
 <div class="metric-card-wrapper">
     <div class="grid gap-4 grid-cols-6 xmd:grid-cols-12">
         <div class="col-span-12">
-            <p class="program-title">Performance Grading Index <em><small>(PGI)</small></em></p>
+            <p class="program-title">
+				<img src="assets/images/pgi.png" alt="logo">
+				Performance Grading Index <em><small>(PGI)</small></em>
+			</p>
             <p class="program-desc ">The Performance Grading Index (PGI) is a tool to provide insights on the status of
                 school education in States and Union territories including key levers that drive their performance and
                 critical areas for improvement.</p>
@@ -9,6 +15,20 @@
     </div>
 </div>
 
+<div class="col-span-full tab-wrapper" *ngIf="NVSK" #target>
+    <div *ngIf="checkReport('pgi_metrics', 'bigNumber1')" id="bignumber1">
+        <app-pgi-bignumber-metrics (exportReportData)="importBigNumberMetrics($event)"></app-pgi-bignumber-metrics>
+    </div>
+    <div class="row-wrapper grid grid-cols-5 gap-4">
+        <div class="col-span-2 xmd:col-span-1  bignumber-container" id="bignumber1"
+            *ngFor="let bigNumberData of bigNumberMetrics; let index = index">
+            <div *ngIf="checkReport('pgi_metrics', 'bigNumber'+(index+1))">
+                <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
+            </div>
+        </div>
+    </div>
+</div>
+
 <div class="custom-tab-group-wrapper">
     <mat-tab-group [selectedIndex]="tabIndex" mat-align-tabs="start" animationDuration="0ms"
         (selectedTabChange)="onTabChanged($event)" appFullScreen>
diff --git a/src/app/views/pgi/pgi.component.ts b/src/app/views/pgi/pgi.component.ts
index 43e0803b..25aa2db2 100644
--- a/src/app/views/pgi/pgi.component.ts
+++ b/src/app/views/pgi/pgi.component.ts
@@ -1,5 +1,5 @@
 
-import { Component, OnInit } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { CommonService } from 'src/app/core/services/common/common.service';
 import { RbacService } from 'src/app/core/services/rbac-service.service';
@@ -11,7 +11,7 @@ import { environment } from 'src/environments/environment';
     templateUrl: './pgi.component.html',
     styleUrls: ['./pgi.component.scss']
 })
-export class PgiComponent implements OnInit {
+export class PgiComponent implements OnInit, AfterViewInit {
     loadTabs = false;
     rbacDetails: any;
     tabIndex;
@@ -20,6 +20,7 @@ export class PgiComponent implements OnInit {
     programName : any = 'pgi'
     bigNumberMetrics: any = [];
     NVSK: boolean = true;
+	@ViewChild('target') private myTarget:ElementRef;
     
 constructor(private route: ActivatedRoute, private _rbacService: RbacService, private _commonService: CommonService) { 
     this.route.queryParams.subscribe((param: any) => {
@@ -50,6 +51,7 @@ constructor(private route: ActivatedRoute, private _rbacService: RbacService, pr
     }
 
     ngAfterViewInit(): void {
+		this._commonService.scrollInto(this.myTarget.nativeElement);
     setTimeout(() => {
         this.selectedTabLabel = this.tabs.length > 0 ? this.tabs[0] : undefined
     });
diff --git a/src/app/views/pm-shri/config/pm_shri_config.ts b/src/app/views/pm-shri/config/pm_shri_config.ts
index afba5464..31afe88b 100644
--- a/src/app/views/pm-shri/config/pm_shri_config.ts
+++ b/src/app/views/pm-shri/config/pm_shri_config.ts
@@ -6,7 +6,7 @@ export const config = {
             "labelProp": "category_name",
             "valueProp": "category_name",
             "id": "metric",
-            "query": "select category_name from dimensions.categorypmshri where category_name not in ('total_instructional_classrooms')"
+            "query": "select category_name from dimensions.categorypmshri where category_name not in ('total_instructional_classrooms')  order by category_name"
         }
     ],
     implementation_status: {
@@ -61,7 +61,7 @@ export const config = {
                     {
                         "queries":
                         {
-                            "map": "select t1.state_id, t2.state_name, t1.category_name, SUM(t4.sum) as total_girls_in_schools, SUM(t5.sum) as total_boys_in_schools, SUM(t6.sum) as total_instructional_classrooms, sum(t1.sum) as category_value, sum(t3.sum) as total_schools, round(cast(sum(t1.sum) / sum(t3.sum) as numeric) * 100, 2) as percentage, t2.latitude, t2.longitude from datasets.pm_shri_pm_shri_category_state0categorypmshri as t1 join dimensions.state as t2 on t2.state_id = t1.state_id join datasets.pm_shri_total_schools_state as t3 on t3.state_id = t1.state_id join datasets.pm_shri_total_boys_in_schools_state as t4 on t4.state_id = t1.state_id join datasets.pm_shri_total_girls_in_schools_state as t5 on t5.state_id = t1.state_id join datasets.pm_shri_total_instructional_classrooms_state as t6 on t6.state_id = t1.state_id where category_name not in ('total_instructional_classrooms') group by t1.state_id, t2.state_name, t1.category_name, t2.latitude, t2.longitude"
+                            "map": "select t1.state_id, t2.state_name, t1.category_name, SUM(t4.sum) as total_girls_in_schools, SUM(t5.sum) as total_boys_in_schools, SUM(t6.sum) as total_instructional_classrooms, sum(t1.sum) as category_value, sum(t3.sum) as total_schools, round(cast(sum(t1.sum) / sum(t3.sum) as numeric) * 100, 2) as percentage, t2.latitude, t2.longitude from datasets.pm_shri_pm_shri_category_state0categorypmshri as t1 join dimensions.state as t2 on t2.state_id = t1.state_id join datasets.pm_shri_total_schools_state as t3 on t3.state_id = t1.state_id join datasets.pm_shri_total_girls_in_schools_state as t4 on t4.state_id = t1.state_id join datasets.pm_shri_total_boys_in_schools_state as t5 on t5.state_id = t1.state_id join datasets.pm_shri_total_instructional_classrooms_state as t6 on t6.state_id = t1.state_id where category_name not in ('total_instructional_classrooms') group by t1.state_id, t2.state_name, t1.category_name, t2.latitude, t2.longitude  order by t1.category_name"
                         },
                         "level": "state",
                         "nextLevel": "district"
@@ -130,8 +130,8 @@ export const config = {
                 "hierarchyLevel": "0",
                 "actions": {
                     "queries": {
-                        "bigNumber1": "6448",
-                        "bigNumber2": "763",
+                        "bigNumber1": "10075",
+                        "bigNumber2": "736",
                         "bigNumber3": "863",
                         "bigNumber4": "1533",
                         "bigNumber5": "1384",
@@ -145,8 +145,8 @@ export const config = {
         ],
         "options": {
             "bigNumber": {
-                "title": ['Total PM SHRI schools', 'Total districts', 'No. of primary schools', 'No. of upper primary schools', 'No. of secondary schools', 'No. of higher secondary schools', 'KVS', 'NVS'],
-                "formatter": { locale: 'en-IN', format: "long" }
+                "title": ['Total PM SHRI Schools', 'Total Districts', 'No. of primary schools', 'No. of upper primary schools', 'No. of secondary schools', 'No. of higher secondary schools', 'KVS', 'NVS'],
+                "formatter": { locale: 'en-IN', format: "short" }
             }
         }
     }
diff --git a/src/app/views/pm-shri/pm-shri.component.html b/src/app/views/pm-shri/pm-shri.component.html
index e773c44a..cdb345fa 100644
--- a/src/app/views/pm-shri/pm-shri.component.html
+++ b/src/app/views/pm-shri/pm-shri.component.html
@@ -1,14 +1,24 @@
+<div class="program-banner-wrapper">
+	<img src="assets/images/pm-shri-banner.png" alt="PM SHRI Banner">
+</div>
 <div class="metric-card-wrapper">
     <div class="grid gap-4 grid-cols-6 xmd:grid-cols-12">
         <div class="col-span-12">
-            <p class="program-title">PM SHRI</p>
-            <p class="program-desc">PM SHRI initiative is intended to develop schools in which every student feels welcomed and cared for, where a safe and stimulating learning environment exists, where a wide range of learning experiences are offered, and where good physical infrastructure and appropriate resources conducive to learning are available to all students.</p>
+            <p class="program-title">
+				<img src="assets/images/pm_shri.png" alt="logo">
+				PM SHRI
+			</p>
+            <p  #target class="program-desc">PM SHRI initiative is intended to develop schools in which every student feels welcomed and cared for, where a safe and stimulating learning environment exists, where a wide range of learning experiences are offered, and where good physical infrastructure and appropriate resources conducive to learning are available to all students.</p>
         </div>
     </div>
 </div>
 
-<div class="custom-tab-group-wrapper">
-    <mat-tab-group [selectedIndex]="tabIndex" mat-align-tabs="start" animationDuration="0ms"
+<div class="custom-tab-group-wrapper" style="height: 1600px; max-height: 2200px; min-height: 300px;">
+	<iframe width="100%" height="100%" frameBorder="0" [src]="urlSafe"
+	target="_parent" loading="lazy"
+	>
+    </iframe>
+    <!-- <mat-tab-group [selectedIndex]="tabIndex" mat-align-tabs="start" animationDuration="0ms"
         (selectedTabChange)="onTabChanged($event)" appFullScreen>
         <div *ngIf="checkReport('pmShri_metrics', 'bigNumber3')">
             <app-bignumber-metrics
@@ -21,5 +31,5 @@
             <app-state-wise-performance-tab
                 *ngIf="selectedTabLabel === 'State Wise Performance'"></app-state-wise-performance-tab>
         </mat-tab>
-    </mat-tab-group>
+    </mat-tab-group> -->
 </div>
\ No newline at end of file
diff --git a/src/app/views/pm-shri/pm-shri.component.scss b/src/app/views/pm-shri/pm-shri.component.scss
index e69de29b..134f3ccc 100644
--- a/src/app/views/pm-shri/pm-shri.component.scss
+++ b/src/app/views/pm-shri/pm-shri.component.scss
@@ -0,0 +1,4 @@
+.program-banner-wrapper img {
+    width: 100%;
+    border-radius: 10px;
+}
\ No newline at end of file
diff --git a/src/app/views/pm-shri/pm-shri.component.ts b/src/app/views/pm-shri/pm-shri.component.ts
index ce5ad8f7..70a1a9a4 100644
--- a/src/app/views/pm-shri/pm-shri.component.ts
+++ b/src/app/views/pm-shri/pm-shri.component.ts
@@ -1,16 +1,17 @@
-import { Component, OnInit } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { CommonService } from 'src/app/core/services/common/common.service';
 import { RbacService } from 'src/app/core/services/rbac-service.service';
 import { config } from './config/pm_shri_config';
 import { environment } from 'src/environments/environment';
+import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
 
 @Component({
   selector: 'app-pm-shri',
   templateUrl: './pm-shri.component.html',
   styleUrls: ['./pm-shri.component.scss']
 })
-export class PmShriComponent implements OnInit {
+export class PmShriComponent implements OnInit, AfterViewInit {
 
   loadTabs = false;
   rbacDetails: any;
@@ -20,8 +21,11 @@ export class PmShriComponent implements OnInit {
   programName: any = 'pm_shri';
   bigNumberMetrics: any = [];
   NVSK: boolean = true;
+  url:string = 'https://nvsk.diksha.gov.in/ords/r/vskdev/pm-shri112';
+  urlSafe: SafeResourceUrl;
+  @ViewChild('target') private myTarget:ElementRef;
 
-  constructor(private route: ActivatedRoute, private _rbacService: RbacService, private _commonService: CommonService) {
+  constructor(private route: ActivatedRoute, private sanitizer: DomSanitizer, private _rbacService: RbacService, private _commonService: CommonService) {
     this.route.queryParams.subscribe((param: any) => {
         this.tabIndex = param.tab ? Number(param.tab) : 0;
     })
@@ -46,10 +50,13 @@ export class PmShriComponent implements OnInit {
   }
 
   ngOnInit(): void {
+	this.urlSafe = this.sanitizer.bypassSecurityTrustResourceUrl(this.url);
     this._commonService.getMetaData(this.programName).subscribe()
+	console.log('PMSHree URL ', this.urlSafe)
   }
 
   ngAfterViewInit(): void {
+	this._commonService.scrollInto(this.myTarget.nativeElement);
     setTimeout(() => {
         this.selectedTabLabel = this.tabs.length > 0 ? this.tabs[0] : undefined
     });
diff --git a/src/app/views/pmposhan/config/pmposhan_config.ts b/src/app/views/pmposhan/config/pmposhan_config.ts
index e7c03613..10ad0e60 100644
--- a/src/app/views/pmposhan/config/pmposhan_config.ts
+++ b/src/app/views/pmposhan/config/pmposhan_config.ts
@@ -1,13 +1,29 @@
 export const config = {
     filters: [
         {
-            "label": "District Wise Performance",
+            "label": "State Wise Progress Status",
             "name": "Metric",
             "labelProp": "category_name",
             "valueProp": "category_name",
             "id": "metric",
             "query": "select category_name from dimensions.categorypm"
         },
+        {
+            "label": "District Wise Progress Status",
+            "name": "Metric",
+            "labelProp": "category_name",
+            "valueProp": "category_name",
+            "id": "metric",
+            "query": "select category_name from dimensions.categorypm"
+        },
+        {
+            "label": "District Wise Progress Status",
+            "name": "State",
+            "labelProp": "state_name",
+            "valueProp": "state_id",
+            "id": "state_name",
+            "query": "select state_id,state_name from dimensions.state order by state_name"
+        },
     ],
     implementation_status:{
         "label": "Implementation Status",
@@ -60,7 +76,7 @@ export const config = {
                     "actions": {
                         "queries":
                         {
-                            "map": "select latitude, longitude, category_name as category_name, t2.state_name, t1.state_id, cast(sum(t1.sum) as numeric) as total_count FROM datasets.pm_poshan_category_daily_state0categorypm as t1 join dimensions.state as t2 on t1.state_id = t2.state_id group by t1.state_id,t2.state_name, category_name, latitude, longitude"
+                            "map": "select latitude, longitude, category_name as category_name, t2.state_name, t1.state_id, cast(sum(t1.sum) as numeric) as total_count FROM datasets.pm_poshan_category_daily_state0categorypm as t1 join dimensions.state as t2 on t1.state_id = t2.state_id group by t1.state_id,t2.state_name, category_name, latitude, longitude order by category_name"
                         },
                         "level": "state",
                         "nextLevel": "district"
@@ -104,7 +120,7 @@ export const config = {
                     "actions": {
                         "queries":
                         {
-                            "map": "select latitude, longitude, category_name as category_name,t2.district_name,t1.district_id, cast(sum(t1.sum) as numeric) as total_count FROM datasets.pm_poshan_category_daily_district0categorypm as t1 join dimensions.district as t2 on t1.district_id = t2.district_id group by t1.district_id,t2.district_name, category_name, latitude, longitude"
+                            "map": "select latitude, longitude, category_name as category_name,t2.district_name,t1.district_id, cast(sum(t1.sum) as numeric) as total_count FROM datasets.pm_poshan_category_daily_district0categorypm as t1 join dimensions.district as t2 on t1.district_id = t2.district_id group by t1.district_id,t2.district_name, category_name, latitude, longitude order by category_name"
                         },
                         "level": "state",
                         "nextLevel": "district"
@@ -150,6 +166,29 @@ export const config = {
             }
         }
     },
+    summary_metrics: {
+         "filters": [
+            {
+                "name": "National",
+                "hierarchyLevel": "0",
+                "actions": {
+                    "queries": {
+                        "bigNumber1": `select sum(sum) as total_schools from datasets.pm_poshan_category_daily_state0categorypm 
+                        where category_name = 'total_schools'`,
+                        "bigNumber2": "select count(distinct state_id) as total_states from datasets.pm_poshan_started_state where sum > 0"
+                    },
+                    "level": "state"
+                }
+            },
+        ],
+        "options": {
+            "bigNumber": {
+                "title": ['Total Schools', 'Total States'],
+                "valueSuffix": ['', ''],
+                "property": ['total_schools', 'total_states']
+            }
+        }
+    },
     pmposhan_metrics: {
         "label": "District Wise Progress Status",
         "filters": [
@@ -158,11 +197,13 @@ export const config = {
                 "hierarchyLevel": "0",
                 "actions": {
                     "queries": {
-                        "bigNumber1": "select sum(sum) as total_schools from datasets.pm_poshan_category_value_daily_categorypm where category_name = 'total_schools'",
-                        "bigNumber2": "select sum(sum) as total_meals_served from datasets.pm_poshan_total_meals_served_daily_district",
-                        "bigNumber3": "",
-                        "bigNumber4": "select count(distinct state_id) as total_states from datasets.pm_poshan_started_state where sum > 0",
-                    },
+                        "bigNumber1": "select count(distinct state_id) as total_states from datasets.pm_poshan_started_state where sum > 0",
+                        "bigNumber2": `select sum(sum) as total_schools from datasets.pm_poshan_category_daily_state0categorypm 
+                        where category_name = 'total_schools'`,                     
+                        "bigNumber3": "select sum(sum) as total_meals_served from datasets.pm_poshan_total_meals_served_daily_district",
+                        "bigNumber4":"select round(cast(avg(t1.sum) / avg(t2.sum) as numeric) * 100, 2) as total_school_meal_served_percent from datasets.pm_poshan_total_schools_meals_served_daily_district t1 join datasets.pm_poshan_category_qak2ldjgag5jmhn0yxrl t2 on t1.district_id = t2.district_id where t2.category_name = 'total_schools'",
+                        "bigNumber5":"select round(cast(avg(t1.sum) / avg(t2.sum) as numeric) * 100, 2) as meal_served_percent from datasets.pm_poshan_total_meals_served_daily_district t1 join datasets.pm_poshan_category_qak2ldjgag5jmhn0yxrl t2 on t1.district_id = t2.district_id where t2.category_name = 'meals_enrolled'"
+                       },
                     "level": "state"
                 }
             },
@@ -172,11 +213,13 @@ export const config = {
                 "valueProp": "state_id",
                 "hierarchyLevel": "1",
                 "actions": {
-                    "queries": {
-                        "bigNumber1": "select sum(sum) as total_schools from datasets.pm_poshan_category_value_categorypm where category_name = 'total_schools'",
-                        "bigNumber2": "select sum(sum) as total_meals_served from datasets.pm_poshan_total_meals_served_daily_district",
-                        "bigNumber3": "select count(distinct(district_id)) as total_districts from datasets.pm_poshan_total_meals_served_daily_district",
-                        "bigNumber4": "",
+                    "queries": { 
+                    "bigNumber1": "select count(distinct state_id) as total_states from datasets.pm_poshan_started_state where sum > 0",
+                    "bigNumber2": `select sum(sum) as total_schools from datasets.pm_poshan_category_daily_state0categorypm 
+                    where category_name = 'total_schools'`,                     
+                    "bigNumber3": "select sum(sum) as total_meals_served from datasets.pm_poshan_total_meals_served_daily_district",
+                    "bigNumber4":"select round(avg(sum(t1.sum) / avg(t2.sum) as numeric) * 100, 2) as total_school_meal_served_percent from datasets.pm_poshan_total_schools_meals_served_daily_district t1 join datasets.pm_poshan_category_qak2ldjgag5jmhn0yxrl t2 on t1.district_id = t2.district_id where t2.category_name = 'total_schools'",
+                    "bigNumber5":"select round(avg(sum(t1.sum) / avg(t2.sum) as numeric) * 100, 2) as meal_served_percent from datasets.pm_poshan_total_meals_served_daily_district t1 join datasets.pm_poshan_category_qak2ldjgag5jmhn0yxrl t2 on t1.district_id = t2.district_id where t2.category_name = 'meals_enrolled'"
                     },
                     "level": "district"
                 }
@@ -184,9 +227,9 @@ export const config = {
         ],
         "options": {
             "bigNumber": {
-                "title": ['Total Schools','Total Meals Served','Total Districts','Total States/UTs Participating'],
-                "valueSuffix": ['','','',''],
-                "property": ['total_schools','total_meals_served','total_districts','total_states']
+                "title": ['Total States/UTs Participating','Total Schools','Total Meals Served','% Schools meals served (Reported)','% Meals served (Reported)'],
+                "valueSuffix": ['','','','%','%'],
+                "property": ['total_states','total_schools','total_meals_served','total_school_meal_served_percent','meal_served_percent']
             }
         }
     }
diff --git a/src/app/views/pmposhan/pages/implementation-status-tab/implementation-status-tab.component.html b/src/app/views/pmposhan/pages/implementation-status-tab/implementation-status-tab.component.html
index ee18719a..19033242 100644
--- a/src/app/views/pmposhan/pages/implementation-status-tab/implementation-status-tab.component.html
+++ b/src/app/views/pmposhan/pages/implementation-status-tab/implementation-status-tab.component.html
@@ -6,14 +6,6 @@
         </div>
     </div>
     <div class="reports-row" >
-        <div class="row-wrapper grid grid-cols-5 gap-4" *ngIf="NVSK">
-            <div class="col-span-2 xmd:col-span-1  bignumber-container" id="bignumber1"
-                *ngFor="let bigNumberData of getMetricsArray(); let index = index">
-                <div *ngIf="checkReport('pmposhan_metrics', 'bigNumber'+(index+1))">
-                    <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
-                </div>
-            </div>
-        </div>
         <div class="row-wrapper grid grid-cols-1 gap-4">
             <div class="col-span-2 xmd:col-span-1 div-shadow" *ngIf="checkReport('implementation_status', 'map')"
                 id="map">
diff --git a/src/app/views/pmposhan/pages/implementation-status-tab/implementation-status-tab.component.ts b/src/app/views/pmposhan/pages/implementation-status-tab/implementation-status-tab.component.ts
index d73997ac..9e735418 100644
--- a/src/app/views/pmposhan/pages/implementation-status-tab/implementation-status-tab.component.ts
+++ b/src/app/views/pmposhan/pages/implementation-status-tab/implementation-status-tab.component.ts
@@ -91,14 +91,6 @@ export class ImplementationStatusTabComponent implements OnInit {
         }
     }
 
-    importBigNumberMetrics(bigNumberMetric: any) {
-        this.bigNumberMetrics[bigNumberMetric.ind] = bigNumberMetric.data
-    }
-
-    getMetricsArray() {
-      return this.bigNumberMetrics.filter((data) => {
-        return data.averagePercentage !== null || data.averagePercentage !== undefined
-      }) 
-    }
+   
 }
 
diff --git a/src/app/views/pmposhan/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html b/src/app/views/pmposhan/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
index 8a178bce..1daea77d 100644
--- a/src/app/views/pmposhan/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
+++ b/src/app/views/pmposhan/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename" >{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p> -->
         <app-leaflet-map [mapData]="reportData"></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/pmposhan/pages/progress-status-tab/progress-status-tab.component.ts b/src/app/views/pmposhan/pages/progress-status-tab/progress-status-tab.component.ts
index 20c3eb25..888090e9 100644
--- a/src/app/views/pmposhan/pages/progress-status-tab/progress-status-tab.component.ts
+++ b/src/app/views/pmposhan/pages/progress-status-tab/progress-status-tab.component.ts
@@ -29,6 +29,7 @@ export class ProgressStatusTabComponent implements OnInit, AfterViewInit {
     hasTimeSeriesFilters: boolean = false;
     hasCommonFilters: boolean = true;
     NVSK: boolean = true;
+    tabLabel: any = 'District Wise Progress Status';
 
     @ViewChild('progressStatus') progressStatus: ProgressStatusComponent;
     @Input() bigNumberMetrics: any = [];
@@ -48,7 +49,7 @@ export class ProgressStatusTabComponent implements OnInit, AfterViewInit {
 
     async ngAfterViewInit(): Promise<void> {
         if (this.hasCommonFilters) {
-            this.filters = await this._wrapperService.constructCommonFilters(config.filters);
+            this.filters = await this._wrapperService.constructCommonFilters(config.filters,this.tabLabel);
             this.progressStatus?.getReportData({ filterValues: this.filters.map((filter) => { return { ...filter, columnName: filter.valueProp, filterType: filter.id } }) });
         }
         if (this.startDate === undefined && this.endDate === undefined && this.hasTimeSeriesFilters) {
diff --git a/src/app/views/pmposhan/pages/progress-status-tab/reports/progress-status/progress-status.component.html b/src/app/views/pmposhan/pages/progress-status-tab/reports/progress-status/progress-status.component.html
index 59228af4..b9962c45 100644
--- a/src/app/views/pmposhan/pages/progress-status-tab/reports/progress-status/progress-status.component.html
+++ b/src/app/views/pmposhan/pages/progress-status-tab/reports/progress-status/progress-status.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename" >{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p> -->
         <app-leaflet-map [mapData]="reportData" level="district" ></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/pmposhan/pages/state-wise-progress-status-tab/reports/state-wise-progress-status/state-wise-progress-status.component.html b/src/app/views/pmposhan/pages/state-wise-progress-status-tab/reports/state-wise-progress-status/state-wise-progress-status.component.html
index 59228af4..b9962c45 100644
--- a/src/app/views/pmposhan/pages/state-wise-progress-status-tab/reports/state-wise-progress-status/state-wise-progress-status.component.html
+++ b/src/app/views/pmposhan/pages/state-wise-progress-status-tab/reports/state-wise-progress-status/state-wise-progress-status.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename" >{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename" >{{title}}</p> -->
         <app-leaflet-map [mapData]="reportData" level="district" ></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/pmposhan/pages/state-wise-progress-status-tab/state-wise-progress-status-tab.component.ts b/src/app/views/pmposhan/pages/state-wise-progress-status-tab/state-wise-progress-status-tab.component.ts
index 4265c4c4..97153aff 100644
--- a/src/app/views/pmposhan/pages/state-wise-progress-status-tab/state-wise-progress-status-tab.component.ts
+++ b/src/app/views/pmposhan/pages/state-wise-progress-status-tab/state-wise-progress-status-tab.component.ts
@@ -29,6 +29,7 @@ export class StateWiseProgressStatusTabComponent implements OnInit {
   hasTimeSeriesFilters: boolean = false;
   hasCommonFilters: boolean = true;
   NVSK: boolean = true;
+  tabLabel: any = 'State Wise Progress Status';
 
   @ViewChild('stateWiseProgressStatus') stateWiseProgressStatus: StateWiseProgressStatusComponent;
   @Input() bigNumberMetrics: any = [];
@@ -48,7 +49,7 @@ export class StateWiseProgressStatusTabComponent implements OnInit {
 
   async ngAfterViewInit(): Promise<void> {
       if (this.hasCommonFilters) {
-          this.filters = await this._wrapperService.constructCommonFilters(config.filters);
+          this.filters = await this._wrapperService.constructCommonFilters(config.filters, this.tabLabel);
           this.stateWiseProgressStatus?.getReportData({ filterValues: this.filters.map((filter) => { return { ...filter, columnName: filter.valueProp, filterType: filter.id } }) });
       }
       if (this.startDate === undefined && this.endDate === undefined && this.hasTimeSeriesFilters) {
diff --git a/src/app/views/pmposhan/pmposhan.component.html b/src/app/views/pmposhan/pmposhan.component.html
index 302f88e5..46f3b1ea 100644
--- a/src/app/views/pmposhan/pmposhan.component.html
+++ b/src/app/views/pmposhan/pmposhan.component.html
@@ -1,7 +1,13 @@
+<div class="program-banner-wrapper">
+	<img src="assets/images/pm-poshan-banner.png" alt="PM Poshan Banner">
+</div>
 <div class="metric-card-wrapper">
     <div class="grid gap-4 grid-cols-6 xmd:grid-cols-12">
         <div class="col-span-12">
-            <p class="program-title">PM POSHAN</p>
+            <p class="program-title">
+				<img src="assets/images/pmposhan.png" alt="logo">
+				PM POSHAN
+			</p>
             <p class="program-desc ">Pradhan Mantri Poshan Shakti Nirman (PM POSHAN) earlier known as the National
                 Programme of Mid-Day Meal in Schools is one of the foremost rights based Centrally Sponsored Schemes
                 under the National Food Security Act, 2013 (NFSA). The primary objective of the scheme is to improve the
@@ -9,7 +15,14 @@
         </div>
     </div>
 </div>
-
+<div class="row-wrapper grid grid-cols-5 gap-4" *ngIf="NVSK"  #target>
+    <div class="col-span-2 xmd:col-span-1  bignumber-container" id="bignumber1"
+        *ngFor="let bigNumberData of getMetricsArray(); let index = index">
+        <div *ngIf="checkReport('pmposhan_metrics', 'bigNumber'+(index+1))">
+            <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
+        </div>
+    </div>
+</div>
 <div class="custom-tab-group-wrapper">
     <mat-tab-group [selectedIndex]="tabIndex" mat-align-tabs="start" animationDuration="0ms"
         (selectedTabChange)="onTabChanged($event)" appFullScreen>
diff --git a/src/app/views/pmposhan/pmposhan.component.ts b/src/app/views/pmposhan/pmposhan.component.ts
index 1b0f701a..a1910250 100644
--- a/src/app/views/pmposhan/pmposhan.component.ts
+++ b/src/app/views/pmposhan/pmposhan.component.ts
@@ -1,16 +1,17 @@
 
-import { Component, OnInit } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { CommonService } from 'src/app/core/services/common/common.service';
 import { RbacService } from 'src/app/core/services/rbac-service.service';
 import { config } from './config/pmposhan_config';
+import { environment } from 'src/environments/environment';
 
 @Component({
     selector: 'app-pmposhan',
     templateUrl: './pmposhan.component.html',
     styleUrls: ['./pmposhan.component.scss']
 })
-export class PmPoshanComponent implements OnInit {
+export class PmPoshanComponent implements OnInit, AfterViewInit {
     loadTabs = false;
     rbacDetails: any;
     tabIndex;
@@ -18,7 +19,9 @@ export class PmPoshanComponent implements OnInit {
     tabs: any = [];
     programName = 'pmPoshan'
     bigNumberMetrics: any = [];
-    
+    NVSK: boolean = true;
+	@ViewChild('target') private myTarget:ElementRef;
+
 constructor(private route: ActivatedRoute, private _rbacService: RbacService, private _commonService: CommonService) { 
     this.route.queryParams.subscribe((param: any) => {
         this.tabIndex = param.tab ? Number(param.tab) : 0;
@@ -38,6 +41,11 @@ constructor(private route: ActivatedRoute, private _rbacService: RbacService, pr
         return true
         })
     })
+
+    if(environment.config === 'VSK') {
+        this.NVSK = false
+    }
+
     }
 
     ngOnInit(): void {
@@ -45,6 +53,7 @@ constructor(private route: ActivatedRoute, private _rbacService: RbacService, pr
     }
 
     ngAfterViewInit(): void {
+		this._commonService.scrollInto(this.myTarget.nativeElement);
     setTimeout(() => {
         this.selectedTabLabel = this.tabs.length > 0 ? this.tabs[0] : undefined
     });
@@ -74,4 +83,10 @@ constructor(private route: ActivatedRoute, private _rbacService: RbacService, pr
         this.bigNumberMetrics[bigNumberMetric.ind] = bigNumberMetric.data
     }
 
+    getMetricsArray() {
+      return this.bigNumberMetrics.filter((data) => {
+        return data.averagePercentage !== null || data.averagePercentage !== undefined
+      }) 
+    }
+
 }
diff --git a/src/app/views/prashast/config/prashast_config.ts b/src/app/views/prashast/config/prashast_config.ts
new file mode 100644
index 00000000..cb7bf5fe
--- /dev/null
+++ b/src/app/views/prashast/config/prashast_config.ts
@@ -0,0 +1,57 @@
+export const config = {
+    summary_metrics: {
+        "filters": [
+        {
+            "name": "National",
+            "hierarchyLevel": "0",
+            "actions": {
+                "queries": {
+                    "bigNumber1": "select dm.metric_value as total_users from dimensions.mainmetrics dm where  dm.program_id='prashast' and dm.metric_name ='Total registered Users' and dm.metric_type ='Key Metric'",
+                    "bigNumber2": "select dm.metric_value as total_student from dimensions.mainmetrics dm where  dm.program_id='prashast' and dm.metric_name ='Total students' and dm.metric_type ='Key Metric'",
+                    },
+                "level": "state"
+            }
+        },
+    ],
+    "options": {
+        "bigNumber": {
+            "title": ['Total Registered Users','Total Students'],
+            "property": ['total_users', 'total_student'],
+            //"valueSuffix": ['L', 'L'],
+            "valueSuffix": ['', ''],
+        }
+    }
+},
+    prashast_metrics: {
+        "filters": [
+            {
+                "name": "National",
+                "hierarchyLevel": "0",
+                "actions": {
+                    "queries": {
+                        "bigNumber1": "select dm.metric_value as total_users from dimensions.mainmetrics dm where  dm.program_id='prashast' and dm.metric_name ='Total registered Users' and dm.metric_type ='Key Metric'",
+                        "bigNumber2": "select dm.metric_value as total_student from dimensions.mainmetrics dm where  dm.program_id='prashast' and dm.metric_name ='Total students' and dm.metric_type ='Key Metric'",
+                        "bigNumber3": "select dm.metric_value as total_school from dimensions.mainmetrics dm where  dm.program_id='prashast' and dm.metric_name ='Total Schools' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber4": "select dm.metric_value as total_teachers from dimensions.mainmetrics dm where  dm.program_id='prashast' and dm.metric_name ='Total Teachers' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber5": "select dm.metric_value as total_pri_head from dimensions.mainmetrics dm where  dm.program_id='prashast' and dm.metric_name ='Total Principal/Headmaster' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber6": "select dm.metric_value as total_special_edu  from dimensions.mainmetrics dm where  dm.program_id='prashast' and dm.metric_name ='Total Special Educators' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber7": "select dm.metric_value as total_survey_1  from dimensions.mainmetrics dm where  dm.program_id='prashast' and dm.metric_name ='Total Survey Part-1' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber8": "select dm.metric_value as total_survey_2 from dimensions.mainmetrics dm where  dm.program_id='prashast' and dm.metric_name ='Total Survey Part-2' and dm.metric_type ='Vanity Metric'",
+                        
+                    },
+                    "level": "state"
+                }
+            },
+        ],
+        "options": {
+            "bigNumber": {
+                "title": ['Total Registered Users on Prashast App','Total Students added on Prashast App','Total Schools using Prashast App', 'Total Teachers using Prashast App', 'Principals and Headmasters using Prashast App','Total Special Educators on the Prashast App','Completed Screening Part-1 on Prashast App','Completed Screening Part-2 on Prashast App'],
+                "property": ['total_users', 'total_student', 'total_school', 'total_teachers', 'total_pri_head', 'total_special_edu', 'total_survey_1', 'total_survey_2'],
+                //"valueSuffix": ['L', 'L', 'L', '', 'L', 'L'],
+                "valueSuffix": ['', '', '', '', '', '', '', ''],
+            }
+        }
+        
+    
+    }
+}
\ No newline at end of file
diff --git a/src/app/views/prashast/pages/prashast-merics-number/prashast-merics-number.component.html b/src/app/views/prashast/pages/prashast-merics-number/prashast-merics-number.component.html
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/views/prashast/pages/prashast-merics-number/prashast-merics-number.component.scss b/src/app/views/prashast/pages/prashast-merics-number/prashast-merics-number.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/views/prashast/pages/prashast-merics-number/prashast-merics-number.component.spec.ts b/src/app/views/prashast/pages/prashast-merics-number/prashast-merics-number.component.spec.ts
new file mode 100644
index 00000000..f6677d88
--- /dev/null
+++ b/src/app/views/prashast/pages/prashast-merics-number/prashast-merics-number.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PrashastMericsNumberComponent } from './prashast-merics-number.component';
+
+describe('PrashastMericsNumberComponent', () => {
+  let component: PrashastMericsNumberComponent;
+  let fixture: ComponentFixture<PrashastMericsNumberComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ PrashastMericsNumberComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(PrashastMericsNumberComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/views/prashast/pages/prashast-merics-number/prashast-merics-number.component.ts b/src/app/views/prashast/pages/prashast-merics-number/prashast-merics-number.component.ts
new file mode 100644
index 00000000..c846ad2a
--- /dev/null
+++ b/src/app/views/prashast/pages/prashast-merics-number/prashast-merics-number.component.ts
@@ -0,0 +1,98 @@
+import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+import { DataService } from 'src/app/core/services/data.service';
+import { RbacService } from 'src/app/core/services/rbac-service.service';
+import { WrapperService } from 'src/app/core/services/wrapper.service';
+import { buildQuery, parseRbacFilter, parseTimeSeriesQuery } from 'src/app/utilities/QueryBuilder';
+import { config } from 'src/app/views/prashast/config/prashast_config';
+@Component({
+  selector: 'app-prashast-merics-number',
+  templateUrl: './prashast-merics-number.component.html',
+  styleUrls: ['./prashast-merics-number.component.scss']
+})
+export class PrashastMericsNumberComponent implements  OnInit {
+
+  reportName: string = 'prashast_metrics';
+  filters: any = [];
+  levels: any;
+  reportData: any = [];
+  title: string = '-------to be filled-------'
+  selectedYear: any;
+  selectedMonth: any;
+  startDate: any;
+  endDate: any;
+  config: any;
+  compareDateRange: any = 30;
+  filterIndex: any;
+  rbacDetails: any;
+
+  @Output() exportReportData = new EventEmitter<any>();
+
+  constructor(private readonly _dataService: DataService, private readonly _wrapperService: WrapperService, private _rbacService: RbacService) {
+    this._rbacService.getRbacDetails().subscribe((rbacDetails: any) => {
+      this.rbacDetails = rbacDetails;
+    })
+  }
+
+  ngOnInit(): void {
+    this.getReportData();
+  }
+
+  getReportData(values?: any): void {
+    let { filterValues, timeSeriesValues } = values ?? {};
+    this.startDate = timeSeriesValues?.startDate;
+    this.endDate = timeSeriesValues?.endDate;
+    let reportConfig = config
+
+    let { timeSeriesQueries, queries, levels, defaultLevel, filters, options } = reportConfig[this.reportName];
+    let onLoadQuery;
+    let currentLevel;
+
+    if (this.rbacDetails?.role !== null && this.rbacDetails.role !== undefined) {
+      filters.every((filter: any) => {
+        if (Number(this.rbacDetails?.role) === Number(filter.hierarchyLevel)) {
+          queries = { ...filter?.actions?.queries }
+          currentLevel = filter?.actions?.level;
+          Object.keys(queries).forEach((key) => {
+            queries[key] = parseRbacFilter(queries[key], this.rbacDetails)
+          });
+          return false
+        }
+        return true
+      })
+    }
+    
+    Object.keys(queries).forEach(async (key: any, index: any) => {
+      if (key.toLowerCase().includes('comparison')) {
+        let endDate = new Date();
+        let days = endDate.getDate() - this.compareDateRange;
+        let startDate = new Date();
+        startDate.setDate(days)
+        onLoadQuery = parseTimeSeriesQuery(queries[key], startDate.toISOString().split('T')[0], endDate.toISOString().split('T')[0])
+      }
+      else {
+        onLoadQuery = queries[key]
+      }
+      let query = buildQuery(onLoadQuery, defaultLevel, this.levels, this.filters, this.startDate, this.endDate, key, this.compareDateRange);
+
+      if (query && key.indexOf('bigNumber') > -1) {
+        if (Array.isArray(options?.bigNumber)) {
+          options.bigNumber = options?.bigNumber[Number(this.rbacDetails?.role)];
+        }
+
+        let metricOptions = {
+          bigNumber: {
+            title: Array.isArray(options?.bigNumber?.title) ? options?.bigNumber?.title?.[index] : options?.bigNumber?.title,
+            property: Array.isArray(options?.bigNumber?.property) ? options?.bigNumber?.property?.[index] : options?.bigNumber?.property,
+            valueSuffix: Array.isArray(options?.bigNumber?.valueSuffix) ? options?.bigNumber?.valueSuffix?.[index] : options?.bigNumber?.valueSuffix
+          }
+        }
+        let metricData = await this._dataService.getBigNumberReportData(query, metricOptions, 'averagePercentage', this.reportData);
+        metricData = {
+          ...metricData,
+        }
+        this.exportReportData.emit({data: metricData, ind: index})
+      }
+    })
+  }
+
+}
\ No newline at end of file
diff --git a/src/app/views/prashast/prashast-routing.module.ts b/src/app/views/prashast/prashast-routing.module.ts
new file mode 100644
index 00000000..24663589
--- /dev/null
+++ b/src/app/views/prashast/prashast-routing.module.ts
@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { PrashastComponent } from './prashast.component';
+
+const routes: Routes = [
+  {
+      path:'',
+      component: PrashastComponent
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class PrashastRoutingModule { }
diff --git a/src/app/views/prashast/prashast.component.html b/src/app/views/prashast/prashast.component.html
new file mode 100644
index 00000000..80d673af
--- /dev/null
+++ b/src/app/views/prashast/prashast.component.html
@@ -0,0 +1,116 @@
+<div class="program-banner-wrapper">
+	<img src="assets/images/prashast-banner.png" alt="Prashast Banner">
+</div>
+<div class="metric-card-wrapper">
+    <div class="grid gap-4 grid-cols-6 xmd:grid-cols-12">
+        <div class="col-span-12">
+            <p class="program-title">
+				<img src="assets/images/prashast.png" alt="logo">
+				PRASHAST
+			</p>
+            <p class="program-desc">Prashast is a pre assessment holistic screening tool for preliminary screening of students in
+                schools to facilitate further referral to assessment camps for disability certification.</p>
+        </div>
+    </div>
+</div>
+<div class="col-span-full tab-wrapper" #target>
+    <div class="row-wrapper grid grid-cols-5 gap-4">
+         <div class="col-span-2 xmd:col-span-1  bignumber-container" id="bignumber2"
+           *ngFor="let bigNumberData of bigNumberMetrics; let index = index">
+           <div *ngIf="checkReport('prashast_metrics', 'bigNumber'+(index+1))">
+               <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
+           </div>
+       </div>
+   </div>
+
+   <div *ngIf="checkReport('prashast_metrics', 'bigNumber1')" id="bignumber1">
+    <app-prashast-merics-number (exportReportData)="importBigNumberMetrics($event)"></app-prashast-merics-number>
+    </div>
+
+</div>
+
+<!-- <div class="custom-tab-group-wrapper">
+    <div class="reports-row">
+        <div class="row-wrapper grid grid-cols-5 gap-4">
+            <div class="col-span-2 xmd:col-span-1 bignumber-container">
+                <div class="report-wrapper">
+                    <div class="average-wrapper">
+                       <h1 class="average-percentage"> 511572 </h1>
+                    </div>
+                    <div class="report-name text-center"> Registered Users </div>
+                    <p class="text-center" style="font-size: small; color: #716262;">Total Registered Users on Prashast
+                        App</p>
+                </div>
+            </div>
+            <div class="col-span-2 xmd:col-span-1 bignumber-container">
+                <div class="report-wrapper">
+                    <div class="average-wrapper">
+                       <h1 class="average-percentage"> 2065848 </h1>
+                    </div>
+                    <div class="report-name text-center"> Students </div>
+                    <p class="text-center" style="font-size: small; color: #716262;">Total Students added on Prashast
+                        App</p>
+                </div>
+            </div>
+            <div class="col-span-2 xmd:col-span-1 bignumber-container">
+                <div class="report-wrapper">
+                    <div class="average-wrapper">
+                       <h1 class="average-percentage"> 187568 </h1>
+                    </div>
+                    <div class="report-name text-center"> Schools </div>
+                    <p class="text-center" style="font-size: small; color: #716262;">Total Schools using Prashast App
+                        App</p>
+                </div>
+            </div>
+            <div class="col-span-2 xmd:col-span-1 bignumber-container">
+                <div class="report-wrapper">
+                    <div class="average-wrapper">
+                       <h1 class="average-percentage"> 324822 </h1>
+                    </div>
+                    <div class="report-name text-center"> Teachers </div>
+                    <p class="text-center" style="font-size: small; color: #716262;">Total Teachers using Prashast App
+                        App</p>
+                </div>
+            </div>
+            <div class="col-span-2 xmd:col-span-1 bignumber-container">
+                <div class="report-wrapper">
+                    <div class="average-wrapper">
+                       <h1 class="average-percentage"> 135950 </h1>
+                    </div>
+                    <div class="report-name text-center"> Principal/Headmaster </div>
+                    <p class="text-center" style="font-size: small; color: #716262;">Principal and Headmaster using Prashast App</p>
+                </div>
+            </div>
+        </div>
+
+        <div class="row-wrapper grid grid-cols-5 gap-4">
+            <div class="col-span-2 xmd:col-span-1 bignumber-container">
+                <div class="report-wrapper">
+                    <div class="average-wrapper">
+                       <h1 class="average-percentage"> 11815 </h1>
+                    </div>
+                    <div class="report-name text-center"> Special Educators </div>
+                    <p class="text-center" style="font-size: small; color: #716262;">Special Educators on the Prashast App</p>
+                </div>
+            </div>
+            <div class="col-span-2 xmd:col-span-1 bignumber-container">
+                <div class="report-wrapper">
+                    <div class="average-wrapper">
+                       <h1 class="average-percentage"> 1043013 </h1>
+                    </div>
+                    <div class="report-name text-center"> Survey Part-1 </div>
+                    <p class="text-center" style="font-size: small; color: #716262;">Completed Screening Part-1 on Prashast App</p>
+                </div>
+            </div>
+            <div class="col-span-2 xmd:col-span-1 bignumber-container">
+                <div class="report-wrapper">
+                    <div class="average-wrapper">
+                       <h1 class="average-percentage"> 213699 </h1>
+                    </div>
+                    <div class="report-name text-center"> Survey Part-2 </div>
+                    <p class="text-center" style="font-size: small; color: #716262;">Completed Screening Part-2 on Prashast App</p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div> -->
diff --git a/src/app/views/prashast/prashast.component.scss b/src/app/views/prashast/prashast.component.scss
new file mode 100644
index 00000000..7f8ef900
--- /dev/null
+++ b/src/app/views/prashast/prashast.component.scss
@@ -0,0 +1,31 @@
+// .average-wrapper {
+//     margin-right: auto;
+//     margin-left: auto;
+//     display: flex;
+//     align-items: center;
+//     justify-content: center;
+//     color: #4C30F5;
+// }
+
+// .average-percentage {
+//     font-style: normal;
+//     font-weight: 400;
+//     font-size: 30.0896px;
+//     line-height: 87px;
+//     color: #4c30f5 !important;
+//     text-align: justify;
+//     height: 85px;
+// }
+
+// .report-wrapper {
+//     border-radius: 14px;
+//     width: 100px;
+//     padding: 5px;
+//     margin-bottom: 20px;
+//     width: auto;
+//     background-color: #FCFDFF;
+//     display: flex;
+//     flex-direction: column;
+//     height: 100%;
+//     justify-content: center;
+// }
diff --git a/src/app/views/prashast/prashast.component.spec.ts b/src/app/views/prashast/prashast.component.spec.ts
new file mode 100644
index 00000000..51e17425
--- /dev/null
+++ b/src/app/views/prashast/prashast.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PrashastComponent } from './prashast.component';
+
+describe('PrashastComponent', () => {
+  let component: PrashastComponent;
+  let fixture: ComponentFixture<PrashastComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ PrashastComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(PrashastComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/views/prashast/prashast.component.ts b/src/app/views/prashast/prashast.component.ts
new file mode 100644
index 00000000..e9e574e8
--- /dev/null
+++ b/src/app/views/prashast/prashast.component.ts
@@ -0,0 +1,55 @@
+import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
+import { RbacService } from 'src/app/core/services/rbac-service.service';
+import { config } from 'src/app/views/prashast/config/prashast_config';
+import { CommonService } from 'src/app/core/services/common/common.service';
+import { ActivatedRoute } from '@angular/router';
+@Component({
+  selector: 'app-prashast',
+  templateUrl: './prashast.component.html',
+  styleUrls: ['./prashast.component.scss']
+  
+})
+export class PrashastComponent implements OnInit, AfterViewInit {
+  rbacDetails: any;
+  bigNumberMetrics: any = [];
+  programName: any = 'prashast';
+  @ViewChild('target') private myTarget:ElementRef;
+
+  constructor(private route: ActivatedRoute, private _rbacService: RbacService, private _commonService: CommonService) { 
+    
+    this._rbacService.getRbacDetails().subscribe((rbacDetails: any) => {
+        this.rbacDetails = rbacDetails;
+    })
+    
+    }
+
+    ngOnInit(): void {
+        this._commonService.getMetaData(this.programName).subscribe()
+    }
+
+    ngAfterViewInit(): void {
+		this._commonService.scrollInto(this.myTarget.nativeElement);
+    }
+
+
+  checkReport(key: string, reportType: string): Boolean {
+      let reportConfig = config;
+      let flag = false;
+      reportConfig[key]?.filters?.forEach((filter: any) => {
+          if (Number(filter.hierarchyLevel) === Number(this.rbacDetails?.role) && Object.keys(filter?.actions?.queries).includes(reportType)) {
+          flag = true
+          }
+      })
+      return flag
+    }
+
+  importBigNumberMetrics(bigNumberMetric: any) {
+      this.bigNumberMetrics[bigNumberMetric.ind] = bigNumberMetric.data
+  }
+
+  getMetricsArray() {
+    return this.bigNumberMetrics.filter((data) => {
+     return data.averagePercentage !== null || data.averagePercentage !== undefined
+    }) 
+  }
+}
diff --git a/src/app/views/prashast/prashast.module.ts b/src/app/views/prashast/prashast.module.ts
new file mode 100644
index 00000000..6db1c46f
--- /dev/null
+++ b/src/app/views/prashast/prashast.module.ts
@@ -0,0 +1,22 @@
+import { PrashastRoutingModule } from './prashast-routing.module';
+import { PrashastComponent } from './prashast.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MatTabsModule } from '@angular/material/tabs';
+import { SharedModule } from 'src/app/shared/shared.module';
+import { PrashastMericsNumberComponent } from './pages/prashast-merics-number/prashast-merics-number.component';
+
+
+@NgModule({
+  declarations: [
+    PrashastComponent,
+    PrashastMericsNumberComponent
+  ],
+  imports: [
+    CommonModule,
+    PrashastRoutingModule,
+    MatTabsModule,
+    SharedModule
+  ]
+})
+export class PrashastModule { }
diff --git a/src/app/views/udise-apex/config/udise_apex_config.ts b/src/app/views/udise-apex/config/udise_apex_config.ts
new file mode 100644
index 00000000..81cd784e
--- /dev/null
+++ b/src/app/views/udise-apex/config/udise_apex_config.ts
@@ -0,0 +1,25 @@
+export const config = {     
+    summary_metrics: {
+        "filters": [
+            {
+                "name": "National",
+                "hierarchyLevel": "0",
+                "actions": {
+                    "queries": {
+                        "bigNumber1": "select dm.metric_value as total_school_surveyed from dimensions.mainmetrics dm where  dm.program_id='udise' and dm.metric_name ='Total Schools Surveyed' and dm.metric_type ='Key Metric'",
+                        "bigNumber2": "select dm.metric_value as total_teachers from dimensions.mainmetrics dm where  dm.program_id='udise' and dm.metric_name ='Total Teachers' and dm.metric_type ='Key Metric'",
+                    },
+                    "level": "state"
+                }
+            },
+        ],
+        "options": {
+            "bigNumber": {
+                "title": ['Total Schools Surveyed', 'Total Teachers'],
+                //"valueSuffix": ['L', 'L'],
+                "valueSuffix": ['', ''],
+                "property": ['total_school_surveyed', 'total_teachers']
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/app/views/udise-apex/udise-apex-routing.module.ts b/src/app/views/udise-apex/udise-apex-routing.module.ts
new file mode 100644
index 00000000..2ddfa5fb
--- /dev/null
+++ b/src/app/views/udise-apex/udise-apex-routing.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { UdiseComponent } from './udise-apex.component';           
+const routes: Routes = [
+    {
+        path:'',
+        component: UdiseComponent
+    }
+];
+@NgModule({
+    imports: [RouterModule.forChild(routes)],
+    exports: [RouterModule]
+})
+export class UdiseApexRoutingComponent { }
\ No newline at end of file
diff --git a/src/app/views/udise-apex/udise-apex.component.html b/src/app/views/udise-apex/udise-apex.component.html
new file mode 100644
index 00000000..0b6ae459
--- /dev/null
+++ b/src/app/views/udise-apex/udise-apex.component.html
@@ -0,0 +1,13 @@
+<div class="metric-card-wrapper">
+    <div class="grid gap-4 grid-cols-6 xmd:grid-cols-12">
+        <div class="col-span-12">
+            <p class="program-title">UDISE+</p>
+            <p class="program-desc"> The Unified District Information System for Education (UDISE) is an educational
+                management information system collected by school administrators on a yearly basis.</p>
+        </div>
+    </div>
+</div>
+
+<div class="custom-tab-group-wrapper" style="height: 1200px; max-height: 1500px; min-height: 300px;">
+    <iframe width="100%" height="100%" frameBorder="0" [src]="urlSafe" 	target="_parent" loading="lazy"> </iframe>
+</div>
\ No newline at end of file
diff --git a/src/app/views/udise-apex/udise-apex.component.scss b/src/app/views/udise-apex/udise-apex.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/views/udise-apex/udise-apex.component.spec.ts b/src/app/views/udise-apex/udise-apex.component.spec.ts
new file mode 100644
index 00000000..09741cb0
--- /dev/null
+++ b/src/app/views/udise-apex/udise-apex.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UdiseComponent } from './udise.component';
+
+describe('UdiseComponent', () => {
+    let component: UdiseComponent;
+    let fixture: ComponentFixture<UdiseComponent>;
+
+    beforeEach(async () => {
+    await TestBed.configureTestingModule({
+        declarations: [ UdiseComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(UdiseComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    });
+
+    it('should create', () => {
+    expect(component).toBeTruthy();
+    });
+});
diff --git a/src/app/views/udise-apex/udise-apex.component.ts b/src/app/views/udise-apex/udise-apex.component.ts
new file mode 100644
index 00000000..31c27d73
--- /dev/null
+++ b/src/app/views/udise-apex/udise-apex.component.ts
@@ -0,0 +1,88 @@
+
+import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { CommonService } from 'src/app/core/services/common/common.service';
+import { RbacService } from 'src/app/core/services/rbac-service.service';
+import { config } from './config/udise_apex_config';
+import { environment } from 'src/environments/environment';
+import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
+
+@Component({
+    selector: 'app-udise',
+    templateUrl: './udise-apex.component.html',
+    styleUrls: ['./udise-apex.component.scss']
+})
+export class UdiseComponent implements OnInit, AfterViewInit {
+    loadTabs = false;
+    rbacDetails: any;
+    tabIndex;
+    selectedTabLabel;
+    tabs: any = [];
+    programName: any = 'udise-apex';
+    bigNumberMetrics: any = [];
+    NVSK: boolean = true;
+    url:string = 'https://vskdev-apex.diksha.gov.in/ords/r/vskdev/udise';
+    urlSafe: SafeResourceUrl;
+	@ViewChild('target') private myTarget:ElementRef;
+
+    constructor(private route: ActivatedRoute, private sanitizer: DomSanitizer, private _rbacService: RbacService, private _commonService: CommonService) {
+        this.route.queryParams.subscribe((param: any) => {
+            this.tabIndex = param.tab ? Number(param.tab) : 0;
+        })
+        this._rbacService.getRbacDetails().subscribe((rbacDetails: any) => {
+            this.rbacDetails = rbacDetails;
+        })
+        let allTabs = [...Object.keys(config)]
+        allTabs.forEach((tab: any) => {
+            config?.[tab]?.filters?.every((filter) => {
+                if ((Number(filter?.hierarchyLevel) === this.rbacDetails?.role) || this.rbacDetails?.role === 0) {
+                    if (!(this.tabs.includes(config?.[tab]?.label))) {
+                        this.tabs.push(config?.[tab]?.label)
+                    }
+                    return false
+                }
+                return true
+            })
+        })
+        if(environment.config === 'VSK') {
+            this.NVSK = false;
+        }
+    }
+
+    ngOnInit(): void {
+        this.urlSafe = this.sanitizer.bypassSecurityTrustResourceUrl(this.url);
+        this._commonService.getMetaData(this.programName).subscribe()
+    }
+
+    ngAfterViewInit(): void {
+		this._commonService.scrollInto(this.myTarget.nativeElement);
+        setTimeout(() => {
+            this.selectedTabLabel = this.tabs.length > 0 ? this.tabs[0] : undefined
+        });
+    }
+
+    onTabChanged($event: any): void {
+        this.selectedTabLabel = $event?.tab?.textLabel;
+        this.tabIndex = $event.index;
+        setTimeout(() => {
+            window.dispatchEvent(new Event('resize'));
+            console.log('resize');
+        }, 100);
+    }
+
+    checkReport(key: string, reportType: string): Boolean {
+        let reportConfig = config;
+        let flag = false;
+        reportConfig[key]?.filters?.forEach((filter: any) => {
+            if (Number(filter.hierarchyLevel) === Number(this.rbacDetails?.role) && Object.keys(filter?.actions?.queries).includes(reportType)) {
+                flag = true
+            }
+        })
+        return flag
+    }
+
+    importBigNumberMetrics(bigNumberMetric: any) {
+        this.bigNumberMetrics[bigNumberMetric.ind] = bigNumberMetric.data
+    }
+
+}
diff --git a/src/app/views/udise-apex/udise-apex.module.ts b/src/app/views/udise-apex/udise-apex.module.ts
new file mode 100644
index 00000000..bcf263e2
--- /dev/null
+++ b/src/app/views/udise-apex/udise-apex.module.ts
@@ -0,0 +1,23 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MatTabsModule } from '@angular/material/tabs';
+import { SharedModule } from 'src/app/shared/shared.module';
+import { DashletModule, DataService } from '@project-sunbird/sb-dashlet';
+import {UdiseApexRoutingComponent} from './udise-apex-routing.module';
+import {UdiseComponent} from './udise-apex.component';
+
+@NgModule({
+declarations: [
+    UdiseComponent,
+   ],
+imports: [
+    DashletModule.forRoot({
+        dataService: DataService
+    }),
+    MatTabsModule,
+    SharedModule,
+    CommonModule,
+    UdiseApexRoutingComponent
+]
+})
+export class UdiseApexModule { }
diff --git a/src/app/views/udise/config/udise_config.ts b/src/app/views/udise/config/udise_config.ts
index 8ba4cc4f..80321f64 100644
--- a/src/app/views/udise/config/udise_config.ts
+++ b/src/app/views/udise/config/udise_config.ts
@@ -8,6 +8,14 @@ export const config = {
             "id": "metric",
             "query": "select category_name from dimensions.categoryudise"
         },
+        {
+            "label": "District Wise Performance",
+            "name": "State",
+            "labelProp": "state_name",
+            "valueProp": "state_id",
+            "id": "state_name",
+            "query": "select state_id,state_name from dimensions.state order by state_name"
+        },
         {
             "label": "State Wise Performance",
             "name": "Metric",
@@ -59,7 +67,7 @@ export const config = {
                 "metricFilterNeeded": false,
                 "indicator": "status",
                 "legend": {
-                    "title": "Implemented Udise"
+                    "title": "Implemented UDISE+"
                 },
                 "tooltipMetrics": [
                     {
@@ -68,7 +76,7 @@ export const config = {
                         "valueSuffix": "\n"
                     },
                     {
-                        "valuePrefix": "Implemented NAS: ",
+                        "valuePrefix": "Implemented UDISE+: ",
                         "value": "status",
                         "valueSuffix": "\n"
                     }
@@ -87,7 +95,7 @@ export const config = {
                     {
                         "queries":
                         {
-                            "map": "select t2.district_name, t1.district_id ,latitude, longitude, t1.category_name,round(cast(sum(t1.sum) as numeric ),2) as percentage from datasets.udise_category_district0categoryudise as t1 join dimensions.district as t2 on t2.district_id = t1.district_id group by t1.district_id, t2.district_name,t1.category_name, latitude, longitude"
+                            "map": "select t2.district_name, t1.district_id ,latitude, longitude, t1.category_name,round(cast(sum(t1.sum) as numeric ),2) as percentage from datasets.udise_category_district0categoryudise as t1 join dimensions.district as t2 on t2.district_id = t1.district_id group by t1.district_id, t2.district_name,t1.category_name, latitude, longitude order by t1.category_name"
                         },
                         "level": "state",
                         "nextLevel": "district"
@@ -100,7 +108,7 @@ export const config = {
                     {
                         "queries":
                         {
-                            "map": "select t2.district_name, t1.district_id , t1.category_name,latitude, longitude,round(cast(sum(t1.sum) as numeric ),2) as percentage from datasets.udise_category_district0categoryudise as t1 join dimensions.district as t2 on t2.district_id = t1.district_id group by t1.district_id, t2.district_name,t1.category_name, latitude, longitude"
+                            "map": "select t2.district_name, t1.district_id , t1.category_name,latitude, longitude,round(cast(sum(t1.sum) as numeric ),2) as percentage from datasets.udise_category_district0categoryudise as t1 join dimensions.district as t2 on t2.district_id = t1.district_id group by t1.district_id, t2.district_name,t1.category_name, latitude, longitude order by t1.category_name"
                         },
                         "level": "district",
                         "nextLevel": "block"
@@ -120,7 +128,7 @@ export const config = {
                 "metricValueProp": "percentage",
                 "groupByColumn": "district_id",
                 "metricFilterNeeded": true,
-                "legend": { "title": "District Wise Performance" },
+                "legend": { "title": "District Wise Performance " },
                 "tooltipMetrics": [
                     {
                         "valuePrefix": "District Name: ",
@@ -175,6 +183,29 @@ export const config = {
             }
         }
     },
+    summary_metrics: {
+        "filters": [
+            {
+                "name": "National",
+                "hierarchyLevel": "0",
+                "actions": {
+                    "queries": {
+                        "bigNumber1": "select dm.metric_value as total_school_surveyed from dimensions.mainmetrics dm where  dm.program_id='udise' and dm.metric_name ='Total Schools Surveyed' and dm.metric_type ='Key Metric'",
+                        "bigNumber2": "select dm.metric_value as total_teachers from dimensions.mainmetrics dm where  dm.program_id='udise' and dm.metric_name ='Total Teachers' and dm.metric_type ='Key Metric'",
+                    },
+                    "level": "state"
+                }
+            },
+        ],
+        "options": {
+            "bigNumber": {
+                "title": ['Total Schools Surveyed', 'Total Teachers'],
+                //"valueSuffix": ['L', 'L'],
+                "valueSuffix": ['', ''],
+                "property": ['total_school_surveyed', 'total_teachers']
+            }
+        }
+    },
     udise_metrics: {
         "label": "District Wise Performance",
         "filters": [
@@ -183,12 +214,14 @@ export const config = {
                 "hierarchyLevel": "0",
                 "actions": {
                     "queries": {
-                        "bigNumber1": "select sum(sum) as total_students from datasets.udise_no_of_students_state",
-                        "bigNumber2": "select round(cast (avg(sum) as numeric),2) as ptr from datasets.udise_category_state0categoryudise where category_name = 'ptr'",
-                        "bigNumber3": "select round(cast (avg(sum) as numeric),2) as schs_with_toilet from datasets.udise_category_state0categoryudise where category_name = '%_schools_having_toilet'",
-                        "bigNumber4": "select round(cast (avg(sum) as numeric),2) as schs_having_electricity from datasets.udise_category_state0categoryudise where category_name = '%_schools_having_electricity'",
-                        "bigNumber5": "select round(cast (avg(sum) as numeric),2) as schs_having_water from datasets.udise_category_state0categoryudise where category_name = '%_schools_having_drinking_water'",
-                    },
+                        "bigNumber1": "select dm.metric_value as total_students from dimensions.mainmetrics dm where  dm.program_id='udise' and dm.metric_name ='Total Students' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber2": "select dm.metric_value as ptr from dimensions.mainmetrics dm where  dm.program_id='udise' and dm.metric_name ='PTR' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber3": "select dm.metric_value as schs_having_electricity from dimensions.mainmetrics dm where  dm.program_id='udise' and dm.metric_name ='% schools with electricity connection' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber4": "select dm.metric_value as schs_having_library  from dimensions.mainmetrics dm where  dm.program_id='udise' and dm.metric_name ='% schools with Library' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber5": "select dm.metric_value as schs_with_toilet  from dimensions.mainmetrics dm where  dm.program_id='udise' and dm.metric_name ='% schools with toilets' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber6": "select dm.metric_value as schs_having_water from dimensions.mainmetrics dm where  dm.program_id='udise' and dm.metric_name ='% schools with drinking water' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber7": "select dm.metric_value as schs_with_ramp from dimensions.mainmetrics dm where  dm.program_id='udise' and dm.metric_name ='% schools with ramp' and dm.metric_type ='Vanity Metric'",
+                     },
                     "level": "state"
                 }
             },
@@ -199,11 +232,13 @@ export const config = {
                 "hierarchyLevel": "1",
                 "actions": {
                     "queries": {
-                        "bigNumber1": "select sum(sum) as total_students from datasets.udise_no_of_students_district",
-                        "bigNumber2": "select round(cast (avg(sum) as numeric),2) as ptr from datasets.udise_category_district0categoryudise where category_name = 'ptr'",
-                        "bigNumber3": "select round(cast (avg(sum) as numeric),2) as schs_with_toilet from datasets.udise_category_district0categoryudise where category_name = '%_schools_having_toilet'",
-                        "bigNumber4": "select round(cast (avg(sum) as numeric),2) as schs_having_electricity from datasets.udise_category_district0categoryudise where category_name = '%_schools_having_electricity'",
-                        "bigNumber5": "select round(cast (avg(sum) as numeric),2) as schs_having_water from datasets.udise_category_district0categoryudise where category_name = '%_schools_having_drinking_water'",
+                        "bigNumber1": "select dm.metric_value as total_students from dimensions.mainmetrics dm where  dm.program_id='udise' and dm.metric_name ='Total Students' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber2": "select dm.metric_value as ptr from dimensions.mainmetrics dm where  dm.program_id='udise' and dm.metric_name ='PTR' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber3": "select dm.metric_value as schs_having_electricity from dimensions.mainmetrics dm where  dm.program_id='udise' and dm.metric_name ='% schools with electricity connection' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber4": "select dm.metric_value as schs_having_library  from dimensions.mainmetrics dm where  dm.program_id='udise' and dm.metric_name ='% schools with Library' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber5": "select dm.metric_value as schs_with_toilet  from dimensions.mainmetrics dm where  dm.program_id='udise' and dm.metric_name ='% schools with toilets' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber6": "select dm.metric_value as schs_having_water from dimensions.mainmetrics dm where  dm.program_id='udise' and dm.metric_name ='% schools with drinking water' and dm.metric_type ='Vanity Metric'",
+                        "bigNumber7": "select dm.metric_value as schs_with_ramp from dimensions.mainmetrics dm where  dm.program_id='udise' and dm.metric_name ='% schools with ramp' and dm.metric_type ='Vanity Metric'",
                     },
                     "level": "district"
                 }
@@ -211,9 +246,10 @@ export const config = {
         ],
         "options": {
             "bigNumber": {
-                "title": ['Total Students', 'PTR', '% Schools With Toilets', '% Schools Having Electricity', '% Schools Having Drinking Water'],
-                "valueSuffix": ['', '', '%', '%', '%'],
-                "property": ['total_students', 'ptr', 'schs_with_toilet', 'schs_having_electricity', 'schs_having_water']
+                "title": ['Total Students', 'PTR', '% Schools with electricity connection', '% Schools with Library', '% Schools with toilets', '% Schools with drinking water', '% Schools with ramp'],
+                //"valueSuffix": ['Cr', '', '%', '%', '%', '%', '%'],
+                "valueSuffix": ['', '', '', '', '', '', ''],
+                "property": ['total_students', 'ptr', 'schs_having_electricity', 'schs_having_library', 'schs_with_toilet', 'schs_having_water', 'schs_with_ramp']
             }
         }
     },
@@ -228,7 +264,7 @@ export const config = {
                     {
                         "queries":
                         {
-                            "map": "select t2.latitude, t2.longitude, t2.state_name, t1.state_id, t1.state_id as level , t1.category_name,round(cast(sum(t1.sum) as numeric ),2) as percentage from datasets.udise_category_state0categoryudise as t1 join dimensions.state as t2 on t2.state_id = t1.state_id group by t1.state_id, t2.state_name,t1.category_name, t2.latitude, t2.longitude"
+                            "map": "select t2.latitude, t2.longitude, t2.state_name, t1.state_id, t1.state_id as level, t1.category_name, sum(t1.sum) as category_value, round(cast(sum(t1.avg) as numeric ),2) as percentage from datasets.udise_category_state0categoryudise as t1 join dimensions.state as t2 on t2.state_id = t1.state_id group by t1.state_id, t2.state_name,t1.category_name, t2.latitude, t2.longitude order by t1.category_name"
                         },
                         "level": "state",
                         "nextLevel": "district"
@@ -241,7 +277,7 @@ export const config = {
                     {
                         "queries":
                         {
-                            "map": "select t2.district_name, t1.district_id, t1.district_id as level , t1.category_name,latitude, longitude,round(cast(sum(t1.sum) as numeric ),2) as percentage from datasets.udise_category_district0categoryudise as t1 join dimensions.district as t2 on t2.district_id = t1.district_id where t2.state_id = {state_id} group by t1.district_id, t2.district_name,t1.category_name, latitude, longitude"
+                            "map": "select t2.district_name, t1.district_id, t1.district_id as level , t1.category_name,latitude, longitude,round(cast(sum(t1.sum) as numeric ),2) as percentage from datasets.udise_category_district0categoryudise as t1 join dimensions.district as t2 on t2.district_id = t1.district_id where t2.state_id = {state_id} group by t1.district_id, t2.district_name,t1.category_name, latitude, longitude order by t1.category_name"
                         },
                         "level": "district",
                         "nextLevel": "block"
@@ -260,8 +296,9 @@ export const config = {
                 "metricLabelProp": "category_name",
                 "metricValueProp": "percentage",
                 "groupByColumn": "level",
+                "indicator": "percentage",
                 "metricFilterNeeded": true,
-                "legend": { "title": "District Wise Performance" },
+                "legend": { "title": "State Wise Performance " },
                 "drillDownConfig": {
                     "enableDrillDown": true,
                     "allowedLevels": [0]
diff --git a/src/app/views/udise/pages/correlation-tab/reports/correlation/correlation.component.html b/src/app/views/udise/pages/correlation-tab/reports/correlation/correlation.component.html
index c0f2c10e..900cbd4a 100644
--- a/src/app/views/udise/pages/correlation-tab/reports/correlation/correlation.component.html
+++ b/src/app/views/udise/pages/correlation-tab/reports/correlation/correlation.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.values && reportData?.values?.length > 0)">
-        <p class="text-center font-medium py-2 filename">{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename">{{title}}</p> -->
         <sb-dashlet type="scatter" [data]="reportData" [config]="config"></sb-dashlet>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.values && reportData?.values?.length > 0)">
diff --git a/src/app/views/udise/pages/district-wise-performance-tab/district-wise-performance-tab.component.html b/src/app/views/udise/pages/district-wise-performance-tab/district-wise-performance-tab.component.html
index b65745ba..aec0a626 100644
--- a/src/app/views/udise/pages/district-wise-performance-tab/district-wise-performance-tab.component.html
+++ b/src/app/views/udise/pages/district-wise-performance-tab/district-wise-performance-tab.component.html
@@ -7,9 +7,9 @@
         <div class="download-button xmd:col-start-4 xmd:col-end-6 col-span-5 flex">
             <app-download-button [data]="reportsData"></app-download-button>
         </div>
-        <div class="col-span-5"> 
+        <!-- <div class="col-span-5"> 
             <app-breadcrumb-component></app-breadcrumb-component>
-        </div>
+        </div> -->
     </div>
     <div class="reports-row">
         <!-- <div *ngIf="checkReport('udise_metrics', 'bigNumber1')" id="bignumber1">
diff --git a/src/app/views/udise/pages/district-wise-performance-tab/reports/district-wise-performance/district-wise-performance.component.html b/src/app/views/udise/pages/district-wise-performance-tab/reports/district-wise-performance/district-wise-performance.component.html
index 8ca8a28e..820a9a40 100644
--- a/src/app/views/udise/pages/district-wise-performance-tab/reports/district-wise-performance/district-wise-performance.component.html
+++ b/src/app/views/udise/pages/district-wise-performance-tab/reports/district-wise-performance/district-wise-performance.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename">{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename">{{title}}</p> -->
         <app-leaflet-map [mapData]="reportData" level="district" ></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/udise/pages/implementation-status-tab/implementation-status-tab.component.html b/src/app/views/udise/pages/implementation-status-tab/implementation-status-tab.component.html
index 079e78b4..efe092f4 100644
--- a/src/app/views/udise/pages/implementation-status-tab/implementation-status-tab.component.html
+++ b/src/app/views/udise/pages/implementation-status-tab/implementation-status-tab.component.html
@@ -1,22 +1,14 @@
 <div class="col-span-full tab-wrapper">
     <div class="filter-row grid grid-cols-4">
-        <div class="col-span-3"> 
+        <!-- <div class="col-span-3"> 
             <app-breadcrumb-component></app-breadcrumb-component>
-        </div>
+        </div> -->
         <div class="col-start-4 col-end-5 download-button" id="downloadbutton" >
             <!-- <app-popup-options [data]="reportsData" [reportName]="'pgi'" ></app-popup-options> -->
             <app-download-button [data]="reportsData"></app-download-button>
         </div>
     </div>
     <div class="reports-row">
-        <div class="row-wrapper grid grid-cols-5 gap-4" *ngIf="NVSK">
-            <div class="col-span-2 xmd:col-span-1 bignumber-container" id="bignumber2"
-                *ngFor="let bigNumberData of bigNumberMetrics; let index = index">
-                <div *ngIf="checkReport('udise_metrics', 'bigNumber' + (index + 1))" id="bignumber2">
-                    <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
-                </div>
-            </div>
-        </div>
         <div class="col-span-2 xmd:col-span-1 div-shadow" *ngIf="checkReport('implementation_status', 'map')" id="map">
             <app-implementation-status #implementationStatus
                 (exportReportData)="csvDownload($event)"></app-implementation-status>
diff --git a/src/app/views/udise/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html b/src/app/views/udise/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
index 0957f880..71dc08ba 100644
--- a/src/app/views/udise/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
+++ b/src/app/views/udise/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename">{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename">{{title}}</p> -->
         <app-leaflet-map [mapData]="reportData" ></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/udise/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.html b/src/app/views/udise/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.html
index db50b5e0..2850feb6 100644
--- a/src/app/views/udise/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.html
+++ b/src/app/views/udise/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.html
@@ -1,6 +1,6 @@
 <div class="col-span-full">
     <ng-container *ngIf="(reportData?.data && reportData?.data?.length > 0)">
-        <p class="text-center font-medium py-2 filename">{{title}}</p><br>
+        <!-- <p class="text-center font-medium py-2 filename">{{title}}</p> -->
         <app-leaflet-map [mapData]="reportData" [drillDownLevel]="drillDownLevel"></app-leaflet-map>
     </ng-container>
     <div class="noData" *ngIf="!(reportData?.data && reportData?.data?.length > 0)">
diff --git a/src/app/views/udise/pages/state-wise-performance-tab/state-wise-performance-tab.component.html b/src/app/views/udise/pages/state-wise-performance-tab/state-wise-performance-tab.component.html
index 5b1e7c0e..f96e4108 100644
--- a/src/app/views/udise/pages/state-wise-performance-tab/state-wise-performance-tab.component.html
+++ b/src/app/views/udise/pages/state-wise-performance-tab/state-wise-performance-tab.component.html
@@ -7,9 +7,9 @@
         <div class="download-button xmd:col-start-4 xmd:col-end-6 col-span-5 flex" id="downloadbutton" #downloadbutton>
             <app-download-button [data]="reportsData"></app-download-button>
         </div>
-        <div class="col-span-5"> 
+        <!-- <div class="col-span-5"> 
             <app-breadcrumb-component></app-breadcrumb-component>
-        </div>
+        </div> -->
     </div>
     <div class="reports-row">
         <div class="row-wrapper grid grid-cols-1 gap-4">
diff --git a/src/app/views/udise/udise.component.html b/src/app/views/udise/udise.component.html
index 435b8fb0..8de1d12c 100644
--- a/src/app/views/udise/udise.component.html
+++ b/src/app/views/udise/udise.component.html
@@ -1,35 +1,49 @@
+<div class="program-banner-wrapper">
+	<img src="assets/images/udise-banner.png" alt="UDISE Banner">
+</div>
 <div class="metric-card-wrapper">
     <div class="grid gap-4 grid-cols-6 xmd:grid-cols-12">
         <div class="col-span-12">
-            <p class="program-title">UDISE+</p>
+            <p class="program-title">
+				<img src="assets/images/udise.png" alt="logo">
+				UDISE+
+			</p>
             <p class="program-desc"> The Unified District Information System for Education (UDISE) is an educational
                 management information system collected by school administrators on a yearly basis.</p>
         </div>
     </div>
 </div>
-
+<div class="col-span-full tab-wrapper" *ngIf="NVSK" #target>
+    <div *ngIf="checkReport('udise_metrics', 'bigNumber1')" id="bignumber1">
+        <app-udise-bignumber-metrics (exportReportData)="importBigNumberMetrics($event)"></app-udise-bignumber-metrics>
+    </div>
+    <div class="row-wrapper grid grid-cols-5 gap-4">
+        <div class="col-span-2 xmd:col-span-1  bignumber-container" id="bignumber1"
+            *ngFor="let bigNumberData of bigNumberMetrics; let index = index">
+            <div *ngIf="checkReport('udise_metrics', 'bigNumber'+(index+1))">
+                <app-big-number [bigNumberReportData]="bigNumberData"></app-big-number>
+            </div>
+        </div>
+    </div>
+</div>
 <div class="custom-tab-group-wrapper">
     <mat-tab-group [selectedIndex]="tabIndex" mat-align-tabs="start" animationDuration="0ms"
         (selectedTabChange)="onTabChanged($event)" appFullScreen>
-        <div *ngIf="checkReport('udise_metrics', 'bigNumber1')" id="bignumber1">
-            <app-udise-bignumber-metrics
-                (exportReportData)="importBigNumberMetrics($event)"></app-udise-bignumber-metrics>
-        </div>
 
         <mat-tab label='Implementation Status' *ngIf="tabs.includes('Implementation Status')">
             <app-implementation-status-tab [bigNumberMetrics]="bigNumberMetrics" *ngIf="selectedTabLabel === 'Implementation Status'"></app-implementation-status-tab>
         </mat-tab>
 
-        <mat-tab label='District Wise Performance' *ngIf="tabs.includes('District Wise Performance')">
-            <app-district-wise-performance-tab [bigNumberMetrics]="bigNumberMetrics"
-                *ngIf="selectedTabLabel === 'District Wise Performance'"></app-district-wise-performance-tab>
-        </mat-tab>
-
         <mat-tab label='State Wise Performance' *ngIf="tabs.includes('State Wise Performance') && NVSK">
             <app-state-wise-performance-tab
                 *ngIf="selectedTabLabel === 'State Wise Performance'"></app-state-wise-performance-tab>
         </mat-tab>
 
+        <mat-tab label='District Wise Performance' *ngIf="tabs.includes('District Wise Performance')">
+            <app-district-wise-performance-tab [bigNumberMetrics]="bigNumberMetrics"
+                *ngIf="selectedTabLabel === 'District Wise Performance'"></app-district-wise-performance-tab>
+        </mat-tab>
+
         <mat-tab label='Correlation' *ngIf="tabs.includes('Correlation')">
             <app-correlation-tab *ngIf="selectedTabLabel === 'Correlation'"></app-correlation-tab>
         </mat-tab>
diff --git a/src/app/views/udise/udise.component.ts b/src/app/views/udise/udise.component.ts
index 52960b86..62c6b211 100644
--- a/src/app/views/udise/udise.component.ts
+++ b/src/app/views/udise/udise.component.ts
@@ -1,5 +1,5 @@
 
-import { Component, OnInit } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { CommonService } from 'src/app/core/services/common/common.service';
 import { RbacService } from 'src/app/core/services/rbac-service.service';
@@ -11,7 +11,7 @@ import { environment } from 'src/environments/environment';
     templateUrl: './udise.component.html',
     styleUrls: ['./udise.component.scss']
 })
-export class UdiseComponent implements OnInit {
+export class UdiseComponent implements OnInit, AfterViewInit {
     loadTabs = false;
     rbacDetails: any;
     tabIndex;
@@ -20,6 +20,7 @@ export class UdiseComponent implements OnInit {
     programName: any = 'udise';
     bigNumberMetrics: any = [];
     NVSK: boolean = true;
+	@ViewChild('target') private myTarget:ElementRef;
 
     constructor(private route: ActivatedRoute, private _rbacService: RbacService, private _commonService: CommonService) {
         this.route.queryParams.subscribe((param: any) => {
@@ -50,6 +51,7 @@ export class UdiseComponent implements OnInit {
     }
 
     ngAfterViewInit(): void {
+		this._commonService.scrollInto(this.myTarget.nativeElement);
         setTimeout(() => {
             this.selectedTabLabel = this.tabs.length > 0 ? this.tabs[0] : undefined
         });
diff --git a/src/assets/data/mock/metric.json b/src/assets/data/mock/metric.json
index 6266d030..189ad89b 100644
--- a/src/assets/data/mock/metric.json
+++ b/src/assets/data/mock/metric.json
@@ -82,7 +82,7 @@
       "orderBy": "12"
     },
     {
-      "programName": "NCERT Quizes",
+      "programName": "NCERT Quizzes",
       "tooltip": "National Curriculum Framework",
       "navigationUrl": "/quizzes",
       "imageUrl": "Quizzes.png",
diff --git a/src/assets/images/36.png b/src/assets/images/36.png
new file mode 100644
index 00000000..6f6be287
Binary files /dev/null and b/src/assets/images/36.png differ
diff --git a/src/assets/images/CG-Logo-removebg-preview1.png b/src/assets/images/CG-Logo-removebg-preview1.png
new file mode 100644
index 00000000..0ba20290
Binary files /dev/null and b/src/assets/images/CG-Logo-removebg-preview1.png differ
diff --git a/src/assets/images/Group 1000005535.png b/src/assets/images/Group 1000005535.png
new file mode 100644
index 00000000..1f575692
Binary files /dev/null and b/src/assets/images/Group 1000005535.png differ
diff --git a/src/assets/images/Micro Improvement.png b/src/assets/images/Micro Improvement.png
index 2ad05019..46d7b1f0 100644
Binary files a/src/assets/images/Micro Improvement.png and b/src/assets/images/Micro Improvement.png differ
diff --git a/src/assets/images/Ministry_of_Education_India 1.png b/src/assets/images/Ministry_of_Education_India 1.png
new file mode 100644
index 00000000..bcecf94e
Binary files /dev/null and b/src/assets/images/Ministry_of_Education_India 1.png differ
diff --git a/src/assets/images/Ministry_of_Education_India.png b/src/assets/images/Ministry_of_Education_India.png
new file mode 100644
index 00000000..bcecf94e
Binary files /dev/null and b/src/assets/images/Ministry_of_Education_India.png differ
diff --git a/src/assets/images/NCF.png b/src/assets/images/NCF.png
index 6503b2fc..feee820e 100644
Binary files a/src/assets/images/NCF.png and b/src/assets/images/NCF.png differ
diff --git a/src/assets/images/NIPUN BHARAT.png b/src/assets/images/NIPUN BHARAT.png
index dc38c135..6ea0425e 100644
Binary files a/src/assets/images/NIPUN BHARAT.png and b/src/assets/images/NIPUN BHARAT.png differ
diff --git a/src/assets/images/Quizzes.png b/src/assets/images/Quizzes.png
index 2ad05019..46d7b1f0 100644
Binary files a/src/assets/images/Quizzes.png and b/src/assets/images/Quizzes.png differ
diff --git a/src/assets/images/about-image-old.png b/src/assets/images/about-image-old.png
new file mode 100644
index 00000000..f2927b39
Binary files /dev/null and b/src/assets/images/about-image-old.png differ
diff --git a/src/assets/images/about-image.png b/src/assets/images/about-image.png
new file mode 100644
index 00000000..158ec8b7
Binary files /dev/null and b/src/assets/images/about-image.png differ
diff --git a/src/assets/images/banner-1-old.png b/src/assets/images/banner-1-old.png
new file mode 100644
index 00000000..d22e5a12
Binary files /dev/null and b/src/assets/images/banner-1-old.png differ
diff --git a/src/assets/images/banner-1.png b/src/assets/images/banner-1.png
new file mode 100644
index 00000000..a2725c2d
Binary files /dev/null and b/src/assets/images/banner-1.png differ
diff --git a/src/assets/images/digital-india 1.png b/src/assets/images/digital-india 1.png
new file mode 100644
index 00000000..7a830962
Binary files /dev/null and b/src/assets/images/digital-india 1.png differ
diff --git a/src/assets/images/diksha-etb-banner.png b/src/assets/images/diksha-etb-banner.png
new file mode 100644
index 00000000..e23dad06
Binary files /dev/null and b/src/assets/images/diksha-etb-banner.png differ
diff --git a/src/assets/images/diksha-logo 1.png b/src/assets/images/diksha-logo 1.png
new file mode 100644
index 00000000..1667c974
Binary files /dev/null and b/src/assets/images/diksha-logo 1.png differ
diff --git a/src/assets/images/diksha.png b/src/assets/images/diksha.png
index 2ad05019..46d7b1f0 100644
Binary files a/src/assets/images/diksha.png and b/src/assets/images/diksha.png differ
diff --git a/src/assets/images/dropdown-arrow1.svg b/src/assets/images/dropdown-arrow1.svg
new file mode 100644
index 00000000..6c7d13d4
--- /dev/null
+++ b/src/assets/images/dropdown-arrow1.svg
@@ -0,0 +1,8 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_3691_2309" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="24" height="24">
+<rect width="24" height="24" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask0_3691_2309)">
+<path d="M12 15.3751L6 9.3751L7.4 7.9751L12 12.5751L16.6 7.9751L18 9.3751L12 15.3751Z" fill="#434141"/>
+</g>
+</svg>
diff --git a/src/assets/images/emp.png b/src/assets/images/emp.png
new file mode 100644
index 00000000..b6308478
Binary files /dev/null and b/src/assets/images/emp.png differ
diff --git a/src/assets/images/footer-logo.png b/src/assets/images/footer-logo.png
new file mode 100644
index 00000000..1f575692
Binary files /dev/null and b/src/assets/images/footer-logo.png differ
diff --git a/src/assets/images/head1.png b/src/assets/images/head1.png
new file mode 100644
index 00000000..f9e415c7
Binary files /dev/null and b/src/assets/images/head1.png differ
diff --git a/src/assets/images/head2-new.png b/src/assets/images/head2-new.png
new file mode 100644
index 00000000..e772a659
Binary files /dev/null and b/src/assets/images/head2-new.png differ
diff --git a/src/assets/images/head3.png b/src/assets/images/head3.png
new file mode 100644
index 00000000..c57e7a3a
Binary files /dev/null and b/src/assets/images/head3.png differ
diff --git a/src/assets/images/india-map3.png b/src/assets/images/india-map3.png
new file mode 100644
index 00000000..b0d71e1b
Binary files /dev/null and b/src/assets/images/india-map3.png differ
diff --git a/src/assets/images/jaduyi-pitra.png b/src/assets/images/jaduyi-pitra.png
new file mode 100644
index 00000000..dde1441a
Binary files /dev/null and b/src/assets/images/jaduyi-pitra.png differ
diff --git a/src/assets/images/key-mob-3.png b/src/assets/images/key-mob-3.png
new file mode 100644
index 00000000..2eb9041f
Binary files /dev/null and b/src/assets/images/key-mob-3.png differ
diff --git a/src/assets/images/key-mob.png b/src/assets/images/key-mob.png
new file mode 100644
index 00000000..6c29c00b
Binary files /dev/null and b/src/assets/images/key-mob.png differ
diff --git a/src/assets/images/key-xl-img.png b/src/assets/images/key-xl-img.png
new file mode 100644
index 00000000..c884678e
Binary files /dev/null and b/src/assets/images/key-xl-img.png differ
diff --git a/src/assets/images/location_on.svg b/src/assets/images/location_on.svg
new file mode 100644
index 00000000..169383b0
--- /dev/null
+++ b/src/assets/images/location_on.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 2C8.13 2 5 5.13 5 9C5 14.25 12 22 12 22C12 22 19 14.25 19 9C19 5.13 15.87 2 12 2ZM7 9C7 6.24 9.24 4 12 4C14.76 4 17 6.24 17 9C17 11.88 14.12 16.19 12 18.88C9.92 16.21 7 11.85 7 9ZM9.5 9C9.5 7.61929 10.6193 6.5 12 6.5C12.8932 6.5 13.7185 6.9765 14.1651 7.75C14.6116 8.5235 14.6116 9.4765 14.1651 10.25C13.7185 11.0235 12.8932 11.5 12 11.5C10.6193 11.5 9.5 10.3807 9.5 9Z" fill="#4C30F5"/>
+</svg>
diff --git a/src/assets/images/mail.svg b/src/assets/images/mail.svg
new file mode 100644
index 00000000..14cf9bb2
--- /dev/null
+++ b/src/assets/images/mail.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22 6C22 4.9 21.1 4 20 4H4C2.9 4 2 4.9 2 6V18C2 19.1 2.9 20 4 20H20C21.1 20 22 19.1 22 18V6ZM20 6L12 10.99L4 6H20ZM12 13L4 8V18H20V8L12 13Z" fill="#4C30F5"/>
+</svg>
diff --git a/src/assets/images/micro-improvements-banner.png b/src/assets/images/micro-improvements-banner.png
new file mode 100644
index 00000000..4a6a9b19
Binary files /dev/null and b/src/assets/images/micro-improvements-banner.png differ
diff --git a/src/assets/images/my-gov.png b/src/assets/images/my-gov.png
new file mode 100644
index 00000000..ea6a1a37
Binary files /dev/null and b/src/assets/images/my-gov.png differ
diff --git a/src/assets/images/nas-banner.png b/src/assets/images/nas-banner.png
new file mode 100644
index 00000000..1af9cf65
Binary files /dev/null and b/src/assets/images/nas-banner.png differ
diff --git a/src/assets/images/nas.png b/src/assets/images/nas.png
index dbe101a0..3dddf837 100644
Binary files a/src/assets/images/nas.png and b/src/assets/images/nas.png differ
diff --git a/src/assets/images/ncert-logo 1.png b/src/assets/images/ncert-logo 1.png
new file mode 100644
index 00000000..2bee7a4c
Binary files /dev/null and b/src/assets/images/ncert-logo 1.png differ
diff --git a/src/assets/images/ncert-quizzes-banner.png b/src/assets/images/ncert-quizzes-banner.png
new file mode 100644
index 00000000..0c47c84f
Binary files /dev/null and b/src/assets/images/ncert-quizzes-banner.png differ
diff --git a/src/assets/images/ncf-banner.png b/src/assets/images/ncf-banner.png
new file mode 100644
index 00000000..d4b8d284
Binary files /dev/null and b/src/assets/images/ncf-banner.png differ
diff --git a/src/assets/images/nipun-bharat-banner.jpg b/src/assets/images/nipun-bharat-banner.jpg
new file mode 100644
index 00000000..ec0d3e95
Binary files /dev/null and b/src/assets/images/nipun-bharat-banner.jpg differ
diff --git a/src/assets/images/nishtha-banner.png b/src/assets/images/nishtha-banner.png
new file mode 100644
index 00000000..1812e47a
Binary files /dev/null and b/src/assets/images/nishtha-banner.png differ
diff --git a/src/assets/images/nishtha.png b/src/assets/images/nishtha.png
index 828eeefe..488262fe 100644
Binary files a/src/assets/images/nishtha.png and b/src/assets/images/nishtha.png differ
diff --git a/src/assets/images/nishtha_spotlight 1.png b/src/assets/images/nishtha_spotlight 1.png
new file mode 100644
index 00000000..a0315f3a
Binary files /dev/null and b/src/assets/images/nishtha_spotlight 1.png differ
diff --git a/src/assets/images/pgi-banner.png b/src/assets/images/pgi-banner.png
new file mode 100644
index 00000000..987c7b81
Binary files /dev/null and b/src/assets/images/pgi-banner.png differ
diff --git a/src/assets/images/pgi.png b/src/assets/images/pgi.png
index ae280190..363790e1 100644
Binary files a/src/assets/images/pgi.png and b/src/assets/images/pgi.png differ
diff --git a/src/assets/images/phone_in_talk.svg b/src/assets/images/phone_in_talk.svg
new file mode 100644
index 00000000..aa20dbd6
--- /dev/null
+++ b/src/assets/images/phone_in_talk.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.43 14.93C17.55 15.3 18.75 15.5 20 15.5C20.55 15.5 21 15.95 21 16.5V20C21 20.55 20.55 21 20 21C10.61 21 3 13.39 3 4C3 3.45 3.45 3 4 3H7.5C8.05 3 8.5 3.45 8.5 4C8.5 5.25 8.7 6.45 9.07 7.57C9.18 7.92 9.1 8.31 8.82 8.57L6.62 10.78C8.06 13.62 10.38 15.93 13.21 17.37L15.41 15.17C15.61 14.98 15.86 14.88 16.12 14.88C16.22 14.88 16.33 14.9 16.43 14.93ZM19 12H21C21 7.03 16.97 3 12 3V5C15.87 5 19 8.13 19 12ZM15 12H17C17 9.24 14.76 7 12 7V9C13.66 9 15 10.34 15 12ZM6.53 5C6.6 5.88 6.75 6.75 6.98 7.58L5.78 8.79C5.38 7.58 5.12 6.32 5.03 5H6.53ZM15.2002 18.2117C16.4002 18.6217 17.6802 18.8817 19.0002 18.9717V17.4617C18.1202 17.4017 17.2502 17.2517 16.4002 17.0117L15.2002 18.2117Z" fill="#4C30F5"/>
+</svg>
diff --git a/src/assets/images/pm-poshan-banner.png b/src/assets/images/pm-poshan-banner.png
new file mode 100644
index 00000000..4b848ff5
Binary files /dev/null and b/src/assets/images/pm-poshan-banner.png differ
diff --git a/src/assets/images/pm-shri-banner.png b/src/assets/images/pm-shri-banner.png
new file mode 100644
index 00000000..9771e1c3
Binary files /dev/null and b/src/assets/images/pm-shri-banner.png differ
diff --git a/src/assets/images/pm_shri.png b/src/assets/images/pm_shri.png
index 479c7d39..acada312 100644
Binary files a/src/assets/images/pm_shri.png and b/src/assets/images/pm_shri.png differ
diff --git a/src/assets/images/pmposhan.png b/src/assets/images/pmposhan.png
index c572137f..f1155584 100644
Binary files a/src/assets/images/pmposhan.png and b/src/assets/images/pmposhan.png differ
diff --git a/src/assets/images/prashast-banner.png b/src/assets/images/prashast-banner.png
new file mode 100644
index 00000000..b84050a1
Binary files /dev/null and b/src/assets/images/prashast-banner.png differ
diff --git a/src/assets/images/prashast.png b/src/assets/images/prashast.png
new file mode 100644
index 00000000..4643ab0c
Binary files /dev/null and b/src/assets/images/prashast.png differ
diff --git a/src/assets/images/udise-banner.png b/src/assets/images/udise-banner.png
new file mode 100644
index 00000000..1aef0794
Binary files /dev/null and b/src/assets/images/udise-banner.png differ
diff --git a/src/assets/images/udise.png b/src/assets/images/udise.png
index 02dccaf9..8b9c1d17 100644
Binary files a/src/assets/images/udise.png and b/src/assets/images/udise.png differ
diff --git a/src/assets/styles/_common.scss b/src/assets/styles/_common.scss
index 525c6213..9e4a8357 100644
--- a/src/assets/styles/_common.scss
+++ b/src/assets/styles/_common.scss
@@ -12,13 +12,16 @@
         color: #67bbe1;
     }
 }
-
+.download-button {
+    padding-right: 8% !important;
+}
 .custom-tab-group-wrapper {
     background-color: #f5f5f5 !important;
-    margin-top: 2rem !important;
-    border-radius: 2rem 0 0 2rem;
-    padding: 1.5rem !important;
+    margin-top: 1rem !important;
+    border-radius: 2rem;
+    padding:.5rem 1rem 1rem !important;
     row-gap: 1rem;
+	border: 5px solid #4C30F5;
 }
 
 .full-screen:fullscreen {
@@ -164,25 +167,35 @@
     color: var(--cQ-secondary) !important;
 }
 
-::ng-deep {
-    .ng-select.ng-select-focused .ng-select-container:after{
-        border-color: transparent;
-        border-width: 0px;
-    }
-        .ng-select .ng-select-container:after {
-        border-bottom : 0px solid rgba(0,0,0,0.42);
-    }
-}
-
 .program-title{
-    font-size: 28px;
-    font-weight: 800;
-    color: white;
+	font-family: "Lato", sans-serif;
+    font-size: 22px;
+    font-weight: 700;
+    color: #4C30F5;
+	line-height: 1.5;
+	display: flex;
+	align-items: center;
+	margin-bottom: 7px;
+	img{
+		margin-right: 10px;
+}
 }
+
 .program-desc{
-    color: white;
+	font-family: "Lato", sans-serif;
+    color: #434141;
     font-size: 16px;
     font-weight: 500;
+	line-height: 1.5;
+}
+
+h2.program-desc{
+	font-family: "Lato", sans-serif;
+	color: #4C30F5;
+	font-weight: 600;
+	font-size: 18px;
+	line-height: 1.5;
+	margin-left: 0rem !important;
 }
 
 .tab-desc{
@@ -191,3 +204,604 @@
     font-size: 14px;
     font-weight: 500;
 }
+
+.xmd\:text-sm {
+    font-size: 0.835rem !important;
+    line-height: 1.25rem;
+}
+
+@media (max-width:992px) {
+	.custom-tab-group-wrapper{
+		border-radius: 2rem;
+	}	
+}
+
+button.legend-range-reset.pull-right {
+    position: absolute;
+    top: 10px;
+    right: 20px;
+    color: #fff;
+}
+
+// theme-overriding 
+html[data-layout="cQubeDkR"] {
+	// overflow-x: hidden;
+	body {
+	  background:#ffffff !important;
+	  overflow-y: auto;
+	  overflow-x: hidden;
+	  position: relative;
+	  &:before {
+		content: "";
+		width: 29.56rem;
+		height: 20.18rem;
+		position: fixed;
+		right: 8rem;
+		opacity: 0.25;
+	  }
+	}
+	.app-nav-bar {
+	  height: 5.5rem;
+	  background: #fff !important;
+	  box-shadow: 0 4px 16px 0 rgba(0, 0, 0, 0.25);
+	  margin: 0;
+	  display: flex;
+	  align-items: center;
+	  left: 0;
+	  transition: all 0.3s;
+	  position: fixed;
+	  z-index: 99;
+	  top: 3rem;
+	}
+	.sidebaractive .app-nav-bar {
+	  left: 0;
+	}
+	.menu-item div {
+	  display: flex;
+	  align-items: center;
+	}
+  
+	.ncert_logo {
+	  height: 3.5rem;
+	  width: inherit;
+	}
+	.headerInnerContainer {
+	  align-items: center;
+	}
+  
+	.app-side-nav {
+	  margin-top:-1.1rem;
+	  height: calc(100vh - 7rem);
+	  background: #4C30F5 !important;
+	  box-shadow: none;
+	  width: 18rem;
+	  transition: all 0.3s;
+	  display: block;
+	  z-index: 8;
+	  ul {
+		// margin-left: 0.5rem;
+		// margin-right:1.5rem;
+		li {
+		  border-bottom: 0px solid #eee !important;
+		  height: 3rem;
+		  padding: 0.5rem !important;
+		  display: flex;
+		  align-items: center;
+		  padding: 1rem 0.5rem 1rem 0.5rem !important;
+		  height: 4rem;
+		  margin-bottom: 0.5rem;
+		  position: relative;
+		  i {
+			width: 3rem;
+			height: 3rem;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			border-radius: 50%;
+			margin-right: 0.5rem;
+			background: white;
+			min-width: 3rem;
+		  }
+		  div.btn {
+			color: #ffffff;
+		  }
+		  div.btn span {
+			font-family: "Outfit", sans-serif;
+			word-break: break-all;
+			font-size: 16px;
+			line-height: 21px;
+			font-weight: 500;
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			transition: all 0.3s;
+			letter-spacing:-0.1px;
+		  }
+		  &:hover,
+		  &.active,
+		  &.activeLink {
+			background-color: #FCFBFF;
+			border-radius: 0;
+			div.btn {
+			  color: #4C30F5;
+			}
+		  }
+		  &:hover .img,
+		  &.active .img,
+		  &.activeLink .img 
+		  {
+			box-shadow: 0 0 6px 0 rgba(76, 48, 245, 0.25);
+		  }
+		  
+		  div:first-child {
+			margin: 0;
+			padding: 0px;
+			font-size: 1rem;
+		  }
+		}
+	  }
+	}
+  
+	.sidebaractive .app-side-nav ul li {
+	  width: 4rem;
+	  height: 4rem;
+	  transition: all 0.3s;
+	  padding: 1rem 5.5rem 1rem 0.5rem !important;
+	  border-radius: 0;
+	  &.activeLink:before,
+	  &.activeLink:after {
+		display: none;
+	  }
+	  div span {
+		display: none;
+	  }
+	  i {
+		margin-right: 0;
+	  }
+	  &:hover:before,
+	  &:hover:after {
+		display: none;
+	  }
+	}
+	.headerSideWidth .logo {
+	  margin-right: 1rem;
+	  margin-left: 1.5rem;
+	}
+	#sidebarMenu {
+	  // transform: translateX(0); /*change here related your menu height*/
+	}
+  
+	.sidebarMenuInner {
+	  margin: 0;
+	  padding: 0;
+	  border-top: 1px solid rgba(255, 255, 255, 0.1);
+	}
+	input[type="checkbox"]:checked ~ #sidebarMenu {
+	  // transform: translateX(-18rem);
+	  // top:50px /*change here related your top menu height*/
+	  li div span {
+		display: none;
+	  }
+	}
+	input[type="checkbox"] {
+	  transition: all 0.3s;
+	  box-sizing: border-box;
+	  display: none;
+	}
+	.RespMenuIcon {
+	  height: 4.3rem;
+	  display: flex;
+	  align-items: center;
+	  justify-content: flex-start;
+	  padding-left: 1.25rem;
+	  .sidebarIconToggle {
+		transition: all 0.3s;
+		box-sizing: border-box;
+		cursor: pointer;
+		// position: absolute;
+		z-index: 99;
+		height: 1.375rem;
+		width: 1.375rem;
+	  }
+	}
+  
+	.spinner {
+	  transition: all 0.3s;
+	  box-sizing: border-box;
+	  position: absolute;
+	  height: 3px;
+	  width: 100%;
+	  background-color: #fff;
+	}
+	.horizontal {
+	  transition: all 0.3s;
+	  box-sizing: border-box;
+	  position: relative;
+	  float: left;
+	  margin-top: 3px;
+	  opacity: 0;
+	}
+	.diagonal.part-1 {
+	  position: relative;
+	  float: left;
+	  transition: all 0.3s;
+	  box-sizing: border-box;
+	  transform: rotate(135deg);
+	  margin-top: 8px;
+	}
+	.diagonal.part-2 {
+	  position: relative;
+	  float: left;
+	  transition: all 0.3s;
+	  box-sizing: border-box;
+	  transform: rotate(-135deg);
+	  margin-top: -9px;
+	}
+	input[type="checkbox"]:checked ~ .sidebarIconToggle > .horizontal {
+	  opacity: 1;
+	}
+	input[type="checkbox"]:checked ~ .sidebarIconToggle > .diagonal.part-1 {
+	  transform: rotate(180deg);
+	  margin-top: 3px;
+	}
+	input[type="checkbox"]:checked ~ .sidebarIconToggle > .diagonal.part-2 {
+	  transform: rotate(0deg);
+	  margin-top: 3px;
+	}
+  
+	//  @media screen and (max-width: 950px) {
+	//       .sidebarIconToggle{
+	//           display:block
+	//        }
+	//     }
+  
+	/* footer */
+	app-footer .app-footer-bar {
+	  background: none;
+	  .container {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		div {
+		  font-size: 0.75rem;
+		}
+	  }
+	}
+	h1.leading-tight,
+	.metric-card-wrapper .h4 {
+	  color: var(--white) !important;
+	  font-size: 1.25rem;
+	  font-weight: bold;
+	}
+	.metric-card-wrapper > div {
+	  background: none;
+	  padding-left: 0rem;
+	  padding-right: 1.5rem;
+	  border-radius: 1.5rem 0 0 1.5rem;
+	}
+	.app-content-wrapper {
+	  margin-top: 8rem;
+	  padding-top: 0;
+	  padding-left: 20rem !important;
+	  padding-right: 1.5rem;
+	  transition: all 0.3s;
+	  //   background: linear-gradient(90deg, var(--cQ-theme-bg) 30%, var(--cQ-theme-bg-shade) 126.6%) !important;
+	  position: relative;
+	  z-index: 1;
+	}
+	.active:focus {
+	  background-color: transparent !important;
+	  color: var(--cQ-primary) !important;
+	}
+	.app-content-wrapper .app-content {
+	  padding: 0.5rem 0 1rem 0rem !important;
+	  p.h3 {
+		margin-bottom: 1rem !important;
+		font-size: 1.25rem;
+		color: var(--white);
+	  }
+	  .dashboard {
+		background: none;
+		border-radius: 2rem 0 0 2rem;
+		padding-right: 1.5rem;
+		row-gap: 1rem;
+	  }
+	}
+  
+	.infoIcon {
+	  cursor: pointer;
+	}
+	.sidebaractive .app-side-nav {
+	  width: 6rem;
+	}
+	.sidebaractive .app-content-wrapper {
+	  padding-left: 7.5rem !important;
+	}
+  
+	.metric-card-wrapper,
+	.tab-group-wrapper {
+	  background: none !important;
+	  padding: 0 !important;
+	}
+	.tab-group-wrapper {
+	  margin-top: 2rem !important;
+	  background: #f5f5f5 !important;
+	  border-radius: 2rem 0 0 2rem;
+	  padding: 1.5rem !important;
+	  row-gap: 1rem;
+	}
+	.mat-tab-body-wrapper {
+	  border-radius: 1rem;
+	  overflow: hidden;
+	  background: var(--white);
+	}
+	.mat-tab-label-container .mat-tab-list {
+	  padding-left: 1rem;
+	}
+	.mat-tab-label {
+	  font-size: 1rem;
+	}
+	/** library css */
+	/* grid */
+	.sb-cQ-grid {
+	  display: flex;
+	  gap: 1rem;
+	  padding: 2rem 1rem;
+	  overflow-x: auto;
+	  &--2 {
+		flex-wrap: wrap;
+		overflow-x: unset;
+		display: grid;
+		grid-template-columns: repeat(auto-fit, minmax(20rem, 1fr));
+	  }
+	}
+	/* sb cq card */
+  
+	.sb-cQ-card {
+	  // width:9.25rem;
+	  min-width: 9.25rem;
+	  height: 9.25rem;
+	  padding: 1.5rem;
+	  background: var(--cQcard-bg);
+	  border-radius: 1.5rem;
+	  border: 0.0625rem solid var(--cQcard-border);
+	  box-shadow: none; //-10px 10px 40px var(--cQcard-boxshadow);
+	  position: relative;
+	  display: flex;
+	  align-items: center;
+	  justify-content: center;
+	  text-align: center;
+	  &__info {
+		width: 1.25rem;
+		height: 1.25rem;
+		position: absolute;
+		right: 1rem;
+		top: 1rem;
+		img {
+		  width: 100%;
+		}
+	  }
+	  &__data {
+		display: flex;
+		flex-direction: column;
+		span.Value {
+		  font-size: 1.5rem;
+		  font-weight: bold;
+		  color: var(--cQ-secondary) !important;
+		}
+		span.Title {
+		  color: var(--cQ-gray555);
+		  font-size: 1rem;
+		  line-height: normal;
+		}
+	  }
+	}
+  
+	.sb-cQ-card_2 {
+	  min-width: 21.75rem;
+	  max-width: 100%;
+	  height: 17.625rem;
+	  display: flex;
+	  flex-direction: column;
+	  justify-content: space-between;
+	  overflow: inherit;
+	  min-width: 13.75rem !important;
+	  &:hover {
+		background: var(--white) !important;
+	  }
+	  .brand {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		width: 100%;
+		.title {
+		  color: var(--cQ-gray);
+		  font-size: 1.25rem;
+		  text-align: left;
+		  word-break: break-word;
+		  margin-right: 0.5rem;
+		  display: -webkit-box;
+		  -webkit-line-clamp: 2;
+		  -webkit-box-orient: vertical;
+		  overflow: hidden;
+		}
+		.logo {
+		  width: 4.5rem;
+		  height: 4.5rem;
+		  display: flex;
+		  align-items: center;
+		  justify-content: center;
+		  img {
+			max-width: 100%;
+		  }
+		}
+	  }
+	  .dataContainer {
+		display: flex;
+		align-items: center;
+		gap: 1rem;
+		width: 100%;
+		div {
+		  display: flex;
+		  align-items: center;
+		  flex-direction: column;
+		  flex: 50%;
+		}
+	  }
+	  button {
+		border: 0.0625rem solid var(--cQcard-btn-border);
+		padding: 0rem !important;
+		border-radius: 1.5rem;
+		width: 100%;
+		font-size: 1rem;
+		background: var(--cQcard-bg);
+		cursor: pointer;
+		min-height: 3rem;
+		color: var(--cQcard-contrast);
+		&:hover {
+		  background: var(--cQ-primary);
+		  color: var(--cQ-primary-contrast);
+		}
+	  }
+	  // &:nth-child(1) {
+	  //   background-color:#81aef9;
+	  // }
+	  // &:nth-child(2) {
+	  //   background-color:#cdedc2;
+	  // }
+	}
+  
+	/* cQ Grid */
+	.cQ-Grid {
+	  grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr));
+	}
+  
+	.mat-tab-labels .mat-tab-label-active {
+	  background: none;
+	  color: var(--cQ-secondary);
+	  border-bottom: 3px solid var(--cQ-secondary) !important;
+	  border-radius: 0 !important;
+	  border: 0;
+	}
+	.mat-tab-label {
+	  border: 0;
+	}
+	.mat-tab-label .mat-tab-label-content {
+	  color: var(--cQ-gray);
+	}
+	.mat-tab-labels .mat-tab-label-active .mat-tab-label-content {
+	  color: var(--cQ-secondary);
+	}
+  
+	.app-nav-bar .md\:container.h-full {
+	  max-width: 100%;
+	  padding: 0 2rem;
+	}
+  
+	@media (max-width: 992px) {
+	  .sidebaractive .app-content-wrapper {
+		padding-left: 0rem !important;
+	  }
+	  .sb-cQ-card_2,
+	  .sb-cQ-card {
+		min-width: auto;
+	  }
+	  .app-content-wrapper {
+		padding-left: 0rem !important;
+	  }
+  
+	  .sidebaractive input[type="checkbox"]:checked ~ #sidebarMenu li div span {
+		display: block;
+	  }
+	  .sidebaractive
+		input[type="checkbox"]:checked
+		~ .sidebarIconToggle
+		> .horizontal {
+		opacity: 0;
+	  }
+	  .horizontal {
+		opacity: 1;
+	  }
+	  .diagonal.part-1 {
+		transform: rotate(0deg);
+	  }
+	  .diagonal.part-2 {
+		transform: rotate(180deg);
+		margin-top: -15px;
+	  }
+	  .sidebaractive
+		input[type="checkbox"]:checked
+		~ .sidebarIconToggle
+		> .diagonal.part-1 {
+		transform: rotate(-135deg);
+		margin-top: 6px;
+	  }
+	  .sidebaractive
+		input[type="checkbox"]:checked
+		~ .sidebarIconToggle
+		> .diagonal.part-2 {
+		transform: rotate(-45deg);
+		margin-top: -9px;
+	  }
+	  .app-content-wrapper {
+		padding-left: 1rem !important;
+		padding-right: 1rem !important;
+		margin-top: 1rem;
+	  }
+	  .mainHeaderContent h1.leading-tight {
+		display: none;
+	  }
+	  .app-nav-bar {
+		left: 0rem;
+		position: static;
+	  }
+	  .app-side-nav {
+		width: 6rem;
+		margin-top: 0;
+		height: auto;
+		top: 0;
+		.menu {
+		  display: none;
+		}
+	  }
+  
+	  .sidebaractive {
+		.app-content-wrapper {
+		  padding-left: 1rem !important;
+		}
+		.app-nav-bar {
+		  left: 0rem;
+		  position: static;
+		}
+		.app-side-nav {
+		  width: 90%;
+		  height: 100%;
+		  margin-top: 0px;
+		  padding-right: 0rem;
+		  .menu {
+			display: block;
+		  }
+		}
+		.app-side-nav ul li div span {
+		  display: block;
+		  margin-left: 0.5rem;
+		}
+		.app-side-nav ul li {
+		  border-radius: 0rem;
+		  width: 100%;
+		  height: 4rem;
+		  transition: all 0.3s;
+		}
+	  }
+	}
+	@media (max-width:479px) {
+		.app-side-nav {
+			width: 4rem;
+		}
+	}
+  }
+
+  
+
+
diff --git a/src/assets/styles/_layout.scss b/src/assets/styles/_layout.scss
index 3e060dac..2561a9d1 100644
--- a/src/assets/styles/_layout.scss
+++ b/src/assets/styles/_layout.scss
@@ -3,10 +3,18 @@
     box-shadow: 0 1px 3px #aaa;
     position: fixed;
     width: 100%;
-    top: 2.8rem !important;
+    top: 3rem !important;
     z-index: 2;
 }
 
+.program-banner-wrapper{
+	margin-bottom: 10px;
+	img{
+		width: 100%;
+		border-radius: 5px;
+	}
+}
+
 @media(max-width: 400px) {
     .app-nav-bar{
         
@@ -64,32 +72,27 @@
     max-height: 90%;
 }
 
-// .row-wrapper {
-//     flex-grow: 1;
-//     min-height: 45rem;
-//     // max-height: 50%;
-// }
 
 .bignumber-container {
-    box-shadow: 0px 7.16865px 19.7138px rgba(0, 0, 0, 0.16);
     border-radius: 10px;
     margin: 10px;
-    
     display: flex;
     // justify-content: center;
     flex-direction: column;
-    background: #fff;
+    background: #FCFBFF;
+    border: 1px solid #4C30F5;
+    box-shadow: 6px 6px 3px 0px rgba(0, 0, 0, 0.3);
+ 
 }
 
 .div-shadow{
-    box-shadow: 0px 7.16865px 19.7138px rgba(0, 0, 0, 0.16);
     border-radius: 10px;
     margin: 10px;
     min-height: 23rem;
     display: flex;
     justify-content: center;
     flex-direction: column;
-    background: #fff;
+    background: #FCFBFF;
 }
 
 .dropdown {
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 5970117a..4d01e8b9 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -7,6 +7,7 @@ export const environment = {
   google_analytics_tracking_id: "UA-260554959-3",
   // apiURL: 'https://qr.staging.cqube.samagra.io',
   apiURL: 'http://localhost:3008',
+  // 'apiURL': 'https://vidyaskendra.diksha.gov.in/api/queryBuilder',
   stateCode: "NA",
   numberFormat: {
     reports: {
diff --git a/src/index.html b/src/index.html
index cfc68076..7cd7aed1 100644
--- a/src/index.html
+++ b/src/index.html
@@ -3,15 +3,19 @@
 
 <head>
   <meta charset="utf-8">
-  <title>cQube</title>
+  <title>NVSK</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="/assets/images/icon.ico">
   <link rel="preconnect" href="https://fonts.gstatic.com">
   <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap" rel="stylesheet">
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-
+  <link href="https://fonts.googleapis.com/css2?family=Outfit:wght@100;300;400;500;600;700&display=swap" rel="stylesheet">
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+  <link rel="preconnect" href="https://fonts.googleapis.com">
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+  <link href="https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&display=swap" rel="stylesheet">
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script>
 
 </head>
 
diff --git a/src/styles.scss b/src/styles.scss
index 03330a0b..b47e3e84 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -5,7 +5,23 @@
 
 @import "~@ng-select/ng-select/themes/material.theme.css";
 @import './assets/styles/styles.scss';
-@import '~@project-sunbird/sb-themes/themes/theme-cqube.scss';
+// @import '~@project-sunbird/sb-themes/themes/theme-cqube.scss';
+
+.app-side-nav::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 .375rem rgba(0,0,0,.3);
+    background-color: #c8d3eb
+}
+
+.app-side-nav::-webkit-scrollbar {
+    width: 0rem;
+    background-color: #c8d3eb
+}
+
+.app-side-nav::-webkit-scrollbar-thumb {
+    background-color: #c8d3eb;
+    border: .125rem solid #c8d3eb
+}
+
 
 html,
 body {
@@ -25,9 +41,11 @@ body {
 // }
 html body {
     background: url('assets/images/background.png') !important;
+	background: none !important;
     background-position: center !important;
     background-repeat: no-repeat !important;
     background-size: cover !important;
+	background-color: #FFFFFF !important;
 }
 
 .button-grp,
@@ -213,6 +231,14 @@ html body {
     }
 }
 
+.app-side-nav::-webkit-scrollbar {
+	width: 5px;
+}
+
+.app-side-nav{
+	overflow-x: hidden;
+}
+
 #footer {
     width: 100%;
     font-size: 13px;
@@ -388,4 +414,41 @@ html body {
 
 .sidebaractive .footer{
     width: calc(100vw - #{$app-side-nav-width} + 6rem) !important;
-}
\ No newline at end of file
+}
+.container {
+	max-width: 1400;
+	margin: 0 auto;
+	padding: 0 15px;
+}
+@media(max-width: 1400px) {
+    .container {
+		max-width: 1199px;
+		margin: 0 auto;
+	}
+}
+@media(max-width: 1200px) {
+    .container {
+		max-width: 992px;
+		margin: 0 auto;
+	}
+}
+@media(max-width: 992px) {
+    .container {
+		max-width: 768px;
+		margin: 0 auto;
+	}
+}
+@media(max-width: 768px) {
+    .container {
+		max-width: 100% !important;
+		margin: 0 auto;
+		padding: 0 15px !important;
+	}
+}
+@media(max-width: 576px) {
+    .container {
+		max-width: 100% !important;
+		margin: 0 auto;
+		padding: 0 15px !important;
+	}
+}