diff --git a/.github/workflows/build-6.0.0-image.yml b/.github/workflows/build-6.0.0-image.yml
new file mode 100644
index 000000000..89ca269e9
--- /dev/null
+++ b/.github/workflows/build-6.0.0-image.yml
@@ -0,0 +1,45 @@
+name: Build Docker 6.0.0 image
+
+on:
+  push:
+    branches: [ ui ]
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v6
+        with:
+          ref: 'ui'
+
+      - name: Retrieve Repomanager version
+        run: |
+          echo "VERSION=$(cat ${GITHUB_WORKSPACE}/www/version)" >> $GITHUB_ENV
+          echo "Version: ${{ env.VERSION }}"
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the container registry
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
+      # Build the images
+      - name: Build and push docker
+        uses: docker/build-push-action@v6
+        with:
+          file: Dockerfile
+          push: true
+          tags: lbr38/repomanager:6.0.0-beta
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/.github/workflows/test-database-update.yml b/.github/workflows/test-database-update.yml
index 0b187807a..527cda5a5 100644
--- a/.github/workflows/test-database-update.yml
+++ b/.github/workflows/test-database-update.yml
@@ -1,4 +1,6 @@
-name: Database update tests
+# TODO debug
+# Crash en boucle - à corriger une fois 6.0.0 mergé dans devel
+# name: Database update tests
 
 on:
   push:
@@ -91,7 +93,9 @@ jobs:
 
           cd ${GITHUB_WORKSPACE}
 
-          sed -i 's/branch:.*/branch: devel/g' docker-compose.yml
+          # TODO debug
+          # sed -i 's/branch:.*/branch: devel/g' docker-compose.yml
+          sed -i 's/branch:.*/branch: ui/g' docker-compose.yml
           sed -i 's/FQDN:.*/FQDN: repomanager.test.com/g' docker-compose.yml
 
           docker-compose -f docker-compose.yml up -d
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 000000000..dfa4cd630
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,7 @@
+## Approach
+- Read existing files before writing. Don't re-read unless changed.
+- Thorough in reasoning, concise in output.
+- Skip files over 100KB unless required.
+- No sycophantic openers or closing fluff.
+- No emojis or em-dashes.
+- Do not guess APIs, versions, flags, commit SHAs, or package names. Verify by reading code or docs before asserting.
\ No newline at end of file
diff --git a/docker-compose-dev-6.0.0.yml b/docker-compose-dev-6.0.0.yml
new file mode 100644
index 000000000..64165c77e
--- /dev/null
+++ b/docker-compose-dev-6.0.0.yml
@@ -0,0 +1,27 @@
+---
+# TODO debug
+# For my dev environment only
+version: "3"
+services:
+  repomanager:
+    container_name: repomanager-dev-600
+    image: repomanager
+    network_mode: host
+    environment:
+      FQDN: repomanager-dev-600.localhost
+      MAX_UPLOAD_SIZE: 64M
+      NGINX_LISTEN_PORT: 7777
+      PUID: 1000
+      PGID: 1000
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        branch: ui
+    restart: unless-stopped
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - /var/lib/docker/volumes/repomanager-dev-600-logs:/var/log/nginx
+      - /var/lib/docker/volumes/repomanager-dev-600-www:/var/www/repomanager
+      - /var/lib/docker/volumes/repomanager-dev-600-data:/var/lib/repomanager
+      - /var/lib/docker/volumes/repomanager-dev-600-repo:/home/repo
diff --git a/docker/config/nginx/repomanager.conf b/docker/config/nginx/repomanager.conf
index 9e910ce86..268db58f9 100644
--- a/docker/config/nginx/repomanager.conf
+++ b/docker/config/nginx/repomanager.conf
@@ -121,8 +121,12 @@ server {
         access_log off;
     }
 
-    location /repo {
-        alias $REPOS_DIR;
+    # Matches /repo/ and /repo/xxx but not /repository
+    location ^~ /repo/ {
+        # Final slash is important, otherwise it could break the download of packages
+        alias $REPOS_DIR/;
+
+        # Uncomment the following lines to enable directory listing (autoindex) for repositories
         # autoindex on;
         # autoindex_exact_size off;
         # autoindex_localtime on;
diff --git a/www/bin/repomanager b/www/bin/repomanager
index cc7778301..91fbf4a16 100755
--- a/www/bin/repomanager
+++ b/www/bin/repomanager
@@ -92,9 +92,10 @@ echo '
  |  | \|  ___/|  |_> )  (_) )  Y Y  \/ __ \|   |  \/ __ \/ /_/  >  ___/|  | \/
  |__|   \___  >   __/ \____/|__|_|  (____  /___|  (____  |___  / \___  >__|
             \/|__|                \/     \/     \/     \/_____/      \/
-           
 '
 
+echo -e "Version $(cat $WWW_DIR/version)\n"
+
 while [ $# -ge 1 ];do
     case "$1" in
         --help|-help|-h)
diff --git a/www/config/tasks/create.php b/www/config/tasks/create.php
index c541837c7..cc0894345 100644
--- a/www/config/tasks/create.php
+++ b/www/config/tasks/create.php
@@ -18,6 +18,7 @@
         'env',
         'group',
         'description',
+        'tags',
         'advanced-params' // Advanced params include package include/exclude and metadata custom fields, it is optional
     ],
 
diff --git a/www/config/tasks/duplicate.php b/www/config/tasks/duplicate.php
index 7e0bb3690..76dca44c5 100644
--- a/www/config/tasks/duplicate.php
+++ b/www/config/tasks/duplicate.php
@@ -19,6 +19,7 @@
         'env',
         'group',
         'description',
+        'tags'
     ],
 
     // Conditional params must be compared with form values
diff --git a/www/config/tasks/env.php b/www/config/tasks/env.php
index 7f0fdce96..61ac71f5f 100644
--- a/www/config/tasks/env.php
+++ b/www/config/tasks/env.php
@@ -24,5 +24,10 @@
 // Form configuration
 $formConfig = [
     // Allowed schedule types for this task
-    'allowed-schedule-types' => ['unique']
+    // Recurring is only allowed when the task targets a dynamic set of repositories,
+    // as pointing an environment on a fixed snapshot repeatedly makes no sense
+    'allowed-schedule-types' => ['unique'],
+
+    // This task can target a dynamic set of repositories (all latest snapshots matching filters)
+    'allow-dynamic-target' => true
 ];
diff --git a/www/config/tasks/rebuild.php b/www/config/tasks/rebuild.php
index 2859ca75c..ddeb035ec 100644
--- a/www/config/tasks/rebuild.php
+++ b/www/config/tasks/rebuild.php
@@ -16,5 +16,8 @@
 // Form configuration
 $formConfig = [
     // Allowed schedule types for this task
-    'allowed-schedule-types' => ['unique', 'recurring']
+    'allowed-schedule-types' => ['unique', 'recurring'],
+
+    // This task can target a dynamic set of repositories (all latest snapshots matching filters)
+    'allow-dynamic-target' => true
 ];
diff --git a/www/config/tasks/rename.php b/www/config/tasks/rename.php
index d09a29e90..121368a7a 100644
--- a/www/config/tasks/rename.php
+++ b/www/config/tasks/rename.php
@@ -3,14 +3,13 @@
 $taskConfig = [
     'description' => 'Rename repository',
 
-    // Retrieve repository info from snap id
-    'retrieve-repo-from-snap-id' => true,
+    // Retrieve repository info from repo id
+    'retrieve-repo-from-repo-id' => true,
 
     // Required params
     'required-params' => [
         'name',
-        'snap-id',
-        'gpg-sign' // Required to make sure deb metadata is regenerated correctly
+        'repo-id'
     ],
 
     // Conditional params must be compared with form values
diff --git a/www/config/tasks/update.php b/www/config/tasks/update.php
index 9f7018162..c1bda04f2 100644
--- a/www/config/tasks/update.php
+++ b/www/config/tasks/update.php
@@ -46,5 +46,8 @@
 // Form configuration
 $formConfig = [
     // Allowed schedule types for this task
-    'allowed-schedule-types' => ['unique', 'recurring']
+    'allowed-schedule-types' => ['unique', 'recurring'],
+
+    // This task can target a dynamic set of repositories (all latest snapshots matching filters)
+    'allow-dynamic-target' => true
 ];
diff --git a/www/controllers/App/Config/Env.php b/www/controllers/App/Config/Env.php
index f58cec2ab..c997e8fad 100644
--- a/www/controllers/App/Config/Env.php
+++ b/www/controllers/App/Config/Env.php
@@ -2,33 +2,25 @@
 
 namespace Controllers\App\Config;
 
-use Exception;
+use Controllers\Environment;
 
 class Env
 {
     /**
      *  Load environments
      */
-    public static function get()
+    public static function get(): void
     {
-        $myenv = new \Controllers\Environment();
+        $envController = new Environment();
 
         if (!defined('ENVS')) {
-            define('ENVS', $myenv->listAll());
-        }
-        if (!defined('ENVS_TOTAL')) {
-            define('ENVS_TOTAL', $myenv->total());
+            define('ENVS', $envController->listAll());
         }
         if (!defined('DEFAULT_ENV')) {
-            define('DEFAULT_ENV', $myenv->default());
-        }
-        if (!defined('LAST_ENV')) {
-            define('LAST_ENV', $myenv->last());
+            define('DEFAULT_ENV', $envController->default());
         }
 
-        /**
-         *  If there is no environment configured then __LOAD_ERROR_EMPTY_ENVS = 1
-         */
+        // If there is no environment configured then __LOAD_ERROR_EMPTY_ENVS = 1
         if (empty(ENVS)) {
             if (!defined('__LOAD_ERROR_EMPTY_ENVS')) {
                 define('__LOAD_ERROR_EMPTY_ENVS', 1);
@@ -39,6 +31,6 @@ public static function get()
             }
         }
 
-        unset($myenv);
+        unset($envController);
     }
 }
diff --git a/www/controllers/App/Main.php b/www/controllers/App/Main.php
index 7a4aa99ca..a950fd8e9 100644
--- a/www/controllers/App/Main.php
+++ b/www/controllers/App/Main.php
@@ -89,7 +89,7 @@ public function __construct(string $level = 'all')
 
         // Errors related to the loading of the environments
         if (defined('__LOAD_ERROR_EMPTY_ENVS') && __LOAD_ERROR_EMPTY_ENVS > 0) {
-            $__LOAD_ERROR_MESSAGES[] = '<b>You must at least configure 1 environment.</b>';
+            $__LOAD_ERROR_MESSAGES[] = '<b>You should at least configure one environment.</b>';
             $__LOAD_GENERAL_ERROR++;
         }
 
diff --git a/www/controllers/App/Permissions.php b/www/controllers/App/Permissions.php
index d1f7e1a4e..9b754cd5c 100644
--- a/www/controllers/App/Permissions.php
+++ b/www/controllers/App/Permissions.php
@@ -12,7 +12,7 @@ class Permissions
     public static function load()
     {
         $userController = new \Controllers\User\User();
-        $userPermissionController = new \Controllers\User\Permission();
+        $userPermissionController = new \Controllers\User\Permission\Permission();
         $isAdmin = false;
         $isSuperAdmin = false;
 
diff --git a/www/controllers/Environment.php b/www/controllers/Environment.php
index 43da91a80..a2ec2513d 100644
--- a/www/controllers/Environment.php
+++ b/www/controllers/Environment.php
@@ -59,7 +59,7 @@ public function add(string $name, string $color) : void
          *  Check if environment already exists
          */
         if ($this->exists($name)) {
-            throw new Exception('Environment <b>' . $name . '</b> already exists');
+            throw new Exception('Environment ' . $name . ' already exists');
         }
 
         /**
@@ -72,7 +72,7 @@ public function add(string $name, string $color) : void
         /**
          *  Add env to database
          */
-        $this->model->add($name, $color);
+        $this->model->add($name, $color, 'false');
     }
 
     /**
@@ -106,17 +106,14 @@ public function edit(array $envs) : void
             throw new Exception('You are not allowed to perform this action');
         }
 
-        /**
-         *  Delete all envs from database before inserting the new ones
-         */
+        // Delete all envs from database before inserting the new ones
         $this->model->deleteAll();
 
-        /**
-         *  Check if all specified envs are valid then add them to $envsToInsert array
-         */
+        // Check that all specified env values are valid
         foreach ($envs as $env) {
             $name = Validate::string($env['name']);
             $color = Validate::string($env['color']);
+            $protected = Validate::string($env['protected']);
 
             if (empty($name)) {
                 throw new Exception('Environment name is empty');
@@ -126,30 +123,54 @@ public function edit(array $envs) : void
                 throw new Exception('Environment color is empty');
             }
 
+            if (!in_array($protected, ['true', 'false'])) {
+                throw new Exception('Environment protected value is invalid');
+            }
+
             if (!Validate::alphaNumericHyphen($name)) {
-                throw new Exception('Environment <b>' . $name . '</b> contains invalid characters');
+                throw new Exception('Environment ' . $name . ' contains invalid characters');
             }
 
             if ($this->exists($name)) {
-                throw new Exception('Environment <b>' . $name . '</b> already exists');
+                throw new Exception('Environment ' . $name . ' already exists');
             }
 
-            $this->model->add($name, $color);
+            $this->model->add($name, $color, $protected);
         }
     }
 
     /**
      *  Return all environments list
      */
-    public function listAll()
+    public function listAll(): array
     {
         return $this->model->listAll();
     }
 
+    /**
+     *  Return the list of protected environments
+     */
+    public function getProtected(): array
+    {
+        return $this->model->getProtected();
+    }
+
+    /**
+     *  Return true if the environment is protected
+     */
+    public function isProtected(string $name): bool
+    {
+        if (in_array($name, $this->getProtected())) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      *  Return default environment
      */
-    public function default()
+    public function default(): string
     {
         return $this->model->default();
     }
diff --git a/www/controllers/Group/Group.php b/www/controllers/Group/Group.php
index 212ae4752..643b68d83 100644
--- a/www/controllers/Group/Group.php
+++ b/www/controllers/Group/Group.php
@@ -206,6 +206,14 @@ public function getReposMembers(int $id): array
         return $this->model->getReposMembers($id);
     }
 
+    /**
+     *  Return the list of group Ids the specified repo is member of
+     */
+    public function getRepoGroupsIds(int $repoId): array
+    {
+        return $this->model->getRepoGroupsIds($repoId);
+    }
+
     /**
      *  Return the list of repos not in any group
      */
diff --git a/www/controllers/Host/Host.php b/www/controllers/Host/Host.php
index 1c51ceef9..42c2dbc5f 100644
--- a/www/controllers/Host/Host.php
+++ b/www/controllers/Host/Host.php
@@ -89,13 +89,14 @@ public function getSettings(): array
     /**
      *  Edit the display settings on the hosts page
      */
-    public function setSettings(int $complianceThresholdCount, int $complianceThresholdDays, int $complianceRebootRequired): void
+    public function setSettings(int $complianceThresholdCount, int $complianceThresholdDays, int $complianceSecurityUpdate, int $complianceRebootRequired): void
     {
         if (!HostPermission::allowedAction('edit-settings')) {
             throw new Exception('You are not allowed to perform this action');
         }
 
-        if (!is_numeric($complianceThresholdCount) or !is_numeric($complianceThresholdDays) or !is_numeric($complianceRebootRequired)) {
+        // Settings must be numeric
+        if (!is_numeric($complianceThresholdCount) or !is_numeric($complianceThresholdDays) or !is_numeric($complianceSecurityUpdate) or !is_numeric($complianceRebootRequired)) {
             throw new Exception('Setting must be numeric');
         }
 
@@ -104,11 +105,15 @@ public function setSettings(int $complianceThresholdCount, int $complianceThresh
             throw new Exception('Value must be greater than 0');
         }
 
+        if ($complianceSecurityUpdate !== 0 and $complianceSecurityUpdate !== 1) {
+            throw new Exception('Invalid value for compliance security update setting');
+        }
+
         if ($complianceRebootRequired !== 0 and $complianceRebootRequired !== 1) {
             throw new Exception('Invalid value for compliance reboot required setting');
         }
 
-        $this->model->setSettings($complianceThresholdCount, $complianceThresholdDays, $complianceRebootRequired);
+        $this->model->setSettings($complianceThresholdCount, $complianceThresholdDays, $complianceSecurityUpdate, $complianceRebootRequired);
     }
 
     /**
@@ -233,11 +238,21 @@ public function getCompliance(int $hostId): array
         $host = $this->get($hostId);
         $settings = $this->getSettings();
 
+        $securityUpdate = false;
         $compliant = true;
         $reason = '';
 
         // Retrieve the total number of available packages
-        $available = count($hostPackageController->getAvailable());
+        $available = $hostPackageController->getAvailable();
+        $availableCount = count($available);
+
+        // Check if there is at least one security update available in the list of available packages ('security' field is set to true)
+        foreach ($available as $package) {
+            if (!empty($package['Security']) and $package['Security'] == 'true') {
+                $securityUpdate = true;
+                break;
+            }
+        }
 
         // Retrieve the date of the last package upgrade event
         $latestUpdate = $hostPackageEventController->getLastPackageUpgradeEvent()['Date'] ?? null;
@@ -246,11 +261,12 @@ public function getCompliance(int $hostId): array
         $thresholdDate = strtotime('-' . $settings['compliance_threshold_days'] . ' days');
 
         // The host is not compliant if the available updates count is >= threshold
-        if ($available >= $settings['compliance_threshold_count']) {
+        if ($availableCount >= $settings['compliance_threshold_count']) {
             $compliant = false;
-            $reason = 'Pending updates count (' . $available . ') is greater than or equal to the threshold (' . $settings['compliance_threshold_count'] . ')';
+            $reason = 'Pending updates count (' . $availableCount . ') is greater than or equal to the threshold (' . $settings['compliance_threshold_count'] . ')';
         }
 
+        // The host is not compliant if no package update has been performed yet
         if (!$latestUpdate) {
             $compliant = false;
             $reason = 'No package update has been performed yet';
@@ -262,6 +278,12 @@ public function getCompliance(int $hostId): array
             $reason = 'Latest update date (' . $latestUpdate . ') is older than the compliance threshold (' . $settings['compliance_threshold_days'] . ' days)';
         }
 
+        // Optional rule: host is not compliant when there is a security update available
+        if ((int) $settings['compliance_security_update'] === 1 and $securityUpdate) {
+            $compliant = false;
+            $reason = 'Host has a security update available';
+        }
+
         // Optional rule: host is not compliant when a reboot is required
         $rebootRequired = $host['Reboot_required'] ?? 'false';
         if ((int) $settings['compliance_reboot_required'] === 1 and ($rebootRequired === 'true')) {
@@ -272,8 +294,9 @@ public function getCompliance(int $hostId): array
         return [
             'compliant' => $compliant,
             'reason' => $reason,
-            'available_updates_count' => $available,
+            'available_updates_count' => $availableCount,
             'latest_update' => $latestUpdate,
+            'security_update' => $securityUpdate,
             'reboot_required' => $rebootRequired
         ];
     }
diff --git a/www/controllers/Host/Package/Package.php b/www/controllers/Host/Package/Package.php
index 975420120..826d58e50 100644
--- a/www/controllers/Host/Package/Package.php
+++ b/www/controllers/Host/Package/Package.php
@@ -50,10 +50,19 @@ private function getPackageState(string $packageName, string|null $packageVersio
 
     /**
      *  Return the list of inventoried packages on the host
+     *  Supports optional pagination and search filter
      */
-    public function getInventory() : array
+    public function getInventory(string $search = '', bool $withOffset = false, int $offset = 0) : array
     {
-        return $this->model->getInventory();
+        return $this->model->getInventory($search, $withOffset, $offset);
+    }
+
+    /**
+     *  Return the total count of inventoried packages, optionally filtered
+     */
+    public function countInventory(string $search = ''): int
+    {
+        return $this->model->countInventory($search);
     }
 
     /**
@@ -143,17 +152,17 @@ private function addPackage(string $name, string $version, string $state, string
     /**
      *  Add a package in the table available packages list
      */
-    private function addPackageAvailable(string $name, string $version, string $repository) : void
+    private function addPackageAvailable(string $name, string $version, string $security, string $repository) : void
     {
-        $this->model->addPackageAvailable($name, $version, $repository);
+        $this->model->addPackageAvailable($name, $version, $security, $repository);
     }
 
     /**
      *  Update a package in the available packages list
      */
-    private function updatePackageAvailable(string $name, string $version, string $repository) : void
+    private function updatePackageAvailable(string $name, string $version, string $security, string $repository) : void
     {
-        $this->model->updatePackageAvailable($name, $version, $repository);
+        $this->model->updatePackageAvailable($name, $version, $security, $repository);
     }
 
     /**
@@ -341,14 +350,14 @@ public function setPackagesAvailable(array $packages) : void
 
             // If the package does not exist in available packages list, add it
             if (!$this->packageAvailableExists($package['name'])) {
-                $this->addPackageAvailable($package['name'], $package['version'], $package['repository']);
+                $this->addPackageAvailable($package['name'], $package['version'], $package['security'], $package['repository']);
                 continue;
             }
 
             // If it exists in the database, also check the version present in the database
             // If the version in the database is different then we update the package in the database, otherwise we do nothing
             if ($this->packageVersionAvailableExists($package['name'], $package['version'])) {
-                $this->updatePackageAvailable($package['name'], $package['version'], $package['repository']);
+                $this->updatePackageAvailable($package['name'], $package['version'], $package['security'], $package['repository']);
             }
         }
     }
diff --git a/www/controllers/Layout/Chart/vars/repo-accesses-chart.vars.inc.php b/www/controllers/Layout/Chart/vars/repo-accesses-chart.vars.inc.php
index 778fea038..060397059 100644
--- a/www/controllers/Layout/Chart/vars/repo-accesses-chart.vars.inc.php
+++ b/www/controllers/Layout/Chart/vars/repo-accesses-chart.vars.inc.php
@@ -12,12 +12,12 @@
 $envData = [];
 
 // Check that repository Id is specified
-if (empty(__ACTUAL_URI__[3])) {
+if (empty(__ACTUAL_URI__[2])) {
     throw new Exception('no repository ID specified');
 }
 
 // Check that repository Id is valid
-if (!is_numeric(__ACTUAL_URI__[3])) {
+if (!is_numeric(__ACTUAL_URI__[2])) {
     throw new Exception('invalid repository ID');
 }
 
@@ -34,7 +34,7 @@
 // }
 
 // Retrieve repo infos from DB
-$repoController->getAllById(__ACTUAL_URI__[3], '', '');
+$repoController->getAllById(__ACTUAL_URI__[2], '', '');
 
 // Get statistics directly from database for all environments
 $results = [];
diff --git a/www/controllers/Layout/Chart/vars/repo-snapshots-chart.vars.inc.php b/www/controllers/Layout/Chart/vars/repo-snapshots-chart.vars.inc.php
index 3a041c8dc..622d5377d 100644
--- a/www/controllers/Layout/Chart/vars/repo-snapshots-chart.vars.inc.php
+++ b/www/controllers/Layout/Chart/vars/repo-snapshots-chart.vars.inc.php
@@ -6,20 +6,18 @@
 $labels = [];
 $options = [];
 
-if (__ACTUAL_URI__[2] != 'repo') {
-    throw new Exception('Error: invalid URI specified.');
+// Check that repository Id is specified
+if (empty(__ACTUAL_URI__[2])) {
+    throw new Exception('no repository ID specified');
 }
 
-if (empty(__ACTUAL_URI__[3])) {
-    throw new Exception('Error: missing repository ID.');
-}
-
-if (!is_numeric(__ACTUAL_URI__[3])) {
-    throw new Exception('Error: invalid repository ID specified.');
+// Check that repository Id is valid
+if (!is_numeric(__ACTUAL_URI__[2])) {
+    throw new Exception('invalid repository ID');
 }
 
 // Get repository info
-$repoController->getAllById(__ACTUAL_URI__[3]);
+$repoController->getAllById(__ACTUAL_URI__[2]);
 
 // Get all snapshots of the repository
 $snapshots = $repoController->getSnapshots($repoController->getRepoId());
@@ -92,7 +90,7 @@
     // Configure click callback to redirect to snapshot page
     'clickCallback' => [
         'enabled' => true,
-        'url' => '/browse/{value}',
+        'url' => '/snapshot/{value}',
         'newTab' => false // '_self' for same tab, '_blank' for new tab
     ]
 ];
diff --git a/www/controllers/Layout/Chart/vars/repo-snapshots-size-chart.vars.inc.php b/www/controllers/Layout/Chart/vars/repo-snapshots-size-chart.vars.inc.php
index 4b2377dd1..296d92cf3 100644
--- a/www/controllers/Layout/Chart/vars/repo-snapshots-size-chart.vars.inc.php
+++ b/www/controllers/Layout/Chart/vars/repo-snapshots-size-chart.vars.inc.php
@@ -5,23 +5,21 @@
 $labels = [];
 $options = [];
 
-if (__ACTUAL_URI__[2] != 'repo') {
-    throw new Exception('Error: invalid URI specified.');
+// Check that repository Id is specified
+if (empty(__ACTUAL_URI__[2])) {
+    throw new Exception('no repository ID specified');
 }
 
-if (empty(__ACTUAL_URI__[3])) {
-    throw new Exception('Error: missing repository ID.');
-}
-
-if (!is_numeric(__ACTUAL_URI__[3])) {
-    throw new Exception('Error: invalid repository ID specified.');
+// Check that repository Id is valid
+if (!is_numeric(__ACTUAL_URI__[2])) {
+    throw new Exception('invalid repository ID');
 }
 
 // Get repository info
-$repoController->getAllById(__ACTUAL_URI__[3]);
+$repoController->getAllById(__ACTUAL_URI__[2]);
 
 // Get all statistics for the specified repo ID
-$stats = $repoStatsController->getByRepoId(__ACTUAL_URI__[3]);
+$stats = $repoStatsController->getByRepoId(__ACTUAL_URI__[2]);
 
 $snapData = [];
 
diff --git a/www/controllers/Layout/Chart/vars/repo-storage-chart.vars.inc.php b/www/controllers/Layout/Chart/vars/repo-storage-chart.vars.inc.php
deleted file mode 100644
index 8d08c2b30..000000000
--- a/www/controllers/Layout/Chart/vars/repo-storage-chart.vars.inc.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-$datasets = [];
-$labels = [];
-$options = [];
-
-// Get used and free disk space in bytes, and also in percent
-$diskTotalSpace = disk_total_space(REPOS_DIR);
-$diskFreeSpace  = disk_free_space(REPOS_DIR);
-$diskUsedSpace  = $diskTotalSpace - $diskFreeSpace;
-$diskFreeSpaceHuman = \Controllers\Utils\Convert::sizeToHuman($diskFreeSpace);
-$diskUsedSpaceHuman = \Controllers\Utils\Convert::sizeToHuman($diskUsedSpace);
-$diskUsedSpacePercent = round(($diskUsedSpace / $diskTotalSpace) * 100);
-$diskFreeSpacePercent = round(($diskFreeSpace / $diskTotalSpace) * 100);
-
-$labels[] = 'Used: ' . $diskUsedSpaceHuman;
-$labels[] = 'Free: ' . $diskFreeSpaceHuman;
-$datasets[0]['data'][] = $diskUsedSpacePercent;
-$datasets[0]['data'][] = $diskFreeSpacePercent;
-
-if ($diskUsedSpacePercent > 0 && $diskUsedSpacePercent <= 30) {
-    $datasets[0]['colors'][] = '#15bf7f';
-    $datasets[0]['colors'][] = 'rgba(21, 191, 127, 0.40)';
-}
-if ($diskUsedSpacePercent > 30 && $diskUsedSpacePercent <= 50) {
-    $datasets[0]['colors'][] = '#ffb536';
-    $datasets[0]['colors'][] = 'rgba(255, 181, 54, 0.40)';
-}
-if ($diskUsedSpacePercent > 50 && $diskUsedSpacePercent <= 70) {
-    $datasets[0]['colors'][] = '#ff7c49';
-    $datasets[0]['colors'][] = 'rgba(255, 124, 73, 0.40)';
-}
-if ($diskUsedSpacePercent > 70 && $diskUsedSpacePercent <= 100) {
-    $datasets[0]['colors'][] = '#F32F63';
-    $datasets[0]['colors'][] = 'rgba(243, 47, 99, 0.40)';
-}
-
-$options['innerRadius'] = '65%';
-$options['outerRadius'] = '99%';
-$options['toolbox']['show'] = false;
-$options['legend']['show'] = false;
-$options['tooltip']['show'] = false;
-$options['emphasis']['disabled'] = true;
-
-unset($diskTotalSpace, $diskFreeSpace, $diskUsedSpace);
diff --git a/www/controllers/Layout/Container/vars/browse/actions.vars.inc.php b/www/controllers/Layout/Container/vars/browse/actions.vars.inc.php
deleted file mode 100644
index a5430edce..000000000
--- a/www/controllers/Layout/Container/vars/browse/actions.vars.inc.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-use \Controllers\Exception\AppException;
-use \Controllers\Utils\Array\Sort;
-use \Controllers\Utils\Convert;
-
-$repoController = new \Controllers\Repo\Repo();
-
-if (empty(__ACTUAL_URI__[2])) {
-    throw new Exception('Error: no repository snapshot ID specified.');
-}
-
-if (!is_numeric(__ACTUAL_URI__[2])) {
-    throw new Exception('Error: invalid repository snapshot ID.');
-}
-
-$snapId = __ACTUAL_URI__[2];
-
-// Instanciate repo snapshot package controller (it will also check if the snapshot exists)
-$repoPackageController = new \Controllers\Repo\Snapshot\Package($snapId);
-
-/**
- *  Retrieve repo infos from DB
- */
-$repoController->getAllById('', $snapId, '');
-
-/**
- *  Define snapshot path
- */
-if ($repoController->getPackageType() == 'rpm') {
-    $snapshotPath = REPOS_DIR . '/rpm/' . $repoController->getName() . '/' . $repoController->getReleasever() . '/' . $repoController->getDate();
-}
-
-if ($repoController->getPackageType() == 'deb') {
-    $snapshotPath = REPOS_DIR . '/deb/' . $repoController->getName() . '/' . $repoController->getDist() . '/' . $repoController->getSection() . '/' . $repoController->getDate();
-}
-
-/**
- *  If the path does not exist on the server then we quit
- *  browse/list container should have already throwed an error
- */
-if (!is_dir($snapshotPath)) {
-    throw new Exception();
-}
-
-/**
- *  Retrieve repo rebuild status
- */
-$rebuild = $repoController->getRebuild();
-
-/**
- *  Upload packages
- */
-if (!empty($_POST['action']) and $_POST['action'] == 'uploadPackage' and !empty($_POST['snapId']) and is_numeric($_POST['snapId']) and !empty($_FILES['packages'])) {
-    try {
-        if (isset($_POST['overwrite']) && is_null($overwrite = Convert::toBool($_POST['overwrite']))) {
-            throw new Exception('Invalid overwrite value');
-        }
-
-        $repoPackageController->upload(Sort::byPostFiles($_FILES['packages']), $overwrite ?? false);
-        $uploadSuccessMessage = 'Packages uploaded successfully';
-    } catch (AppException $e) {
-        $uploadErrorDetails = $e->getDetails();
-    } catch (Exception $e) {
-        $uploadErrorMessage = $e->getMessage();
-    }
-
-    unset($repoPackageController);
-}
diff --git a/www/controllers/Layout/Container/vars/browse/list.vars.inc.php b/www/controllers/Layout/Container/vars/browse/list.vars.inc.php
deleted file mode 100644
index 5c63fc9b0..000000000
--- a/www/controllers/Layout/Container/vars/browse/list.vars.inc.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-$myrepo = new \Controllers\Repo\Repo();
-$repoSnapshotController = new \Controllers\Repo\Snapshot\Snapshot();
-
-if (empty(__ACTUAL_URI__[2])) {
-    throw new Exception('Error: no repository snapshot ID specified.');
-}
-
-if (!is_numeric(__ACTUAL_URI__[2])) {
-    throw new Exception('Error: invalid repository snapshot ID.');
-}
-
-$snapId = __ACTUAL_URI__[2];
-
-/**
- *  Check if the snapshot exists
- */
-if (!$repoSnapshotController->exists($snapId)) {
-    throw new Exception('Error: repository snapshot #' . $snapId . ' does not exist.');
-}
-
-/**
- *  Retrieve repo infos from DB
- */
-$myrepo->getAllById('', $snapId, '');
-
-/**
- *  Define snapshot path
- */
-if ($myrepo->getPackageType() == 'rpm') {
-    $snapshotPath = REPOS_DIR . '/rpm/' . $myrepo->getName() . '/' . $myrepo->getReleasever() . '/' . $myrepo->getDate();
-}
-
-if ($myrepo->getPackageType() == 'deb') {
-    $snapshotPath = REPOS_DIR . '/deb/' . $myrepo->getName() . '/' . $myrepo->getDist() . '/' . $myrepo->getSection() . '/' . $myrepo->getDate();
-}
-
-/**
- *  If the path does not exist on the server then we quit
- */
-if (!is_dir($snapshotPath)) {
-    throw new Exception('Error: repo directory ' . $snapshotPath . ' does not exist.');
-}
-
-/**
- *  Retrieve repo size and packages count
- */
-if ($myrepo->getPackageType() == 'rpm') {
-    $packagesCount = count(\Controllers\Filesystem\File::findRecursive($snapshotPath, [], ['rpm']));
-}
-if ($myrepo->getPackageType() == 'deb') {
-    $packagesCount = count(\Controllers\Filesystem\File::findRecursive($snapshotPath, [], ['deb']));
-}
-
-/**
- *  Get the size of the snapshot
- */
-$repoSize = $repoSnapshotController->getSize($snapId, true) ?? 'Unknown';
-
-unset($repoSnapshotController);
diff --git a/www/controllers/Layout/Container/vars/header/menu.vars.inc.php b/www/controllers/Layout/Container/vars/header/menu.vars.inc.php
index 3bc13241c..ab7111e8c 100644
--- a/www/controllers/Layout/Container/vars/header/menu.vars.inc.php
+++ b/www/controllers/Layout/Container/vars/header/menu.vars.inc.php
@@ -1,13 +1,9 @@
 <?php
-$myTask = new \Controllers\Task\Task();
+$taskController = new \Controllers\Task\Task();
 $taskListingController = new \Controllers\Task\Listing();
 
-/**
- *  Get running tasks
- */
+// Get running tasks
 $tasksRunning = $taskListingController->getRunning();
 
-/**
- *  Count running tasks
- */
+// Count running tasks
 $totalRunningTasks = count($tasksRunning);
diff --git a/www/controllers/Layout/Container/vars/host/packages.vars.inc.php b/www/controllers/Layout/Container/vars/host/packages.vars.inc.php
index 2e6747577..b2f8c0ffb 100644
--- a/www/controllers/Layout/Container/vars/host/packages.vars.inc.php
+++ b/www/controllers/Layout/Container/vars/host/packages.vars.inc.php
@@ -13,7 +13,7 @@
 $complianceThresholdDays = $settings['compliance_threshold_days'];
 
 // Get installed packages and its total
-$packagesInventored = $hostPackageController->getInventory();
+$packagesInventoredTotal = $hostPackageController->countInventory();
 $packagesInstalledCount = count($hostPackageController->getInstalled());
 
 // Get available packages and its total
diff --git a/www/controllers/Layout/Container/vars/hosts/overview.vars.inc.php b/www/controllers/Layout/Container/vars/hosts/overview.vars.inc.php
index 6780808f8..ff1e6c37c 100644
--- a/www/controllers/Layout/Container/vars/hosts/overview.vars.inc.php
+++ b/www/controllers/Layout/Container/vars/hosts/overview.vars.inc.php
@@ -1,26 +1,18 @@
 <?php
 $hostListingController = new \Controllers\Host\Listing();
 
-/**
- *  Getting total hosts
- */
+// Getting total hosts
 $totalHosts = count($hostListingController->get());
 
-/**
- *  Getting a list of all hosts kernel
- */
+// Getting a list of all hosts kernel
 $kernels = $hostListingController->getKernel();
 array_multisort(array_column($kernels, 'Count'), SORT_DESC, $kernels);
 
-/**
- *  Getting a list of all hosts profiles
- */
+// Getting a list of all hosts profiles
 $profiles = $hostListingController->getProfile();
 array_multisort(array_column($profiles, 'Count'), SORT_DESC, $profiles);
 
-/**
- *  Getting a list of all hosts requiring a reboot
- */
+// Getting a list of all hosts requiring a reboot
 $rebootRequiredList = $hostListingController->getRebootRequired();
 $rebootRequiredCount = count($rebootRequiredList);
 
diff --git a/www/controllers/Layout/Container/vars/stats/repo.vars.inc.php b/www/controllers/Layout/Container/vars/repo/kpi.vars.inc.php
similarity index 78%
rename from www/controllers/Layout/Container/vars/stats/repo.vars.inc.php
rename to www/controllers/Layout/Container/vars/repo/kpi.vars.inc.php
index d916a92a4..c4575451d 100644
--- a/www/controllers/Layout/Container/vars/stats/repo.vars.inc.php
+++ b/www/controllers/Layout/Container/vars/repo/kpi.vars.inc.php
@@ -3,16 +3,16 @@
 $debRepoStatController = new \Controllers\Repo\Statistic\Deb();
 $rpmRepoStatController = new \Controllers\Repo\Statistic\Rpm();
 
-if (empty(__ACTUAL_URI__[3])) {
-    throw new Exception('Error: missing repository ID.');
+if (empty(__ACTUAL_URI__[2])) {
+    throw new Exception('no repository ID specified.');
 }
 
-if (!is_numeric(__ACTUAL_URI__[3])) {
-    throw new Exception('Error: invalid repository ID specified.');
+if (!is_numeric(__ACTUAL_URI__[2])) {
+    throw new Exception('invalid repository ID specified.');
 }
 
 // Get repository info
-$repoController->getAllById(__ACTUAL_URI__[3]);
+$repoController->getAllById(__ACTUAL_URI__[2]);
 
 // Get all snapshots of the repository
 $snapshots = $repoController->getSnapshots($repoController->getRepoId());
diff --git a/www/controllers/Layout/Container/vars/repos/kpi.vars.inc.php b/www/controllers/Layout/Container/vars/repos/kpi.vars.inc.php
new file mode 100644
index 000000000..0e25c0ac7
--- /dev/null
+++ b/www/controllers/Layout/Container/vars/repos/kpi.vars.inc.php
@@ -0,0 +1,45 @@
+<?php
+use \Controllers\Utils\Convert;
+
+$repoController = new \Controllers\Repo\Repo();
+$taskController = new \Controllers\Task\Task();
+
+// Get total repos count
+$totalRepos = $repoController->count();
+
+// Get used and free disk space in bytes, and also in percent
+$diskTotalSpace = disk_total_space(REPOS_DIR);
+$diskFreeSpace  = disk_free_space(REPOS_DIR);
+$diskUsedSpace  = $diskTotalSpace - $diskFreeSpace;
+$diskFreeSpaceHuman = Convert::sizeToHuman($diskFreeSpace);
+$diskUsedSpaceHuman = Convert::sizeToHuman($diskUsedSpace);
+$diskUsedSpacePercent = round(($diskUsedSpace / $diskTotalSpace) * 100);
+$diskFreeSpacePercent = round(($diskFreeSpace / $diskTotalSpace) * 100);
+
+// Get last and next scheduled tasks
+$lastScheduledTask = $taskController->getLastScheduledTask();
+$nextScheduledTasks = $taskController->getNextScheduledTask();
+$lastScheduledTaskSummary = [];
+
+// If the last scheduled task dispatched sub-tasks, its real status is a summary of their statuses
+if (!empty($lastScheduledTask['Id'])) {
+    $lastScheduledTaskSummary = (new \Controllers\Task\Listing())->getSubTasksSummary($lastScheduledTask['Id']);
+}
+
+if (!empty($nextScheduledTasks)) {
+    $data = [];
+
+    foreach ($nextScheduledTasks as $task) {
+        $data[] = $taskController->getDayTimeLeft($task['Id']);
+    }
+
+    $nextScheduledTasks = $data;
+
+    // Sort tasks by date and time
+    array_multisort(array_column($nextScheduledTasks, 'date'), SORT_ASC, array_column($nextScheduledTasks, 'time'), SORT_ASC, $nextScheduledTasks);
+
+    // Remove duplicates (when multiple tasks are scheduled for the same date and time)
+    $nextScheduledTasks = array_unique($nextScheduledTasks, SORT_REGULAR);
+}
+
+unset($repoController, $taskController, $diskTotalSpace, $diskFreeSpace, $diskUsedSpace, $data);
diff --git a/www/controllers/Layout/Container/vars/repos/list.vars.inc.php b/www/controllers/Layout/Container/vars/repos/list.vars.inc.php
index 6c618f2ce..bbaf95c89 100644
--- a/www/controllers/Layout/Container/vars/repos/list.vars.inc.php
+++ b/www/controllers/Layout/Container/vars/repos/list.vars.inc.php
@@ -1,43 +1,64 @@
 <?php
+$userPreferenceController = new \Controllers\User\Preference\Preference();
 $repoSnapshotController = new \Controllers\Repo\Snapshot\Snapshot();
+$repoListingController = new \Controllers\Repo\Listing();
 $groupController = new \Controllers\Group\Repo();
+$envController = new \Controllers\Environment();
 $repoController = new \Controllers\Repo\Repo();
-$myrepoListing = new \Controllers\Repo\Listing();
-$taskController = new \Controllers\Task\Task();
+
+$groups = [];
+$repos = [];
+$snapshots = [];
+
+// Get user preferences
+$userPreferences = $userPreferenceController->get($_SESSION['id']);
+
+// Get protected environments
+$protectedEnvs = $envController->getProtected();
 
 // Retrieve all group names
 $groupsList = $groupController->listAll(true);
 
-// Get total repos count
-$totalRepos = $repoController->count();
+// Define if the user can view all repositories or only specific groups and repositories
+$viewAll = IS_ADMIN || in_array('all', USER_PERMISSIONS['repositories']['view']);
+$allowedGroups = $viewAll ? [] : USER_PERMISSIONS['repositories']['view']['groups'];
+$allowedRepos = $viewAll ? [] : USER_PERMISSIONS['repositories']['view']['repos'];
 
-// Get used and free disk space in bytes, and also in percent
-$diskTotalSpace = disk_total_space(REPOS_DIR);
-$diskFreeSpace  = disk_free_space(REPOS_DIR);
-$diskUsedSpace  = $diskTotalSpace - $diskFreeSpace;
-$diskFreeSpaceHuman = \Controllers\Utils\Convert::sizeToHuman($diskFreeSpace);
-$diskUsedSpaceHuman = \Controllers\Utils\Convert::sizeToHuman($diskUsedSpace);
-$diskUsedSpacePercent = round(($diskUsedSpace / $diskTotalSpace) * 100);
-$diskFreeSpacePercent = round(($diskFreeSpace / $diskTotalSpace) * 100);
+// Loop through groups to get repos for each group and add them to the $groups array
+foreach ($groupsList as $group) {
+    // Group is allowed if the user can view all repositories or if the group is in the allowed groups list
+    $groupAllowed = $viewAll || in_array($group['Id'], $allowedGroups);
+    $groupRepos = [];
 
-// Get last and next scheduled tasks
-$lastScheduledTask = $taskController->getLastScheduledTask();
-$nextScheduledTasks = $taskController->getNextScheduledTask();
+    foreach ($repoListingController->listByGroup($group['Name']) as $repo) {
+        // A repository granted individually makes its group visible, without revealing the other repositories of that group
+        if (!$groupAllowed and !in_array($repo['repoId'], $allowedRepos)) {
+            continue;
+        }
 
-if (!empty($nextScheduledTasks)) {
-    $data = [];
+        // Add the whole repo to the repos array
+        $repos[] = $repo;
 
-    foreach ($nextScheduledTasks as $task) {
-        $data[] = $taskController->getDayTimeLeft($task['Id']);
+        // Add the repoId to the group if not already in the group repos (to avoid duplicate repos in the same group)
+        if (!in_array($repo['repoId'], $groupRepos)) {
+            $groupRepos[] = $repo['repoId'];
+        }
     }
 
-    $nextScheduledTasks = $data;
+    // If the group is allowed or if it has at least one repository that the user can view, add it to the visible groups array
+    if ($groupAllowed || !empty($groupRepos)) {
+        // Do not display the 'Default' group if it is empty, unless it is the only group
+        if ($group['Name'] == 'Default' and count($groupRepos) == 0 and count($groupsList) > 1) {
+            continue;
+        }
 
-    // Sort tasks by date and time
-    array_multisort(array_column($nextScheduledTasks, 'date'), SORT_ASC, array_column($nextScheduledTasks, 'time'), SORT_ASC, $nextScheduledTasks);
-
-    // Remove duplicates (when multiple tasks are scheduled for the same date and time)
-    $nextScheduledTasks = array_unique($nextScheduledTasks, SORT_REGULAR);
+        // Add the group to the visible groups array with its name, repositories, and count of repositories
+        $groups[$group['Id']] = [
+            'name' => $group['Name'],
+            'repos' => $groupRepos,
+            'count' => count($groupRepos)
+        ];
+    }
 }
 
-unset($groupController, $repoController, $taskController, $diskTotalSpace, $diskFreeSpace, $diskUsedSpace, $data);
+unset($userPreferenceController, $groupController, $repoController, $envController);
diff --git a/www/controllers/Layout/Container/vars/snapshot/kpi.vars.inc.php b/www/controllers/Layout/Container/vars/snapshot/kpi.vars.inc.php
new file mode 100644
index 000000000..947ea750c
--- /dev/null
+++ b/www/controllers/Layout/Container/vars/snapshot/kpi.vars.inc.php
@@ -0,0 +1,59 @@
+<?php
+use \Controllers\Filesystem\Directory;
+use \Controllers\Filesystem\File;
+use \Controllers\Utils\Convert;
+
+$repoController = new \Controllers\Repo\Repo();
+$repoSnapshotController = new \Controllers\Repo\Snapshot\Snapshot();
+
+if (empty(__ACTUAL_URI__[2])) {
+    throw new Exception('no repository snapshot ID specified.');
+}
+
+if (!is_numeric(__ACTUAL_URI__[2])) {
+    throw new Exception('invalid repository snapshot ID.');
+}
+
+$snapId = __ACTUAL_URI__[2];
+
+// Check if the snapshot exists
+if (!$repoSnapshotController->exists($snapId)) {
+    throw new Exception('repository snapshot #' . $snapId . ' does not exist.');
+}
+
+// Retrieve repository infos from DB
+$repoController->getAllById(null, $snapId, null);
+
+// Define repository name
+if ($repoController->getPackageType() == 'rpm') {
+    $repository = $repoController->getName() . ' ❯ ' . $repoController->getReleasever();
+}
+if ($repoController->getPackageType() == 'deb') {
+    $repository = $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection();
+}
+
+// Define snapshot path
+if ($repoController->getPackageType() == 'rpm') {
+    $snapshotPath = REPOS_DIR . '/rpm/' . $repoController->getName() . '/' . $repoController->getReleasever() . '/' . $repoController->getDate();
+}
+if ($repoController->getPackageType() == 'deb') {
+    $snapshotPath = REPOS_DIR . '/deb/' . $repoController->getName() . '/' . $repoController->getDist() . '/' . $repoController->getSection() . '/' . $repoController->getDate();
+}
+
+// Retrieve repo size and packages count
+if ($repoController->getPackageType() == 'rpm') {
+    $repoSize = Directory::getSize($snapshotPath);
+    $packagesCount = count(File::findRecursive($snapshotPath, [], ['rpm']));
+}
+if ($repoController->getPackageType() == 'deb') {
+    $repoSize = Directory::getSize($snapshotPath);
+    $packagesCount = count(File::findRecursive($snapshotPath, [], ['deb']));
+}
+
+// Convert repo size in the most suitable byte format
+$repoSize = Convert::sizeToHuman($repoSize);
+
+// Retrieve snapshot rebuild status
+$rebuild = $repoController->getRebuild();
+
+unset($repoSnapshotController);
diff --git a/www/controllers/Layout/Container/vars/snapshot/list.vars.inc.php b/www/controllers/Layout/Container/vars/snapshot/list.vars.inc.php
new file mode 100644
index 000000000..bc3366d1d
--- /dev/null
+++ b/www/controllers/Layout/Container/vars/snapshot/list.vars.inc.php
@@ -0,0 +1,60 @@
+<?php
+use \Controllers\Filesystem\Directory;
+use \Controllers\Filesystem\File;
+use \Controllers\Utils\Convert;
+
+$repoController = new \Controllers\Repo\Repo();
+$repoSnapshotController = new \Controllers\Repo\Snapshot\Snapshot();
+
+if (empty(__ACTUAL_URI__[2])) {
+    throw new Exception('no repository snapshot ID specified.');
+}
+
+if (!is_numeric(__ACTUAL_URI__[2])) {
+    throw new Exception('invalid repository snapshot ID.');
+}
+
+$snapId = __ACTUAL_URI__[2];
+
+// Check if the snapshot exists
+if (!$repoSnapshotController->exists($snapId)) {
+    throw new Exception('repository snapshot #' . $snapId . ' does not exist.');
+}
+
+// Check if the snapshot has a protected environment
+$protectedEnv = $repoSnapshotController->hasProtectedEnv($snapId);
+
+// Check if a task is running for this snapshot
+$taskRunning = $repoSnapshotController->taskRunning($snapId);
+
+// Retrieve repo infos from DB
+$repoController->getAllById('', $snapId, '');
+
+// Define snapshot path
+if ($repoController->getPackageType() == 'rpm') {
+    $snapshotPath = REPOS_DIR . '/rpm/' . $repoController->getName() . '/' . $repoController->getReleasever() . '/' . $repoController->getDate();
+}
+
+if ($repoController->getPackageType() == 'deb') {
+    $snapshotPath = REPOS_DIR . '/deb/' . $repoController->getName() . '/' . $repoController->getDist() . '/' . $repoController->getSection() . '/' . $repoController->getDate();
+}
+
+// If the path does not exist on the server then we quit
+if (!is_dir($snapshotPath)) {
+    throw new Exception('snapshot directory ' . $snapshotPath . ' does not exist.');
+}
+
+// Retrieve repo size and packages count
+if ($repoController->getPackageType() == 'rpm') {
+    $repoSize = Directory::getSize($snapshotPath);
+    $packagesCount = count(File::findRecursive($snapshotPath, [], ['rpm']));
+}
+if ($repoController->getPackageType() == 'deb') {
+    $repoSize = Directory::getSize($snapshotPath);
+    $packagesCount = count(File::findRecursive($snapshotPath, [], ['deb']));
+}
+
+// Convert repo size in the most suitable byte format
+$repoSize = Convert::sizeToHuman($repoSize);
+
+unset($repoController, $repoSnapshotController);
diff --git a/www/controllers/Layout/Container/vars/tasks/log.vars.inc.php b/www/controllers/Layout/Container/vars/tasks/log.vars.inc.php
index 0ae7ab669..d2b0ddcf5 100644
--- a/www/controllers/Layout/Container/vars/tasks/log.vars.inc.php
+++ b/www/controllers/Layout/Container/vars/tasks/log.vars.inc.php
@@ -1,12 +1,14 @@
 <?php
+use \Controllers\Layout\Table\Render as TableRender;
+
 $taskController = new \Controllers\Task\Task();
+$taskListingController = new \Controllers\Task\Listing();
 $repoController = new \Controllers\Repo\Repo();
 $legacyLog = false;
 $output = '';
+$taskFound = true;
 
-/**
- *  Get the log file of the task
- */
+// Get the log file of the task
 try {
     /**
      *  If a task Id is provided in the URL, use it
@@ -21,12 +23,12 @@
 
     // If no task Id has been found, throw an exception. It can happen on brand new installations with no task yet.
     if (empty($taskId)) {
-        throw new Exception('No task found.');
+        throw new Exception('No task found');
     }
 
     // Check if task exists
     if (!$taskController->exists($taskId)) {
-        throw new Exception('Task #' . $taskId . ' not found.');
+        throw new Exception('Task #' . $taskId . ' not found');
     }
 
     // Get task info
@@ -51,106 +53,115 @@
 
         $repoId = null;
         $snapId = null;
-        $envId = null;
 
         // Get log content
         $content = $taskLogController->getContent();
 
         // If log content is empty
         if (empty($content)) {
-            throw new Exception('No log found for this task.');
-        }
-
-        if (empty($rawParams['action'])) {
-            throw new Exception('No action found in the task.');
-        }
-
-        /**
-         *  Get repository info
-         */
-
-        // If the action is create, the repository info is in the raw params
-        if ($rawParams['action'] == 'create') {
-            $repoController->setType($rawParams['repo-type']);
+            /**
+             *  The task itself may have no log if it only dispatched sub-tasks (e.g. a scheduled
+             *  task targeting a group of repositories). In that case, display the list of
+             *  sub-tasks it launched instead of failing.
+             */
+            $childTasks = $taskListingController->getByParentId($taskId);
+
+            if (empty($childTasks)) {
+                // A scheduled task has no log until it has been executed at least once
+                if (in_array($taskInfo['Status'], ['scheduled', 'disabled'])) {
+                    throw new Exception('This task has not been executed yet');
+                }
 
-            if (!empty($rawParams['source'])) {
-                $repoController->setSource($rawParams['source']);
-            }
-            if (!empty($rawParams['alias'])) {
-                $repoController->setName($rawParams['alias']);
-            } else {
-                $repoController->setName($rawParams['source']);
-            }
-            if (!empty($rawParams['dist'])) {
-                $repoController->setDist($rawParams['dist']);
-            }
-            if (!empty($rawParams['section'])) {
-                $repoController->setSection($rawParams['section']);
-            }
-            if (!empty($rawParams['releasever'])) {
-                $repoController->setReleasever($rawParams['releasever']);
-            }
-            if (!empty($rawParams['arch'])) {
-                $repoController->setArch($rawParams['arch']);
-            }
-            if (!empty($rawParams['package-type'])) {
-                $repoController->setPackageType($rawParams['package-type']);
-            }
-            if (!empty($rawParams['gpg-check'])) {
-                $repoController->setGpgCheck($rawParams['gpg-check']);
-            }
-            if (!empty($rawParams['gpg-sign'])) {
-                $repoController->setGpgSign($rawParams['gpg-sign']);
-            }
-            if (!empty($rawParams['description'])) {
-                $repoController->setDescription($rawParams['description']);
-            }
-            if (!empty($rawParams['group'])) {
-                $repoController->setGroup($rawParams['group']);
+                throw new Exception('No log found for this task');
             }
 
-        // Otherwise, we get the repository info from the database
+            // Used to display the real status of the parent task, based on its sub-tasks status
+            $subTasksSummary = $taskListingController->getSubTasksSummary($taskId);
+
+            ob_start();
+            TableRender::render('tasks/list-children');
+            $output .= ob_get_clean();
         } else {
-            if (!empty($rawParams['repo-id'])) {
-                $repoId = $rawParams['repo-id'];
+            if (empty($rawParams['action'])) {
+                throw new Exception('No action found in the task');
             }
-            if (!empty($rawParams['snap-id'])) {
-                $snapId = $rawParams['snap-id'];
-            }
-            // If the action is removeEnv, the environment has been removed, so it
-            if ($rawParams['action'] != 'removeEnv') {
-                if (!empty($rawParams['env-id'])) {
-                    $envId = $rawParams['env-id'];
+
+            // If the action is create, the repository info is in the raw params
+            if ($rawParams['action'] == 'create') {
+                $repoController->setType($rawParams['repo-type']);
+
+                if (!empty($rawParams['source'])) {
+                    $repoController->setSource($rawParams['source']);
+                }
+                if (!empty($rawParams['alias'])) {
+                    $repoController->setName($rawParams['alias']);
+                } else {
+                    $repoController->setName($rawParams['source']);
+                }
+                if (!empty($rawParams['dist'])) {
+                    $repoController->setDist($rawParams['dist']);
+                }
+                if (!empty($rawParams['section'])) {
+                    $repoController->setSection($rawParams['section']);
+                }
+                if (!empty($rawParams['releasever'])) {
+                    $repoController->setReleasever($rawParams['releasever']);
+                }
+                if (!empty($rawParams['arch'])) {
+                    $repoController->setArch($rawParams['arch']);
+                }
+                if (!empty($rawParams['package-type'])) {
+                    $repoController->setPackageType($rawParams['package-type']);
+                }
+                if (!empty($rawParams['gpg-check'])) {
+                    $repoController->setGpgCheck($rawParams['gpg-check']);
+                }
+                if (!empty($rawParams['gpg-sign'])) {
+                    $repoController->setGpgSign($rawParams['gpg-sign']);
+                }
+                if (!empty($rawParams['description'])) {
+                    $repoController->setDescription($rawParams['description']);
+                }
+                if (!empty($rawParams['tags'])) {
+                    $repoController->setTags($rawParams['tags']);
+                }
+                if (!empty($rawParams['group'])) {
+                    $repoController->setGroup($rawParams['group']);
                 }
-            }
 
-            $repoController->getAllById($repoId, $snapId, $envId);
-        }
+            // Otherwise, we get the repository info from the database
+            } else {
+                if (!empty($rawParams['repo-id'])) {
+                    $repoId = $rawParams['repo-id'];
+                }
+                if (!empty($rawParams['snap-id'])) {
+                    $snapId = $rawParams['snap-id'];
+                }
+
+                $repoController->getAllById($repoId, $snapId);
+            }
 
-        /**
-         *  Include table template for the task
-         */
-        ob_start();
-        include_once(ROOT . '/views/templates/tasks/' . $rawParams['action'] . '.inc.php');
-        $output .= ob_get_clean();
-
-        /**
-         *  The container which will contain all the steps
-         */
-        $output .= '<div class="steps-container" task-id="' . $taskId . '">';
-
-        /**
-         *  Include steps
-         */
-        foreach ($content['steps'] as $stepIdentifier => $step) {
+            // Include table template for the task
             ob_start();
-            include(ROOT . '/views/includes/containers/tasks/log/step.inc.php');
-            include(ROOT . '/views/includes/containers/tasks/log/step-content.inc.php');
+            include_once(ROOT . '/views/templates/tasks/' . $rawParams['action'] . '.inc.php');
             $output .= ob_get_clean();
-        }
 
-        $output .= '</div>';
+            // The container which will contain all the steps
+            $output .= '<div class="steps-container" task-id="' . $taskId . '">';
+
+            // Include steps
+            foreach ($content['steps'] as $stepIdentifier => $step) {
+                ob_start();
+                include(ROOT . '/views/includes/containers/tasks/log/step.inc.php');
+                include(ROOT . '/views/includes/containers/tasks/log/step-content.inc.php');
+                $output .= ob_get_clean();
+            }
+
+            $output .= '</div>';
+        }
     }
 } catch (Exception $e) {
-    $output = '<p class="note">' . $e->getMessage() . '</p>';
+    $taskFound = false;
+    $taskErrorMessage = $e->getMessage();
+    $output = '<p class="note">' . $taskErrorMessage . '</p>';
 }
diff --git a/www/controllers/Layout/Container/vars/tasks/tasks.vars.inc.php b/www/controllers/Layout/Container/vars/tasks/tasks.vars.inc.php
new file mode 100644
index 000000000..9c6f3507f
--- /dev/null
+++ b/www/controllers/Layout/Container/vars/tasks/tasks.vars.inc.php
@@ -0,0 +1,13 @@
+<?php
+$taskListingController = new \Controllers\Task\Listing();
+
+// Get all tasks and count them
+$totalCount = count($taskListingController->get());
+
+// Get running tasks
+$runningCount = count($taskListingController->getRunning());
+
+// Get scheduled tasks
+$scheduledCount = count($taskListingController->getScheduled());
+
+unset($taskListingController);
diff --git a/www/controllers/Layout/ContainerReload.php b/www/controllers/Layout/ContainerReload.php
index 20069a77e..6dfe1385e 100644
--- a/www/controllers/Layout/ContainerReload.php
+++ b/www/controllers/Layout/ContainerReload.php
@@ -42,6 +42,14 @@ public function exists(string $name)
         return $this->model->exists($name);
     }
 
+    /**
+     *  Delete the specified containers entries
+     */
+    public function delete(array $names): void
+    {
+        $this->model->delete($names);
+    }
+
     /**
      *  Clean all containers entries
      */
diff --git a/www/controllers/Layout/Panel/vars/hosts/settings.vars.inc.php b/www/controllers/Layout/Panel/vars/hosts/settings.vars.inc.php
index d33366754..e910c750d 100644
--- a/www/controllers/Layout/Panel/vars/hosts/settings.vars.inc.php
+++ b/www/controllers/Layout/Panel/vars/hosts/settings.vars.inc.php
@@ -17,6 +17,9 @@
 // Get compliance threshold days
 $complianceThresholdDays = $settings['compliance_threshold_days'];
 
+// Get compliance security update
+$complianceSecurityUpdate = $settings['compliance_security_update'];
+
 // Get compliance reboot required
 $complianceRebootRequired = $settings['compliance_reboot_required'];
 
diff --git a/www/controllers/Layout/Panel/vars/repos/edit.vars.inc.php b/www/controllers/Layout/Panel/vars/repos/edit.vars.inc.php
index a429abbd0..b09ef5662 100644
--- a/www/controllers/Layout/Panel/vars/repos/edit.vars.inc.php
+++ b/www/controllers/Layout/Panel/vars/repos/edit.vars.inc.php
@@ -14,7 +14,7 @@
  *  Check that action and repos params have been sent
  */
 if (empty($item['repos'])) {
-    throw new Exception('Task repositories required');
+    throw new Exception('Repositories required');
 }
 
 $slidePanelTitle = 'EDIT REPOSITORY & SNAPSHOT PROPERTIES';
diff --git a/www/controllers/Layout/Panel/vars/repos/install.vars.inc.php b/www/controllers/Layout/Panel/vars/repos/install.vars.inc.php
index 4ade1b5bc..235325404 100644
--- a/www/controllers/Layout/Panel/vars/repos/install.vars.inc.php
+++ b/www/controllers/Layout/Panel/vars/repos/install.vars.inc.php
@@ -45,8 +45,8 @@
     $packageType = $repoController->getPackageType();
     $packagesTypes[] = $packageType; ?>
 
-    <h6 class="margin-bottom-5">REPOSITORY</h6>
-    <div class="flex align-item-center justify-space-between margin-left-5 margin-right-5">
+    <div class="form-block form-block-accent-<?= $packageType == 'deb' ? 'red' : 'blue' ?>">
+    <div class="flex align-item-center justify-space-between">
         <div class="flex align-item-center">
             <?php
             if ($packageType == 'deb') {
@@ -58,11 +58,9 @@
                 $labelColor = 'blue';
             } ?>
 
-            <p class="label-black"><?= $repoController->getDateFormatted() ?></p>
+            <p class="label-white"><?= $repoController->getDateFormatted() ?></p>
             <p class="repository-install-env"></p>
         </div>
-
-        <span class="label-pkg-<?= $packageType ?>"><?= strtoupper($packageType) ?></span>
     </div>
 
     <h6>INSTALLATION</h6>
@@ -95,11 +93,10 @@
     if ($packageType == 'rpm') : ?>
         <pre class="repository-install-commands codeblock margin-top-10 margin-bottom-10 copy" url="<?= WWW_REPOS_DIR_URL ?>" hostname="<?= WWW_HOSTNAME ?>" prefix="<?= REPO_CONF_FILES_PREFIX ?>" package-type="rpm" name="<?= $repoController->getName() ?>" releasever="<?= $repoController->getReleasever() ?>"></pre>
         <?php
-    endif;
+    endif; ?>
 
-    if ($repo !== end($repos)) {
-        echo '<hr class="margin-top-30 margin-bottom-30">';
-    }
+    </div>
+    <?php
 }
 
 $commands = ob_get_clean();
\ No newline at end of file
diff --git a/www/controllers/Layout/Panel/vars/repos/new.vars.inc.php b/www/controllers/Layout/Panel/vars/repos/new.vars.inc.php
index 82c308179..b4d97efbf 100644
--- a/www/controllers/Layout/Panel/vars/repos/new.vars.inc.php
+++ b/www/controllers/Layout/Panel/vars/repos/new.vars.inc.php
@@ -1,25 +1,26 @@
 <?php
+use \Controllers\User\User;
+use \Controllers\Group\Repo as RepoGroup;
+use \Controllers\Repo\Listing as RepoListing;
 use \Controllers\User\Permission\Repo as RepoPermission;
 
-/**
- *  If the user is not an administrator or does not have permission to create repositories, prevent access to this panel.
- */
+// Check if the user has the permission to create a new repository
 if (!RepoPermission::allowedAction('create')) {
     throw new Exception('You are not allowed to access this panel');
 }
 
-$myrepo = new \Controllers\Repo\Repo();
-$mygroup = new \Controllers\Group\Repo();
-$mysource = new \Controllers\Repo\Source\Source();
-$userController = new \Controllers\User\User();
+$groupController = new RepoGroup();
+$repoListingController = new RepoListing();
+$userController = new User();
+$sourceController = new \Controllers\Repo\Source\Source();
 
-/**
- *  New repo form variables
- */
-$newRepoRpmSourcesList = $mysource->listAll('rpm');
-$newRepoDebSourcesList = $mysource->listAll('deb');
-$newRepoFormGroupList = $mygroup->listAll();
+// New repo form variables
+$rpmSourcesList = $sourceController->listAll('rpm');
+$debSourcesList = $sourceController->listAll('deb');
 
+// Retrieve the groups, the tags and the recipients to build the target selectors
+$groups = $groupController->listAll();
+$tags = $repoListingController->listTags();
 $usersEmail = $userController->getEmails();
 
-unset($userController);
+unset($targetController, $groupController, $repoListingController, $userController, $sourceController);
diff --git a/www/controllers/Layout/Panel/vars/repos/rename.vars.inc.php b/www/controllers/Layout/Panel/vars/repos/rename.vars.inc.php
new file mode 100644
index 000000000..646c0499a
--- /dev/null
+++ b/www/controllers/Layout/Panel/vars/repos/rename.vars.inc.php
@@ -0,0 +1,24 @@
+<?php
+use \Controllers\User\Permission\Repo as RepoPermission;
+
+$renameFormController = new \Controllers\Repo\Edit\Form();
+$taskFormController = new \Controllers\Task\Form\Form();
+
+//  If the user is not an administrator or does not have permission to edit repositories, prevent access to this panel.
+if (!RepoPermission::allowedAction('edit')) {
+    throw new Exception('You are not allowed to access this panel');
+}
+
+// Check that action and repos params have been sent
+if (empty($item['repos'])) {
+    throw new Exception('Repositories required');
+}
+
+$slidePanelTitle = 'RENAME REPOSITORY';
+
+// Get form content
+try {
+    $formContent = $taskFormController->get('rename', json_decode($item['repos'], true));
+} catch (JsonException $e) {
+    throw new Exception('Error while retrieving the form content: ' . $e->getMessage());
+}
diff --git a/www/controllers/Layout/Panel/vars/repos/scheduled-task.vars.inc.php b/www/controllers/Layout/Panel/vars/repos/scheduled-task.vars.inc.php
new file mode 100644
index 000000000..ac624f00a
--- /dev/null
+++ b/www/controllers/Layout/Panel/vars/repos/scheduled-task.vars.inc.php
@@ -0,0 +1,38 @@
+<?php
+use \Controllers\User\User;
+use \Controllers\Task\Target;
+use \Controllers\Group\Repo as RepoGroup;
+use \Controllers\Repo\Listing as RepoListing;
+use \Controllers\User\Permission\Repo as RepoPermission;
+
+$targetController = new Target();
+$groupController = new RepoGroup();
+$repoListingController = new RepoListing();
+$userController = new User();
+
+// Only keep the actions the user is allowed to execute
+$allowedActions = [];
+
+foreach ($targetController->getValidActions() as $action) {
+    if (RepoPermission::allowedAction($action)) {
+        $allowedActions[] = $action;
+    }
+}
+
+if (empty($allowedActions)) {
+    throw new Exception('You are not allowed to access this panel');
+}
+
+// Human readable title for each action
+$actionsTitles = [
+    'update' => 'Update repositories',
+    'env' => 'Point an environment',
+    'rebuild' => 'Rebuild repositories metadata'
+];
+
+// Retrieve the groups, the tags and the recipients to build the target selectors
+$groups = $groupController->listAll(true);
+$tags = $repoListingController->listTags();
+$usersEmail = $userController->getEmails();
+
+unset($targetController, $groupController, $repoListingController, $userController);
diff --git a/www/controllers/Layout/Panel/vars/repos/settings.vars.inc.php b/www/controllers/Layout/Panel/vars/repos/settings.vars.inc.php
new file mode 100644
index 000000000..67dbb542d
--- /dev/null
+++ b/www/controllers/Layout/Panel/vars/repos/settings.vars.inc.php
@@ -0,0 +1,12 @@
+<?php
+$userPreferenceController = new \Controllers\User\Preference\Preference();
+
+// Check if session is valid
+if (empty($_SESSION['id'])) {
+    throw new Exception('Session id is empty.');
+}
+
+// Get user preferences
+$preferences = $userPreferenceController->get($_SESSION['id']);
+
+unset($userPreferenceController);
diff --git a/www/controllers/Layout/Panel/vars/settings/user/permissions.vars.inc.php b/www/controllers/Layout/Panel/vars/settings/user/permissions.vars.inc.php
index 7eeacd0d5..49c9e4c2c 100644
--- a/www/controllers/Layout/Panel/vars/settings/user/permissions.vars.inc.php
+++ b/www/controllers/Layout/Panel/vars/settings/user/permissions.vars.inc.php
@@ -1,6 +1,7 @@
 <?php
-$permissionController = new \Controllers\User\Permission();
+$permissionController = new \Controllers\User\Permission\Permission();
 $groupController = new \Controllers\Group\Repo();
+$repoListingController = new \Controllers\Repo\Listing();
 
 if (!IS_ADMIN) {
     throw new Exception('You are not allowed to access this panel.');
@@ -12,12 +13,29 @@
 
 $userId = $item['Id'];
 
-/**
- *  Get user permissions
- */
+// Get user permissions
 $permissions = $permissionController->get($userId);
 
-/**
- *  Get repositories groups
- */
+// Get repositories groups
 $groupsList = $groupController->listAll(true);
+
+// Get repositories, deduplicated by repository Id as the listing returns one row per snapshot and environment
+$reposList = [];
+
+foreach ($repoListingController->list() as $repo) {
+    if (isset($reposList[$repo['repoId']])) {
+        continue;
+    }
+
+    $label = $repo['Name'];
+
+    if ($repo['Package_type'] == 'deb') {
+        $label .= ' ❯ ' . $repo['Dist'] . ' ❯ ' . $repo['Section'];
+    }
+
+    if ($repo['Package_type'] == 'rpm' and !empty($repo['Releasever'])) {
+        $label .= ' ❯ ' . $repo['Releasever'];
+    }
+
+    $reposList[$repo['repoId']] = $label;
+}
diff --git a/www/controllers/Layout/Panel/vars/snapshot/rebuild.vars.inc.php b/www/controllers/Layout/Panel/vars/snapshot/rebuild.vars.inc.php
new file mode 100644
index 000000000..0792cb0ad
--- /dev/null
+++ b/www/controllers/Layout/Panel/vars/snapshot/rebuild.vars.inc.php
@@ -0,0 +1,38 @@
+<?php
+use \Controllers\User\Permission\Repo as RepoPermission;
+
+$repoController = new \Controllers\Repo\Repo();
+$gpgSignChecked = '';
+
+// If the user does not have permission to rebuild repositories, prevent access to this panel.
+if (!RepoPermission::allowedAction('rebuild')) {
+    throw new Exception('You are not allowed to rebuild repositories');
+}
+
+if (empty(__ACTUAL_URI__[2])) {
+    throw new Exception('Snapshot ID is missing');
+}
+
+if (!is_numeric(__ACTUAL_URI__[2])) {
+    throw new Exception('Invalid snapshot ID');
+}
+
+$snapId = __ACTUAL_URI__[2];
+
+// Retrieve repository infos from DB
+$repoController->getAllById(null, $snapId);
+
+// Retrieve snapshot rebuild status
+$rebuild = $repoController->getRebuild();
+
+if (!empty($rebuild) and $rebuild == 'running') {
+    throw new Exception('Snapshot metadata rebuild is currently running. You cannot rebuild metadata at this time.');
+}
+
+// Define if the GPG signature checkbox should be checked by default
+if ($repoController->getPackageType() == 'rpm' && RPM_SIGN_PACKAGES == 'true') {
+    $gpgSignChecked = 'checked';
+}
+if ($repoController->getPackageType() == 'deb' && DEB_SIGN_REPO == 'true') {
+    $gpgSignChecked = 'checked';
+}
diff --git a/www/controllers/Layout/Panel/vars/snapshot/upload.vars.inc.php b/www/controllers/Layout/Panel/vars/snapshot/upload.vars.inc.php
new file mode 100644
index 000000000..e657e6992
--- /dev/null
+++ b/www/controllers/Layout/Panel/vars/snapshot/upload.vars.inc.php
@@ -0,0 +1,47 @@
+<?php
+use \Controllers\User\Permission\Repo as RepoPermission;
+
+$repoController = new \Controllers\Repo\Repo();
+
+// If the user does not have permission to upload packages, prevent access to this panel.
+if (!RepoPermission::allowedAction('upload-package')) {
+    throw new Exception('You are not allowed to upload packages');
+}
+
+if (empty(__ACTUAL_URI__[2])) {
+    throw new Exception('Snapshot ID is missing');
+}
+
+if (!is_numeric(__ACTUAL_URI__[2])) {
+    throw new Exception('Invalid snapshot ID');
+}
+
+$snapId = __ACTUAL_URI__[2];
+
+// Instanciate repo snapshot package controller (it will also check if the snapshot exists)
+$repoPackageController = new \Controllers\Repo\Snapshot\Package($snapId);
+
+// Retrieve repository infos from DB
+$repoController->getAllById(null, $snapId);
+
+// Retrieve snapshot rebuild status
+$rebuild = $repoController->getRebuild();
+
+// Define snapshot path
+if ($repoController->getPackageType() == 'rpm') {
+    $snapshotPath = REPOS_DIR . '/rpm/' . $repoController->getName() . '/' . $repoController->getReleasever() . '/' . $repoController->getDate();
+}
+
+if ($repoController->getPackageType() == 'deb') {
+    $snapshotPath = REPOS_DIR . '/deb/' . $repoController->getName() . '/' . $repoController->getDist() . '/' . $repoController->getSection() . '/' . $repoController->getDate();
+}
+
+// Check if the snapshot path exists
+if (!is_dir($snapshotPath)) {
+    throw new Exception('Snapshot path does not exist on the server');
+}
+
+// If a task is already running on this repo then print a message
+if (!empty($rebuild) and $rebuild == 'running') {
+    throw new Exception('A task is running on this repository snapshot. You cannot upload packages at this time.');
+}
diff --git a/www/controllers/Layout/Panel/vars/tasks/edit.vars.inc.php b/www/controllers/Layout/Panel/vars/tasks/edit.vars.inc.php
index d1a221997..f5f6cb637 100644
--- a/www/controllers/Layout/Panel/vars/tasks/edit.vars.inc.php
+++ b/www/controllers/Layout/Panel/vars/tasks/edit.vars.inc.php
@@ -1,9 +1,11 @@
 <?php
+use \Controllers\User\Permission\Task as TaskPermission;
+
 $taskController = new \Controllers\Task\Task();
 $tasks = [];
 
-// If the user is not an admin, check if they have permissions to edit a task
-if (!IS_ADMIN and !in_array('edit', USER_PERMISSIONS['tasks']['allowed-actions'])) {
+// Check if the user has permission to edit tasks
+if (!TaskPermission::allowedAction('edit')) {
     throw new Exception('You are not allowed to edit a task.');
 }
 
diff --git a/www/controllers/Layout/Tab/Repos.php b/www/controllers/Layout/Tab/Repos.php
index 9380db833..9b70d7532 100644
--- a/www/controllers/Layout/Tab/Repos.php
+++ b/www/controllers/Layout/Tab/Repos.php
@@ -8,6 +8,7 @@ class Repos
 {
     public static function render()
     {
+        Render::render('repos/kpi');
         Render::render('repos/list');
     }
 }
diff --git a/www/controllers/Layout/Tab/Stats.php b/www/controllers/Layout/Tab/Repository.php
similarity index 79%
rename from www/controllers/Layout/Tab/Stats.php
rename to www/controllers/Layout/Tab/Repository.php
index 506ce912c..67e835ece 100644
--- a/www/controllers/Layout/Tab/Stats.php
+++ b/www/controllers/Layout/Tab/Repository.php
@@ -5,7 +5,7 @@
 use Controllers\User\Permission\Repo as RepoPermission;
 use Controllers\Layout\Container\Render;
 
-class Stats
+class Repository
 {
     public static function render()
     {
@@ -14,8 +14,7 @@ public static function render()
             header('Location: /');
         }
 
-        if (__ACTUAL_URI__[2] == 'repo') {
-            Render::render('stats/repo');
-        }
+        Render::render('repo/kpi');
+        Render::render('repo/stats');
     }
 }
diff --git a/www/controllers/Layout/Tab/Run.php b/www/controllers/Layout/Tab/Run.php
index 94ea57c5d..b96d1f47d 100644
--- a/www/controllers/Layout/Tab/Run.php
+++ b/www/controllers/Layout/Tab/Run.php
@@ -2,20 +2,27 @@
 
 namespace Controllers\Layout\Tab;
 
-use Controllers\User\Permission\Task as TaskPermission;
-use Controllers\Layout\Container\Render;
-
 class Run
 {
     public static function render()
     {
-        // If user is not allowed to see tasks, redirect to home page
-        if (!TaskPermission::allowed()) {
-            header('Location: /');
+        /**
+         *  /run now redirects to "/tasks", which is the main page for task management
+         *  If it is followed by an ID (ex: /run/123), then redirects to /task/123
+         */
+        $currentPath = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
+
+        // If the path is exactly "/run", redirect to "/tasks"
+        if ($currentPath === '/run') {
+            header('Location: /tasks');
             exit;
         }
 
-        Render::render('tasks/log');
-        Render::render('tasks/list');
+        // If the path starts with "/run/" followed by an ID, redirect to "/task/{ID}"
+        if (preg_match('#^/run/(\d+)$#', $currentPath, $matches)) {
+            $taskId = $matches[1];
+            header('Location: /task/' . $taskId);
+            exit;
+        }
     }
 }
diff --git a/www/controllers/Layout/Tab/Browse.php b/www/controllers/Layout/Tab/Snapshot.php
similarity index 81%
rename from www/controllers/Layout/Tab/Browse.php
rename to www/controllers/Layout/Tab/Snapshot.php
index cc84bc889..f34f6b020 100644
--- a/www/controllers/Layout/Tab/Browse.php
+++ b/www/controllers/Layout/Tab/Snapshot.php
@@ -4,7 +4,7 @@
 use \Controllers\User\Permission\Repo as RepoPermission;
 use \Controllers\Layout\Container\Render;
 
-class Browse
+class Snapshot
 {
     public static function render()
     {
@@ -13,7 +13,7 @@ public static function render()
             header('Location: /');
         }
 
-        Render::render('browse/list');
-        Render::render('browse/actions');
+        Render::render('snapshot/kpi');
+        Render::render('snapshot/list');
     }
 }
diff --git a/www/controllers/Layout/Tab/Task.php b/www/controllers/Layout/Tab/Task.php
new file mode 100644
index 000000000..a16e499cd
--- /dev/null
+++ b/www/controllers/Layout/Tab/Task.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Controllers\Layout\Tab;
+
+use Controllers\User\Permission\Task as TaskPermission;
+use Controllers\Layout\Container\Render;
+
+class Task
+{
+    public static function render()
+    {
+        // If user is not allowed to see tasks, redirect to home page
+        if (!TaskPermission::allowed()) {
+            header('Location: /');
+            exit;
+        }
+
+        Render::render('tasks/log');
+    }
+}
diff --git a/www/controllers/Layout/Tab/Tasks.php b/www/controllers/Layout/Tab/Tasks.php
new file mode 100644
index 000000000..b75b30bd1
--- /dev/null
+++ b/www/controllers/Layout/Tab/Tasks.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Controllers\Layout\Tab;
+
+use Controllers\User\Permission\Task as TaskPermission;
+use Controllers\Layout\Container\Render;
+
+class Tasks
+{
+    public static function render()
+    {
+        // If user is not allowed to see tasks, redirect to home page
+        if (!TaskPermission::allowed()) {
+            header('Location: /');
+            exit;
+        }
+
+        Render::render('tasks/tasks');
+    }
+}
diff --git a/www/controllers/Layout/Table/Render.php b/www/controllers/Layout/Table/Render.php
index 29e4c2cd9..0eea7f98d 100644
--- a/www/controllers/Layout/Table/Render.php
+++ b/www/controllers/Layout/Table/Render.php
@@ -62,7 +62,7 @@ public static function paginationBtn($currentPage, $totalPages): void
 
         // Previous button
         if ($currentPage > 1) {
-            $output .= '<button class="reloadable-table-page-btn pagination-btn-first pagination-btn-previous" page="' . ($currentPage - 1) . '" title="Previous"><img src="/assets/icons/previous.svg" class="icon" /></button>';
+            $output .= '<button class="reloadable-table-page-btn pagination-btn-first pagination-btn-previous" page="' . ($currentPage - 1) . '" title="Previous">❮</button>';
         }
 
         // First page button (n°1)
@@ -108,7 +108,7 @@ public static function paginationBtn($currentPage, $totalPages): void
 
         // Next button
         if ($currentPage < $totalPages) {
-            $output .= '<button class="reloadable-table-page-btn pagination-btn-last pagination-btn-next" page="' . ($currentPage + 1) . '" title="Next"><img src="/assets/icons/next.svg" class="icon" /></button>';
+            $output .= '<button class="reloadable-table-page-btn pagination-btn-last pagination-btn-next" page="' . ($currentPage + 1) . '" title="Next">❯</button>';
         }
 
         echo $output;
diff --git a/www/controllers/Layout/Table/vars/host/installed-packages.vars.inc.php b/www/controllers/Layout/Table/vars/host/installed-packages.vars.inc.php
new file mode 100644
index 000000000..be881cb92
--- /dev/null
+++ b/www/controllers/Layout/Table/vars/host/installed-packages.vars.inc.php
@@ -0,0 +1,34 @@
+<?php
+$id = __ACTUAL_URI__[2];
+$hostPackageController = new \Controllers\Host\Package\Package($id);
+$reloadableTableOffset = 0;
+$search = '';
+
+// Retrieve offset from cookie if exists
+if (!empty($_COOKIE['tables/host/installed-packages/offset']) and is_numeric($_COOKIE['tables/host/installed-packages/offset'])) {
+    $reloadableTableOffset = (int) $_COOKIE['tables/host/installed-packages/offset'];
+}
+
+// Retrieve search filter from cookie if exists
+if (!empty($_COOKIE['tables/host/installed-packages/search'])) {
+    $search = \Controllers\Utils\Validate::string($_COOKIE['tables/host/installed-packages/search']);
+}
+
+// Get total count of inventoried packages (filtered if a search is active)
+$reloadableTableTotalItems = $hostPackageController->countInventory($search);
+
+// If offset is out of range, reset it to 0
+if ($reloadableTableOffset >= $reloadableTableTotalItems) {
+    $reloadableTableOffset = 0;
+}
+
+// Get list of inventoried packages, with offset and optional search filter
+$reloadableTableContent = $hostPackageController->getInventory($search, true, $reloadableTableOffset);
+
+// Count total pages for the pagination
+$reloadableTableTotalPages = (int) ceil($reloadableTableTotalItems / 10);
+
+// Calculate current page number
+$reloadableTableCurrentPage = (int) ceil($reloadableTableOffset / 10) + 1;
+
+unset($hostPackageController);
diff --git a/www/controllers/Layout/Table/vars/stats/access.vars.inc.php b/www/controllers/Layout/Table/vars/stats/access.vars.inc.php
index 419945087..f6ca42fc7 100644
--- a/www/controllers/Layout/Table/vars/stats/access.vars.inc.php
+++ b/www/controllers/Layout/Table/vars/stats/access.vars.inc.php
@@ -7,20 +7,18 @@
 $timeEnd = strtotime(DATE_YMD . ' 23:59:59');
 $envs = [];
 
-if (__ACTUAL_URI__[2] != 'repo') {
-    throw new Exception('Error: invalid URI specified.');
+// Check that repository Id is specified
+if (empty(__ACTUAL_URI__[2])) {
+    throw new Exception('no repository ID specified');
 }
 
-if (empty(__ACTUAL_URI__[3])) {
-    throw new Exception('Error: missing repository ID.');
-}
-
-if (!is_numeric(__ACTUAL_URI__[3])) {
-    throw new Exception('Error: invalid repository ID specified.');
+// Check that repository Id is valid
+if (!is_numeric(__ACTUAL_URI__[2])) {
+    throw new Exception('invalid repository ID');
 }
 
 // Get repository info
-$repoController->getAllById(__ACTUAL_URI__[3]);
+$repoController->getAllById(__ACTUAL_URI__[2]);
 
 // Retrieve period from cookie if exists
 if (!empty($_COOKIE['tables/stats/access/period'])) {
diff --git a/www/controllers/Layout/Table/vars/stats/ip-access.vars.inc.php b/www/controllers/Layout/Table/vars/stats/ip-access.vars.inc.php
index 6fd256bf4..269ac6f2c 100644
--- a/www/controllers/Layout/Table/vars/stats/ip-access.vars.inc.php
+++ b/www/controllers/Layout/Table/vars/stats/ip-access.vars.inc.php
@@ -7,16 +7,18 @@
 $timeEnd = strtotime(DATE_YMD . ' 23:59:59');
 $envs = [];
 
-if (empty(__ACTUAL_URI__[3])) {
-    throw new Exception('Error: missing repository ID.');
+// Check that repository Id is specified
+if (empty(__ACTUAL_URI__[2])) {
+    throw new Exception('no repository ID specified');
 }
 
-if (!is_numeric(__ACTUAL_URI__[3])) {
-    throw new Exception('Error: invalid repository ID specified.');
+// Check that repository Id is valid
+if (!is_numeric(__ACTUAL_URI__[2])) {
+    throw new Exception('invalid repository ID');
 }
 
 // Get repository info
-$repoController->getAllById(__ACTUAL_URI__[3]);
+$repoController->getAllById(__ACTUAL_URI__[2]);
 
 // Retrieve period from cookie if exists
 if (!empty($_COOKIE['tables/stats/ip-access/period'])) {
diff --git a/www/controllers/Layout/Table/vars/tasks/list-children.vars.inc.php b/www/controllers/Layout/Table/vars/tasks/list-children.vars.inc.php
new file mode 100644
index 000000000..a330d4b0d
--- /dev/null
+++ b/www/controllers/Layout/Table/vars/tasks/list-children.vars.inc.php
@@ -0,0 +1,24 @@
+<?php
+$taskController = new \Controllers\Task\Task();
+$taskListingController = new \Controllers\Task\Listing();
+$reloadableTableOffset = 0;
+
+// The parent task Id is the task Id currently displayed (/task/{id})
+$parentTaskId = __ACTUAL_URI__[2];
+
+// Retrieve offset from cookie if exists
+if (!empty($_COOKIE['tables/tasks/list-children/offset']) and is_numeric($_COOKIE['tables/tasks/list-children/offset'])) {
+    $reloadableTableOffset = $_COOKIE['tables/tasks/list-children/offset'];
+}
+
+// Get list of sub-tasks generated by the parent task, with offset
+$reloadableTableContent = $taskListingController->getByParentId($parentTaskId, true, $reloadableTableOffset);
+
+// Get list of ALL sub-tasks, without offset, for the total count
+$reloadableTableTotalItems = count($taskListingController->getByParentId($parentTaskId));
+
+// Count total pages for the pagination
+$reloadableTableTotalPages = ceil($reloadableTableTotalItems / 10);
+
+// Calculate current page number
+$reloadableTableCurrentPage = ceil($reloadableTableOffset / 10) + 1;
diff --git a/www/controllers/Layout/Table/vars/tasks/list-done.vars.inc.php b/www/controllers/Layout/Table/vars/tasks/list-done.vars.inc.php
index c6635dc6c..e88d4c393 100644
--- a/www/controllers/Layout/Table/vars/tasks/list-done.vars.inc.php
+++ b/www/controllers/Layout/Table/vars/tasks/list-done.vars.inc.php
@@ -1,31 +1,21 @@
 <?php
-$myTask = new \Controllers\Task\Task();
+$taskController = new \Controllers\Task\Task();
 $taskListingController = new \Controllers\Task\Listing();
 $reloadableTableOffset = 0;
 
-/**
- *  Retrieve offset from cookie if exists
- */
+// Retrieve offset from cookie if exists
 if (!empty($_COOKIE['tables/tasks/list-done/offset']) and is_numeric($_COOKIE['tables/tasks/list-done/offset'])) {
     $reloadableTableOffset = $_COOKIE['tables/tasks/list-done/offset'];
 }
 
-/**
- *  Get list of done tasks, with offset
- */
+// Get list of done tasks, with offset
 $reloadableTableContent = $taskListingController->getDone('', true, $reloadableTableOffset);
 
-/**
- *  Get list of ALL done tasks, without offset, for the total count
- */
+// Get list of ALL done tasks, without offset, for the total count
 $reloadableTableTotalItems = count($taskListingController->getDone());
 
-/**
- *  Count total pages for the pagination
- */
+// Count total pages for the pagination
 $reloadableTableTotalPages = ceil($reloadableTableTotalItems / 10);
 
-/**
- *  Calculate current page number
- */
+// Calculate current page number
 $reloadableTableCurrentPage = ceil($reloadableTableOffset / 10) + 1;
diff --git a/www/controllers/Layout/Table/vars/tasks/list-queued.vars.inc.php b/www/controllers/Layout/Table/vars/tasks/list-queued.vars.inc.php
index 99bb55784..8e6bce488 100644
--- a/www/controllers/Layout/Table/vars/tasks/list-queued.vars.inc.php
+++ b/www/controllers/Layout/Table/vars/tasks/list-queued.vars.inc.php
@@ -1,31 +1,21 @@
 <?php
-$myTask = new \Controllers\Task\Task();
+$taskController = new \Controllers\Task\Task();
 $taskListingController = new \Controllers\Task\Listing();
 $reloadableTableOffset = 0;
 
-/**
- *  Retrieve offset from cookie if exists
- */
+// Retrieve offset from cookie if exists
 if (!empty($_COOKIE['tables/tasks/list-queued/offset']) and is_numeric($_COOKIE['tables/tasks/list-queued/offset'])) {
     $reloadableTableOffset = $_COOKIE['tables/tasks/list-queued/offset'];
 }
 
-/**
- *  Get list of queued tasks, with offset
- */
+// Get list of queued tasks, with offset
 $reloadableTableContent = $taskListingController->getQueued('', true, $reloadableTableOffset);
 
-/**
- *  Get list of ALL queued tasks, without offset, for the total count
- */
+// Get list of ALL queued tasks, without offset, for the total count
 $reloadableTableTotalItems = count($taskListingController->getQueued());
 
-/**
- *  Count total pages for the pagination
- */
+// Count total pages for the pagination
 $reloadableTableTotalPages = ceil($reloadableTableTotalItems / 10);
 
-/**
- *  Calculate current page number
- */
+// Calculate current page number
 $reloadableTableCurrentPage = ceil($reloadableTableOffset / 10) + 1;
diff --git a/www/controllers/Layout/Table/vars/tasks/list-running.vars.inc.php b/www/controllers/Layout/Table/vars/tasks/list-running.vars.inc.php
index 65f9a5728..065290e3d 100644
--- a/www/controllers/Layout/Table/vars/tasks/list-running.vars.inc.php
+++ b/www/controllers/Layout/Table/vars/tasks/list-running.vars.inc.php
@@ -1,31 +1,21 @@
 <?php
-$myTask = new \Controllers\Task\Task();
+$taskController = new \Controllers\Task\Task();
 $taskListingController = new \Controllers\Task\Listing();
 $reloadableTableOffset = 0;
 
-/**
- *  Retrieve offset from cookie if exists
- */
+// Retrieve offset from cookie if exists
 if (!empty($_COOKIE['tables/tasks/list-running/offset']) and is_numeric($_COOKIE['tables/tasks/list-running/offset'])) {
     $reloadableTableOffset = $_COOKIE['tables/tasks/list-running/offset'];
 }
 
-/**
- *  Get list of running tasks, with offset
- */
+// Get list of running tasks, with offset
 $reloadableTableContent = $taskListingController->getRunning('', true, $reloadableTableOffset);
 
-/**
- *  Get list of ALL running tasks, without offset, for the total count
- */
+// Get list of ALL running tasks, without offset, for the total count
 $reloadableTableTotalItems = count($taskListingController->getRunning());
 
-/**
- *  Count total pages for the pagination
- */
+// Count total pages for the pagination
 $reloadableTableTotalPages = ceil($reloadableTableTotalItems / 10);
 
-/**
- *  Calculate current page number
- */
+// Calculate current page number
 $reloadableTableCurrentPage = ceil($reloadableTableOffset / 10) + 1;
diff --git a/www/controllers/Layout/Table/vars/tasks/list-scheduled.vars.inc.php b/www/controllers/Layout/Table/vars/tasks/list-scheduled.vars.inc.php
index f08221dcb..181b928a8 100644
--- a/www/controllers/Layout/Table/vars/tasks/list-scheduled.vars.inc.php
+++ b/www/controllers/Layout/Table/vars/tasks/list-scheduled.vars.inc.php
@@ -1,31 +1,21 @@
 <?php
-$myTask = new \Controllers\Task\Task();
+$taskController = new \Controllers\Task\Task();
 $taskListingController = new \Controllers\Task\Listing();
 $reloadableTableOffset = 0;
 
-/**
- *  Retrieve offset from cookie if exists
- */
+// Retrieve offset from cookie if exists
 if (!empty($_COOKIE['tables/tasks/list-scheduled/offset']) and is_numeric($_COOKIE['tables/tasks/list-scheduled/offset'])) {
     $reloadableTableOffset = $_COOKIE['tables/tasks/list-scheduled/offset'];
 }
 
-/**
- *  Get list of scheduled tasks, with offset
- */
+// Get list of scheduled tasks, with offset
 $reloadableTableContent = $taskListingController->getScheduled(true, $reloadableTableOffset);
 
-/**
- *  Get list of ALL scheduled tasks, without offset, for the total count
- */
+// Get list of ALL scheduled tasks, without offset, for the total count
 $reloadableTableTotalItems = count($taskListingController->getScheduled());
 
-/**
- *  Count total pages for the pagination
- */
+// Count total pages for the pagination
 $reloadableTableTotalPages = ceil($reloadableTableTotalItems / 10);
 
-/**
- *  Calculate current page number
- */
+// Calculate current page number
 $reloadableTableCurrentPage = ceil($reloadableTableOffset / 10) + 1;
diff --git a/www/controllers/Repo/Browse.php b/www/controllers/Repo/Browse.php
index b52f280f9..214c1390b 100644
--- a/www/controllers/Repo/Browse.php
+++ b/www/controllers/Repo/Browse.php
@@ -209,7 +209,7 @@ private static function printSearchResultFiles(array $results): void
 
             <li>
                 <div class="<?= $class ?>" path="<?= htmlspecialchars($path, ENT_QUOTES) ?>" name="<?= htmlspecialchars($file, ENT_QUOTES) ?>">
-                    <div class="flex column-gap-5 align-item-center" title="<?= $title ?>">
+                    <div class="flex column-gap-8 align-item-center" title="<?= $title ?>">
                         <img src="/assets/icons/<?= $icon ?>.svg" class="icon" />
                         <p><?= htmlspecialchars($file, ENT_QUOTES) ?></p>
                     </div>
@@ -265,7 +265,7 @@ private static function printFiles(array $files): void
 
             <li>
                 <div class="<?= $class ?>" path="<?= $path ?>" name="<?= $file ?>">
-                    <div class="flex column-gap-5 align-item-center" title="<?= $title ?>">
+                    <div class="flex column-gap-8 align-item-center" title="<?= $title ?>">
                         <img src="/assets/icons/<?= $icon ?>.svg" class="icon" />
                         <p><?= $file ?></p>
                     </div>
@@ -286,10 +286,10 @@ private static function printFiles(array $files): void
      */
     private static function printSubDir(string $dir, string $path): void
     {
-        $fullPath = $path . '/' . $dir;
-        ?>
+        $fullPath = $path . '/' . $dir; ?>
+
         <li>
-            <div class="explorer-toggle div-generic-blue pointer flex column-gap-5 align-item-center" title="Directory <?= $dir ?>" data-path="<?= htmlspecialchars($fullPath, ENT_QUOTES) ?>">
+            <div class="explorer-toggle div-generic-blue pointer flex column-gap-8 align-item-center" title="Directory <?= $dir ?>" data-path="<?= htmlspecialchars($fullPath, ENT_QUOTES) ?>">
                 <img src="/assets/icons/folder.svg" class="icon" />
                 <p><?= $dir ?></p>
             </div>
diff --git a/www/controllers/Repo/Deb.php b/www/controllers/Repo/Deb.php
index f16885657..78f58c4b4 100644
--- a/www/controllers/Repo/Deb.php
+++ b/www/controllers/Repo/Deb.php
@@ -2,8 +2,6 @@
 
 namespace Controllers\Repo;
 
-use Exception;
-
 class Deb extends \Controllers\Repo\Repo
 {
     public function __construct()
@@ -20,14 +18,6 @@ public function getIdByNameDistComponent(string $name, string $distribution, str
         return $this->model->getIdByNameDistComponent($name, $distribution, $component);
     }
 
-    /**
-     *  Return repository environment description
-     */
-    public function getDescriptionByName(string $name, string $dist, string $component, string $env) : string|null
-    {
-        return $this->model->getDescriptionByName($name, $dist, $component, $env);
-    }
-
     /**
      *  Return environment Id from repo name
      */
diff --git a/www/controllers/Repo/Edit/Form.php b/www/controllers/Repo/Edit/Form.php
index f43bca092..c59a4d3bb 100644
--- a/www/controllers/Repo/Edit/Form.php
+++ b/www/controllers/Repo/Edit/Form.php
@@ -64,7 +64,7 @@ public function get(array $repos) : string
              */
             ob_start();
 
-            echo '<div class="edit-form-params" repo-id="' . $repoId . '" snap-id="' . $snapId . '">';
+            echo '<div class="edit-form-params form-block form-block-accent-' . ($packageType == 'deb' ? 'red' : 'blue') . '" repo-id="' . $repoId . '" snap-id="' . $snapId . '">';
 
             /**
              *  Include form template
@@ -73,8 +73,6 @@ public function get(array $repos) : string
 
             echo '</div>';
 
-            echo '<br><hr>';
-
             $content .= ob_get_clean();
         }
 
@@ -152,13 +150,6 @@ public function edit(array $params) : void
                 $repoController->updateSource($param['repo-id'], $param['source']);
             }
 
-            /**
-             *  Update snapshot description
-             *  TODO: no editable description for now
-             */
-            // $repoController->updateDescription($param['snap-id'], $description);
-            // $snapshotController->updateDescription($param['snap-id'], $description);
-
             /**
              *  Add history
              */
diff --git a/www/controllers/Repo/Environment.php b/www/controllers/Repo/Environment.php
index f99a3f937..8a95806fa 100644
--- a/www/controllers/Repo/Environment.php
+++ b/www/controllers/Repo/Environment.php
@@ -2,8 +2,7 @@
 
 namespace Controllers\Repo;
 
-use Exception;
-use Controllers\Utils\Validate;
+use \Controllers\Environment as GlobalEnvironment;
 
 class Environment
 {
@@ -15,19 +14,19 @@ public function __construct()
     }
 
     /**
-     *  Return all environments associated to a repository ID
+     *  Return all environments associated to a snapshot Id
      */
-    public function getByRepoId(int $repoId): array
+    public function getBySnapId(int $snapId): array
     {
-        return $this->model->getByRepoId($repoId);
+        return $this->model->getBySnapId($snapId);
     }
 
     /**
      *  Associate a new environment to a snapshot
      */
-    public function add(int $snapId, string $env, string $description = '') : void
+    public function add(int $snapId, string $env) : void
     {
-        $this->model->add($snapId, $env, $description);
+        $this->model->add($snapId, $env);
     }
 
     /**
@@ -38,19 +37,6 @@ public function remove(int $id) : void
         $this->model->remove($id);
     }
 
-    /**
-     *  Update environment description
-     */
-    public function updateDescription(int $id, string $description) : void
-    {
-        // Description should not contain single quotes or backslashes
-        if (str_contains($description, "'") || str_contains($description, "\\") || str_contains($description, '<?') || str_contains($description, '?>')) {
-            throw new Exception('Description contains invalid characters');
-        }
-
-        $this->model->updateDescription($id, Validate::string($description));
-    }
-
     /**
      *  Return true if the repository environment Id exists
      */
diff --git a/www/controllers/Repo/Listing.php b/www/controllers/Repo/Listing.php
index e1101766f..84a195cb4 100644
--- a/www/controllers/Repo/Listing.php
+++ b/www/controllers/Repo/Listing.php
@@ -46,4 +46,20 @@ public function listSnapshots(int $repoId) : array
     {
         return $this->model->listSnapshots($repoId);
     }
+
+    /**
+     *  Return the list of repositories matching the specified filters, with their latest active snapshot Id
+     */
+    public function listByTarget(string $groupId = '', array $tags = [], string $packageType = '') : array
+    {
+        return $this->model->listByTarget($groupId, $tags, $packageType);
+    }
+
+    /**
+     *  Return the list of all distinct tags used by repositories
+     */
+    public function listTags(): array
+    {
+        return $this->model->listTags();
+    }
 }
diff --git a/www/controllers/Repo/Package/Sync.php b/www/controllers/Repo/Package/Sync.php
index bad8438bf..e3b8bb086 100644
--- a/www/controllers/Repo/Package/Sync.php
+++ b/www/controllers/Repo/Package/Sync.php
@@ -58,12 +58,12 @@ private function syncPackage()
             if ($this->repoSnapshotController->getDateById($this->repoController->getSnapId()) != $this->repoController->getDate()) {
                 if ($this->repoController->getPackageType() == 'rpm') {
                     if ($this->rpmRepoController->existsSnapDate($this->repoController->getName(), $this->repoController->getReleasever(), $this->repoController->getDate())) {
-                        throw new Exception('A snapshot already exists on the ' . Label::black($this->repoController->getDateFormatted()));
+                        throw new Exception('A snapshot already exists on the ' . Label::white($this->repoController->getDateFormatted()));
                     }
                 }
                 if ($this->repoController->getPackageType() == 'deb') {
                     if ($this->debRepoController->existsSnapDate($this->repoController->getName(), $this->repoController->getDist(), $this->repoController->getSection(), $this->repoController->getDate())) {
-                        throw new Exception('A snapshot already exists on the ' . Label::black($this->repoController->getDateFormatted()));
+                        throw new Exception('A snapshot already exists on the ' . Label::white($this->repoController->getDateFormatted()));
                     }
                 }
             }
diff --git a/www/controllers/Repo/Repo.php b/www/controllers/Repo/Repo.php
index eb34138d1..0dbb5c70f 100644
--- a/www/controllers/Repo/Repo.php
+++ b/www/controllers/Repo/Repo.php
@@ -25,8 +25,9 @@ class Repo
     private $date;
     private $dateFormatted;
     private $time;
-    private $env;
+    private $env = [];
     private $description;
+    private $tags = [];
     private $group;
     private $advancedParams = [];
     private $signed;
@@ -117,6 +118,11 @@ public function setDescription($description = ''): void
         $this->description = Validate::string($description);
     }
 
+    public function setTags(array $tags = []): void
+    {
+        $this->tags = $tags;
+    }
+
     public function setSource(string $source): void
     {
         $this->source = $source;
@@ -199,6 +205,7 @@ public function getPackageType(): string
 
     public function getEnv(): string|array
     {
+        // return $this->env ?? [];
         return $this->env;
     }
 
@@ -257,6 +264,11 @@ public function getDescription(): string|null
         return $this->description;
     }
 
+    public function getTags(): array
+    {
+        return $this->tags;
+    }
+
     public function getGroup(): string|null
     {
         return $this->group;
@@ -292,74 +304,76 @@ public function getAllById(string|int|null $repoId = null, string|int|null $snap
     {
         $data = $this->model->getAllById($repoId, $snapId, $envId);
 
-        if (!empty($data['repoId'])) {
-            $this->setRepoId($data['repoId']);
-        }
-        if (!empty($data['snapId'])) {
-            $this->setSnapId($data['snapId']);
-        }
-        if (!empty($data['envId'])) {
-            $this->setEnvId($data['envId']);
-        }
-        if (!empty($data['Source'])) {
-            $this->setSource($data['Source']);
-        }
-        if (!empty($data['Name'])) {
-            $this->setName($data['Name']);
-        }
-        if (!empty($data['Releasever'])) {
-            $this->setReleasever($data['Releasever']);
-        }
-        if (!empty($data['Dist'])) {
-            $this->setDist($data['Dist']);
-        }
-        if (!empty($data['Section'])) {
-            $this->setSection($data['Section']);
-        }
-        if (!empty($data['Package_type'])) {
-            $this->setPackageType($data['Package_type']);
-        }
-        if (!empty($data['Date'])) {
-            $this->setDate($data['Date']);
-        }
-        if (!empty($data['Time'])) {
-            $this->setTime($data['Time']);
-        }
-        if (!empty($data['Status'])) {
-            $this->setStatus($data['Status']);
-        }
-        if (!empty($data['Env'])) {
-            $this->setEnv($data['Env']);
-        }
-        if (!empty($data['Type'])) {
-            $this->setType($data['Type']);
-        }
-        if (!empty($data['Signed'])) {
-            $this->setSigned($data['Signed']);
-        }
-        if (!empty($data['Reconstruct'])) {
-            $this->setRebuild($data['Reconstruct']);
-        }
-        if (!empty($data['Description'])) {
-            $this->setDescription($data['Description']);
-        }
-        if (!empty($data['Arch'])) {
-            $this->setArch(explode(',', $data['Arch']));
-        }
+        try {
+            if (!empty($data['repoId'])) {
+                $this->setRepoId($data['repoId']);
+            }
+            if (!empty($data['snapId'])) {
+                $this->setSnapId($data['snapId']);
+            }
+            if (!empty($data['envId'])) {
+                $this->setEnvId($data['envId']);
+            }
+            if (!empty($data['Source'])) {
+                $this->setSource($data['Source']);
+            }
+            if (!empty($data['Name'])) {
+                $this->setName($data['Name']);
+            }
+            if (!empty($data['Releasever'])) {
+                $this->setReleasever($data['Releasever']);
+            }
+            if (!empty($data['Dist'])) {
+                $this->setDist($data['Dist']);
+            }
+            if (!empty($data['Section'])) {
+                $this->setSection($data['Section']);
+            }
+            if (!empty($data['Package_type'])) {
+                $this->setPackageType($data['Package_type']);
+            }
+            if (!empty($data['Date'])) {
+                $this->setDate($data['Date']);
+            }
+            if (!empty($data['Time'])) {
+                $this->setTime($data['Time']);
+            }
+            if (!empty($data['Status'])) {
+                $this->setStatus($data['Status']);
+            }
+            if (!empty($data['Env'])) {
+                $this->setEnv($data['Env']);
+            }
+            if (!empty($data['Type'])) {
+                $this->setType($data['Type']);
+            }
+            if (!empty($data['Signed'])) {
+                $this->setSigned($data['Signed']);
+            }
+            if (!empty($data['Reconstruct'])) {
+                $this->setRebuild($data['Reconstruct']);
+            }
+            if (!empty($data['Arch'])) {
+                $this->setArch(explode(',', $data['Arch']));
+            }
+            if (!empty($data['Description'])) {
+                $this->setDescription($data['Description']);
+            }
+            if (!empty($data['Tags'])) {
+                $tags = explode(',', $data['Tags']);
+                $this->setTags($tags);
+            }
 
-        /**
-         *  Extract Advanced_params JSON
-         *  This includes package include/exclude, metadata custom fields and potentially other parameters in the future
-         *  It is optional and can be empty
-         */
-        if (!empty($data['Advanced_params'])) {
-            try {
+            /**
+             *  Advanced_params includes package include/exclude, metadata custom fields and potentially other parameters in the future
+             *  It is optional and can be empty
+             */
+            if (!empty($data['Advanced_params'])) {
                 $advancedParams = json_decode($data['Advanced_params'], true, 512, JSON_THROW_ON_ERROR);
-            } catch (JsonException $e) {
-                throw new Exception('Failed to decode advanced parameters JSON: ' . $e->getMessage());
+                $this->setAdvancedParams($advancedParams);
             }
-
-            $this->setAdvancedParams($advancedParams);
+        } catch (JsonException $e) {
+            throw new Exception('Failed to decode JSON data from database: ' . $e->getMessage());
         }
     }
 
@@ -533,4 +547,46 @@ public function updateSource(int $repoId, string $source): void
     {
         $this->model->updateSource($repoId, $source);
     }
+
+    /**
+     *  Update description
+     */
+    public function updateDescription(int $id, string $description): void
+    {
+        // Description should not contain single quotes or backslashes
+        if (str_contains($description, "'") || str_contains($description, "\\") || str_contains($description, '<?') || str_contains($description, '?>')) {
+            throw new Exception('Description contains invalid characters');
+        }
+
+        $this->model->updateDescription($id, Validate::string($description));
+    }
+
+    /**
+     *  Update tags
+     */
+    public function updateTags(int $id, array $tags): void
+    {
+        $validTags = [];
+
+        foreach ($tags as $tag) {
+            $tag = trim($tag);
+
+            // Ignore empty tags
+            if (empty($tag)) {
+                continue;
+            }
+
+            // Tags must be alphanumeric (hyphen and underscore allowed)
+            if (!Validate::alphaNumericHyphen($tag)) {
+                throw new Exception('Tag ' . $tag . ' contains invalid characters');
+            }
+
+            // Avoid duplicates
+            if (!in_array($tag, $validTags)) {
+                $validTags[] = $tag;
+            }
+        }
+
+        $this->model->updateTags($id, implode(',', $validTags));
+    }
 }
diff --git a/www/controllers/Repo/Rpm.php b/www/controllers/Repo/Rpm.php
index 264c8ad41..009995ed9 100644
--- a/www/controllers/Repo/Rpm.php
+++ b/www/controllers/Repo/Rpm.php
@@ -2,8 +2,6 @@
 
 namespace Controllers\Repo;
 
-use Exception;
-
 class Rpm extends \Controllers\Repo\Repo
 {
     public function __construct()
@@ -20,14 +18,6 @@ public function getIdByNameReleasever(string $name, string $releaseVersion) : in
         return $this->model->getIdByNameReleasever($name, $releaseVersion);
     }
 
-    /**
-     *  Return repository environment description
-     */
-    public function getDescriptionByName(string $name, string $releaseVersion, string $env) : string|null
-    {
-        return $this->model->getDescriptionByName($name, $releaseVersion, $env);
-    }
-
     /**
      *  Return environment Id from repo name
      */
diff --git a/www/controllers/Repo/Snapshot/Package.php b/www/controllers/Repo/Snapshot/Package.php
index 691a2f33f..8f08e17fb 100644
--- a/www/controllers/Repo/Snapshot/Package.php
+++ b/www/controllers/Repo/Snapshot/Package.php
@@ -126,6 +126,11 @@ public function upload(array $packages, bool $overwrite = false, bool $ignoreIfE
             throw new Exception('You are not allowed to upload packages');
         }
 
+        // Check if snapshot has a protected env
+        if ($this->repoSnapshotController->hasProtectedEnv($this->snapId)) {
+            throw new Exception('Snapshot has a protected environment and cannot be modified. Please contact your administrator.');
+        }
+
         // Both overwrite and ignoreIfExists cannot be true at the same time
         if ($overwrite && $ignoreIfExists) {
             throw new Exception('Options overwrite and ignore-if-exists are mutually exclusive');
@@ -331,6 +336,11 @@ public function delete(array $files): array
             throw new Exception('You are not allowed to delete packages.');
         }
 
+        // Check if snapshot has a protected env
+        if ($this->repoSnapshotController->hasProtectedEnv($this->snapId)) {
+            throw new Exception('Snapshot has a protected environment and cannot be modified. Please contact your administrator.');
+        }
+
         foreach ($files as $file) {
             $file = REPOS_DIR . '/' . $file;
 
diff --git a/www/controllers/Repo/Snapshot/Snapshot.php b/www/controllers/Repo/Snapshot/Snapshot.php
index 3179e2a83..c1133c66d 100644
--- a/www/controllers/Repo/Snapshot/Snapshot.php
+++ b/www/controllers/Repo/Snapshot/Snapshot.php
@@ -160,6 +160,24 @@ public function updateAdvancedParams(int $snapId, array $advancedParams): void
         $this->model->updateAdvancedParams($snapId, $advancedParams);
     }
 
+    /**
+     *  Return true if the snapshot has a protected environment
+     */
+    public function hasProtectedEnv(int $snapId): bool
+    {
+        $envController = new \Controllers\Environment();
+        $repoEnvController = new \Controllers\Repo\Environment();
+
+        // Get the list of environments associated with the snapshot and check if any of them is protected
+        foreach ($repoEnvController->getBySnapId($snapId) as $env) {
+            if ($envController->isProtected($env)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      *  Clean unused snapshots and return a message
      */
diff --git a/www/controllers/Repo/Task/Create.php b/www/controllers/Repo/Task/Create.php
index 1984aa53d..0440e183c 100644
--- a/www/controllers/Repo/Task/Create.php
+++ b/www/controllers/Repo/Task/Create.php
@@ -56,7 +56,7 @@ public function __construct(string $taskId)
     /**
      *  Create repository
      */
-    public function execute()
+    public function execute(): void
     {
         if ($this->type == 'mirror') {
             $this->mirror();
@@ -70,52 +70,38 @@ public function execute()
     /**
      *  Create a mirror repository
      */
-    private function mirror()
+    private function mirror(): void
     {
-        /**
-         *  Define the date and time of the new mirror snapshot
-         */
+        // Define the date and time of the new mirror snapshot
         $this->repoController->setDate(date('Y-m-d'));
         $this->repoController->setTime(date('H:i'));
 
-        /**
-         *  Sync packages
-         */
+        // Sync packages
         $this->syncPackage();
 
-        /**
-         *  Sign repository / packages
-         */
+        // Sign repository / packages
         $this->signPackage();
 
-        /**
-         *  Create repository and symlinks
-         */
+        // Create repository and symlinks
         $this->createMetadata();
 
-        /**
-         *  Finalize repository (add to database and set permissions)
-         */
+        // Finalize repository (add to database and set permissions)
         $this->finalize();
     }
 
     /**
      *  Create a local repository
      */
-    private function local()
+    private function local(): void
     {
-        /**
-         *  Set today date and time as target date and time
-         */
+        // Set today date and time as target date and time
         $this->repoController->setDate(date('Y-m-d'));
         $this->repoController->setTime(date('H:i'));
 
         $this->taskLogStepController->new('create-repo', 'CREATING REPOSITORY');
         $this->taskLogSubStepController->new('create-dirs', 'CREATING DIRECTORIES');
 
-        /**
-         *  Check if a repo/section with the same name is already active with snapshots
-         */
+        // Check if a repo/section with the same name is already active with snapshots
         if ($this->repoController->getPackageType() == 'rpm') {
             if ($this->rpmRepoController->isActive($this->repoController->getName(), $this->repoController->getReleasever())) {
                 throw new Exception(Label::white($this->repoController->getName() . ' ❯ ' . $this->repoController->getReleasever()) . ' repository already exists');
@@ -127,9 +113,7 @@ private function local()
             }
         }
 
-        /**
-         *  Define snapshot directory path
-         */
+        // Define snapshot directory path
         if ($this->repoController->getPackageType() == 'rpm') {
             $snapshotPath = REPOS_DIR . '/rpm/' . $this->repoController->getName() . '/' . $this->repoController->getReleasever() . '/' . $this->repoController->getDate();
         }
@@ -137,9 +121,7 @@ private function local()
             $snapshotPath = REPOS_DIR . '/deb/' . $this->repoController->getName() . '/' . $this->repoController->getDist() . '/' . $this->repoController->getSection() . '/' . $this->repoController->getDate();
         }
 
-        /**
-         *  Create snapshot directory and subdirectories
-         */
+        // Create snapshot directory and subdirectories
         if ($this->repoController->getPackageType() == 'rpm') {
             if (!is_dir($snapshotPath . '/packages')) {
                 if (!mkdir($snapshotPath . '/packages', 0770, true)) {
@@ -155,9 +137,7 @@ private function local()
             }
         }
 
-        /**
-         *  Create environment symlink, if an environment has been specified
-         */
+        // Create environment symlink, if an environment has been specified
         if (!empty($this->repoController->getEnv())) {
             foreach ($this->repoController->getEnv() as $env) {
                 if ($this->repoController->getPackageType() == 'rpm') {
@@ -167,18 +147,14 @@ private function local()
                     $link = REPOS_DIR . '/deb/' . $this->repoController->getName() . '/' . $this->repoController->getDist() . '/' . $this->repoController->getSection() . '/' . $env;
                 }
 
-                /**
-                 *  If a symlink with the same name already exists, we remove it
-                 */
+                // If a symlink with the same name already exists, we remove it
                 if (is_link($link)) {
                     if (!unlink($link)) {
                         throw new Exception('Could not remove existing symlink ' . $link);
                     }
                 }
 
-                /**
-                 *  Create symlink
-                 */
+                // Create symlink
                 if (!symlink($this->repoController->getDate(), $link)) {
                     throw new Exception('Could not point environment to the repository');
                 }
@@ -191,73 +167,50 @@ private function local()
 
         $this->taskLogSubStepController->new('updating-database', 'UPDATING DATABASE');
 
-        /**
-         *  Check if repository already exists in database
-         */
+        // If currently no rpm repo of this name exists in the database then we add it
         if ($this->repoController->getPackageType() == 'rpm') {
-            $exists = $this->rpmRepoController->exists($this->repoController->getName(), $this->repoController->getReleasever());
-        }
-        if ($this->repoController->getPackageType() == 'deb') {
-            $exists = $this->debRepoController->exists($this->repoController->getName(), $this->repoController->getDist(), $this->repoController->getSection());
-        }
-
-        /**
-         *  If no repo of this name exists in database then we add it
-         *  Note: here we set the source as $this->repoController->getName()
-         */
-        if ($exists === false) {
-            /**
-             *  Retrieve repo Id from the last insert row
-             */
-            if ($this->repoController->getPackageType() == 'rpm') {
+            if (!$this->rpmRepoController->exists($this->repoController->getName(), $this->repoController->getReleasever())) {
+                // Note: for local repositories, source is set to repo name
                 $this->rpmRepoController->add($this->repoController->getName(), $this->repoController->getReleasever(), $this->repoController->getName());
+
+                // Repository Id becomes the Id of the last inserted row in the database
                 $this->repoController->setRepoId($this->rpmRepoController->getLastInsertRowID());
-            }
-            if ($this->repoController->getPackageType() == 'deb') {
-                $this->debRepoController->add($this->repoController->getName(), $this->repoController->getDist(), $this->repoController->getSection(), $this->repoController->getName());
-                $this->repoController->setRepoId($this->debRepoController->getLastInsertRowID());
-            }
 
-        /**
-         *  Else if a repo of this name exists, we attach this new snapshot and this new env to this repo
-         */
-        } else {
-            /**
-             *  Retrieve and set repo Id from database
-             */
-            if ($this->repoController->getPackageType() == 'rpm') {
-                $repoId = $this->rpmRepoController->getIdByNameReleasever($this->repoController->getName(), $this->repoController->getReleasever());
+            // Otherwise, if a repo of the same name exists, we retrieve its Id from the database
+            } else {
+                $this->repoController->setRepoId($this->rpmRepoController->getIdByNameReleasever($this->repoController->getName(), $this->repoController->getReleasever()));
             }
+        }
 
-            if ($this->repoController->getPackageType() == 'deb') {
-                $repoId = $this->debRepoController->getIdByNameDistComponent($this->repoController->getName(), $this->repoController->getDist(), $this->repoController->getSection());
-            }
+        // If currently no deb repo of this name exists in the database then we add it
+        if ($this->repoController->getPackageType() == 'deb') {
+            if (!$this->debRepoController->exists($this->repoController->getName(), $this->repoController->getDist(), $this->repoController->getSection())) {
+                // Note: for local repositories, source is set to repo name
+                $this->debRepoController->add($this->repoController->getName(), $this->repoController->getDist(), $this->repoController->getSection(), $this->repoController->getName());
 
-            if (empty($repoId)) {
-                throw new Exception('Could not retrieve repository Id from database');
-            }
+                // Repository Id becomes the Id of the last inserted row in the database
+                $this->repoController->setRepoId($this->debRepoController->getLastInsertRowID());
 
-            $this->repoController->setRepoId($repoId);
+            // Otherwise, if a repo of the same name exists, we retrieve its Id from the database
+            } else {
+                $this->repoController->setRepoId($this->debRepoController->getIdByNameDistComponent($this->repoController->getName(), $this->repoController->getDist(), $this->repoController->getSection()));
+            }
         }
 
-        unset($exists, $repoId);
+        // Apply description and tags after the repository Id has been determined,
+        $this->repoController->updateDescription($this->repoController->getRepoId(), (string) $this->repoController->getDescription());
+        $this->repoController->updateTags($this->repoController->getRepoId(), $this->repoController->getTags());
 
-        /**
-         *  Add snapshot to database
-         */
+        // Add snapshot to database
         $this->repoSnapshotController->add($this->repoController->getDate(), $this->repoController->getTime(), 'false', $this->repoController->getArch(), $this->repoController->getAdvancedParams(), $this->repoController->getType(), 'active', $this->repoController->getRepoId());
 
-        /**
-         *  Retrieve snapshot Id from the last insert row
-         */
+        // Retrieve snapshot Id from the last insert row
         $this->repoController->setSnapId($this->repoSnapshotController->getLastInsertRowID());
 
-        /**
-         *  Add env to database if an env has been specified by the user
-         */
+        // Add env to database if an env has been specified by the user
         if (!empty($this->repoController->getEnv())) {
             foreach ($this->repoController->getEnv() as $env) {
-                $this->repoEnvController->add($this->repoController->getSnapId(), $env, $this->repoController->getDescription());
+                $this->repoEnvController->add($this->repoController->getSnapId(), $env);
             }
         }
 
@@ -265,18 +218,14 @@ private function local()
 
         $this->taskLogSubStepController->new('applying-permissions', 'APPLYING PERMISSIONS');
 
-        /**
-         *  Apply permissions on the new repo
-         */
+        // Apply permissions on the new repo
         File::recursiveChmod($snapshotPath, 'dir', 770);
         File::recursiveChmod($snapshotPath, 'file', 660);
 
         $this->taskLogSubStepController->completed();
         $this->taskLogStepController->completed();
 
-        /**
-         *  Add repo to group if a group has been specified
-         */
+        // Add repo to group if a group has been specified
         if (!empty($this->repoController->getGroup())) {
             $this->taskLogStepController->new('add-to-group', 'ADDING REPOSITORY TO GROUP');
             $this->repoController->addRepoIdToGroup($this->repoController->getRepoId(), $this->repoController->getGroup());
diff --git a/www/controllers/Repo/Task/Delete.php b/www/controllers/Repo/Task/Delete.php
index d01a6d1e3..602ef7cad 100644
--- a/www/controllers/Repo/Task/Delete.php
+++ b/www/controllers/Repo/Task/Delete.php
@@ -33,7 +33,7 @@ public function __construct(string $taskId)
     /**
      *  Delete a repository snapshot
      */
-    public function execute()
+    public function execute(): void
     {
         $deleted = true;
 
diff --git a/www/controllers/Repo/Task/Duplicate.php b/www/controllers/Repo/Task/Duplicate.php
index 72722a25d..77612c851 100644
--- a/www/controllers/Repo/Task/Duplicate.php
+++ b/www/controllers/Repo/Task/Duplicate.php
@@ -45,16 +45,12 @@ public function execute()
         $this->taskLogStepController->new('duplicating', 'DUPLICATING');
         $this->taskLogSubStepController->new('initializing', 'INITIALIZING');
 
-        /**
-         *  Check if source repo snapshot exists
-         */
+        // Check if source repo snapshot exists
         if ($this->sourceRepoController->existsSnapId($this->sourceRepoController->getSnapId()) === false) {
             throw new Exception('Source repository snapshot does not exist');
         }
 
-        /**
-         *  Check if a repo with the same name already exists
-         */
+        // Check if a repo with the same name already exists
         if ($this->repoController->getPackageType() == 'rpm') {
             if ($this->rpmRepoController->isActive($this->repoController->getName(), $this->repoController->getReleasever())) {
                 throw new Exception('A repo <span class="label-black">' . $this->repoController->getName() . ' (release ver. ' . $this->repoController->getReleasever() . ')</span> already exists');
@@ -66,9 +62,7 @@ public function execute()
             }
         }
 
-        /**
-         *  Define source snapshot path
-         */
+        // Define source snapshot path
         if ($this->sourceRepoController->getPackageType() == 'rpm') {
             $sourceSnapshotPath = REPOS_DIR . '/rpm/' . $this->sourceRepoController->getName() . '/' . $this->sourceRepoController->getReleasever() . '/' . $this->sourceRepoController->getDate();
         }
@@ -76,9 +70,7 @@ public function execute()
             $sourceSnapshotPath = REPOS_DIR . '/deb/' . $this->sourceRepoController->getName() . '/' . $this->sourceRepoController->getDist() . '/' . $this->sourceRepoController->getSection() . '/' . $this->sourceRepoController->getDate();
         }
 
-        /**
-         *  Define target snapshot path
-         */
+        // Define target snapshot path
         if ($this->repoController->getPackageType() == 'rpm') {
             $parentDir = REPOS_DIR . '/rpm/' . $this->repoController->getName() . '/' . $this->repoController->getReleasever();
             $targetSnapshotPath = REPOS_DIR . '/rpm/' . $this->repoController->getName() . '/' . $this->repoController->getReleasever() . '/'. $this->repoController->getDate();
@@ -88,38 +80,28 @@ public function execute()
             $targetSnapshotPath = REPOS_DIR . '/deb/' . $this->repoController->getName() . '/' . $this->repoController->getDist() . '/' . $this->repoController->getSection() . '/' . $this->repoController->getDate();
         }
 
-        /**
-         *  Create parent directory if it does not already exists
-         */
+        // Create parent directory if it does not already exists
         if (!is_dir($parentDir)) {
             if (!mkdir($parentDir, 0770, true)) {
                 throw new Exception('Cannot create directory ' . $parentDir);
             }
         }
 
-        /**
-         *  Set temporary dir path
-         */
+        // Set temporary dir path
         $tempDir = REPOS_DIR . '/temporary-task-' . $this->taskId;
 
-        /**
-         *  Create the temporary directory if it does not already exist (might exist if the task has been stopped and restarted)
-         */
+        // Create the temporary directory if it does not already exist (might exist if the task has been stopped and restarted)
         if (!file_exists($tempDir)) {
             if (!mkdir($tempDir, 0770, true)) {
                 throw new Exception('Cannot create temporary directory ' . $tempDir);
             }
         }
 
-        /**
-         *  Get all files and directories in the source repository
-         */
+        // Get all files and directories in the source repository
         $dirs  = File::recursiveScan($sourceSnapshotPath, 'dir', true);
         $files = File::recursiveScan($sourceSnapshotPath, 'file', true);
 
-        /**
-         *  Create all directories in the temporary directory
-         */
+        // Create all directories in the temporary directory
         foreach ($dirs as $dir) {
             if (!file_exists($tempDir . '/' . $dir)) {
                 if (!mkdir($tempDir . '/' . $dir, 0770, true)) {
@@ -139,19 +121,13 @@ public function execute()
         foreach ($files as $file) {
             $fileCounter++;
 
-            /**
-             *  Count total number of files to copy
-             */
+            // Count total number of files to copy
             $totalFiles = count($files);
 
-            /**
-             *  Show progress
-             */
+            // Show progress
             $this->taskLogSubStepController->new('copying-file-' . $fileCounter, 'COPYING FILE (' . $fileCounter . '/' . $totalFiles . ')', 'From ' . $sourceSnapshotPath . '/' . $file . '<br>To ' . $tempDir . '/' . $file);
 
-            /**
-             *  Ignore file if it was already copied (completed file exists)
-             */
+            // Ignore file if it was already copied (completed file exists)
             if (file_exists($tempDir . '/' . $file) and file_exists($tempDir . '/' . $file . '.completed')) {
                 $this->taskLogSubStepController->completed('Already exists (ignoring)');
                 continue;
@@ -167,16 +143,12 @@ public function execute()
                 }
             }
 
-            /**
-             *  Copy the file
-             */
+            // Copy the file
             if (!copy($sourceSnapshotPath . '/' . $file, $tempDir . '/' . $file)) {
                 throw new Exception('Cannot copy file ' . $sourceSnapshotPath . '/' . $file . ' to ' . $tempDir . '/' . $file);
             }
 
-            /**
-             *  Create the completed file
-             */
+            // Create the completed file
             if (!touch($tempDir . '/' . $file . '.completed')) {
                 throw new Exception('Cannot create copy-completed file ' . $tempDir . '/' . $file . '.completed');
             }
@@ -186,9 +158,7 @@ public function execute()
 
         unset($dirs, $files);
 
-        /**
-         *  Rename the temporary directory to the target directory
-         */
+        // Rename the temporary directory to the target directory
         $this->taskLogSubStepController->new('moving-temp-dir', 'MOVING TEMPORARY DIRECTORY');
         if (!rename($tempDir, $targetSnapshotPath)) {
             throw new Exception('Cannot rename temporary directory ' . $tempDir . ' to ' . $targetSnapshotPath);
@@ -208,23 +178,17 @@ public function execute()
                 }
             }
 
-            /**
-             *  Set step 'DUPLICATING' as completed
-             */
+            // Set step 'DUPLICATING' as completed
             $this->taskLogStepController->completed();
 
-            /**
-             *  On a deb repo, the duplicated repo metadata must be rebuilded
-             */
+            // On a deb repo, the duplicated repo metadata must be rebuilded
             if ($this->repoController->getPackageType() == 'deb') {
                 $this->createMetadata();
             }
 
             $this->taskLogStepController->new('finalizing', 'FINALIZING');
 
-            /**
-             *  Create a symlink to the new repo, only if the user has specified an environment
-             */
+            // Create a symlink to the new repo, only if the user has specified an environment
             if (!empty($this->repoController->getEnv())) {
                 foreach ($this->repoController->getEnv() as $env) {
                     $this->taskLogSubStepController->new('pointing-environment', 'POINTING ENVIRONMENT');
@@ -236,18 +200,14 @@ public function execute()
                         $link = REPOS_DIR . '/deb/' . $this->repoController->getName() . '/' . $this->repoController->getDist() . '/' . $this->repoController->getSection() . '/' . $env;
                     }
 
-                    /**
-                     *  If a symlink with the same name already exists, we remove it
-                     */
+                    // If a symlink with the same name already exists, we remove it
                     if (is_link($link)) {
                         if (!unlink($link)) {
                             throw new Exception('Could not remove existing symlink ' . $link);
                         }
                     }
 
-                    /**
-                     *  Create symlink
-                     */
+                    // Create symlink
                     if (!symlink($this->repoController->getDate(), $link)) {
                         throw new Exception('Could not point environment to the repository');
                     }
@@ -260,9 +220,7 @@ public function execute()
 
             $this->taskLogSubStepController->new('inserting-database', 'INSERTING REPOSITORY IN DATABASE');
 
-            /**
-             *  Insert the new repo in database and retrieve its Id
-             */
+            // Insert the new repo in database and retrieve its Id
             if ($this->repoController->getPackageType() == 'rpm') {
                 $this->rpmRepoController->add($this->repoController->getName(), $this->repoController->getReleasever(), $this->repoController->getSource());
                 $targetRepoId = $this->rpmRepoController->getLastInsertRowID();
@@ -272,14 +230,13 @@ public function execute()
                 $targetRepoId = $this->debRepoController->getLastInsertRowID();
             }
 
-            /**
-             *  Add the new repo snapshot in database
-             */
+            // Repository Id becomes the Id of the last inserted row in the database
+            $this->repoController->setRepoId($targetRepoId);
+
+            // Add the new repo snapshot in database
             $this->repoSnapshotController->add($this->repoController->getDate(), $this->repoController->getTime(), $this->repoController->getSigned(), $this->repoController->getArch(), $this->repoController->getAdvancedParams(), $this->repoController->getType(), $this->repoController->getStatus(), $targetRepoId);
 
-            /**
-             *  Retrieve the Id of the new repo snapshot in database
-             */
+            // Retrieve the Id of the new repo snapshot in database
             $targetSnapId = $this->repoSnapshotController->getLastInsertRowID();
 
             // Calculate and update snapshot size
@@ -287,28 +244,26 @@ public function execute()
             $this->repoSnapshotController->updateSize($targetSnapId, Directory::getSize($targetSnapshotPath));
             $this->taskLogSubStepController->completed();
 
-            /**
-             *  Add the new repo environment in database, only if the user has specified an environment
-             */
+            // Add the new repo environment in database, only if the user has specified an environment
             if (!empty($this->repoController->getEnv())) {
                 foreach ($this->repoController->getEnv() as $env) {
-                    $this->repoEnvController->add($targetSnapId, $env, $this->repoController->getDescription());
+                    $this->repoEnvController->add($targetSnapId, $env);
                 }
             }
 
-            /**
-             *  Add the new repo to a group if a group has been specified
-             */
+            // Apply description and tags after the repository Id has been determined,
+            $this->repoController->updateDescription($this->repoController->getRepoId(), (string) $this->repoController->getDescription());
+            $this->repoController->updateTags($this->repoController->getRepoId(), $this->repoController->getTags());
+
+            // Add the new repo to a group if a group has been specified
             if (!empty($this->repoController->getGroup())) {
-                $this->repoController->addRepoIdToGroup($targetRepoId, $this->repoController->getGroup());
+                $this->repoController->addRepoIdToGroup($this->repoController->getRepoId(), $this->repoController->getGroup());
             }
 
             $this->taskLogSubStepController->completed();
             $this->taskLogStepController->completed();
 
-        /**
-         *  If an error occurred after the temporary directory was renamed, clean the target directory
-         */
+        // If an error occurred after the temporary directory was renamed, clean the target directory
         } catch (Exception $e) {
             if (file_exists($targetSnapshotPath)) {
                 if (!Directory::deleteRecursive($targetSnapshotPath)) {
@@ -316,9 +271,7 @@ public function execute()
                 }
             }
 
-            /**
-             *  Throw initial exception to set the task as error
-             */
+            // Throw initial exception to set the task as error
             throw new Exception($e->getMessage());
         }
     }
diff --git a/www/controllers/Repo/Task/Env.php b/www/controllers/Repo/Task/Env.php
index 4d9634645..de7968953 100644
--- a/www/controllers/Repo/Task/Env.php
+++ b/www/controllers/Repo/Task/Env.php
@@ -32,11 +32,7 @@ public function __construct(string $taskId)
     public function execute()
     {
         foreach ($this->repoController->getEnv() as $env) {
-            $actualDescription = null;
-
-            /**
-             *  Define snapshot directory path
-             */
+            // Define snapshot directory path
             if ($this->repoController->getPackageType() == 'rpm') {
                 $snapshotPath = REPOS_DIR . '/rpm/' . $this->repoController->getName() . '/' . $this->repoController->getReleasever() . '/' . $this->repoController->getDate();
             }
@@ -47,44 +43,19 @@ public function execute()
             $this->taskLogStepController->new('point-env-' . $env, 'POINT ENVIRONMENT ' . Label::envtag($env));
             $this->taskLogSubStepController->new('checking-' . $env, 'CHECKING');
 
-            /**
-             *  Check if the source snapshot exists
-             */
+            // Check if the source snapshot exists
             if (!$this->repoController->existsSnapId($this->repoController->getSnapId())) {
                 throw new Exception('<span class="label-black">' . $this->repoController->getDateFormatted() . '</span> repository snapshot does not exist anymore');
             }
 
-            /**
-             *  Check if an environment of the same name already exists on the target snapshot
-             */
+            // Check if an environment of the same name already points to the target snapshot
             if ($this->repoController->existsSnapIdEnv($this->repoController->getSnapId(), $env) === true) {
                 if ($this->repoController->getPackageType() == 'rpm') {
-                    throw new Exception(Label::envtag($env) . ' environment already exists on <span class="label-white">' . $this->repoController->getName() . '</span>⸺<span class="label-black">' . $this->repoController->getDateFormatted() . '</span>');
+                    throw new Exception(Label::envtag($env) . ' environment already points to <span class="label-white">' . $this->repoController->getName() . '</span>⸺<span class="label-black">' . $this->repoController->getDateFormatted() . '</span>');
                 }
 
                 if ($this->repoController->getPackageType() == 'deb') {
-                    throw new Exception(Label::envtag($env) . ' environment already exists on <span class="label-white">' . $this->repoController->getName() . ' ❯ ' . $this->repoController->getDist() . ' ❯ ' . $this->repoController->getSection() . '</span>⸺<span class="label-black">' . $this->repoController->getDateFormatted() . '</span>');
-                }
-            }
-
-            /**
-             *  If the user did not specify any description then we get the one currently in place on the environment of the same name (if the environment exists and if it has a description)
-             */
-            if (empty($this->repoController->getDescription())) {
-                if ($this->repoController->getPackageType() == 'rpm') {
-                    $actualDescription = $this->rpmRepoController->getDescriptionByName($this->repoController->getName(), $this->repoController->getReleasever(), $env);
-                }
-                if ($this->repoController->getPackageType() == 'deb') {
-                    $actualDescription = $this->debRepoController->getDescriptionByName($this->repoController->getName(), $this->repoController->getDist(), $this->repoController->getSection(), $env);
-                }
-
-                /**
-                 *  If the description is empty then the description will remain empty
-                 */
-                if (!empty($actualDescription)) {
-                    $this->repoController->setDescription(htmlspecialchars_decode($actualDescription));
-                } else {
-                    $this->repoController->setDescription('');
+                    throw new Exception(Label::envtag($env) . ' environment already points to <span class="label-white">' . $this->repoController->getName() . ' ❯ ' . $this->repoController->getDist() . ' ❯ ' . $this->repoController->getSection() . '</span>⸺<span class="label-black">' . $this->repoController->getDateFormatted() . '</span>');
                 }
             }
 
@@ -92,18 +63,12 @@ public function execute()
             $this->taskLogSubStepController->new('create-symlink-' . $env, 'CREATING SYMLINK');
 
             if ($this->repoController->getPackageType() == 'rpm') {
-                /**
-                 *  If there is already an environment of the same name pointing to a snapshot.
-                 */
+                // If there is already an environment of the same name pointing to a snapshot
                 if ($this->rpmRepoController->existsEnv($this->repoController->getName(), $this->repoController->getReleasever(), $env)) {
-                    /**
-                     *  Retrieve the Id of the already existing environment
-                     */
+                    // Retrieve the Id of the already existing environment
                     $actualEnvIds = $this->rpmRepoController->getEnvIdFromRepoName($this->repoController->getName(), $this->repoController->getReleasever(), $env);
 
-                    /**
-                     *  Delete the possible environment of the same name already pointing to a snapshot of this repo (if there is one)
-                     */
+                    // Delete the possible environment of the same name already pointing to a snapshot of this repo (if there is one)
                     if (!empty($actualEnvIds)) {
                         foreach ($actualEnvIds as $actualEnvId) {
                             $this->repoEnvController->remove($actualEnvId);
@@ -111,36 +76,26 @@ public function execute()
                     }
                 }
 
-                /**
-                 *  Delete symbolic link if already exists
-                 */
+                // Delete symbolic link if already exists
                 if (is_link(REPOS_DIR . '/rpm/' . $this->repoController->getName() . '/' . $this->repoController->getReleasever() . '/' . $env)) {
                     if (!unlink(REPOS_DIR . '/rpm/' . $this->repoController->getName() . '/' . $this->repoController->getReleasever() . '/' . $env)) {
                         throw new Exception('Could not delete existing symbolic link: ' . REPOS_DIR . '/rpm/' . $this->repoController->getName() . '/' . $this->repoController->getReleasever() . '/' . $env);
                     }
                 }
 
-                /**
-                 *  Create symbolic link
-                 */
+                // Create symbolic link
                 if (!symlink($this->repoController->getDate(), REPOS_DIR . '/rpm/' . $this->repoController->getName() . '/' . $this->repoController->getReleasever() . '/' . $env)) {
                     throw new Exception('Could not create symbolic link: ' . REPOS_DIR . '/rpm/' . $this->repoController->getName() . '/' . $this->repoController->getReleasever() . '/' . $env);
                 }
             }
 
             if ($this->repoController->getPackageType() == 'deb') {
-                /**
-                 *  If there is already an environment of the same name pointing to a snapshot.
-                 */
+                // If there is already an environment of the same name pointing to a snapshot
                 if ($this->debRepoController->existsEnv($this->repoController->getName(), $this->repoController->getDist(), $this->repoController->getSection(), $env)) {
-                    /**
-                     *  Retrieve the Id of the already existing environment
-                     */
+                    // Retrieve the Id of the already existing environment
                     $actualEnvIds = $this->debRepoController->getEnvIdFromRepoName($this->repoController->getName(), $this->repoController->getDist(), $this->repoController->getSection(), $env);
 
-                    /**
-                     *  Delete the possible environment of the same name already pointing to a snapshot of this repo (if there is one)
-                     */
+                    // Delete the possible environment of the same name already pointing to a snapshot of this repo (if there is one)
                     if (!empty($actualEnvIds)) {
                         foreach ($actualEnvIds as $actualEnvId) {
                             $this->repoEnvController->remove($actualEnvId);
@@ -148,18 +103,14 @@ public function execute()
                     }
                 }
 
-                /**
-                 *  Delete symbolic link if already exists
-                 */
+                // Delete symbolic link if already exists
                 if (is_link(REPOS_DIR . '/deb/' . $this->repoController->getName() . '/' . $this->repoController->getDist() . '/' . $this->repoController->getSection() . '/' . $env)) {
                     if (!unlink(REPOS_DIR . '/deb/' . $this->repoController->getName() . '/' . $this->repoController->getDist() . '/' . $this->repoController->getSection() . '/' . $env)) {
                         throw new Exception('Could not delete existing symbolic link: ' . REPOS_DIR . '/deb/' . $this->repoController->getName() . '/' . $this->repoController->getDist() . '/' . $this->repoController->getSection() . '/' . $env);
                     }
                 }
 
-                /**
-                 *  Create symbolic link
-                 */
+                // Create symbolic link
                 if (!symlink($this->repoController->getDate(), REPOS_DIR . '/deb/' . $this->repoController->getName() . '/' . $this->repoController->getDist() . '/' . $this->repoController->getSection() . '/' . $env)) {
                     throw new Exception('Could not create symbolic link: ' . REPOS_DIR . '/deb/' . $this->repoController->getName() . '/' . $this->repoController->getDist() . '/' . $this->repoController->getSection() . '/' . $env);
                 }
@@ -167,11 +118,9 @@ public function execute()
 
             $this->taskLogSubStepController->completed();
 
-            /**
-             *  Add environment to database
-             */
+            // Add environment to database
             $this->taskLogSubStepController->new('update-database', 'UPDATING DATABASE');
-            $this->repoEnvController->add($this->repoController->getSnapId(), $env, $this->repoController->getDescription());
+            $this->repoEnvController->add($this->repoController->getSnapId(), $env);
             $this->taskLogSubStepController->completed();
             $this->taskLogStepController->completed();
         }
diff --git a/www/controllers/Repo/Task/Finalize.php b/www/controllers/Repo/Task/Finalize.php
index e2a9a38da..660b46a45 100644
--- a/www/controllers/Repo/Task/Finalize.php
+++ b/www/controllers/Repo/Task/Finalize.php
@@ -11,7 +11,7 @@ trait Finalize
     /**
      *  Finalize the repository: add to the database and apply permissions
      */
-    protected function finalize()
+    protected function finalize(): void
     {
         $this->taskLogStepController->new('finalizing', 'FINALIZING');
 
@@ -48,7 +48,6 @@ protected function finalize()
             if ($this->repoController->getPackageType() == 'deb') {
                 if (!$this->debRepoController->exists($this->repoController->getName(), $this->repoController->getDist(), $this->repoController->getSection())) {
                     $this->debRepoController->add($this->repoController->getName(), $this->repoController->getDist(), $this->repoController->getSection(), $this->repoController->getSource());
-
                     // Repository Id becomes the Id of the last inserted row in the database
                     $this->repoController->setRepoId($this->debRepoController->getLastInsertRowID());
 
@@ -58,6 +57,10 @@ protected function finalize()
                 }
             }
 
+            // Apply description and tags after the repository Id has been determined,
+            $this->repoController->updateDescription($this->repoController->getRepoId(), (string) $this->repoController->getDescription());
+            $this->repoController->updateTags($this->repoController->getRepoId(), $this->repoController->getTags());
+
             // Add snapshot in database
             $this->repoSnapshotController->add($this->repoController->getDate(), $this->repoController->getTime(), $this->repoController->getGpgSign(), $this->repoController->getArch(), $this->repoController->getAdvancedParams(), $this->repoController->getType(), 'active', $this->repoController->getRepoId());
 
@@ -67,7 +70,7 @@ protected function finalize()
             // Add env in database if an env has been specified by the user
             if (!empty($this->repoController->getEnv())) {
                 foreach ($this->repoController->getEnv() as $env) {
-                    $this->repoEnvController->add($this->repoController->getSnapId(), $env, $this->repoController->getDescription());
+                    $this->repoEnvController->add($this->repoController->getSnapId(), $env);
                 }
             }
         }
@@ -123,23 +126,6 @@ protected function finalize()
                 $this->taskLogSubStepController->new('adding-env', 'ADDING ENVIRONMENT');
 
                 foreach ($this->repoController->getEnv() as $env) {
-                    // If the user has not specified any description, then we retrieve the one currently in place on the environment of the same name (if the environment exists and if it has a description)
-                    if (empty($this->repoController->getDescription())) {
-                        if ($this->repoController->getPackageType() == 'rpm') {
-                            $actualDescription = $this->rpmRepoController->getDescriptionByName($this->repoController->getName(), $this->repoController->getReleasever(), $env);
-                        }
-                        if ($this->repoController->getPackageType() == 'deb') {
-                            $actualDescription = $this->debRepoController->getDescriptionByName($this->repoController->getName(), $this->repoController->getDist(), $this->repoController->getSection(), $env);
-                        }
-
-                        // If the retrieved description is empty then the description will remain empty
-                        if (!empty($actualDescription)) {
-                            $this->repoController->setDescription(htmlspecialchars_decode($actualDescription));
-                        } else {
-                            $this->repoController->setDescription('');
-                        }
-                    }
-
                     // Retrieve the Id of the environment currently in place (if there is one)
                     if ($this->repoController->getPackageType() == 'rpm') {
                         $actualEnvIds = $this->rpmRepoController->getEnvIdFromRepoName($this->repoController->getName(), $this->repoController->getReleasever(), $env);
@@ -156,7 +142,7 @@ protected function finalize()
                     }
 
                     // Then we declare the new environment and make it point to the previously created snapshot
-                    $this->repoEnvController->add($this->repoController->getSnapId(), $env, $this->repoController->getDescription());
+                    $this->repoEnvController->add($this->repoController->getSnapId(), $env);
                 }
 
                 $this->taskLogSubStepController->completed();
diff --git a/www/controllers/Repo/Task/Rebuild.php b/www/controllers/Repo/Task/Rebuild.php
index c74aa37bf..5e8893208 100644
--- a/www/controllers/Repo/Task/Rebuild.php
+++ b/www/controllers/Repo/Task/Rebuild.php
@@ -34,26 +34,18 @@ public function __construct(string $taskId)
     /**
      *  Rebuild repository metadata
      */
-    public function execute()
+    public function execute(): void
     {
-        /**
-         *  Set snapshot metadata rebuild state in database
-         */
+        // Set snapshot metadata rebuild state in database
         $this->repoSnapshotController->updateRebuild($this->repoController->getSnapId(), 'running');
 
-        /**
-         *  Sign repository / packages
-         */
+        // Sign repository / packages
         $this->signPackage();
 
-        /**
-         *  Create repository and symlinks
-         */
+        // Create repository and symlinks
         $this->createMetadata();
 
-        /**
-         *  Finalize repository (update database, clean temporary files, etc.)
-         */
+        // Finalize repository (update database, clean temporary files, etc.)
         $this->finalize();
     }
 }
diff --git a/www/controllers/Repo/Task/RemoveEnv.php b/www/controllers/Repo/Task/RemoveEnv.php
index 72268c778..090ca796e 100644
--- a/www/controllers/Repo/Task/RemoveEnv.php
+++ b/www/controllers/Repo/Task/RemoveEnv.php
@@ -28,14 +28,12 @@ public function __construct(string $taskId)
     /**
      *  Remove snapshot environment
      */
-    public function execute()
+    public function execute(): void
     {
         $this->taskLogStepController->new('removing', 'REMOVING');
         $this->taskLogSubStepController->new('delete-symlink', 'DELETE SYMLINK');
 
-        /**
-         *  Define environment symlink
-         */
+        // Define environment symlink
         if ($this->repoController->getPackageType() == 'rpm') {
             $symlink = REPOS_DIR . '/rpm/' . $this->repoController->getName() . '/' . $this->repoController->getReleasever() . '/' . $this->repoController->getEnv();
         }
@@ -44,9 +42,7 @@ public function execute()
             $symlink = REPOS_DIR . '/deb/' . $this->repoController->getName() . '/' . $this->repoController->getDist() . '/' . $this->repoController->getSection() . '/' . $this->repoController->getEnv();
         }
 
-        /**
-         *  Delete environment symlink
-         */
+        // Delete environment symlink
         if (file_exists($symlink)) {
             if (!unlink($symlink)) {
                 throw new Exception('Failed to delete symlink: ' . $symlink);
@@ -55,9 +51,7 @@ public function execute()
 
         $this->taskLogSubStepController->completed();
 
-        /**
-         *  Delete environment from database
-         */
+        // Delete environment from database
         $this->taskLogSubStepController->new('update-database', 'UPDATE DATABASE');
         $this->repoEnvController->remove($this->repoController->getEnvId());
         $this->taskLogSubStepController->completed();
diff --git a/www/controllers/Repo/Task/Rename.php b/www/controllers/Repo/Task/Rename.php
index b893edeb3..c4b0907c3 100644
--- a/www/controllers/Repo/Task/Rename.php
+++ b/www/controllers/Repo/Task/Rename.php
@@ -13,8 +13,8 @@ public function __construct(string $taskId)
     {
         parent::__construct($taskId, 'rename');
 
-        // Get source repository details from its snapshot Id
-        $this->sourceRepoController->getAllById(null, $this->params['snap-id'], null);
+        // Get source repository details from its repo Id
+        $this->sourceRepoController->getAllById($this->params['repo-id']);
 
         // Execute the task
         try {
@@ -34,14 +34,14 @@ public function __construct(string $taskId)
     /**
      *  Rename repository
      */
-    public function execute()
+    public function execute(): void
     {
         $this->taskLogStepController->new('renaming', 'RENAMING');
         $this->taskLogSubStepController->new('renaming-directory', 'RENAMING REPOSITORY DIRECTORY');
 
-        // Check if source repo snapshot exists
-        if ($this->sourceRepoController->existsSnapId($this->sourceRepoController->getSnapId()) === false) {
-            throw new Exception('Source repository snapshot does not exist');
+        // Check if source repo exists
+        if ($this->sourceRepoController->existsId($this->sourceRepoController->getRepoId()) === false) {
+            throw new Exception('Source repository does not exist');
         }
 
         // Check if a repo with the same name already exists
@@ -56,7 +56,7 @@ public function execute()
             }
         }
 
-        // Define source snapshot path
+        // Define source repository path
         if ($this->sourceRepoController->getPackageType() == 'rpm') {
             $sourcePath = REPOS_DIR . '/rpm/' . $this->sourceRepoController->getName() . '/' . $this->sourceRepoController->getReleasever();
         }
@@ -64,7 +64,7 @@ public function execute()
             $sourcePath = REPOS_DIR . '/deb/' . $this->sourceRepoController->getName() . '/' . $this->sourceRepoController->getDist() . '/' . $this->sourceRepoController->getSection();
         }
 
-        // Define target snapshot path
+        // Define target repository path
         if ($this->repoController->getPackageType() == 'rpm') {
             $parentDir = REPOS_DIR . '/rpm/' . $this->repoController->getName();
             $targetPath = REPOS_DIR . '/rpm/' . $this->repoController->getName() . '/' . $this->repoController->getReleasever();
@@ -96,24 +96,24 @@ public function execute()
         $this->taskLogSubStepController->completed();
         $this->taskLogStepController->completed();
 
-        if ($this->repoController->getPackageType() == 'deb') {
-            try {
-                // On a deb repo, the renamed repository needs to have its metadata rebuilded
-                $this->createMetadata();
-
-            // If an error occurred after repository has been moved, try to revert the move
-            } catch (Exception $e) {
-                // Try to revert the move
-                if (file_exists($targetPath)) {
-                    if (!rename($targetPath, $sourcePath)) {
-                        throw new Exception('An error occured while creating the repository metadata: ' . $e->getMessage() . '. Additionally, the system could not revert the renamed repository from ' . $targetPath . ' to ' . $sourcePath . '. Manual intervention is required to restore the repository to its original state.');
-                    }
-                }
-
-                // Throw initial exception to set the task as error
-                throw new Exception('An error occured while creating the repository metadata: ' . $e->getMessage(). ' The renamed repository has been reverted to its original state. Please check that everything is fine before retrying the rename operation.');
-            }
-        }
+        // if ($this->repoController->getPackageType() == 'deb') {
+        //     try {
+        //         // On a deb repo, the renamed repository needs to have its metadata rebuilded
+        //         $this->createMetadata();
+
+        //     // If an error occurred after repository has been moved, try to revert the move
+        //     } catch (Exception $e) {
+        //         // Try to revert the move
+        //         if (file_exists($targetPath)) {
+        //             if (!rename($targetPath, $sourcePath)) {
+        //                 throw new Exception('An error occured while creating the repository metadata: ' . $e->getMessage() . '. Additionally, the system could not revert the renamed repository from ' . $targetPath . ' to ' . $sourcePath . '. Manual intervention is required to restore the repository to its original state.');
+        //             }
+        //         }
+
+        //         // Throw initial exception to set the task as error
+        //         throw new Exception('An error occured while creating the repository metadata: ' . $e->getMessage(). ' The renamed repository has been reverted to its original state. Please check that everything is fine before retrying the rename operation.');
+        //     }
+        // }
 
         try {
             $this->taskLogStepController->new('finalizing', 'FINALIZING');
diff --git a/www/controllers/Repo/Task/Update.php b/www/controllers/Repo/Task/Update.php
index bbe04cc2a..b2d109b1d 100644
--- a/www/controllers/Repo/Task/Update.php
+++ b/www/controllers/Repo/Task/Update.php
@@ -40,67 +40,49 @@ public function __construct(string $taskId)
     /**
      *  Update repository
      */
-    public function execute()
+    public function execute(): void
     {
-        /**
-         *  Define default date and time
-         */
+        // Define default date and time
         $this->repoController->setDate(date('Y-m-d'));
         $this->repoController->setTime(date('H:i'));
 
-        /**
-         *  Sync packages (if mirror repo)
-         */
+        // Sync packages (if mirror repo)
         if ($this->repoController->getType() == 'mirror') {
             $this->syncPackage();
         }
 
-        /**
-         *  Update repository (if local repo)
-         */
+        // Update repository (if local repo)
         if ($this->repoController->getType() == 'local') {
             $this->updateLocal();
         }
 
-        /**
-         *  Sign repo / packages
-         */
+        // Sign repo / packages
         $this->signPackage();
 
-        /**
-         *  Create repo and symlinks
-         */
+        // Create repo and symlinks
         $this->createMetadata();
 
-        /**
-         *  Finalize repo (add to database and apply rights)
-         */
+        // Finalize repo (add to database and apply rights)
         $this->finalize();
     }
 
     /**
      *  Update local repository
      */
-    private function updateLocal()
+    private function updateLocal(): void
     {
         $this->taskLogStepController->new('updating', 'UPDATING');
         $this->taskLogSubStepController->new('initializing', 'INITIALIZING');
 
-        /**
-         *  Define temporary working directory
-         */
+        // Define temporary working directory
         $workingDir = REPOS_DIR . '/temporary-task-' . $this->taskId;
 
-        /**
-         *  Check if a snapshot exists in the database
-         */
+        // Check if a snapshot exists in the database
         if ($this->repoController->existsSnapId($this->repoController->getSnapId()) === false) {
             throw new Exception('Specified repo snapshot does not exist');
         }
 
-        /**
-         *  We cannot update a snapshot in the same day
-         */
+        // We cannot update a snapshot in the same day
         if ($this->repoController->getPackageType() == 'rpm') {
             if ($this->rpmRepoController->existsSnapDate($this->repoController->getName(), $this->repoController->getReleasever(), $this->repoController->getDate())) {
                 throw new Exception('A snapshot already exists on the <span class="label-black">' . $this->repoController->getDateFormatted() . '</span>');
@@ -112,16 +94,12 @@ private function updateLocal()
             }
         }
 
-        /**
-         *  Arch must be specified
-         */
+        // Arch must be specified
         if (empty($this->repoController->getArch())) {
             throw new Exception('Packages arch must be specified');
         }
 
-        /**
-         *  Define previous snapshot directory path
-         */
+        // Define previous snapshot directory path
         if ($this->sourceRepoController->getPackageType() == 'rpm') {
             $previousSnapshotDir = REPOS_DIR . '/rpm/' . $this->sourceRepoController->getName() . '/' . $this->sourceRepoController->getReleasever() . '/' . $this->sourceRepoController->getDate();
         }
@@ -129,16 +107,12 @@ private function updateLocal()
             $previousSnapshotDir = REPOS_DIR . '/deb/' . $this->sourceRepoController->getName() . '/' . $this->sourceRepoController->getDist() . '/' . $this->sourceRepoController->getSection() . '/' . $this->sourceRepoController->getDate();
         }
 
-        /**
-         *  Check that previous snapshot directory exists
-         */
+        // Check that previous snapshot directory exists
         if (!is_dir($previousSnapshotDir)) {
             throw new Exception('Previous snapshot directory does not exist: ' . $previousSnapshotDir);
         }
 
-        /**
-         *  If working directory already exists, delete it
-         */
+        // If working directory already exists, delete it
         if (is_dir($workingDir)) {
             if (!Directory::deleteRecursive($workingDir)) {
                 throw new Exception('Cannot delete existing directory: ' . $workingDir);
@@ -148,9 +122,7 @@ private function updateLocal()
         $this->taskLogSubStepController->completed();
         $this->taskLogSubStepController->new('search-packages', 'SEARCHING PACKAGES IN PREVIOUS SNAPSHOT');
 
-        /**
-         *  Search for packages in the previous snapshot directory
-         */
+        // Search for packages in the previous snapshot directory
         try {
             if ($this->repoController->getPackageType() == 'deb') {
                 $packages = File::findRecursive($previousSnapshotDir . '/pool/' . $this->sourceRepoController->getSection(), [], ['deb', 'dsc', 'gz', 'xz']);
@@ -163,17 +135,13 @@ private function updateLocal()
             throw new Exception('Error while retrieving previous snapshot packages: ' . $e->getMessage());
         }
 
-        /**
-         *  Count number of packages found
-         */
+        // Count number of packages found
         $totalPackages = count($packages);
         $packageCounter = 0;
 
         $this->taskLogSubStepController->completed($totalPackages . ' package(s) found');
 
-        /**
-         *  Create target pool/packages directory
-         */
+        // Create target pool/packages directory
         if ($this->repoController->getPackageType() == 'deb') {
             // Create pool directory
             if (!mkdir($workingDir . '/pool/' . $this->repoController->getSection(), 0770, true)) {
@@ -187,9 +155,7 @@ private function updateLocal()
             }
         }
 
-        /**
-         *  Deduplication/Copy packages from previous snapshot to the new snapshot
-         */
+        // Deduplication/Copy packages from previous snapshot to the new snapshot
         foreach ($packages as $packagePath) {
             // Get package name
             $name = basename($packagePath);
diff --git a/www/controllers/Service/Unit/ScheduledTask.php b/www/controllers/Service/Unit/ScheduledTask.php
index fb7d61d46..51d4d5509 100644
--- a/www/controllers/Service/Unit/ScheduledTask.php
+++ b/www/controllers/Service/Unit/ScheduledTask.php
@@ -4,6 +4,7 @@
 
 use Exception;
 use DateTime;
+use Controllers\Task\Target;
 
 class ScheduledTask extends \Controllers\Service\Service
 {
@@ -35,6 +36,7 @@ public function execute() : void
         }
 
         $taskToExec = [];
+        $tasksRawParams = [];
         $dateNow = date('Y-m-d');
         $timeNow = date('H:i');
         $minutesNow = date('i');
@@ -65,6 +67,9 @@ public function execute() : void
 
             $taskRawParams = json_decode($task['Raw_params'], true);
 
+            // Keep the parameters aside, they are needed when the task is actually executed
+            $tasksRawParams[$task['Id']] = $taskRawParams;
+
             /**
              *  Case where the task is a unique task
              */
@@ -161,9 +166,17 @@ public function execute() : void
                 parent::log('Launching scheduled task #' . $taskId . '...');
 
                 try {
-                    // Add the scheduled task to the queue and execute it
-                    $this->taskController->updateStatus($taskId, 'queued');
-                    $this->taskController->executeId($taskId);
+                    /**
+                     *  If the task targets a dynamic set of repositories, it is not executed as is:
+                     *  it generates one task per matching repository, on their latest snapshot
+                     */
+                    if (Target::isDynamic($tasksRawParams[$taskId] ?? [])) {
+                        $this->executeDynamicTask($taskId, $tasksRawParams[$taskId]);
+                    } else {
+                        // Add the scheduled task to the queue and execute it
+                        $this->taskController->updateStatus($taskId, 'queued');
+                        $this->taskController->executeId($taskId);
+                    }
                 } catch (Exception $e) {
                     throw new Exception('Error while executing scheduled task #' . $taskId . ': ' . $e->getMessage());
                 }
@@ -174,6 +187,42 @@ public function execute() : void
         }
     }
 
+    /**
+     *  Execute a scheduled task targeting a dynamic set of repositories
+     *  One task is generated per matching repository, targeting its latest snapshot
+     */
+    private function executeDynamicTask(int $taskId, array $taskRawParams): void
+    {
+        $targetController = new Target();
+
+        // Retrieve the parameters of the tasks to generate, one per matching repository
+        $tasksParams = $targetController->expand($taskRawParams);
+
+        if (empty($tasksParams)) {
+            parent::log('No repository matches the target of scheduled task #' . $taskId);
+        } else {
+            parent::log('Scheduled task #' . $taskId . ' matches ' . count($tasksParams) . ' repository(ies)');
+
+            // Generate and execute a task for each matching repository, linked to the scheduled task that generated them
+            $this->taskController->execute($tasksParams, $taskId);
+        }
+
+        /**
+         *  Keep track of the last execution date and time of the scheduled task,
+         *  it has no log of its own as it only dispatches sub-tasks
+         */
+        $this->taskController->updateDate($taskId, date('Y-m-d'));
+        $this->taskController->updateTime($taskId, date('H:i:s'));
+
+        /**
+         *  A recurring task stays scheduled and will run again at the next occurrence
+         *  A unique task must not run again, so it is marked as done
+         */
+        if (($taskRawParams['schedule']['schedule-type'] ?? '') == 'unique') {
+            $this->taskController->updateStatus($taskId, 'done');
+        }
+    }
+
     /**
      *  Send scheduled tasks reminders
      */
diff --git a/www/controllers/Task/Execution.php b/www/controllers/Task/Execution.php
index 3f114bbf1..88998b5cd 100644
--- a/www/controllers/Task/Execution.php
+++ b/www/controllers/Task/Execution.php
@@ -112,6 +112,11 @@ public function __construct(int $taskId, string $action)
                 $this->repoController->getAllById($this->params['repo-id'], $this->params['snap-id'], $this->params['env-id']);
             }
 
+            // Retrieve repository details from repo Id, if needed
+            if (isset($taskConfig['retrieve-repo-from-repo-id']) and $taskConfig['retrieve-repo-from-repo-id']) {
+                $this->repoController->getAllById($this->params['repo-id']);
+            }
+
             // Retrieve repository details from snap Id, if needed
             if (isset($taskConfig['retrieve-repo-from-snap-id']) and $taskConfig['retrieve-repo-from-snap-id']) {
                 $this->repoController->getAllById(null, $this->params['snap-id'], null);
@@ -247,6 +252,7 @@ public function paramsSet($requiredParams = [], $optionalParams = [])
             'gpg-sign' => 'setGpgSign',
             'env' => 'setEnv',
             'description' => 'setDescription',
+            'tags' => 'setTags',
             'group' => 'setGroup',
             'advanced-params' => 'setAdvancedParams'
         ];
@@ -283,10 +289,11 @@ public function start() : void
 
         // Update layout containers states
         $this->layoutContainerReloadController->reload('header/menu');
+        $this->layoutContainerReloadController->reload('repos/kpi');
         $this->layoutContainerReloadController->reload('repos/list');
-        $this->layoutContainerReloadController->reload('tasks/list');
-        $this->layoutContainerReloadController->reload('browse/list');
-        $this->layoutContainerReloadController->reload('browse/actions');
+        $this->layoutContainerReloadController->reload('tasks/tasks');
+        $this->layoutContainerReloadController->reload('snapshot/kpi');
+        $this->layoutContainerReloadController->reload('snapshot/list');
 
         // Add current PHP execution PID to the PID file to make sure it can be killed with the stop button
         $this->taskController->addsubpid(getmypid());
@@ -315,10 +322,6 @@ public function end() : void
             // Calculate total duration
             $duration = Convert::microtimeToHuman(microtime(true) - $this->timeStart);
 
-            // Create one last step for total duration
-            $this->taskLogStepController->new('duration', 'DURATION');
-            $this->taskLogStepController->none('Total duration: ' . $duration);
-
             // Update duration
             $this->taskController->updateDuration($this->taskId, $duration);
 
@@ -358,10 +361,12 @@ public function end() : void
 
             // Update layout containers states
             $this->layoutContainerReloadController->reload('header/menu');
+            $this->layoutContainerReloadController->reload('repos/kpi');
             $this->layoutContainerReloadController->reload('repos/list');
-            $this->layoutContainerReloadController->reload('tasks/list');
-            $this->layoutContainerReloadController->reload('browse/list');
-            $this->layoutContainerReloadController->reload('browse/actions');
+            $this->layoutContainerReloadController->reload('tasks/tasks');
+            $this->layoutContainerReloadController->reload('tasks/log');
+            $this->layoutContainerReloadController->reload('snapshot/kpi');
+            $this->layoutContainerReloadController->reload('snapshot/list');
         } catch (Exception $e) {
             throw new Exception('Error while ending task: ' . $e->getMessage());
         }
diff --git a/www/controllers/Task/Form/Create.php b/www/controllers/Task/Form/Create.php
index c14ec20ea..36392f3a7 100644
--- a/www/controllers/Task/Form/Create.php
+++ b/www/controllers/Task/Form/Create.php
@@ -53,6 +53,9 @@ public function validate(array $formParams): void
         // Check description
         Param\Description::check($formParams['description']);
 
+        // Check tags
+        Param\Tags::check($formParams['tags']);
+
         // Check group
         if (!empty($formParams['group'])) {
             Param\Group::check($formParams['group']);
diff --git a/www/controllers/Task/Form/Delete.php b/www/controllers/Task/Form/Delete.php
index 646bfa385..f81c2847a 100644
--- a/www/controllers/Task/Form/Delete.php
+++ b/www/controllers/Task/Form/Delete.php
@@ -4,37 +4,45 @@
 
 use Exception;
 use Controllers\Repo\Repo;
+use Controllers\Repo\Snapshot\Snapshot;
 use Controllers\History\Save as History;
+use Controllers\Utils\Generate\Html\Label;
 
 class Delete
 {
     public function validate(array $formParams): void
     {
         $repoController = new Repo();
+        $repoSnaphotController = new Snapshot();
 
         // Check that the snapshot id is valid
         Param\Snapshot::checkId($formParams['snap-id']);
 
-        // Retrieve all repo data from the Id
-        $repoController->setSnapId($formParams['snap-id']);
-        $repoController->getAllById('', $formParams['snap-id'], '');
+        // Check that the snapshot exists
+        if (!$repoSnaphotController->exists($formParams['snap-id'])) {
+            throw new Exception('Snapshot Id #' . $formParams['snap-id'] . ' does not exist');
+        }
 
-        // Check that the repo exists
-        if ($repoController->existsSnapId($formParams['snap-id']) === false) {
-            throw new Exception('Snapshot Id ' . $formParams['snap-id'] . ' does not exist');
+        // Check if the snapshot has a protected environment
+        if ($repoSnaphotController->hasProtectedEnv($formParams['snap-id'])) {
+            throw new Exception('Snapshot has a protected environment and cannot be deleted');
         }
 
+        // Retrieve all repo data from the Id
+        // $repoController->setSnapId($formParams['snap-id']);
+        $repoController->getAllById('', $formParams['snap-id'], '');
+
         // Check scheduling parameters
         Param\Schedule::check($formParams['schedule']);
 
         // Add history
         if ($repoController->getPackageType() == 'rpm') {
-            History::set('Running task: delete repository snapshot <span class="label-white">' . $repoController->getName() . '</span>⸺<span class="label-black">' . $repoController->getDateFormatted() . '</span>');
+            History::set('Running task: delete repository snapshot ' . Label::white($repoController->getName()) . '⸺' . Label::white($repoController->getDateFormatted()));
         }
         if ($repoController->getPackageType() == 'deb') {
-            History::set('Running task: delete repository snapshot <span class="label-white">' . $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection() . '</span>⸺<span class="label-black">' . $repoController->getDateFormatted() . '</span>');
+            History::set('Running task: delete repository snapshot ' . Label::white($repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection()) . '⸺' . Label::white($repoController->getDateFormatted()));
         }
 
-        unset($repoController);
+        unset($repoController, $repoSnaphotController);
     }
 }
diff --git a/www/controllers/Task/Form/Duplicate.php b/www/controllers/Task/Form/Duplicate.php
index 463d5f135..fdcf00674 100644
--- a/www/controllers/Task/Form/Duplicate.php
+++ b/www/controllers/Task/Form/Duplicate.php
@@ -5,6 +5,7 @@
 use Exception;
 use Controllers\Repo\Repo;
 use Controllers\History\Save as History;
+use Controllers\Utils\Generate\Html\Label;
 
 class Duplicate
 {
@@ -17,10 +18,6 @@ public function validate(array $formParams): void
         // Check that the snapshot id is valid
         Param\Snapshot::checkId($formParams['snap-id']);
 
-        // Retrieve all repo data from the Id
-        $repoController->setSnapId($formParams['snap-id']);
-        $repoController->getAllById('', $formParams['snap-id'], '');
-
         // Check name
         Param\Name::check($formParams['name']);
 
@@ -34,20 +31,27 @@ public function validate(array $formParams): void
             Param\Description::check($formParams['description']);
         }
 
+        // Check tags
+        Param\Tags::check($formParams['tags']);
+
         // Check group
         if (!empty($formParams['group'])) {
             Param\Group::check($formParams['group']);
         }
 
+        // Retrieve all repo data from the Id
+        // $repoController->setSnapId($formParams['snap-id']);
+        $repoController->getAllById('', $formParams['snap-id'], '');
+
         // Check that a repo with the same name does not already exist
         if ($repoController->getPackageType() == 'rpm') {
             if ($rpmRepoController->isActive($formParams['name'], $repoController->getReleasever())) {
-                throw new Exception('<span class="label-white">' . $formParams['name'] . ' ❯ ' . $repoController->getReleasever() . '</span> repository already exists');
+                throw new Exception(Label::white($formParams['name'] . ' ❯ ' . $repoController->getReleasever()) . ' repository already exists');
             }
         }
         if ($repoController->getPackageType() == 'deb') {
             if ($debRepoController->isActive($formParams['name'], $repoController->getDist(), $repoController->getSection())) {
-                throw new Exception('<span class="label-white">' . $formParams['name'] . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection() . '</span> repo already exists');
+                throw new Exception(Label::white($formParams['name'] . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection()) . ' repo already exists');
             }
         }
 
@@ -56,10 +60,10 @@ public function validate(array $formParams): void
 
         // Add history
         if ($repoController->getPackageType() == 'rpm') {
-            History::set('Running task: duplicate repository <span class="label-white">' . $repoController->getName() . '</span>⸺<span class="label-black">' . $repoController->getDateFormatted() . '</span> ➡ <span class="label-white">' . $formParams['name'] . '</span>');
+            History::set('Running task: duplicate repository ' . Label::white($repoController->getName()) . '⸺' . Label::white($repoController->getDateFormatted()) . ' ➡ ' . Label::white($formParams['name']));
         }
         if ($repoController->getPackageType() == 'deb') {
-            History::set('Running task: duplicate repository <span class="label-white">' . $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection() . '</span>⸺<span class="label-black">' . $repoController->getDateFormatted() . '</span> ➡ <span class="label-white">' . $formParams['name'] . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection() . '</span>');
+            History::set('Running task: duplicate repository ' . Label::white($repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection()) . '⸺' . Label::white($repoController->getDateFormatted()) . ' ➡ ' . Label::white($formParams['name'] . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection()));
         }
 
         unset($repoController, $rpmRepoController, $debRepoController);
diff --git a/www/controllers/Task/Form/Env.php b/www/controllers/Task/Form/Env.php
index 486fbb4b7..f67b01105 100644
--- a/www/controllers/Task/Form/Env.php
+++ b/www/controllers/Task/Form/Env.php
@@ -2,7 +2,9 @@
 
 namespace Controllers\Task\Form;
 
+use Exception;
 use Controllers\Repo\Repo;
+use Controllers\Environment;
 use Controllers\Utils\Generate\Html\Label;
 use Controllers\History\Save as History;
 
@@ -11,23 +13,28 @@ class Env
     public function validate(array $formParams): void
     {
         $repoController = new Repo();
+        $envController = new Environment();
 
         // Check that the snapshot id is valid
         Param\Snapshot::checkId($formParams['snap-id']);
 
-        // Retrieve all repo data from the Id
-        $repoController->setSnapId($formParams['snap-id']);
-        $repoController->getAllById('', $formParams['snap-id'], '');
-
         // Check environment
         Param\Environment::check($formParams['env']);
 
-        // Check description
-        Param\Description::check($formParams['description']);
-
         // Check scheduling parameters
         Param\Schedule::check($formParams['schedule']);
 
+        // Check if the env is protected
+        foreach ($formParams['env'] as $env) {
+            if ($envController->isProtected($env)) {
+                throw new Exception('Environment ' . $env . ' is protected and cannot be moved');
+            }
+        }
+
+        // Retrieve all repo data from the Id
+        // $repoController->setSnapId($formParams['snap-id']);
+        $repoController->getAllById('', $formParams['snap-id'], '');
+
         // Add history
         $content = '';
         foreach ($formParams['env'] as $env) {
@@ -35,10 +42,10 @@ public function validate(array $formParams): void
         }
 
         if ($repoController->getPackageType() == 'rpm') {
-            History::set('Running task: point environment(s) <span>' . trim($content) . '</span> to repository <span class="label-white">' . $repoController->getName() . '</span>⸺<span class="label-black">' . $repoController->getDateFormatted() . '</span>');
+            History::set('Running task: point environment(s) <span>' . trim($content) . '</span> to repository ' . Label::white($repoController->getName()) . '⸺' . Label::white($repoController->getDateFormatted()));
         }
         if ($repoController->getPackageType() == 'deb') {
-            History::set('Running task: point environment(s) <span>' . trim($content) . '</span> to repository <span class="label-white">' . $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection() . '</span>⸺<span class="label-black">' . $repoController->getDateFormatted() . '</span>');
+            History::set('Running task: point environment(s) <span>' . trim($content) . '</span> to repository ' . Label::white($repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection()) . '⸺' . Label::white($repoController->getDateFormatted()));
         }
 
         unset($repoController);
diff --git a/www/controllers/Task/Form/Form.php b/www/controllers/Task/Form/Form.php
index fab2243f5..8c6758160 100644
--- a/www/controllers/Task/Form/Form.php
+++ b/www/controllers/Task/Form/Form.php
@@ -3,9 +3,14 @@
 namespace Controllers\Task\Form;
 
 use Exception;
+use Controllers\User\User;
 use Controllers\Repo\Repo;
+use Controllers\Environment;
+use Controllers\Task\Target;
 use Controllers\Utils\Validate;
-use Controllers\Repo\Environment;
+use Controllers\Repo\Listing as RepoListing;
+use Controllers\Repo\Environment as RepoEnvironment;
+use Controllers\History\Save as History;
 use Controllers\Task\Scheduled as ScheduledTask;
 use Controllers\User\Permission\Repo as RepoPermission;
 
@@ -16,70 +21,92 @@ class Form
     /**
      *  Return the task form to the user according to his selection
      */
-    public function get(string $action, array $repos) : string
+    public function get(string $action, array $repos): string
     {
-        $userController = new \Controllers\User\User();
+        $userController = new User();
+        $repoEnvController = new RepoEnvironment();
+        $repoListingController = new RepoListing();
+        $scheduledTaskController = new ScheduledTask();
+
+        // Get the list of email addresses to populate the recipient selector
         $usersEmail = $userController->getEmails();
 
+        // Get current tags to populate the tag selector
+        $tags = $repoListingController->listTags();
+
+        // Initialize the form content
         $content = '<form id="task-form" autocomplete="off">';
 
+        // Add each repository form to the content
         foreach ($repos as $repo) {
             $repoController = new Repo();
-            $repoEnvController = new Environment();
-            $scheduledTaskController = new ScheduledTask();
-            $repoId = Validate::int($repo['repo-id']);
-            $snapId = Validate::int($repo['snap-id']);
+            $scheduledTasksCount = 0;
+            $repoId = null;
+            $snapId = null;
             $envId  = null;
 
-            // If an environment points to the snapshot (snapId), retrieve the envId from the repo array
-            if (!empty($repo['envId'])) {
-                $envId = Validate::int($repo['env-id']);
+            if (empty($repo['repo-id'])) {
+                throw new Exception('Repository Id is required');
             }
 
-            // Check that the Ids are numeric
-            if (!is_numeric($repoId)) {
-                throw new Exception("Repository Id is invalid");
+            if (!is_numeric($repo['repo-id'])) {
+                throw new Exception('Repository Id is invalid');
             }
-            if (!is_numeric($snapId)) {
-                throw new Exception("Snapshot Id is invalid");
+
+            $repoId = Validate::int($repo['repo-id']);
+
+            // If a snapshot Id is provided
+            if (!empty($repo['snap-id'])) {
+                if (!is_numeric($repo['snap-id'])) {
+                    throw new Exception('Snapshot Id is invalid');
+                }
+
+                $snapId = Validate::int($repo['snap-id']);
             }
-            if (!empty($envId) and !is_numeric($envId)) {
-                throw new Exception("Environment Id is invalid");
+
+            // If an environment points to the snapshot (snapId), retrieve the envId from the repo array
+            if (!empty($repo['env-id'])) {
+                if (!is_numeric($repo['env-id'])) {
+                    throw new Exception('Environment Id is invalid');
+                }
+
+                $envId = Validate::int($repo['env-id']);
             }
 
             // Check that the Ids exist in the database
             if (!$repoController->existsId($repoId)) {
                 throw new Exception("Repository Id does not exist");
             }
-            if (!$repoController->existsSnapId($snapId)) {
+            if (!empty($snapId) and !$repoController->existsSnapId($snapId)) {
                 throw new Exception("Snapshot Id does not exist");
             }
             if (!empty($envId) and !$repoEnvController->exists($envId)) {
                 throw new Exception("Environment Id does not exist");
             }
 
+
             // Retrieve all repo data from the Ids
             $repoController->getAllById($repoId, $snapId, $envId);
 
             // Retrieve the package type of the repo
             $packageType = $repoController->getPackageType();
 
-            // Get scheduled tasks on this snapshot (if any) and count them
-            $scheduledTasks = $scheduledTaskController->getBySnapId($snapId);
-            $scheduledTasksCount = count($scheduledTasks);
+            // Get scheduled tasks on the snapshot (if any) and count them
+            if (!empty($snapId)) {
+                $scheduledTasks = $scheduledTaskController->getBySnapId($snapId);
+                $scheduledTasksCount = count($scheduledTasks);
+            }
 
             // Build the form from a template
             ob_start();
 
-            echo '<div class="task-form-params" repo-id="' . $repoId . '" snap-id="' . $snapId . '" env-id="' . $envId . '" action="' . $action . '">';
+            echo '<div class="task-form-params form-block form-block-accent-' . ($packageType == 'deb' ? 'red' : 'blue') . '" repo-id="' . $repoId . '" snap-id="' . $snapId . '" env-id="' . $envId . '" action="' . $action . '">';
 
             // Include form template
             include(ROOT . '/views/includes/forms/tasks/' . $action . '.inc.php');
 
             echo '</div>';
 
-            echo '<br><hr>';
-
             $content .= ob_get_clean();
         }
 
@@ -130,4 +157,74 @@ public function validate(array $tasksParams) : void
             $controller->validate($task);
         }
     }
+
+    /**
+     *  Validate a task targeting a dynamic set of repositories (all latest snapshots matching filters)
+     *  Such a task has no fixed snapshot, so the per-action validators cannot be used here
+     *  @param array $taskParams
+     */
+    public function validateTarget(array $taskParams): array
+    {
+        $targetController = new Target();
+        $envController = new Environment();
+
+        // Retrieve action
+        if (empty($taskParams['action'])) {
+            throw new Exception('No action has been specified');
+        }
+
+        if (!in_array($taskParams['action'], $targetController->getValidActions())) {
+            throw new Exception('This action cannot target all repositories: ' . $taskParams['action']);
+        }
+
+        // If the user does not have permission to perform the specified action, prevent creation of the task
+        if (!RepoPermission::allowedAction($taskParams['action'])) {
+            throw new Exception('You are not allowed to execute this action');
+        }
+
+        if (empty($taskParams['target'])) {
+            throw new Exception('No target has been specified');
+        }
+
+        // Validate and clean the target definition
+        $taskParams['target'] = $targetController->validate($taskParams['target']);
+
+        // A dynamic task is only useful when scheduled
+        if (empty($taskParams['schedule']['scheduled']) or $taskParams['schedule']['scheduled'] != 'true') {
+            throw new Exception('A task targeting all repositories must be scheduled');
+        }
+
+        // Check scheduling parameters
+        Param\Schedule::check($taskParams['schedule']);
+
+        // Environment is required for the 'env' action
+        if ($taskParams['action'] == 'env') {
+            Param\Environment::check($taskParams['env'] ?? []);
+
+            // Check if the env is protected
+            foreach ($taskParams['env'] as $env) {
+                if ($envController->isProtected($env)) {
+                    throw new Exception('Environment ' . $env . ' is protected and cannot be moved');
+                }
+            }
+        }
+
+        // Environment is optional for the 'update' action
+        if ($taskParams['action'] == 'update' and !empty($taskParams['env'])) {
+            Param\Environment::check($taskParams['env']);
+        }
+
+        // Check GPG parameters
+        if (in_array($taskParams['action'], ['update', 'rebuild'])) {
+            Param\GpgSign::check($taskParams['gpg-sign'] ?? 'false');
+        }
+
+        if ($taskParams['action'] == 'update') {
+            Param\GpgCheck::check($taskParams['gpg-check'] ?? 'false');
+        }
+
+        History::set('Scheduling task: ' . $taskParams['action'] . ' on <span class="label-white">' . Target::describe($taskParams['target']) . '</span>');
+
+        return $taskParams;
+    }
 }
diff --git a/www/controllers/Task/Form/Param/Environment.php b/www/controllers/Task/Form/Param/Environment.php
index 1fccee83b..1a0146237 100644
--- a/www/controllers/Task/Form/Param/Environment.php
+++ b/www/controllers/Task/Form/Param/Environment.php
@@ -6,20 +6,27 @@
 
 class Environment
 {
-    public static function check(array $envs) : void
+    public static function check(array $envs): void
     {
-        $myenv = new \Controllers\Environment();
+        $envController = new \Controllers\Environment();
 
         if (empty($envs)) {
             throw new Exception('Environment must be specified');
         }
 
         foreach ($envs as $env) {
-            if (!$myenv->exists($env)) {
+            if (!$envController->exists($env)) {
                 throw new Exception('Specified environment does not exist');
             }
         }
 
-        unset($envs, $myenv);
+        // Check that the environment is not protected
+        foreach ($envs as $env) {
+            if ($envController->isProtected($env)) {
+                throw new Exception('Environment ' . $env . ' is protected and cannot be modified');
+            }
+        }
+
+        unset($envs, $envController);
     }
 }
diff --git a/www/controllers/Task/Form/Param/Repo.php b/www/controllers/Task/Form/Param/Repo.php
new file mode 100644
index 000000000..55af7379a
--- /dev/null
+++ b/www/controllers/Task/Form/Param/Repo.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Controllers\Task\Form\Param;
+
+use Controllers\Repo\Repo as RepoController;
+use Exception;
+
+class Repo
+{
+    public static function checkId(int $id) : void
+    {
+        $repoController = new RepoController();
+
+        if (!$repoController->existsId($id)) {
+            throw new Exception('Specified repository does not exist');
+        }
+
+        unset($repoController);
+    }
+}
diff --git a/www/controllers/Task/Form/Param/Schedule.php b/www/controllers/Task/Form/Param/Schedule.php
index 0f21b78d5..3f69166e1 100644
--- a/www/controllers/Task/Form/Param/Schedule.php
+++ b/www/controllers/Task/Form/Param/Schedule.php
@@ -320,7 +320,11 @@ public static function clean(array $params): array
         }
 
         // Remove recipient if no alert or reminder is set
-        if ($params['schedule']['schedule-notify-error'] == 'false' && $params['schedule']['schedule-notify-success'] == 'false' && empty($params['schedule']['schedule-reminder'])) {
+        $notifyOnError = $params['schedule']['schedule-notify-error'] ?? 'false';
+        $notifyOnSuccess = $params['schedule']['schedule-notify-success'] ?? 'false';
+        $reminders = $params['schedule']['schedule-reminder'] ?? [];
+
+        if ($notifyOnError == 'false' && $notifyOnSuccess == 'false' && empty($reminders)) {
             unset($params['schedule']['schedule-recipient']);
         }
 
diff --git a/www/controllers/Task/Form/Param/Tags.php b/www/controllers/Task/Form/Param/Tags.php
new file mode 100644
index 000000000..09768bf07
--- /dev/null
+++ b/www/controllers/Task/Form/Param/Tags.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Controllers\Task\Form\Param;
+
+use Exception;
+use Controllers\Utils\Validate;
+
+class Tags
+{
+    public static function check(array $tags): void
+    {
+        if (empty($tags)) {
+            return;
+        }
+
+        foreach ($tags as $tag) {
+            if (!Validate::alphaNumericHyphen($tag, ['.', '+'])) {
+                throw new Exception('List of tags contains invalid characters');
+            }
+        }
+    }
+}
diff --git a/www/controllers/Task/Form/Rebuild.php b/www/controllers/Task/Form/Rebuild.php
index 1309025db..e8ed37d9e 100644
--- a/www/controllers/Task/Form/Rebuild.php
+++ b/www/controllers/Task/Form/Rebuild.php
@@ -2,34 +2,47 @@
 
 namespace Controllers\Task\Form;
 
+use Exception;
 use Controllers\Repo\Repo;
+use Controllers\Repo\Snapshot\Snapshot;
 use Controllers\History\Save as History;
+use Controllers\Utils\Generate\Html\Label;
 
 class Rebuild
 {
     public function validate(array $formParams): void
     {
         $repoController = new Repo();
+        $repoSnaphotController = new Snapshot();
 
         // Check that the snapshot id is valid
         Param\Snapshot::checkId($formParams['snap-id']);
 
-        // Retrieve all repo data from the Id
-        $repoController->setSnapId($formParams['snap-id']);
-        $repoController->getAllById('', $formParams['snap-id'], '');
-
         // Check gpg sign
         Param\GpgSign::check($formParams['gpg-sign']);
 
         // Check scheduling parameters
         Param\Schedule::check($formParams['schedule']);
 
+        // Check that the snapshot exists
+        if (!$repoSnaphotController->exists($formParams['snap-id'])) {
+            throw new Exception('Snapshot Id #' . $formParams['snap-id'] . ' does not exist');
+        }
+
+        // Check if the snapshot has a protected environment
+        if ($repoSnaphotController->hasProtectedEnv($formParams['snap-id'])) {
+            throw new Exception('Snapshot has a protected environment and cannot be deleted');
+        }
+
+        // Retrieve all repo data from the Id
+        $repoController->getAllById('', $formParams['snap-id'], '');
+
         // Add history
         if ($repoController->getPackageType() == 'rpm') {
-            History::set('Running task: rebuild repository metadata files of <span class="label-white">' . $repoController->getName() . '</span>⸺<span class="label-black">' . $repoController->getDateFormatted() . '</span>');
+            History::set('Running task: rebuild repository metadata files of ' . Label::white($repoController->getName()) . '⸺' . Label::white($repoController->getDateFormatted()));
         }
         if ($repoController->getPackageType() == 'deb') {
-            History::set('Running task: rebuild repository metadata files of <span class="label-white">' . $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection() . '</span>⸺<span class="label-black">' . $repoController->getDateFormatted() . '</span>');
+            History::set('Running task: rebuild repository metadata files of ' . Label::white($repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection()) . '⸺' . Label::white($repoController->getDateFormatted()));
         }
 
         unset($repoController);
diff --git a/www/controllers/Task/Form/RemoveEnv.php b/www/controllers/Task/Form/RemoveEnv.php
index 37a0c6303..03c0a086a 100644
--- a/www/controllers/Task/Form/RemoveEnv.php
+++ b/www/controllers/Task/Form/RemoveEnv.php
@@ -2,14 +2,18 @@
 
 namespace Controllers\Task\Form;
 
+use Exception;
 use Controllers\Repo\Repo;
+use Controllers\Environment;
 use Controllers\History\Save as History;
+use Controllers\Utils\Generate\Html\Label;
 
 class RemoveEnv
 {
     public function validate(array $formParams): void
     {
         $repoController = new Repo();
+        $envController = new Environment();
 
         // Check that the snapshot id is valid
         Param\Snapshot::checkId($formParams['snap-id']);
@@ -17,12 +21,17 @@ public function validate(array $formParams): void
         // Retrieve all repo data from the Id
         $repoController->getAllById($formParams['repo-id'], $formParams['snap-id'], $formParams['env-id']);
 
+        // Check if the env is protected
+        if ($envController->isProtected($repoController->getEnv())) {
+            throw new Exception('Environment ' . $repoController->getEnv() . ' is protected and cannot be removed');
+        }
+
         // Add history
         if ($repoController->getPackageType() == 'rpm') {
-            History::set('Running task: remove ' . $repoController->getEnv() . ' environment from <span class="label-white">' . $repoController->getName() . '</span>⸺<span class="label-black">' . $repoController->getDateFormatted() . '</span>');
+            History::set('Running task: remove ' . $repoController->getEnv() . ' environment from ' . Label::white($repoController->getName()) . '⸺' . Label::white($repoController->getDateFormatted()));
         }
         if ($repoController->getPackageType() == 'deb') {
-            History::set('Running task: remove ' . $repoController->getEnv() . ' environment from <span class="label-white">' . $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection() . '</span>⸺<span class="label-black">' . $repoController->getDateFormatted() . '</span>');
+            History::set('Running task: remove ' . $repoController->getEnv() . ' environment from ' . Label::white($repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection()) . '⸺' . Label::white($repoController->getDateFormatted()));
         }
 
         unset($repoController);
diff --git a/www/controllers/Task/Form/Rename.php b/www/controllers/Task/Form/Rename.php
index ba5b560df..6ebe75975 100644
--- a/www/controllers/Task/Form/Rename.php
+++ b/www/controllers/Task/Form/Rename.php
@@ -17,23 +17,26 @@ public function validate(array $formParams): void
         $rpmRepoController = new Rpm();
         $debRepoController = new Deb();
 
-        // Check that the snapshot id is valid
-        Param\Snapshot::checkId($formParams['snap-id']);
+        // Check that the repo id is valid
+        Param\Repo::checkId($formParams['repo-id']);
 
-        // Retrieve all repo data from the Id
-        $repoController->getAllById('', $formParams['snap-id'], '');
+        // Check name
+        Param\Name::check($formParams['name']);
 
         // Check old name
         Param\Name::check($formParams['old-name']);
 
+        // Check scheduling parameters
+        Param\Schedule::check($formParams['schedule']);
+
+        // Retrieve all repo data from the Id
+        $repoController->getAllById($formParams['repo-id']);
+
         // Old name must match the current name of the repository being renamed, otherwise someone is trying to doing something bad
         if ($formParams['old-name'] != $repoController->getName()) {
             throw new Exception('The old repository name does not match the name of the repository being renamed');
         }
 
-        // Check name
-        Param\Name::check($formParams['name']);
-
         // Check that a repo with the same name does not already exist
         if ($repoController->getPackageType() == 'rpm') {
             if ($rpmRepoController->isActive($formParams['name'], $repoController->getReleasever())) {
@@ -46,15 +49,12 @@ public function validate(array $formParams): void
             }
         }
 
-        // Check scheduling parameters
-        Param\Schedule::check($formParams['schedule']);
-
         // Add history
         if ($repoController->getPackageType() == 'rpm') {
-            History::set('Running task: renaming repository ' . Label::white($repoController->getName()) . '⸺' . Label::black($repoController->getDateFormatted()) . ' ➡ ' . Label::white($formParams['name']));
+            History::set('Running task: renaming repository ' . Label::white($repoController->getName()) . ' ➡ ' . Label::white($formParams['name']));
         }
         if ($repoController->getPackageType() == 'deb') {
-            History::set('Running task: renaming repository ' . Label::white($repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection()) . '⸺' . Label::black($repoController->getDateFormatted()) . ' ➡ ' . Label::white($formParams['name'] . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection()));
+            History::set('Running task: renaming repository ' . Label::white($repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection()) . ' ➡ ' . Label::white($formParams['name'] . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection()));
         }
 
         unset($repoController, $rpmRepoController, $debRepoController);
diff --git a/www/controllers/Task/Form/Update.php b/www/controllers/Task/Form/Update.php
index 82e25bbbb..05c1c8e46 100644
--- a/www/controllers/Task/Form/Update.php
+++ b/www/controllers/Task/Form/Update.php
@@ -2,8 +2,11 @@
 
 namespace Controllers\Task\Form;
 
+use Exception;
 use Controllers\Repo\Repo;
+use Controllers\Repo\Snapshot\Snapshot;
 use Controllers\History\Save as History;
+use Controllers\Utils\Generate\Html\Label;
 
 class Update
 {
@@ -14,8 +17,17 @@ public function validate(array $formParams): void
         // Check that the snapshot id is valid
         Param\Snapshot::checkId($formParams['snap-id']);
 
+        // Check architecture
+        Param\Arch::check($formParams['arch']);
+
+        // Check gpg sign
+        Param\GpgSign::check($formParams['gpg-sign']);
+
+        // Check scheduling parameters
+        Param\Schedule::check($formParams['schedule']);
+
         // Retrieve all repo data from the Id
-        $repoController->setSnapId($formParams['snap-id']);
+        // $repoController->setSnapId($formParams['snap-id']);
         $repoController->getAllById('', $formParams['snap-id'], '');
 
         // Check env
@@ -23,9 +35,6 @@ public function validate(array $formParams): void
             Param\Environment::check($formParams['env']);
         }
 
-        // Check architecture
-        Param\Arch::check($formParams['arch']);
-
         // Case of a mirror repository, check additional parameters
         if ($repoController->getType() == 'mirror') {
             // Check keep latest versions of packages
@@ -55,18 +64,12 @@ public function validate(array $formParams): void
             }
         }
 
-        // Check gpg sign
-        Param\GpgSign::check($formParams['gpg-sign']);
-
-        // Check scheduling parameters
-        Param\Schedule::check($formParams['schedule']);
-
         // Add history
         if ($repoController->getPackageType() == 'rpm') {
-            History::set('Running task: update ' . $repoController->getType() . ' repository <span class="label-white">' . $repoController->getName() . '</span>');
+            History::set('Running task: update ' . $repoController->getType() . ' repository ' . Label::white($repoController->getName()));
         }
         if ($repoController->getPackageType() == 'deb') {
-            History::set('Running task: update ' . $repoController->getType() . ' repository <span class="label-white">' . $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection() . '</span>');
+            History::set('Running task: update ' . $repoController->getType() . ' repository ' . Label::white($repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection()));
         }
 
         unset($repoController);
diff --git a/www/controllers/Task/Listing.php b/www/controllers/Task/Listing.php
index acfcb013c..9d4b7db8b 100644
--- a/www/controllers/Task/Listing.php
+++ b/www/controllers/Task/Listing.php
@@ -59,4 +59,75 @@ public function getDone(string $type = 'immediate', bool $withOffset = false, in
     {
         return $this->model->getDone($type, $withOffset, $offset);
     }
+
+    /**
+     *  Get all sub-tasks generated by a parent task
+     *  It is possible to add an offset to the request
+     */
+    public function getByParentId(int $parentTaskId, bool $withOffset = false, int $offset = 0): array
+    {
+        return $this->model->getByParentId($parentTaskId, $withOffset, $offset);
+    }
+
+    /**
+     *  Count sub-tasks generated by a parent task, grouped by status
+     */
+    public function countStatusByParentId(int $parentTaskId): array
+    {
+        return $this->model->countStatusByParentId($parentTaskId);
+    }
+
+    /**
+     *  Return a summary of the sub-tasks statuses of a parent task
+     *  A parent task has no status of its own as it only dispatches sub-tasks, so its real status is a summary of theirs
+     *  Return an empty array if the task has no sub-task
+     */
+    public function getSubTasksSummary(int $parentTaskId): array
+    {
+        $count = $this->countStatusByParentId($parentTaskId);
+
+        if (empty($count)) {
+            return [];
+        }
+
+        return $this->buildSubTasksSummary($count);
+    }
+
+    /**
+     *  Same as getSubTasksSummary() but for multiple parent tasks at once
+     *  Tasks having no sub-task are not returned
+     */
+    public function getSubTasksSummaries(array $parentTaskIds): array
+    {
+        $summaries = [];
+
+        foreach ($this->model->countStatusByParentIds($parentTaskIds) as $parentTaskId => $count) {
+            $summaries[$parentTaskId] = $this->buildSubTasksSummary($count);
+        }
+
+        return $summaries;
+    }
+
+    /**
+     *  Build a sub-tasks summary from a count of sub-tasks per status
+     */
+    private function buildSubTasksSummary(array $count): array
+    {
+        $summary = [
+            'total'   => array_sum($count),
+            'success' => $count['done'] ?? 0,
+            'failed'  => ($count['error'] ?? 0) + ($count['stopped'] ?? 0),
+            'ongoing' => ($count['running'] ?? 0) + ($count['queued'] ?? 0)
+        ];
+
+        if ($summary['ongoing'] > 0) {
+            $summary['status'] = 'running';
+        } elseif ($summary['failed'] > 0) {
+            $summary['status'] = 'error';
+        } else {
+            $summary['status'] = 'done';
+        }
+
+        return $summary;
+    }
 }
diff --git a/www/controllers/Task/Target.php b/www/controllers/Task/Target.php
new file mode 100644
index 000000000..709b66fd1
--- /dev/null
+++ b/www/controllers/Task/Target.php
@@ -0,0 +1,259 @@
+<?php
+
+namespace Controllers\Task;
+
+use Exception;
+use Controllers\Repo\Repo;
+use Controllers\Repo\Listing as RepoListing;
+
+/**
+ *  A task target describes a dynamic set of repositories, instead of a fixed list of snapshots.
+ *  It is used by scheduled tasks that must always run on the latest snapshot of every matching
+ *  repository, including repositories created after the task has been scheduled.
+ */
+class Target
+{
+    /**
+     *  Actions that support a dynamic target
+     */
+    private $validActions = ['update', 'env', 'rebuild'];
+
+    /**
+     *  Return the list of actions supporting a dynamic target
+     */
+    public function getValidActions(): array
+    {
+        return $this->validActions;
+    }
+
+    /**
+     *  Return true if the specified task parameters target a dynamic set of repositories
+     */
+    public static function isDynamic(array $taskParams): bool
+    {
+        return !empty($taskParams['target']) and is_array($taskParams['target']);
+    }
+
+    /**
+     *  Validate and clean a target definition
+     *  Returns the sanitized target
+     */
+    public function validate(array $target): array
+    {
+        $groupId = '';
+        $tags = [];
+        $packageType = '';
+
+        /**
+         *  Check group, if any
+         *  The group Id is stored instead of its name, so that renaming a group has no impact on the target
+         *  Group Id 0 is a fictitious group ('Default') holding the repositories that do not belong to any group
+         */
+        if (isset($target['group']) and $target['group'] !== '') {
+            if (!is_numeric($target['group'])) {
+                throw new Exception('Invalid target group Id');
+            }
+
+            $groupId = strval(intval($target['group']));
+
+            if ($groupId !== '0') {
+                $groupController = new \Controllers\Group\Repo();
+
+                if (!$groupController->existsId(intval($groupId))) {
+                    throw new Exception('Target group does not exist: #' . $groupId);
+                }
+            }
+        }
+
+        // Check tags, if any
+        if (!empty($target['tags'])) {
+            if (!is_array($target['tags'])) {
+                throw new Exception('Invalid target tags');
+            }
+
+            foreach ($target['tags'] as $tag) {
+                if (!is_string($tag)) {
+                    throw new Exception('Invalid target tag');
+                }
+
+                $tag = trim($tag);
+
+                if ($tag === '') {
+                    continue;
+                }
+
+                // Tags are stored as a comma-separated string, so a tag cannot contain a comma
+                if (str_contains($tag, ',')) {
+                    throw new Exception('Invalid target tag: ' . $tag);
+                }
+
+                $tags[] = $tag;
+            }
+        }
+
+        // Check package type, if any
+        if (!empty($target['package-type'])) {
+            if (!in_array($target['package-type'], ['deb', 'rpm'])) {
+                throw new Exception('Invalid target package type');
+            }
+
+            $packageType = $target['package-type'];
+        }
+
+        return [
+            'group' => $groupId,
+            'tags' => $tags,
+            'package-type' => $packageType
+        ];
+    }
+
+    /**
+     *  Return the list of repositories matching the target, with their latest active snapshot Id
+     */
+    public function resolve(array $target): array
+    {
+        $target = $this->validate($target);
+
+        $repoListingController = new RepoListing();
+
+        return $repoListingController->listByTarget($target['group'], $target['tags'], $target['package-type']);
+    }
+
+    /**
+     *  Return a human readable description of the target
+     *  The group name is resolved from its Id, so the description always reflects the current name
+     */
+    public static function describe(array $target): string
+    {
+        $filters = [];
+
+        if (isset($target['group']) and $target['group'] !== '') {
+            /**
+             *  Keep <b> markup in the template, but escape the group name itself
+             *  because it comes from data and may contain HTML special characters
+             */
+            $filters[] = 'group <b>' . htmlspecialchars(self::groupName(intval($target['group'])), ENT_QUOTES) . '</b>';
+        }
+
+        if (!empty($target['tags'])) {
+            /**
+             *  Escape each tag value before injecting it in the HTML-formatted
+             *  description. This preserves the surrounding <b> tags while ensuring
+             *  tag content is displayed as text.
+             */
+            $escapedTags = array_map(function ($tag) {
+                return htmlspecialchars($tag, ENT_QUOTES);
+            }, $target['tags']);
+
+            $filters[] = 'tag' . (count($escapedTags) > 1 ? 's' : '') . ' <b>#' . implode(' #', $escapedTags) . '</b>';
+        }
+
+        if (!empty($target['package-type'])) {
+            $filters[] = 'package type ' . $target['package-type'];
+        }
+
+        if (empty($filters)) {
+            return 'All repositories (latest snapshots)';
+        }
+
+        return 'All repositories with ' . implode(' and ', $filters) . ' (latest snapshots)';
+    }
+
+    /**
+     *  Return the current name of a group from its Id
+     *  Group Id 0 is the fictitious 'Default' group
+     */
+    private static function groupName(int $groupId): string
+    {
+        if ($groupId === 0) {
+            return 'Default';
+        }
+
+        try {
+            $groupController = new \Controllers\Group\Repo();
+
+            return $groupController->getNameById(intval($groupId));
+        } catch (Exception $e) {
+            // The group may have been deleted since the task was scheduled
+            return '#' . $groupId . ' (deleted)';
+        }
+    }
+
+    /**
+     *  Expand a dynamic task into a list of concrete task parameters, one per matching repository
+     *  Each generated task targets the latest snapshot of the repository and is meant to be executed immediately
+     */
+    public function expand(array $taskParams): array
+    {
+        $tasksParams = [];
+
+        if (empty($taskParams['action'])) {
+            throw new Exception('No action has been specified');
+        }
+
+        $action = $taskParams['action'];
+
+        if (!in_array($action, $this->validActions)) {
+            throw new Exception('Action does not support a dynamic target: ' . $action);
+        }
+
+        if (empty($taskParams['target'])) {
+            throw new Exception('No target has been specified');
+        }
+
+        // Retrieve all the repositories matching the target
+        $repos = $this->resolve($taskParams['target']);
+
+        foreach ($repos as $repo) {
+            $params = [
+                'action' => $action,
+                'repo-id' => strval($repo['repoId']),
+                'snap-id' => strval($repo['snapId']),
+                'env-id' => '',
+
+                // Generated tasks are executed immediately, the recurrence is carried by the parent task
+                'schedule' => [
+                    'scheduled' => 'false'
+                ]
+            ];
+
+            /**
+             *  Retrieve the current repository settings, as some parameters cannot be known
+             *  when the task is scheduled (e.g. the architectures of a repository created later)
+             */
+            $repoController = new Repo();
+            $repoController->getAllById(null, $repo['snapId'], null);
+
+            if ($action == 'update') {
+                // Each repository is updated with its own current architectures and advanced parameters
+                $params['arch'] = $repoController->getArch();
+                $params['advanced-params'] = $repoController->getAdvancedParams();
+                $params['gpg-sign'] = $taskParams['gpg-sign'] ?? 'false';
+
+                // GPG check only applies to mirror repositories
+                if ($repoController->getType() == 'mirror') {
+                    $params['gpg-check'] = $taskParams['gpg-check'] ?? 'false';
+                }
+
+                // Environments to point to the new snapshot are optional
+                if (!empty($taskParams['env'])) {
+                    $params['env'] = $taskParams['env'];
+                }
+            }
+
+            if ($action == 'env') {
+                $params['env'] = $taskParams['env'] ?? [];
+            }
+
+            if ($action == 'rebuild') {
+                $params['gpg-sign'] = $taskParams['gpg-sign'] ?? 'false';
+            }
+
+            unset($repoController);
+
+            $tasksParams[] = $params;
+        }
+
+        return $tasksParams;
+    }
+}
diff --git a/www/controllers/Task/Task.php b/www/controllers/Task/Task.php
index a0deb4abc..9f8a7802f 100644
--- a/www/controllers/Task/Task.php
+++ b/www/controllers/Task/Task.php
@@ -2,10 +2,13 @@
 
 namespace Controllers\Task;
 
+use Controllers\User\Permission\Task as TaskPermission;
 use Controllers\Task\Form\Param\Schedule;
+use Controllers\History\Save as History;
 use Controllers\Task\Log\SubStep;
 use Controllers\Task\Log\Step;
 use Controllers\Utils\Cron;
+use Controllers\Repo\Repo;
 use Controllers\Process;
 use JsonException;
 use Exception;
@@ -179,10 +182,11 @@ public function somethingRunning()
 
     /**
      *  Return repository from task Id
+     *  Return string if $string is true, otherwise return an array with the repository details
      */
-    public function getRepo(int $id): string
+    public function getRepo(int $id, $string = true): string|array
     {
-        $repoController = new \Controllers\Repo\Repo();
+        $repoController = new Repo();
 
         try {
             // Retrieve task informations
@@ -194,6 +198,22 @@ public function getRepo(int $id): string
                 throw new Exception('could not decode task parameters: ' . $e->getMessage());
             }
 
+            // Case where the task targets a dynamic set of repositories, there is no fixed repository
+            if (Target::isDynamic($taskRawParams)) {
+                unset($repoController);
+
+                $description = Target::describe($taskRawParams['target']);
+
+                if ($string) {
+                    return $description;
+                }
+
+                return [
+                    'type' => 'target',
+                    'name' => $description
+                ];
+            }
+
             if (!empty($taskRawParams['source-snap-id'])) {
                 if (is_numeric($taskRawParams['source-snap-id'])) {
                     $repoController->getAllById('', $taskRawParams['source-snap-id'], '');
@@ -248,15 +268,38 @@ public function getRepo(int $id): string
                 }
             }
 
+            unset($repoController);
+
             if (!empty($dist) and !empty($component)) {
-                return $name . ' ❯ ' . $dist . ' ❯ ' . $component;
+                $repo = [
+                    'type' => 'deb',
+                    'name' => $name,
+                    'dist' => $dist,
+                    'component' => $component
+                ];
+
+                if ($string) {
+                    return $name . ' ❯ ' . $dist . ' ❯ ' . $component;
+                }
             }
 
             if (!empty($releasever)) {
-                return $name . ' ❯ ' . $releasever;
+                $repo = [
+                    'type' => 'rpm',
+                    'name' => $name,
+                    'releasever' => $releasever
+                ];
+
+                if ($string) {
+                    return $name . ' ❯ ' . $releasever;
+                }
             }
 
-            throw new Exception('unknown repository');
+            if (empty($repo)) {
+                throw new Exception('unknown repository');
+            }
+
+            return $repo;
         } catch (Exception $e) {
             return 'Error retrieving repository: ' . strtolower($e->getMessage());
         }
@@ -265,8 +308,9 @@ public function getRepo(int $id): string
     /**
      *  Add a new task in database
      *  @param array $params
+     *  @param int|null $parentTaskId Id of the task that generated this task, if any (e.g. a scheduled task targeting a group of repositories)
      */
-    private function new(array $params) : int
+    private function new(array $params, int|null $parentTaskId = null) : int
     {
         /**
          *  Default values
@@ -316,15 +360,16 @@ private function new(array $params) : int
         /**
          *  Add the task in database
          */
-        $taskId = $this->model->new($type, $paramsJson, $status);
+        $taskId = $this->model->new($type, $paramsJson, $status, $parentTaskId);
 
         return $taskId;
     }
 
     /**
      *  Execute one or more tasks
+     *  @param int|null $parentTaskId Id of the task that generated these tasks, if any (e.g. a scheduled task targeting a group of repositories)
      */
-    public function execute(array $tasksParams): int|array
+    public function execute(array $tasksParams, int|null $parentTaskId = null): int|array
     {
         $tasks = [];
 
@@ -344,7 +389,7 @@ public function execute(array $tasksParams): int|array
                         $params['releasever'] = $releasever;
 
                         // Generate a new task containing all the parameters needed to execute the task retrieve its Id
-                        $taskId = $this->new($params);
+                        $taskId = $this->new($params, $parentTaskId);
 
                         // Execute the task now if it is not scheduled
                         if ($params['schedule']['scheduled'] != 'true') {
@@ -367,7 +412,7 @@ public function execute(array $tasksParams): int|array
                             $params['section'] = $section;
 
                             // Generate a new task containing all the parameters needed to execute the task retrieve its Id
-                            $taskId = $this->new($params);
+                            $taskId = $this->new($params, $parentTaskId);
 
                             // Execute the task now if it is not scheduled
                             if ($params['schedule']['scheduled'] != 'true') {
@@ -383,7 +428,7 @@ public function execute(array $tasksParams): int|array
             // Every other task can be executed directly
             } else {
                 // Generate a new task containing all the parameters needed to execute the task retrieve its Id
-                $taskId = $this->new($taskParams);
+                $taskId = $this->new($taskParams, $parentTaskId);
 
                 // Execute the task now if it is not scheduled
                 if ($taskParams['schedule']['scheduled'] != 'true') {
@@ -426,7 +471,7 @@ public function exists(int $id) : bool
      */
     public function relaunch(int $id) : void
     {
-        if (!IS_ADMIN and !in_array('relaunch', USER_PERMISSIONS['tasks']['allowed-actions'])) {
+        if (!TaskPermission::allowedAction('relaunch')) {
             throw new Exception('You are not allowed to relaunch a task');
         }
 
@@ -450,7 +495,7 @@ public function relaunch(int $id) : void
         $this->executeId($newTaskId);
 
         $this->layoutContainerReloadController->reload('tasks/logs');
-        $this->layoutContainerReloadController->reload('tasks/list');
+        $this->layoutContainerReloadController->reload('tasks/tasks');
     }
 
     /**
@@ -466,7 +511,7 @@ public function duplicate(int $id) : int
      */
     public function stop(int $taskId): void
     {
-        if (!IS_ADMIN and !in_array('stop', USER_PERMISSIONS['tasks']['allowed-actions'])) {
+        if (!TaskPermission::allowedAction('stop')) {
             throw new Exception('You are not allowed to stop a task');
         }
 
@@ -537,8 +582,13 @@ public function stop(int $taskId): void
 
         // Update layout containers states
         $this->layoutContainerReloadController->reload('header/menu');
+        $this->layoutContainerReloadController->reload('repos/kpi');
         $this->layoutContainerReloadController->reload('repos/list');
-        $this->layoutContainerReloadController->reload('tasks/list');
+        $this->layoutContainerReloadController->reload('tasks/tasks');
+        $this->layoutContainerReloadController->reload('tasks/log');
+
+        // Save history
+        History::set('Stopped task #' . $taskId);
 
         if (!empty($killError)) {
             throw new Exception($killError);
@@ -612,7 +662,7 @@ public static function getChildrenPid(int $pid) : array|bool
      */
     public function enable(array $tasksId): void
     {
-        if (!IS_ADMIN and !in_array('enable', USER_PERMISSIONS['tasks']['allowed-actions'])) {
+        if (!TaskPermission::allowedAction('enable')) {
             throw new Exception('You are not allowed to enable a task');
         }
 
@@ -651,7 +701,7 @@ public function enable(array $tasksId): void
      */
     public function disable(array $tasksId) : void
     {
-        if (!IS_ADMIN and !in_array('disable', USER_PERMISSIONS['tasks']['allowed-actions'])) {
+        if (!TaskPermission::allowedAction('disable')) {
             throw new Exception('You are not allowed to disable a task');
         }
 
@@ -690,7 +740,7 @@ public function disable(array $tasksId) : void
      */
     public function delete(array $tasksId) : void
     {
-        if (!IS_ADMIN and !in_array('delete', USER_PERMISSIONS['tasks']['allowed-actions'])) {
+        if (!TaskPermission::allowedAction('delete')) {
             throw new Exception('You are not allowed to delete a task');
         }
 
@@ -709,9 +759,8 @@ public function delete(array $tasksId) : void
                 throw new Exception('Could not decode task #' . $id . ' JSON parameters: ' . $e->getMessage());
             }
 
-
-            // Check if task is a scheduled task
-            if ($taskRawParams['schedule']['scheduled'] != 'true') {
+            // Check if task is a scheduled task or a queued task, only these types of tasks can be deleted
+            if ($taskRawParams['schedule']['scheduled'] != 'true' and $task['Status'] != 'queued') {
                 throw new Exception('Task #' . $id . ' is not a scheduled task and cannot be deleted');
             }
 
@@ -1007,4 +1056,77 @@ public function getLatestStatus(string $snapId) : array
     {
         return $this->model->getLatestStatus($snapId);
     }
+
+    /**
+     *  Generate a human readable literal action from the technical action name
+     */
+    public static function generateLiteralAction(string $action): string
+    {
+        if ($action == 'create') {
+            return 'Create repository';
+        }
+        if ($action == 'update') {
+            return 'Update repository';
+        }
+        if ($action == 'env') {
+            return 'Point an environment';
+        }
+        if ($action == 'removeEnv') {
+            return 'Remove an environment';
+        }
+        if ($action == 'rebuild') {
+            return 'Rebuild metadata';
+        }
+        if ($action == 'rename') {
+            return 'Rename repository';
+        }
+        if ($action == 'duplicate') {
+            return 'Duplicate repository';
+        }
+        if ($action == 'delete') {
+            return 'Delete snapshot';
+        }
+
+        return ucfirst($action);
+    }
+
+    /**
+     *  Generate a human readable literal action from the technical action name
+     */
+    public static function generateLiteralAction2(array $task): string
+    {
+        // Try to decode the task parameters
+        try {
+            $taskRawParams = json_decode($task['Raw_params'], true, 512, JSON_THROW_ON_ERROR);
+        } catch (JsonException $e) {
+            return 'Error: could not decode task #' . $task['Id'] . ' JSON parameters: ' . $e->getMessage();
+        }
+
+        if ($taskRawParams['action'] == 'create') {
+            return $taskRawParams['repo-type'] == 'local' ? 'New local repository' : 'New mirror repository';
+        }
+        if ($taskRawParams['action'] == 'update') {
+            return 'Update repository';
+        }
+        if ($taskRawParams['action'] == 'env') {
+            return 'Point an environment';
+        }
+        if ($taskRawParams['action'] == 'removeEnv') {
+            return 'Remove an environment';
+        }
+        if ($taskRawParams['action'] == 'rebuild') {
+            return 'Rebuild repository metadata';
+        }
+        if ($taskRawParams['action'] == 'rename') {
+            return 'Rename repository';
+        }
+        if ($taskRawParams['action'] == 'duplicate') {
+            return 'Duplicate repository';
+        }
+        if ($taskRawParams['action'] == 'delete') {
+            return 'Delete snapshot';
+        }
+
+        return ucfirst($taskRawParams['action']);
+    }
 }
diff --git a/www/controllers/User/Create.php b/www/controllers/User/Create.php
index e6d7cfc70..82abc3b69 100644
--- a/www/controllers/User/Create.php
+++ b/www/controllers/User/Create.php
@@ -13,7 +13,7 @@ public function __construct()
     {
         parent::__construct();
         $this->model = new \Models\User\Create();
-        $this->userPermissionController = new \Controllers\User\Permission();
+        $this->userPermissionController = new \Controllers\User\Permission\Permission();
     }
 
     /**
diff --git a/www/controllers/User/Permission.php b/www/controllers/User/Permission/Permission.php
similarity index 88%
rename from www/controllers/User/Permission.php
rename to www/controllers/User/Permission/Permission.php
index bb13b794f..02b2a616c 100644
--- a/www/controllers/User/Permission.php
+++ b/www/controllers/User/Permission/Permission.php
@@ -1,19 +1,20 @@
 <?php
 
-namespace Controllers\User;
+namespace Controllers\User\Permission;
 
 use Exception;
 use JsonException;
 
-class Permission extends User
+class Permission extends \Controllers\User\User
 {
     private $permissionModel;
     private $defaultPermissions = [
         'repositories' => [
             'allowed-actions' => [],
             'view' => [
-                'all',
-                'groups' => []
+                // 'all',
+                'groups' => [],
+                'repos' => []
             ],
         ],
         'tasks' => [
@@ -129,6 +130,22 @@ public function set(int $id, array $reposView, array $reposActions, array $tasks
                 // Add group Id key to permissions
                 $permissions['repositories']['view']['groups'][] = $groupId;
             }
+
+            /**
+             *  If entry starts with 'repo-', then it's an individual repository
+             */
+            if (strpos($repoOrGroup, 'repo-') === 0) {
+                // Get repository Id
+                $repoId = str_replace('repo-', '', $repoOrGroup);
+
+                // Check that repository Id is valid
+                if (!is_numeric($repoId)) {
+                    throw new Exception('Invalid repository Id: ' . $repoId);
+                }
+
+                // Add repository Id key to permissions
+                $permissions['repositories']['view']['repos'][] = $repoId;
+            }
         }
 
         /**
diff --git a/www/controllers/User/Permission/Repo.php b/www/controllers/User/Permission/Repo.php
index 48fcd0b82..43cffc48e 100644
--- a/www/controllers/User/Permission/Repo.php
+++ b/www/controllers/User/Permission/Repo.php
@@ -4,6 +4,9 @@
 
 class Repo
 {
+    /**
+     *  Check if the user is allowed to perform a specific action on repositories
+     */
     public static function allowedAction(string $action) : bool
     {
         // Admins are allowed to do everything
@@ -17,4 +20,45 @@ public static function allowedAction(string $action) : bool
 
         return false;
     }
+
+    /**
+     *  Check if the user is allowed to view a specific repository
+     */
+    public static function allowedToView(int $repoId) : bool
+    {
+        // Admins are allowed to view everything
+        if (IS_ADMIN) {
+            return true;
+        }
+
+        if (in_array('all', USER_PERMISSIONS['repositories']['view'])) {
+            return true;
+        }
+
+        // The repository can be granted individually
+        if (in_array($repoId, USER_PERMISSIONS['repositories']['view']['repos'])) {
+            return true;
+        }
+
+        if (empty(USER_PERMISSIONS['repositories']['view']['groups'])) {
+            return false;
+        }
+
+        $groupController = new \Controllers\Group\Repo();
+        $groupsIds = $groupController->getRepoGroupsIds($repoId);
+
+        // Repositories that are member of no group belong to the fictitious 'Default' group, which Id is 0
+        if (empty($groupsIds)) {
+            $groupsIds = [0];
+        }
+
+        // Or granted through one of the groups it is member of
+        foreach ($groupsIds as $groupId) {
+            if (in_array($groupId, USER_PERMISSIONS['repositories']['view']['groups'])) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/www/controllers/User/Preference/Preference.php b/www/controllers/User/Preference/Preference.php
new file mode 100644
index 000000000..71feb7d2a
--- /dev/null
+++ b/www/controllers/User/Preference/Preference.php
@@ -0,0 +1,180 @@
+<?php
+
+namespace Controllers\User\Preference;
+
+use Exception;
+use JsonException;
+use Controllers\Utils\Convert;
+
+class Preference extends \Controllers\User\User
+{
+    private $preferenceModel;
+    private $defaultPreferences = [
+        'repositories' => [
+            'list' => [
+                'expand' => false,
+                'one-line' => false
+            ]
+        ]
+    ];
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->preferenceModel = new \Models\User\Preference();
+    }
+
+    /**
+     *  Get user preferences
+     */
+    public function get(int $id): array
+    {
+        // Check if user exists
+        if (!$this->existsId($id)) {
+            throw new Exception('User does not exist');
+        }
+
+        // Get user preferences
+        $preferences = $this->preferenceModel->get($id);
+
+        // If preferences are empty, create default preferences and return them
+        if (empty($preferences)) {
+            try {
+                $this->preferenceModel->set($id, json_encode($this->defaultPreferences, JSON_THROW_ON_ERROR));
+            } catch (JsonException $e) {
+                throw new Exception('Error setting default preferences: ' . $e->getMessage());
+            }
+
+            return $this->defaultPreferences;
+        }
+
+        // Decode preferences (JSON) and return them
+        try {
+            $preferences = json_decode($preferences, true, 512, JSON_THROW_ON_ERROR);
+        } catch (Exception $e) {
+            throw new Exception('Error decoding preferences: ' . $e->getMessage());
+        }
+
+        // Merge with default preferences if some keys are missing
+        $preferences = array_replace_recursive($this->defaultPreferences, $preferences);
+
+        return $preferences;
+    }
+
+    /**
+     *  Get default preferences definition
+     */
+    public function getDefault(): array
+    {
+        return $this->defaultPreferences;
+    }
+
+    /**
+     *  Filter preferences to only keep keys that exist in the schema
+     */
+    private function filterPreferencesBySchema(array $preferences, array $schema): array
+    {
+        $filtered = [];
+
+        foreach ($schema as $key => $value) {
+            if (!isset($preferences[$key])) {
+                continue;
+            }
+
+            if (is_array($value)) {
+                // Recursive filtering for nested arrays
+                $filtered[$key] = $this->filterPreferencesBySchema($preferences[$key], $value);
+            } else {
+                // Keep scalar values
+                $filtered[$key] = $preferences[$key];
+            }
+        }
+
+        return $filtered;
+    }
+
+    /**
+     *  Set user preferences
+     */
+    public function set(int $id, array $preferences): void
+    {
+        // Check if user exists
+        if (!$this->existsId($id)) {
+            throw new Exception('User does not exist');
+        }
+
+        // Get current preferences (includes defaults for missing keys)
+        $currentPreferences = $this->get($id);
+
+        // Update preferences using dot-separated keys
+        foreach ($preferences as $key => $value) {
+            $keys = explode('.', $key);
+            $lastKey = array_key_last($keys);
+
+            // Navigate through the default preferences to find the expected type
+            $defaultValue = $this->defaultPreferences;
+            $isValidKey = true;
+
+            foreach ($keys as $k) {
+                if (isset($defaultValue[$k])) {
+                    $defaultValue = $defaultValue[$k];
+                } else {
+                    $isValidKey = false;
+                    break;
+                }
+            }
+
+            // Reject invalid keys (not in the schema)
+            if (!$isValidKey) {
+                throw new Exception('Invalid preference key: ' . $key);
+            }
+
+            // Validate value type based on the default value's type
+            $expectedType = gettype($defaultValue);
+
+            if ($expectedType === 'boolean') {
+                // For booleans, accept string 'true'/'false' or actual boolean
+                if (!is_bool($value) && !(is_string($value) && in_array($value, ['true', 'false'], true))) {
+                    throw new Exception('Preference ' . $key . ' expects a boolean, got ' . gettype($value));
+                }
+
+                $validatedValue = is_bool($value) ? $value : Convert::toBool($value);
+            } elseif ($expectedType === 'array') {
+                // For arrays, accept arrays only
+                if (!is_array($value)) {
+                    throw new Exception('Preference ' . $key . ' expects an array, got ' . gettype($value));
+                }
+
+                $validatedValue = $value;
+            } else {
+                // For strings, numbers, etc. - accept same type only
+                if (gettype($value) !== $expectedType) {
+                    throw new Exception('Preference ' . $key . ' expects a ' . $expectedType . ', got ' . gettype($value));
+                }
+
+                $validatedValue = $value;
+            }
+
+            // Set the validated value
+            $current = &$currentPreferences;
+            foreach ($keys as $i => $k) {
+                if ($i === $lastKey) {
+                    $current[$k] = $validatedValue;
+                } else {
+                    $current = &$current[$k];
+                }
+            }
+            unset($current);
+        }
+
+        // Filter preferences to only keep keys that exist in the schema
+        $currentPreferences = $this->filterPreferencesBySchema($currentPreferences, $this->defaultPreferences);
+
+        // Save updated preferences
+        try {
+            $this->preferenceModel->set($id, json_encode($currentPreferences, JSON_THROW_ON_ERROR));
+        } catch (JsonException $e) {
+            throw new Exception('Error encoding preferences: ' . $e->getMessage());
+        }
+    }
+}
diff --git a/www/controllers/Utils/Generate/Html/Label.php b/www/controllers/Utils/Generate/Html/Label.php
index e001fe973..dc40270f2 100644
--- a/www/controllers/Utils/Generate/Html/Label.php
+++ b/www/controllers/Utils/Generate/Html/Label.php
@@ -7,36 +7,55 @@ class Label
     /**
      *  Generate environment tag
      */
-    public static function envtag(string $name, string|null $css = null) : string
+    public static function envtag(string $name, $additionalCss = ''): string
     {
+        $name = trim($name);
+
         // Default class and colors
-        $class = 'env';
         $color = '#000000';
         $background = '#ffffff';
         $border = '';
+        $protected = false;
 
         // Retrieve color from ENVS array
         if (defined('ENVS')) {
             foreach (ENVS as $env) {
-                if ($env['Name'] == $name and !empty($env['Color'])) {
-                    $background = $env['Color'];
-                    // Get contrasting text color
-                    $color = Color::contrastingText($background);
+                if (($env['Name'] ?? '') === $name) {
+                    if (!empty($env['Color'])) {
+                        $background = $env['Color'];
+                        // Get contrasting text color
+                        $color = Color::contrastingText($background);
+                    }
+
+                    $protected = ($env['Protected'] ?? 'false') === 'true';
+                    break;
                 }
             }
         }
 
+        // Outlined style: transparent bg, colored border and text
         if ($background == '#ffffff') {
-            $border = '1px solid #949494';
+            // No color configured: use a subtle gray outline
+            $color = '#c0d0e2';
+            $border = '1.5px solid #c0d0e2';
         } else {
-            $border = '1px solid ' . $background;
+            // Use the configured color for border and text
+            $color = $background;
+            $border = '1.5px solid ' . $background;
         }
 
-        if ($css == 'fit') {
-            $class = 'env-fit';
+        $style = 'background-color: transparent; color: ' . $color . '; border: ' . $border;
+
+        $content = '<span class="env flex column-gap-5 align-item-center' . ($additionalCss ? ' ' . $additionalCss : '') . '" style="' . $style . '" title="Environment ' . $name . ' ' . ($protected ? '(protected)' : '') . '">';
+
+        // If environment is protected, add a lock icon
+        if ($protected) {
+            $content .= '<svg class="icon-small" viewBox="0 0 512 512" aria-hidden="true" focusable="false" style="color: ' . $color . '; flex-shrink: 0;"><path d="m 374.60332,188.24922 h -16.94334 v -84.71665 a 101.66,101.66 0 1 0 -203.31998,0 v 84.71665 H 137.39667 A 67.847453,67.847453 0 0 0 69.62335,256.02255 V 442.3992 a 67.847453,67.847453 0 0 0 67.77332,67.77333 H 374.60332 A 67.847453,67.847453 0 0 0 442.37665,442.3992 V 256.02255 a 67.847453,67.847453 0 0 0 -67.77333,-67.77333 z m -50.82999,0 H 188.22667 v -84.71665 a 67.77333,67.77333 0 1 1 135.54666,0 z" fill="currentColor"/></svg>';
         }
 
-        return '<span class="' . $class . '" style="background-color: ' . $background . '; color: ' . $color . '; border: ' . $border . '">' . $name . '</span>';
+        $content .= '<span style="color: ' . $color . '">' . $name . '</span></span>';
+
+        return $content;
     }
 
     /**
@@ -46,12 +65,4 @@ public static function white(string $string): string
     {
         return '<span class="label-white">' . $string . '</span>';
     }
-
-    /**
-     *  Generate black label
-     */
-    public static function black(string $string): string
-    {
-        return '<span class="label-black">' . $string . '</span>';
-    }
 }
diff --git a/www/controllers/Websocket/BrowserClient/Process.php b/www/controllers/Websocket/BrowserClient/Process.php
index 3586a2cf6..2c5c8e3ec 100644
--- a/www/controllers/Websocket/BrowserClient/Process.php
+++ b/www/controllers/Websocket/BrowserClient/Process.php
@@ -20,15 +20,21 @@ public function reload($socket)
             return;
         }
 
+        // Keep track of what has been broadcasted to avoid deleting containers that have been added while broadcasting
+        $broadcasted = [];
+
         // For each container, send a reload request to all browser clients
         foreach ($containers as $container) {
             $this->broadcast($socket, 'browser-client', array(
                 'type' => 'reload-container',
                 'container' => $container['Container']
             ));
+
+            $broadcasted[] = $container['Container'];
         }
 
-        // Clean up the layout container state
-        $this->layoutContainerReloadController->clean();
+        // Only remove what has just been broadcasted: a task may have requested a reload while
+        // broadcasting, and it must be kept so it is sent on the next round
+        $this->layoutContainerReloadController->delete($broadcasted);
     }
 }
diff --git a/www/controllers/ajax/environment.php b/www/controllers/ajax/environment.php
index 1a65de9e8..0ed872980 100644
--- a/www/controllers/ajax/environment.php
+++ b/www/controllers/ajax/environment.php
@@ -1,27 +1,25 @@
 <?php
+$envController = new \Controllers\Environment();
+
 /**
  *  Add a new environment
  */
-if ($action == 'add-env' and !empty($_POST['name']) and !empty($_POST['color'])) {
-    $myenv = new \Controllers\Environment();
-
+if ($action == 'add' and !empty($_POST['name']) and !empty($_POST['color'])) {
     try {
-        $myenv->add($_POST['name'], $_POST['color']);
+        $envController->add($_POST['name'], $_POST['color']);
     } catch (Exception $e) {
         response(HTTP_BAD_REQUEST, $e->getMessage());
     }
 
-    response(HTTP_OK, 'Environment <b>' . $_POST['name'] . '</b> has been added');
+    response(HTTP_OK, 'Environment ' . $_POST['name'] . ' added');
 }
 
 /**
  *  Delete an environment
  */
-if ($action == 'delete-env' and !empty($_POST['id'])) {
-    $myenv = new \Controllers\Environment();
-
+if ($action == 'delete' and !empty($_POST['id'])) {
     try {
-        $myenv->delete($_POST['id']);
+        $envController->delete($_POST['id']);
     } catch (Exception $e) {
         response(HTTP_BAD_REQUEST, $e->getMessage());
     }
@@ -30,18 +28,16 @@
 }
 
 /**
- *  Add / edit actual envs
+ *  Edit environment(s)
  */
-if ($action == 'edit-env' and !empty($_POST['envs'])) {
-    $myenv = new \Controllers\Environment();
-
+if ($action == 'edit' and !empty($_POST['envs'])) {
     try {
-        $myenv->edit($_POST['envs']);
+        $envController->edit($_POST['envs']);
     } catch (Exception $e) {
         response(HTTP_BAD_REQUEST, $e->getMessage());
     }
 
-    response(HTTP_OK, 'Environments edited');
+    response(HTTP_OK, 'Environment' . (count($_POST['envs']) > 1 ? 's' : '') . ' updated');
 }
 
 response(HTTP_BAD_REQUEST, 'Invalid action');
diff --git a/www/controllers/ajax/hosts/settings.php b/www/controllers/ajax/hosts/settings.php
index 79d671d2a..72e9e1b80 100644
--- a/www/controllers/ajax/hosts/settings.php
+++ b/www/controllers/ajax/hosts/settings.php
@@ -2,11 +2,11 @@
 /**
  *  Edit hosts settings
  */
-if ($action == 'edit' and isset($_POST['complianceThresholdCount']) and isset($_POST['complianceThresholdDays']) and isset($_POST['complianceRebootRequired'])) {
+if ($action == 'edit' and isset($_POST['complianceThresholdCount']) and isset($_POST['complianceThresholdDays']) and isset($_POST['complianceSecurityUpdate']) and isset($_POST['complianceRebootRequired'])) {
     $hostController = new \Controllers\Host\Host();
 
     try {
-        $hostController->setSettings($_POST['complianceThresholdCount'], $_POST['complianceThresholdDays'], $_POST['complianceRebootRequired']);
+        $hostController->setSettings($_POST['complianceThresholdCount'], $_POST['complianceThresholdDays'], $_POST['complianceSecurityUpdate'], $_POST['complianceRebootRequired']);
     } catch (Exception $e) {
         response(HTTP_BAD_REQUEST, $e->getMessage());
     }
diff --git a/www/controllers/ajax/repo/edit.php b/www/controllers/ajax/repo/edit.php
index 99d3d4ec9..f7f6cdfbf 100644
--- a/www/controllers/ajax/repo/edit.php
+++ b/www/controllers/ajax/repo/edit.php
@@ -1,8 +1,62 @@
 <?php
+use \Controllers\Repo\Repo;
+use \Controllers\User\Permission\Repo as RepoPermission;
+
+/**
+ *  Edit repository description
+ */
+if ($_POST['action'] == 'description' and !empty($_POST['repoId']) and isset($_POST['description'])) {
+    $repoController = new Repo();
+
+    try {
+        if (!RepoPermission::allowedAction('edit')) {
+            throw new Exception('You do not have permission to edit repositories');
+        }
+
+        if (!RepoPermission::allowedToView($_POST['repoId'])) {
+            throw new Exception('You do not have permission to edit this repository');
+        }
+
+        $repoController->updateDescription($_POST['repoId'], $_POST['description']);
+    } catch (Exception $e) {
+        response(HTTP_BAD_REQUEST, $e->getMessage());
+    }
+
+    response(HTTP_OK, 'Description has been saved');
+}
+
+/**
+ *  Edit repository tags
+ */
+if ($_POST['action'] == 'tags' and !empty($_POST['repoId']) and isset($_POST['tags'])) {
+    $repoController = new Repo();
+
+    // Tags are sent as a comma-separated string
+    $tags = array_filter(array_map('trim', explode(',', $_POST['tags'])), function ($tag) {
+        return $tag !== '';
+    });
+
+    try {
+        if (!RepoPermission::allowedAction('edit')) {
+            throw new Exception('You do not have permission to edit repositories');
+        }
+
+        if (!RepoPermission::allowedToView($_POST['repoId'])) {
+            throw new Exception('You do not have permission to edit this repository');
+        }
+
+        $repoController->updateTags($_POST['repoId'], $tags);
+    } catch (Exception $e) {
+        response(HTTP_BAD_REQUEST, $e->getMessage());
+    }
+
+    response(HTTP_OK, 'Tags have been saved');
+}
+
 /**
  *  Validate form and edit repositories
  */
-if ($_POST['action'] == 'validateForm' and !empty($_POST['params'])) {
+if ($_POST['action'] == 'validate-execute' and !empty($_POST['params'])) {
     $repoEditForm = new \Controllers\Repo\Edit\Form();
 
     try {
diff --git a/www/controllers/ajax/repo/environment.php b/www/controllers/ajax/repo/environment.php
deleted file mode 100644
index adf4405f4..000000000
--- a/www/controllers/ajax/repo/environment.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- *  Edit a repo description
- */
-if ($_POST['action'] == 'update-description' and !empty($_POST['envId']) and isset($_POST['description'])) {
-    $repoEnvController = new \Controllers\Repo\Environment();
-
-    try {
-        $repoEnvController->updateDescription($_POST['envId'], $_POST['description']);
-    } catch (Exception $e) {
-        response(HTTP_BAD_REQUEST, $e->getMessage());
-    }
-
-    response(HTTP_OK, "Description has been saved");
-}
-
-response(HTTP_BAD_REQUEST, 'Invalid action');
diff --git a/www/controllers/ajax/repo/snapshot/browse.php b/www/controllers/ajax/repo/snapshot/browse.php
index 293e81743..ef5e18b6d 100644
--- a/www/controllers/ajax/repo/snapshot/browse.php
+++ b/www/controllers/ajax/repo/snapshot/browse.php
@@ -84,7 +84,7 @@
 }
 
 /**
- *  Delete packages from repo
+ *  Delete packages from a snapshot
  */
 if ($action == 'delete-package' and !empty($_POST['snapId']) and !empty($_POST['packages'])) {
     $repoSnapshotPackageController = new \Controllers\Repo\Snapshot\Package($_POST['snapId']);
@@ -98,6 +98,28 @@
     response(HTTP_OK, $deleted);
 }
 
+/**
+ *  Upload packages to a snapshot
+ */
+if ($action == 'upload-package' and !empty($_POST['snapId']) and is_numeric($_POST['snapId']) and !empty($_FILES['packages'])) {
+    $repoSnapshotPackageController = new \Controllers\Repo\Snapshot\Package($_POST['snapId']);
+
+    try {
+        // Validate the overwrite value if it has been provided
+        if (isset($_POST['overwrite']) and is_null($overwrite = \Controllers\Utils\Convert::toBool($_POST['overwrite']))) {
+            throw new Exception('Invalid overwrite value');
+        }
+
+        $uploaded = $repoSnapshotPackageController->upload(\Controllers\Utils\Array\Sort::byPostFiles($_FILES['packages']), $overwrite ?? false);
+    } catch (\Controllers\Exception\AppException $e) {
+        response(HTTP_BAD_REQUEST, $e->getDetails());
+    } catch (Exception $e) {
+        response(HTTP_BAD_REQUEST, $e->getMessage());
+    }
+
+    response(HTTP_OK, $uploaded);
+}
+
 /**
  *  Rebuild repo metadata files
  */
diff --git a/www/controllers/ajax/settings/user.php b/www/controllers/ajax/settings/user.php
index a158a9886..f4845d5c8 100644
--- a/www/controllers/ajax/settings/user.php
+++ b/www/controllers/ajax/settings/user.php
@@ -46,7 +46,7 @@
  */
 if ($action == 'edit-permissions' and !empty($_POST['id']) and isset($_POST['reposView']) and isset($_POST['reposActions']) and isset($_POST['tasksActions']) and isset($_POST['hostsActions'])) {
     try {
-        $userPermissionController = new \Controllers\User\Permission();
+        $userPermissionController = new \Controllers\User\Permission\Permission();
         $userPermissionController->set($_POST['id'], $_POST['reposView'], $_POST['reposActions'], $_POST['tasksActions'], $_POST['hostsActions']);
     } catch (Exception $e) {
         response(HTTP_BAD_REQUEST, $e->getMessage());
diff --git a/www/controllers/ajax/task.php b/www/controllers/ajax/task.php
index 7a1347773..9901babbb 100644
--- a/www/controllers/ajax/task.php
+++ b/www/controllers/ajax/task.php
@@ -1,11 +1,11 @@
 <?php
-$myTask = new \Controllers\Task\Task();
+$taskController = new \Controllers\Task\Task();
 
 /**
  *  Validate and execute a task form
  */
-if ($_POST['action'] == 'validateForm' and !empty($_POST['taskParams'])) {
-    $myTaskForm = new \Controllers\Task\Form\Form();
+if ($_POST['action'] == 'validate-execute' and !empty($_POST['taskParams'])) {
+    $taskFormController = new \Controllers\Task\Form\Form();
 
     try {
         try {
@@ -14,17 +14,76 @@
             throw new Exception('Could not decode task parameters: ' . $e->getMessage());
         }
 
-        $myTaskForm->validate($taskRawParams);
-        $myTask->execute($taskRawParams);
+        $taskFormController->validate($taskRawParams);
+        $task = $taskController->execute($taskRawParams);
+
+        // If the task is an array, it means that multiple tasks have been executed, redirect to the tasks page
+        if (is_array($task)) {
+            $count = count($task);
+            $link = '/tasks';
+        }
+
+        // If there is only one task, redirect to the task log page
+        if (is_int($task)) {
+            $count = 1;
+            $link = '/task/' . $task;
+        }
+
+        if (isset($taskRawParams[0]['schedule']['scheduled']) and $taskRawParams[0]['schedule']['scheduled'] == 'true') {
+            response(HTTP_OK, 'Task' . ($count > 1 ? 's are scheduled' : ' is scheduled') . ': <a href="/tasks" target="_blank" rel="noopener noreferrer"><b>view</b></a>');
+        }
+
+        response(HTTP_OK, 'Task' . ($count > 1 ? 's are running' : ' is running') . ': <a href="' . $link . '" target="_blank" rel="noopener noreferrer"><b>view</b></a>');
     } catch (Exception $e) {
         response(HTTP_BAD_REQUEST, $e->getMessage());
     }
+}
+
+/**
+ *  Validate and schedule a task targeting a dynamic set of repositories (all latest snapshots matching filters)
+ */
+if ($_POST['action'] == 'validate-execute-target' and !empty($_POST['taskParams'])) {
+    $taskFormController = new \Controllers\Task\Form\Form();
+
+    try {
+        try {
+            $taskRawParams = json_decode($_POST['taskParams'], true, 512, JSON_THROW_ON_ERROR);
+        } catch (JsonException $e) {
+            throw new Exception('Could not decode task parameters: ' . $e->getMessage());
+        }
 
-    if (isset($taskRawParams[0]['schedule']['scheduled']) and $taskRawParams[0]['schedule']['scheduled'] == 'true') {
-        response(HTTP_OK, 'Task is scheduled: <a href="/run" target="_blank" rel="noopener noreferrer"><b>visualize</b></a>');
+        // Validate the task and retrieve the sanitized parameters
+        $taskRawParams = $taskFormController->validateTarget($taskRawParams);
+
+        // Create the scheduled task, it will not be executed now
+        $taskController->execute([$taskRawParams]);
+    } catch (Exception $e) {
+        response(HTTP_BAD_REQUEST, $e->getMessage());
+    }
+
+    response(HTTP_OK, 'Task is scheduled: <a href="/tasks" target="_blank" rel="noopener noreferrer"><b>view</b></a>');
+}
+
+/**
+ *  Return a description of the repositories currently matching a target definition
+ */
+if ($_POST['action'] == 'count-target-repos' and isset($_POST['target'])) {
+    $targetController = new \Controllers\Task\Target();
+
+    try {
+        try {
+            $target = json_decode($_POST['target'], true, 512, JSON_THROW_ON_ERROR);
+        } catch (JsonException $e) {
+            throw new Exception('Could not decode target: ' . $e->getMessage());
+        }
+
+        $repos = $targetController->resolve($target);
+        $count = count($repos);
+    } catch (Exception $e) {
+        response(HTTP_BAD_REQUEST, $e->getMessage());
     }
 
-    response(HTTP_OK, 'Task is running: <a href="/run" target="_blank" rel="noopener noreferrer"><b>visualize</b></a>');
+    response(HTTP_OK, 'Target: ' . \Controllers\Task\Target::describe($target) . '. ' . $count . ' repositor' . ($count == 1 ? 'y' : 'ies') . ' currently matching.');
 }
 
 /**
@@ -53,7 +112,7 @@
  */
 if ($_POST['action'] == 'disable' and !empty($_POST['id'])) {
     try {
-        $myTask->disable($_POST['id']);
+        $taskController->disable($_POST['id']);
     } catch (Exception $e) {
         response(HTTP_BAD_REQUEST, $e->getMessage());
     }
@@ -66,7 +125,7 @@
  */
 if ($_POST['action'] == 'enable' and !empty($_POST['id'])) {
     try {
-        $myTask->enable($_POST['id']);
+        $taskController->enable($_POST['id']);
     } catch (Exception $e) {
         response(HTTP_BAD_REQUEST, $e->getMessage());
     }
@@ -79,12 +138,12 @@
  */
 if ($_POST['action'] == 'delete' and !empty($_POST['id'])) {
     try {
-        $myTask->delete($_POST['id']);
+        $taskController->delete($_POST['id']);
     } catch (Exception $e) {
         response(HTTP_BAD_REQUEST, $e->getMessage());
     }
 
-    response(HTTP_OK, 'Task has been deleted');
+    response(HTTP_OK, 'Task' . (count($_POST['id']) > 1 ? 's have' : ' has') . ' been deleted');
 }
 
 /**
@@ -92,12 +151,12 @@
  */
 if ($_POST['action'] == 'relaunch' and !empty($_POST['id'])) {
     try {
-        $myTask->relaunch($_POST['id']);
+        $taskController->relaunch($_POST['id']);
     } catch (Exception $e) {
         response(HTTP_BAD_REQUEST, $e->getMessage());
     }
 
-    response(HTTP_OK, 'Task has been relaunched using the same parameters');
+    response(HTTP_OK, 'Task' . (count($_POST['id']) > 1 ? 's have' : ' has') . ' been relaunched using the same parameters');
 }
 
 /**
@@ -105,12 +164,12 @@
  */
 if ($_POST['action'] == 'stop' and !empty($_POST['id'])) {
     try {
-        $myTask->stop($_POST['id']);
+        $taskController->stop($_POST['id']);
     } catch (Exception $e) {
         response(HTTP_BAD_REQUEST, $e->getMessage());
     }
 
-    response(HTTP_OK, 'Task stopped');
+    response(HTTP_OK, 'Task' . (count($_POST['id']) > 1 ? 's have' : ' has') . ' been stopped');
 }
 
 /**
@@ -157,7 +216,7 @@
 
 if ($_POST['action'] == 'get-task-status' and !empty($_POST['taskId'])) {
     try {
-        $task = $myTask->getById($_POST['taskId']);
+        $task = $taskController->getById($_POST['taskId']);
         $status = $task['Status'];
     } catch (Exception $e) {
         response(HTTP_BAD_REQUEST, $e->getMessage());
diff --git a/www/controllers/ajax/user/preferences.php b/www/controllers/ajax/user/preferences.php
new file mode 100644
index 000000000..b05ef1967
--- /dev/null
+++ b/www/controllers/ajax/user/preferences.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ *  Edit user preferences
+ */
+if ($_POST['action'] == 'save' and !empty($_POST['preferences'])) {
+    try {
+        $userPreferenceController = new \Controllers\User\Preference\Preference();
+        $userPreferenceController->set($_SESSION['id'], $_POST['preferences']);
+    } catch (Exception $e) {
+        response(HTTP_BAD_REQUEST, $e->getMessage());
+    }
+
+    response(HTTP_OK, 'Preferences have been saved');
+}
+
+response(HTTP_BAD_REQUEST, 'Invalid action');
diff --git a/www/models/Connection.php b/www/models/Connection.php
index d2c513b40..871d5ae78 100644
--- a/www/models/Connection.php
+++ b/www/models/Connection.php
@@ -45,9 +45,7 @@ public function __construct(string $database, int|null $databaseId = null, bool
                     $this->generateMainTables();
                 }
 
-            /**
-             *  Case where database is 'stats', it is the stats database 'repomanager-stats.db'
-             */
+            // Case where database is 'stats', it is the stats database 'repomanager-stats.db'
             } elseif ($database == 'stats') {
                 $this->open(STATS_DB);
                 $this->busyTimeout(30000);
@@ -64,9 +62,7 @@ public function __construct(string $database, int|null $databaseId = null, bool
                     $this->generateStatsTables();
                 }
 
-            /**
-             *  Case where database is 'hosts', it is the hosts database 'repomanager-hosts.db'
-             */
+            // Case where database is 'hosts', it is the hosts database 'repomanager-hosts.db'
             } elseif ($database == 'hosts') {
                 $this->open(HOSTS_DB);
                 $this->busyTimeout(30000);
@@ -83,9 +79,7 @@ public function __construct(string $database, int|null $databaseId = null, bool
                     $this->generateHostsTables();
                 }
 
-            /**
-             *  Case where database is 'host', it is a host database 'properties.db', databaseId must be set
-             */
+            // Case where database is 'host', it is a host database 'properties.db', databaseId must be set
             } elseif ($database == 'host' and !empty($databaseId)) {
                 $this->open(HOSTS_DIR . '/' . $databaseId . '/properties.db');
                 $this->busyTimeout(30000);
@@ -93,9 +87,7 @@ public function __construct(string $database, int|null $databaseId = null, bool
                 $this->enableWAL();
                 $this->generateHostTables();
 
-            /**
-             *  Case where database is 'ws', it is the websockets database 'repomanager-ws.db'
-             */
+            // Case where database is 'ws', it is the websockets database 'repomanager-ws.db'
             } elseif ($database == 'ws') {
                 $this->open(WS_DB);
                 $this->busyTimeout(30000);
@@ -103,9 +95,7 @@ public function __construct(string $database, int|null $databaseId = null, bool
                 $this->enableWAL();
                 $this->generateWsTables();
 
-            /**
-             *  Case where database is 'task-log', it is a task log database 'task-<databaseId>-log.db'
-             */
+            // Case where database is 'task-log', it is a task log database 'task-<databaseId>-log.db'
             } elseif ($database == 'task-log' and !empty($databaseId)) {
                 $this->open(MAIN_LOGS_DIR . '/repomanager-task-' . $databaseId . '-log.db');
                 $this->busyTimeout(30000);
@@ -113,9 +103,7 @@ public function __construct(string $database, int|null $databaseId = null, bool
                 $this->enableWAL();
                 $this->generateTaskLogTables();
 
-            /**
-             *  Case where database is not 'main', 'stats', 'hosts' or 'host'
-             */
+            // Case where database is not 'main', 'stats', 'hosts' or 'host'
             } else {
                 throw new Exception("unknown database: $database");
             }
@@ -132,12 +120,6 @@ private function enableWAL(): void
         $this->exec('pragma journal_mode = WAL; pragma synchronous = normal; pragma temp_store = memory; pragma mmap_size = 30000000000;');
     }
 
-    /**
-     *
-     *  Functions to check if all tables are present
-     *
-     */
-
     /**
      *  Count the number of tables in the database
      */
@@ -153,7 +135,7 @@ public function countTables(): int
      */
     public function checkMainTables(): bool
     {
-        $this->required = 28;
+        $this->required = 29;
         $this->count = $this->countTables();
 
         // If the number of required tables != $required then try to regenerate the tables
@@ -240,20 +222,12 @@ public function checkWsTables(): bool
         return true;
     }
 
-    /**
-     *
-     *  Functions to generate tables if not exists
-     *
-     */
-
     /**
      *  Generate tables in the main database
      */
     private function generateMainTables(): void
     {
-        /**
-         *  repos table
-         */
+        // repos table
         $this->exec("CREATE TABLE IF NOT EXISTS repos (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Name VARCHAR(255) NOT NULL,
@@ -261,16 +235,14 @@ private function generateMainTables(): void
         Dist VARCHAR(255),
         Section VARCHAR(255),
         Source VARCHAR(255) NOT NULL,
-        Package_type VARCHAR(10) NOT NULL)");
+        Package_type VARCHAR(10) NOT NULL,
+        Description VARCHAR(255),
+        Tags VARCHAR(255))");
 
-        /**
-         *  Create indexes
-         */
+        // Create indexes
         $this->exec("CREATE INDEX IF NOT EXISTS repos_ALL_index ON repos (Name, Releasever, Dist, Section, Source, Package_type)");
 
-        /**
-         *  repos_snap table
-         */
+        // repos_snap table
         $this->exec("CREATE TABLE IF NOT EXISTS repos_snap (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Date DATE NOT NULL,
@@ -285,61 +257,45 @@ private function generateMainTables(): void
         Status CHAR(8) NOT NULL,
         Id_repo INTEGER NOT NULL)");
 
-        /**
-         *  Create indexes
-         */
+        // Create indexes
         // TODO: uncomment in release > 5.14.0
         // $this->exec("CREATE INDEX IF NOT EXISTS idx_repos_snap ON repos_snap (Date, Time, Signed, Arch, Type, Reconstruct, Size, Size_human, Status, Id_repo)");
         $this->exec("CREATE INDEX IF NOT EXISTS idx_repos_snap_status_id_repo ON repos_snap (Status, Id_repo)");
         $this->exec("CREATE INDEX IF NOT EXISTS idx_repos_snap_id_repo ON repos_snap (Id_repo)");
 
-        /**
-         *  repos_env table
-         */
+        // repos_env table
         $this->exec("CREATE TABLE IF NOT EXISTS repos_env (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Env VARCHAR(255),
-        Description VARCHAR(255),
         Id_snap INTEGER NOT NULL)");
 
-        /**
-         *  Create indexes
-         */
-        $this->exec("CREATE INDEX IF NOT EXISTS repos_env_index ON repos_env (Env, Description, Id_snap)");
+        // Create indexes
+        $this->exec("CREATE INDEX IF NOT EXISTS idx_repos_env ON repos_env (Env, Id_snap)");
 
-        /**
-         *  Create indexes
-         */
-        $this->exec("CREATE INDEX IF NOT EXISTS repos_env_id_snap_index ON repos_env (Id_snap)");
+        // Create indexes
+        $this->exec("CREATE INDEX IF NOT EXISTS idx_repos_env_id_snap ON repos_env (Id_snap)");
 
-        /**
-         *  env table
-         */
+        // env table
         $this->exec("CREATE TABLE IF NOT EXISTS env (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Name VARCHAR(255) NOT NULL,
-        Color VARCHAR(255))");
+        Color VARCHAR(255),
+        Protected CHAR(5))"); /* true, false */
 
-        /**
-         *  Insert default env if table is empty
-         */
+        // Insert default env if table is empty
         $result = $this->query("SELECT Id FROM env");
         if ($this->isempty($result) === true) {
             $this->exec("INSERT INTO env ('Name', 'Color') VALUES ('preprod', '#ffffff')");
             $this->exec("INSERT INTO env ('Name', 'Color') VALUES ('prod', '#F32F63')");
         }
 
-        /**
-         *  sources table
-         */
+        // sources table
         $this->exec("CREATE TABLE IF NOT EXISTS sources (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Definition TEXT,
         Method VARCHAR(255))");
 
-        /**
-         *  users table
-         */
+        // users table
         $this->exec("CREATE TABLE IF NOT EXISTS users (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Username VARCHAR(255) NOT NULL,
@@ -352,44 +308,35 @@ private function generateMainTables(): void
         Type CHAR(5) NOT NULL,
         State CHAR(7) NOT NULL)"); /* active / deleted */
 
-        /**
-         *  Create user_permissions table
-         */
+        // Create user_permissions table
         $this->exec("CREATE TABLE IF NOT EXISTS user_permissions (
         Permissions VARCHAR(255),
         User_id INTEGER NOT NULL)");
 
-        /**
-         *  user_role table
-         */
+        // Create user_preferences table
+        $this->exec("CREATE TABLE IF NOT EXISTS user_preferences (
+        Preferences TEXT,
+        User_id INTEGER NOT NULL UNIQUE)");
+
+        // user_role table
         $this->exec("CREATE TABLE IF NOT EXISTS user_role (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Name CHAR(15) NOT NULL UNIQUE)");
 
-        /**
-         *  If user_role table is empty (just created) then we create default roles
-         */
+        // If user_role table is empty (just created) then we create default roles
         $result = $this->query("SELECT Id FROM user_role");
         if ($this->isempty($result) === true) {
-            /**
-             *  super-administrator role: all permissions
-             */
+            // super-administrator role: all permissions
             $this->exec("INSERT INTO user_role ('Name') VALUES ('super-administrator')");
 
-            /**
-             *  administrator role: all permissions except user management (only super-administrator can manage users)
-             */
+            // administrator role: all permissions except user management (only super-administrator can manage users)
             $this->exec("INSERT INTO user_role ('Name') VALUES ('administrator')");
 
-            /**
-             *  usage role: read-only permissions
-             */
+            // usage role: read-only permissions
             $this->exec("INSERT INTO user_role ('Name') VALUES ('usage')");
         }
 
-        /**
-         *  If users table is empty (just created) then we create admin user (default password 'repomanager' and role n°1 (super-administrator))
-         */
+        // If users table is empty (just created) then we create admin user (default password 'repomanager' and role n°1 (super-administrator))
         $result = $this->query("SELECT Id FROM users");
         if ($this->isempty($result) === true) {
             $password_hashed = '$2y$10$FD6/70o2nXPf76SAPYIGSutauQ96LqKie5PLanoYBNbCWen492cX6';
@@ -403,9 +350,7 @@ private function generateMainTables(): void
             }
         }
 
-        /**
-         *  history table
-         */
+        // history table
         $this->exec("CREATE TABLE IF NOT EXISTS history (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Date DATE NOT NULL,
@@ -418,24 +363,18 @@ private function generateMainTables(): void
         Action VARCHAR(255) NOT NULL,
         State CHAR(7))"); /* success or error */
 
-        /**
-         *  groups table
-         */
+        // groups table
         $this->exec("CREATE TABLE IF NOT EXISTS groups (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Name VARCHAR(255) UNIQUE NOT NULL)");
 
-        /**
-         *  group_members table
-         */
+        // group_members table
         $this->exec("CREATE TABLE IF NOT EXISTS group_members (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Id_repo INTEGER NOT NULL,
         Id_group INTEGER NOT NULL);");
 
-        /**
-         *  Create indexes
-         */
+        // Create indexes
         $this->exec("CREATE INDEX IF NOT EXISTS group_members_id_repo_index ON group_members (Id_repo)");
         $this->exec("CREATE INDEX IF NOT EXISTS group_members_id_group_index ON group_members (Id_group)");
 
@@ -448,31 +387,26 @@ private function generateMainTables(): void
         Pid INTEGER,
         Logfile VARCHAR(255),
         Duration INTEGER,
-        Status CHAR(9))"); /* new, scheduled, running, done, stopped */
+        Status CHAR(9), /* new, scheduled, running, done, stopped */
+        Parent_task_id INTEGER)");
 
-        /**
-         *  Create indexes
-         */
+        // Create indexes
         $this->exec("CREATE INDEX IF NOT EXISTS tasks_rawparams_status ON tasks (Raw_params, Status)");
         $this->exec("CREATE INDEX IF NOT EXISTS tasks_status ON tasks (Status)");
+        // TODO: uncomment this after 6.0.0
+        // $this->exec("CREATE INDEX IF NOT EXISTS tasks_parent_task_id ON tasks (Parent_task_id)");
 
-        /**
-         *  profile_settings table
-         */
+        // profile_settings table
         $this->exec("CREATE TABLE IF NOT EXISTS profile_settings (
         Package_type VARCHAR(255))");
 
-        /**
-         *  If profile_settings table is empty (just created) then we populate it
-         */
+        // If profile_settings table is empty (just created) then we populate it
         $result = $this->query("SELECT * FROM profile_settings");
         if ($this->isempty($result) === true) {
             $this->exec("INSERT INTO profile_settings (Package_type) VALUES ('deb,rpm')");
         }
 
-        /**
-         *  profile table
-         */
+        // profile table
         $this->exec("CREATE TABLE IF NOT EXISTS profile (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Name VARCHAR(255) NOT NULL,
@@ -482,46 +416,34 @@ private function generateMainTables(): void
         Service_restart VARCHAR(255),
         Notes VARCHAR(255))");
 
-        /**
-         *  profile_repo_members table
-         */
+        // profile_repo_members table
         $this->exec("CREATE TABLE IF NOT EXISTS profile_repo_members (
         Id_profile INTEGER NOT NULL,
         Id_repo INTEGER NOT NULL)");
 
-        /**
-         *  profile_package table
-         */
+        // profile_package table
         $this->exec("CREATE TABLE IF NOT EXISTS profile_package (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Name VARCHAR(255) UNIQUE NOT NULL)");
 
-        /**
-         *  If profile_package table is empty (just created) then we populate it
-         */
+        // If profile_package table is empty (just created) then we populate it
         $result = $this->query("SELECT Id FROM profile_package");
         if ($this->isempty($result) === true) {
             $this->exec("INSERT INTO profile_package (Name) VALUES ('apache'), ('httpd'), ('php'), ('php-fpm'), ('mysql'), ('fail2ban'), ('nrpe'), ('munin-node'), ('node'), ('newrelic'), ('nginx'), ('haproxy'), ('netdata'), ('nfs'), ('rsnapshot'), ('kernel'), ('java'), ('redis'), ('varnish'), ('mongo'), ('rabbit'), ('clamav'), ('clam'), ('gpg'), ('gnupg')");
         }
 
-        /**
-         *  profile_service table
-         */
+        // profile_service table
         $this->exec("CREATE TABLE IF NOT EXISTS profile_service (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Name VARCHAR(255) UNIQUE NOT NULL)");
 
-        /**
-         *  If profile_service table is empty (just created) then we populate it
-         */
+        // If profile_service table is empty (just created) then we populate it
         $result = $this->query("SELECT Id FROM profile_service");
         if ($this->isempty($result) === true) {
             $this->exec("INSERT INTO profile_service (Name) VALUES ('apache'), ('httpd'), ('php-fpm'), ('mysqld'), ('fail2ban'), ('nrpe'), ('munin-node'), ('nginx'), ('haproxy'), ('netdata'), ('nfsd'), ('redis'), ('varnish'), ('mongod'), ('clamd')");
         }
 
-        /**
-         *  Create system_monitoring table
-         */
+        // Create system_monitoring table
         $this->exec("CREATE TABLE IF NOT EXISTS system_monitoring (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Timestamp VARCHAR(255) NOT NULL,
@@ -529,14 +451,10 @@ private function generateMainTables(): void
         Memory_usage REAL,
         Disk_usage REAL)");
 
-        /**
-         *  Create indexes on system_monitoring table
-         */
+        // Create indexes on system_monitoring table
         $this->exec("CREATE INDEX IF NOT EXISTS system_monitoring_index ON system_monitoring (Timestamp, Cpu_usage, Memory_usage, Disk_usage)");
 
-        /**
-         *  notifications table
-         */
+        // notifications table
         $this->exec("CREATE TABLE IF NOT EXISTS notifications (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Id_notification CHAR(5) NOT NULL,
@@ -544,9 +462,7 @@ private function generateMainTables(): void
         Message VARCHAR(255) NOT NULL,
         Status CHAR(9) NOT NULL)"); /* new, acquitted */
 
-        /**
-         *  settings table
-         */
+        // settings table
         $this->exec("CREATE TABLE IF NOT EXISTS settings (
         /* General settings */
         DEBUG_MODE CHAR(5),
@@ -614,26 +530,18 @@ private function generateMainTables(): void
         OIDC_HTTP_PROXY VARCHAR(255),
         OIDC_CERT_PATH VARCHAR(255))");
 
-        /**
-         *  If settings table is empty then populate it
-         */
+        // If settings table is empty then populate it
         $result = $this->query("SELECT * FROM settings");
         if ($this->isempty($result) === true) {
-            /**
-             *  Set default values
-             */
+            // Set default values
             $fqdn = 'localhost';
 
-            /**
-             *  FQDN file is created on container startup (entrypoint)
-             */
+            // FQDN file is created on container startup (entrypoint)
             if (file_exists(ROOT . '/.fqdn')) {
                 $fqdn = trim(file_get_contents(ROOT . '/.fqdn'));
             }
 
-            /**
-             *  GPG key Id
-             */
+            // GPG key Id
             $gpgKeyId = 'repomanager@' . $fqdn;
 
             /**
@@ -767,10 +675,7 @@ private function generateMainTables(): void
             )");
         }
 
-        /**
-         *  Generate cve table if not exists
-         *  CVEs table
-         */
+        // Generate cve table if not exists
         $this->exec("CREATE TABLE IF NOT EXISTS cve (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Name VARCHAR(255) NOT NULL,
@@ -822,16 +727,12 @@ private function generateMainTables(): void
         Duration INTEGER,
         Status CHAR(7) NOT NULL)"); /* running, error, done */
 
-        /**
-         *  Create indexes
-         */
+        // Create indexes
         $this->exec("CREATE INDEX IF NOT EXISTS cve_index ON cve (Name, Updated_date, Updated_time)");
         $this->exec("CREATE INDEX IF NOT EXISTS cve_cpe_index ON cve_cpe (Part, Vendor, Product, Version, Id_cve)");
         $this->exec("CREATE INDEX IF NOT EXISTS cve_affected_hosts_index ON cve_affected_hosts (Status, Id_cve)");
 
-        /**
-         *  Generate logs table if not exists
-         */
+        // Generate logs table if not exists
         $this->exec("CREATE TABLE IF NOT EXISTS logs (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Date DATE NOT NULL,
@@ -842,9 +743,7 @@ private function generateMainTables(): void
         Details TEXT,
         Status CHAR(9) NOT NULL)"); /* new, acquitted */
 
-        /**
-         *  Generate layout_container_state table if not exists
-         */
+        // Generate layout_container_state table if not exists
         $this->exec("CREATE TABLE IF NOT EXISTS layout_container_state (
         Container VARCHAR(255) NOT NULL)");
     }
@@ -854,9 +753,7 @@ private function generateMainTables(): void
      */
     private function generateStatsTables(): void
     {
-        /**
-         *  stats table
-         */
+        // stats table
         $this->exec("CREATE TABLE IF NOT EXISTS repo_stats (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Timestamp INTEGER NOT NULL,
@@ -865,9 +762,7 @@ private function generateStatsTables(): void
         Snapshot_packages_count INTEGER NOT NULL,
         Id_repo INTEGER NOT NULL)");
 
-        /**
-         *  access_deb table
-         */
+        // access_deb table
         $this->exec("CREATE TABLE IF NOT EXISTS access_deb (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Timestamp INTEGER NOT NULL,
@@ -880,9 +775,7 @@ private function generateStatsTables(): void
         Request VARCHAR(255) NOT NULL,
         Request_result VARCHAR(8) NOT NULL)");
 
-        /**
-         *  access_rpm table
-         */
+        // access_rpm table
         $this->exec("CREATE TABLE IF NOT EXISTS access_rpm (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Timestamp INTEGER NOT NULL,
@@ -894,16 +787,12 @@ private function generateStatsTables(): void
         Request VARCHAR(255) NOT NULL,
         Request_result VARCHAR(8) NOT NULL)");
 
-        /**
-         *  access_queue table
-         */
+        // access_queue table
         $this->exec("CREATE TABLE IF NOT EXISTS access_queue (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Request VARCHAR(255) NOT NULL)");
 
-        /**
-         *  Create indexes
-         */
+        // Create indexes
         $this->exec("CREATE INDEX IF NOT EXISTS idx_access_deb ON access_deb (Name, Dist, Section, Env, Source, IP, Request, Request_result, Timestamp)");
         $this->exec("CREATE INDEX IF NOT EXISTS idx_access_rpm ON access_rpm (Name, Releasever, Env, Source, IP, Request, Request_result, Timestamp)");
         $this->exec("CREATE INDEX IF NOT EXISTS idx_repo_stats ON repo_stats (Snapshot_date, Snapshot_size, Snapshot_packages_count, Id_repo, Timestamp)");
@@ -922,9 +811,7 @@ private function generateStatsTables(): void
      */
     private function generateHostsTables(): void
     {
-        /**
-         *  requests table
-         */
+        // requests table
         $this->exec("CREATE TABLE IF NOT EXISTS requests (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Date DATE NOT NULL,
@@ -938,9 +825,7 @@ private function generateHostsTables(): void
         Next_retry VARCHAR(255),
         Id_host INTEGER NOT NULL)");
 
-        /**
-         *  hosts table
-         */
+        // hosts table
         $this->exec("CREATE TABLE IF NOT EXISTS hosts (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Ip VARCHAR(15) NOT NULL,
@@ -965,27 +850,22 @@ private function generateHostsTables(): void
         Uptime VARCHAR(255),
         Agent_version VARCHAR(255))"); /* active / disabled / deleted */
 
-        /**
-         *  groups table
-         */
+        // groups table
         $this->exec("CREATE TABLE IF NOT EXISTS groups (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Name VARCHAR(255) UNIQUE NOT NULL)");
 
-        /**
-         *  group_members table
-         */
+        // group_members table
         $this->exec("CREATE TABLE IF NOT EXISTS group_members (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Id_host INTEGER NOT NULL,
         Id_group INTEGER NOT NULL)");
 
-        /**
-         *  settings table
-         */
+        // settings table
         $this->exec("CREATE TABLE IF NOT EXISTS settings (
         compliance_threshold_count INTEGER NOT NULL DEFAULT 1,
         compliance_threshold_days INTEGER NOT NULL DEFAULT 30,
+        compliance_security_update INTEGER NOT NULL DEFAULT 1,
         compliance_reboot_required INTEGER NOT NULL DEFAULT 1)"); /* 1 = true, 0 = false */
 
         // Insert default values in settings table, if empty
@@ -993,9 +873,7 @@ private function generateHostsTables(): void
             $this->query("INSERT INTO settings (compliance_threshold_count, compliance_threshold_days, compliance_reboot_required) VALUES (1, 30, 1)");
         }
 
-        /**
-         *  Create indexes
-         */
+        // Create indexes
         // hosts table indexes:
         $this->exec("CREATE INDEX IF NOT EXISTS idx_hosts ON hosts (Ip, Hostname, Os, Os_version, Os_family, Kernel, Arch, Type, Profile, Env, AuthId, Token, Online_status, Online_status_date, Online_status_time, Reboot_required, Agent_version)");
         $this->exec("CREATE INDEX IF NOT EXISTS idx_hosts_authid ON hosts (AuthId)");
@@ -1026,46 +904,38 @@ private function generateHostsTables(): void
      */
     public function generateHostTables(): void
     {
-        /**
-         *  packages table
-         *  Inventory of all packages installed on the host
-         */
+        // packages table, inventory of all packages installed on the host
         $this->exec("CREATE TABLE IF NOT EXISTS packages (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Name VARCHAR(255),
         Version VARCHAR(255),
         State VARCHAR(255),
         Type VARCHAR(255),
+        Security CHAR(5), /* true, false */
         Date DATE NOT NULL,
         Time TIME NOT NULL,
         Id_event INTEGER)");
 
-        /**
-         *  history table
-         *  History of all packages installed on the host (installed, updated, removed)
-         */
+        // history table, history of all packages installed on the host (installed, updated, removed)
         $this->exec("CREATE TABLE IF NOT EXISTS packages_history (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Name VARCHAR(255),
         Version VARCHAR(255),
         State VARCHAR(255),
         Type VARCHAR(255),
+        Security CHAR(5), /* true, false */
         Date DATE NOT NULL,
         Time TIME NOT NULL,
         Id_event INTEGER)");
 
-        /**
-         *  packages_available table
-         *  Available packages for update
-         */
+        // packages_available table, available packages for update
         $this->exec("CREATE TABLE IF NOT EXISTS packages_available (
         Name VARCHAR(255),
         Version VARCHAR(255),
+        Security CHAR(5), /* true, false */
         Repository VARCHAR(255))");
 
-        /**
-         *  events table
-         */
+        // events table
         $this->exec("CREATE TABLE IF NOT EXISTS events (
         Id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
         Date DATE NOT NULL,
@@ -1076,9 +946,7 @@ public function generateHostTables(): void
         Command VARCHAR(255),
         Status VARCHAR(7))"); /* error / warning / unknown / done */
 
-        /**
-         *  Create indexes
-         */
+        // Create indexes
         // packages table indexes:
         $this->exec("CREATE INDEX IF NOT EXISTS host_packages_available_name_version ON packages_available (Name, Version);");
         $this->exec("CREATE INDEX IF NOT EXISTS host_packages_name_version ON packages (Name, Version);");
@@ -1097,9 +965,7 @@ public function generateHostTables(): void
      */
     private function generateWsTables(): void
     {
-        /**
-         *  ws_connections table
-         */
+        // ws_connections table
         $this->exec("CREATE TABLE IF NOT EXISTS ws_connections (
         Connection_id INTEGER,
         Type VARCHAR(255),
@@ -1154,16 +1020,12 @@ public function isempty($result): bool
     {
         $count = 0;
 
-        /**
-         *  Count the number of rows returned by the query
-         */
+        // Count the number of rows returned by the query
         while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
             $count++;
         }
 
-        /**
-         *  If count == 0 then result is empty
-         */
+        // If count == 0 then result is empty
         if ($count == 0) {
             return true;
         }
diff --git a/www/models/Environment.php b/www/models/Environment.php
index 05080ac41..85d717ce9 100644
--- a/www/models/Environment.php
+++ b/www/models/Environment.php
@@ -34,12 +34,13 @@ public function getAllByName(): array
     /**
      *  Add new environment in database
      */
-    public function add(string $name, string $color) : void
+    public function add(string $name, string $color, string $protected) : void
     {
         try {
-            $stmt = $this->db->prepare("INSERT INTO env (Name, Color) VALUES (:name, :color)");
+            $stmt = $this->db->prepare("INSERT INTO env (Name, Color, Protected) VALUES (:name, :color, :protected)");
             $stmt->bindValue(':name', $name);
             $stmt->bindValue(':color', $color);
+            $stmt->bindValue(':protected', $protected);
             $stmt->execute();
         } catch (Exception $e) {
             DbLog::error($e);
@@ -71,23 +72,39 @@ public function deleteAll()
     /**
      *  List all environments
      */
-    public function listAll()
+    public function listAll(): array
     {
-        $datas = [];
+        $data = [];
 
         $result = $this->db->query("SELECT * FROM env");
 
         while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
-            $datas[] = $row;
+            $data[] = $row;
         }
 
-        return $datas;
+        return $data;
+    }
+
+    /**
+     *  Return the list of protected environments
+     */
+    public function getProtected(): array
+    {
+        $data = [];
+
+        $result = $this->db->query("SELECT Name FROM env WHERE Protected = 'true'");
+
+        while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
+            $data[] = $row['Name'];
+        }
+
+        return $data;
     }
 
     /**
      *  List default environment
      */
-    public function default()
+    public function default(): string
     {
         $default = '';
 
diff --git a/www/models/Group/Group.php b/www/models/Group/Group.php
index 7f8e867f9..299f97d01 100644
--- a/www/models/Group/Group.php
+++ b/www/models/Group/Group.php
@@ -218,6 +218,28 @@ public function getReposMembers(int $id)
         return $data;
     }
 
+    /**
+     *  Return the list of group Ids the specified repo is member of
+     */
+    public function getRepoGroupsIds(int $repoId): array
+    {
+        $data = [];
+
+        try {
+            $stmt = $this->db->prepare("SELECT Id_group FROM group_members WHERE Id_repo = :repoId");
+            $stmt->bindValue(':repoId', $repoId);
+            $result = $stmt->execute();
+        } catch (Exception $e) {
+            DbLog::error($e);
+        }
+
+        while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
+            $data[] = $row['Id_group'];
+        }
+
+        return $data;
+    }
+
     /**
      *  Return the list of repos not in any group
      */
diff --git a/www/models/Host/Host.php b/www/models/Host/Host.php
index c4f79fc18..2a22db6ee 100644
--- a/www/models/Host/Host.php
+++ b/www/models/Host/Host.php
@@ -123,12 +123,13 @@ public function getSettings(): array
     /**
      *  Edit the display settings on the hosts page
      */
-    public function setSettings(int $complianceThresholdCount, int $complianceThresholdDays, int $complianceRebootRequired): void
+    public function setSettings(int $complianceThresholdCount, int $complianceThresholdDays, int $complianceSecurityUpdate, int $complianceRebootRequired): void
     {
         try {
-            $stmt = $this->db->prepare("UPDATE settings SET compliance_threshold_count = :compliance_threshold_count, compliance_threshold_days = :compliance_threshold_days, compliance_reboot_required = :compliance_reboot_required");
+            $stmt = $this->db->prepare("UPDATE settings SET compliance_threshold_count = :compliance_threshold_count, compliance_threshold_days = :compliance_threshold_days, compliance_security_update = :compliance_security_update, compliance_reboot_required = :compliance_reboot_required");
             $stmt->bindValue(':compliance_threshold_count', $complianceThresholdCount, SQLITE3_INTEGER);
             $stmt->bindValue(':compliance_threshold_days', $complianceThresholdDays, SQLITE3_INTEGER);
+            $stmt->bindValue(':compliance_security_update', $complianceSecurityUpdate, SQLITE3_INTEGER);
             $stmt->bindValue(':compliance_reboot_required', $complianceRebootRequired, SQLITE3_INTEGER);
             $stmt->execute();
         } catch (Exception $e) {
diff --git a/www/models/Host/Package/Package.php b/www/models/Host/Package/Package.php
index 384660c27..5bf38a587 100644
--- a/www/models/Host/Package/Package.php
+++ b/www/models/Host/Package/Package.php
@@ -138,13 +138,35 @@ public function getPackageState(string $packageName, string|null $packageVersion
 
     /**
      *  Return the list of inventoried packages in database
+     *  Supports optional pagination and search filter on package name
      */
-    public function getInventory() : array
+    public function getInventory(string $search, bool $withOffset = false, int $offset = 0): array
     {
         $datas = [];
 
         try {
-            $result = $this->db->query("SELECT * FROM packages ORDER BY Name ASC");
+            $query = "SELECT * FROM packages";
+
+            if (!empty($search)) {
+                $query .= " WHERE Name LIKE :search OR Version LIKE :search";
+            }
+
+            $query .= " ORDER BY Name ASC";
+
+            if ($withOffset === true) {
+                $query .= " LIMIT 10 OFFSET :offset";
+            }
+
+            $stmt = $this->db->prepare($query);
+
+            if (!empty($search)) {
+                $stmt->bindValue(':search', '%' . $search . '%', SQLITE3_TEXT);
+            }
+            if ($withOffset === true) {
+                $stmt->bindValue(':offset', $offset, SQLITE3_INTEGER);
+            }
+
+            $result = $stmt->execute();
         } catch (Exception $e) {
             DbLog::error($e);
         }
@@ -156,6 +178,38 @@ public function getInventory() : array
         return $datas;
     }
 
+    /**
+     *  Return the total count of inventoried packages, optionally filtered by a search on package name/version
+     */
+    public function countInventory(string $search): int
+    {
+        $count = 0;
+
+        try {
+            $query = "SELECT COUNT(*) AS total FROM packages";
+
+            if (!empty($search)) {
+                $query .= " WHERE Name LIKE :search OR Version LIKE :search";
+            }
+
+            $stmt = $this->db->prepare($query);
+
+            if (!empty($search)) {
+                $stmt->bindValue(':search', '%' . $search . '%', SQLITE3_TEXT);
+            }
+
+            $result = $stmt->execute();
+        } catch (Exception $e) {
+            DbLog::error($e);
+        }
+
+        while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
+            $count = (int) $row['total'];
+        }
+
+        return $count;
+    }
+
     /**
      *  Return the list of installed packages in database
      */
@@ -185,7 +239,7 @@ public function getAvailable(bool $withOffset, int $offset) : array
         $data = [];
 
         try {
-            $query = "SELECT packages_available.Name, packages.Version as Current_version, packages_available.Version, packages_available.Repository FROM packages_available";
+            $query = "SELECT packages_available.Name, packages.Version as Current_version, packages_available.Version, packages_available.Security, packages_available.Repository FROM packages_available";
 
             // Join with packages table to also get the current version of the package installed on the host
             $query .= " LEFT JOIN packages ON packages_available.Name = packages.Name AND (packages.State = 'inventored' or packages.State = 'installed' or packages.State = 'dep-installed' or packages.State = 'upgraded' or packages.State = 'downgraded')";
@@ -403,12 +457,13 @@ public function addPackage(string $name, string $version, string $state, string
     /**
      *  Add a package in the available packages list
      */
-    public function addPackageAvailable(string $name, string $version, string $repository) : void
+    public function addPackageAvailable(string $name, string $version, string $security, string $repository) : void
     {
         try {
-            $stmt = $this->db->prepare("INSERT INTO packages_available ('Name', 'Version', 'Repository') VALUES (:name, :version, :repository)");
+            $stmt = $this->db->prepare("INSERT INTO packages_available ('Name', 'Version', 'Security', 'Repository') VALUES (:name, :version, :security, :repository)");
             $stmt->bindValue(':name', $name);
             $stmt->bindValue(':version', $version);
+            $stmt->bindValue(':security', $security);
             $stmt->bindValue(':repository', $repository);
             $stmt->execute();
         } catch (Exception $e) {
@@ -419,12 +474,13 @@ public function addPackageAvailable(string $name, string $version, string $repos
     /**
      *  Update a package in the available packages list
      */
-    public function updatePackageAvailable(string $name, string $version, string $repository) : void
+    public function updatePackageAvailable(string $name, string $version, string $security, string $repository) : void
     {
         try {
-            $stmt = $this->db->prepare("UPDATE packages_available SET Version = :version, Repository = :repository WHERE Name = :name");
+            $stmt = $this->db->prepare("UPDATE packages_available SET Version = :version, Security = :security, Repository = :repository WHERE Name = :name");
             $stmt->bindValue(':name', $name);
             $stmt->bindValue(':version', $version);
+            $stmt->bindValue(':security', $security);
             $stmt->bindValue(':repository', $repository);
             $stmt->execute();
         } catch (Exception $e) {
diff --git a/www/models/Layout/ContainerReload.php b/www/models/Layout/ContainerReload.php
index c2dbfcb54..a080a93d0 100644
--- a/www/models/Layout/ContainerReload.php
+++ b/www/models/Layout/ContainerReload.php
@@ -66,6 +66,30 @@ public function exists(string $name)
         return true;
     }
 
+    /**
+     *  Delete the specified layout container states
+     */
+    public function delete(array $names): void
+    {
+        if (empty($names)) {
+            return;
+        }
+
+        try {
+            $placeholders = implode(',', array_fill(0, count($names), '?'));
+
+            $stmt = $this->db->prepare("DELETE FROM layout_container_state WHERE Container IN (" . $placeholders . ")");
+
+            foreach (array_values($names) as $index => $name) {
+                $stmt->bindValue($index + 1, $name);
+            }
+
+            $stmt->execute();
+        } catch (Exception $e) {
+            DbLog::error($e);
+        }
+    }
+
     /**
      *  Clean all containers entries
      */
diff --git a/www/models/Repo/Deb.php b/www/models/Repo/Deb.php
index fa0891cf0..64c699dde 100644
--- a/www/models/Repo/Deb.php
+++ b/www/models/Repo/Deb.php
@@ -36,40 +36,6 @@ public function getIdByNameDistComponent(string $name, string $distribution, str
         return $id;
     }
 
-    /**
-     *  Return repository environment description
-     */
-    public function getDescriptionByName(string $name, string $dist, string $component, string $env) : string|null
-    {
-        $description = null;
-
-        try {
-            $stmt = $this->db->prepare("SELECT repos_env.Description FROM repos_env
-            INNER JOIN repos_snap
-                ON repos_snap.Id = repos_env.Id_snap
-            INNER JOIN repos
-                ON repos.Id = repos_snap.Id_repo
-            WHERE repos.Name = :name
-            AND repos.Dist = :dist
-            AND repos.Section = :component
-            AND repos_env.Env = :env
-            AND repos_snap.Status = 'active'");
-            $stmt->bindValue(':name', $name);
-            $stmt->bindValue(':dist', $dist);
-            $stmt->bindValue(':component', $component);
-            $stmt->bindValue(':env', $env);
-            $result = $stmt->execute();
-        } catch (Exception $e) {
-            DbLog::error($e);
-        }
-
-        while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
-            $description = $row['Description'];
-        }
-
-        return $description;
-    }
-
     /**
      *  Return environment Id from repo name
      */
diff --git a/www/models/Repo/Environment.php b/www/models/Repo/Environment.php
index 284d322b4..d8c285ae5 100644
--- a/www/models/Repo/Environment.php
+++ b/www/models/Repo/Environment.php
@@ -13,18 +13,17 @@ public function __construct()
     }
 
     /**
-     *  Return all environments associated to a repository ID
+     *  Return all environments associated to a snapshot Id
      */
-    public function getByRepoId(int $repoId): array
+    public function getBySnapId(int $snapId): array
     {
         $data = [];
 
         try {
             $stmt = $this->db->prepare("SELECT Env FROM repos_env
             INNER JOIN repos_snap ON repos_snap.Id = repos_env.Id_snap
-            INNER JOIN repos ON repos.Id = repos_snap.Id_repo
-            WHERE repos.Id = :repoId");
-            $stmt->bindValue(':repoId', $repoId);
+            WHERE repos_snap.Id = :snapId");
+            $stmt->bindValue(':snapId', $snapId);
             $result = $stmt->execute();
         } catch (Exception $e) {
             DbLog::error($e);
@@ -40,12 +39,11 @@ public function getByRepoId(int $repoId): array
     /**
      *  Associate a new env to a snapshot
      */
-    public function add(int $snapId, string $env, string $description) : void
+    public function add(int $snapId, string $env) : void
     {
         try {
-            $stmt = $this->db->prepare("INSERT INTO repos_env ('Env', 'Description', 'Id_snap') VALUES (:env, :description, :snapId)");
+            $stmt = $this->db->prepare("INSERT INTO repos_env ('Env', 'Id_snap') VALUES (:env, :snapId)");
             $stmt->bindValue(':env', $env);
-            $stmt->bindValue(':description', $description);
             $stmt->bindValue(':snapId', $snapId);
             $stmt->execute();
         } catch (Exception $e) {
@@ -67,21 +65,6 @@ public function remove(int $id) : void
         }
     }
 
-    /**
-     *  Update environment description
-     */
-    public function updateDescription(int $id, string $description) : void
-    {
-        try {
-            $stmt = $this->db->prepare("UPDATE repos_env SET Description = :description WHERE Id = :envId");
-            $stmt->bindValue(':description', $description);
-            $stmt->bindValue(':envId', $id);
-            $stmt->execute();
-        } catch (Exception $e) {
-            DbLog::error($e);
-        }
-    }
-
     /**
      *  Return true if the repository environment Id exists
      */
diff --git a/www/models/Repo/Listing.php b/www/models/Repo/Listing.php
index 6fc56f6f6..868addaef 100644
--- a/www/models/Repo/Listing.php
+++ b/www/models/Repo/Listing.php
@@ -30,6 +30,8 @@ public function list() : array
             repos.Releasever,
             repos.Source,
             repos.Package_type,
+            repos.Description,
+            repos.Tags,
             repos_env.Env,
             repos_snap.Date,
             repos_snap.Time,
@@ -38,8 +40,7 @@ public function list() : array
             repos_snap.Type,
             repos_snap.Reconstruct,
             repos_snap.Size,
-            repos_snap.Size_human,
-            repos_env.Description
+            repos_snap.Size_human
             FROM repos 
             LEFT JOIN repos_snap
                 ON repos.Id = repos_snap.Id_repo
@@ -78,6 +79,8 @@ public function listByGroup(string $groupName) : array
                 repos.Releasever,
                 repos.Source,
                 repos.Package_type,
+                repos.Description,
+                repos.Tags,
                 repos_env.Env,
                 repos_snap.Date,
                 repos_snap.Time,
@@ -87,8 +90,7 @@ public function listByGroup(string $groupName) : array
                 repos_snap.Reconstruct,
                 repos_snap.Size,
                 repos_snap.Size_human,
-                repos_snap.Status,
-                repos_env.Description
+                repos_snap.Status
                 FROM repos
                 LEFT JOIN repos_snap
                     ON repos.Id = repos_snap.Id_repo
@@ -107,6 +109,8 @@ public function listByGroup(string $groupName) : array
                 repos.Releasever,
                 repos.Source,
                 repos.Package_type,
+                repos.Description,
+                repos.Tags,
                 repos_env.Env,
                 repos_snap.Date,
                 repos_snap.Time,
@@ -116,8 +120,7 @@ public function listByGroup(string $groupName) : array
                 repos_snap.Reconstruct,
                 repos_snap.Size,
                 repos_snap.Size_human,
-                repos_snap.Status,
-                repos_env.Description
+                repos_snap.Status
                 FROM repos
                 LEFT JOIN repos_snap
                     ON repos.Id = repos_snap.Id_repo
@@ -168,7 +171,9 @@ public function listNameOnly(bool $withActiveSnapshots)
                 repos.Dist,
                 repos.Section,
                 repos.Source,
-                repos.Package_type
+                repos.Package_type,
+                repos.Description,
+                repos.Tags
                 FROM repos
                 INNER JOIN repos_snap
                     ON repos_snap.Id_repo = repos.Id
@@ -205,7 +210,16 @@ public function listSnapshots(int $repoId) : array
                         ORDER BY Env
                     ),
                     ''
-                ) AS Environments
+                ) AS Environments,
+                COALESCE(
+                    (
+                        SELECT GROUP_CONCAT(Id, ',')
+                        FROM repos_env
+                        WHERE Id_snap = repos_snap.Id
+                        ORDER BY Env
+                    ),
+                    ''
+                ) AS EnvironmentIds
             FROM repos_snap
             WHERE repos_snap.Id_repo = :repoId
             AND repos_snap.Status = 'active'
@@ -222,4 +236,117 @@ public function listSnapshots(int $repoId) : array
 
         return $data;
     }
+
+    /**
+     *  Return the list of repositories matching the specified filters, with their latest active snapshot Id
+     *  Repositories without any active snapshot are ignored
+     *  An empty group Id / tags / package type means 'no filtering on this criteria'
+     */
+    public function listByTarget(string $groupId = '', array $tags = [], string $packageType = '') : array
+    {
+        $data = [];
+        $conditions = [];
+        $bindings = [];
+
+        // Filter on package type
+        if ($packageType !== '') {
+            $conditions[] = 'repos.Package_type = :packageType';
+            $bindings[':packageType'] = $packageType;
+        }
+
+        /**
+         *  Filter on group
+         *  Group Id 0 is a fictitious group ('Default') containing all the repositories that do not belong to any group
+         *  The group Id is used instead of its name, so that renaming a group has no impact on the target
+         */
+        if ($groupId !== '') {
+            if ($groupId === '0') {
+                $conditions[] = 'repos.Id NOT IN (SELECT Id_repo FROM group_members)';
+            } else {
+                $conditions[] = 'repos.Id IN (SELECT group_members.Id_repo FROM group_members WHERE group_members.Id_group = :groupId)';
+                $bindings[':groupId'] = $groupId;
+            }
+        }
+
+        /**
+         *  Filter on tags
+         *  A repository must have ALL the specified tags to be selected
+         *  Tags are stored as a comma-separated string, so the column is surrounded by commas to search for an exact tag
+         */
+        foreach (array_values($tags) as $index => $tag) {
+            $placeholder = ':tag' . $index;
+            $conditions[] = "(',' || IFNULL(repos.Tags, '') || ',') LIKE " . $placeholder;
+            $bindings[$placeholder] = '%,' . $tag . ',%';
+        }
+
+        $where = empty($conditions) ? '' : ' WHERE ' . implode(' AND ', $conditions);
+
+        try {
+            // The latest active snapshot Id is retrieved with a subquery, then rows without snapshot are filtered out
+            $stmt = $this->db->prepare("SELECT * FROM (
+                SELECT
+                repos.Id AS repoId,
+                repos.Name,
+                repos.Dist,
+                repos.Section,
+                repos.Releasever,
+                repos.Package_type,
+                repos.Tags,
+                (
+                    SELECT repos_snap.Id
+                    FROM repos_snap
+                    WHERE repos_snap.Id_repo = repos.Id
+                    AND repos_snap.Status = 'active'
+                    ORDER BY repos_snap.Date DESC, repos_snap.Time DESC, repos_snap.Id DESC
+                    LIMIT 1
+                ) AS snapId
+                FROM repos" . $where . "
+            ) WHERE snapId IS NOT NULL
+            ORDER BY Name ASC, Releasever ASC, Dist ASC, Section ASC");
+
+            foreach ($bindings as $placeholder => $value) {
+                $stmt->bindValue($placeholder, $value);
+            }
+
+            $result = $stmt->execute();
+        } catch (Exception $e) {
+            DbLog::error($e);
+            return $data;
+        }
+
+        while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
+            $data[] = $row;
+        }
+
+        return $data;
+    }
+
+    /**
+     *  Return the list of all distinct tags used by repositories
+     */
+    public function listTags(): array
+    {
+        $data = [];
+
+        try {
+            $result = $this->db->query("SELECT DISTINCT Tags FROM repos WHERE Tags IS NOT NULL AND Tags != ''");
+        } catch (Exception $e) {
+            DbLog::error($e);
+            return $data;
+        }
+
+        while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
+            foreach (explode(',', $row['Tags']) as $tag) {
+                $tag = trim($tag);
+
+                if ($tag !== '' and !in_array($tag, $data)) {
+                    $data[] = $tag;
+                }
+            }
+        }
+
+        sort($data);
+
+        return $data;
+    }
 }
diff --git a/www/models/Repo/Repo.php b/www/models/Repo/Repo.php
index f1f005500..c101f1180 100644
--- a/www/models/Repo/Repo.php
+++ b/www/models/Repo/Repo.php
@@ -52,6 +52,8 @@ public function getAllById(string|null $repoId, string|null $snapId, string|null
                 repos.Section,
                 repos.Source,
                 repos.Package_type,
+                repos.Description,
+                repos.Tags,
                 repos_snap.Id AS snapId,
                 repos_snap.Date,
                 repos_snap.Time,
@@ -66,7 +68,6 @@ public function getAllById(string|null $repoId, string|null $snapId, string|null
                 repos_snap.Id_repo,
                 repos_env.Id AS envId,
                 repos_env.Env,
-                repos_env.Description,
                 repos_env.Id_snap
                 FROM repos 
                 INNER JOIN repos_snap
@@ -88,6 +89,8 @@ public function getAllById(string|null $repoId, string|null $snapId, string|null
                 repos.Section,
                 repos.Source,
                 repos.Package_type,
+                repos.Description,
+                repos.Tags,
                 repos_snap.Id AS snapId,
                 repos_snap.Date,
                 repos_snap.Time,
@@ -115,7 +118,9 @@ public function getAllById(string|null $repoId, string|null $snapId, string|null
                 repos.Dist,
                 repos.Section,
                 repos.Source,
-                repos.Package_type
+                repos.Package_type,
+                repos.Description,
+                repos.Tags
                 FROM repos
                 WHERE repos.Id = :repoId");
                 $stmt->bindValue(':repoId', $repoId);
@@ -128,6 +133,8 @@ public function getAllById(string|null $repoId, string|null $snapId, string|null
                 repos.Section,
                 repos.Source,
                 repos.Package_type,
+                repos.Description,
+                repos.Tags,
                 repos_snap.Id AS snapId,
                 repos_snap.Date,
                 repos_snap.Time,
@@ -154,6 +161,8 @@ public function getAllById(string|null $repoId, string|null $snapId, string|null
                 repos.Section,
                 repos.Source,
                 repos.Package_type,
+                repos.Description,
+                repos.Tags,
                 repos_snap.Id AS snapId,
                 repos_snap.Date,
                 repos_snap.Time,
@@ -168,7 +177,6 @@ public function getAllById(string|null $repoId, string|null $snapId, string|null
                 repos_snap.Id_repo,
                 repos_env.Id AS envId,
                 repos_env.Env,
-                repos_env.Description,
                 repos_env.Id_snap
                 FROM repos
                 INNER JOIN repos_snap
@@ -178,6 +186,7 @@ public function getAllById(string|null $repoId, string|null $snapId, string|null
                 WHERE repos_env.Id = :envId");
                 $stmt->bindValue(':envId', $envId);
             }
+
             $result = $stmt->execute();
         } catch (Exception $e) {
             DbLog::error($e);
@@ -519,4 +528,34 @@ public function updateSource(int $repoId, string $source): void
 
         unset($stmt);
     }
+
+    /**
+     *  Update description
+     */
+    public function updateDescription(int $id, string $description): void
+    {
+        try {
+            $stmt = $this->db->prepare("UPDATE repos SET Description = :description WHERE Id = :id");
+            $stmt->bindValue(':description', $description);
+            $stmt->bindValue(':id', $id);
+            $stmt->execute();
+        } catch (Exception $e) {
+            DbLog::error($e);
+        }
+    }
+
+    /**
+     *  Update tags
+     */
+    public function updateTags(int $id, string $tags): void
+    {
+        try {
+            $stmt = $this->db->prepare("UPDATE repos SET Tags = :tags WHERE Id = :id");
+            $stmt->bindValue(':tags', $tags);
+            $stmt->bindValue(':id', $id);
+            $stmt->execute();
+        } catch (Exception $e) {
+            DbLog::error($e);
+        }
+    }
 }
diff --git a/www/models/Repo/Rpm.php b/www/models/Repo/Rpm.php
index 29755488a..e5d65b79e 100644
--- a/www/models/Repo/Rpm.php
+++ b/www/models/Repo/Rpm.php
@@ -35,38 +35,6 @@ public function getIdByNameReleasever(string $name, string $releaseVersion) : in
         return $id;
     }
 
-    /**
-     *  Return repository environment description
-     */
-    public function getDescriptionByName(string $name, string $releaseVersion, string $env) : string|null
-    {
-        $description = null;
-
-        try {
-            $stmt = $this->db->prepare("SELECT repos_env.Description FROM repos_env
-            INNER JOIN repos_snap
-                ON repos_snap.Id = repos_env.Id_snap
-            INNER JOIN repos
-                ON repos.Id = repos_snap.Id_repo
-            WHERE repos.Name = :name
-            AND repos.Releasever = :releaseVersion
-            AND repos_env.Env = :env
-            AND repos_snap.Status = 'active'");
-            $stmt->bindValue(':name', $name);
-            $stmt->bindValue(':releaseVersion', $releaseVersion);
-            $stmt->bindValue(':env', $env);
-            $result = $stmt->execute();
-        } catch (Exception $e) {
-            DbLog::error($e);
-        }
-
-        while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
-            $description = $row['Description'];
-        }
-
-        return $description;
-    }
-
     /**
      *  Return environment Id from repo name
      */
@@ -186,7 +154,7 @@ public function add(string $name, string $releaseVersion, string $source = '') :
         try {
             $stmt = $this->db->prepare("INSERT INTO repos ('Name', 'Releasever', 'Source', 'Package_type') VALUES (:name, :releaseVersion, :source, 'rpm')");
             $stmt->bindValue(':name', $name, SQLITE3_TEXT);
-            $stmt->bindValue(':releaseVersion', $releaseVersion);
+            $stmt->bindValue(':releaseVersion', $releaseVersion, SQLITE3_TEXT);
             $stmt->bindValue(':source', $source, SQLITE3_TEXT);
             $stmt->execute();
         } catch (Exception $e) {
diff --git a/www/models/Task/Listing.php b/www/models/Task/Listing.php
index 8f44e308e..37cf33b11 100644
--- a/www/models/Task/Listing.php
+++ b/www/models/Task/Listing.php
@@ -206,4 +206,90 @@ public function getDone(string $type, bool $withOffset, int $offset): array
 
         return $data;
     }
+
+    /**
+     *  Get all sub-tasks generated by a parent task
+     *  (e.g. a scheduled task targeting a group of repositories generates one task per repository)
+     *  It is possible to add an offset to the request
+     */
+    public function getByParentId(int $parentTaskId, bool $withOffset = false, int $offset = 0): array
+    {
+        $data = [];
+
+        try {
+            $query = "SELECT * FROM tasks
+            WHERE Parent_task_id = :parentTaskId
+            ORDER BY Date DESC, Time DESC, Id ASC";
+
+            // Add offset if needed
+            if ($withOffset === true) {
+                $query .= " LIMIT 10 OFFSET :offset";
+            }
+
+            // Prepare query
+            $stmt = $this->db->prepare($query);
+            $stmt->bindValue(':parentTaskId', $parentTaskId, SQLITE3_INTEGER);
+            $stmt->bindValue(':offset', $offset, SQLITE3_INTEGER);
+            $result = $stmt->execute();
+        } catch (Exception $e) {
+            DbLog::error($e);
+        }
+
+        while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
+            $data[] = $row;
+        }
+
+        return $data;
+    }
+
+    /**
+     *  Count sub-tasks generated by a parent task, grouped by status
+     */
+    public function countStatusByParentId(int $parentTaskId): array
+    {
+        $data = [];
+
+        try {
+            $stmt = $this->db->prepare("SELECT Status, COUNT(*) AS Total FROM tasks WHERE Parent_task_id = :parentTaskId GROUP BY Status");
+            $stmt->bindValue(':parentTaskId', $parentTaskId, SQLITE3_INTEGER);
+            $result = $stmt->execute();
+        } catch (Exception $e) {
+            DbLog::error($e);
+        }
+
+        while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
+            $data[$row['Status']] = (int) $row['Total'];
+        }
+
+        return $data;
+    }
+
+    /**
+     *  Count sub-tasks generated by multiple parent tasks, grouped by parent task Id and status
+     */
+    public function countStatusByParentIds(array $parentTaskIds): array
+    {
+        $data = [];
+
+        // Ids are casted to int as they are directly injected into the query
+        $parentTaskIds = array_map('intval', array_filter($parentTaskIds, 'is_numeric'));
+
+        if (empty($parentTaskIds)) {
+            return $data;
+        }
+
+        try {
+            $result = $this->db->query("SELECT Parent_task_id, Status, COUNT(*) AS Total FROM tasks
+            WHERE Parent_task_id IN (" . implode(',', $parentTaskIds) . ")
+            GROUP BY Parent_task_id, Status");
+        } catch (Exception $e) {
+            DbLog::error($e);
+        }
+
+        while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
+            $data[$row['Parent_task_id']][$row['Status']] = (int) $row['Total'];
+        }
+
+        return $data;
+    }
 }
diff --git a/www/models/Task/Task.php b/www/models/Task/Task.php
index e863ccba4..a3519f81a 100644
--- a/www/models/Task/Task.php
+++ b/www/models/Task/Task.php
@@ -282,14 +282,17 @@ public function exists(int $id) : bool
 
     /**
      *  Add a new task to the database
+     *  If $parentTaskId is provided, the task is linked to the task that generated it
+     *  (e.g. a scheduled task targeting a group of repositories)
      */
-    public function new(string $type, string $rawParams, string $status) : int
+    public function new(string $type, string $rawParams, string $status, int|null $parentTaskId = null) : int
     {
         try {
-            $stmt = $this->db->prepare("INSERT INTO tasks (Type, Raw_params, Status) VALUES (:type, :rawParams, :status)");
+            $stmt = $this->db->prepare("INSERT INTO tasks (Type, Raw_params, Status, Parent_task_id) VALUES (:type, :rawParams, :status, :parentTaskId)");
             $stmt->bindValue(':type', $type);
             $stmt->bindValue(':rawParams', $rawParams);
             $stmt->bindValue(':status', $status);
+            $stmt->bindValue(':parentTaskId', $parentTaskId);
             $stmt->execute();
         } catch (Exception $e) {
             DbLog::error($e);
diff --git a/www/models/User/Preference.php b/www/models/User/Preference.php
new file mode 100644
index 000000000..f0e8e37d2
--- /dev/null
+++ b/www/models/User/Preference.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Models\User;
+
+use Exception;
+use Controllers\Database\Log as DbLog;
+
+class Preference extends \Models\Model
+{
+    public function __construct()
+    {
+        $this->getConnection('main');
+    }
+
+    /**
+     *  Get user preferences
+     */
+    public function get(int $id): string
+    {
+        $data = '';
+
+        try {
+            $stmt = $this->db->prepare("SELECT Preferences FROM user_preferences WHERE User_id = :id");
+            $stmt->bindValue(':id', $id);
+            $result = $stmt->execute();
+        } catch (Exception $e) {
+            DbLog::error($e);
+        }
+
+        while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
+            $data = $row['Preferences'];
+        }
+
+        return $data;
+    }
+
+    /**
+     *  Set user preferences
+     */
+    public function set(int $id, string $preferences): void
+    {
+        // First, delete existing preferences if any
+        $this->delete($id);
+
+        try {
+            // Then insert new preferences
+            $stmt = $this->db->prepare("INSERT INTO user_preferences (User_id, Preferences) VALUES (:id, :preferences)");
+            $stmt->bindValue(':preferences', $preferences);
+            $stmt->bindValue(':id', $id);
+            $stmt->execute();
+        } catch (Exception $e) {
+            DbLog::error($e);
+        }
+    }
+
+    /**
+     *  Delete user preferences
+     */
+    public function delete(int $id): void
+    {
+        try {
+            $stmt = $this->db->prepare("DELETE FROM user_preferences WHERE User_id = :id");
+            $stmt->bindValue(':id', $id);
+            $stmt->execute();
+        } catch (Exception $e) {
+            DbLog::error($e);
+        }
+    }
+}
diff --git a/www/public/assets/icons/calendar.svg b/www/public/assets/icons/calendar.svg
new file mode 100644
index 000000000..ababc8c46
--- /dev/null
+++ b/www/public/assets/icons/calendar.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="calendar.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="1.4199219"
+     inkscape:cx="235.22421"
+     inkscape:cy="256"
+     inkscape:window-width="1920"
+     inkscape:window-height="977"
+     inkscape:window-x="0"
+     inkscape:window-y="31"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6" />
+  <path
+     d="M 510.19357,111.42449 A 72.626734,72.626734 0 0 0 437.56684,38.797749 H 419.41015 V 21.151722 c 0,-9.770565 -7.51232,-18.1566835 -17.28289,-18.6446444 A 18.156684,18.156684 0 0 0 383.09678,20.641065 V 38.797749 H 128.90321 V 21.151722 c 0,-9.770565 -7.51232,-18.1566835 -17.28288,-18.6446444 A 18.156684,18.156684 0 0 0 92.589848,20.641065 V 38.797749 H 74.433164 A 72.626734,72.626734 0 0 0 1.80643,111.42449 v 13.6175 a 4.5391709,4.5391709 0 0 0 4.5391709,4.53917 H 505.6544 a 4.5391709,4.5391709 0 0 0 4.53917,-4.53917 z"
+     id="path2"
+     style="stroke-width:1.13479;fill:#ffffff;fill-opacity:1" />
+  <path
+     d="m 1.80643,438.24479 a 72.626734,72.626734 0 0 0 72.626734,72.62673 H 437.56684 a 72.626734,72.626734 0 0 0 72.62673,-72.62673 V 169.29891 a 3.4043782,3.4043782 0 0 0 -3.40438,-3.40438 H 5.2108081 A 3.4043782,3.4043782 0 0 0 1.80643,169.29891 Z M 392.17512,202.2079 a 27.235025,27.235025 0 1 1 -27.23502,27.23502 27.235025,27.235025 0 0 1 27.23502,-27.23502 z m 0,90.78341 a 27.235025,27.235025 0 1 1 -27.23502,27.23503 27.235025,27.235025 0 0 1 27.23502,-27.23503 z M 301.39171,202.2079 a 27.235025,27.235025 0 1 1 -27.23502,27.23502 27.235025,27.235025 0 0 1 27.23502,-27.23502 z m 0,90.78341 a 27.235025,27.235025 0 1 1 -27.23502,27.23503 27.235025,27.235025 0 0 1 27.23502,-27.23503 z m 0,90.78342 a 27.235025,27.235025 0 1 1 -27.23502,27.23503 27.235025,27.235025 0 0 1 27.23502,-27.23503 z M 210.6083,292.99131 a 27.235025,27.235025 0 1 1 -27.23503,27.23503 27.235025,27.235025 0 0 1 27.23503,-27.23503 z m 0,90.78342 a 27.235025,27.235025 0 1 1 -27.23503,27.23503 27.235025,27.235025 0 0 1 27.23503,-27.23503 z m -90.78342,-90.78342 a 27.235025,27.235025 0 1 1 -27.235032,27.23503 27.235025,27.235025 0 0 1 27.235032,-27.23503 z m 0,90.78342 a 27.235025,27.235025 0 1 1 -27.235032,27.23503 27.235025,27.235025 0 0 1 27.235032,-27.23503 z"
+     id="path4"
+     style="stroke-width:1.13479;fill:#ffffff;fill-opacity:1" />
+</svg>
diff --git a/www/public/assets/icons/cloud-download.svg b/www/public/assets/icons/cloud-download.svg
new file mode 100644
index 000000000..f3e627837
--- /dev/null
+++ b/www/public/assets/icons/cloud-download.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg2"
+   sodipodi:docname="cloud-download.svg"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="namedview2"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="1.5683594"
+     inkscape:cx="255.6812"
+     inkscape:cy="256"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M472.7,189.5c-13.26-8.43-29.83-14.56-48.08-17.93A16,16,0,0,1,412,159.28c-7.86-34.51-24.6-64.13-49.15-86.58C334.15,46.45,296.21,32,256,32c-35.35,0-68,11.08-94.37,32a150.13,150.13,0,0,0-41.95,52.83A16.05,16.05,0,0,1,108,125.8c-27.13,4.9-50.53,14.68-68.41,28.7C13.7,174.83,0,203.56,0,237.6,0,305,55.93,352,136,352H240V224.45c0-8.61,6.62-16,15.23-16.43A16,16,0,0,1,272,224V352H396c72.64,0,116-34.24,116-91.6C512,230.35,498.41,205.83,472.7,189.5Z"
+     id="path1"
+     style="fill:#ffffff;fill-opacity:1" />
+  <path
+     d="M240,425.42l-36.7-36.64a16,16,0,0,0-22.6,22.65l64,63.89a16,16,0,0,0,22.6,0l64-63.89a16,16,0,0,0-22.6-22.65L272,425.42V352H240Z"
+     id="path2"
+     style="fill:#ffffff;fill-opacity:1" />
+</svg>
diff --git a/www/public/assets/icons/deb.svg b/www/public/assets/icons/deb.svg
deleted file mode 100644
index d4a816fed..000000000
--- a/www/public/assets/icons/deb.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   width="256"
-   height="256"
-   viewBox="0 0 256 256"
-   xml:space="preserve"
-   id="svg12"
-   sodipodi:docname="deb.svg"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
-   id="namedview14"
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1.0"
-   inkscape:pageshadow="2"
-   inkscape:pageopacity="0.0"
-   inkscape:pagecheckerboard="0"
-   showgrid="false"
-   inkscape:zoom="2.0080728"
-   inkscape:cx="127.98341"
-   inkscape:cy="123.75049"
-   inkscape:window-width="1920"
-   inkscape:window-height="977"
-   inkscape:window-x="0"
-   inkscape:window-y="31"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="g10" />
-
-<defs
-   id="defs2">
-</defs>
-<g
-   style="stroke: none; stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: none; fill-rule: nonzero; opacity: 1;"
-   transform="translate(1.4065934065934016 1.4065934065934016) scale(2.81 2.81)"
-   id="g10">
-	
-	
-	
-<circle
-   style="fill:#f32f63;fill-opacity:1;stroke:none;stroke-width:3.39127;stroke-linecap:round;paint-order:stroke fill markers"
-   id="path870"
-   cx="45.051033"
-   cy="45.051033"
-   r="45.350861" /><text
-   xml:space="preserve"
-   style="font-style:normal;font-weight:normal;font-size:40.9103px;line-height:1.25;font-family:sans-serif;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-   x="1.7835963"
-   y="59.962917"
-   id="text3781"><tspan
-     sodipodi:role="line"
-     id="tspan3779"
-     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-     x="1.7835963"
-     y="59.962917" /></text><text
-   xml:space="preserve"
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.7965px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0"
-   x="2.9615719"
-   y="59.556938"
-   id="text24145"><tspan
-     sodipodi:role="line"
-     id="tspan24143"
-     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.7965px;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ffffff;fill-opacity:1;stroke-width:0"
-     x="2.9615719"
-     y="59.556938">DEB</tspan></text></g>
-</svg>
diff --git a/www/public/assets/icons/disk.svg b/www/public/assets/icons/disk.svg
new file mode 100644
index 000000000..65cd5a162
--- /dev/null
+++ b/www/public/assets/icons/disk.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="disk.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     id="namedview10"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="1.4199219"
+     inkscape:cx="256.35213"
+     inkscape:cy="256"
+     inkscape:window-width="1920"
+     inkscape:window-height="977"
+     inkscape:window-x="598"
+     inkscape:window-y="1111"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <path
+     d="m 117.25828,27.949415 c 36.63086,-16.52683 85.95395,-26.2486754 139.27247,-26.2486754 53.31852,0 102.39745,9.7219514 138.78737,26.2692684 34.91763,15.877731 64.48749,41.665934 64.48749,75.633532 v 0.0319 c -0.0117,5.87321 -3.28849,14.74406 -13.05099,25.70923 -9.54808,10.72314 -24.00766,21.92821 -42.74929,32.12485 -37.43866,20.36782 -89.84218,35.54497 -148.00533,35.54497 -58.16315,0 -110.56665,-15.17715 -148.00533,-35.54497 C 89.25262,151.27283 74.793569,140.06776 65.2457,129.34462 55.464729,118.35928 52.194393,109.47569 52.194393,103.60354 c 0,-34.42181 29.982245,-59.826284 65.063887,-75.654125 z"
+     id="path2"
+     style="fill:#ffffff;fill-opacity:1;stroke-width:1.06148" />
+  <path
+     d="m 420.2376,191.30683 c 10.17542,-5.53459 19.58232,-12.47779 28.02964,-20.06636 4.30327,-3.86595 11.53837,-0.94472 11.53837,4.84038 v 82.49987 c 0,5.87216 -3.27045,12.63276 -13.05099,23.61809 -9.54808,10.72316 -24.00766,21.92822 -42.74929,32.12487 C 366.56667,334.6915 314.16315,349.86865 256,349.86865 c -58.16315,0 -110.56665,-15.17715 -148.00533,-35.54497 C 89.252621,304.12703 74.793569,292.92197 65.245701,282.19881 55.46473,271.21348 52.194394,264.45288 52.194394,258.58072 v -82.49987 c 0,-5.7851 7.234886,-8.70633 11.538581,-4.84038 8.447,7.58751 17.854009,14.53177 28.02943,20.06636 C 134.23252,214.41222 192.22371,230.98205 256,230.98205 c 63.77629,0 121.76749,-16.56983 164.2376,-39.67522 z"
+     id="path4"
+     style="fill:#ffffff;fill-opacity:1;stroke-width:1.06148" />
+  <path
+     d="m 63.732975,324.09468 c -4.303695,-3.86595 -11.538581,-0.94473 -11.538581,4.84038 v 80.37689 c 0,34.20537 29.726214,59.6227 64.674306,75.50786 36.48228,16.58255 85.68859,26.39494 139.1313,26.39494 53.44272,0 102.64904,-9.81239 139.1313,-26.39494 34.94841,-15.88516 64.67431,-41.30249 64.67431,-75.50786 v -80.37689 c 0,-5.78511 -7.2351,-8.70633 -11.53837,-4.84038 -8.44732,7.58751 -17.85422,14.53175 -28.02964,20.06635 -42.47011,23.1054 -100.46131,39.67521 -164.2376,39.67521 -63.77629,0 -121.76748,-16.56981 -164.237595,-39.67521 -10.175421,-5.5346 -19.58243,-12.47884 -28.02943,-20.06635 z"
+     id="path6"
+     style="fill:#ffffff;fill-opacity:1;stroke-width:1.06148" />
+</svg>
diff --git a/www/public/assets/icons/key2.svg b/www/public/assets/icons/key2.svg
deleted file mode 100644
index b99ae7ae0..000000000
--- a/www/public/assets/icons/key2.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="512"
-   height="512"
-   viewBox="0 0 512 512"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="key2.svg"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     id="namedview6"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="1.4199219"
-     inkscape:cx="256.35213"
-     inkscape:cy="256"
-     inkscape:window-width="1920"
-     inkscape:window-height="977"
-     inkscape:window-x="598"
-     inkscape:window-y="1111"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="m 303.55405,169.64106 c -9.17613,9.17613 -18.06991,18.06991 -23.505,29.29301 -66.13867,5.29391 -240.837947,19.34044 -255.51974,19.05809 a 20.134311,20.134311 0 0 0 -15.317065,5.85861 c -5.9997766,5.99977 -8.1173473,15.45824 -8.25851007,21.81094 -0.2117688,9.52905 1.27053577,47.857 8.47025857,47.99818 21.4580255,0.28234 26.4695875,-0.35293 35.2927855,-0.28235 13.270089,0.14117 19.269857,-20.68156 27.034268,-23.78733 7.764421,-3.10577 11.293691,-1.69405 16.164097,1.48232 4.870407,3.17634 9.105551,13.19948 14.611216,18.84631 5.78801,5.9292 11.43485,6.63507 19.90513,6.9174 6.77621,0.28233 12.35248,-0.21176 17.1523,-4.8704 6.49386,-6.21152 5.71742,-23.78733 19.26984,-23.64617 13.55244,0.14117 12.35247,21.10507 20.4698,27.52836 8.11734,6.4233 27.03428,5.15276 32.25762,1.76464 5.22333,-3.38809 7.12914,-23.64616 14.82297,-28.51656 2.61167,-1.62347 11.85838,-2.25874 15.81116,0.28235 3.95278,2.54108 12.77599,22.51679 16.72879,25.05786 4.79981,3.10576 13.55243,3.52929 19.62276,4.941 6.21155,15.67 14.25832,27.52837 27.03429,40.30436 48.35112,48.3511 125.21878,49.83342 171.66409,3.3881 46.44531,-46.4453 44.80067,-123.15064 -3.55044,-171.50174 -48.35112,-48.35111 -123.71533,-48.37227 -170.16062,-1.92698 z M 448.30386,281.6815 a 31.943379,31.943379 0 1 1 0,-45.17473 31.943379,31.943379 0 0 1 0,45.17473 z"
-     id="path2"
-     style="fill:#ffb536;fill-opacity:1;stroke-width:0.99823" />
-</svg>
diff --git a/www/public/assets/icons/locked-red.svg b/www/public/assets/icons/locked-red.svg
new file mode 100644
index 000000000..8c66eb377
--- /dev/null
+++ b/www/public/assets/icons/locked-red.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="locked.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="1.4199219"
+     inkscape:cx="256"
+     inkscape:cy="256"
+     inkscape:window-width="1920"
+     inkscape:window-height="977"
+     inkscape:window-x="598"
+     inkscape:window-y="1111"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="m 374.60332,188.24922 h -16.94334 v -84.71665 a 101.66,101.66 0 1 0 -203.31998,0 v 84.71665 H 137.39667 A 67.847453,67.847453 0 0 0 69.62335,256.02255 V 442.3992 a 67.847453,67.847453 0 0 0 67.77332,67.77333 H 374.60332 A 67.847453,67.847453 0 0 0 442.37665,442.3992 V 256.02255 a 67.847453,67.847453 0 0 0 -67.77333,-67.77333 z m -50.82999,0 H 188.22667 v -84.71665 a 67.77333,67.77333 0 1 1 135.54666,0 z"
+     id="path2"
+     style="stroke-width:1.05897;fill:#f32f63;fill-opacity:1" />
+</svg>
diff --git a/www/public/assets/icons/locked.svg b/www/public/assets/icons/locked.svg
new file mode 100644
index 000000000..961c46d6e
--- /dev/null
+++ b/www/public/assets/icons/locked.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="locked.svg"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="1.4199219"
+     inkscape:cx="256.35213"
+     inkscape:cy="256"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <path
+     d="m 374.60332,188.24922 h -16.94334 v -84.71665 a 101.66,101.66 0 1 0 -203.31998,0 v 84.71665 H 137.39667 A 67.847453,67.847453 0 0 0 69.62335,256.02255 V 442.3992 a 67.847453,67.847453 0 0 0 67.77332,67.77333 H 374.60332 A 67.847453,67.847453 0 0 0 442.37665,442.3992 V 256.02255 a 67.847453,67.847453 0 0 0 -67.77333,-67.77333 z m -50.82999,0 H 188.22667 v -84.71665 a 67.77333,67.77333 0 1 1 135.54666,0 z"
+     id="path2"
+     style="stroke-width:1.05897;fill:#ffffff;fill-opacity:1" />
+</svg>
diff --git a/www/public/assets/icons/save.svg b/www/public/assets/icons/save.svg
new file mode 100644
index 000000000..07f7781f8
--- /dev/null
+++ b/www/public/assets/icons/save.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="save.svg"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="1.5683594"
+     inkscape:cx="255.6812"
+     inkscape:cy="256"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <path
+     d="M 495.26179,101.78309 411.49213,18.013427 v 0 A 54.194539,54.194539 0 0 0 372.91489,2.0324029 H 74.776727 A 72.744348,72.744348 0 0 0 2.0323786,74.776751 V 438.49849 A 72.744348,72.744348 0 0 0 74.776727,511.24284 H 438.49847 a 72.744348,72.744348 0 0 0 72.74435,-72.74435 V 140.36033 A 54.194539,54.194539 0 0 0 495.26179,101.78309 Z M 102.05586,92.962838 h 200.04695 a 9.0930435,9.0930435 0 0 1 9.09305,9.093042 v 54.55826 a 9.0930435,9.0930435 0 0 1 -9.09305,9.09305 H 102.05586 a 9.0930435,9.0930435 0 0 1 -9.093047,-9.09305 v -54.55826 a 9.0930435,9.0930435 0 0 1 9.093047,-9.093042 z m 158.8441,363.619442 a 90.930435,90.930435 0 1 1 86.56577,-86.56577 90.998633,90.998633 0 0 1 -86.56577,86.56577 z"
+     id="path1"
+     style="stroke-width:1.13663;fill:#ffffff;fill-opacity:1" />
+  <circle
+     cx="256.6376"
+     cy="365.75415"
+     r="54.558262"
+     id="circle1"
+     style="stroke-width:1.13663;fill:#ffffff;fill-opacity:1" />
+</svg>
diff --git a/www/public/assets/icons/server.svg b/www/public/assets/icons/server.svg
index dacbe0db8..128b042e5 100644
--- a/www/public/assets/icons/server.svg
+++ b/www/public/assets/icons/server.svg
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+
 <svg
-   width="512"
-   height="512"
-   viewBox="0 0 512 512"
+   width="800px"
+   height="800px"
+   viewBox="0 0 24 24"
+   fill="none"
    version="1.1"
-   id="svg8"
-   sodipodi:docname="server.svg"
+   id="svg6"
+   sodipodi:docname="server-minimalistic-svgrepo-com.svg"
    inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
   <defs
-     id="defs12" />
+     id="defs10" />
   <sodipodi:namedview
-     id="namedview10"
+     id="namedview8"
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
@@ -22,25 +25,27 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="1.4199219"
-     inkscape:cx="256.35213"
-     inkscape:cy="256"
+     inkscape:zoom="0.90875"
+     inkscape:cx="366.43741"
+     inkscape:cy="400"
      inkscape:window-width="1920"
      inkscape:window-height="977"
-     inkscape:window-x="598"
-     inkscape:window-y="1111"
+     inkscape:window-x="0"
+     inkscape:window-y="31"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg8" />
+     inkscape:current-layer="svg6" />
   <path
-     d="m 117.25828,27.949415 c 36.63086,-16.52683 85.95395,-26.2486754 139.27247,-26.2486754 53.31852,0 102.39745,9.7219514 138.78737,26.2692684 34.91763,15.877731 64.48749,41.665934 64.48749,75.633532 v 0.0319 c -0.0117,5.87321 -3.28849,14.74406 -13.05099,25.70923 -9.54808,10.72314 -24.00766,21.92821 -42.74929,32.12485 -37.43866,20.36782 -89.84218,35.54497 -148.00533,35.54497 -58.16315,0 -110.56665,-15.17715 -148.00533,-35.54497 C 89.25262,151.27283 74.793569,140.06776 65.2457,129.34462 55.464729,118.35928 52.194393,109.47569 52.194393,103.60354 c 0,-34.42181 29.982245,-59.826284 65.063887,-75.654125 z"
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="m 1.878153,16.453751 c 0.3239184,-0.02219 0.7377517,-0.02254 1.3314628,-0.02254 H 20.790368 c 0.593747,0 1.007592,3.58e-4 1.331487,0.02254 0.318287,0.02184 0.503676,0.06275 0.645163,0.121684 0.461565,0.192308 0.828288,0.561178 1.019403,1.025368 0.05858,0.142322 0.09925,0.328785 0.120969,0.648981 0.02207,0.325803 0.02242,0.742034 0.02242,1.339241 0,0.597206 -3.58e-4,1.013557 -0.02242,1.339361 -0.02172,0.320196 -0.0624,0.50654 -0.120969,0.648981 -0.191115,0.464189 -0.557838,0.833059 -1.019403,1.025367 -0.141487,0.05893 -0.326876,0.09985 -0.645163,0.121685 -0.323895,0.02219 -0.73774,0.02255 -1.331487,0.02255 H 3.2096158 c -0.5937111,0 -1.0075444,-3.58e-4 -1.3314628,-0.02255 C 1.5598656,22.702587 1.3745121,22.661668 1.2330007,22.602734 0.77144811,22.410426 0.40474949,22.041556 0.21357422,21.577367 0.15495112,21.434926 0.11434204,21.248582 0.09262977,20.928386 0.07052383,20.602582 0.07018979,20.186231 0.07018979,19.589025 c 0,-0.597207 3.3404e-4,-1.013438 0.02243998,-1.339241 0.0217123,-0.320196 0.0623214,-0.506659 0.12094445,-0.648981 0.19117527,-0.46419 0.55787389,-0.83306 1.01942648,-1.025368 0.1415114,-0.05893 0.3268649,-0.09985 0.6451523,-0.121684 z m 1.3314628,4.398523 c 0.6935397,0 1.2557679,-0.565594 1.2557679,-1.263249 0,-0.697536 -0.5622282,-1.263129 -1.2557679,-1.263129 -0.6935397,0 -1.255768,0.565593 -1.255768,1.263129 0,0.697655 0.5622283,1.263249 1.255768,1.263249 z"
+     fill="#1c274c"
      id="path2"
-     style="fill:#ffffff;fill-opacity:1;stroke-width:1.06148" />
+     style="stroke-width:1.19298;fill:#ffffff;fill-opacity:1" />
   <path
-     d="m 420.2376,191.30683 c 10.17542,-5.53459 19.58232,-12.47779 28.02964,-20.06636 4.30327,-3.86595 11.53837,-0.94472 11.53837,4.84038 v 82.49987 c 0,5.87216 -3.27045,12.63276 -13.05099,23.61809 -9.54808,10.72316 -24.00766,21.92822 -42.74929,32.12487 C 366.56667,334.6915 314.16315,349.86865 256,349.86865 c -58.16315,0 -110.56665,-15.17715 -148.00533,-35.54497 C 89.252621,304.12703 74.793569,292.92197 65.245701,282.19881 55.46473,271.21348 52.194394,264.45288 52.194394,258.58072 v -82.49987 c 0,-5.7851 7.234886,-8.70633 11.538581,-4.84038 8.447,7.58751 17.854009,14.53177 28.02943,20.06636 C 134.23252,214.41222 192.22371,230.98205 256,230.98205 c 63.77629,0 121.76749,-16.56983 164.2376,-39.67522 z"
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="m 3.2096108,7.5890877 c -0.5937111,0 -1.0075444,-3.459e-4 -1.3314628,-0.022571 C 1.5598606,7.544673 1.3745071,7.5038253 1.2329957,7.4448562 0.77144311,7.2525477 0.40474449,6.8837016 0.21356922,6.4194291 0.15494612,6.2770826 0.11433704,6.0906435 0.09262477,5.7704831 0.07051883,5.444656 0.07018479,5.0283889 0.07018479,4.4311944 c 0,-0.5971946 3.3404e-4,-1.0134735 0.02243998,-1.3393006 C 0.11433704,2.7717453 0.15494612,2.5853062 0.21356922,2.4429477 0.40474449,1.9786871 0.77144311,1.6098292 1.2329957,1.4175325 1.3745071,1.3585634 1.5598606,1.3177157 1.878148,1.2958723 2.2020664,1.2736469 2.6158997,1.273301 3.2096108,1.273301 H 20.790363 c 0.593747,0 1.007592,3.459e-4 1.331487,0.022571 0.318287,0.021843 0.503676,0.062691 0.645163,0.1216602 0.461565,0.1922967 0.828288,0.5611546 1.019403,1.0254152 0.05858,0.1423585 0.09925,0.3287976 0.120969,0.6489461 0.02207,0.3258271 0.02243,0.742106 0.02243,1.3393006 0,0.5971945 -3.59e-4,1.0134616 -0.02243,1.3392887 -0.02172,0.3201604 -0.0624,0.5065995 -0.120969,0.648946 -0.191115,0.4642725 -0.557837,0.8331186 -1.019402,1.0254271 -0.141488,0.058969 -0.326877,0.099816 -0.645164,0.1216603 -0.323895,0.022225 -0.73774,0.022571 -1.331487,0.022571 z m 0,1.2631526 c -0.5937111,0 -1.0075444,3.459e-4 -1.3314628,0.022571 C 1.5598606,8.896655 1.3745071,8.9375026 1.2329957,8.9964717 0.77144311,9.1887684 0.40474449,9.5576263 0.21356922,10.021911 c -0.0586231,0.142322 -0.0992322,0.328786 -0.12094445,0.648982 -0.02210594,0.325803 -0.02243998,0.742034 -0.02243998,1.339241 0,0.597206 3.3404e-4,1.013437 0.02243998,1.339241 0.0217123,0.320196 0.0623214,0.506658 0.12094445,0.648982 0.19117527,0.464308 0.55787389,0.833178 1.01942648,1.025486 0.1415114,0.05893 0.3268649,0.09973 0.6451523,0.121565 0.3239184,0.0223 0.7377517,0.02266 1.3314628,0.02266 H 20.790363 c 0.593747,0 1.007592,-3.58e-4 1.331487,-0.02266 0.318287,-0.02183 0.503676,-0.06264 0.645163,-0.121565 0.461565,-0.192308 0.828288,-0.561178 1.019403,-1.025486 0.05858,-0.142324 0.09925,-0.328786 0.120969,-0.648982 0.02207,-0.325804 0.02243,-0.742035 0.02243,-1.339241 0,-0.597207 -3.59e-4,-1.013438 -0.02243,-1.339241 -0.02171,-0.320196 -0.06239,-0.50666 -0.120969,-0.648982 C 23.595301,9.5576263 23.228578,9.1887684 22.767013,8.9964717 22.625526,8.9375026 22.440137,8.896655 22.12185,8.8748114 21.797955,8.8525862 21.38411,8.8522403 20.790363,8.8522403 Z m 1.2557679,3.1578937 c 0,0.697655 -0.5622282,1.263129 -1.2557679,1.263129 -0.6935397,0 -1.255768,-0.565474 -1.255768,-1.263129 0,-0.697656 0.5622283,-1.263129 1.255768,-1.263129 0.6935397,0 1.2557679,0.565473 1.2557679,1.263129 z M 3.2096108,5.6943469 c 0.6935397,0 1.2557679,-0.5655328 1.2557679,-1.2631525 0,-0.6976198 -0.5622282,-1.2631526 -1.2557679,-1.2631526 -0.6935397,0 -1.255768,0.5655328 -1.255768,1.2631526 0,0.6976197 0.5622283,1.2631525 1.255768,1.2631525 z"
+     fill="#1c274c"
      id="path4"
-     style="fill:#ffffff;fill-opacity:1;stroke-width:1.06148" />
-  <path
-     d="m 63.732975,324.09468 c -4.303695,-3.86595 -11.538581,-0.94473 -11.538581,4.84038 v 80.37689 c 0,34.20537 29.726214,59.6227 64.674306,75.50786 36.48228,16.58255 85.68859,26.39494 139.1313,26.39494 53.44272,0 102.64904,-9.81239 139.1313,-26.39494 34.94841,-15.88516 64.67431,-41.30249 64.67431,-75.50786 v -80.37689 c 0,-5.78511 -7.2351,-8.70633 -11.53837,-4.84038 -8.44732,7.58751 -17.85422,14.53175 -28.02964,20.06635 -42.47011,23.1054 -100.46131,39.67521 -164.2376,39.67521 -63.77629,0 -121.76748,-16.56981 -164.237595,-39.67521 -10.175421,-5.5346 -19.58243,-12.47884 -28.02943,-20.06635 z"
-     id="path6"
-     style="fill:#ffffff;fill-opacity:1;stroke-width:1.06148" />
+     style="stroke-width:1.19298;fill:#ffffff;fill-opacity:1" />
 </svg>
diff --git a/www/public/assets/icons/shield-warning.svg b/www/public/assets/icons/shield-warning.svg
new file mode 100644
index 000000000..2fdd49f3e
--- /dev/null
+++ b/www/public/assets/icons/shield-warning.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="shield-warning.svg"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="0.5"
+     inkscape:cx="-668"
+     inkscape:cy="431"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <path
+     d="M 509.54949,91.583811 A 18.186182,18.186182 0 0 0 494.60271,74.818424 C 396.81788,57.291491 355.67164,43.583657 267.36636,3.8468475 c -8.82029,-3.28487908 -14.28752,-3.22804738 -22.73273,0 C 156.32836,43.629121 115.18212,57.268758 17.397285,74.818424 A 18.186182,18.186182 0 0 0 2.4505164,91.583811 C -1.9255338,161.0323 7.3835184,225.70691 30.138979,283.84586 a 396.52698,396.52698 0 0 0 81.189941,127.7693 c 50.77354,53.91066 107.07115,85.38412 136.10084,97.29607 a 22.732728,22.732728 0 0 0 17.17457,0 c 30.68919,-12.41206 84.89539,-42.98758 136.06675,-97.3188 A 396.52698,396.52698 0 0 0 481.86102,283.84586 C 504.61648,225.71828 513.92553,161.0323 509.54949,91.583811 Z"
+     id="path1"
+     style="stroke-width:1.13663;fill:#ffffff;fill-opacity:1" />
+  <g
+     style="fill:none;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none"
+     transform="matrix(2.81,0,0,2.81,259.08275,259.0719)"
+     id="g2-5">
+	<path
+   d="M 45,90 C 20.187,90 0,69.813 0,45 0,20.187 20.187,0 45,0 69.813,0 90,20.187 90,45 90,69.813 69.813,90 45,90 Z"
+   style="opacity:1;fill:#ffb536;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none"
+   stroke-linecap="round"
+   id="path1-3" />
+
+	<path
+   d="m 45,57.469 v 0 c -1.821,0 -3.319,-1.434 -3.399,-3.252 L 38.465,23.95 C 38.18,20.148 41.187,16.906 45,16.906 v 0 c 3.813,0 6.82,3.242 6.535,7.044 L 48.398,54.217 C 48.319,56.036 46.821,57.469 45,57.469 Z"
+   style="opacity:1;fill:#ffffff;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none"
+   stroke-linecap="round"
+   id="path2" />
+
+	<circle
+   cx="45"
+   cy="67.669998"
+   r="5.4200001"
+   style="opacity:1;fill:#ffffff;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none"
+   id="circle2" />
+
+</g>
+</svg>
diff --git a/www/public/assets/icons/shield.svg b/www/public/assets/icons/shield.svg
new file mode 100644
index 000000000..30ec19dd0
--- /dev/null
+++ b/www/public/assets/icons/shield.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="shield.svg"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="0.5"
+     inkscape:cx="103"
+     inkscape:cy="119"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <path
+     d="M 509.54949,91.583811 A 18.186182,18.186182 0 0 0 494.60271,74.818424 C 396.81788,57.291491 355.67164,43.583657 267.36636,3.8468475 c -8.82029,-3.28487908 -14.28752,-3.22804738 -22.73273,0 C 156.32836,43.629121 115.18212,57.268758 17.397285,74.818424 A 18.186182,18.186182 0 0 0 2.4505164,91.583811 C -1.9255338,161.0323 7.3835184,225.70691 30.138979,283.84586 a 396.52698,396.52698 0 0 0 81.189941,127.7693 c 50.77354,53.91066 107.07115,85.38412 136.10084,97.29607 a 22.732728,22.732728 0 0 0 17.17457,0 c 30.68919,-12.41206 84.89539,-42.98758 136.06675,-97.3188 A 396.52698,396.52698 0 0 0 481.86102,283.84586 C 504.61648,225.71828 513.92553,161.0323 509.54949,91.583811 Z"
+     id="path1"
+     style="stroke-width:1.13663;fill:#ffffff;fill-opacity:1" />
+  <g
+     style="fill:none;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none"
+     transform="matrix(2.81,0,0,2.81,259.09519,259.09088)"
+     id="g2"
+     inkscape:transform-center-x="-93.728518"
+     inkscape:transform-center-y="-5.1008717">
+	<circle
+   cx="45"
+   cy="45"
+   r="45"
+   style="opacity:1;fill:#15bf7f;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none"
+   id="circle1" />
+
+	<path
+   d="m 38.478,64.5 c -0.01,0 -0.02,0 -0.029,0 -1.3,-0.009 -2.533,-0.579 -3.381,-1.563 L 21.59,47.284 c -1.622,-1.883 -1.41,-4.725 0.474,-6.347 1.884,-1.621 4.725,-1.409 6.347,0.474 L 38.523,53.155 61.629,27.02 c 1.645,-1.862 4.489,-2.037 6.352,-0.391 1.862,1.646 2.037,4.49 0.391,6.352 l -26.521,30 C 40.995,63.947 39.767,64.5 38.478,64.5 Z"
+   style="opacity:1;fill:#ffffff;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none"
+   stroke-linecap="round"
+   id="path1-5" />
+
+</g>
+</svg>
diff --git a/www/public/assets/icons/tag.svg b/www/public/assets/icons/tag.svg
new file mode 100644
index 000000000..df590be23
--- /dev/null
+++ b/www/public/assets/icons/tag.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="tag.svg"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="1.5683594"
+     inkscape:cx="255.6812"
+     inkscape:cy="256"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <path
+     d="M 496.46622,17.035872 A 50.523077,50.523077 0 0 0 460.42376,2.0323937 H 320.69819 A 34.814889,34.814889 0 0 0 296.23797,12.137009 L 16.911851,291.4063 a 50.943629,50.943629 0 0 0 0,71.97124 L 149.89722,496.36291 a 50.954996,50.954996 0 0 0 71.99397,0 L 501.10365,217.20728 a 34.780791,34.780791 0 0 0 10.13871,-24.44885 V 52.95329 A 50.284385,50.284385 0 0 0 496.46622,17.035872 Z M 402.12616,147.52066 a 36.372069,36.372069 0 1 1 36.37207,-36.37206 36.372069,36.372069 0 0 1 -36.37207,36.37206 z"
+     id="path1"
+     style="stroke-width:1.137;stroke-dasharray:none;fill:#ffffff;fill-opacity:1" />
+</svg>
diff --git a/www/public/assets/icons/trash.svg b/www/public/assets/icons/trash.svg
new file mode 100644
index 000000000..b9434a636
--- /dev/null
+++ b/www/public/assets/icons/trash.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg2"
+   sodipodi:docname="trash.svg"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="namedview2"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="0.78417969"
+     inkscape:cx="269.07098"
+     inkscape:cy="161.31507"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M 487.55947,73.697252 H 361.25429 V 46.351842 A 52.627152,45.575686 0 0 0 308.62715,0.776154 H 203.37284 a 52.627152,45.575686 0 0 0 -52.62715,45.575688 v 27.34541 H 24.440527 a 21.050868,18.230279 0 0 0 0,36.460558 h 22.36654 l 24.997896,347.42346 c 1.868265,30.59267 28.944937,53.64258 63.152577,53.64258 h 242.08492 c 34.37868,0 60.91592,-22.53716 63.15257,-53.55141 l 24.9979,-347.51463 h 22.36654 a 21.050868,18.230279 0 0 0 0,-36.460558 z M 172.54649,438.30275 h -0.74993 A 21.050861,18.230274 0 0 1 150.74569,420.72193 L 140.22026,165.4981 a 21.064215,18.24184 0 1 1 42.10171,-1.29893 l 10.52545,255.22386 a 21.050861,18.230274 0 0 1 -20.30093,18.87972 z m 104.50437,-18.23027 a 21.050865,18.230279 0 0 1 -42.10172,0 V 164.84864 a 21.050865,18.230279 0 0 1 42.10172,0 z M 319.15258,73.697252 H 192.84742 v -27.34541 a 10.407019,9.012592 0 0 1 10.52542,-9.115138 h 105.25431 a 10.407019,9.012592 0 0 1 10.52543,9.115138 z m 42.10171,347.024678 a 21.050861,18.230274 0 0 1 -21.05085,17.58082 h -0.76308 a 21.050861,18.230274 0 0 1 -20.28778,-18.87972 l 10.52543,-255.22386 a 21.064215,18.24184 0 1 1 42.10171,1.29893 z"
+     id="path2"
+     style="stroke-width:1.22437;fill:#ffffff;fill-opacity:1" />
+</svg>
diff --git a/www/public/assets/icons/unlocked.svg b/www/public/assets/icons/unlocked.svg
new file mode 100644
index 000000000..512e65f19
--- /dev/null
+++ b/www/public/assets/icons/unlocked.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="lock-open.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="1.4199219"
+     inkscape:cx="256"
+     inkscape:cy="256"
+     inkscape:window-width="1920"
+     inkscape:window-height="977"
+     inkscape:window-x="0"
+     inkscape:window-y="31"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M 374.60504,188.24164 H 188.22569 v -84.71789 a 67.77431,67.77431 0 1 1 135.54862,0 16.943579,16.943579 0 0 0 33.88715,0 101.66146,101.66146 0 1 0 -203.32291,0 v 84.71789 h -16.94358 a 67.848436,67.848436 0 0 0 -67.774317,67.7743 v 186.37935 a 67.848436,67.848436 0 0 0 67.774317,67.77431 h 237.21007 a 67.848436,67.848436 0 0 0 67.77431,-67.77431 V 256.01594 a 67.848436,67.848436 0 0 0 -67.77431,-67.7743 z"
+     id="path2"
+     style="stroke-width:1.05897;fill:#ffffff;fill-opacity:1" />
+</svg>
diff --git a/www/public/assets/icons/upload.svg b/www/public/assets/icons/upload.svg
new file mode 100644
index 000000000..f4238b3ef
--- /dev/null
+++ b/www/public/assets/icons/upload.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg2"
+   sodipodi:docname="cloud-upload.svg"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="namedview2"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="1.6308594"
+     inkscape:cx="255.69341"
+     inkscape:cy="256"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M473.66,210c-14-10.38-31.2-18-49.36-22.11a16.11,16.11,0,0,1-12.19-12.22c-7.8-34.75-24.59-64.55-49.27-87.13C334.15,62.25,296.21,47.79,256,47.79c-35.35,0-68,11.08-94.37,32.05a150.07,150.07,0,0,0-42.06,53,16,16,0,0,1-11.31,8.87c-26.75,5.4-50.9,16.87-69.34,33.12C13.46,197.33,0,227.24,0,261.39c0,34.52,14.49,66,40.79,88.76,25.12,21.69,58.94,33.64,95.21,33.64H240V230.42l-36.69,36.69a16,16,0,0,1-23.16-.56c-5.8-6.37-5.24-16.3.85-22.39l63.69-63.68a16,16,0,0,1,22.62,0L331,244.14c6.28,6.29,6.64,16.6.39,22.91a16,16,0,0,1-22.68.06L272,230.42V383.79H396c31.34,0,59.91-8.8,80.45-24.77,23.26-18.1,35.55-44,35.55-74.83C512,254.25,498.74,228.58,473.66,210Z"
+     id="path1"
+     style="fill:#ffffff;fill-opacity:1" />
+  <path
+     d="M240,448.21a16,16,0,1,0,32,0V383.79H240Z"
+     id="path2"
+     style="fill:#ffffff;fill-opacity:1" />
+</svg>
diff --git a/www/public/resources/js/app/checkbox.config.js b/www/public/resources/js/app/checkbox.config.js
index 6870dc631..0e07aba46 100644
--- a/www/public/resources/js/app/checkbox.config.js
+++ b/www/public/resources/js/app/checkbox.config.js
@@ -193,7 +193,6 @@ const checkboxesCallback = {
             'buttons': [
             {
                 'text': 'Edit',
-                'color': 'blue-alt',
                 'callback': function () {
                     mypanel.get('tasks/edit', {
                         tasks: id
@@ -202,7 +201,6 @@ const checkboxesCallback = {
             },
             {
                 'text': 'Enable',
-                'color': 'blue-alt',
                 'callback': function () {
                     ajaxRequest(
                         // Controller:
@@ -218,13 +216,12 @@ const checkboxesCallback = {
                         // Print error alert:
                         true
                     ).then(function () {
-                        mycontainer.reload('tasks/list');
+                        mycontainer.reload('tasks/tasks');
                     });
                 }
             },
             {
                 'text': 'Disable',
-                'color': 'blue-alt',
                 'callback': function () {
                     ajaxRequest(
                         // Controller:
@@ -240,7 +237,7 @@ const checkboxesCallback = {
                         // Print error alert:
                         true
                     ).then(function () {
-                        mycontainer.reload('tasks/list');
+                        mycontainer.reload('tasks/tasks');
                     });
                 }
             },
@@ -262,7 +259,7 @@ const checkboxesCallback = {
                         // Print error alert:
                         true
                     ).then(function () {
-                        mycontainer.reload('tasks/list');
+                        mycontainer.reload('tasks/tasks');
                     });
                 }
             }]
@@ -295,7 +292,7 @@ const checkboxesCallback = {
                         // Print error alert:
                         true
                     ).then(function () {
-                        mycontainer.reload('tasks/list');
+                        mycontainer.reload('tasks/tasks');
                     });
                 }
             }]
diff --git a/www/public/resources/js/app/container.config.js b/www/public/resources/js/app/container.config.js
index ed5e1412a..5fdec9a12 100644
--- a/www/public/resources/js/app/container.config.js
+++ b/www/public/resources/js/app/container.config.js
@@ -6,6 +6,32 @@ const containersUsingMorphdom = [
     // 'repos/properties',
 ];
 
+/**
+ *  Containers supporting a partial reload.
+ *  When the user is actively interacting with such a container (focused element, checked
+ *  checkbox, non-empty text input), the whole container is not replaced. Instead, only the
+ *  items that are not busy themselves are refreshed, so the user selections and inputs are kept
+ *  while the rest of the container stays up to date.
+ *
+ *  item: selector of the repeated item inside the container
+ *  key:  attribute uniquely identifying an item, used to match current and new items
+ *  @type {Object}
+ */
+const containersPartialReload = {
+    'repos/list': { item: '.repo-item-wrapper', key: 'repo-id' },
+};
+
+/**
+ *  Functions executed after a container has been reloaded
+ *  @type {Object}
+ */
+const postReloadFunctions = {
+    // Re-apply the current search filter on the repositories that have just been refreshed
+    'repos/list': function () {
+        myrepo.search();
+    },
+};
+
 /**
  *  Default morphdom skip rules, apply to all containers
  *  @type {Array}
diff --git a/www/public/resources/js/classes/Checkbox.js b/www/public/resources/js/classes/Checkbox.js
index e093eefd2..8adbcd1c8 100644
--- a/www/public/resources/js/classes/Checkbox.js
+++ b/www/public/resources/js/classes/Checkbox.js
@@ -18,12 +18,6 @@ class Checkbox
 
         // If the 'Select all' checkbox is checked, check the child checkbox and make it visible, else uncheck the child checkbox and remove any custom visibility so it returns to default
         checkboxes.each(function () {
-            // If the checkbox is the latest one, directly simulate a click on it to trigger any event attached to it
-            if (--count === 0) {
-                $(this).trigger('click');
-                return;
-            }
-
             if (status) {
                 $(this).prop('checked', true);
                 $(this).css('opacity', '1');
@@ -31,7 +25,15 @@ class Checkbox
                 $(this).prop('checked', false);
                 $(this).css('opacity', '');
             }
+
+            // Trigger change event so visual state (e.g. task-selected) is updated
+            $(this).trigger('change');
         });
+
+        // Trigger select on the last checkbox to update the confirmbox, without toggling its state
+        if (checkboxes.length) {
+            this.select(checkboxes.last());
+        }
     }
 
     /**
diff --git a/www/public/resources/js/classes/ConfirmBox.js b/www/public/resources/js/classes/ConfirmBox.js
index e7c33e787..158d4d980 100644
--- a/www/public/resources/js/classes/ConfirmBox.js
+++ b/www/public/resources/js/classes/ConfirmBox.js
@@ -17,7 +17,7 @@ class ConfirmBox
 
         // If there is a title
         if (data.title != "") {
-            innerHtml += '<div class="flex justify-space-between">';
+            innerHtml += '<div class="flex align-item-center justify-space-between">';
             innerHtml += '<h6 class="margin-top-0 margin-bottom-0 wordbreakall">' + data.title.toUpperCase() + '</h6>';
             innerHtml += '<img src="/assets/icons/close.svg" class="icon-large lowopacity confirm-box-cancel-btn" title="Close" />';
             innerHtml += '</div>';
@@ -38,7 +38,7 @@ class ConfirmBox
         if (!empty(data.buttons)) {
             var id = 0;
             for (const [key, value] of Object.entries(data.buttons)) {
-                innerHtml += '<div class="confirm-box-btn btn-auto-' + value.color + '" confirm-btn-id="' + id + '" pointer">' + value.text + '</div>';
+                innerHtml += '<div class="confirm-box-btn btn-auto-' + (value.color || 'tr') + '" confirm-btn-id="' + id + '" pointer">' + value.text + '</div>';
                 id++;
             }
         }
diff --git a/www/public/resources/js/classes/Container.js b/www/public/resources/js/classes/Container.js
index 374676bc1..1d27f8bfc 100644
--- a/www/public/resources/js/classes/Container.js
+++ b/www/public/resources/js/classes/Container.js
@@ -7,6 +7,8 @@ class Container {
     reload(container, identifier = null)
     {
         var useMorphdom = false;
+        var partialConfig = (typeof containersPartialReload !== 'undefined') ? containersPartialReload[container] : null;
+        var partial = false;
 
         return new Promise((resolve, reject) => {
             try {
@@ -15,14 +17,25 @@ class Container {
                     return;
                 }
 
+                /**
+                 *  If the user is actively interacting with the container, only the items that
+                 *  are not busy will be refreshed, to avoid losing selections and inputs
+                 */
+                if (partialConfig && this._isBusy($('.reloadable-container[container="' + container + '"]'))) {
+                    partial = true;
+                }
+
                 // Print a loading icon on the bottom of the page
                 mylayout.printLoading();
 
                 /**
                  *  Check if container has children with class .veil-on-reload
                  *  If so print a veil on them
+                 *  The veil is not printed on a partial reload, as the user is working on the container
                  */
-                mylayout.printLoadingVeilByParentClass('reloadable-container[container="' + container + '"]');
+                if (!partial) {
+                    mylayout.printLoadingVeilByParentClass('reloadable-container[container="' + container + '"]');
+                }
 
                 ajaxRequest(
                     // Controller:
@@ -45,8 +58,12 @@ class Container {
                         useMorphdom = true;
                     }
 
+                    // If only the non-busy items must be refreshed
+                    if (partial) {
+                        this._partialReplace(container, partialConfig, jsonValue.message);
+
                     // If morphdom must be used
-                    if (useMorphdom) {
+                    } else if (useMorphdom) {
                         // Replace with new content using morphdom
                         morphdom($('.reloadable-container[container="' + container + '"]')[0], jsonValue.message, {
                             // Avoid some elements to be updated
@@ -172,4 +189,65 @@ class Container {
         
         return false;
     }
+
+    /**
+     * Replace only the items of a container that are not busy, keeping the ones the user is working on
+     * @param {string} container
+     * @param {Object} config
+     * @param {string} html
+     */
+    _partialReplace(container, config, html) {
+        const current = $('.reloadable-container[container="' + container + '"]');
+        const received = $('<div>').html(html);
+
+        received.find(config.item).each((index, newItem) => {
+            const key = $(newItem).attr(config.key);
+
+            // Item cannot be matched without a key
+            if (!key) {
+                return;
+            }
+
+            // Find the matching item currently displayed
+            const existing = current.find(config.item).filter((i, el) => $(el).attr(config.key) === key);
+
+            // The item does not exist yet on the page, it will show up on the next complete reload
+            if (!existing.length) {
+                return;
+            }
+
+            // Leave the items the user is currently working on untouched
+            if (this._isBusy(existing)) {
+                return;
+            }
+
+            existing.replaceWith(newItem);
+        });
+    }
+
+    /**
+     * Check if the user is actively interacting with an element (focus, checked checkbox, filled input)
+     * @param {jQuery} element
+     * @returns {boolean}
+     */
+    _isBusy(element) {
+        // An element inside has the focus
+        if (element.find(':focus').length) {
+            return true;
+        }
+
+        // A checkbox inside is checked
+        if (element.find('input[type="checkbox"]:checked').length) {
+            return true;
+        }
+
+        // A text input or a textarea inside is filled
+        if (element.find('input[type="text"], input[type="search"], input:not([type]), textarea').filter(function () {
+            return $(this).val().trim() !== '';
+        }).length) {
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/www/public/resources/js/classes/Environment.js b/www/public/resources/js/classes/Environment.js
index ae2ba40ba..da6d75354 100644
--- a/www/public/resources/js/classes/Environment.js
+++ b/www/public/resources/js/classes/Environment.js
@@ -1,26 +1,82 @@
 class Environment
 {
     /**
-     * Upodate environment description
-     * @param {*} id
-     * @param {*} description
+     *  Add a new environment
      */
-    updateDescription(id, description)
+    add()
     {
         ajaxRequest(
             // Controller:
-            'repo/environment',
+            'environment',
             // Action:
-            'update-description',
+            'add',
             // Data:
             {
-                envId: id,
-                description: description
+                name: $('input[type="text"][name="add-env-name"]').val(),
+                color: $('input[type="color"][name="add-env-color"]').val()
             },
             // Print success alert:
             true,
             // Print error alert:
             true
-        );
+        ).then(function () {
+            mylayout.reloadContentById('envs-container');
+        });
+    }
+
+    /**
+     *  Edit environments
+     */
+    edit()
+    {
+        var envs = [];
+
+        $('div#current-envs').find('.env-line').each(function () {
+            envs.push({
+                name: $(this).find('input[type="text"][name="env-name"]').val(),
+                color: $(this).find('input[type="color"][name="env-color"]').val(),
+                protected: $(this).find('img.env-protection').attr('protected')
+            });
+        });
+
+        ajaxRequest(
+            // Controller:
+            'environment',
+            // Action:
+            'edit',
+            // Data:
+            {
+                envs: envs,
+            },
+            // Print success alert:
+            true,
+            // Print error alert:
+            true
+        ).then(function () {
+            mylayout.reloadContentById('envs-container');
+        });
+    }
+
+    /**
+     *  Delete an environment
+     */
+    delete(id)
+    {
+        ajaxRequest(
+            // Controller:
+            'environment',
+            // Action:
+            'delete',
+            // Data:
+            {
+                id: id,
+            },
+            // Print success alert:
+            true,
+            // Print error alert:
+            true
+        ).then(function () {
+            mylayout.reloadContentById('envs-container');
+        });
     }
 }
diff --git a/www/public/resources/js/classes/Host.js b/www/public/resources/js/classes/Host.js
index ff1702665..23eb4ecba 100644
--- a/www/public/resources/js/classes/Host.js
+++ b/www/public/resources/js/classes/Host.js
@@ -50,7 +50,6 @@ class Host
             buttons.push(
                 {
                     'text': 'Request general information',
-                    'color': 'blue-alt',
                     'callback': function () {
                         executeAction('request-general-infos', hosts);
                     }
@@ -62,7 +61,6 @@ class Host
             buttons.push(
                 {
                     'text': 'Request package information',
-                    'color': 'blue-alt',
                     'callback': function () {
                         executeAction('request-packages-infos', hosts);
                     }
@@ -74,7 +72,6 @@ class Host
             buttons.push(
                 {
                     'text': 'Update packages',
-                    'color': 'blue-alt',
                     'callback': function () {
                         mypanel.get('hosts/requests/update-packages', {
                             hostsId: hosts
@@ -88,7 +85,6 @@ class Host
         buttons.push(
             {
                 'text': 'Export to CSV',
-                'color': 'blue-alt',
                 'callback': function () {
                     myhost.export(hosts);
                 }
diff --git a/www/public/resources/js/classes/Host/HostSearch.js b/www/public/resources/js/classes/Host/HostSearch.js
index d0d78dc2c..9f00e252e 100644
--- a/www/public/resources/js/classes/Host/HostSearch.js
+++ b/www/public/resources/js/classes/Host/HostSearch.js
@@ -36,7 +36,9 @@ class HostSearch
 
             // Show all group containers (in case they were hidden during a previous search)
             $('.hosts-group-container').show();
-            $('.host-line').removeClass('flex').hide();
+
+            //  Hide all host lines, only those corresponding to the search will be re-displayed
+            $('.host-line').hide();
 
             /**
              * Parse filter parameters from search input.
@@ -243,7 +245,6 @@ class HostSearch
         $('#hosts-search').addClass('hide');
 
         $('.hosts-group-container, .host-line').show();
-        $('.host-line').addClass('flex');
         $('#hosts').show();
     }
 
diff --git a/www/public/resources/js/classes/Permission/Repo.js b/www/public/resources/js/classes/Permission/Repo.js
new file mode 100644
index 000000000..91d903420
--- /dev/null
+++ b/www/public/resources/js/classes/Permission/Repo.js
@@ -0,0 +1,27 @@
+/**
+ *  Check user permissions on repositories
+ *  Mirrors the backend Controllers\User\Permission\Repo class
+ */
+class RepoPermission {
+    /**
+     *  Check if the user is allowed to perform a specific action on repositories
+     *  Admins are allowed to do everything (no 'user_permissions' cookie means the user is an admin,
+     *  see Controllers\App\Permissions::load() which deletes the cookie for admins)
+     * @param {string} action
+     * @returns {boolean}
+     */
+    allowedAction(action)
+    {
+        if (!mycookie.exists('user_permissions')) {
+            return true;
+        }
+
+        const userPermissions = JSON.parse(mycookie.get('user_permissions'));
+
+        if (userPermissions.repositories && userPermissions.repositories['allowed-actions'] && userPermissions.repositories['allowed-actions'].includes(action)) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/www/public/resources/js/classes/Permission/Tasks.js b/www/public/resources/js/classes/Permission/Tasks.js
new file mode 100644
index 000000000..868d00c2f
--- /dev/null
+++ b/www/public/resources/js/classes/Permission/Tasks.js
@@ -0,0 +1,46 @@
+/**
+ *  Check user permissions on tasks
+ *  Mirrors the backend Controllers\User\Permission\Task class
+ */
+class TaskPermission {
+    /**
+     *  Check if the user has any permission on tasks
+     *  Admins are allowed to do everything (no 'user_permissions' cookie means the user is an admin,
+     *  see Controllers\App\Permissions::load() which deletes the cookie for admins)
+     * @returns {boolean}
+     */
+    allowed()
+    {
+        if (!mycookie.exists('user_permissions')) {
+            return true;
+        }
+
+        const userPermissions = JSON.parse(mycookie.get('user_permissions'));
+
+        if (userPermissions.tasks && userPermissions.tasks['allowed-actions'] && userPermissions.tasks['allowed-actions'].length > 0) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     *  Check if the user is allowed to perform a specific action on tasks
+     * @param {string} action
+     * @returns {boolean}
+     */
+    allowedAction(action)
+    {
+        if (!mycookie.exists('user_permissions')) {
+            return true;
+        }
+
+        const userPermissions = JSON.parse(mycookie.get('user_permissions'));
+
+        if (userPermissions.tasks && userPermissions.tasks['allowed-actions'] && userPermissions.tasks['allowed-actions'].includes(action)) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/www/public/resources/js/classes/Repo.js b/www/public/resources/js/classes/Repo.js
index 8e9163358..a97d867c3 100644
--- a/www/public/resources/js/classes/Repo.js
+++ b/www/public/resources/js/classes/Repo.js
@@ -6,7 +6,7 @@ class Repo {
     {
         // If input is empty, then show all repos and quit
         if (!$("#repo-search-input").val()) {
-            $('.repos-list-group, .repos-list-group-flex-div').show();
+            $('.repos-list-group, .repos-row, .repo-item-wrapper, .repo-item, .group-repo-name').show();
             return;
         }
 
@@ -14,79 +14,93 @@ class Repo {
 
         /**
          *  Retrieve search input value
-         *  Convert to uppercase to ignore case when searching
+         *  Split into individual terms for multi-word search
          */
-        const search = $("#repo-search-input").val().toUpperCase().trim();
-
-        // First, hide all repos groups
-        $('.repos-list-group, .repos-list-group-flex-div').hide();
-
-        // Then search in every repo group of there is a repo or dist or section matching the search
-        $('.repos-list-group').each(function () {
-            // Retrieve all repos lines
-            $('.item-repo').each(function () {
-                const name = $(this).attr('name');
-                const dist = $(this).attr('dist');
-                const section = $(this).attr('section');
-                const releasever = $(this).attr('releasever');
-
-                // If repo name contains the search then display 'repos-list-group-flex-div' and its parent 'repos-list-group'
-                if (name.toUpperCase().indexOf(search) > -1) {
-                    $(this).parents('.repos-list-group-flex-div').show();
-                    $(this).parents('.repos-list-group').show();
-                }
+        const terms = $("#repo-search-input").val().toUpperCase().trim().split(/\s+/);
+
+        // First, hide all groups and repo items (hide the wrapper too, otherwise
+        // it stays in the grid flow as an empty cell and shifts the visible cards)
+        $('.repos-list-group, .repos-row, .repo-item-wrapper, .repo-item, .group-repo-name').hide();
+
+        // Search through all repo items using their data attributes and visible text
+        $('.repo-item').each(function () {
+            const name = ($(this).attr('data-name') || '').toUpperCase();
+            const dist = ($(this).attr('data-dist') || '').toUpperCase();
+            const section = ($(this).attr('data-section') || '').toUpperCase();
+            const releasever = ($(this).attr('data-releasever') || '').toUpperCase();
+            const type = ($(this).attr('data-type') || '').toUpperCase();
+            const packageType = ($(this).attr('data-package-type') || '').toUpperCase();
+            const description = ($(this).attr('data-description') || '').toUpperCase();
+            const tags = ($(this).attr('data-tags') || '').toUpperCase();
+
+            // Individual tags of this repo, used for exact 'tag:' matching
+            const tagsList = tags.split(',').map(function (t) {
+                return t.trim();
+            }).filter(function (t) {
+                return t.length > 0;
+            });
 
-                // If repo dist contains the search then display 'repos-list-group-flex-div' and its parent 'repos-list-group'
-                if (dist.toUpperCase().indexOf(search) > -1) {
-                    $(this).parents('.repos-list-group-flex-div').show();
-                    $(this).parents('.repos-list-group').show();
-                }
+            // Also include the whole visible text of the repo card (header line with
+            // name/distribution/section, snapshot dates, environments, tags...) so the
+            // search keeps working even if a data attribute is missing
+            const visibleText = ($(this).text() || '').toUpperCase();
 
-                // If repo section contains the search then display 'repos-list-group-flex-div' and its parent 'repos-list-group'
-                if (section.toUpperCase().indexOf(search) > -1) {
-                    $(this).parents('.repos-list-group-flex-div').show();
-                    $(this).parents('.repos-list-group').show();
-                }
+            // All searchable content for this repo
+            const searchable = name + ' ' + dist + ' ' + section + ' ' + releasever + ' ' + type + ' ' + packageType + ' ' + description + ' ' + tags + ' ' + visibleText;
 
-                // If repo releasever contains the search then display 'repos-list-group-flex-div' and its parent 'repos-list-group'
-                if (releasever.toUpperCase().indexOf(search) > -1) {
-                    $(this).parents('.repos-list-group-flex-div').show();
-                    $(this).parents('.repos-list-group').show();
+            // Check that ALL terms match somewhere in the searchable content
+            // A 'TAG:xxx' term must match one of this repo's tags exactly, instead of
+            // matching anywhere in the searchable content (name, description, etc.)
+            const allMatch = terms.every(function (term) {
+                if (term.indexOf('TAG:') === 0) {
+                    return tagsList.indexOf(term.substring(4)) > -1;
                 }
-            });
 
-            // Retrieve all repos environments
-            $('.item-env').each(function () {
-                const env = $(this).text().trim();
-
-                // If env is not empty
-                if (env != "") {
-                    // If env name contains the search then display 'repos-list-group-flex-div' and its parent 'repos-list-group'
-                    if (env.toUpperCase().indexOf(search) > -1) {
-                        $(this).parents('.repos-list-group-flex-div').show();
-                        $(this).parents('.repos-list-group').show();
-                    }
-                }
+                return searchable.indexOf(term) > -1;
             });
 
-            // Retrieve all repos descriptions
-            $('input[type="text"].repo-description-input').each(function () {
-                const description = $(this).val().trim();
-
-                // If description is not empty
-                if (description != "") {
-                    // If description contains the search then display 'repos-list-group-flex-div' and its parent 'repos-list-group'
-                    if (description.toUpperCase().indexOf(search) > -1) {
-                        $(this).parents('.repos-list-group-flex-div').show();
-                        $(this).parents('.repos-list-group').show();
-                    }
-                }
-            });
+            if (allMatch) {
+                $(this).show();
+                $(this).closest('.repo-item-wrapper').show();
+                $(this).closest('.repos-row').show();
+                $(this).closest('.repos-row').prev('.group-repo-name').show();
+                // Reveal ALL ancestor groups (they can be nested), not just the closest one
+                $(this).parents('.repos-list-group').show();
+            }
         });
 
         mylayout.hideLoading();
     }
 
+    /**
+     *  Add a tag to the search input and filter repositories by it
+     * @param {string} tag
+     */
+    searchByTag(tag)
+    {
+        const input = $('#repo-search-input');
+
+        // Retrieve the terms already present in the search input
+        const current = input.val().trim();
+        const terms = current.length > 0 ? current.split(/\s+/) : [];
+
+        // Use a 'tag:' prefix so the search only matches this exact tag,
+        // instead of matching the tag name anywhere (e.g. in a repo name)
+        const searchTerm = 'tag:' + tag;
+
+        // Add the tag only if it is not already present (case-insensitive)
+        if (!terms.some(function (term) {
+            return term.toUpperCase() === searchTerm.toUpperCase();
+        })) {
+            terms.push(searchTerm);
+        }
+
+        input.val(terms.join(' '));
+
+        // Filter the repositories with the updated search terms
+        this.search();
+    }
+
     /**
      *  Get latest task status for all repos
      */
@@ -125,191 +139,202 @@ class Repo {
     }
 
     /**
-     *  Print packages tree (root level only – sub-directories are lazy-loaded on expand)
+     * Switch a repository description <p> into an editable input
+     * @param {*} p jQuery element of the description <p>
      */
-    printTree(path)
+    startEditDescription(p)
     {
-        const self = this;
+        if (!myrepopermission.allowedAction('edit')) {
+            myalert.print('You do not have permission to edit repositories', 'error');
+            return;
+        }
 
-        ajaxRequest(
-            // Controller:
-            'repo/snapshot/browse',
-            // Action:
-            'tree',
-            // Data:
-            {
-                path: path
-            },
-            // Print success alert:
-            false,
-            // Print error alert:
-            true
-        ).then(function () {
-            $('#packages-list').html(jsonValue.message);
-            self._initTreeLevel($('#packages-list'));
-            self._initLoadMore($('#packages-list'));
-            self._initSearch(path);
-            $('#loading-tree').remove();
-            $('#browse-search-bar').show();
-            $('#explorer').show();
-        });
+        // If already in edit mode, do nothing
+        if (p.find('input').length > 0) {
+            return;
+        }
+
+        const currentDescription = p.text().trim();
+        const repoId = p.attr('repo-id');
+        const envId = p.attr('env-id');
+
+        // Remove empty class (hide placeholder)
+        p.removeClass('repo-description-empty');
+
+        // Create input field
+        const input = $('<input type="text" class="repo-description-input-edit">')
+            .attr('repo-id', repoId)
+            .attr('env-id', envId)
+            .attr('data-original', currentDescription)
+            .val(currentDescription);
+
+        // Replace <p> content with input
+        p.html(input);
+        input.focus();
     }
 
     /**
-     *  Initialise click handlers for one tree level.
-     *  Directories are fetched from the server the first time they are expanded.
-     *  Call this again on any newly injected subtree container.
+     * Switch a repository tags display into an editable select2
+     * @param {*} display jQuery element containing the tags display
      */
-    _initTreeLevel($container)
+    startEditTags(display)
     {
-        const self = this;
-
-        $container.find('div.explorer-toggle').each(function () {
-            const $toggle = $(this);
-
-            $toggle.prepend('+ ');
-
-            $toggle.on('click', function () {
-                const $subtree = $toggle.next('ul');
-
-                // Already loaded: just toggle visibility
-                if ($toggle.data('loaded')) {
-                    $subtree.toggle(100);
-                    const v = $toggle.html().substring(0, 1);
-                    if (v == '+') {
-                        $toggle.html('-' + $toggle.html().substring(1));
-                    } else if (v == '-') {
-                        $toggle.html('+' + $toggle.html().substring(1));
-                    }
-                    return;
-                }
+        // Ignore if the user does not have permission to edit repositories
+        if (!myrepopermission.allowedAction('edit')) {
+            return;
+        }
+
+        // If already in edit mode, do nothing
+        if (display.hasClass('editing')) {
+            return;
+        }
+
+        const repoId = display.attr('repo-id');
+
+        // Current tags of this repo
+        const currentTags = (display.attr('data-tags') || '').split(',').map(function (tag) {
+            return tag.trim();
+        }).filter(function (tag) {
+            return tag.length > 0;
+        });
 
-                // First expand: fetch this directory level from the server
-                $toggle.data('loaded', true);
-                $toggle.html('-' + $toggle.html().substring(1));
-
-                // Show loading indicator inside the empty placeholder
-                $subtree.html('<li class="flex align-item-center column-gap-5 padding-top-10 padding-bottom-10"><img src="/assets/icons/loading.svg" class="icon" /><span class="lowopacity-cst">Loading</span></li>');
-                $subtree.show();
-
-                ajaxRequest(
-                    // Controller:
-                    'repo/snapshot/browse',
-                    // Action:
-                    'tree',
-                    // Data:
-                    {
-                        path: $toggle.data('path')
-                    },
-                    // Print success alert:
-                    false,
-                    // Print error alert:
-                    true
-                ).then(function () {
-                    // The server returns a <ul>…</ul>; replace the placeholder <ul>
-                    const $newSubtree = $(jsonValue.message).hide();
-                    $subtree.replaceWith($newSubtree);
-                    self._initTreeLevel($newSubtree);
-                    $newSubtree.show(100);
-                }).catch(function () {
-                    // Revert state so the user can retry
-                    $toggle.data('loaded', false);
-                    $toggle.html('+' + $toggle.html().substring(1));
-                    $subtree.hide().empty();
-                });
+        // Collect all existing tags across all repos to suggest them in the dropdown
+        const allTags = new Set(currentTags);
+
+        $('.repo-tags-display').each(function () {
+            ($(this).attr('data-tags') || '').split(',').forEach(function (tag) {
+                tag = tag.trim();
+                if (tag.length > 0) {
+                    allTags.add(tag);
+                }
             });
         });
+
+        // Build the multiple select element
+        const select = $('<select multiple class="repo-tags-input-edit"></select>')
+            .attr('repo-id', repoId)
+            .attr('data-original', currentTags.join(','));
+
+        // Add each existing tag as an option, pre-selecting the ones currently applied to this repo
+        allTags.forEach(function (tag) {
+            const selected = currentTags.includes(tag);
+            select.append(new Option(tag, tag, selected, selected));
+        });
+
+        // Switch to edit mode and replace the content with the select
+        display.addClass('editing').removeClass('repo-tags-empty').empty().append(select);
+
+        // Convert to a select2 "multiple", allowing the user to add new tags
+        myselect2.convert(select, 'Add tags...', true, false);
+
+        // Open the dropdown right away
+        select.select2('open');
     }
 
     /**
-     *  Set up the file search bar.
-     *  Debounces keystrokes and queries the server for filename matches.
-     *  Clears back to the tree when the input is emptied.
+     * Save tags being edited and revert select2 to plain text display
+     * @param {*} display jQuery element containing the tags display
      */
-    _initSearch(rootPath)
+    saveRepoTags(display)
     {
-        let debounceTimer = null;
+        const select = display.find('select.repo-tags-input-edit');
 
-        $('#browse-search-input').on('input', function () {
-            clearTimeout(debounceTimer);
-            const query = $(this).val().trim();
+        if (select.length === 0) {
+            return;
+        }
 
-            if (query.length < 2) {
-                $('#browse-search-results').hide().empty();
-                $('#explorer').show();
-                return;
-            }
+        const repoId = display.attr('repo-id');
+
+        // Retrieve selected tags, clean and deduplicate them
+        let tags = select.val() || [];
+        tags = tags.map(function (tag) {
+            return tag.trim();
+        }).filter(function (tag) {
+            return tag.length > 0;
+        });
 
-            debounceTimer = setTimeout(function () {
-                // Show loading state
-                $('#explorer').hide();
-                $('#browse-search-results')
-                    .html('<div class="flex align-item-center column-gap-5 padding-top-5"><img src="/assets/icons/loading.svg" class="icon" /><span class="lowopacity-cst">Searching...</span></div>')
-                    .show();
-
-                ajaxRequest(
-                    // Controller:
-                    'repo/snapshot/browse',
-                    // Action:
-                    'tree/search',
-                    // Data:
-                    {
-                        path: rootPath, query: query
-                    },
-                    // Print success alert:
-                    false,
-                    // Print error alert:
-                    false
-                ).then(function () {
-                    $('#browse-search-results').html(jsonValue.message);
-                }).catch(function () {
-                    $('#browse-search-results').html('<p class="note">Search failed. Please try again.</p>');
-                });
-            }, 350);
+        // Deduplicate and sort tags case-insensitively
+        tags = [...new Set(tags)].sort(function (a, b) {
+            return a.toLowerCase().localeCompare(b.toLowerCase());
         });
+
+        // Destroy the select2 instance
+        select.select2('destroy');
+
+        // Save the new tags
+        this.updateTags(repoId, tags.join(','));
+
+        // Update data-tags on the display and on the parent repo item (used by the search)
+        display.attr('data-tags', tags.join(','));
+        display.closest('.repo-item').attr('data-tags', tags.join(','));
+
+        // Revert to the text display
+        display.removeClass('editing').empty();
+
+        if (tags.length > 0) {
+            tags.forEach(function (tag) {
+                const tagItem = $('<div class="flex align-item-center column-gap-5 mediumopacity repo-tag-item"></div>')
+                    .attr('title', tag + ' tag');
+
+                $('<img src="/assets/icons/tag.svg" class="icon-np icon-small" />').appendTo(tagItem);
+                $('<p class="font-size-13"></p>').text(tag).appendTo(tagItem);
+
+                tagItem.appendTo(display);
+            });
+        } else {
+            display.addClass('repo-tags-empty');
+            // Hide the tags container and show the header "Add tags" button again
+            const repoItem = display.closest('.repo-item');
+            repoItem.find('.repo-tags-container').hide();
+            repoItem.find('.repo-add-tags-btn').show();
+        }
     }
 
     /**
-     *  Set up delegated "load more" handler on a root container.
-     *  Must be called once on the #packages-list root; event delegation handles
-     *  all .load-more-files buttons inserted dynamically inside it.
+     * Update repository description
+     * @param {*} id
+     * @param {*} description
      */
-    _initLoadMore($root)
+    updateDescription(id, description)
     {
-        const self = this;
-
-        $root.on('click', 'li.load-more-files', function () {
-            const $li = $(this);
-            const path = $li.data('path');
-            const offset = $li.data('offset');
-
-            // Show loading state in place of the button
-            $li.find('div').html('<div class="flex align-item-center column-gap-5"><img src="/assets/icons/loading.svg" class="icon" /><span class="lowopacity-cst">Loading</span></div>');
-            $li.off('click');
+        ajaxRequest(
+            // Controller:
+            'repo/edit',
+            // Action:
+            'description',
+            // Data:
+            {
+                repoId: id,
+                description: description
+            },
+            // Print success alert:
+            false,
+            // Print error alert:
+            true
+        );
+    }
 
-            ajaxRequest(
-                // Controller:
-                'repo/snapshot/browse',
-                // Action:
-                'tree/page',
-                // Data:
-                {
-                    path: path, offset: offset
-                },
-                // Print success alert:
-                false,
-                // Print error alert:
-                true
-            ).then(function () {
-                // Response is a fragment of <li> elements; insert before the button then remove it
-                const $items = $(jsonValue.message);
-                $li.before($items);
-                $li.remove();
-            }).catch(function () {
-                // Restore button text so the user can retry
-                $li.find('div').html('<p>Load more files (click to retry)</p>');
-                $li.on('click', arguments.callee);
-            });
-        });
+    /**
+     * Update repository tags
+     * @param {*} id
+     * @param {*} tags Comma-separated list of tags
+     */
+    updateTags(id, tags)
+    {
+        ajaxRequest(
+            // Controller:
+            'repo/edit',
+            // Action:
+            'tags',
+            // Data:
+            {
+                repoId: id,
+                tags: tags
+            },
+            // Print success alert:
+            false,
+            // Print error alert:
+            true
+        );
     }
 }
diff --git a/www/public/resources/js/classes/ScheduledTask.js b/www/public/resources/js/classes/ScheduledTask.js
new file mode 100644
index 000000000..d607c8543
--- /dev/null
+++ b/www/public/resources/js/classes/ScheduledTask.js
@@ -0,0 +1,180 @@
+class ScheduledTask
+{
+    /**
+     *  This panel only supports scheduled tasks: force and lock the scheduling switch.
+     */
+    initScheduleForm()
+    {
+        const scheduleInput = $('.task-schedule-form-params .task-schedule-btn');
+
+        if (scheduleInput.length) {
+            scheduleInput.prop('checked', true).trigger('change');
+            scheduleInput.prop('disabled', true);
+            scheduleInput.closest('.onoff-switch-label').addClass('nopointer lowopacity');
+        }
+    }
+
+    /**
+     *  Return the action currently selected in the scheduled task panel
+     */
+    getAction()
+    {
+        return $('#scheduled-task-action').val();
+    }
+
+    /**
+     *  Show only the parameters related to the selected action
+     */
+    printActionParams()
+    {
+        const action = this.getAction();
+
+        $('.scheduled-task-action-params').hide();
+        $('.scheduled-task-action-params[action="' + action + '"]').show();
+    }
+
+    /**
+     *  Return the target definition (repositories filters) entered by the user
+     */
+    getTarget()
+    {
+        var target = {};
+
+        $('.scheduled-task-target-param').each(function () {
+            const name = $(this).attr('param-name');
+            var value = $(this).val();
+
+            // Multiple selects return null when nothing is selected
+            if (value == null) {
+                value = $(this).prop('multiple') ? [] : '';
+            }
+
+            target[name] = value;
+        });
+
+        return target;
+    }
+
+    /**
+     *  Print a description of the repositories currently matching the target
+     */
+    printTarget(description)
+    {
+        $('#scheduled-task-target-count').html(description);
+    }
+
+    /**
+     *  Retrieve and print a description of the repositories currently matching the target
+     */
+    refreshCount()
+    {
+        $('#scheduled-task-target-count').text('Calculating...');
+
+        ajaxRequest(
+            // Controller:
+            'task',
+            // Action:
+            'count-target-repos',
+            // Data:
+            {
+                target: JSON.stringify(this.getTarget())
+            },
+            // Print success alert:
+            false,
+            // Print error alert:
+            false,
+            // Reload containers:
+            null,
+            // Exec on success:
+            ['myscheduledtask.printTarget(jsonValue.message)'],
+            // Exec on error:
+            ['$("#scheduled-task-target-count").text("Could not retrieve the targeted repositories.")']
+        );
+    }
+
+    /**
+     *  Build the task parameters from the panel form
+     */
+    getParams()
+    {
+        const action = this.getAction();
+
+        var params = {
+            action: action,
+            target: this.getTarget(),
+            schedule: {
+                scheduled: 'true'
+            }
+        };
+
+        // Retrieve the parameters of the selected action only
+        $('.scheduled-task-action-params[action="' + action + '"]').find('.scheduled-task-param').each(function () {
+            const name = $(this).attr('param-name');
+
+            if ($(this).attr('type') == 'checkbox') {
+                params[name] = $(this).is(':checked') ? 'true' : 'false';
+                return;
+            }
+
+            var value = $(this).val();
+
+            if (value == null) {
+                value = $(this).prop('multiple') ? [] : '';
+            }
+
+            params[name] = value;
+        });
+
+        // Retrieve the scheduling parameters
+        $('.task-schedule-form-params').find('.task-param').each(function () {
+            const name = $(this).attr('param-name');
+
+            if ($(this).attr('type') == 'checkbox') {
+                params['schedule'][name] = $(this).is(':checked') ? 'true' : 'false';
+                return;
+            }
+
+            if ($(this).attr('type') == 'radio') {
+                if ($(this).is(':checked')) {
+                    params['schedule'][name] = $(this).val();
+                }
+                return;
+            }
+
+            var value = $(this).val();
+
+            if (value == null) {
+                value = $(this).prop('multiple') ? [] : '';
+            }
+
+            params['schedule'][name] = value;
+        });
+
+        return params;
+    }
+
+    /**
+     *  Create the scheduled task
+     */
+    schedule()
+    {
+        ajaxRequest(
+            // Controller:
+            'task',
+            // Action:
+            'validate-execute-target',
+            // Data:
+            {
+                taskParams: JSON.stringify(this.getParams())
+            },
+            // Print success alert:
+            true,
+            // Print error alert:
+            true,
+            // Reload containers:
+            null,
+            // Exec on success:
+            ['mypanel.close("repos/scheduled-task")']
+        );
+    }
+}
diff --git a/www/public/resources/js/classes/Snapshot.js b/www/public/resources/js/classes/Snapshot.js
new file mode 100644
index 000000000..f2d218453
--- /dev/null
+++ b/www/public/resources/js/classes/Snapshot.js
@@ -0,0 +1,350 @@
+class Snapshot {
+    /**
+     *  Download package from a snapshot
+     */
+    download()
+    {
+        // Package to download
+        var packages = [];
+
+        // Get all selected checkboxes and their file-id (media) attribute
+        $('#packages-list, #browse-search-results').find('input[name=packageName\\[\\]]:checked').each(function () {
+            packages.push({ filename: $(this).attr('filename'), path: $(this).attr('path') });
+        });
+
+        // Append a temporary <a> element to download files
+        var temporaryDownloadLink = document.createElement("a");
+        temporaryDownloadLink.style.display = 'none';
+
+        document.body.appendChild(temporaryDownloadLink);
+
+        for (var n = 0; n < packages.length; n++) {
+            var download = packages[n];
+            temporaryDownloadLink.setAttribute('href', '/repo/' + download.path);
+            temporaryDownloadLink.setAttribute('download', download.filename);
+
+            // Click on the <a> element to start download
+            temporaryDownloadLink.click();
+        }
+
+        // Remove temporary <a> element
+        document.body.removeChild(temporaryDownloadLink);
+    }
+
+    /**
+     *  Upload packages to a snapshot via ajax
+     *  @param {HTMLFormElement} form
+     */
+    upload(form)
+    {
+        // Build multipart form data from the form, including the selected package files
+        const formData = new FormData(form);
+
+        // Add the parameters required by the ajax controller
+        formData.append('controller', 'repo/snapshot/browse');
+        formData.append('sourceUrl', window.location.href);
+        formData.append('sourceUri', window.location.pathname);
+
+        myalert.print('Uploading packages...');  
+
+        return new Promise((resolve, reject) => {
+            $.ajax({
+                type: 'POST',
+                url: '/ajax/controller.php',
+                data: formData,
+                // Required for file upload: let the browser set the multipart content type
+                // and prevent jQuery from serializing the FormData object
+                processData: false,
+                contentType: false,
+                dataType: 'json',
+                success: function (data, textStatus, jqXHR) {
+                    jsonValue = jQuery.parseJSON(jqXHR.responseText);
+
+                    // Reload the packages list and actions to show the newly uploaded packages
+                    mycontainer.reload('snapshot/kpi');
+                    mycontainer.reload('snapshot/list');
+
+                    // Close the upload slide panel
+                    mypanel.close('snapshot/upload');
+
+                    // Print the list of uploaded packages
+                    myalert.print(mysnapshot._formatUploadMessage(jsonValue.message), 'success');
+
+                    resolve('Packages uploaded successfully');
+                },
+
+                error: function (jqXHR, textStatus, thrownError) {
+                    jsonValue = jQuery.parseJSON(jqXHR.responseText);
+
+                    // Print the error details
+                    myalert.print(mysnapshot._formatUploadMessage(jsonValue.message), 'error');
+
+                    reject('Failed to upload packages');
+                }
+            });
+        });
+    }
+
+    /**
+     * Delete packages
+     * @param {*} snapId
+     */
+    delete(snapId)
+    {
+        // Package to delete
+        var packages = [];
+
+        myalert.print('Deleting packages...');
+
+        // Get the path of the selected packages
+        $('body').find('input[name=packageName\\[\\]]:checked').each(function () {
+            packages.push($(this).attr('path'));
+        });
+
+        ajaxRequest(
+            // Controller:
+            'repo/snapshot/browse',
+            // Action:
+            'delete-package',
+            {
+                snapId: snapId,
+                packages: packages
+            },
+            // Print success alert:
+            false,
+            // Print error alert:
+            true
+        ).then(function () {
+            // Reload packages list and actions
+            mycontainer.reload('snapshot/kpi');
+            mycontainer.reload('snapshot/list');
+
+            // Print packages that have been deleted
+            var deletedNames = jsonValue.message.map(function (pkg) { return pkg.name; });
+            var maxDisplay = 10;
+            var message = 'Packages deleted: <br>' + deletedNames.slice(0, maxDisplay).join('<br>');
+            if (deletedNames.length > maxDisplay) {
+                message += '<br>+' + (deletedNames.length - maxDisplay) + ' more...';
+            }
+            myalert.print(message, 'success');
+        });
+    }
+
+    /**
+     *  Print packages tree (root level only – sub-directories are lazy-loaded on expand)
+     */
+    printTree(path)
+    {
+        const self = this;
+
+        ajaxRequest(
+            // Controller:
+            'repo/snapshot/browse',
+            // Action:
+            'tree',
+            // Data:
+            {
+                path: path
+            },
+            // Print success alert:
+            false,
+            // Print error alert:
+            true
+        ).then(function () {
+            $('#packages-list').html(jsonValue.message);
+            self._initTreeLevel($('#packages-list'));
+            self._initLoadMore($('#packages-list'));
+            self._initSearch(path);
+            $('#loading-tree').remove();
+            // $('#browse-search-bar').show();
+            $('#explorer').show();
+        });
+    }
+
+    /**
+     *  Format an upload result/error message for display
+     *  The message can be a plain string or an object { title: [item, ...], ... }
+     *  @param {*} message
+     *  @returns {string}
+     */
+    _formatUploadMessage(message)
+    {
+        // Plain string message (e.g. a generic error)
+        if (typeof message === 'string') {
+            return message;
+        }
+
+        // Structured message: { title: [item, ...] }
+        var lines = [];
+
+        $.each(message, function (title, items) {
+            lines.push(title + ':');
+
+            if (Array.isArray(items)) {
+                items.forEach(function (item) {
+                    lines.push(item);
+                });
+            }
+        });
+
+        return lines.join('<br>');
+    }
+
+    /**
+     *  Initialise click handlers for one tree level.
+     *  Directories are fetched from the server the first time they are expanded.
+     *  Call this again on any newly injected subtree container.
+     */
+    _initTreeLevel($container)
+    {
+        const self = this;
+
+        $container.find('div.explorer-toggle').each(function () {
+            const $toggle = $(this);
+
+            $toggle.prepend('+ ');
+
+            $toggle.on('click', function () {
+                const $subtree = $toggle.next('ul');
+
+                // Already loaded: just toggle visibility
+                if ($toggle.data('loaded')) {
+                    $subtree.toggle(100);
+                    const v = $toggle.html().substring(0, 1);
+                    if (v == '+') {
+                        $toggle.html('-' + $toggle.html().substring(1));
+                    } else if (v == '-') {
+                        $toggle.html('+' + $toggle.html().substring(1));
+                    }
+                    return;
+                }
+
+                // First expand: fetch this directory level from the server
+                $toggle.data('loaded', true);
+                $toggle.html('-' + $toggle.html().substring(1));
+
+                // Show loading indicator inside the empty placeholder
+                $subtree.html('<li class="flex align-item-center column-gap-5 padding-top-10 padding-bottom-10"><img src="/assets/icons/loading.svg" class="icon" /><span class="lowopacity-cst">Loading</span></li>');
+                $subtree.show();
+
+                ajaxRequest(
+                    // Controller:
+                    'repo/snapshot/browse',
+                    // Action:
+                    'tree',
+                    // Data:
+                    {
+                        path: $toggle.data('path')
+                    },
+                    // Print success alert:
+                    false,
+                    // Print error alert:
+                    true
+                ).then(function () {
+                    // The server returns a <ul>…</ul>; replace the placeholder <ul>
+                    const $newSubtree = $(jsonValue.message).hide();
+                    $subtree.replaceWith($newSubtree);
+                    self._initTreeLevel($newSubtree);
+                    $newSubtree.show(100);
+                }).catch(function () {
+                    // Revert state so the user can retry
+                    $toggle.data('loaded', false);
+                    $toggle.html('+' + $toggle.html().substring(1));
+                    $subtree.hide().empty();
+                });
+            });
+        });
+    }
+
+    /**
+     *  Set up the file search bar.
+     *  Debounces keystrokes and queries the server for filename matches.
+     *  Clears back to the tree when the input is emptied.
+     */
+    _initSearch(rootPath)
+    {
+        let debounceTimer = null;
+
+        $('#browse-search-input').on('input', function () {
+            clearTimeout(debounceTimer);
+            const query = $(this).val().trim();
+
+            if (query.length < 2) {
+                $('#browse-search-results').hide().empty();
+                $('#explorer').show();
+                return;
+            }
+
+            debounceTimer = setTimeout(function () {
+                // Show loading state
+                $('#explorer').hide();
+                $('#browse-search-results')
+                    .html('<div class="flex align-item-center column-gap-5 padding-top-5"><img src="/assets/icons/loading.svg" class="icon" /><span class="lowopacity-cst">Searching...</span></div>')
+                    .show();
+
+                ajaxRequest(
+                    // Controller:
+                    'repo/snapshot/browse',
+                    // Action:
+                    'tree/search',
+                    // Data:
+                    {
+                        path: rootPath, query: query
+                    },
+                    // Print success alert:
+                    false,
+                    // Print error alert:
+                    false
+                ).then(function () {
+                    $('#browse-search-results').html(jsonValue.message);
+                }).catch(function () {
+                    $('#browse-search-results').html('<p class="note">Search failed. Please try again.</p>');
+                });
+            }, 350);
+        });
+    }
+
+    /**
+     *  Set up delegated "load more" handler on a root container.
+     *  Must be called once on the #packages-list root; event delegation handles
+     *  all .load-more-files buttons inserted dynamically inside it.
+     */
+    _initLoadMore($root)
+    {
+        const self = this;
+
+        $root.on('click', 'li.load-more-files', function () {
+            const $li = $(this);
+            const path = $li.data('path');
+            const offset = $li.data('offset');
+
+            // Show loading state in place of the button
+            $li.find('div').html('<div class="flex align-item-center column-gap-5"><img src="/assets/icons/loading.svg" class="icon" /><span class="lowopacity-cst">Loading</span></div>');
+            $li.off('click');
+
+            ajaxRequest(
+                // Controller:
+                'repo/snapshot/browse',
+                // Action:
+                'tree/page',
+                // Data:
+                {
+                    path: path, offset: offset
+                },
+                // Print success alert:
+                false,
+                // Print error alert:
+                true
+            ).then(function () {
+                // Response is a fragment of <li> elements; insert before the button then remove it
+                const $items = $(jsonValue.message);
+                $li.before($items);
+                $li.remove();
+            }).catch(function () {
+                // Restore button text so the user can retry
+                $li.find('div').html('<p>Load more files (click to retry)</p>');
+                $li.on('click', arguments.callee);
+            });
+        });
+    }
+}
diff --git a/www/public/resources/js/events/browse/repository.js b/www/public/resources/js/events/browse/repository.js
deleted file mode 100644
index 42ae26e08..000000000
--- a/www/public/resources/js/events/browse/repository.js
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- *  Event: view repository file content
- */
-$(document).on('click','.view-file',function () {
-    const name = $(this).attr('name');
-    const path = $(this).attr('path');
-
-    mymodal.loading();
-    
-    ajaxRequest(
-        // Controller:
-        'repo/snapshot/browse',
-        // Action:
-        'view-file',
-        // Data:
-        {
-            path: path
-        },
-        // Print success alert:
-        false,
-        // Print error alert:
-        true
-    ).then(function () {
-        // Print the modal window with the log
-        mymodal.print(jsonValue.message, name, true);
-    });
-});
-
-/**
- *  Event: when we click on a checkbox, we show the 'Delete' and 'Download' buttons
- */
-$(document).on('click',".package-checkbox",function (e) {
-    // Prevent parent to be triggered
-    e.stopPropagation();
-
-    var snapId = $('#packages-list').attr('snap-id');
-
-    /**
-     *  The list of allowed actions the user can execute on the selected repositories
-     *  By default: all (only 'delete-package' for now but maybe more later), unless the user has specific permissions
-     *  Those permissions are later verified by the server so even if the user tries to execute an action he is not allowed to, it will not work
-     */
-    var allowedActions = ['delete-package'];
-
-    /**
-     *  The buttons that will be displayed in the confirm box
-     */
-    var buttons = [];
-
-    /**
-     *  If no checkbox is selected then hide the buttons
-     */
-    if ($('body').find('input[name=packageName\\[\\]]:checked').length == 0) {
-        myconfirmbox.close();
-        return;
-    }
-
-    /**
-     *  Get permissions from cookie
-     */
-    if (mycookie.exists('user_permissions')) {
-        var userPermissions = JSON.parse(mycookie.get('user_permissions'));
-
-        // Reset allowed actions array
-        var allowedActions = [];
-
-        // Loop through all permissions and check if the user has the permission to execute the action
-        if (userPermissions.repositories && userPermissions.repositories['allowed-actions']) {
-            var allowedActions = userPermissions.repositories['allowed-actions'];
-        }
-    }
-
-    // Count the number of selected packages (across both tree and search results)
-    var count = $('body').find('input[type="checkbox"].package-checkbox:checked').length;
-
-    /**
-     *  Define confirm box buttons depending on the allowed actions
-     */
-
-    // Download is always allowed by default
-    buttons.push(
-        {
-            'text': 'Download',
-            'color': 'blue-alt',
-            'callback': function () {
-                downloadPackage();
-            }
-        }
-    );
-
-    if (allowedActions.includes('delete-package')) {
-        buttons.push(
-            {
-                'text': 'Delete',
-                'color': 'red',
-                'callback': function () {
-                    deletePackages(snapId);
-                }
-            }
-        );
-    }
-
-    /**
-     *  Show the confirm box
-     */
-    myconfirmbox.print(
-        {
-            'title': 'Select packages',
-            'message': count + ' file(s) selected.',
-            'id': 'select-package',
-            'buttons': buttons
-        }
-    );
-});
-
-/**
- *  Event: rebuild metadata
- */
-$(document).on('click',"#rebuild-btn",function () {
-    var snapId = $(this).attr('snap-id');
-    var gpgSign = 'false';
-
-    if ($('input[type=checkbox][name=gpgSign]').is(':checked')) {
-        var gpgSign = 'true';
-    }
-
-    ajaxRequest(
-        // Controller:
-        'repo/snapshot/browse',
-        // Action:
-        'rebuild',
-        // Data:
-        {
-            snapId: snapId,
-            gpgSign: gpgSign
-        },
-        // Print success alert:
-        true,
-        // Print error alert:
-        true,
-        // Reload containers:
-        ['browse/list', 'browse/actions']
-    );
-});
diff --git a/www/public/resources/js/events/checkbox.js b/www/public/resources/js/events/checkbox.js
index 24390acf2..37de1d4a0 100644
--- a/www/public/resources/js/events/checkbox.js
+++ b/www/public/resources/js/events/checkbox.js
@@ -1,3 +1,20 @@
+/**
+ *  Event: When a task "select all" button is clicked
+ */
+$(document).on('click', '.task-select-all-btns', function (e) {
+    // Prevent parent to be triggered
+    e.stopPropagation();
+
+    const checkbox = $(this).find('.select-all-checkbox');
+    const status = !checkbox.is(':checked');
+
+    checkbox.prop('checked', status);
+    $(this).attr('status', status ? 'selected' : '');
+
+    // Select/deselect all child checkboxes
+    mycheckbox.selectAll(checkbox.attr('checkbox-id'));
+});
+
 /**
  *  Event: When a "select all" checkbox is clicked
  */
diff --git a/www/public/resources/js/events/host/actions.js b/www/public/resources/js/events/host/actions.js
index 27a9d2678..d8b58ef43 100644
--- a/www/public/resources/js/events/host/actions.js
+++ b/www/public/resources/js/events/host/actions.js
@@ -102,6 +102,49 @@ $(document).on('click','.host-update-packages-btn',function () {
     mypanel.get('hosts/requests/update-packages', {hostId: id});
 });
 
+/**
+ *  Event: click on a host-line to select it
+ *  Do not trigger if the user clicked on a link (<a>)
+ */
+$(document).on('click', '.host-line', function (e) {
+    // Ignore clicks on links or the checkbox itself
+    if ($(e.target).closest('a, input[name="checkbox-host[]"]').length) {
+        return;
+    }
+
+    // Find the checkbox inside this container and toggle it
+    var checkbox = $(this).find('input[name="checkbox-host[]"]');
+
+    if (checkbox.length) {
+        checkbox.click();
+    }
+});
+
+/**
+ *  Event: toggle selected state on host-line when checkbox is checked/unchecked
+ */
+$(document).on('change', 'input[name="checkbox-host[]"]', function () {
+    var container = $(this).closest('.host-line');
+
+    if ($(this).is(':checked')) {
+        container.addClass('host-selected');
+    } else {
+        container.removeClass('host-selected');
+    }
+
+    const group = $(this).attr('group');
+    const button = $('.select-group-hosts-btn[group="' + group + '"]');
+    const groupCheckboxes = $('input[name="checkbox-host[]"][group="' + group + '"]').filter(function () {
+        return $(this).closest('.host-line').is(':visible');
+    });
+    const checkedCount = groupCheckboxes.filter(':checked').length;
+    const isAllSelected = groupCheckboxes.length > 0 && checkedCount === groupCheckboxes.length;
+
+    button.toggleClass('hide', checkedCount === 0);
+    button.attr('status', isAllSelected ? 'selected' : '');
+    button.find('.select-group-hosts-checkbox').prop('checked', isAllSelected);
+});
+
 /**
  *  Event: when a host checkbox is checked
  */
@@ -113,38 +156,43 @@ $(document).on('click','input[type="checkbox"][name="checkbox-host[]"]',function
 /**
  *  Event: when a 'Select all' button is clicked, it selects all checkbox-host[] of the group
  */
-$(document).on('click','input[type="checkbox"].select-group-hosts-checkbox',function () {
+$(document).on('click', '.select-group-hosts-btn', function () {
     // Retrieve the group name of the button which has been clicked
     const group = $(this).attr('group');
+    const checkbox = $(this).find('.select-group-hosts-checkbox');
 
     // Retrieve checkbox status
     const status = $(this).attr('status');
 
-    // Retrieve all checkboxes of the group
-    const hostsCheckboxes = $('input[name="checkbox-host[]"][group="' + group + '"]:visible');
+    // Retrieve all checkboxes of the group (filter by visible host-line parent since checkboxes are hidden)
+    const hostsCheckboxes = $('input[name="checkbox-host[]"][group="' + group + '"]').filter(function () {
+        return $(this).closest('.host-line').is(':visible');
+    });
 
     // If current status is 'selected', then unselect all hosts
     if (status == 'selected') {
         hostsCheckboxes.each(function () {
             if ($(this).is(':checked')) {
-                $(this).prop('checked', false);
+                $(this).prop('checked', false).trigger('change');
             }
         });
 
-        // Set status to 'unselected'
-        $(this).attr('status', 'unselected');
+        // Clear selected status
+        $(this).attr('status', '');
+        checkbox.prop('checked', false);
 
     // Make sure the 'Select all hosts' button is unchecked
     } else {
         // Check all checkbox-host[] of the same group
         hostsCheckboxes.each(function () {
             if (!$(this).is(':checked')) {
-                $(this).prop('checked', true);
+                $(this).prop('checked', true).trigger('change');
             }
         });
 
         // Set status to 'selected'
         $(this).attr('status', 'selected');
+        checkbox.prop('checked', true);
     }
 
     // Print actions for selected hosts
@@ -158,12 +206,14 @@ $(document).on('click', '#select-all-hosts', function () {
     /**
      *  Retrieve all host groups checkboxes that are visible
      */
-    const hostGroupsCheckboxes = $('input[type="checkbox"].select-group-hosts-checkbox:visible');
+    const hostGroupsButtons = $('.select-group-hosts-btn');
 
     /**
-     *  Retrieve all hosts checkboxes that are visible
+     *  Retrieve all hosts checkboxes (filter by visible host-line parent)
      */
-    const hostCheckboxes = $('input[type="checkbox"][name="checkbox-host[]"]:visible');
+    const hostCheckboxes = $('input[type="checkbox"][name="checkbox-host[]"]').filter(function () {
+        return $(this).closest('.host-line').is(':visible');
+    });
 
     /**
      *  Retrieve select status
@@ -174,15 +224,18 @@ $(document).on('click', '#select-all-hosts', function () {
      *  If current status is not 'selected', then select all hosts
      */
     if (selectStatus != 'selected') {
-        hostGroupsCheckboxes.each(function () {
-            if (!$(this).is(':checked')) {
-                $(this).prop('checked', true);
+        hostGroupsButtons.each(function () {
+            const checkbox = $(this).find('.select-group-hosts-checkbox');
+
+            if (!checkbox.is(':checked')) {
+                checkbox.prop('checked', true);
+                $(this).attr('status', 'selected');
             }
         });
 
         hostCheckboxes.each(function () {
             if (!$(this).is(':checked')) {
-                $(this).prop('checked', true);
+                $(this).prop('checked', true).trigger('change');
             }
         });
 
@@ -198,20 +251,23 @@ $(document).on('click', '#select-all-hosts', function () {
      *  Otherwise, unselect all hosts
      */
     } else {
-        hostGroupsCheckboxes.each(function () {
-            if ($(this).is(':checked')) {
-                $(this).prop('checked', false);
+        hostGroupsButtons.each(function () {
+            const checkbox = $(this).find('.select-group-hosts-checkbox');
+
+            if (checkbox.is(':checked')) {
+                checkbox.prop('checked', false);
+                $(this).attr('status', '');
             }
         });
 
         hostCheckboxes.each(function () {
             if ($(this).is(':checked')) {
-                $(this).prop('checked', false);
+                $(this).prop('checked', false).trigger('change');
             }
         });
 
-        // Set status to 'unselected'
-        $(this).attr('status', 'unselected');
+        // Clear selected status
+        $(this).attr('status', '');
 
         // Make sure the 'Select all hosts' button is unchecked
         $(this).css('opacity', '');
@@ -294,16 +350,39 @@ $(document).on('submit', '#host-update-packages-form', function () {
         // Print success alert:
         true,
         // Print error alert:
-        true,
-        // Reload container:
-        [],
-        // Execute functions on success:
-        []
+        true
     );
 
     return false;
 });
 
+/**
+ *  Event: click on a host-package-item to select it
+ */
+$(document).on('click', '.host-package-item', function (e) {
+    // Ignore if clicked on a link, the checkbox itself, or the package timeline trigger
+    if ($(e.target).closest('a, .get-package-timeline').length || $(e.target).is('.available-package-checkbox')) {
+        return;
+    }
+
+    var checkbox = $(this).find('.available-package-checkbox');
+    if (checkbox.length) {
+        checkbox.trigger('click');
+    }
+});
+
+/**
+ *  Event: toggle selected state on host-package-item when checkbox changes
+ */
+$(document).on('change', '.available-package-checkbox', function () {
+    var container = $(this).closest('.host-package-item');
+    if (this.checked) {
+        container.addClass('host-package-selected');
+    } else {
+        container.removeClass('host-package-selected');
+    }
+});
+
 /**
  *  Event: available package checkbox selection
  */
@@ -370,7 +449,7 @@ $(document).on('click','input[type="checkbox"].available-package-checkbox',funct
         myconfirmbox.print(
             {
                 'title': 'Update packages',
-                'message': 'Request the host to update selected packages?',
+                'message': countChecked + ' package' + (countChecked > 1 ? 's' : '') + ' selected.',
                 'id': 'update-available-packages-confirm-box',
                 'buttons': [
                 {
@@ -406,6 +485,9 @@ $(document).on('click','input[type="checkbox"].available-package-checkbox',funct
     } else {
         myconfirmbox.close();
     }
+
+    // Trigger change to update visual state
+    $(this).trigger('change');
 });
 
 /**
@@ -486,7 +568,6 @@ $(document).on('click','#host-request-btn',function () {
         buttons.push(
             {
                 'text': 'Request general information',
-                'color': 'blue-alt',
                 'callback': function () {
                     executeAction('request-general-infos', [id]);
                 }
@@ -498,7 +579,6 @@ $(document).on('click','#host-request-btn',function () {
         buttons.push(
             {
                 'text': 'Request package information',
-                'color': 'blue-alt',
                 'callback': function () {
                     executeAction('request-packages-infos', [id]);
                 }
@@ -510,7 +590,6 @@ $(document).on('click','#host-request-btn',function () {
         buttons.push(
             {
                 'text': 'Update packages',
-                'color': 'blue-alt',
                 'callback': function () {
                     mypanel.get('hosts/requests/update-packages', {
                         hostsId: [id]
diff --git a/www/public/resources/js/events/hosts/layout.js b/www/public/resources/js/events/hosts/layout.js
index 202ad300b..8ab218128 100644
--- a/www/public/resources/js/events/hosts/layout.js
+++ b/www/public/resources/js/events/hosts/layout.js
@@ -64,7 +64,7 @@ $(document).on('mouseenter', '.search-host-tooltip', function (e) {
     content += '<div class="flex flex-direction-column row-gap-5 margin-top-10">';
     content += '<p>• Main search is performed on all fields, use filters to narrow down results</p>';
     content += '<p>• You can combine multiple filters</p>';
-    content += '<p>• Use quotes when filter contains spaces, e.g os="Linux Mint"</p>';
+    content += '<p>• Use quotes when a string contains spaces, e.g os="Linux Mint"</p>';
     content += '<p>• Search and filters are case-insensitive</p>';
     content += '</div>';
 
diff --git a/www/public/resources/js/events/hosts/settings.js b/www/public/resources/js/events/hosts/settings.js
index ec81c4932..4486afaba 100644
--- a/www/public/resources/js/events/hosts/settings.js
+++ b/www/public/resources/js/events/hosts/settings.js
@@ -13,6 +13,7 @@ $(document).on('submit','form#hosts-settings',function (e) {
         {
             complianceThresholdCount: $('input[name="compliance-threshold-count"').val(),
             complianceThresholdDays: $('input[name="compliance-threshold-days"').val(),
+            complianceSecurityUpdate: $('input[name="compliance-security-update"').is(':checked') ? 1 : 0,
             complianceRebootRequired: $('input[name="compliance-reboot-required"').is(':checked') ? 1 : 0
         },
         // Print success alert:
diff --git a/www/public/resources/js/events/repo/edit.js b/www/public/resources/js/events/repo/edit.js
index b9cbbbf82..60ec8ddcf 100644
--- a/www/public/resources/js/events/repo/edit.js
+++ b/www/public/resources/js/events/repo/edit.js
@@ -1,75 +1,24 @@
 /**
- *  Event: click on edit repository button
- *  TODO: wait for repos list refactoring before implementing the repo-edit-btn
+ *  Event: click on rename repository button
  */
-// $(document).on('click','.repo-edit-btn',function (e) {
-//     e.preventDefault();
-
-//     const repoId = $(this).attr('repo-id');
-
-//     /**
-//      *  The buttons that will be displayed in the confirm box
-//      */
-//     var buttons = [];
-
-//     /**
-//      *  The list of allowed actions the user can execute on the selected repositories
-//      *  By default: all, unless the user has specific permissions
-//      *  Those permissions are later verified by the server so even if the user tries to execute an action he is not allowed to, it will not work
-//      */
-//     var allowedActions = ['update', 'duplicate', 'env', 'rebuild', 'rename', 'edit', 'install', 'delete'];
-
-//     /**
-//      *  Get permissions from cookie
-//      */
-//     if (mycookie.exists('user_permissions')) {
-//         var userPermissions = JSON.parse(mycookie.get('user_permissions'));
-
-//         // Reset allowed actions array
-//         var allowedActions = [];
-
-//         // Loop through all permissions and check if the user has the permission to execute the action
-//         if (userPermissions.repositories && userPermissions.repositories['allowed-actions']) {
-//             var allowedActions = userPermissions.repositories['allowed-actions'];
-//         }
-//     }
-
-//     /**
-//      *  Define confirm box buttons depending on the allowed actions
-//      */
-//     if (allowedActions.includes('rename')) {
-//         buttons.push(
-//             {
-//                 'text': 'Rename',
-//                 'color': 'blue-alt',
-//                 'callback': function () {
-//                     executeAction('rename');
-//                 }
-//             }
-//         );
-//     }
-
-//     if (allowedActions.includes('edit')) {
-//         buttons.push(
-//             {
-//                 'text': 'Edit',
-//                 'color': 'blue-alt',
-//                 'callback': function () {
-//                     executeAction('edit')
-//                 }
-//             }
-//         );
-//     }
-
-//     myconfirmbox.print(
-//         {
-//             'title': 'Edit repository',
-//             'message': '',
-//             'id': 'repo-edit-confirm-box',
-//             'buttons': buttons
-//         }
-//     );
-// });
+$(document).on('click','.repo-rename-btn',function (e) {
+    e.preventDefault(e);
+
+    // The buttons that will be displayed in the confirm box
+    var buttons = [];
+
+    if (!myrepopermission.allowedAction('rename')) {
+        myalert.print('You do not have permission to rename repositories', 'error');
+        return;
+    }
+
+    // Get panel
+    mypanel.get('repos/rename', {
+        repos: JSON.stringify([{
+            'repo-id': $(this).attr('repo-id')
+        }])
+    });
+});
 
 /**
  *  Event: submit repository edit form
@@ -155,7 +104,7 @@ $(document).on('submit','#edit-form',function () {
         // Controller:
         'repo/edit',
         // Action:
-        'validateForm',
+        'validate-execute',
         // Data:
         {
             params: paramsJson,
@@ -166,49 +115,171 @@ $(document).on('submit','#edit-form',function () {
         true
     ).then(function () {
         // Uncheck all checkboxes and remove all styles JQuery could have applied
-        $('.reposList').find('input[name=checkbox-repo]').prop('checked', false);
-        $('.reposList').find('input[name=checkbox-repo]').removeAttr('style');
+        $('#repositories-list').find('input[name=checkbox-repo]').prop('checked', false);
+        $('#repositories-list').find('input[name=checkbox-repo]').removeAttr('style');
     });
 
     return false;
 });
 
 /**
- *  Event: add placeholder to description input on mouse enter
- *  This is to prevent Firefox from always displaying the placeholder
+ *  Event: click on "Add a description" button (header)
+ */
+$(document).on('click', '.repo-add-description-btn', function () {
+    const btn = $(this);
+    const repoItem = btn.closest('.repo-item');
+    const container = repoItem.find('.repo-description-container');
+    const p = container.find('p.repo-description-input');
+
+    // Hide the button, reveal the description container and enter edit mode
+    btn.hide();
+    container.show();
+    myrepo.startEditDescription(p);
+});
+
+/**
+ *  Event: single-click on an empty description to add one
  */
-$(document).on('mouseenter','input[type="text"].repo-description-input',function () {
-    $(this).attr('placeholder', '🖉 add a description');
+$(document).on('click', 'p.repo-description-input.repo-description-empty', function () {
+    myrepo.startEditDescription($(this));
 });
 
 /**
- *  Event: remove placeholder on mouse leave
- *  This is to prevent Firefox from always displaying the placeholder
+ *  Event: double-click on an existing description to edit it
  */
-$(document).on('mouseleave','input[type="text"].repo-description-input',function () {
-    $(this).attr('placeholder', '');
+$(document).on('dblclick', 'p.repo-description-input', function () {
+    myrepo.startEditDescription($(this));
 });
 
 /**
  *  Event: edit repository description when pressing 'Enter' key
  */
-$(document).on('keypress','input[type="text"].repo-description-input',function (e) {
+$(document).on('keypress','.repo-description-input-edit',function (e) {
     e.stopPropagation();
 
     const keycode = (e.keyCode ? e.keyCode : e.which);
 
     if (keycode == '13') {
-        myenvironment.updateDescription($(this).attr('env-id'), $(this).val());
+        const input = $(this);
+        const p = input.closest('p.repo-description-input');
+        const repoItem = p.closest('.repo-item');
+        const newDescription = input.val().trim();
+
+        // Mark as saved to prevent blur from reverting.
+        // Use a native property (not jQuery .data) because p.text() below calls
+        // .empty()/cleanData on the input, which would wipe jQuery data before the
+        // synchronous blur (fired when the focused input is removed) can read it.
+        this._descSaved = true;
+
+        // Save description
+        myrepo.updateDescription(input.attr('repo-id'), newDescription);
+
+        // Revert to <p> with new value
+        p.text(newDescription);
+
+        // If description is now empty, hide the container and show the header button again
+        if (!newDescription) {
+            p.addClass('repo-description-empty');
+            repoItem.find('.repo-description-container').hide();
+            repoItem.find('.repo-add-description-btn').show();
+        } else {
+            p.removeClass('repo-description-empty');
+        }
     }
 });
 
 /**
- *  Event: create new repo: print description field only if an env is specified
+ *  Event: revert description input on blur (click outside)
  */
-$(document).on('change','#new-repo-target-env-select',function () {
-    if ($('#new-repo-target-env-select').val() == "") {
-        $('#new-repo-target-description-tr').hide();
+$(document).on('blur','.repo-description-input-edit',function () {
+    const input = $(this);
+
+    // If already saved via Enter, do nothing (native flag survives cleanData)
+    if (this._descSaved) {
+        return;
+    }
+
+    const p = input.closest('p.repo-description-input');
+    const repoItem = p.closest('.repo-item');
+    const originalDescription = input.attr('data-original');
+
+    // Revert to <p> with original value
+    p.text(originalDescription);
+
+    // If description is empty, hide the container and show the header button again
+    if (!originalDescription) {
+        p.addClass('repo-description-empty');
+        repoItem.find('.repo-description-container').hide();
+        repoItem.find('.repo-add-description-btn').show();
     } else {
-        $('#new-repo-target-description-tr').show();
+        p.removeClass('repo-description-empty');
     }
-}).trigger('change');
+});
+
+/**
+ *  Event: click on "Add tags" button (header)
+ */
+$(document).on('click', '.repo-add-tags-btn', function () {
+    const btn = $(this);
+    const repoItem = btn.closest('.repo-item');
+    const container = repoItem.find('.repo-tags-container');
+    const display = container.find('div.repo-tags-display');
+
+    // Hide the button, reveal the tags container and enter edit mode
+    btn.hide();
+    container.show();
+    myrepo.startEditTags(display);
+});
+
+/**
+ *  Event: single-click on an empty tags area to add tags
+ */
+$(document).on('click', '.repo-tags-display.repo-tags-empty', function () {
+    myrepo.startEditTags($(this));
+});
+
+/**
+ *  Event: single-click on a tag to filter the repositories search by it
+ */
+$(document).on('click', '.repo-tag-item', function (e) {
+    e.stopPropagation();
+
+    const tag = $(this).find('p').text().trim();
+
+    if (tag) {
+        myrepo.searchByTag(tag);
+    }
+});
+
+/**
+ *  Event: double-click on existing tags to edit them
+ */
+$(document).on('dblclick', '.repo-tags-display', function () {
+    myrepo.startEditTags($(this));
+});
+
+/**
+ *  Event: save tags when clicking outside the tags editor
+ */
+$(document).on('mousedown', function (e) {
+    const editing = $('.repo-tags-display.editing');
+
+    if (editing.length === 0) {
+        return;
+    }
+
+    editing.each(function () {
+        const display = $(this);
+
+        // Ignore clicks inside the editor itself or inside the select2 dropdown/container
+        if ($(e.target).closest('.repo-tags-display').is(display)) {
+            return;
+        }
+
+        if ($(e.target).closest('.select2-container, .select2-dropdown').length > 0) {
+            return;
+        }
+
+        myrepo.saveRepoTags(display);
+    });
+});
diff --git a/www/public/resources/js/events/repo/env.js b/www/public/resources/js/events/repo/env.js
index 29b4f1274..2b63b55d4 100644
--- a/www/public/resources/js/events/repo/env.js
+++ b/www/public/resources/js/events/repo/env.js
@@ -1,21 +1,45 @@
 /**
- *  Event: select one or multiple snapshot environment(s) to delete
+ *  Event: click on a snap-env-container to toggle the environment checkbox
  */
-$(document).on('click','.select-env-checkbox',function (e) {
-    // Prevent parent to be triggered
+$(document).on('click', '.snap-env-container', function (e) {
+    // Prevent triggering the parent snap-container click
     e.stopPropagation();
 
-    var actions = [];
+    // Toggle the hidden checkbox
+    var checkbox = $(this).find('.select-env-checkbox');
+
+    if (checkbox.is(':disabled')) {
+        return;
+    }
+
+    checkbox.prop('checked', !checkbox.prop('checked')).trigger('change');
+});
+
+/**
+ *  Event: toggle selected state and confirmbox when env checkbox changes
+ */
+$(document).on('change', '.select-env-checkbox', function (e) {
+    // Prevent parent to be triggered
+    e.stopPropagation(e);
+
+    if ($(this).is(':disabled')) {
+        $(this).prop('checked', false);
+        return;
+    }
 
-    // If the checkbox is checked, make it visible, else remove any custom visibility so it returns to default
+    var container = $(this).closest('.snap-env-container');
+
+    // Toggle visual state
     if ($(this).is(':checked')) {
-        $(this).css('visibility', 'visible');
+        container.addClass('env-selected');
     } else {
-        $(this).css('visibility', '');
+        container.removeClass('env-selected');
     }
 
+    var actions = [];
+
     // Get all checked checkboxes
-    const checked = $('.reposList').find('input[type="checkbox"].select-env-checkbox:checked');
+    const checked = $('#repositories-list').find('input[type="checkbox"].select-env-checkbox:checked');
 
     if (checked.length == 0) {
         myconfirmbox.close();
@@ -51,7 +75,7 @@ $(document).on('click','.select-env-checkbox',function (e) {
                                 // Controller:
                                 'task',
                                 // Action:
-                                'validateForm',
+                                'validate-execute',
                                 // Data:
                                 {
                                     taskParams: JSON.stringify([actions[i]]),
@@ -62,6 +86,10 @@ $(document).on('click','.select-env-checkbox',function (e) {
                                 true
                             );
                         }
+
+                        // A repo item still holding a checked checkbox is considered busy and would be
+                        // skipped by the repos list partial reload, hiding the environment removal
+                        checked.prop('checked', false).closest('.snap-env-container').removeClass('env-selected');
                     }
             }
             ]
diff --git a/www/public/resources/js/group.js b/www/public/resources/js/events/repo/group.js
similarity index 87%
rename from www/public/resources/js/group.js
rename to www/public/resources/js/events/repo/group.js
index e70d1d4ab..a8e9fd89c 100644
--- a/www/public/resources/js/group.js
+++ b/www/public/resources/js/events/repo/group.js
@@ -1,11 +1,7 @@
-/**
- *  Events listeners
- */
-
 /**
  *  Event: Create new group
  */
-$(document).on('submit','#newGroupForm',function (e) {
+$(document).on('submit','form#new-group',function (e) {
     e.preventDefault();
 
     ajaxRequest(
@@ -15,7 +11,7 @@ $(document).on('submit','#newGroupForm',function (e) {
         'new',
         // Data:
         {
-            name: $("#newGroupInput").val(),
+            name: $(this).find('input[name="group-name"]').val(),
             type: 'repo'
         },
         // Print success alert:
@@ -75,7 +71,5 @@ $(document).on('submit','.group-form',function (e) {
  *  Event: Print group configuration div
  */
 $(document).on('click','.group-config-btn',function () {
-    var id = $(this).attr('group-id');
-
-    slide('.group-config-div[group-id="' + id + '"]');
+    slide('.group-config-div[group-id="' + $(this).attr('group-id') + '"]');
 });
diff --git a/www/public/resources/js/events/repo/list.js b/www/public/resources/js/events/repo/list.js
index 9f5bd318d..f554b6a6c 100644
--- a/www/public/resources/js/events/repo/list.js
+++ b/www/public/resources/js/events/repo/list.js
@@ -11,18 +11,18 @@ $(document).on('click','#hide-all-repo-groups',function () {
         $(this).find('img').attr('src', 'assets/icons/view-off.svg');
 
         // Retrieve all groups and hide them if they are visible
-        $('.repo-list-group-container').each(function () {
-            // Retrieve group id
-            var id = $(this).attr('group-id');
+        $('.repos-list-group').each(function () {
+            var content = $(this).children('.group-content');
 
-            // If the group is visible then hide it, else do nothing
-            if ($(this).is(":visible")) {
-                slide('.repo-list-group-container[group-id="' + id + '"]');
+            // If the group content is visible then hide it, else do nothing
+            if (content.is(":visible")) {
+                content.slideUp(200);
             }
         });
 
         // Change all up/down icons to 'down'
         $('img.hide-repo-group').attr('src', 'assets/icons/view-off.svg');
+        $('img.hide-repo-group').attr('state', 'hidden');
     }
 
     // If actual state is 'hidden' then show all groups
@@ -32,18 +32,18 @@ $(document).on('click','#hide-all-repo-groups',function () {
         $(this).find('img').attr('src', 'assets/icons/view.svg');
 
         // Retrieve all groups and show them if they are hidden
-        $('.repo-list-group-container').each(function () {
-            // Retrieve group id
-            var id = $(this).attr('group-id');
+        $('.repos-list-group').each(function () {
+            var content = $(this).children('.group-content');
 
-            // If the group is hidden then show it, else do nothing
-            if ($(this).is(":hidden")) {
-                slide('.repo-list-group-container[group-id="' + id + '"]');
+            // If the group content is hidden then show it, else do nothing
+            if (content.is(":hidden")) {
+                content.slideDown(200);
             }
         });
 
         // Change all up/down icons to 'up'
         $('img.hide-repo-group').attr('src', 'assets/icons/view.svg');
+        $('img.hide-repo-group').attr('state', 'visible');
     }
 });
 
@@ -51,7 +51,6 @@ $(document).on('click','#hide-all-repo-groups',function () {
  *  Event: show / hide repos group content
  */
 $(document).on('click','.hide-repo-group',function () {
-    var id = $(this).attr('group-id');
     var state = $(this).attr('state');
 
     if (state == 'visible') {
@@ -64,5 +63,5 @@ $(document).on('click','.hide-repo-group',function () {
         $(this).attr('src', 'assets/icons/view.svg');
     }
 
-    slide('.repo-list-group-container[group-id="' + id + '"]');
+    $(this).closest('.repos-list-group').children('.group-content').slideToggle(200);
 });
diff --git a/www/public/resources/js/events/repo/preferences.js b/www/public/resources/js/events/repo/preferences.js
new file mode 100644
index 000000000..c95229f9f
--- /dev/null
+++ b/www/public/resources/js/events/repo/preferences.js
@@ -0,0 +1,39 @@
+/**
+ *  Event: edit user personnal informations
+ */
+$(document).on('submit','form#repos-list-preferences',function (e) {
+    e.preventDefault();
+
+    var preferences = {};
+
+    // Get all values from the form
+    $(this).find('input').each(function () {
+        var name = $(this).attr('name');
+        
+        // If the input is a checkbox, get its checked state
+        if ($(this).attr('type') === 'checkbox') {
+            preferences[name] = $(this).is(':checked');
+        } else {
+            preferences[name] = $(this).val();
+        }
+    });
+
+    ajaxRequest(
+        // Controller:
+        'user/preferences',
+        // Action:
+        'save',
+        // Data:
+        {
+            preferences: preferences
+        },
+        // Print success alert:
+        true,
+        // Print error alert:
+        true
+    ).then(function () {
+        mycontainer.reload('repos/list');
+    });
+
+    return false;
+});
\ No newline at end of file
diff --git a/www/public/resources/js/events/repo/scheduled-task.js b/www/public/resources/js/events/repo/scheduled-task.js
new file mode 100644
index 000000000..b6decc306
--- /dev/null
+++ b/www/public/resources/js/events/repo/scheduled-task.js
@@ -0,0 +1,20 @@
+/**
+ *  Event: show the parameters of the selected action
+ */
+$(document).on('change', '#scheduled-task-action', function () {
+    myscheduledtask.printActionParams();
+});
+
+/**
+ *  Event: refresh the number of targeted repositories when a target filter changes
+ */
+$(document).on('change', '.scheduled-task-target-param', function () {
+    myscheduledtask.refreshCount();
+});
+
+/**
+ *  Event: create the scheduled task
+ */
+$(document).on('click', '.scheduled-task-confirm-btn', function () {
+    myscheduledtask.schedule();
+});
diff --git a/www/public/resources/js/events/settings/environment.js b/www/public/resources/js/events/settings/environment.js
index 44c97d2de..2d3732886 100644
--- a/www/public/resources/js/events/settings/environment.js
+++ b/www/public/resources/js/events/settings/environment.js
@@ -1,11 +1,36 @@
+/**
+ *  Toggle environment proctection
+ */
+$(document).on('click','img.env-protection', function () {
+    const img = $(this);
+    const protected = img.attr('protected');
+    const id = img.attr('env-id');
+    const name = img.attr('env-name');
+    
+    if (protected == 'false') {
+        img.attr('src','/assets/icons/locked-red.svg');
+        img.attr('title','Unprotect environment');
+        img.attr('protected','true');
+        img.addClass('icon');
+        img.removeClass('icon-lowopacity');
+    } else {
+        img.attr('src','/assets/icons/unlocked.svg');
+        img.attr('title','Protect environment');
+        img.addClass('icon-lowopacity');
+        img.attr('protected','false');
+        img.removeClass('icon');
+    }
+});
+
 /**
  *  Event: add a new environment by pressing enter
  */
 $(document).on('keypress','input[name="add-env-name"]', function (e) {
-    var keycode = (event.keyCode ? event.keyCode : event.which);
+    const keycode = (event.keyCode ? event.keyCode : event.which);
+
     if (keycode == '13') {
         e.stopPropagation();
-        addEnv();
+        myenvironment.add();
     }
 });
 
@@ -13,17 +38,18 @@ $(document).on('keypress','input[name="add-env-name"]', function (e) {
  *  Event: add a new environment by clicking the add button
  */
 $(document).on('click','#add-env-btn',function () {
-    addEnv();
+    myenvironment.add();
 });
 
 /**
  *  Event: edit environments by pressing enter
  */
 $(document).on('keypress','input[name="env-name"]', function (e) {
-    var keycode = (event.keyCode ? event.keyCode : event.which);
+    const keycode = (event.keyCode ? event.keyCode : event.which);
+
     if (keycode == '13') {
         e.stopPropagation();
-        editEnv();
+        myenvironment.edit();
     }
 });
 
@@ -31,15 +57,15 @@ $(document).on('keypress','input[name="env-name"]', function (e) {
  *  Event: edit environments by clicking the edit button
  */
 $(document).on('click','#edit-env-btn', function () {
-    editEnv()
+    myenvironment.edit();
 });
 
 /**
  *  Event: delete an environment
  */
 $(document).on('click','.delete-env-btn',function () {
-    var id = $(this).attr('env-id');
-    var name = $(this).attr('env-name');
+    const id = $(this).attr('env-id');
+    const name = $(this).attr('env-name');
 
     myconfirmbox.print(
         {
@@ -50,22 +76,7 @@ $(document).on('click','.delete-env-btn',function () {
                 'text': 'Delete',
                 'color': 'red',
                 'callback': function () {
-                    ajaxRequest(
-                        // Controller:
-                        'environment',
-                        // Action:
-                        'delete-env',
-                        // Data:
-                        {
-                            id: id,
-                        },
-                        // Print success alert:
-                        true,
-                        // Print error alert:
-                        true
-                    ).then(function () {
-                        mylayout.reloadContentById('envs-div');
-                    });
+                    myenvironment.delete(id);
                 }
             }]
         }
diff --git a/www/public/resources/js/events/snapshot/browse.js b/www/public/resources/js/events/snapshot/browse.js
new file mode 100644
index 000000000..73969da93
--- /dev/null
+++ b/www/public/resources/js/events/snapshot/browse.js
@@ -0,0 +1,120 @@
+/**
+ *  Event: view snapshot file content
+ */
+$(document).on('click','.view-file',function () {
+    const name = $(this).attr('name');
+
+    mymodal.loading();
+    
+    ajaxRequest(
+        // Controller:
+        'repo/snapshot/browse',
+        // Action:
+        'view-file',
+        // Data:
+        {
+            path: $(this).attr('path')
+        },
+        // Print success alert:
+        false,
+        // Print error alert:
+        true
+    ).then(function () {
+        // Print the modal window with the log
+        mymodal.print(jsonValue.message, name, true);
+    });
+});
+
+/**
+ *  Event: show confirm box when selecting packages
+ */
+$(document).on('click',".package-checkbox",function (e) {
+    // Prevent parent to be triggered
+    e.stopPropagation();
+
+    const snapId = $('#packages-list').attr('snap-id');
+
+    // The buttons that will be displayed in the confirm box
+    var buttons = [];
+
+    // If no checkbox is selected then hide the buttons
+    if ($('body').find('input[name=packageName\\[\\]]:checked').length == 0) {
+        myconfirmbox.close();
+        return;
+    }
+
+    // Count the number of selected packages (across both tree and search results)
+    var count = $('body').find('input[type="checkbox"].package-checkbox:checked').length;
+
+    // Define confirm box buttons depending on the allowed actions
+
+    // Download is always allowed by default
+    buttons.push(
+        {
+            'text': 'Download',
+            'callback': function () {
+                mysnapshot.download();
+            }
+        }
+    );
+
+    if (myrepopermission.allowedAction('delete-package')) {
+        buttons.push(
+            {
+                'text': 'Delete',
+                'color': 'red',
+                'callback': function () {
+                    mysnapshot.delete(snapId);
+                }
+            }
+        );
+    }
+
+    // Show the confirm box
+    myconfirmbox.print(
+        {
+            'title': 'Select packages',
+            'message': count + ' file(s) selected.',
+            'id': 'select-package',
+            'buttons': buttons
+        }
+    );
+});
+
+/**
+ *  Event: submit the snapshot package upload form
+ *  Captures the form submission and uploads the selected packages via ajax
+ */
+$(document).on('submit', '#snapshot-upload', function (e) {
+    e.preventDefault();
+
+    // Upload the selected packages
+    mysnapshot.upload(this);
+});
+
+/**
+ *  Event: rebuild metadata
+ */
+$(document).on('click',"#snapshot-rebuild-btn",function () {
+    ajaxRequest(
+        // Controller:
+        'repo/snapshot/browse',
+        // Action:
+        'rebuild',
+        // Data:
+        {
+            snapId: $(this).attr('snap-id'),
+            gpgSign: $('input[type=checkbox][name=gpgSign]').is(':checked') ? 'true' : 'false'
+        },
+        // Print success alert:
+        true,
+        // Print error alert:
+        true
+    ).then(function () {
+        // Reload containers
+        mycontainer.reload('snapshot/kpi');
+        mycontainer.reload('snapshot/list');
+        // Close panel
+        mypanel.close('snapshot/rebuild');
+    });
+});
diff --git a/www/public/resources/js/events/task/actions.js b/www/public/resources/js/events/task/actions.js
index b381dc9ba..90d90fcf5 100644
--- a/www/public/resources/js/events/task/actions.js
+++ b/www/public/resources/js/events/task/actions.js
@@ -20,33 +20,13 @@ $(document).on('click','.show-step-content-btn',function () {
 
     if ($('.task-step-content[task-id="' + taskId + '"][step="' + step + '"]').is(':visible')) {
         $('.task-step-content[task-id="' + taskId + '"][step="' + step + '"]').hide();
+        $(this).removeClass('step-open');
     } else {
         $('.task-step-content[task-id="' + taskId + '"][step="' + step + '"]').css('display', 'grid');
+        $(this).addClass('step-open');
     }
 });
 
-/**
- *  Event: show logfile
- */
-$(document).on('click','.show-task-btn',function () {
-    var taskId = $(this).attr('task-id');
-
-    // Add a loading spinner to the container
-    $('#log-refresh-container').html('<div class="absolute min-height-50vh flex align-item-center justify-center"><img src="/assets/icons/loading.svg" class="icon" /></div>');
-
-    // Change URL without reloading the page
-    history.pushState(null, null, '/run/' + taskId);
-
-    // Reload task container to print the new task log
-    mycontainer.reload('tasks/log').then(function () {
-        // Restart log scroll event listener
-        scrollEventListener();
-
-        // Remove loading spinner
-        $('#log-refresh-container .loading-veil').remove();
-    });
-});
-
 /**
  *  Event: view task process log (debug log)
  */
@@ -234,6 +214,27 @@ $(document).on('click','.step-down-btn',function () {
     $('.task-step-content[task-id="' + taskId + '"][step="' + step + '"]').scrollTop($('.task-step-content[task-id="' + taskId + '"][step="' + step + '"]').scrollTop() + 100);
 });
 
+/**
+ *  Event: click on a selectable task item to toggle its hidden checkbox
+ */
+$(document).on('click', '.task-item-selectable', function (e) {
+    // Prevent parent to be triggered
+    e.stopPropagation(e);
+
+    // Ignore clicks on action icons and the details button
+    if ($(e.target).closest('.show-scheduled-task-info-btn, .relaunch-task-btn, .stop-task-btn, .task-checkbox-input, .view-task-log-btn').length) {
+        return;
+    }
+
+    // Find the hidden checkbox inside this task item and toggle it
+    var checkbox = $(this).find('.task-checkbox-input');
+
+    if (checkbox.length) {
+        // click() toggles the native checked state + fires click and change events
+        checkbox.click();
+    }
+});
+
 /**
  *  Event: show or hide scheduled task informations
  */
@@ -249,6 +250,19 @@ $(document).on('click','.show-scheduled-task-info-btn',function (e) {
     $('.scheduled-task-info[task-id="' + taskId + '"]').toggle();
 });
 
+/**
+ *  Event: toggle selected state on task-item when its hidden checkbox is toggled
+ */
+$(document).on('change', '.task-checkbox-input', function () {
+    var container = $(this).closest('.task-item');
+
+    if ($(this).is(':checked')) {
+        container.addClass('task-selected');
+    } else {
+        container.removeClass('task-selected');
+    }
+});
+
 /**
  *  Event: relaunch task
  */
@@ -256,6 +270,8 @@ $(document).on('click','.relaunch-task-btn',function (e) {
     // Prevent parent to be triggered
     e.stopPropagation();
 
+    myalert.print('Relaunching task...');
+
     ajaxRequest(
         // Controller:
         'task',
@@ -269,5 +285,7 @@ $(document).on('click','.relaunch-task-btn',function (e) {
         true,
         // Print error alert:
         true
-    );
+    ).then(function () {
+        mycontainer.reload('tasks/tasks');
+    });
 });
\ No newline at end of file
diff --git a/www/public/resources/js/events/task/stop.js b/www/public/resources/js/events/task/stop.js
index 73b63c333..73d8e2695 100644
--- a/www/public/resources/js/events/task/stop.js
+++ b/www/public/resources/js/events/task/stop.js
@@ -1,7 +1,10 @@
 /**
  *  Event: stop task
  */
-$(document).on('click','.stop-task-btn',function () {
+$(document).on('click','.stop-task-btn',function (e) {
+    // Prevent parent to be triggered
+    e.stopPropagation();
+
     myalert.print('Stopping task...');
 
     ajaxRequest(
@@ -17,5 +20,7 @@ $(document).on('click','.stop-task-btn',function () {
         true,
         // Print error alert:
         true
-    );
+    ).then(function () {
+        mycontainer.reload('tasks/tasks');
+    });
 });
\ No newline at end of file
diff --git a/www/public/resources/js/functions.js b/www/public/resources/js/functions.js
index 3a88a68b5..0f0eb6b1d 100644
--- a/www/public/resources/js/functions.js
+++ b/www/public/resources/js/functions.js
@@ -209,19 +209,24 @@ function empty(value)
  */
 function printEnv(env, selector)
 {
-    // Default colors
-    var background = '#ffffff';
-    var color = '#000000';
+    // Default: outlined style with subtle gray
+    var color = '#c0d0e2';
+    var border = '1.5px solid #c0d0e2';
+    var background = 'transparent';
 
     // Check if the environment color is set in localStorage
     if (localStorage.getItem('env/' + env) !== null) {
-        definition = JSON.parse(localStorage.getItem('env/' + env));
-        color = definition.color;
-        background = definition.background;
+        var definition = JSON.parse(localStorage.getItem('env/' + env));
+
+        if (definition.background && definition.background !== '#ffffff') {
+            // Use configured color for border and text (outlined style)
+            color = definition.background;
+            border = '1.5px solid ' + definition.background;
+        }
     }
 
     // Generate html
-    var html = '⸺<span class="env" style="background-color: ' + background + '; color: ' + color + ';">' + env + '</span>';
+    var html = '⸺<span class="env" style="background-color: ' + background + '; color: ' + color + '; border: ' + border + ';">' + env + '</span>';
 
     // Print environment
     $(selector).html(html);
diff --git a/www/public/resources/js/functions/browse.js b/www/public/resources/js/functions/browse.js
deleted file mode 100644
index 97418185f..000000000
--- a/www/public/resources/js/functions/browse.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- *  Download package
- */
-function downloadPackage()
-{
-    packagesToDownload = [];
-
-    /**
-     *  Get all selected checkboxes and their file-id (media) attribute
-     */
-    $('#packages-list, #browse-search-results').find('input[name=packageName\\[\\]]:checked').each(function () {
-        packagesToDownload.push({ filename: $(this).attr('filename'), path: $(this).attr('path') });
-    });
-
-    /**
-     *  Append a temporary <a> element to download files
-     */
-    var temporaryDownloadLink = document.createElement("a");
-    temporaryDownloadLink.style.display = 'none';
-
-    document.body.appendChild(temporaryDownloadLink);
-
-    for (var n = 0; n < packagesToDownload.length; n++) {
-        var download = packagesToDownload[n];
-        temporaryDownloadLink.setAttribute('href', '/repo/' + download.path);
-        temporaryDownloadLink.setAttribute('download', download.filename);
-
-        /**
-         *  Click on the <a> element to start download
-         */
-        temporaryDownloadLink.click();
-    }
-
-    /**
-     *  Remove temporary <a> element
-     */
-    document.body.removeChild(temporaryDownloadLink);
-}
-
-/**
- * Delete packages
- * @param {*} snapId
- */
-function deletePackages(snapId)
-{
-    var packages = [];
-
-    myalert.print('Deleting packages...');  
-
-    // Get the path of the selected packages
-    $('body').find('input[name=packageName\\[\\]]:checked').each(function () {
-        packages.push($(this).attr('path'));
-    });
-
-    ajaxRequest(
-        // Controller:
-        'repo/snapshot/browse',
-        // Action:
-        'delete-package',
-        {
-            snapId: snapId,
-            packages: packages
-        },
-        // Print success alert:
-        false,
-        // Print error alert:
-        true
-    ).then(function () {
-        // Reload packages list and actions
-        mycontainer.reload('browse/list');
-        mycontainer.reload('browse/actions');
-
-        // Print packages that have been deleted
-        var deletedNames = jsonValue.message.map(function (pkg) { return pkg.name; });
-        var maxDisplay = 10;
-        var message = 'Packages deleted: <br>' + deletedNames.slice(0, maxDisplay).join('<br>');
-        if (deletedNames.length > maxDisplay) {
-            message += '<br>+' + (deletedNames.length - maxDisplay) + ' more...';
-        }
-        myalert.print(message, 'success');
-    });
-}
\ No newline at end of file
diff --git a/www/public/resources/js/functions/environment.js b/www/public/resources/js/functions/environment.js
deleted file mode 100644
index ae8822057..000000000
--- a/www/public/resources/js/functions/environment.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- *  Add new environment
- */
-function addEnv()
-{
-    var name = $('input[type="text"][name="add-env-name"]').val();
-    var color = $('input[type="color"][name="add-env-color"]').val();
-
-    ajaxRequest(
-        // Controller:
-        'environment',
-        // Action:
-        'add-env',
-        // Data:
-        {
-            name: name,
-            color: color
-        },
-        // Print success alert:
-        true,
-        // Print error alert:
-        true
-    ).then(function () {
-        mylayout.reloadContentById('envs-div');
-    });
-}
-
-/**
- *  Edit environments color and name
- */
-function editEnv()
-{
-    var envs = [];
-
-    $('#current-envs-div').find('.env-line').each(function () {
-        var name = $(this).find('input[type="text"][name="env-name"]').val();
-        var color = $(this).find('input[type="color"][name="env-color"]').val();
-
-        envs.push({
-            name: name,
-            color: color
-        });
-    });
-
-    ajaxRequest(
-        // Controller:
-        'environment',
-        // Action:
-        'edit-env',
-        // Data:
-        {
-            envs: envs,
-        },
-        // Print success alert:
-        true,
-        // Print error alert:
-        true
-    ).then(function () {
-        mylayout.reloadContentById('envs-div');
-    });
-}
diff --git a/www/public/resources/js/functions/task.js b/www/public/resources/js/functions/task.js
index 03519fe15..be9a1d569 100644
--- a/www/public/resources/js/functions/task.js
+++ b/www/public/resources/js/functions/task.js
@@ -4,17 +4,17 @@
 function autorefresh()
 {
     // Ignore refresh if 'legacy' attribute is set
-    if ($('#log-refresh-container').attr('legacy') == 'true') {
+    if ($('#task-refresh-container').attr('legacy') == 'true') {
         return;
     }
 
     // Autorefresh with new steps and content every 2sec
     setInterval(function () {
         // Retrieve task Id
-        var taskId = $('#log-refresh-container').attr('task-id');
+        var taskId = $('#task-refresh-container').attr('task-id');
 
         // Ignore refresh if task is not running (wait for 2sec and try again)
-        if ($('#log-refresh-container').attr('task-status') != 'running') {
+        if ($('#task-refresh-container').attr('task-status') != 'running') {
             return;
         }
 
@@ -67,11 +67,12 @@ function autorefresh()
                 var status = jsonValue.message;
 
                 // Refresh task status in the DOM, if the task is not running anymore, this will prevent the task from refreshing again
-                $('#log-refresh-container').attr('task-status', status);
+                $('#task-refresh-container').attr('task-status', status);
 
-                // Remove the autoscroll button if the task is done, error or stopped
+                // Remove the autoscroll and stop buttons if the task is done, error or stopped
                 if (status == 'done' || status == 'error' || status == 'stopped') {
                     $('#autoscroll-btn').remove();
+                    $('#stop-task-log-btn').remove();
                 }
             });
         }).finally(function () {
@@ -87,11 +88,11 @@ function autorefresh()
 function enableAutoScroll()
 {
     // Autoscroll can be enabled only if the task is running
-    if ($('#log-refresh-container').attr('task-status') == 'running') {
+    if ($('#task-refresh-container').attr('task-status') == 'running') {
         // Set autoscroll cookie to true to enable autoscroll
         mycookie.set('autoscroll', 'true');
 
-        $('#autoscroll-btn').find('img').attr('src', '/assets/icons/pause.svg');
+        $('#autoscroll-btn').find('.round-btn-icon').css('--icon', "url('/assets/icons/pause.svg')");
         $('#autoscroll-btn').addClass('round-btn-yellow').removeClass('round-btn-green');
         $('#autoscroll-btn').attr('title', 'Disable auto refresh and scroll');
 
@@ -112,7 +113,7 @@ function disableAutoScroll()
         // Set autoscroll cookie to false to disable autoscroll
         mycookie.set('autoscroll', 'false');
 
-        $('#autoscroll-btn').find('img').attr('src', '/assets/icons/play.svg');
+        $('#autoscroll-btn').find('.round-btn-icon').css('--icon', "url('/assets/icons/play.svg')");
         $('#autoscroll-btn').addClass('round-btn-green').removeClass('round-btn-yellow');
         $('#autoscroll-btn').attr('title', 'Enable auto refresh and scroll');
 
@@ -135,7 +136,7 @@ function refreshStepsInDOM(steps)
             var autoscroll = false;
 
             // Retrieve task Id
-            var taskId = $('#log-refresh-container').attr('task-id');
+            var taskId = $('#task-refresh-container').attr('task-id');
 
             // Parse steps JSON
             steps = JSON.parse(JSON.stringify(steps));
diff --git a/www/public/resources/js/host.js b/www/public/resources/js/host.js
index 14945363f..fcbcd1af9 100644
--- a/www/public/resources/js/host.js
+++ b/www/public/resources/js/host.js
@@ -1,53 +1,3 @@
-/**
- *  Fonctions
- */
-
-/**
- *  Rechercher un paquet dans le tableau des paquets installés sur l'hôte
- */
-function filterPackage()
-{
-    var input, filter, i
-
-    /**
-     *  Retrieve the input value
-     */
-    input = document.getElementById("installed-packages-search");
-    filter = input.value.toUpperCase();
-
-    /**
-     *  Retrieve package rows
-     */
-    container = document.getElementById("installed-packages-container");
-    packageRow = container.getElementsByClassName("package-row");
-
-    /**
-     *  Loop through all rows, and hide those who don't match the search query
-     */
-    for (i = 0; i < packageRow.length; i++) {
-        /**
-         *  Retrieve current row package name and version
-         */
-        packageName = packageRow[i].getAttribute('packagename');
-        packageVersion = packageRow[i].getAttribute('packageversion');
-
-        /**
-         *  If a package name or version matches the filter, then show the row, else hide it
-         */
-        if (packageName && packageVersion) {
-            if (packageName.toUpperCase().indexOf(filter) > -1 || packageVersion.toUpperCase().indexOf(filter) > -1) {
-                packageRow[i].style.display = "";
-            } else {
-                packageRow[i].style.display = "none";
-            }
-        }
-    }
-}
-
-/**
- *  Events listeners
- */
-
 /**
  *  Event: Search hosts on 'kernel' mouse hover
  */
@@ -183,7 +133,7 @@ $(document).on('mouseenter',".hosts-charts-list-label[chart-type=profile]",funct
 /**
  *  Event: Create new group
  */
-$(document).on('submit','#newGroupForm',function (e) {
+$(document).on('submit','form#new-group',function (e) {
     e.preventDefault();
 
     ajaxRequest(
@@ -193,7 +143,7 @@ $(document).on('submit','#newGroupForm',function (e) {
         'new',
         // Data:
         {
-            name: $("#newGroupInput").val(),
+            name: $(this).find('input[name="group-name"]').val(),
             type: 'host'
         },
         // Print success alert:
@@ -214,9 +164,7 @@ $(document).on('submit','#newGroupForm',function (e) {
  *  Event: Print group configuration div
  */
 $(document).on('click','.group-config-btn',function () {
-    var id = $(this).attr('group-id');
-
-    slide('.group-config-div[group-id="' + id + '"]');
+    slide('.group-config-div[group-id="' + $(this).attr('group-id') + '"]');
 });
 
 /**
@@ -317,38 +265,38 @@ $(document).on('click','#installed-packages-btn',function () {
     }
 });
 
+/**
+ *  Event: debounced search in the inventoried packages list
+ */
+var installedPackagesSearchTimeout = null;
+$(document).on('input', '#installed-packages-search', function () {
+    var search = $(this).val();
+
+    clearTimeout(installedPackagesSearchTimeout);
+    installedPackagesSearchTimeout = setTimeout(function () {
+        mycookie.set('tables/host/installed-packages/search', search, 1);
+        mycookie.set('tables/host/installed-packages/offset', 0, 1);
+        mytable.reload('host/installed-packages', 0);
+    }, 300);
+});
+
 /**
  *  Event: click 'Select all' available packages
  */
 $(document).on('click','.available-package-select-all',function () {
-    /**
-     *  Retrieve all available packages checkboxes
-     */
-    var checkboxes = $('.available-package-checkbox');
+    // Retrieve all available packages checkboxes
+    const checkboxes = $('.available-package-checkbox');
 
-    /**
-     *  Retrieve select btn status
-     */
-    var selectStatus = $(this).attr('status');
-
-    /**
-     *  If current status is not 'selected', then select all the packages
-     */
-    if (selectStatus != 'selected') {
-        /**
-         *  Loop through all checkboxes and check them
-         */
+    // If current status is not 'selected', then select all the packages
+    if ($(this).attr('status') != 'selected') {
+        // Loop through all checkboxes and check them
         checkboxes.each(function () {
-            /**
-             *  If package is excluded then don't select it
-             */
+            // If package is excluded then don't select it
             if ($(this).attr('excluded') == 'true') {
                 return;
             }
 
-            /**
-             *  Check the checkbox if it is not already checked
-             */
+            // Check the checkbox if it is not already checked
             if (!$(this).is(':checked')) {
                 $(this).click();
             }
@@ -357,9 +305,7 @@ $(document).on('click','.available-package-select-all',function () {
         // Set status
         $(this).attr('status', 'selected');
 
-    /**
-     *  Otherwise, uncheck all checkboxes
-     */
+    // Otherwise, uncheck all checkboxes
     } else {
         checkboxes.each(function () {
             if ($(this).is(':checked')) {
@@ -379,11 +325,6 @@ $(document).on('click','.request-show-log-btn',function (e) {
     // Prevent parent to be triggered
     e.stopPropagation();
 
-    /**
-     *  Retrieve request id
-     */
-    var id = $(this).attr('request-id');
-
     ajaxRequest(
         // Controller:
         'host',
@@ -391,7 +332,7 @@ $(document).on('click','.request-show-log-btn',function (e) {
         'getRequestLog',
         // Data:
         {
-            id: id
+            id: $(this).attr('request-id')
         },
         // Print success alert:
         false,
@@ -438,22 +379,13 @@ $(document).on('click','.request-show-package-log-btn',function (e) {
  *  Event: show request log details
  */
 $(document).on('click','.request-show-more-info-btn',function () {
-    var id = $(this).attr('request-id');
-    $('div.request-details[request-id="' + id + '"]').toggle();
+    $('div.request-details[request-id="' + $(this).attr('request-id') + '"]').toggle();
 });
 
 /**
  *  Event: cancel a request sent to a host
  */
 $(document).on('click','.cancel-request-btn',function () {
-    /**
-     *  Retrieve request id
-     */
-    var id = $(this).attr('request-id');
-
-    /**
-     *  Cancel request
-     */
     ajaxRequest(
         // Controller:
         'host',
@@ -461,7 +393,7 @@ $(document).on('click','.cancel-request-btn',function () {
         'cancelRequest',
         // Data:
         {
-            id: id
+            id: $(this).attr('request-id')
         },
         // Print success alert:
         true,
@@ -475,10 +407,10 @@ $(document).on('click','.cancel-request-btn',function () {
 /**
  *  Event: print package history
  */
-$(document).on('click','.get-package-timeline',function () {
-    var hostid = $(this).attr('hostid');
-    var packageName = $(this).attr('packagename');
-    var title = packageName.toUpperCase() + ' HISTORY';
+$(document).on('click','.get-package-timeline',function (e) {
+    e.preventDefault();
+
+    const packageName = $(this).attr('packagename')
 
     mymodal.loading();
 
@@ -489,7 +421,7 @@ $(document).on('click','.get-package-timeline',function () {
         'getPackageTimeline',
         // Data:
         {
-            hostid: hostid,
+            hostid: $(this).attr('hostid'),
             packagename: packageName
         },
         // Print success alert:
@@ -497,7 +429,7 @@ $(document).on('click','.get-package-timeline',function () {
         // Print error alert:
         true
     ).then(function () {
-        mymodal.print(jsonValue.message, title, false)
+        mymodal.print(jsonValue.message, packageName.toUpperCase(), false)
     });
 });
 
diff --git a/www/public/resources/js/task.js b/www/public/resources/js/task.js
index 924d55a12..10504ea15 100644
--- a/www/public/resources/js/task.js
+++ b/www/public/resources/js/task.js
@@ -3,29 +3,19 @@
  */
 function newRepoFormPrintFields()
 {
-    /**
-     *  Search for the type of repo and the type of packages selected in the task form whose
-     *  action is 'create' (form for creating a new repo)
-     */
+    // Retrieve the value of the 'repoType' radio button
+    const repoType = $('.task-form-params[action="create"]').find('input:radio[name="repo-type"]:checked').val();
 
-    /**
-     *  Retrieve the value of the 'repoType' radio button
-     */
-    var repoType = $('.task-form-params[action="create"]').find('input:radio[name="repo-type"]:checked').val();
+    // Retrieve the value of the 'package-type' radio button
+    const packageType = $('.task-form-params[action="create"]').find('input:radio[name="package-type"]:checked').val();
 
-    /**
-     *  Retrieve the value of the 'package-type' radio button
-     */
-    var packageType = $('.task-form-params[action="create"]').find('input:radio[name="package-type"]:checked').val();
+    // Match the form block accent color with the selected package type
+    $('.task-form-params[action="create"]').removeClass('form-block-accent-blue form-block-accent-red').addClass(packageType == 'deb' ? 'form-block-accent-red' : 'form-block-accent-blue');
 
-    /**
-     *  Hide all fields
-     */
+    // Hide all fields
     $('.task-form-params').find('[field-type]').hide();
 
-    /**
-     *  Depending on the type of repo and packages selected, display only the fields related to this type of repo and packages.
-     */
+    // Depending on the type of repo and packages selected, display only the fields related to this type of repo and packages
     $('.task-form-params').find('[field-type~=' + repoType + '][field-type~=' + packageType + ']').show();
 }
 
@@ -129,65 +119,67 @@ $(document).on('change','select.task-param[param-name="schedule-frequency"]',fun
     }
 }).trigger('change');
 
+/**
+ *  Event: click on a snap-container to select the snapshot
+ *  Do not trigger if the user clicked on a link (<a>) or an environment tag (.snap-env)
+ */
+$(document).on('click', '.snap-container', function (e) {
+    // Ignore clicks on links, environment tags/containers, or the checkbox itself
+    if ($(e.target).closest('a, .snap-env-container, .snap-env, input[name="checkbox-repo"]').length) {
+        return;
+    }
+
+    // Find the checkbox inside this container and toggle it
+    var checkbox = $(this).find('input[name="checkbox-repo"]');
+
+    if (checkbox.length) {
+        checkbox.click();
+    }
+});
+
+/**
+ *  Event: toggle selected state on snap-container when checkbox is checked/unchecked
+ */
+$(document).on('change', 'input[name="checkbox-repo"]', function () {
+    var container = $(this).closest('.snap-container');
+
+    if ($(this).is(':checked')) {
+        container.addClass('snap-selected');
+    } else {
+        container.removeClass('snap-selected');
+    }
+});
+
 /**
  *  Event: when a checkbox is checked/unchecked
  */
 $(document).on('click',"input[name=checkbox-repo]",function () {
-    /**
-     *  The buttons that will be displayed in the confirm box
-     */
+    // The buttons that will be displayed in the confirm box
     var buttons = [];
 
-    /**
-     *  The list of allowed actions the user can execute on the selected repositories
-     *  By default: all, unless the user has specific permissions
-     *  Those permissions are later verified by the server so even if the user tries to execute an action he is not allowed to, it will not work
-     */
-    var allowedActions = ['update', 'duplicate', 'env', 'rebuild', 'rename', 'edit', 'install', 'delete'];
-
-    /**
-     *  Retrieve checkbox's group id
-     */
-    var groupId = $(this).attr('group-id');
+    // Retrieve checkbox's group id
+    const groupId = $(this).attr('group-id');
 
-    /**
-     *  Count the number of checked checkboxes
-     */
-    var count_checked = $('.reposList').find('input[name=checkbox-repo]:checked').length;
+    // Count the number of checked checkboxes
+    const count_checked = $('#repositories-list').find('input[name=checkbox-repo]:checked').length;
 
-    /**
-     *  If all checkboxes are unchecked then we hide all action buttons
-     */
+    // If all checkboxes are unchecked then we hide all action buttons
     if (count_checked == 0) {
         myconfirmbox.close();
-        $('.reposList').find('input[name=checkbox-repo]').removeAttr('style');
-        $('.repos-list-group[group-id=' + groupId + ']').find('.repos-list-group-select-all-btns').hide();
+        $('#repositories-list').find('input[name=checkbox-repo]').removeAttr('style');
+        $('#repositories-list').find('.snap-container').removeClass('snap-selected');
+        $('.repos-list-group[group-id=' + groupId + ']').find('.repos-list-group-select-latest-btns').addClass('hide').hide();
+        $('.repos-list-group[group-id=' + groupId + ']').find('.repos-list-select-all-btns').addClass('hide').hide();
+        $('.repos-list-group-select-latest-btns[group-id="' + groupId + '"]').attr('status', '').find('input[type="checkbox"]').prop('checked', false);
+        $('.repos-list-select-all-btns[group-id="' + groupId + '"]').attr('status', '').find('input[type="checkbox"]').prop('checked', false);
         return;
     }
 
-    /**
-     *  Get permissions from cookie
-     */
-    if (mycookie.exists('user_permissions')) {
-        var userPermissions = JSON.parse(mycookie.get('user_permissions'));
-
-        // Reset allowed actions array
-        var allowedActions = [];
-
-        // Loop through all permissions and check if the user has the permission to execute the action
-        if (userPermissions.repositories && userPermissions.repositories['allowed-actions']) {
-            var allowedActions = userPermissions.repositories['allowed-actions'];
-        }
-    }
-
-    /**
-     *  Define confirm box buttons depending on the allowed actions
-     */
-    if (allowedActions.includes('update')) {
+    // Define confirm box buttons depending on the allowed actions
+    if (myrepopermission.allowedAction('update')) {
         buttons.push(
             {
                 'text': 'Update',
-                'color': 'blue-alt',
                 'callback': function () {
                     executeAction('update')
                 }
@@ -195,11 +187,10 @@ $(document).on('click',"input[name=checkbox-repo]",function () {
         );
     }
 
-    if (allowedActions.includes('duplicate')) {
+    if (myrepopermission.allowedAction('duplicate')) {
         buttons.push(
             {
                 'text': 'Duplicate',
-                'color': 'blue-alt',
                 'callback': function () {
                     executeAction('duplicate');
                 }
@@ -207,11 +198,10 @@ $(document).on('click',"input[name=checkbox-repo]",function () {
         );
     }
 
-    if (allowedActions.includes('env')) {
+    if (myrepopermission.allowedAction('env')) {
         buttons.push(
             {
                 'text': 'Point an environment',
-                'color': 'blue-alt',
                 'callback': function () {
                     executeAction('env');
                 }
@@ -219,11 +209,10 @@ $(document).on('click',"input[name=checkbox-repo]",function () {
         );
     }
 
-    if (allowedActions.includes('rebuild')) {
+    if (myrepopermission.allowedAction('rebuild')) {
         buttons.push(
             {
                 'text': 'Rebuild',
-                'color': 'blue-alt',
                 'callback': function () {
                     executeAction('rebuild');
                 }
@@ -231,23 +220,10 @@ $(document).on('click',"input[name=checkbox-repo]",function () {
         );
     }
 
-    if (allowedActions.includes('rename')) {
-        buttons.push(
-            {
-                'text': 'Rename',
-                'color': 'blue-alt',
-                'callback': function () {
-                    executeAction('rename');
-                }
-            }
-        );
-    }
-
-    if (allowedActions.includes('edit')) {
+    if (myrepopermission.allowedAction('edit')) {
         buttons.push(
             {
                 'text': 'Edit',
-                'color': 'blue-alt',
                 'callback': function () {
                     executeAction('edit')
                 }
@@ -259,14 +235,13 @@ $(document).on('click',"input[name=checkbox-repo]",function () {
     buttons.push(
         {
             'text': 'Install',
-            'color': 'blue-alt',
             'callback': function () {
                 executeAction('install')
             }
         }
     );
 
-    if (allowedActions.includes('delete')) {
+    if (myrepopermission.allowedAction('delete')) {
         buttons.push(
             {
                 'text': 'Delete',
@@ -287,19 +262,31 @@ $(document).on('click',"input[name=checkbox-repo]",function () {
         }
     );
 
-    /**
-     *  Show 'select all latest snapshots' buttons
-     */
-    $('.repos-list-group[group-id=' + groupId + ']').find('.repos-list-group-select-all-btns').css('display', 'flex');
+    // Show 'select all latest snapshots' buttons
+    $('.repos-list-group[group-id=' + groupId + ']').find('.repos-list-group-select-latest-btns').removeClass('hide').css('display', 'flex');
+    $('.repos-list-group[group-id=' + groupId + ']').find('.repos-list-select-all-btns').removeClass('hide').css('display', 'flex');
 
     /**
      *  If there is at least 1 checkbox checked then we display all the other checkboxes
      *  All checked checkboxes are set to opacity = 1
      */
-    $('.reposList').find('input[name=checkbox-repo]').css("visibility", "visible");
-    $('.reposList').find('input[name=checkbox-repo]:checked').css("opacity", "1");
+    $('#repositories-list').find('input[name=checkbox-repo]').css("visibility", "visible");
+    $('#repositories-list').find('input[name=checkbox-repo]:checked').css("opacity", "1");
+
+    syncRepoGroupSelectionButtons(groupId);
 });
 
+function syncRepoGroupSelectionButtons(groupId)
+{
+    const checkedInGroup = $('.repos-list-group[group-id=' + groupId + ']').find('input[name=checkbox-repo]:checked').length;
+
+    // Keep both buttons in sync when a group has no selected snapshots.
+    if (checkedInGroup === 0) {
+        $('.repos-list-group-select-latest-btns[group-id="' + groupId + '"]').attr('status', '').find('input[type="checkbox"]').prop('checked', false);
+        $('.repos-list-select-all-btns[group-id="' + groupId + '"]').attr('status', '').find('input[type="checkbox"]').prop('checked', false);
+    }
+}
+
 function executeAction(action)
 {
     var repos = [];
@@ -307,7 +294,7 @@ function executeAction(action)
     /**
      *  Loop through all checked repos and retrieve their id
      */
-    $('.reposList').find('input[name=checkbox-repo]:checked').each(function () {
+    $('#repositories-list').find('input[name=checkbox-repo]:checked').each(function () {
         var obj = {};
 
         /**
@@ -352,43 +339,41 @@ function executeAction(action)
 }
 
 /**
- *  Event: Click on 'select all latest snapshots' button
+ *  Event: Click on snapshots selection buttons ('latest' or 'all')
  */
-$(document).on('click',".repos-list-group-select-all-btns",function () {
-    /**
-     *  Retrieve group Id
-     */
-    var groupId = $(this).attr('group-id');
+$(document).on('click', '.repos-list-group-select-latest-btns, .repos-list-select-all-btns', function () {
+    var latestRepoId = '';
+    const isLatestButton = $(this).hasClass('repos-list-group-select-latest-btns');
+    const buttonSelector = isLatestButton ? '.repos-list-group-select-latest-btns' : '.repos-list-select-all-btns';
+    const oppositeButtonSelector = isLatestButton ? '.repos-list-select-all-btns' : '.repos-list-group-select-latest-btns';
 
-    /**
-     *  Retrieve all repos in the group
-     */
-    var reposCheckboxes = $('.repos-list-group[group-id=' + groupId + ']').find('input[name=checkbox-repo]');
+    // Retrieve group Id
+    const groupId = $(this).attr('group-id');
 
-    /**
-     *  Retrieve select status
-     */
-    var selectStatus = $(this).attr('status');
+    // Retrieve all repos in the group
+    const reposCheckboxes = $('.repos-list-group[group-id=' + groupId + ']').find('input[name=checkbox-repo]');
 
-    /**
-     *  If current status is not 'selected', then select all the latest snaps
-     */
-    if (selectStatus != 'selected') {
-        /**
-         *  Loop through all checkboxes and check the latest snap
-         *  The latest snap is the first snap in the list (the first checkbox of each repo)
-         */
-        latestRepoId = '';
+    // Retrieve select status
+    const status = $(this).attr('status');
+
+    // If current status is not 'selected', then select snapshots according to button type
+    if (status != 'selected') {
         reposCheckboxes.each(function () {
-            // Click the checkbox if it matches the latest snap
-            if ($(this).attr('repo-id') != latestRepoId) {
-                // Click the checkbox if not already checked
-                if (!$(this).is(':checked')) {
-                    $(this).click();
+            if (isLatestButton) {
+                // The latest snap is the first snap in the list for each repo.
+                if ($(this).attr('repo-id') != latestRepoId) {
+                    if (!$(this).is(':checked')) {
+                        $(this).click();
+                    }
+                } else {
+                    // Make sure only latest snapshots remain selected.
+                    if ($(this).is(':checked')) {
+                        $(this).click();
+                    }
                 }
-            // Otherwise, uncheck the checkbox to make sure only the latest snaps are checked
             } else {
-                if ($(this).is(':checked')) {
+                // Select all snapshots.
+                if (!$(this).is(':checked')) {
                     $(this).click();
                 }
             }
@@ -397,35 +382,37 @@ $(document).on('click',".repos-list-group-select-all-btns",function () {
         });
 
         // Set status
-        $(this).attr('status', 'selected');
+        $(buttonSelector + '[group-id="' + groupId + '"]').attr('status', 'selected');
+        $(oppositeButtonSelector + '[group-id="' + groupId + '"]').attr('status', '').find('input[type="checkbox"]').prop('checked', false);
 
-        // Make sure the 'Select latest snapshots' button is visible and its checkbox is checked
-        $('.repos-list-group-select-all-btns[group-id="' + groupId + '"]').css('display', 'flex');
-        $('.repos-list-group-select-all-btns[group-id="' + groupId + '"]').css('opacity', '1');
-        $('.repos-list-group-select-all-btns[group-id="' + groupId + '"]').css('filter', 'initial');
-        $('.repos-list-group-select-all-btns[group-id="' + groupId + '"]').find('input[type="checkbox"]').prop('checked', true);
+        // Make sure the active selection button is visible and checked.
+        $(buttonSelector + '[group-id="' + groupId + '"]').removeClass('hide').css('display', 'flex');
+        $(buttonSelector + '[group-id="' + groupId + '"]').css('opacity', '1');
+        $(buttonSelector + '[group-id="' + groupId + '"]').css('filter', 'initial');
+        $(buttonSelector + '[group-id="' + groupId + '"]').find('input[type="checkbox"]').prop('checked', true);
 
-    /**
-     *  Otherwise, uncheck all checkboxes
-     */
-    } else {
-        reposCheckboxes.each(function () {
-            if ($(this).is(':checked')) {
-                $(this).click();
-            }
-        });
+        return;
+    }
 
-        // Set status
-        $(this).attr('status', '');
+    // Otherwise, uncheck all checkboxes in the group
+    reposCheckboxes.each(function () {
+        if ($(this).is(':checked')) {
+            $(this).click();
+        }
+    });
+
+    // Set status and visual state on both buttons when no selection remains.
+    syncRepoGroupSelectionButtons(groupId);
 
-        // Make sure the 'Select latest snapshots' button is hidden and its checkbox is unchecked
-        $('.repos-list-group-select-all-btns[group-id="' + groupId + '"]').hide();
-        $('.repos-list-group-select-all-btns[group-id="' + groupId + '"]').css('opacity', '');
-        $('.repos-list-group-select-all-btns[group-id="' + groupId + '"]').css('filter', '');
-        $('.repos-list-group-select-all-btns[group-id="' + groupId + '"]').find('input[type="checkbox"]').prop('checked', false);
+    if ($('.repos-list-group[group-id=' + groupId + ']').find('input[name=checkbox-repo]:checked').length === 0) {
+        $('.repos-list-group-select-latest-btns[group-id="' + groupId + '"]').addClass('hide').hide().css('opacity', '').css('filter', '');
+        $('.repos-list-select-all-btns[group-id="' + groupId + '"]').addClass('hide').hide().css('opacity', '').css('filter', '');
     }
 });
 
+
+
+
 /**
  *  Event: Schedule a task
  */
@@ -440,11 +427,13 @@ $(document).on('click',".task-schedule-btn", function () {
      */
     if ($(this).is(':checked')) {
         form.find('.task-schedule-params').show();
-        form.find('.task-confirm-btn').css('background-color', '#15bf7f');
+        form.find('.task-confirm-btn').removeClass('btn-large-red');
+        form.find('.task-confirm-btn').addClass('btn-large-green');
         form.find('.task-confirm-btn').html('Schedule');
     } else {
         form.find('.task-schedule-params').hide();
-        form.find('.task-confirm-btn').css('background-color', '#F32F63');
+        form.find('.task-confirm-btn').removeClass('btn-large-green');
+        form.find('.task-confirm-btn').addClass('btn-large-red');
         form.find('.task-confirm-btn').html('Execute now');
     }
 });
@@ -591,7 +580,7 @@ $(document).on('submit','#task-form',function (e) {
         // Controller:
         'task',
         // Action:
-        'validateForm',
+        'validate-execute',
         // Data:
         {
             taskParams: taskParamsJson,
@@ -604,8 +593,10 @@ $(document).on('submit','#task-form',function (e) {
         mypanel.close();
 
         // Uncheck all checkboxes and remove all styles JQuery could have applied
-        $('.reposList').find('input[name=checkbox-repo]').prop('checked', false);
-        $('.reposList').find('input[name=checkbox-repo]').removeAttr('style');
+        $('#repositories-list').find('input[name=checkbox-repo]').prop('checked', false);
+        $('#repositories-list').find('input[name=checkbox-repo]').removeAttr('style');
+
+        mycontainer.reload('repos/kpi');
     });
 
     return false;
diff --git a/www/public/resources/styles/common.css b/www/public/resources/styles/common.css
index b22f1270b..957d4b87d 100644
--- a/www/public/resources/styles/common.css
+++ b/www/public/resources/styles/common.css
@@ -1,5 +1,5 @@
 /**
- *  v1.21
+ *  v1.22
  */
 @font-face{font-family: 'Roboto'; src: url('/assets/fonts/Roboto/Roboto-Regular.ttf') format('truetype');}
 
@@ -54,7 +54,7 @@ h1, h2, h3, h4 {
 h3 {
     width: max-content;
     font-size: 18px;
-    margin: 50px 0 40px 0;
+    margin: 40px 0 40px 0;
     border-bottom: 1px solid #15bf7f;
 }
 
@@ -118,7 +118,8 @@ h6 {
     padding: 18px;
     margin-top: 15px;
     margin-bottom: 15px;
-    border: 1px dashed #5473e8;
+    /* border: 1px dashed #5473e8; */
+    border: 1px dashed #24405c;
     border-radius: 20px;
     background-color: #13263a;
 }
@@ -181,6 +182,8 @@ pre.codeblock {
 .text-right { text-align: right; }
 .relative { position: relative; }
 .pointer { cursor: pointer; }
+.nopointer{cursor:default!important}
+.notallowed{cursor:not-allowed!important}
 .bold { font-weight: bold; }
 .greentext{color:#15bf7f !important}
 .redtext{color:#F32F63 !important}
@@ -219,6 +222,7 @@ pre.codeblock {
 .flex-div-15 { flex: 0 0 14%; }.flex-div-20 { flex: 0 0 19%; }.flex-div-25 { flex: 0 0 24%; }.flex-div-30 { flex: 0 0 29%; }
 .flex-div-33 { flex: 0 0 32%; }.flex-div-40 { flex: 0 0 39%; }.flex-div-50 { flex: 0 0 48.5%; }.flex-div-60 { flex: 0 0 59%; }
 .flex-div-65 { flex: 0 0 64%; }.flex-div-68 { flex: 0 0 67%; }.flex-div-80 { flex: 0 0 79%; }.flex-div-90 { flex: 0 0 90%; }.flex-div-100 { flex: 0 0 98%; }
+.flex-1{flex:1;}
 .flex-grow { flex-grow: 1; }
 .flex-wrap { flex-wrap: wrap; }
 .flex-nowrap { flex-wrap: nowrap; }
@@ -245,6 +249,7 @@ pre.codeblock {
 /* For responsive */
 /* column on mobile */
 .flexrc{display:flex;flex-direction: column;}
+.flex-wrap-mobile{flex-wrap:wrap;}
 .hide-mobile{display:none!important;}
 .justify-center {justify-content: center}
 .justify-space-between {justify-content: space-between}
@@ -276,10 +281,10 @@ pre.codeblock {
 .margin-top-0 {margin-top: 0px !important}.margin-top-5 {margin-top: 5px !important}.margin-top-8{margin-top:8px!important}.margin-top-10 {margin-top: 10px !important}.margin-top-15 {margin-top: 15px !important}.margin-top-20 {margin-top: 20px !important}.margin-top-30 {margin-top: 30px !important}.margin-top-40 {margin-top: 40px !important}.margin-top-50{margin-top:50px !important}
 .margin-bottom-0 {margin-bottom: 0px !important}.margin-bottom-5 {margin-bottom: 5px !important}.margin-bottom-8{margin-bottom:8px!important}.margin-bottom-10 {margin-bottom: 10px !important}.margin-bottom-15 {margin-bottom: 15px !important}.margin-bottom-20 {margin-bottom: 20px !important}.margin-bottom-30 {margin-bottom: 30px !important}.margin-bottom-40 {margin-bottom: 40px !important} .margin-bottom-50{margin-bottom:50px!important}
 .min-height-100{min-height:100px!important}.min-height-120{min-height:120px!important}.min-height-150{min-height:150px!important}.min-height-200{min-height:200px!important}.min-height-300{min-height:300px!important}.min-height-400{min-height:400px!important}.min-height-500{min-height:500px!important}.min-height-600{min-height:600px!important}.min-height-700{min-height:700px!important}.min-height-800{min-height:800px!important}.min-height-900{min-height:900px!important}.min-height-1000{min-height:1000px!important}
-.min-width-100 {min-width: 100px}.min-width-200 {min-width: 200px}.min-width-300 {min-width: 300px}.min-width-400 {min-width: 400px}.min-width-500 {min-width: 500px}.min-width-600 {min-width: 600px}.min-width-700 {min-width: 700px}.min-width-800 {min-width: 800px}.min-width-900 {min-width: 900px}.min-width-1000 {min-width: 1000px}
+.min-width-100 {min-width: 100px}.min-width-150{min-width: 150px}.min-width-200 {min-width: 200px}.min-width-300 {min-width: 300px}.min-width-400 {min-width: 400px}.min-width-500 {min-width: 500px}.min-width-600 {min-width: 600px}.min-width-700 {min-width: 700px}.min-width-800 {min-width: 800px}.min-width-900 {min-width: 900px}.min-width-1000 {min-width: 1000px}
 .min-height-50vh{min-height:50vh}.min-height-90vh{min-height:90vh}.min-height-100vh{min-height:100vh}
 .min-width-100vw{min-width:100vw}
-.width-100{width:100%}
+.width-50{width:50%}.width-100{width:100%}
 .height-100{height:100%}
 .max-width-fit{max-width:fit-content}
 .max-width-80{max-width:80px}.max-width-100{max-width:100px}.max-width-200{max-width:200px}.max-width-300{max-width:300px}.max-width-400{max-width:400px}.max-width-500{max-width:500px}.max-width-600{max-width:600px}.max-width-700{max-width:700px}.max-width-800{max-width:800px}.max-width-900{max-width:900px}.max-width-1000{max-width:1000px}
@@ -305,7 +310,7 @@ code {
     column-gap: 15px;
     padding: 15px;
     margin-bottom: 8px;
-    border-radius: 20px;
+    border-radius: 18px;
     background-color: #182b3e;
     box-shadow: rgb(0 0 0) 0px 10px 13px -12px, rgb(0 0 0 / 15%) 0px 0px 10px 2px;
 }
@@ -318,44 +323,71 @@ code {
     grid-template-columns: fit-content(33%) auto 10%;
 }
 
+.table-container-2 {
+    grid-template-columns: auto 10%;
+}
+
+/**
+ *  Generic modern list items for slide panels
+ */
+.panel-list-item {
+    padding: 12px 18px;
+    border: 1px solid rgba(52, 97, 136, 0.45);
+    background-color: #223950;
+    transition: border-color 0.2s ease, background 0.2s ease;
+}
+
+.panel-list-item:hover {
+    background-color: #1f3347 !important;
+    border-color: rgba(52, 97, 136, 0.75);
+}
+
 [class*=' pagination-btn'],[class^='pagination-btn'] {
     display: flex;
     align-items: center;
     justify-content: center;
-    min-width: 35px;
+    min-width: 32px;
     height: 30px;
-    border: none;
-    border-radius: 60px;
-    color: white;
+    border: 1px solid #2d5575;
+    border-radius: 6px;
+    color: #97a5b4;
     text-align: center;
     text-decoration: none;
-    font-size: 14px;
+    font-size: 13px;
     cursor: pointer;
-    background-color: #15bf7f;
-    border-radius: 0;
+    background-color: transparent;
+    margin: 0 2px;
+    transition: all 0.15s ease;
 }
 
 [class*=' pagination-btn']:hover,[class^='pagination-btn']:hover {
-    background-color: #12a16a;
+    background-color: rgba(34, 56, 79, 0.6);
+    border-color: #3d7aab;
+    color: #ffffff;
 }
 
 .pagination-btn-current {
-    background-color: #12a16a;
-    border: 1px solid #10885a;
+    background-color: rgba(21, 191, 127, 0.15);
+    border-color: #15bf7f;
+    color: #15bf7f;
+}
+
+.pagination-btn-current:hover {
+    background-color: rgba(21, 191, 127, 0.25);
+    border-color: #15bf7f;
+    color: #15bf7f;
 }
 
 .pagination-btn-first {
-    border-top-left-radius: 60px;
-    border-bottom-left-radius: 60px;
+    border-radius: 6px;
 }
 
 .pagination-btn-last {
-    border-top-right-radius: 60px;
-    border-bottom-right-radius: 60px;
+    border-radius: 6px;
 }
 
 .pagination-btn-previous, .pagination-btn-next {
-    width: 40px;
+    width: 35px;
 }
 
 .round-item {
@@ -387,6 +419,7 @@ code {
     width: 100%;
     padding: 20px;
     background-color: #182b3e;
+    background-attachment: local;
     border-left: 1px solid rgb(117 128 134 / 34%);
     box-shadow: rgb(0 0 0) 0px 10px 13px -12px, rgb(0 0 0 / 15%) 0px 0px 10px 2px;
     overflow: auto;
@@ -448,12 +481,13 @@ code {
     .grid-rfr-1-6{grid-template-columns:repeat(6, 1fr)!important}
     .grid-rfr-2-4{grid-template-columns:repeat(4, 1fr)!important}
     .flexrc{flex-direction:row!important;}
+    .flex-wrap-mobile{flex-wrap:nowrap!important;}
     .hide-mobile{display:initial!important;}
     .d-align-item-center{align-items:center!important;}
     .table-container-3{grid-template-columns: fit-content(10%) auto 10%!important}
 
     .slide-panel {
-        width: 40%;
+        width: 47%;
     }
 
     #loading {
diff --git a/www/public/resources/styles/components/button.css b/www/public/resources/styles/components/button.css
index 5a3494c1e..48dbacdd6 100644
--- a/www/public/resources/styles/components/button.css
+++ b/www/public/resources/styles/components/button.css
@@ -2,69 +2,110 @@
 /* All buttons */
 [class^="btn-"], [class*=" btn-"], input::file-selector-button {
     padding: 10px;
+    min-height: 34px;
     border: none;
     border-radius: 60px;
     color: white;
     text-align: center;
     text-decoration: none;
     display: inline-block;
+    font-family: 'archivo';
+    font-weight: 600;
     font-size: 14px;
+    line-height: 1;
+    letter-spacing: 0.4px;
     cursor: pointer;
+    box-sizing: border-box;
     box-shadow: rgba(12, 18, 20, 0.504) 0px 0px 5px 1px;
+    transition: background-color 0.2s ease, color 0.2s ease, border-color 0.2s ease, opacity 0.2s ease;
 }
 
 /* All transparent buttons */
 .btn-large-tr, .btn-medium-tr, .btn-small-tr, .btn-xsmall-tr, .btn-xxsmall-tr, .btn-fit-tr, .round-btn-tr,
 .btn-large-tr-to-red, .btn-medium-tr-to-red, .btn-small-tr-to-red, .btn-xsmall-tr-to-red, .btn-xxsmall-tr-to-red, .btn-fit-tr-to-red, .round-btn-tr-to-red,
 .btn-auto-tr {
-    background-color: initial;
-    box-shadow: rgb(0 0 0) 0px 10px 13px -12px, rgb(0 0 0 / 15%) 0px 0px 10px 2px;
-    border: 1px solid #ffffff30;
+    background-color: transparent;
+    box-shadow: none;
+    border: 1.5px solid #ffffff45;
+    color: #cdd7e1;
+}
+
+/* Disabled state for all button classes */
+[class^="btn-"]:disabled,
+[class*=" btn-"]:disabled,
+[class^="btn-"][disabled],
+[class*=" btn-"][disabled] {
+    opacity: 0.45;
+    cursor: not-allowed;
+    pointer-events: none;
 }
 
 /* All blue buttons */
 .btn-large-blue, .btn-medium-blue, .btn-small-blue, .btn-xsmall-blue, .btn-xxsmall-blue, .btn-fit-blue, .round-btn-blue, .btn-auto-blue {
-    background-color: #22384F;
+    background-color: transparent;
+    border: 1.5px solid #5473e8;
+    color: #5473e8;
+    box-shadow: none;
 }
 /* All blue alt buttons */
 .btn-large-blue-alt, .btn-medium-blue-alt, .btn-small-blue-alt, .btn-xsmall-blue-alt, .btn-xxsmall-blue-alt, .btn-fit-blue-alt, .round-btn-blue-alt, .btn-auto-blue-alt {
-    background-color: #24405b;
+    background-color: transparent;
+    border: 1.5px solid #5473e8;
+    color: #5473e8;
+    box-shadow: none;
 }
 /* All green buttons */
 .btn-large-green, .btn-medium-green, .btn-small-green, .btn-xsmall-green, .btn-xxsmall-green, .btn-fit-green, .round-btn-green, .btn-auto-green {
-    background-color: #15bf7f;
+    /* background-color: rgba(21, 191, 127, 0.15); */
+    background-color: transparent;
+    border: 1.5px solid #15bf7f;
+    color: #15bf7f;
+    box-shadow: none;
 }
 /* All red buttons */
 .btn-large-red, .btn-medium-red, .btn-small-red, .btn-xsmall-red, .btn-xxsmall-red, .btn-fit-red, .round-btn-red, .btn-auto-red {
-    background-color: #F32F63;
+    background-color: transparent;
+    border: 1.5px solid #F32F63;
+    color: #F32F63;
+    box-shadow: none;
 }
 /* All yellow buttons */
 .btn-large-yellow, .btn-medium-yellow, .btn-small-yellow, .btn-xsmall-yellow, .btn-xxsmall-yellow, .btn-fit-yellow, .round-btn-yellow, .btn-auto-yellow {
-    background-color: #ffb536;
+    background-color: transparent;
+    border: 1.5px solid #ffb536;
+    color: #ffb536;
+    box-shadow: none;
 }
 /* All auto buttons */
 .btn-auto-blue, .btn-auto-blue-alt, .btn-auto-green, .btn-auto-red, .btn-auto-yellow {
     width: auto;
 }
 
+/* All fit buttons */
+.btn-fit, .btn-fit-blue, .btn-fit-blue-alt, .btn-fit-green, .btn-fit-red, .btn-fit-yellow, .btn-fit-tr, .btn-fit-tr-to-red {
+    width: fit-content;
+    padding-left: 14px;
+    padding-right: 14px;
+}
+
 /* All large buttons */
-.btn-large, .btn-large-blue, .btn-large-green, .btn-large-red, .btn-large-tr {
+.btn-large, .btn-large-blue, .btn-large-blue-alt, .btn-large-green, .btn-large-red, .btn-large-yellow, .btn-large-tr, .btn-large-tr-to-red {
     width: 100%;
 }
 /* All medium buttons */
-.btn-medium, .btn-medium-blue, .btn-medium-green, .btn-medium-red, .btn-medium-tr {
+.btn-medium, .btn-medium-blue, .btn-medium-blue-alt, .btn-medium-green, .btn-medium-red, .btn-medium-yellow, .btn-medium-tr, .btn-medium-tr-to-red {
     width: 150px;
 }
 /* All small buttons */
-.btn-small, .btn-small-blue, .btn-small-green, .btn-small-red, .btn-small-tr {
+.btn-small, .btn-small-blue, .btn-small-blue-alt, .btn-small-green, .btn-small-red, .btn-small-yellow, .btn-small-tr, .btn-small-tr-to-red {
     width: 100px;
 }
 /* All very small buttons */
-.btn-xsmall, .btn-xsmall-blue, .btn-xsmall-green, .btn-xsmall-red, .btn-xsmall-tr {
-    width: 50px;
+.btn-xsmall, .btn-xsmall-blue, .btn-xsmall-blue-alt, .btn-xsmall-green, .btn-xsmall-red, .btn-xsmall-yellow, .btn-xsmall-tr, .btn-xsmall-tr-to-red {
+    width: 56px;
 }
 /* All very very small buttons */
-.btn-xxsmall, .btn-xxsmall-blue, .btn-xxsmall-green, .btn-xxsmall-red, .btn-xxsmall-tr {
+.btn-xxsmall, .btn-xxsmall-blue, .btn-xxsmall-blue-alt, .btn-xxsmall-green, .btn-xxsmall-red, .btn-xxsmall-yellow, .btn-xxsmall-tr, .btn-xxsmall-tr-to-red {
     margin: 2px;
     width: 34px;
     height: 34px;
@@ -72,33 +113,38 @@
 
 /* All transparent buttons (hover) */
 .btn-large-tr:hover, .btn-medium-tr:hover, .btn-small-tr:hover, .btn-xsmall-tr:hover, .btn-xxsmall-tr:hover, .btn-fit-tr:hover, .round-btn-tr:hover, .btn-auto-tr:hover {
-    transition-duration: 0.2s;
     background-color: #22384F;
     opacity: 1;
 }
 
 /* All transparent to red buttons (hover) */
 .btn-large-tr-to-red:hover, .btn-medium-tr-to-red:hover, .btn-small-tr-to-red:hover, .btn-xsmall-tr-to-red:hover, .btn-xxsmall-tr-to-red:hover, .btn-fit-tr-to-red:hover, .round-btn-tr-to-red:hover, .btn-auto-tr-to-red:hover {
-    transition-duration: 0.2s;
     background-color: #F32F63;
-    border: 1px solid #F32F63;
+    border: 1.5px solid #F32F63;
+    color: #ffffff;
     opacity: 1;
 }
 
 /* All blue buttons (hover) */
-.btn-large-blue:hover, .btn-medium-blue:hover, .btn-small-blue:hover, .btn-xsmall-blue:hover, .btn-xxsmall-blue:hover, .btn-fit-blue:hover, .round-btn-blue:hover, .btn-auto-blue:hover {
-    transition-duration: 0.2s;
-    background-color: #1e3a54;
+.btn-large-blue:hover, .btn-medium-blue:hover, .btn-small-blue:hover, .btn-xsmall-blue:hover, .btn-xxsmall-blue:hover, .btn-fit-blue:hover, .round-btn-blue:hover, .btn-auto-blue:hover,
+.btn-large-blue-alt:hover, .btn-medium-blue-alt:hover, .btn-small-blue-alt:hover, .btn-xsmall-blue-alt:hover, .btn-xxsmall-blue-alt:hover, .btn-fit-blue-alt:hover, .round-btn-blue-alt:hover, .btn-auto-blue-alt:hover {
+    background-color: rgba(84, 115, 232, 0.15);
+    color: #ffffff;
 }
 /* All green buttons (hover) */
 .btn-large-green:hover, .btn-medium-green:hover, .btn-small-green:hover, .btn-xsmall-green:hover, .btn-xxsmall-green:hover, .btn-fit-green:hover, .round-btn-green:hover, .btn-auto-green:hover {
-    transition-duration: 0.2s;
-    background-color: #12a16a;
+    background-color: rgba(21, 191, 127, 0.15);
+    color: #ffffff;
 }
 /* All red buttons (hover) */
 .btn-large-red:hover, .btn-medium-red:hover, .btn-small-red:hover, .btn-xsmall-red:hover, .btn-xxsmall-red:hover, .btn-fit-red:hover, .round-btn-red:hover, .btn-auto-red:hover {
-    transition-duration: 0.2s;
-    background-color: #f10e4b;
+    background-color: rgba(243, 47, 99, 0.15);
+    color: #ffffff;
+}
+/* All yellow buttons (hover) */
+.btn-large-yellow:hover, .btn-medium-yellow:hover, .btn-small-yellow:hover, .btn-xsmall-yellow:hover, .btn-xxsmall-yellow:hover, .btn-fit-yellow:hover, .round-btn-yellow:hover, .btn-auto-yellow:hover {
+    background-color: rgba(255, 181, 54, 0.15);
+    color: #ffffff;
 }
 
 /**
@@ -125,6 +171,14 @@
     width: 18px;
 }
 
+.round-btn-green {
+    background: rgba(21, 191, 127, 0.22)
+}
+
+.round-btn-green img {
+    filter: brightness(0) saturate(100%) invert(80%) sepia(30%) saturate(400%) hue-rotate(100deg) brightness(110%);
+}
+
 /**
  *  Slide btns
  */
@@ -140,10 +194,10 @@
     transition: max-width 0.7s;
     margin: 0 3px 0 3px;
     color: white;
-    /* background-color: #15bf7f; */
     border-radius: 60px;
     cursor: pointer;
-    /* box-shadow: rgba(12, 18, 20, 0.504) 0px 0px 10px 1px; */
+    font-family: 'archivo';
+    font-weight: 500;
 }
 [class^="slide-btn"] img {
     width: 20px;
@@ -168,6 +222,26 @@
 .slide-btn-yellow:hover {
     background-color: #eb984e;
 }
+.slide-btn-green {
+    background-color: rgba(21, 191, 127, 0.22);
+    border: 1px solid rgba(21, 191, 127, 0.8);
+}
+.slide-btn-green span {
+    color: #a0ffd9;
+}
+.slide-btn-green img {
+    filter: brightness(0) saturate(100%) invert(80%) sepia(30%) saturate(400%) hue-rotate(100deg) brightness(110%);
+}
+.slide-btn-green:hover {
+    background-color: rgba(21, 191, 127, 0.38);
+    border-color: #15bf7f;
+}
+.slide-btn-green:hover span {
+    color: #ffffff;
+}
+.slide-btn-green:hover img {
+    filter: brightness(0) invert(1);
+}
 .slide-btn-tr, .slide-btn-medium-tr {
     background-color: initial;
     box-shadow: rgb(32 25 25 / 50%) 0px 0px 15px 1px;
@@ -211,7 +285,8 @@
     left: 0;
     right: 0;
     bottom: 0;
-    background-color: #ccc;
+    background-color: rgba(255, 255, 255, 0.06);
+    box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.08);
     -webkit-transition: .4s;
     transition: .4s;
     border-radius: 34px;
@@ -223,21 +298,23 @@
     width: 16px;
     left: 2px;
     bottom: 2px;
-    background-color: white;
+    background-color: #8b98a5;
     -webkit-transition: .4s;
     transition: .4s;
     border-radius: 50%;
 }
 .onoff-switch-input:checked + .onoff-switch-slider {
-    background-color: #5473e8;
+    background-color: rgba(79, 195, 247, 0.2);
+    box-shadow: inset 0 0 0 1px rgba(79, 195, 247, 0.55);
 }
 .onoff-switch-input:focus + .onoff-switch-slider {
-    box-shadow: 0 0 1px #5473e8;
+    box-shadow: 0 0 0 2px rgba(79, 195, 247, 0.55);
 }
 .onoff-switch-input:checked + .onoff-switch-slider:before {
     -webkit-transform: translateX(15px);
     -ms-transform: translateX(15px);
     transform: translateX(15px);
+    background-color: #9ab7ff;
 }
 
 /**
@@ -264,14 +341,14 @@
 
 .switch-field label,
 .single-switch-field label {
-    background-color: white;
-    color: #3b3b3b;
+    background-color: rgba(255, 255, 255, 0.03);
+    color: #8b98a5;
     line-height: 1;
     text-align: center;
     padding: 6px 8px;
     margin-right: -1px;
-    border: 1px solid rgba(0, 0, 0, 0.2);
-    box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.1);
+    border: 1px solid rgba(255, 255, 255, 0.08);
+    box-shadow: none;
     transition: all 0.1s ease-in-out;
 }
 
@@ -282,9 +359,10 @@
 
 .switch-field input:checked + label,
 .single-switch-field input:checked + label {
-    background-color: #5473e8;
+    background-color: rgba(79, 195, 247, 0.2);
+    border-color: rgba(79, 195, 247, 0.55);
     box-shadow: none;
-    color: white;
+    color: #e9f8ff;
 }
 
 .switch-field label:first-of-type {
@@ -306,3 +384,20 @@
         max-width: 100%;
     }
 }
+
+/* High visibility overrides for active switches */
+.onoff-switch-input:checked + .onoff-switch-slider {
+    background-color: rgba(79, 195, 247, 0.2) !important;
+    box-shadow: inset 0 0 0 1px rgba(79, 195, 247, 0.55) !important;
+}
+
+.onoff-switch-input:checked + .onoff-switch-slider:before {
+    background-color: #ffffff !important;
+}
+
+.switch-field input:checked + label,
+.single-switch-field input:checked + label {
+    background-color: rgba(79, 195, 247, 0.2) !important;
+    border-color: rgba(79, 195, 247, 0.55) !important;
+    color: #e9f8ff !important;
+}
diff --git a/www/public/resources/styles/components/card.css b/www/public/resources/styles/components/card.css
index a6c3df456..df2c962de 100644
--- a/www/public/resources/styles/components/card.css
+++ b/www/public/resources/styles/components/card.css
@@ -8,6 +8,7 @@
     border: 1px solid #24405c;
     border-radius: 20px;
     box-shadow: rgb(0 0 0) 0px 10px 13px -12px, rgb(0 0 0 / 15%) 0px 0px 10px 2px;
+    overflow: hidden;
 }
 
 .kpi-value {
@@ -23,24 +24,23 @@
     transform: scale(1.10);
 }
 
-.kpi-status-running {
+.kpi-accent-purple {
     background: linear-gradient(135deg, #2a0f2e 0%, #4a1942 50%, #2a0f2e 100%);
     border-color: #c44daa;
     animation: pulse-running 2s ease-in-out infinite;
 }
 
-.kpi-status-done {
+.kpi-accent-green {
     background: linear-gradient(135deg, #0f3d2e 0%, #1a5c40 50%, #0f3d2e 100%);
     border-color: #1abc6b;
 }
 
-.kpi-status-error,
-.kpi-status-stopped {
+.kpi-accent-red {
     background: linear-gradient(135deg, #3d1420 0%, #5c1a2a 50%, #3d1420 100%);
     border-color: #c0392b;
 }
 
-.kpi-status-scheduled {
+.kpi-accent-yellow {
     background: linear-gradient(135deg, #2d2a0f 0%, #4a4410 50%, #2d2a0f 100%);
     border-color: #b8a825;
 }
diff --git a/www/public/resources/styles/components/confirmbox.css b/www/public/resources/styles/components/confirmbox.css
index 7c2f16a24..5c71416bc 100644
--- a/www/public/resources/styles/components/confirmbox.css
+++ b/www/public/resources/styles/components/confirmbox.css
@@ -7,20 +7,17 @@
     align-items: flex-start;
     visibility: hidden;
     min-height: 20px;
-    padding: 20px 0px 20px 0px;
+    padding: 20px 0px;
     font-size: 16px;
     position: fixed;
-    bottom: 0;
-    right: -1000px;
     bottom: 50px;
+    right: -1000px;
     z-index: 1000;
-    background-color: #22384F;
-    box-shadow: 0px 0px 5px 0px rgba(0,0,0,1);
+    background-color: #182b3e;
+    border: 1px solid #24405c;
+    border-radius: 20px;
+    box-shadow: 0 8px 32px rgba(0, 0, 0, 0.5);
     color: white;
-    border-radius: 20px 0 0 20px;
-    border-left: 5px solid #15bf7f;
-    border-top: 1px solid #d1d1d11f;
-    border-bottom: 1px solid #d1d1d11f;
 }
 
 .confirm-box-cancel-btn {
@@ -30,6 +27,29 @@
     cursor: pointer;
 }
 
+.confirm-box .confirm-box-btn {
+    padding: 10px 5px;
+    border-radius: 12px;
+    border: 1px solid #2e5275;
+    background-color: rgba(34, 56, 79, 0.6);
+    box-shadow: none;
+    transition: background-color 0.2s ease, border-color 0.2s ease;
+}
+
+.confirm-box .confirm-box-btn:hover {
+    background-color: rgba(79, 195, 247, 0.12);
+    border-color: rgba(79, 195, 247, 0.4);
+}
+
+.confirm-box .confirm-box-btn.btn-auto-red {
+    border-color: #F32F63;
+}
+
+.confirm-box .confirm-box-btn.btn-auto-red:hover {
+    border-color: #F32F63;
+    background-color: rgba(243, 47, 99, 0.15);
+}
+
 /* Desktop configuration */
 @media (min-width:1025px) {
     .confirm-box {
diff --git a/www/public/resources/styles/components/input.css b/www/public/resources/styles/components/input.css
index f7fd1156c..b078292a3 100644
--- a/www/public/resources/styles/components/input.css
+++ b/www/public/resources/styles/components/input.css
@@ -7,12 +7,18 @@ input[type=text], input[type=date], input[type=time], input[type=number], input[
     margin-top: 4px;
     margin-bottom: 4px;
     padding-left: 10px;
-    border: none;
+    border: 1px solid rgba(255, 255, 255, 0.08);
     border-radius: 20px;
     box-sizing: border-box;
     font-size: 14px;
     color: white;
     background-color:#22384F;
+    transition: border-color 0.2s ease, box-shadow 0.2s ease;
+}
+input[type=text]:focus, input[type=date]:focus, input[type=time]:focus, input[type=number]:focus, input[type=email]:focus, input[type=password]:focus, select:focus {
+    outline: none;
+    border-color: rgba(84, 115, 232, 0.8);
+    box-shadow: 0 0 10px rgba(84, 115, 232, 0.25);
 }
 input[type=file] {
     background: none !important;
@@ -133,8 +139,43 @@ textarea {
     color: white;
     background-color:#22384F;
     border-radius: 16px;
-    border: none;
+    border: 1px solid rgba(255, 255, 255, 0.08);
+    transition: border-color 0.2s ease, box-shadow 0.2s ease;
+}
+textarea:focus {
+    outline: none;
+    border-color: rgba(84, 115, 232, 0.8);
+    box-shadow: 0 0 10px rgba(84, 115, 232, 0.25);
 }
 .textarea-100 {
     min-height: 100px;
 }
+
+/**
+ *  Form block
+ *  Groups the parameters of a same item (e.g. a repository snapshot) into a distinct section of a form
+ */
+.form-block {
+    padding: 14px 18px 14px 18px;
+    margin-bottom: 24px;
+    background-color: #15273ae3;
+    border: 1px solid #24405c;
+    border-left: 3px solid #24405c;
+    border-radius: 16px;
+}
+
+.form-block > *:first-child {
+    margin-top: 0;
+}
+
+.form-block-accent-red {
+    border-left-color: #F32F63;
+}
+
+.form-block-accent-blue {
+    border-left-color: #5473e8;
+}
+
+.form-block-accent-green {
+    border-left-color: #15bf7f;
+}
diff --git a/www/public/resources/styles/components/label.css b/www/public/resources/styles/components/label.css
index b61b9e1fa..9f11d9d77 100644
--- a/www/public/resources/styles/components/label.css
+++ b/www/public/resources/styles/components/label.css
@@ -1,16 +1,19 @@
 
 [class^="label"] {
+    font-family: 'archivo';
+    font-weight: 600;
     font-size: 13px;
+    letter-spacing: 0.2px;
     vertical-align: middle;
     display: inline-block;
-    padding: 6px;
+    padding: 6px 10px;
     min-width: 12px;
     min-height: 12px;
     line-height: 12px !important;
     text-align: center;
-    border-radius: 60px;
-    color: white;
-    box-shadow: rgb(12 18 20 / 67%) 0px 0px 0px 1px;
+    border-radius: 20px;
+    background: transparent;
+    box-shadow: none;
 }
 .label-icon-tr {
     display: grid;
@@ -28,29 +31,30 @@
     border: 1px solid #24405c;
     color: white;
     text-align: left;
-    box-shadow: rgb(12 18 20 / 67%) 0px 0px 0px 1px;
-}
-.label-black {
-    background-color: rgb(46, 54, 58);
-    box-shadow: rgb(12 18 20 / 67%) 0px 0px 0px 1px;
+    box-shadow: none;
 }
-.label-white {
-    background-color: white;
-    color: #000000d9;
+
+.label-white, .label-black {
+    color: #c0d0e2;
+    border: 1.5px solid #c0d0e2;
 }
 .label-green {
-    background-color: #15bf7f;
+    color: #15bf7f;
+    border: 1.5px solid #15bf7f;
 }
 .label-blue {
-    background-color: #5473e8;
+    color: #5473e8;
+    border: 1.5px solid #5473e8;
 }
 .label-red {
-    background-color: #F32F63;
+    color: #F32F63;
+    border: 1.5px solid #F32F63;
 }
 .label-yellow {
-    background-color: #ffb536;
+    color: #ffb536;
+    border: 1.5px solid #ffb536;
 }
 .label-tr {
-    background-color: initial;
-    border: 1px solid #24405c;
+    color: #8A99AA;
+    border-color: #24405c;
 }
diff --git a/www/public/resources/styles/components/layout.css b/www/public/resources/styles/components/layout.css
index c761c141d..1e13f3705 100644
--- a/www/public/resources/styles/components/layout.css
+++ b/www/public/resources/styles/components/layout.css
@@ -4,7 +4,7 @@ body {
     min-height: 100vh;
     margin: 0px;
     padding: 0px;
-    background-color: #0e1e2f;
+    background-color: #0e1e30;
     color: white;
     overflow-y: auto;
     font-family: 'Roboto', sans-serif !important;
@@ -12,12 +12,36 @@ body {
 }
 
 .div-generic-blue {
-    position: relative;
     padding: 15px;
     margin-bottom: 30px;
     border-radius: 20px;
     background-color: #182b3e;
     box-shadow: rgb(0 0 0) 0px 10px 13px -12px, rgb(0 0 0 / 15%) 0px 0px 10px 2px;
+    border: 1px solid #1a4a6a;
+}
+
+.accent-green {
+    border-left: 2px solid #15bf7f !important;
+}
+
+.accent-cyan {
+    border-left: 2px solid #4fc3f7 !important;
+}
+
+.accent-blue {
+    border-left: 2px solid #5473e8 !important;
+}
+
+.accent-yellow {
+    border-left: 2px solid #ffb536 !important;
+}
+
+.accent-orange {
+    border-left: 2px solid #e8851e !important;
+}
+
+.accent-red {
+    border-left: 2px solid #F32F63 !important;
 }
 
 .div-generic-blue h3 {
diff --git a/www/public/resources/styles/main.css b/www/public/resources/styles/main.css
index 966eba56e..5c56be3ab 100644
--- a/www/public/resources/styles/main.css
+++ b/www/public/resources/styles/main.css
@@ -1,4 +1,3 @@
-@font-face{font-family: 'ethnocentric'; src: url('/assets/fonts/ethnocentric rg.ttf') format('truetype');}
 @font-face{font-family: 'archivo'; src: url('/assets/fonts/Archivo-Variable.ttf') format('truetype');}
 
 .font-family-archivo {
@@ -10,40 +9,20 @@ header {
     margin-bottom: 20px;
     position: relative;
 }
+
 #menu {
-    width: 100%;
-    height: 66px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    -webkit-box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.75);
-    -moz-box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.75);
-    box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.75);
-}
-#menu-inline {
     display: none;
     visibility: hidden;
+    width: 0px;
 }
+
 #menu-burger {
     display: flex;
     align-items: center;
     justify-content: flex-end;
-    padding: 0 20px 0 0;
+    padding: 0 0 20px 0;
 }
 
-#title {
-    position: relative;
-    margin-left: 20px;
-    margin-top: 0px;
-    margin-bottom: 0px;
-    padding: 0px 25px 0px 0px;
-    color: white;
-}
-#title span {
-    font-family: 'ethnocentric';
-    font-size: 18px;
-}
 #devel {
     font-size: 8px !important;
     position: absolute;
@@ -52,70 +31,11 @@ header {
     background-color: #15bf7f;
     border-radius: 60px;
 }
-[class^="menu-sub-container"] {
-    height: 99%;
-    display: flex;
-    align-items: center;
-    margin-left: 25px;
-    margin-right: 25px;
-}
-.menu-sub-container a {
-    opacity: 0.50;
-}
-.menu-sub-container-underline {
-    border-bottom: 1px solid #15bf7f;
-    opacity: 1;
-}
-.menu-sub-container:hover a {
-    opacity: 1;
-}
-.menu-tab-title {
-    display: none;
-}
-#header-refresh {
-    position: relative;
-}
-.op-total-running {
-    position: absolute;
-    right: -15px;
-    top: -30px;
-    width: 15px;
-    height: 15px;
-    line-height: 15px !important;
-    border: none;
-    border-radius: 50%;
-    color: white;
-    background-color: #F32F63;
-    text-align: center;
-    font-size: 9px;
-    font-family: monospace;
-    text-decoration: none;
-}
-.header-op-container {
-    display: none;
-    position: absolute;
-    margin-top: 15px;
-    z-index: 99;
-}
-.header-op-subdiv {
-    display: flex !important;
-    justify-content: space-between;
-    min-width: max-content;
-    margin-bottom: 3px;
-    padding: 8px;
-    text-align: left !important;
-    align-items: center;
-}
-.header-op-subdiv img {
-    height: 18px;
-}
-#header-refresh-container:hover .header-op-container {
-    display: block;
-}
+
 #notification-count {
     position: absolute;
-    right: -11px;
-    top: -12px;
+    right: -2px;
+    top: -2px;
     width: 15px;
     height: 15px;
     line-height: 15px !important;
@@ -128,20 +48,36 @@ header {
     font-family: monospace;
     text-decoration: none;
 }
+
 #userspace {
     display: flex;
     justify-content: flex-end;
     align-items: center;
 }
 
-/* Les articles constituent le container principal des sections section-left et section-right. */
+ /* Wraps the main content and the footer, so that the footer can be pushed to the bottom of the page */
+#main-column {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    min-width: 0;
+}
+
 article {
-    width: auto;
+    width: 100%;
+    box-sizing: border-box;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    margin: auto 20px auto 20px;
+    align-content: flex-start;
+    padding: 25px 25px;
 }
+
+#virtual-space {
+    display: none;
+    visibility: hidden;
+}
+
 .section-left, .section-right {
     width: 100%;
     vertical-align: top;
@@ -159,18 +95,14 @@ article {
 #repos-list-container {
     width: 100%;
     font-size: 14px;
+    display: flex;
+    flex-direction: column;
+    row-gap: 15px;
+    margin-top: 10px;
 }
 
-.repos-list-group-select-all-btns {
-    align-items: center;
-    margin-left: 380px;
-    column-gap: 8px;
-    overflow: auto;
-}
-
-.repos-list-group-select-all-btns input[type="checkbox"] {
-    height: 20px;
-    width: 20px;
+.repos-list-group:hover img:last-child {
+    display: block;
 }
 
 .repos-list-group-flex-div {
@@ -372,170 +304,433 @@ article {
     column-gap: 10px;
 }
 
-input::placeholder {
-    color: #ffffff9e;
+.repo-description-container {
+    display: flex;
+    align-items: center;
+    column-gap: 8px;
+    margin-top: 5px;
+}
+
+.repo-rename-btn,
+.repo-add-description-btn,
+.repo-add-tags-btn {
+    display: inline-flex;
+    align-items: center;
+    column-gap: 5px;
+    cursor: pointer;
+    /* font-size: 11px; */
+    opacity: 0.5;
+    transition: opacity 0.2s ease;
+}
+
+.repo-rename-btn:hover,
+.repo-add-description-btn:hover,
+.repo-add-tags-btn:hover {
+    opacity: 1;
+}
+
+.repo-description-input.repo-description-editable {
+    cursor: pointer;
+    min-height: 5px;
+}
+
+.repo-tags-display {
+    min-height: 18px;
+}
+
+.repo-tags-display.repo-tags-editable {
+    cursor: pointer;
 }
 
-/* Etiquettes d'environnements */
-.env, .last-env, .env-fit, .last-env-fit {
+.repo-tag-item {
+    cursor: pointer;
+}
+
+.repo-tags-display .repo-tags-input-edit,
+.repo-tags-display .select2-container {
+    min-width: 200px;
+}
+
+/* Task list items */
+.task-item {
+    display: grid;
+    grid-template-columns: 1fr auto auto;
+    align-items: center;
+    column-gap: 20px;
+    padding: 14px 20px;
+    background: linear-gradient(135deg, #121f30, #162a3e);
+    border: 1px solid #1e3a54;
+    border-left: 3px solid #1e3a54;
+    border-radius: 10px;
+    transition: border-color 0.2s ease, background 0.2s ease;
+}
+
+.task-item:hover {
+    border-color: #2d5575;
+    background: linear-gradient(135deg, #152538, #1a2f44);
+}
+
+.task-item-date {
+    font-family: 'archivo';
+    font-size: 14px;
+    font-weight: 500;
+    color: #b8c8d8;
+    letter-spacing: 0.3px;
+}
+
+.task-item-schedule {
+    font-size: 12px;
+}
+
+.task-item-action {
     font-size: 13px;
-    padding-left: 10px;
-    padding-right: 10px;
-    padding-top: 4px;
-    padding-bottom: 4px;
-    vertical-align: middle;
-    border-radius: 16px;
 }
-.env, .env-fit {
-    background-color: white;
-    color: #000000d9;
+
+.task-item-repo {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 8px;
 }
-.env-fit, .last-env-fit {
-    text-align: center;
-    display: block;
+
+.task-item-status {
+    display: flex;
+    align-items: center;
+    column-gap: 10px;
 }
-.env-fit:hover, .last-env-fit:hover {
-    background-color: #e6e6e6;
+
+.task-checkbox-input {
+    display: none;
 }
-.last-env, .last-env-fit {
-    color: white;
-    background-color: #F32F63;
+
+.task-item.task-selected {
+    border-color: #15bf7f;
+    border-left-color: #15bf7f;
+    background: linear-gradient(135deg, #0f2a1f, #132f28);
 }
-.last-env:hover, .last-env-fit:hover {
-    background-color: #dc0044;
+
+/* Group headers */
+.group-header {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    column-gap: 40px;
+    row-gap: 15px;
+    padding: 0px 20px 14px 5px;
 }
 
-[class^="label-pkg"] {
-    display: block;
-    width: 19px;
-    height: 19px;
-    line-height: 19px !important;
-    padding: unset;
-    text-align: center;
-    border-radius: 50%;
-    font-size: 7px;
+.group-header-icon {
+    width: 22px;
+    height: 22px;
+}
+
+.group-header-name {
     font-family: 'archivo';
-    box-shadow: rgb(0 0 0) 0px 10px 13px -12px, rgb(0 0 0 / 15%) 0px 0px 10px 2px;
+    font-size: 18px;
+    font-weight: 700;
+    color: #f0f4f8;
+    letter-spacing: 0.3px;
 }
-.label-pkg-rpm {
-    background-color: #5372e7;
+
+.group-header-count {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 24px;
+    height: 24px;
+    padding: 0 8px;
+    font-family: 'archivo';
+    font-size: 12px;
+    font-weight: 700;
+    color: #4fc3f7;
+    background-color: rgba(79, 195, 247, 0.12);
+    border: 1px solid rgba(79, 195, 247, 0.35);
+    border-radius: 12px;
 }
-.label-pkg-deb {
-    background-color: #F32F63;
+
+.group-header-right {
+    display: none;
 }
 
-footer {
+.group-header:hover .select-all-btn.hide {
+    display: inline-flex !important;
+}
+
+.select-all-btn {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    min-height: 26px;
+    padding: 0px 12px;
+    opacity: 0.92;
+}
+
+.select-all-btn span {
+    font-size: 13px;
+    font-family: 'archivo';
+    font-weight: 600;
+    line-height: 1;
+    white-space: nowrap;
+    color: inherit;
+}
+
+.select-all-btn input[type="checkbox"] {
+    display: none;
+}
+
+.select-all-btn[status="selected"] {
+    background-color: rgba(21, 191, 127, 0.18);
+    border-color: #15bf7f;
+    color: #15bf7f;
+    opacity: 1;
+}
+
+.repos-list-group-select-latest-btns.hide,
+.repos-list-select-all-btns.hide {
+    display: none !important;
+}
+
+/* Group content wrapper */
+.group-content {
+    margin-left: 15px;
+    padding-left: 22px;
+    border-left: 2px solid #1e3a54;
+}
+
+/* Makes a repo container span the full width of its grid row when it is alone on it */
+.repo-span-full {
+    grid-column: 1 / -1;
+}
+
+/* Without this, a repo wider than its grid column stretches the column instead of letting its content scroll */
+.repo-item-wrapper {
+    min-width: 0;
+}
+
+.repo-item {
+    height: stretch;
     display: flex;
     flex-direction: column;
-    justify-content: space-between;
-    row-gap: 40px;
+    min-width: 0;
+}
+
+.repo-snapshots {
+    overflow-x: auto;
+}
+
+/* Mobile / tablet: keep each snapshot on a single line and scroll them horizontally rather than squeezing them */
+@media (max-width: 1024px) {
+    .repo-item-header {
+        flex-wrap: wrap;
+    }
+
+    .repo-snapshots > .snap-container {
+        grid-template-columns: 1fr max-content !important;
+        column-gap: 20px;
+        width: max-content;
+        min-width: 100%;
+    }
+
+    .repo-snapshots .snap-envs {
+        flex-wrap: nowrap;
+    }
+}
+
+.repo-tags-container {
+    margin-top: 5px;
+}
+
+/* Same hover behaviour for the "Add a description" / "Add tags" buttons.
+   The display:none logic (button only present when the field is empty) is kept;
+   this only controls the hover reveal, uniform with the rename button. */
+.repo-item .repo-rename-btn,
+.repo-item .repo-add-description-btn,
+.repo-item .repo-add-tags-btn {
+    visibility: hidden;
+}
+
+.repo-item:hover .repo-rename-btn,
+.repo-item:hover .repo-add-description-btn,
+.repo-item:hover .repo-add-tags-btn {
+    visibility: visible;
+}
+
+.repos-row {
+    align-items: start;
+}
+
+.repo-name {
+    font-family: 'archivo';
+    font-size: 16px;
+    font-weight: 700;
+    letter-spacing: 0.5px;
+}
+
+/* new ui */
+.snap-container {
     width: auto;
-    height: 300px;
-    flex-grow: 1;
-    margin-top: 200px;
-    padding: 40px 25px 50px 25px;
-    box-shadow:
-     0px 1px 1px 0px rgba(0, 0, 0, 0.5) inset,
-     0px 2px 2px 0px rgba(109, 109, 109, 0.2);
-    background-color:#182b3e;
+    display: grid;
+    align-items: center;
+    column-gap: 6px;
+    row-gap: 20px;
+    padding: 16px 24px;
+    background: linear-gradient(135deg, #121f30, #162a3e);
+    border: 1px solid #1e3a54;
+    border-radius: 10px;
+    transition: border-color 0.2s ease, background 0.2s ease;
 }
 
-footer #github img { width: 25px; }
+.snap-container:hover {
+    border-color: #2d5575;
+    background: linear-gradient(135deg, #152538, #1a2f44);
+}
 
-.circle-div-container div {
-    display: inline-block;
-    vertical-align: middle;
-    margin: 5px 10px 5px 0px;
+.snap-separator {
+    width: 1px;
+    height: 24px;
+    background-color: #2a4562;
+    justify-self: center;
 }
 
-.circle-div-container-count, .circle-div-container-count-green, .circle-div-container-count-yellow, .circle-div-container-count-red {
-    position: relative;
-    border-radius: 50%;
-    border: 4px solid #5473e8;
-    text-align: center;
-    display: inline-block;
-    padding: 10px;
-    width: 25px;
-    height: 25px;
-    -webkit-box-shadow: 0px 10px 13px -12px #000000, 0px 0px 10px 2px rgb(0 0 0 / 15%);
-    box-shadow: 0px 10px 13px -12px #000000, 0px 0px 10px 2px rgb(0 0 0 / 15%);
+.snap-checkbox {
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
-.circle-div-container-count span, .circle-div-container-count-green span, .circle-div-container-count-yellow span, .circle-div-container-count-red span {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    -ms-transform: translate(-50%, -50%);
-    transform: translate(-50%, -50%);
-    font-size: 13.5px;
+
+.snap-checkbox input[type="checkbox"] {
+    width: 16px;
+    height: 16px;
+    cursor: pointer;
+}
+
+.snap-checkbox-input {
+    display: none;
+}
+
+.snap-container.snap-selected {
+    border-color: #15bf7f;
+    background: linear-gradient(135deg, #0f2a1f, #132f28);
+}
+
+.snap-icon {
+    width: 18px;
+    height: 18px;
 }
-.circle-div-container-count-green { border: 4px solid #15bf7f; }
-.circle-div-container-count-yellow { border: 4px solid #ffb536; }
-.circle-div-container-count-red { border: 4px solid #F32F63; }
 
-#repo-storage-chart {
-    min-height: 18px !important;
-    height: 18px !important;
-    width: 18px !important;
+.snap-date {
+    font-family: 'archivo';
+    font-size: 14px;
+    font-weight: 500;
+    letter-spacing: 0.3px;
+}
+
+.snap-size {
+    font-size: 12px;
+    letter-spacing: 0.8px;
+}
+
+.snap-signed {
+    font-size: 12px;
+    letter-spacing: 0.8px;
 }
 
-.donut-chart-container {
-    width: 120px;
-    height: 120px;
+.snap-envs {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    column-gap: 10px;
+    row-gap: 20px;
+}
+
+.snap-env-container {
     position: relative;
-    margin: auto;
+    cursor: pointer;
+    border-radius: 20px;
+    transition: box-shadow 0.2s ease;
 }
 
-.donut-chart {
-    position: absolute;
-    z-index: 20;
-    display: block;
-    width: 100% !important;
-    height: 100% !important;
+.snap-env-container .select-env-checkbox {
+    display: none;
 }
 
-.donut-chart-container .donut-legend {
-    position: absolute;
-    text-align: center;
-    font-size: 13px;
-    top: 40%;
-    left: 50%;
-    -ms-transform: translate(-50%, -50%);
-    transform: translate(-50%, -50%);
+/* Selected environment */
+.snap-env-container.env-selected .snap-env {
+    background-color: rgba(21, 191, 127, 0.15) !important;
+    border-color: #15bf7f !important;
+    color: #15bf7f !important;
+    box-shadow: 0 0 8px rgba(21, 191, 127, 0.3);
 }
-.donut-legend-title {
-    position: absolute;
-    text-align: center;
+.snap-env-container.env-selected .snap-env span {
+    color: #15bf7f !important;
+}
+.snap-env-container.env-selected .snap-env svg {
+    color: #15bf7f !important;
+}
+
+/* Env labels */
+.env {
+    display: inline-flex !important;
+    width: fit-content;
+    padding: 5px 14px;
+    vertical-align: middle;
+    border-radius: 16px;
+    background: transparent;
+    color: #a0b0c0;
+    border: 1.5px solid currentColor;
+    box-shadow: none;
+    letter-spacing: 0.3px;
+    border-radius: 20px;
+    margin-left: 0;
+}
+
+.env span {
     font-size: 13px;
-    top: 33%;
-    left: 50%;
-    -ms-transform: translate(-50%, -50%);
-    transform: translate(-50%, -50%);
+    font-family: 'archivo';
+    font-weight: 600;
 }
-.donut-legend-content {
-    width: 100%;
-    position: absolute;
+
+[class^="label-pkg"] {
+    display: block;
+    width: 19px;
+    height: 19px;
+    line-height: 19px !important;
+    padding: unset;
     text-align: center;
-    font-size: 18px;
-    top: 60%;
-    left: 50%;
-    -ms-transform: translate(-50%, -50%);
-    transform: translate(-50%, -50%);
+    border-radius: 50%;
+    font-size: 7px;
+    font-family: 'archivo';
+    box-shadow: rgb(0 0 0) 0px 10px 13px -12px, rgb(0 0 0 / 15%) 0px 0px 10px 2px;
 }
-
-.profiles-container {
-    columns: 1;
-    column-count: 1;
-    width: 100%;
+.label-pkg-rpm {
+    background-color: #5372e7;
+}
+.label-pkg-deb {
+    background-color: #F32F63;
 }
 
-.profiles-container > div {
-    break-inside: avoid;
+footer {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    row-gap: 20px;
+    width: 100%;
+    box-sizing: border-box;
+    margin-top: auto;
+    padding: 50px 25px 30px 25px;
 }
 
 .header-blue, .header-blue-min { background-color: #22384F; }
 .header-light-red, .header-light-red-min { background-color: #ff3369 !important; }
 .header-light-blue, .header-light-blue-min { background-color: #2b4d6e !important; }
 
+/* Disable scroll when maintenance mode is active */
+body:has(#maintenance-container) {
+    overflow: hidden;
+}
+
 #maintenance-container {
     position: fixed;
     top: 0;
@@ -577,30 +772,227 @@ footer #github img { width: 25px; }
 
 /* Desktop configuration */
 @media (min-width:1500px) {
-    #menu {
-        justify-content: flex-start;
+    #menu-burger {
+        display: none;
     }
-    #menu-inline {
-        height: 100%;
+
+    #menu
+    {
+        display: flex !important;
+        visibility: visible !important;
+        flex-direction: column;
+        align-items: center;
+        justify-content: space-between;
+        row-gap: 10px;
+        width: 60px;
+        height: 100vh;
+    }
+
+    #menu-fixed {
+        position: fixed;
+        top: 0;
+        left: 0;
+        height: 100vh;
+        max-height: 100vh;
+        width: 60px;
         display: flex;
-        visibility: visible;
+        flex-direction: column;
+        align-items: center;
         justify-content: space-between;
-        flex-grow: 1;
+        row-gap: 10px;
+        background-color: #182b3e;
+        border-right: 1px solid #24405c;
+        padding: 20px 0px;
+        box-sizing: border-box;
+        z-index: 500;
     }
-    #menu-burger {
-        display: none !important;
-        visibility: hidden !important;
+
+    #menu img {
+        width: 24px;
+        height: 24px;
+    }
+
+    #menu .menu-sub-item img {
+        width: 20px;
+        height: 20px;
+    }
+
+    /* Menu items hover & active state */
+    .menu-item,
+    .menu-sub-item {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 40px;
+        height: 40px;
+        border-radius: 12px;
+        transition: background-color 0.2s ease, transform 0.15s ease;
+    }
+
+    .menu-item > a,
+    .menu-sub-item > a{
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+        height: 100%;
+        border-radius: inherit;
+    }
+
+    .menu-item img,
+    .menu-sub-item img {
+        opacity: 0.55;
+        transition: opacity 0.2s ease, filter 0.2s ease;
+    }
+
+    .menu-item:hover,
+    .menu-sub-item:hover {
+        background-color: rgba(79, 195, 247, 0.08);
+        transform: scale(1.08);
+    }
+
+    .menu-item-tasks:hover {
+        transform: none;
+    }
+
+    .menu-item:hover img {
+        opacity: 1;
+        filter: drop-shadow(0 0 3px rgba(79, 195, 247, 0.4));
+    }
+
+    .menu-item-active {
+        background-color: rgba(21, 191, 127, 0.12);
+        position: relative;
+    }
+
+    .menu-item-active::before {
+        content: '';
+        position: absolute;
+        left: -10px;
+        top: 50%;
+        transform: translateY(-50%);
+        width: 3px;
+        height: 24px;
+        background-color: #15bf7f;
+        border-radius: 0 3px 3px 0;
+    }
+
+    .menu-item-active img {
+        opacity: 1;
+        filter: brightness(1.2) drop-shadow(0 0 2px rgba(21, 191, 127, 0.3));
+    }
+
+    .menu-item-active:hover {
+        background-color: rgba(21, 191, 127, 0.16);
     }
-    .menu-tab-title {
+
+    /* Running tasks badge on sidebar menu */
+    .menu-item-tasks {
+        position: relative;
+    }
+
+    .menu-task-badge {
+        position: absolute;
+        top: -4px;
+        right: -4px;
+        width: 16px;
+        height: 16px;
+        line-height: 16px !important;
+        border-radius: 50%;
+        background-color: #F32F63;
+        color: white;
+        text-align: center;
+        font-size: 9px;
+        font-family: monospace;
+        pointer-events: none;
+        z-index: 2;
+    }
+
+    .menu-task-popup {
+        display: none;
+        position: absolute;
+        left: calc(100% + 15px);
+        top: 0;
+        min-width: max-content;
+        max-height: 80vh;
+        overflow-y: auto;
+        background-color: #182b3e;
+        border: 1px solid #24405c;
+        border-radius: 12px;
+        box-shadow: 0 8px 24px rgba(0, 0, 0, 0.4);
+        padding: 6px;
+        z-index: 400;
+    }
+
+    /* Bridges the gap between the menu item and the popup, so moving the mouse to the popup does not close it.
+       It cannot be carried by the popup itself, whose overflow-y would clip it. */
+    .menu-item-tasks::after {
+        content: '';
+        display: none;
+        position: absolute;
+        left: 100%;
+        top: 0;
+        width: 15px;
+        height: 100%;
+    }
+
+    .menu-item-tasks:hover::after,
+    .menu-item-tasks:hover .menu-task-popup {
         display: block;
-        font-family: 'Archivo';
-        font-weight: 600;
-        font-size: 16px;
+    }
+
+    .menu-task-popup-item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        column-gap: 14px;
+        padding: 8px 12px;
+        border-radius: 8px;
+        white-space: nowrap;
+        transition: background-color 0.15s ease;
+    }
+
+    .menu-task-popup-item:hover {
+        background-color: rgba(79, 195, 247, 0.08);
+        font-weight: normal;
+    }
+
+    .menu-task-popup-item-link {
+        display: flex;
+        align-items: center;
+        column-gap: 8px;
+    }
+
+    .menu-task-popup-item-link span:first-child {
+        color: #97a5b4;
+        font-size: 13px;
+    }
+
+    .menu-task-popup-item .stop-task-btn {
+        display: flex;
+        align-items: center;
+        opacity: 0;
+        transition: opacity 0.15s ease;
+    }
+
+    .menu-task-popup-item:hover .stop-task-btn {
+        opacity: 1;
     }
 
     article {
         flex-direction: row;
         flex-wrap: wrap;
+        padding: 10px 0;
+    }
+
+    footer {
+        padding-left: 0;
+        padding-right: 0;
+    }
+
+    #virtual-space {
+        display: block;
+        visibility: visible;
     }
 
     .section-main {
@@ -623,4 +1015,16 @@ footer #github img { width: 25px; }
     .repos-list-group-flex-div {
         grid-template-columns: 350px 55px auto auto auto 55px 1fr 40px;
     }
+
+    /* .toolbar {
+        flex-wrap: nowrap;
+    }
+
+    .toolbar #input {
+        min-width: 150px;
+    } */
+
+    .snap-envs {
+        justify-content: flex-end;
+    }
 }
\ No newline at end of file
diff --git a/www/public/resources/styles/select2.css b/www/public/resources/styles/select2.css
index 9229e9a7e..1cf616165 100644
--- a/www/public/resources/styles/select2.css
+++ b/www/public/resources/styles/select2.css
@@ -154,8 +154,9 @@ https://github.com/select2/select2/issues/3278#issuecomment-258481272 : */
 .select2-container--default .select2-selection--single {
   background-color: #22384F; /* modifié */
   /*background-color: #fff;*/
-  /* border: 1px solid #aaa; */
-  border-radius: 20px; }
+  border: 1px solid rgba(255, 255, 255, 0.08); /* modifié */
+  border-radius: 20px;
+  transition: border-color 0.2s ease, box-shadow 0.2s ease; }
   .select2-container--default .select2-selection--single .select2-selection__rendered {
     /*color: #444;*/
     line-height: 28px; }
@@ -207,13 +208,15 @@ https://github.com/select2/select2/issues/3278#issuecomment-258481272 : */
 
 .select2-container--default .select2-selection--multiple {
   background-color: #22384F; /* modifié */
+  border: 1px solid rgba(255, 255, 255, 0.08); /* modifié */
   border-radius: 20px;
   cursor: text;
   padding-bottom: 5px;
-  padding-left: 10px;
+  padding-left: 2px;
   padding-right: 5px;
   height: 100%;
   min-height: 35px;
+  transition: border-color 0.2s ease, box-shadow 0.2s ease;
   position: relative; }
   .select2-container--default .select2-selection--multiple.select2-selection--clearable {
     padding-right: 25px; }
@@ -227,7 +230,10 @@ https://github.com/select2/select2/issues/3278#issuecomment-258481272 : */
     right: 0;
     padding: 1px; }
   .select2-container--default .select2-selection--multiple .select2-selection__choice {
-    background-color: #5473e8; /* modifié */
+    background-color: rgba(79, 195, 247, 0.2); /* modifié */
+    border: 1px solid rgba(79, 195, 247, 0.55); /* modifié */
+    color: #e9f8ff; /* modifié */
+    box-shadow: none; /* modifié */
     border-radius: 16px;
     box-sizing: border-box;
     display: inline-block;
@@ -242,9 +248,11 @@ https://github.com/select2/select2/issues/3278#issuecomment-258481272 : */
     overflow: hidden;
     text-overflow: ellipsis;
     vertical-align: bottom;
+    transition: background-color 0.15s ease, border-color 0.15s ease;
     white-space: nowrap; }
   .select2-container--default .select2-selection--multiple .select2-selection__choice__display {
     cursor: default;
+    color: #e9f8ff;
     padding-left: 2px;
     padding-right: 5px; }
   .select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
@@ -253,7 +261,7 @@ https://github.com/select2/select2/issues/3278#issuecomment-258481272 : */
     /* border-right: 1px solid #aaa; */
     border-top-left-radius: 16px;
     border-bottom-left-radius: 16px;
-    color: #999;
+    color: #e9f8ff; /* modifié */
     cursor: pointer;
     font-size: 1em;
     font-weight: bold;
@@ -264,8 +272,8 @@ https://github.com/select2/select2/issues/3278#issuecomment-258481272 : */
     left: 0;
     top: 0; }
     .select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover, .select2-container--default .select2-selection--multiple .select2-selection__choice__remove:focus {
-      background-color: #F32F63;
-      color: #333;
+      background-color: rgba(243, 47, 99, 0.9); /* modifié */
+      color: #ffffff; /* modifié */
       outline: none; }
 
 .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
@@ -289,8 +297,12 @@ https://github.com/select2/select2/issues/3278#issuecomment-258481272 : */
   margin-left: 10px;
   margin-right: auto; }
 
-.select2-container--default.select2-container--focus .select2-selection--multiple {
-  outline: 0; }
+.select2-container--default.select2-container--focus .select2-selection--multiple,
+.select2-container--default.select2-container--open .select2-selection--single,
+.select2-container--default.select2-container--open .select2-selection--multiple {
+  outline: 0;
+  border-color: rgba(84, 115, 232, 0.8);
+  box-shadow: 0 0 10px rgba(84, 115, 232, 0.25); }
 
 .select2-container--default.select2-container--disabled .select2-selection--multiple {
   background-color: #eee;
@@ -349,12 +361,13 @@ https://github.com/select2/select2/issues/3278#issuecomment-258481272 : */
   color: #999; }
 
 .select2-container--default .select2-results__option--selected {
-  background-color: #596EB5; /* modifié */
+  background-color: rgba(79, 195, 247, 0.2); /* modifié */
+  color: #e9f8ff;
 }
 
 .select2-container--default .select2-results__option--highlighted.select2-results__option--selectable {
-  background-color: #596EB5; /* modifié */
-  color: white; }
+  background-color: rgba(79, 195, 247, 0.2); /* modifié */
+  color: #e9f8ff; }
 
 .select2-container--default .select2-results__group {
   cursor: default;
@@ -561,4 +574,16 @@ https://github.com/select2/select2/issues/3278#issuecomment-258481272 : */
   padding: 6px; }
 
 .select2-container--classic.select2-container--open .select2-dropdown {
-  border-color: #5897fb; }
\ No newline at end of file
+  border-color: #5897fb; }
+
+/* High visibility overrides for selected tags */
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: rgba(79, 195, 247, 0.2) !important;
+  border: 1px solid rgba(79, 195, 247, 0.55) !important;
+  color: #e9f8ff !important;
+}
+
+.select2-container--default .select2-selection--multiple .select2-selection__choice__display,
+.select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
+  color: #e9f8ff !important;
+}
\ No newline at end of file
diff --git a/www/public/resources/styles/browse.css b/www/public/resources/styles/snapshot.css
similarity index 95%
rename from www/public/resources/styles/browse.css
rename to www/public/resources/styles/snapshot.css
index 5ca4ec2fd..1fa953e51 100644
--- a/www/public/resources/styles/browse.css
+++ b/www/public/resources/styles/snapshot.css
@@ -1,6 +1,3 @@
-/**
-*   Explorateur de fichiers
-*/
 #explorer,
 #browse-search-results {
     font-size: 14px;
diff --git a/www/public/resources/styles/stats-hosts.css b/www/public/resources/styles/stats-hosts.css
index 76956fa99..fd70425e0 100644
--- a/www/public/resources/styles/stats-hosts.css
+++ b/www/public/resources/styles/stats-hosts.css
@@ -20,13 +20,6 @@
     column-gap: 15px;
 }
 
-.host-available-packages-label {
-    min-width: 20px;
-    text-align: center;
-    border-radius: 60px;
-    padding: 1px 2px;
-}
-
 .host-additionnal-info {
     display: none;
     flex-direction: column;
@@ -62,13 +55,136 @@
     -webkit-column-width: 30%;
     column-count: 1;
     width: 100%;
-    column-gap: 1%;
+    column-gap: 50px;
 }
 
 .hosts-group-container {
     break-inside: avoid;
 }
 
+/* Host group header (aligned with repos group-header style) */
+.hosts-group-header {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    column-gap: 40px;
+    row-gap: 15px;
+    padding: 0px 20px 14px 5px;
+}
+
+.hosts-group-header:hover .select-group-hosts-btn.hide {
+    display: inline-flex !important;
+}
+
+.select-group-hosts-btn.hide {
+    display: none !important;
+}
+
+.hosts-group-header-left {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+}
+
+.hosts-group-header-name {
+    font-family: 'archivo';
+    font-size: 18px;
+    font-weight: 700;
+    color: #f0f4f8;
+    letter-spacing: 0.3px;
+}
+
+.hosts-group-header-count {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 24px;
+    height: 24px;
+    padding: 0 8px;
+    font-family: 'archivo';
+    font-size: 12px;
+    font-weight: 700;
+    color: #4fc3f7;
+    background-color: rgba(79, 195, 247, 0.12);
+    border: 1px solid rgba(79, 195, 247, 0.35);
+    border-radius: 12px;
+}
+
+/* Host group content (aligned with repos group-content style) */
+.hosts-group-content {
+    margin-left: 12px;
+    padding-left: 20px;
+    border-left: 2px solid #1e3a54;
+}
+
+/* Host line item (aligned with task-item / snap-container style) */
+.host-line {
+    display: grid;
+    grid-template-columns: 1fr;
+    align-items: center;
+    column-gap: 20px;
+    padding: 14px 20px;
+    border-radius: 10px;
+    border-left: 3px solid #1e3a54;
+    cursor: pointer;
+    transition: border-color 0.2s ease, background 0.2s ease;
+}
+
+.host-line:hover {
+    border-color: #2d5575;
+    background: linear-gradient(135deg, #152538, #1a2f44);
+}
+
+.host-line.host-selected {
+    border-color: #15bf7f;
+    background: linear-gradient(135deg, #0f2a1f, #132f28);
+}
+
+.host-line .js-host-checkbox {
+    display: none;
+}
+
+.host-accent-green {
+    border-left-color: #15bf7f;
+}
+
+.host-accent-red {
+    border-left-color: #F32F63;
+}
+
+.host-accent-yellow {
+    border-left-color: #ffb536;
+}
+
+.searchInput-container {
+    width: 100%;
+    margin-bottom: 50px;
+}
+
+.searchInput-subcontainer {
+    margin: auto;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    column-gap: 40px;
+}
+
+.searchInput-subcontainer p {
+    text-align: center;
+}
+
+.hosts-charts-container {
+    display: flex;
+    flex-direction: column;
+    gap: 20px;
+    margin: 0 auto 20px auto;
+}
+
+.hosts-chart-sub-container {
+    min-height: 230px;
+    position: relative;
+}
+
 .hosts-charts-list-label > div > span:first-child {
     display: inline-block;
     width: 10px;
@@ -214,6 +330,16 @@
         justify-content: space-evenly;
     }
 
+    .hosts-charts-container {
+        display: grid;
+        grid-template-columns: repeat(3, 1fr);
+        gap: 20px;
+    }
+
+    .hosts-chart-wide {
+        grid-column: span 2;
+    }
+
     .event-packages-details {
         min-width: 50vw;
         max-width: 90vw;
@@ -221,4 +347,79 @@
         column-gap: 10px;
         row-gap: 15px;
     }
+}
+
+/**
+ *  Host detail page items (packages, events, requests)
+ */
+.host-package-item,
+.host-event-item,
+.host-request-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 12px 18px;
+    background: linear-gradient(135deg, #121f30, #162a3e);
+    border: 1px solid #1e3a54;
+    border-left: 3px solid #1e3a54;
+    border-radius: 10px;
+    transition: border-color 0.2s ease, background 0.2s ease;
+}
+
+.host-package-item:hover,
+.host-event-item:hover,
+.host-request-item:hover {
+    border-color: #2d5575;
+    background: linear-gradient(135deg, #152538, #1a2f44);
+}
+
+/* Selectable packages */
+.host-package-item.pointer {
+    cursor: pointer;
+}
+
+.host-package-item .available-package-checkbox {
+    display: none;
+}
+
+.host-package-item.host-package-selected {
+    border-color: #15bf7f;
+    background: linear-gradient(135deg, #0f2a1f, #132f28);
+}
+
+.host-package-item.host-package-excluded {
+    position: relative;
+    border-left-color: #d4a574;
+    opacity: 0.78;
+}
+
+.host-package-item.host-package-excluded::after {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: repeating-linear-gradient(
+        45deg,
+        transparent,
+        transparent 10px,
+        rgba(212, 165, 116, 0.15) 10px,
+        rgba(212, 165, 116, 0.15) 20px
+    );
+    border-radius: 10px;
+    pointer-events: none;
+}
+
+/* Request status accents */
+.host-request-item.request-accent-green {
+    border-left-color: #15bf7f;
+}
+
+.host-request-item.request-accent-red {
+    border-left-color: #F32F63;
+}
+
+.host-request-item.request-accent-yellow {
+    border-left-color: #ffb536;
 }
\ No newline at end of file
diff --git a/www/public/resources/styles/run.css b/www/public/resources/styles/tasks.css
similarity index 53%
rename from www/public/resources/styles/run.css
rename to www/public/resources/styles/tasks.css
index 3fdf5d64f..bd53beaff 100644
--- a/www/public/resources/styles/run.css
+++ b/www/public/resources/styles/tasks.css
@@ -1,20 +1,24 @@
-#log-refresh-container {
+#task-refresh-container {
     flex: 0 0 100%;
     position: relative;
     min-height: 90vh;
 }
 
-#log-refresh-container h3 {
+#task-refresh-container h3 {
     margin-top: 0 !important;
     margin-bottom: 0 !important;
     border: none;
 }
 
-#log-refresh-container h6 {
+#task-refresh-container #task-details h6 {
+    margin-bottom: 5px;
+}
+
+#task-refresh-container h6 {
     margin-top: 30px;
 }
 
-#log-refresh-container pre { /* empecher le contenu des <pre> de dépasser */
+#task-refresh-container pre {
     white-space: pre-wrap;       /* css-3 */
     white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
     white-space: -pre-wrap;      /* Opera 4-6 */
@@ -27,6 +31,7 @@
     margin: 10px 0 0 0;
 }
 
+/* Legacy log layout, to be removed */
 .getPackagesDiv, .signRepoDiv, .createRepoDiv {
     background-color: #182b3e;
     padding: 15px;
@@ -39,26 +44,47 @@
     line-height: 2 !important;
 }
 
-/* Boutons Top et Down pour atteindre le haut ou le bas de page */
 #scroll-btns-container {
-    display: none;
+    display: block;
+    position: fixed;
+    right: 20px;
+    bottom: 20px;
+    z-index: 1000;
 }
-/* Les boutons scroll sont fixes à l'intérieur du container */
+
 #scroll-btns {
-    position: sticky;
-    top: 570px;
     display: flex;
     flex-direction: column;
     row-gap: 5px;
 }
 
+#autoscroll-btn {
+    width: 40px;
+    height: 40px;
+}
+
+#scroll-btns-container .round-btn-icon {
+    display: block;
+    width: 20px;
+    height: 20px;
+    background-color: currentColor;
+    -webkit-mask: var(--icon) center / contain no-repeat;
+    mask: var(--icon) center / contain no-repeat;
+}
+
+/* Force the icon to follow the accent color (round-btn base sets color:white) */
+#scroll-btns-container .round-btn-red   { color: #F32F63; }
+#scroll-btns-container .round-btn-yellow { color: #ffb536; }
+#scroll-btns-container .round-btn-green  { color: #15bf7f; }
+#scroll-btns-container [class^="round-btn"]:hover { color: #ffffff; }
+
 .op-header-container {
     margin-top: 4px;
     margin-bottom: 4px;
     margin-left: 15px;
 }
 
-/* Legacy task log layout */
+/* Legacy task log layout, to be removed */
 .op-table {
     width: 100%;
     margin: 5px;
@@ -111,12 +137,49 @@
 .task-step {
     display: flex;
     flex-direction: column;
-    margin-top: 5px;
+    margin-top: 8px;
     border-radius: 10px;
-    border: 1px solid #24405c;
-    background-color: #182b3e;
-    -webkit-box-shadow: rgb(0 0 0) 0px 10px 13px -12px, rgb(0 0 0 / 15%) 0px 0px 10px 2px;
-    box-shadow: rgb(0 0 0) 0px 10px 13px -12px, rgb(0 0 0 / 15%) 0px 0px 10px 2px;
+    border: 1px solid #1e3a54;
+    border-left: 3px solid #1e3a54;
+    background: linear-gradient(135deg, #121f30, #162a3e);
+    transition: border-color 0.2s ease, background 0.2s ease;
+}
+
+.task-step[status="completed"] {
+    border-left-color: #15bf7f;
+    background: linear-gradient(135deg, rgba(21, 191, 127, 0.12), rgba(21, 191, 127, 0.03));
+    border-color: rgba(21, 191, 127, 0.3);
+}
+
+.task-step[status="error"],
+.task-step[status="stopped"] {
+    border-left-color: #F32F63;
+    background: linear-gradient(135deg, rgba(243, 47, 99, 0.12), rgba(243, 47, 99, 0.03));
+    border-color: rgba(243, 47, 99, 0.3);
+}
+
+.task-step[status="warning"] {
+    border-left-color: #ffb536;
+    background: linear-gradient(135deg, rgba(255, 181, 54, 0.12), rgba(255, 181, 54, 0.03));
+    border-color: rgba(255, 181, 54, 0.3);
+}
+
+.task-step[status="running"] {
+    border: 1px solid #1a4a6a;
+    background: #182b3e;
+}
+
+.task-step[status="completed"] .task-step-status p {
+    color: #15bf7f;
+}
+
+.task-step[status="error"] .task-step-status p,
+.task-step[status="stopped"] .task-step-status p {
+    color: #F32F63;
+}
+
+.task-step[status="warning"] .task-step-status p {
+    color: #ffb536;
 }
 
 .task-step-title {
@@ -125,8 +188,9 @@
     justify-content: space-between;
     align-items: center;
     column-gap: 10px;
-    padding: 20px;
+    padding: 16px 20px;
     border-radius: 10px;
+    min-height: 40px;
 }
 
 .task-step-content {
@@ -135,26 +199,36 @@
     min-height: 250px;
     max-height: 700px;
     overflow-y: auto;
-    border-radius: 20px;
-    margin-top: 4px;
-    border-left: 1px solid #24405c;
-    border-right: 1px solid #24405c;
-    border-bottom: 1px solid #24405c;
-    background-color: #182b3e;
-    -webkit-box-shadow: rgb(0 0 0) 0px 10px 13px -12px, rgb(0 0 0 / 15%) 0px 0px 10px 2px;
-    box-shadow: rgb(0 0 0) 0px 10px 13px -12px, rgb(0 0 0 / 15%) 0px 0px 10px 2px;
+    border-radius: 0 0 10px 10px;
+    margin-top: 0;
+    border: 1px solid #1e3a54;
+    border-top: none;
+    background: linear-gradient(180deg, #0e1a28, #121f30);
 }
 
 .task-sub-step-container {
-    border-right: 1px solid #24405c;
+    border-right: 1px solid #1e3a54;
 }
 
 .task-sub-step-content, .step-loading {
     display: grid;
     grid-template-columns: minmax(20px, 20px) auto;
-    column-gap: 10px;
-    border-top: 1px solid #24405c;
-    padding: 15px;
+    column-gap: 12px;
+    border-top: 1px solid rgba(30, 58, 84, 0.5);
+    padding: 14px 18px;
+    transition: background 0.15s ease;
+}
+
+.task-sub-step-content:first-child {
+    border-top: none;
+}
+
+.task-sub-step-content:hover {
+    background: rgba(255, 255, 255, 0.02);
+}
+
+.task-step.step-open {
+    border-radius: 10px 10px 0 0;
 }
 
 .step-content-btns {
@@ -169,15 +243,10 @@
 
 /* Desktop configuration */
 @media (min-width:1500px) {
-    #log-refresh-container {
+    #task-refresh-container {
         flex: 0 0 94%;
     }
 
-    #scroll-btns-container {
-        display: block;
-        order: 2;
-    }
-
     .task-step-content {
         grid-template-columns: 96% 4%;
     }
diff --git a/www/update/database/6.0.0.php b/www/update/database/6.0.0.php
new file mode 100644
index 000000000..f34900ca8
--- /dev/null
+++ b/www/update/database/6.0.0.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ *  6.0.0 update
+ */
+
+// Open hosts database
+try {
+    $hostsDb = new \Models\Connection('hosts');
+} catch (Exception $e) {
+    throw new Exception('could not open hosts database: ' . $e->getMessage());
+}
+
+// Drop some indexes if exists
+try {
+    $this->db->exec("DROP INDEX IF EXISTS repos_env_index");
+    $this->db->exec("DROP INDEX IF EXISTS repos_env_id_snap_index");
+} catch (Exception $e) {
+    throw new Exception('could not delete old indexes from database: ' . $e->getMessage());
+}
+
+// Delete Pkg_translation column from repos_snap database
+if ($this->db->columnExist('repos_snap', 'Pkg_translation')) {
+    try {
+        $this->db->exec("ALTER TABLE repos_snap DROP COLUMN Pkg_translation");
+    } catch (Exception $e) {
+        throw new Exception('could not delete Pkg_translation column from repos_snap table');
+    }
+}
+
+// Add Description column to repos table
+if (!$this->db->columnExist('repos', 'Description')) {
+    try {
+        $this->db->exec("ALTER TABLE repos ADD COLUMN Description VARCHAR(255)");
+    } catch (Exception $e) {
+        throw new Exception('could not add Description column to repos table');
+    }
+}
+
+// Add Tags column to repos table
+if (!$this->db->columnExist('repos', 'Tags')) {
+    try {
+        $this->db->exec("ALTER TABLE repos ADD COLUMN Tags VARCHAR(255)");
+    } catch (Exception $e) {
+        throw new Exception('could not add Tags column to repos table');
+    }
+}
+
+// Delete Description column from repos_env table
+if ($this->db->columnExist('repos_env', 'Description')) {
+    try {
+        $this->db->exec("ALTER TABLE repos_env DROP COLUMN Description");
+    } catch (Exception $e) {
+        throw new Exception('could not delete Description column from repos_env table');
+    }
+}
+
+// Add 'Protected' column to env table
+if (!$this->db->columnExist('env', 'Protected')) {
+    try {
+        $this->db->exec("ALTER TABLE env ADD COLUMN Protected CHAR(5) DEFAULT 'false'");
+    } catch (Exception $e) {
+        throw new Exception('could not add Protected column to env table');
+    }
+}
+
+// Add 'Parent_task_id' column to tasks table
+if (!$this->db->columnExist('tasks', 'Parent_task_id')) {
+    try {
+        $this->db->exec("ALTER TABLE tasks ADD COLUMN Parent_task_id INTEGER");
+    } catch (Exception $e) {
+        throw new Exception('could not add Parent_task_id column to tasks table');
+    }
+}
+
+// Create index on 'Parent_task_id' column
+try {
+    $this->db->exec("CREATE INDEX IF NOT EXISTS tasks_parent_task_id ON tasks (Parent_task_id)");
+} catch (Exception $e) {
+    throw new Exception('could not create tasks_parent_task_id index: ' . $e->getMessage());
+}
+
+// Add 'compliance_security_update' column to settings table
+if (!$hostsDb->columnExist('settings', 'compliance_security_update')) {
+    try {
+        $hostsDb->exec("ALTER TABLE settings ADD COLUMN compliance_security_update INTEGER NOT NULL DEFAULT 1");
+    } catch (Exception $e) {
+        throw new Exception('could not add compliance_security_update column to settings table');
+    }
+}
+
+// Add some columns to hosts database
+try {
+    $result = $hostsDb->query("SELECT Id FROM hosts");
+    $hostIds = [];
+
+    while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
+        $hostIds[] = $row['Id'];
+    }
+
+    foreach ($hostIds as $hostId) {
+        try {
+            $hostDb = new \Models\Connection('host', $hostId);
+
+            // Add 'Security' column to packages table
+            if (!$hostDb->columnExist('packages', 'Security')) {
+                $hostDb->exec("ALTER TABLE packages ADD COLUMN Security CHAR(5)");
+            }
+
+            // Add 'Security' column to packages_history table
+            if (!$hostDb->columnExist('packages_history', 'Security')) {
+                $hostDb->exec("ALTER TABLE packages_history ADD COLUMN Security CHAR(5)");
+            }
+
+            // Add 'Security' column to packages_available table
+            if (!$hostDb->columnExist('packages_available', 'Security')) {
+                $hostDb->exec("ALTER TABLE packages_available ADD COLUMN Security CHAR(5)");
+            }
+        } catch (Exception $e) {
+            // If it fails for a specific host, just drop its database to reset it
+            if (file_exists(HOSTS_DIR . '/' . $hostId . '/properties.db')) {
+                if (!unlink(HOSTS_DIR . '/' . $hostId . '/properties.db')) {
+                    throw new Exception('could not reset host #' . $hostId . ' database: ' . $e->getMessage());
+                }
+            }
+        }
+    }
+} catch (Exception $e) {
+    throw new Exception('could not update host databases: ' . $e->getMessage());
+}
diff --git a/www/update/database/ci/deb/rename.php b/www/update/database/ci/deb/rename.php
index a6d0622ca..f8490ab2d 100644
--- a/www/update/database/ci/deb/rename.php
+++ b/www/update/database/ci/deb/rename.php
@@ -3,7 +3,7 @@
  *  Rename deb repo
  */
 $rawParams['action'] = 'rename';
-$rawParams['snap-id'] = '1';
+$rawParams['repo-id'] = '1';
 $rawParams['env-id'] = '';
 $rawParams['name'] = 'debian-rename';
 $rawParams['arch'] = ['amd64', 'armhf'];
diff --git a/www/update/database/ci/rpm/rename.php b/www/update/database/ci/rpm/rename.php
index 1c7f584b7..de0fc42cb 100644
--- a/www/update/database/ci/rpm/rename.php
+++ b/www/update/database/ci/rpm/rename.php
@@ -3,7 +3,7 @@
  *  Rename rpm repo
  */
 $rawParams['action'] = 'rename';
-$rawParams['snap-id'] = '1';
+$rawParams['repo-id'] = '1';
 $rawParams['env-id'] = '';
 $rawParams['name'] = 'centos-extras-common-rename';
 $rawParams['arch'] = ['x86_64', 'noarch'];
diff --git a/www/version b/www/version
index 5d4f567eb..f4965a313 100644
--- a/www/version
+++ b/www/version
@@ -1 +1 @@
-5.14.0
\ No newline at end of file
+6.0.0
\ No newline at end of file
diff --git a/www/views/includes/containers/browse/actions.inc.php b/www/views/includes/containers/browse/actions.inc.php
deleted file mode 100644
index 743c5b17c..000000000
--- a/www/views/includes/containers/browse/actions.inc.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-use \Controllers\User\Permission\Repo as RepoPermission; ?>
-
-<section class="section-right reloadable-container" container="browse/actions">
-    <?php
-    try {
-        // If the user does not have permission to upload packages, prevent access to this panel.
-        if (!RepoPermission::allowedAction('upload-package')) {
-            throw new Exception('You are not allowed to upload packages');
-        } ?>
-
-        <h3>UPLOAD PACKAGES</h3>
-
-        <?php
-        // If a task is already running on this repo then print a message
-        if (!empty($rebuild) and $rebuild == 'running') : ?>
-            <div class="div-generic-blue">
-                <h6 class="margin-top-0">TASK RUNNING</h6>
-                <div class="flex align-item-center column-gap-5">
-                    <img src="/assets/icons/loading.svg" class="icon" />
-                    <p class="note">A task is running on this repository snapshot.</p>
-                </div>
-            </div>
-            <?php
-        endif;
-
-        // If there is no task running on this repo then print action buttons
-        if (empty($rebuild) or (!empty($rebuild) and $rebuild != 'running')) : ?>
-            <div class="div-generic-blue">
-                <form action="" method="post" enctype="multipart/form-data">
-                    <input type="hidden" name="action" value="uploadPackage" />
-                    <input type="hidden" name="snapId" value="<?= $snapId ?>" />
-
-                    <h6 class="margin-top-0">SELECT PACKAGES TO UPLOAD</h6>
-                    <p class="note">Max upload size: <?= ini_get('upload_max_filesize') ?></p>
-                    <p class="note">Valid MIME types: <code class="font-size-11">application/x-rpm</code> and <code class="font-size-11">application/vnd.debian.binary-package</code></p>
-
-                    <br>
-                    <input type="file" name="packages[]" accept="application/vnd.debian.binary-package" multiple />
-                    
-                    <h6 class="">OVERWRITE EXISTING PACKAGES</h6>
-                    <p class="note">If a package with the same name already exists in the snapshot, it will be overwritten.</p>
-                    <label class="onoff-switch-label">
-                        <input name="overwrite" type="checkbox" class="onoff-switch-input">
-                        <span class="onoff-switch-slider"></span>
-                    </label>
-
-                    <br><br>
-                    <button type="submit" class="btn-large-green">Upload package</button>
-                </form>
-
-                <div class="margin-top-10">
-                    <?php
-                    // Print success messages from uploading packages if there are
-                    if (!empty($uploadSuccessMessage)) {
-                        echo '<p class="greentext">' . $uploadSuccessMessage . '</p>';
-                    }
-
-                    // Print error messages from uploading packages if there are
-                    if (!empty($uploadErrorDetails)) {
-                        foreach ($uploadErrorDetails as $errorTitle => $errorPackages) {
-                            echo '<p class="redtext">' . htmlspecialchars($errorTitle) . ':</p>';
-                            foreach ($errorPackages as $pkg) {
-                                echo '<p class="redtext">' . htmlspecialchars($pkg) . '</p>';
-                            }
-                        }
-                    }
-
-                    if (!empty($uploadErrorMessage)) {
-                        echo '<p class="redtext">' . $uploadErrorMessage . '</p>';
-                    } ?>
-                </div>
-            </div>
-            <?php
-        endif;
-    } catch (Exception $e) {
-        // echo '<div class="div-generic-blue">';
-        // echo $e->getMessage();
-        // echo '</div>';
-    }
-
-    try {
-        // If the user does not have permission to rebuild repositories, prevent access to this panel.
-        if (!RepoPermission::allowedAction('rebuild')) {
-            throw new Exception('You are not allowed to rebuild repositories');
-        } ?>
-            
-        <h3>REBUILD REPOSITORY</h3>
-
-        <?php
-        // If there is no task running on this repo then print action buttons
-        if (empty($rebuild) or (!empty($rebuild) and $rebuild != 'running')) :
-            $gpgSignChecked = '';
-
-            if ($repoController->getPackageType() == 'rpm' && RPM_SIGN_PACKAGES == 'true') {
-                $gpgSignChecked = 'checked';
-            }
-            if ($repoController->getPackageType() == 'deb' && DEB_SIGN_REPO == 'true') {
-                $gpgSignChecked = 'checked';
-            } ?>
-
-            <div class="div-generic-blue">
-                <h6 class="margin-top-0">SIGN WITH GPG</h6>
-                <p class="note">Signature can extend the task duration.</p>
-                <label class="onoff-switch-label">
-                    <input name="gpgSign" type="checkbox" class="onoff-switch-input" <?= $gpgSignChecked ?>>
-                    <span class="onoff-switch-slider"></span>
-                </label>
-
-                <br><br>
-                <button id="rebuild-btn" snap-id="<?= $snapId ?>" type="button" class="btn-large-red">Execute</button>
-            </div>
-            <?php
-        endif;
-    } catch (Exception $e) {
-        // echo '<div class="div-generic-blue">';
-        // echo $e->getMessage();
-        // echo '</div>';
-    } ?>
-</section>
diff --git a/www/views/includes/containers/browse/list.inc.php b/www/views/includes/containers/browse/list.inc.php
deleted file mode 100644
index b786b3a7e..000000000
--- a/www/views/includes/containers/browse/list.inc.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<section class="section-left reloadable-container" container="browse/list">
-    <h3>SNAPSHOT</h3>
-
-    <?php
-    if ($myrepo->getPackageType() == 'rpm') {
-        $repo = $myrepo->getName() . ' ❯ ' . $myrepo->getReleasever();
-    }
-    if ($myrepo->getPackageType() == 'deb') {
-        $repo = $myrepo->getName() . ' ❯ ' . $myrepo->getDist() . ' ❯ ' . $myrepo->getSection();
-    } ?>
-
-    <div class="grid grid-rfr-1-4 row-gap-20 div-generic-blue margin-bottom-15">
-        <div>
-            <h6 class="margin-top-0">REPOSITORY</h6>
-            <div class="flex align-item-center column-gap-5">
-                <p><span class="label-white"><?= $repo ?></span></p>
-                <span class="label-pkg-<?= $myrepo->getPackageType() ?>"><?= strtoupper($myrepo->getPackageType()) ?></span>
-            </div>
-        </div>
-
-        <div>
-            <h6 class="margin-top-0">SNAPSHOT</h6>
-            <p><span class="label-black"><?= $myrepo->getDateFormatted() ?></span></p>
-        </div>
-
-        <div>
-            <h6 class="margin-top-0">SIZE</h6>
-            <p><?= $repoSize ?></p>
-        </div>
-
-        <div>
-            <h6 class="margin-top-0">PACKAGES</h6>
-            <p><?= $packagesCount ?></p>
-        </div>
-    </div>
-
-    <div>
-        <?php
-        if ($myrepo->getRebuild() == 'needed') {
-            echo '<p class="yellowtext">Repository snapshot content has been modified. You have to rebuild metadata.<br><br></p>';
-        } ?>
-
-        <div id="loading-tree" class="flex align-item-center column-gap-5">
-            <img src="/assets/icons/loading.svg" class="icon" />
-            <p class="note">Generating tree structure...</p>
-        </div>
-
-        <div id="browse-search-bar" class="hide margin-bottom-10">
-            <input type="text" id="browse-search-input" placeholder="Search files by name..." autocomplete="off" />
-        </div>
-
-        <div id="browse-search-results" class="hide"></div>
-
-        <div id="explorer" class="hide">
-            <form id="packages-list" snap-id="<?= $snapId ?>">
-            </form>
-        </div>
-    </div>
-
-    <script>
-        $(document).ready(function () {
-            myrepo.printTree('<?= $snapshotPath ?>');
-        });
-    </script>
-</section>
\ No newline at end of file
diff --git a/www/views/includes/containers/header/debug-mode.inc.php b/www/views/includes/containers/header/debug-mode.inc.php
index 24e976643..4a442d8f6 100644
--- a/www/views/includes/containers/header/debug-mode.inc.php
+++ b/www/views/includes/containers/header/debug-mode.inc.php
@@ -1,4 +1,4 @@
-<article class="reloadable-container" container="header/debug-mode">
+<div class="reloadable-container width-100" container="header/debug-mode">
     <?php
     if (IS_ADMIN && \Controllers\App\DebugMode::enabled()) : ?>
         <section class="section-main">
@@ -31,4 +31,4 @@
         </section>
         <?php
     endif ?>
-</article>
+</div>
diff --git a/www/views/includes/containers/header/general-error-messages.inc.php b/www/views/includes/containers/header/general-error-messages.inc.php
index 907892fe9..60d9624ab 100644
--- a/www/views/includes/containers/header/general-error-messages.inc.php
+++ b/www/views/includes/containers/header/general-error-messages.inc.php
@@ -1,4 +1,4 @@
-<article class="reloadable-container" container="header/general-error-messages">
+<div class="reloadable-container width-100" container="header/general-error-messages">
     <?php
     /**
      *  Print missing parameters alert if any
@@ -18,7 +18,7 @@
                 endif;
 
                 if (!empty(__LOAD_ERROR_MESSAGES)) : ?>
-                    <div class="flex flex-direction-column row-gap-5 margin-top-10">
+                    <div class="flex flex-direction-column row-gap-5">
                         <?php
                         foreach (__LOAD_ERROR_MESSAGES as $message) {
                             echo '<p>' . $message . '</p>';
@@ -30,4 +30,4 @@
         </section>
         <?php
     endif ?>
-</article>
+</div>
diff --git a/www/views/includes/containers/header/general-log-messages.inc.php b/www/views/includes/containers/header/general-log-messages.inc.php
index acac98b91..87525d4a9 100644
--- a/www/views/includes/containers/header/general-log-messages.inc.php
+++ b/www/views/includes/containers/header/general-log-messages.inc.php
@@ -1,4 +1,4 @@
-<article class="reloadable-container" container="header/general-log-messages">
+<div class="reloadable-container width-100" container="header/general-log-messages">
     <?php
     /**
      *  Print info or error logs if any
@@ -55,4 +55,4 @@
         </section>
         <?php
     endif ?>
-</article>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/www/views/includes/containers/header/menu.inc.php b/www/views/includes/containers/header/menu.inc.php
index 7d45ec77d..4dfe65084 100644
--- a/www/views/includes/containers/header/menu.inc.php
+++ b/www/views/includes/containers/header/menu.inc.php
@@ -1,197 +1,115 @@
 <?php
 use \Controllers\User\Permission\Host as HostPermission;
-use \Controllers\User\Permission\Task as TaskPermission; ?>
-
-<header class="reloadable-container" container="header/menu">
-    <nav id="menu">
-        <div id="title">
-            <a href="/"><span>Repomanager</span></a>
+use \Controllers\User\Permission\Task as TaskPermission;
+
+$currentSection = '';
+
+if (defined('__ACTUAL_URI__') && !empty(__ACTUAL_URI__[1])) {
+    $currentSection = __ACTUAL_URI__[1];
+} ?>
+
+<nav id="menu" class="reloadable-container" container="header/menu">
+    <div id="menu-fixed">
+        <div class="flex flex-direction-column row-gap-30">
+            <!-- Repositories tab -->
+            <div class="menu-item <?= in_array($currentSection, ['', 'repository', 'snapshot', 'stats']) ? 'menu-item-active' : '' ?>">
+                <a href="/">
+                    <img src="/assets/icons/package.svg" class="icon" title="Repositories" />
+                </a>
+            </div>
 
+            <!-- Tasks tab -->
             <?php
-            if (DEVEL) {
-                echo '<p><span id="devel">DEVEL</span></p>';
-            } ?>
-        </div>
-
-        <div id="menu-inline">
-            <div class="flex align-item-center">
-                <?php
-                /**
-                 *  REPOS tab
-                 */
-                if (in_array(__ACTUAL_URI__[1], ['', 'browse', 'stat', 'stats'])) {
-                    $headerMenuClass = 'menu-sub-container-underline';
-                } else {
-                    $headerMenuClass = 'menu-sub-container';
-                } ?>
-
-                <div class="<?= $headerMenuClass ?>">
-                    <a href="/">
-                        <div class="flex align-item-center column-gap-10">
-                            <img src="/assets/icons/package.svg" class="icon" />
-                            <span class="menu-tab-title">REPOSITORIES</span>
-                        </div>
+            if (TaskPermission::allowed()) : ?>
+                <div class="menu-item menu-item-tasks <?= in_array($currentSection, ['tasks', 'task']) ? 'menu-item-active' : '' ?>">
+                    <a href="/tasks">
+                        <img src="/assets/icons/rocket.svg" class="icon" title="Tasks" />
                     </a>
-                </div>
 
-                <?php
-                // TASKS tab
-
-                // Check if the user has any permission on tasks
-                if (TaskPermission::allowed()) :
-                    if (__ACTUAL_URI__[1] == 'run') {
-                        $headerMenuClass = 'menu-sub-container-underline';
-                    } else {
-                        $headerMenuClass = 'menu-sub-container';
-                    } ?>
-
-                    <div id="header-refresh-container" class="<?= $headerMenuClass ?>">
-                        <div>
-                            <a href="/run">
-                                <div class="flex align-item-center column-gap-10">
-                                    <img src="/assets/icons/rocket.svg" class="icon" />
-                                    <span class="menu-tab-title">TASKS</span>
-                                </div>
-                            </a>
-
-                            <div id="header-refresh">
-                                <?php
-                                // Print a notification badge according to the number of running tasks
-                                if ($totalRunningTasks > 0) {
-                                    echo '<span class="op-total-running">' . $totalRunningTasks . '</span>';
+                    <?php
+                    if ($totalRunningTasks > 0) : ?>
+                        <span class="menu-task-badge"><?= $totalRunningTasks ?></span>
+
+                        <div class="menu-task-popup">
+                            <?php
+                            foreach ($tasksRunning as $task) :
+                                $color = 'white';
+                                $taskParams = json_decode($task['Raw_params'], true);
+                                $repo = $taskController->getRepo($task['Id'], false);
+
+                                if ($repo['type'] == 'deb') {
+                                    $color = 'red';
                                 }
 
-                                // If at least 1 task is running then we display its details
-                                if ($totalRunningTasks > 0) :
-                                    echo '<div class="header-op-container">';
-
-                                    // Print each running task
-                                    foreach ($tasksRunning as $task) :
-                                        $taskParams = json_decode($task['Raw_params'], true); ?>
-
-                                        <div class="header-op-subdiv btn-large-red">
-                                            <a href="/run/<?= $task['Id'] ?>">
-                                                <span>
-                                                    <?php
-                                                    if ($taskParams['action'] == 'create') {
-                                                        if ($taskParams['repo-type'] == 'local') {
-                                                            echo 'New local repository ';
-                                                        }
-                                                        if ($taskParams['repo-type'] == 'mirror') {
-                                                            echo 'New mirror repository ';
-                                                        }
-                                                    }
-                                                    if ($taskParams['action'] == 'update') {
-                                                        echo 'Update ';
-                                                    }
-                                                    if ($taskParams['action'] == 'env') {
-                                                        echo 'Point environment ';
-                                                    }
-                                                    if ($taskParams['action'] == 'removeEnv') {
-                                                        echo 'Remove environment ';
-                                                    }
-                                                    if ($taskParams['action'] == 'rebuild') {
-                                                        echo 'Rebuilding metadata ';
-                                                    }
-                                                    if ($taskParams['action'] == 'rename') {
-                                                        echo 'Rename ';
-                                                    }
-                                                    if ($taskParams['action'] == 'duplicate') {
-                                                        echo 'Duplicate ';
-                                                    }
-                                                    if ($taskParams['action'] == 'delete') {
-                                                        echo 'Delete ';
-                                                    } ?>
-                                                </span>
-
-                                                <span class="label-white"><?= $myTask->getRepo($task['Id']); ?></span>
-                                            </a>
-
-                                            <?php
-                                            if (IS_ADMIN or in_array('stop', USER_PERMISSIONS['tasks']['allowed-actions'])) : ?>
-                                                    <img src="/assets/icons/stop.svg" class="icon-large stop-task-btn" task-id="<?= $task['Id'] ?>" title="Stop task">
-                                                <?php
-                                            endif ?>
-                                        </div>
-                                        <?php
-                                    endforeach;
-                                    echo '</div>';
+                                if ($repo['type'] == 'rpm') {
+                                    $color = 'blue';
+                                } ?>
 
-                                    unset($tasksRunning);
-                                endif ?>
-                            </div>
-                        </div>
-                    </div>
-                    <?php
-                endif;
-
-                // HOSTS tab
-                // Check if the user has any permission on hosts
-                if (HostPermission::allowed()) :
-                    if (__ACTUAL_URI__[1] == 'hosts' or __ACTUAL_URI__[1] == 'host') {
-                        $headerMenuClass = 'menu-sub-container-underline';
-                    } else {
-                        $headerMenuClass = 'menu-sub-container';
-                    }
-
-                    if (MANAGE_HOSTS == "true") : ?>
-                        <div class="<?= $headerMenuClass ?>">
-                            <a href="/hosts">
-                                <div class="flex align-item-center column-gap-10">
-                                    <img src="/assets/icons/server.svg" class="icon" />
-                                    <span class="menu-tab-title">HOSTS</span>
+                                <div class="menu-task-popup-item">
+                                    <a href="/task/<?= $task['Id'] ?>" class="menu-task-popup-item-link">
+                                        <span><?= $taskController::generateLiteralAction2($task); ?></span>
+                                        <span class="label-<?= $color ?>"><?= $taskController->getRepo($task['Id']); ?></span>
+                                    </a>
+
+                                    <?php
+                                    // Check if the user has permission to stop tasks
+                                    if (TaskPermission::allowedAction('stop')) : ?>
+                                        <span title="Stop task" class="stop-task-btn" task-id="<?= $task['Id'] ?>"><img src="/assets/icons/stop.svg" class="icon-medium icon-lowopacity" /></span>
+                                        <?php
+                                    endif ?>
                                 </div>
-                            </a>
+                                <?php
+                                unset($taskParams, $repo, $color);
+                            endforeach ?>
                         </div>
                         <?php
-                    endif;
-                endif ?>
-            </div>
-
-            <div class="flex align-item-center column-gap-30 margin-right-15">
+                    endif ?>
+                </div>
                 <?php
-                if (IS_ADMIN) : ?>
-                    <div>
-                        <a href="/settings"><img src="/assets/icons/cog.svg" class="icon-lowopacity" title="Repomanager settings" /></a>
-                    </div>
-
-                    <div>
-                        <a href="/history"><img src="/assets/icons/time.svg" class="icon-lowopacity" title="Repomanager history" /></a>
-                    </div>                
+            endif ?>
 
-                    <a href="/status">
-                        <img src="/assets/icons/health.svg" class="icon-lowopacity margin-right-0" title="Access system health & monitoring" />
+            <!-- Hosts tab -->
+            <?php
+            if (HostPermission::allowed()) : ?>
+                <div class="menu-item <?= in_array($currentSection, ['hosts', 'host']) ? 'menu-item-active' : '' ?>">
+                    <a href="/hosts">
+                        <img src="/assets/icons/server.svg" class="icon" title="Hosts" />
                     </a>
-                    <?php
-                endif ?>
+                </div>
+                <?php
+            endif ?>
+        </div>
 
-                <div class="relative">
-                    <img src="/assets/icons/alarm.svg" class="icon-lowopacity get-panel-btn" panel="general/notification" title="Show notifications" />
-                    <?php
-                    if (NOTIFICATION != 0) : ?>
-                        <span id="notification-count"><?= NOTIFICATION ?></span>
-                        <?php
-                    endif ?>
+        <div class="flex flex-direction-column row-gap-20">
+            <?php
+            if (IS_ADMIN) : ?>
+                <div class="menu-sub-item <?= $currentSection === 'settings' ? 'menu-item-active' : '' ?>">
+                    <a href="/settings"><img src="/assets/icons/cog.svg" class="icon" title="Repomanager settings" /></a>
                 </div>
 
-                <div class="flex align-item-center column-gap-10 get-panel-btn lowopacity pointer" panel="general/userspace" title="Userspace">
-                    <img src="/assets/icons/user.svg" class="icon" />
-                    <span>
-                        <?php
-                        echo $_SESSION['username'];
-
-                        if (!empty($_SESSION['first_name']) and !empty($_SESSION['last_name'])) {
-                            echo ' (' . $_SESSION['first_name'] . ' ' . $_SESSION['last_name'] . ')';
-                        } elseif (!empty($_SESSION['first_name'])) {
-                            echo ' (' . $_SESSION['first_name'] . ')';
-                        } ?>
-                    </span>
+                <div class="menu-sub-item <?= $currentSection === 'history' ? 'menu-item-active' : '' ?>">
+                    <a href="/history"><img src="/assets/icons/time.svg" class="icon" title="Repomanager history" /></a>
                 </div>
+
+                <div class="menu-sub-item <?= $currentSection === 'status' ? 'menu-item-active' : '' ?>">
+                    <a href="/status"><img src="/assets/icons/health.svg" class="icon" title="System health & monitoring" /></a>
+                </div>            
+                <?php
+            endif ?>
+
+            <div class="menu-sub-item get-panel-btn pointer relative" panel="general/notification" title="Show notifications">
+                <img src="/assets/icons/alarm.svg" class="icon-lowopacity" />
+                <?php
+                if (NOTIFICATION != 0) : ?>
+                    <span id="notification-count"><?= NOTIFICATION ?></span>
+                    <?php
+                endif ?>
             </div>
-        </div>
 
-        <div id="menu-burger">
-            <img src="/assets/icons/menu.svg" class="icon-large get-panel-btn" panel="header/menu-burger" title="Open menu" />
+            <div class="menu-sub-item get-panel-btn pointer" panel="general/userspace" title="Userspace">
+                <img src="/assets/icons/user.svg" class="icon" />
+            </div>
         </div>
-    </nav>
-</header>
\ No newline at end of file
+    </div>
+</nav>
+        
diff --git a/www/views/includes/containers/header/service-status.inc.php b/www/views/includes/containers/header/service-status.inc.php
index 02d9594fe..cb1ed3e01 100644
--- a/www/views/includes/containers/header/service-status.inc.php
+++ b/www/views/includes/containers/header/service-status.inc.php
@@ -1,4 +1,4 @@
-<article class="reloadable-container" container="header/service-status">
+<div class="reloadable-container width-100" container="header/service-status">
     <?php
     // Do not display the message if an update is running because it is normal that the service is not running during an update
     if (!\Controllers\Service\Service::isRunning() and !\Controllers\Update::running()) : ?>
@@ -10,4 +10,4 @@
         </section>
         <?php
     endif ?> 
-</article>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/www/views/includes/containers/host/packages.inc.php b/www/views/includes/containers/host/packages.inc.php
index 1f8303d25..efa0f6992 100644
--- a/www/views/includes/containers/host/packages.inc.php
+++ b/www/views/includes/containers/host/packages.inc.php
@@ -3,7 +3,7 @@
     <p class="note">Packages installed and available updates.</p>
     
     <?php
-    if (empty($packagesInventored) and empty($packagesAvailable)) : ?>
+    if (empty($packagesInventoredTotal) and empty($packagesAvailableTotal)) : ?>
         <div class="empty-state">
             <p class="empty-state-title">Nothing for now!</p>
             <p class="note">The host did not send any packages inventory yet.</p>
@@ -11,7 +11,7 @@
         <?php
     endif;
 
-    if (!empty($packagesInventored) or !empty($packagesAvailable)) : ?>
+    if (!empty($packagesInventoredTotal) or !empty($packagesAvailableTotal)) : ?>
         <div class="flex align-item-center column-gap-40 margin-top-15 margin-bottom-15">
             <div>
                 <div id="installed-packages-btn" class="pointer">
@@ -50,36 +50,9 @@
         </div>
 
         <div id="installed-packages-div" class="hide">
-            <p class="mediumopacity-cst margin-top-15 margin-bottom-15"><?= count($packagesInventored) ?> packages inventored</p>
+            <input type="text" id="installed-packages-search" class="margin-bottom-5" autocomplete="off" placeholder="Search package" value="<?= !empty($_COOKIE['tables/host/installed-packages/search']) ? htmlspecialchars($_COOKIE['tables/host/installed-packages/search'], ENT_QUOTES) : '' ?>">
 
-            <input type="text" id="installed-packages-search" class="margin-bottom-5" onkeyup="filterPackage()" autocomplete="off" placeholder="Search package">
-
-            <div id="installed-packages-container" class="margin-top-15">
-                <?php
-                if (!empty($packagesInventored)) :
-                    foreach ($packagesInventored as $item) : ?>
-                        <div class="table-container-3 bck-blue-alt pointer package-row get-package-timeline" hostid="<?= $id ?>" packagename="<?= $item['Name'] ?>" packageversion="<?= $item['Version'] ?>" title="See package history">
-                            <div class="text-center">
-                                <?= \Controllers\Utils\Generate\Html\Icon::product($item['Name']);?>
-                            </div>
-
-                            <div>
-                                <p class="copy">
-                                    <?php
-                                    // If package is removed or purged, show it in red
-                                    if ($item['State'] == 'removed' or $item['State'] == 'purged') {
-                                        echo '<span class="redtext">' . $item['Name'] . ' (uninstalled)</span>';
-                                    } else {
-                                        echo $item['Name'];
-                                    } ?>
-                                </p>
-                                <p class="lowopacity-cst copy"><?= $item['Version'] ?></p>
-                            </div>
-                        </div>
-                        <?php
-                    endforeach;
-                endif ?>
-            </div>
+            <?php \Controllers\Layout\Table\Render::render('host/installed-packages'); ?>
         </div>
         <?php
     endif ?>
diff --git a/www/views/includes/containers/host/requests.inc.php b/www/views/includes/containers/host/requests.inc.php
index c2b06255e..7f43bf102 100644
--- a/www/views/includes/containers/host/requests.inc.php
+++ b/www/views/includes/containers/host/requests.inc.php
@@ -16,8 +16,6 @@
     </div>
 
     <?php
-    /**
-     *  Print requests
-     */
+    // Print requests
     \Controllers\Layout\Table\Render::render('host/requests'); ?>
 </section>
\ No newline at end of file
diff --git a/www/views/includes/containers/host/summary.inc.php b/www/views/includes/containers/host/summary.inc.php
index 2b2e86f42..8cc37abec 100644
--- a/www/views/includes/containers/host/summary.inc.php
+++ b/www/views/includes/containers/host/summary.inc.php
@@ -10,28 +10,22 @@
                 <div class="flex column-gap-8">
                     <?php
                     if ($compliance['compliant']) {
-                        echo '<img src="/assets/icons/check.svg" class="icon-np" title="Host is compliant" />';
+                        echo '<img src="/assets/icons/shield.svg" class="icon-np icon-medium" title="Host is compliant" />';
                     } else {
-                        echo '<img src="/assets/icons/warning-red.svg" class="icon-np" title="Host is not compliant: ' . strtolower($compliance['reason']) . '" />';
+                        echo '<img src="/assets/icons/warning-red.svg" class="icon-np icon-medium" title="Host is not compliant: ' . strtolower($compliance['reason']) . '" />';
                     } ?>
                 </div>
             </div>
 
-            <div class="flex justify-space-between">
+            <div class="flex column-gap-10 justify-space-between">
                 <?php
                 if (HostPermission::allowedAction('reset')) : ?>
-                    <div id="host-reset-btn" class="slide-btn-yellow" host-id="<?= $id ?>" title="Reset host informations">
-                        <img src="/assets/icons/update.svg">
-                        <span>Reset</span>
-                    </div>
+                    <p id="host-reset-btn" class="label-yellow pointer" host-id="<?= $id ?>" title="Reset host informations">Reset</p>
                     <?php
                 endif;
 
                 if (HostPermission::allowedAction('delete')) : ?>
-                    <div id="host-delete-btn" class="slide-btn-red" host-id="<?= $id ?>" title="Delete host">
-                        <img src="/assets/icons/delete.svg">
-                        <span>Delete</span>
-                    </div>
+                    <p id="host-delete-btn" class="label-red pointer" host-id="<?= $id ?>" title="Delete host">Delete</p>
                     <?php
                 endif ?>
             </div>
@@ -79,7 +73,7 @@
                             $tooltip = 'No network information available';
                         }
 
-                        echo '<code class="tooltip" tooltip="' . $tooltip . '">' . $interface . '</code>';
+                        echo '<span class="label-white tooltip" tooltip="' . $tooltip . '">' . $interface . '</span>';
                     }
                 } else {
                     echo '<p class="mediumopacity-cst">Unknown</p>';
@@ -135,12 +129,15 @@
 
         <div>
             <h6 class="margin-top-0">ENVIRONMENT</h6>
-            <?php
-            if (!empty($env)) {
-                echo '<p>' . \Controllers\Utils\Generate\Html\Label::envtag($env) . '</p>';
-            } else {
-                echo '<p class="mediumopacity-cst">Unknown</p>';
-            } ?>
+
+            <div>
+                <?php
+                if (!empty($env)) {
+                    echo \Controllers\Utils\Generate\Html\Label::envtag($env);
+                } else {
+                    echo '<p class="mediumopacity-cst">Unknown</p>';
+                } ?>
+            </div>
         </div>
 
         <div>
diff --git a/www/views/includes/containers/hosts/list.inc.php b/www/views/includes/containers/hosts/list.inc.php
index ed33977b1..dfdd72c22 100644
--- a/www/views/includes/containers/hosts/list.inc.php
+++ b/www/views/includes/containers/hosts/list.inc.php
@@ -59,11 +59,11 @@
     <?php
     if ($totalHosts == 0) : ?>
         <div class="empty-state">
-            <p class="empty-state-title">No host registered yet.</p>
+            <p class="empty-state-title">No host registered yet!</p>
             <p class="note">Install <b>linupdate</b> on your hosts to register them to Repomanager. This page will display dashboards and informations about the hosts and their packages (installed, available, updated...).</p>
             <div class="empty-state-actions">
-                <a href="https://github.com/lbr38/linupdate" target="_blank" rel="noopener noreferrer"><button type="button" class="btn-medium-blue">Linupdate GitHub</button></a>
-                <a href="https://github.com/lbr38/linupdate/wiki/Module:-reposerver#quick-setup-example" target="_blank" rel="noopener noreferrer"><button type="button" class="btn-large-tr">Linupdate quick setup</button></a>
+                <a href="https://github.com/lbr38/linupdate" target="_blank" rel="noopener noreferrer"><button type="button" class="btn-fit-tr">Linupdate GitHub</button></a>
+                <a href="https://github.com/lbr38/linupdate/wiki/Module:-reposerver#quick-setup-example" target="_blank" rel="noopener noreferrer"><button type="button" class="btn-fit-tr">Linupdate quick setup</button></a>
             </div>
         </div>
         <?php
@@ -71,9 +71,9 @@
 
     if ($totalHosts >= 1) : ?>
         <div>
-            <div class="grid grid-rfr-1-2 justify-space-between column-gap-20 row-gap-15 margin-bottom-10">
+            <div class="grid grid-rfr-1-2 justify-space-between column-gap-30 row-gap-15 margin-bottom-30">
                 <div>
-                    <div class="flex align-item-center column-gap-5 margin-bottom-5">
+                    <div class="flex align-item-center column-gap-8 margin-bottom-5">
                         <h6 class="margin-top-0 search-host-tooltip">SEARCH HOST</h6>
                         <img src="/assets/icons/info.svg" class="icon-small icon-np lowopacity search-host-tooltip" />
                     </div>
@@ -82,7 +82,7 @@
                 </div>
 
                 <div>
-                    <div class="flex align-item-center column-gap-5 margin-bottom-5">
+                    <div class="flex align-item-center column-gap-8 margin-bottom-5">
                         <h6 class="margin-top-0 search-package-tooltip">SEARCH PACKAGE</h6>
                         <img src="/assets/icons/info.svg" class="icon-small icon-np lowopacity search-package-tooltip" />
                     </div>
@@ -91,10 +91,10 @@
                 </div>
             </div>
 
-            <div class="flex justify-end margin-bottom-10 margin-right-30">
-                <div id="select-all-hosts" class="flex align-item-center column-gap-5 mediumopacity pointer">
-                    <p>Select all hosts</p>
-                    <input type="checkbox" title="Select all hosts" />
+            <div class="flex justify-self-end margin-bottom-10 margin-right-10">
+                <div id="select-all-hosts" class="select-all-btn btn-fit-tr align-item-center column-gap-8 pointer" title="Select all hosts">
+                    <span>Select all hosts</span>
+                    <input type="checkbox" title="Select all hosts" aria-hidden="true" tabindex="-1" />
                 </div>
             </div>
         </div>
@@ -119,7 +119,7 @@
                         } ?>
                         <input type='hidden' name='groupname' value='<?=$group['Name']?>'>
         
-                        <div class="hosts-group-container div-generic-blue veil-on-reload">
+                        <div class="hosts-group-container veil-on-reload margin-bottom-40">
                             <?php
                             // Print the group name except if it's the Default group
                             if ($group['Name'] == 'Default') {
@@ -138,22 +138,28 @@
                                 $countMessage = $hostsCount . ' hosts';
                             } ?>
 
-                            <div class="flex justify-space-between">
-                                <div>
-                                    <p class="font-size-16"><?= $groupName ?></p>
-                                    <p class="lowopacity-cst"><?= $countMessage ?></p>
+                            <div class="hosts-group-header">
+                                <div class="hosts-group-header-left">
+                                    <img src="/assets/icons/folder.svg" class="icon-np lowopacity-cst" />
+                                    <span class="hosts-group-header-name"><?= $groupName ?></span>
+                                    <span class="hosts-group-header-count"><?= $hostsCount ?></span>
                                 </div>
+
+                                <?php
+                                if ($hostsCount > 0) : ?>
+                                    <div class="select-all-btn select-group-hosts-btn btn-fit-tr align-item-center column-gap-8 pointer hide" group="<?= $group['Name'] ?>" title="Select all hosts in this group">
+                                        <span>Select all</span>
+                                        <input class="select-group-hosts-checkbox" type="checkbox" group="<?= $group['Name'] ?>" aria-hidden="true" tabindex="-1" />
+                                    </div>
+                                    <?php
+                                endif ?>
                             </div>
 
                             <?php
                             // Print the hosts of the group
                             if (!empty($hostsList)) : ?>
-                                <div class="hosts-table">
-                                    <div class="flex justify-end margin-bottom-10">
-                                        <span class="margin-right-15">
-                                            <input class="select-group-hosts-checkbox lowopacity pointer" type="checkbox" group="<?= $group['Name'] ?>" title="Select all" >
-                                        </span>
-                                    </div>
+                                <div class="hosts-group-content">
+                                    <div class="flex flex-direction-column row-gap-10">
                                 
                                     <?php
                                     // Process the hosts list
@@ -245,332 +251,314 @@
                                         if (!$compliance['compliant']) {
                                             $compliantIcon = 'warning-red.svg';
                                             $compliantTitle = 'Host is not compliant: ' . strtolower($compliance['reason']);
-                                            if ($packagesAvailableTotal >= $complianceThresholdCount) {
-                                                $class = 'bkg-red';
-                                            }
                                         }
 
                                         // Print the host informations
-                                        // Here the <div> will contain all the host informations in order to be able to search on it (input 'search a host') ?>
-                                        <div class="host-line flex flex-direction-column div-generic-blue bck-blue-alt margin-bottom-10" hostid="<?= $id ?>" hostname="<?= $hostname ?>" os="<?= $os ?>" os_version="<?= $osVersion ?>" os_family="<?= $osFamily ?>" type="<?= $type ?>" kernel="<?= $kernel ?>" arch="<?= $arch ?>" profile="<?= $profile ?>" env="<?= $env ?>" agent-status="<?= $agentStatus ?>" agent-version="<?= $agentVersion ?>" reboot_required="<?= $rebootRequired ?>" compliant="<?= Convert::toString($compliance['compliant']) ?>">
-                                            <div class="flex column-gap-20">
-                                                <div class="align-self-center">
-                                                    <?php
-                                                    if ($agentStatus == 'running') : ?>
-                                                        <img src="/assets/icons/check.svg" class="icon-np" title="Agent is running" />
-                                                        <?php
-                                                    endif;
+                                        // Here the <div> will contain all the host informations in order to be able to search on it (input 'search a host')
+                                        $hostAccent = $agentStatus === 'running' ? 'host-accent-green' : 'host-accent-red'; ?>
 
-                                                    if ($agentStatus != 'running') : ?>
-                                                        <img src="/assets/icons/warning-red.svg" class="icon-np" title="Agent state on the host: <?= $agentStatus ?> (<?= $agentLastSendStatusMsg ?>)" />
-                                                        <?php
-                                                    endif ?>
-                                                </div>
+                                        <div class="div-generic-blue host-line <?= $hostAccent ?>" hostid="<?= $id ?>" hostname="<?= $hostname ?>" os="<?= $os ?>" os_version="<?= $osVersion ?>" os_family="<?= $osFamily ?>" type="<?= $type ?>" kernel="<?= $kernel ?>" arch="<?= $arch ?>" profile="<?= $profile ?>" env="<?= $env ?>" agent-status="<?= $agentStatus ?>" agent-version="<?= $agentVersion ?>" reboot_required="<?= $rebootRequired ?>" compliant="<?= Convert::toString($compliance['compliant']) ?>" title="<?= $agentStatus !== 'running' ? 'Agent ' . $agentStatus . ' (' . $agentLastSendStatusMsg . ')' : 'Agent is running' ?>">
+                                            <div class="width-100 overflowx-auto overflowy-hidden">
+                                                <?php
+                                                if ($compactView) : ?>
+                                                    <div class="grid hosts-compact-view">
+                                                        <div class="flex align-item-center column-gap-10">
+                                                            <?= Icon::os($os); ?>
 
-                                                <div class="width-100 overflowx-auto overflowy-hidden">
-                                                    <?php
-                                                    if ($compactView) : ?>
-                                                        <div class="grid hosts-compact-view">
                                                             <div>
-                                                                <div>
-                                                                    <p title="Hostname" class="copy">
-                                                                        <a href="/host/<?= $id ?>" class="wordbreakall" target="_blank" rel="noopener noreferrer">
-                                                                            <b><?= $hostname ?></b>
-                                                                        </a>
-                                                                    </p>
-
-                                                                    <p class="mediumopacity-cst copy" title="IP address"><?= $ip ?></p>
-                                                                </div>
+                                                                <p title="Hostname" class="copy">
+                                                                    <a href="/host/<?= $id ?>" class="wordbreakall" target="_blank" rel="noopener noreferrer">
+                                                                        <b><?= $hostname ?></b>
+                                                                    </a>
+                                                                </p>
+                                                                <p class="font-size-12 mediumopacity-cst copy" title="IP address"><?= $ip ?></p>
+                                                            </div>
+                                                        </div>
+
+                                                        <div class="grid hosts-compact-view-subgrid align-item-center">
+                                                            <div class="flex flex-direction-column row-gap-2">
+                                                                <p class="font-size-13" title="OS"><?= ucfirst($os) . ' ' . $osVersion ?></p>
+                                                                <p class="font-size-10 font-family-archivo mediumopacity-cst" title="Type"><b><?= strtoupper($type) ?></b></p>
                                                             </div>
 
-                                                            <div class="grid hosts-compact-view-subgrid align-item-center">
-                                                                <div class="label-icon-tr max-width-fit" title="OS and type">
-                                                                    <?= Icon::os($os); ?>
+                                                            <div>
+                                                                <a href="/host/<?= $id ?>" target="_blank" rel="noopener noreferrer">
+                                                                    <div class="flex align-item-center column-gap-8">
+                                                                        <img src="/assets/icons/package.svg" class="icon-np" />
+                                                                        <p class="label-white font-size-12" title="<?= $packagesInstalledTotal . ' package(s) installed on this host' ?>"><?= $packagesInstalledTotal ?></p>
+                                                                        <?php
+                                                                        if ($packagesAvailableTotal > 0) {
+                                                                            $class = 'label-white';
+
+                                                                            if ($packagesAvailableTotal >= $complianceThresholdCount) {
+                                                                                $class = 'label-red';
+                                                                            }
 
-                                                                    <div class="flex flex-direction-column row-gap-2 width-100">
-                                                                        <p class="font-size-13" title="OS"><?= ucfirst($os) . ' ' . $osVersion ?></p>
-                                                                        <p class="font-size-10 font-family-archivo mediumopacity-cst" title="Type"><b><?= strtoupper($type) ?></b></p>
+                                                                            echo '<p class="' . $class . ' font-size-11" title="' . $packagesAvailableTotal . ' package update(s) available on this host">' . $packagesAvailableTotal . '</p>';
+                                                                        } ?>
                                                                     </div>
-                                                                </div>
-
-                                                                <div class="flex flex-direction-column row-gap-5">
-                                                                    <a href="/host/<?= $id ?>" target="_blank" rel="noopener noreferrer">
-                                                                        <div class="label-icon-tr max-width-fit">
-                                                                            <img src="/assets/icons/<?= $compliantIcon ?>" class="icon-np" title="<?= $compliantTitle ?>"/>
-                                                                            <div class="flex align-item-center column-gap-10">
-                                                                                <p class="font-size-13" title="<?= $packagesInstalledTotal . ' package(s) installed on this host' ?>"><?= $packagesInstalledTotal ?></p>
-                                                                                <p class="font-size-13 host-available-packages-label <?= $class ?>" title="<?= $packagesAvailableTotal ?> package update(s) available on this host"><?= $packagesAvailableTotal ?></p>
-                                                                            </div>
-                                                                        </div>
-                                                                    </a>
-                                                                </div>
+                                                                </a>
+                                                            </div>
 
-                                                                <div class="flex align-item-center justify-end">
-                                                                    <?php
-                                                                    if ($rebootRequired == 'true') {
-                                                                        echo '<img src="/assets/icons/warning.svg" class="icon-np" title="Reboot required" />';
-                                                                    } ?>
-                                                                </div>
+                                                            <div class="flex align-item-center column-gap-8 row-gap-5 justify-end">
+                                                                <?php
+                                                                if (!$compliance['compliant']) {
+                                                                    echo '<img src="/assets/icons/' . $compliantIcon . '" class="icon-np" title="' . $compliantTitle . '" />';
+                                                                }
+
+                                                                if ($rebootRequired == 'true') {
+                                                                    echo '<img src="/assets/icons/warning.svg" class="icon-np" title="Reboot required" />';
+                                                                } ?>
                                                             </div>
                                                         </div>
-                                                        <?php
-                                                    endif;
+                                                    </div>
+                                                    <?php
+                                                endif;
 
-                                                    if (!$compactView) : ?>
-                                                        <div class="margin-bottom-15">
+                                                if (!$compactView) : ?>
+                                                    <div class="flex align-item-center column-gap-10 margin-bottom-15">
+                                                        <?= Icon::os($os); ?>
+                                                        <div>
                                                             <p class="copy">
                                                                 <a href="/host/<?= $id ?>" class="wordbreakall" target="_blank" rel="noopener noreferrer">
                                                                     <b><?= $hostname ?></b>
                                                                 </a>
                                                             </p>
+                                                            <p class="font-size-12 mediumopacity-cst copy"><?= $ip ?></p>
                                                         </div>
+                                                    </div>
 
-                                                        <div class="grid grid-rfr-1-4 row-gap-20 column-gap-20">
-                                                            <div>
-                                                                <h6 class="margin-top-0">IP</h6>
-                                                                <p class="mediumopacity-cst copy"><?= $ip ?></p>
-                                                            </div>
-                                                            
-                                                            <div>
-                                                                <h6 class="margin-top-0">TYPE</h6>
-                                                                <p class="mediumopacity-cst copy"><?= $type ?></p>
-                                                            </div>
+                                                    <div class="grid grid-rfr-1-5 row-gap-20 column-gap-20">
+                                                        <div>
+                                                            <h6 class="margin-top-0">OS</h6>
+                                                            <p class="mediumopacity-cst copy"><?= ucfirst($os) . ' ' . $osVersion ?></p>
+                                                        </div>
+                                                        
+                                                        <div>
+                                                            <h6 class="margin-top-0">TYPE</h6>
+                                                            <p class="mediumopacity-cst copy"><?= $type ?></p>
+                                                        </div>
 
-                                                            <div>
-                                                                <h6 class="margin-top-0">AGENT VERSION</h6>
-                                                                <p class="mediumopacity-cst copy"><?= $agentVersion ?></p>
-                                                            </div>
+                                                        <div>
+                                                            <h6 class="margin-top-0">KERNEL</h6>
+                                                            <p class="mediumopacity-cst copy"><?= $kernel ?></p>
+                                                        </div>
 
-                                                            <div>
-                                                                <h6 class="margin-top-0">REBOOT REQUIRED</h6>
-                                                                <p class="flex align-item-center column-gap-5">
-                                                                    <?php
-                                                                    if ($rebootRequired == 'true') {
-                                                                        echo '<img src="/assets/icons/warning.svg" class="icon-np" />';
-                                                                        echo '<span>Yes</span>';
-                                                                    } else {
-                                                                        echo '<span class="mediumopacity-cst">No</span>';
-                                                                    } ?>
-                                                                </p>
-                                                            </div>
+                                                        <div>
+                                                            <h6 class="margin-top-0">ARCH</h6>
+                                                            <p class="mediumopacity-cst copy"><?= $arch ?></p>
+                                                        </div>
 
-                                                            <div>
-                                                                <h6 class="margin-top-0">OS</h6>
-                                                                <div class="flex align-item-center column-gap-5">
-                                                                    <p class="mediumopacity-cst copy"><?= $os ?></p>
-                                                                    <span><?= Icon::os($os); ?></span>
-                                                                </div>
-                                                            </div>
+                                                        <div>
+                                                            <h6 class="margin-top-0">PROFILE</h6>
+                                                            <p class="mediumopacity-cst copy"><?= $profile ?></p>
+                                                        </div>
 
-                                                            <div>
-                                                                <h6 class="margin-top-0">OS VERSION</h6>
-                                                                <p class="mediumopacity-cst copy"><?= $osVersion ?></p>
-                                                            </div>
+                                                        <div>
+                                                            <h6 class="margin-top-0">ENVIRONMENT</h6>
+                                                            <p class="copy">
+                                                                <?= Label::envtag($env) ?>
+                                                            </p>
+                                                        </div>
 
-                                                            <div>
-                                                                <h6 class="margin-top-0">KERNEL</h6>
-                                                                <p class="mediumopacity-cst copy"><?= $kernel ?></p>
-                                                            </div>
+                                                        <div>
+                                                            <h6 class="margin-top-0">AGENT VERSION</h6>
+                                                            <p class="copy"><span class="label-white"><?= $agentVersion ?></span></p>
+                                                        </div>
 
-                                                            <div>
-                                                                <h6 class="margin-top-0">ARCH</h6>
-                                                                <p class="mediumopacity-cst copy"><?= $arch ?></p>
-                                                            </div>
+                                                        <div>
+                                                            <h6 class="margin-top-0">REBOOT REQUIRED</h6>
+                                                            <p class="flex align-item-center column-gap-5">
+                                                                <?php
+                                                                if ($rebootRequired == 'true') {
+                                                                    echo '<img src="/assets/icons/warning.svg" class="icon-np" />';
+                                                                    echo '<span>Yes</span>';
+                                                                } else {
+                                                                    echo '<span class="mediumopacity-cst">No</span>';
+                                                                } ?>
+                                                            </p>
+                                                        </div>
 
-                                                            <div>
-                                                                <h6 class="margin-top-0">PROFILE</h6>
-                                                                <p class="mediumopacity-cst copy"><?= $profile ?></p>
-                                                            </div>
+                                                        <div>
+                                                            <h6 class="margin-top-0"><?= $layoutPackagesTitle ?> INSTALLED</h6>
+                                                            <p title="<?= $packagesInstalledTotal . ' package(s) installed on this host' ?>">
+                                                                <span class="label-white"><?= $packagesInstalledTotal ?></span>
+                                                            </p>
+                                                        </div>
 
-                                                            <div>
-                                                                <h6 class="margin-top-0">ENVIRONMENT</h6>
-                                                                <p class="copy">
-                                                                    <?= Label::envtag($env) ?>
-                                                                </p>
-                                                            </div>
+                                                        <div>
+                                                            <h6 class="margin-top-0"><?= $layoutPackagesTitle ?> AVAILABLE</h6>
+                                                            <p title="<?= $packagesAvailableTotal . ' package update(s) available on this host' ?>">
+                                                                <?php
+                                                                if ($packagesAvailableTotal >= $complianceThresholdCount) {
+                                                                    echo '<span class="label-red">' . $packagesAvailableTotal . '</span>';
+                                                                } else {
+                                                                    echo '<span class="label-white">' . $packagesAvailableTotal . '</span>';
+                                                                } ?>
+                                                            </p>
+                                                        </div>
+                                                    </div>
+                                                
+                                                    <div>
+                                                        <?php
+                                                        // Last request status
+                                                        if (!empty($lastPendingRequest)) :
+                                                            // Retrieve and decode JSON data
+                                                            $requestJson = json_decode($lastPendingRequest['Request'], true);
+
+                                                            // Request name
+                                                            $request = $requestJson['request'];
+
+                                                            // Request data
+                                                            if (isset($requestJson['data'])) {
+                                                                $requestData = $requestJson['data'];
+                                                            }
+
+                                                            // Only if not a 'disconnect' request
+                                                            if ($request != 'disconnect') :
+                                                                // Response data
+                                                                if (!empty($lastPendingRequest['Response_json'])) {
+                                                                    $responseJson = json_decode($lastPendingRequest['Response_json'], true);
+                                                                }
 
-                                                            <div>
-                                                                <h6 class="margin-top-0"><?= $layoutPackagesTitle ?> INSTALLED</h6>
-                                                                <p title="<?= $packagesInstalledTotal . ' package(s) installed on this host' ?>">
-                                                                    <?= $packagesInstalledTotal ?>
-                                                                </p>
-                                                            </div>
+                                                                // Request status
+                                                                if ($lastPendingRequest['Status'] == 'new') {
+                                                                    $requestStatus = 'Pending';
+                                                                    $requestStatusIcon = 'pending.svg';
+                                                                }
+                                                                if ($lastPendingRequest['Status'] == 'sent') {
+                                                                    $requestStatus = 'Sent';
+                                                                    $requestStatusIcon = 'pending.svg';
+                                                                }
+                                                                if ($lastPendingRequest['Status'] == 'running') {
+                                                                    $requestStatus = 'Running';
+                                                                    $requestStatusIcon = 'loading.svg';
+                                                                }
+                                                                if ($lastPendingRequest['Status'] == 'canceled') {
+                                                                    $requestStatus = 'Canceled';
+                                                                    $requestStatusIcon = 'warning-red.svg';
+                                                                }
+                                                                if ($lastPendingRequest['Status'] == 'failed') {
+                                                                    $requestStatus = 'Failed';
+                                                                    $requestStatusIcon = 'error.svg';
+                                                                }
+                                                                if ($lastPendingRequest['Status'] == 'completed') {
+                                                                    $requestStatus = 'Completed';
+                                                                    $requestStatusIcon = 'check.svg';
+                                                                }
 
-                                                            <div>
-                                                                <h6 class="margin-top-0"><?= $layoutPackagesTitle ?> AVAILABLE</h6>
-                                                                <p title="<?= $packagesAvailableTotal . ' package update(s) available on this host' ?>">
-                                                                    <?php
-                                                                    if ($packagesAvailableTotal >= $complianceThresholdCount) {
-                                                                        echo '<span class="label-white bkg-red">' . $packagesAvailableTotal . '</span>';
-                                                                    } else {
-                                                                        echo '<span class="label-white">' . $packagesAvailableTotal . '</span>';
-                                                                    } ?>    
-                                                                </p>
-                                                            </div>
-                                                        </div>
-                                                    
-                                                        <div>
-                                                            <?php
-                                                            // Last request status
-                                                            if (!empty($lastPendingRequest)) :
-                                                                // Retrieve and decode JSON data
-                                                                $requestJson = json_decode($lastPendingRequest['Request'], true);
-
-                                                                // Request name
-                                                                $request = $requestJson['request'];
-
-                                                                // Request data
-                                                                if (isset($requestJson['data'])) {
-                                                                    $requestData = $requestJson['data'];
+                                                                // Request info
+                                                                $requestInfo = $lastPendingRequest['Info'];
+
+                                                                // Request title
+                                                                if ($request == 'request-general-infos') {
+                                                                    $requestTitle = 'Requested the host to send its general informations';
+                                                                    $requestTitleShort = 'Request general information';
                                                                 }
+                                                                if ($request == 'request-packages-infos') {
+                                                                    $requestTitle = 'Requested the host to send its packages informations';
+                                                                    $requestTitleShort = 'Request package information';
+                                                                }
+                                                                if ($request == 'request-packages-update') {
+                                                                    $requestTitle = 'Request to update a list of package(s)';
+                                                                    $requestTitleShort = 'Request to update a list of package(s)';
 
-                                                                // Only if not a 'disconnect' request
-                                                                if ($request != 'disconnect') :
-                                                                    // Response data
-                                                                    if (!empty($lastPendingRequest['Response_json'])) {
-                                                                        $responseJson = json_decode($lastPendingRequest['Response_json'], true);
+                                                                    if (!empty($requestJson['packages'])) {
+                                                                        $requestDetails = count($requestJson['packages']) . ' package(s) to install';
                                                                     }
+                                                                }
+                                                                if ($request == 'request-all-packages-update') {
+                                                                    $requestTitle = 'Requested the host to update all of its packages';
+                                                                    $requestTitleShort = 'Request to update all packages';
+
+                                                                    if (!empty($responseJson)) {
+                                                                        // If there was no packages to update
+                                                                        if ($responseJson['update']['status'] == 'nothing-to-do') {
+                                                                            $responseDetails = 'No packages to update';
+                                                                        }
 
-                                                                    // Request status
-                                                                    if ($lastPendingRequest['Status'] == 'new') {
-                                                                        $requestStatus = 'Pending';
-                                                                        $requestStatusIcon = 'pending.svg';
-                                                                    }
-                                                                    if ($lastPendingRequest['Status'] == 'sent') {
-                                                                        $requestStatus = 'Sent';
-                                                                        $requestStatusIcon = 'pending.svg';
-                                                                    }
-                                                                    if ($lastPendingRequest['Status'] == 'running') {
-                                                                        $requestStatus = 'Running';
-                                                                        $requestStatusIcon = 'loading.svg';
-                                                                    }
-                                                                    if ($lastPendingRequest['Status'] == 'canceled') {
-                                                                        $requestStatus = 'Canceled';
-                                                                        $requestStatusIcon = 'warning-red.svg';
-                                                                    }
-                                                                    if ($lastPendingRequest['Status'] == 'failed') {
-                                                                        $requestStatus = 'Failed';
-                                                                        $requestStatusIcon = 'error.svg';
-                                                                    }
-                                                                    if ($lastPendingRequest['Status'] == 'completed') {
-                                                                        $requestStatus = 'Completed';
-                                                                        $requestStatusIcon = 'check.svg';
-                                                                    }
+                                                                        // If there was packages to update, retrieve the number of packages updated
+                                                                        if ($responseJson['update']['status'] == 'done' or $responseJson['update']['status'] == 'failed') {
+                                                                            $successCount = $responseJson['update']['success']['count'];
+                                                                            $failedCount  = $responseJson['update']['failed']['count'];
 
-                                                                    // Request info
-                                                                    $requestInfo = $lastPendingRequest['Info'];
+                                                                            // If the update was successful
+                                                                            if ($responseJson['update']['status'] == 'done') {
+                                                                                $requestStatus = 'Successful';
+                                                                                $requestStatusIcon = 'check.svg';
+                                                                            }
 
-                                                                    // Request title
-                                                                    if ($request == 'request-general-infos') {
-                                                                        $requestTitle = 'Requested the host to send its general informations';
-                                                                        $requestTitleShort = 'Request general information';
-                                                                    }
-                                                                    if ($request == 'request-packages-infos') {
-                                                                        $requestTitle = 'Requested the host to send its packages informations';
-                                                                        $requestTitleShort = 'Request package information';
-                                                                    }
-                                                                    if ($request == 'request-packages-update') {
-                                                                        $requestTitle = 'Request to update a list of package(s)';
-                                                                        $requestTitleShort = 'Request to update a list of package(s)';
+                                                                            // If the update failed
+                                                                            if ($responseJson['update']['status'] == 'failed') {
+                                                                                $requestStatus = 'Failed with errors';
+                                                                                $requestStatusIcon = 'error.svg';
+                                                                            }
 
-                                                                        if (!empty($requestJson['packages'])) {
-                                                                            $requestDetails = count($requestJson['packages']) . ' package(s) to install';
-                                                                        }
-                                                                    }
-                                                                    if ($request == 'request-all-packages-update') {
-                                                                        $requestTitle = 'Requested the host to update all of its packages';
-                                                                        $requestTitleShort = 'Request to update all packages';
-
-                                                                        if (!empty($responseJson)) {
-                                                                            // If there was no packages to update
-                                                                            if ($responseJson['update']['status'] == 'nothing-to-do') {
-                                                                                $responseDetails = 'No packages to update';
+                                                                            // If there was packages updated AND packages failed
+                                                                            if ($successCount >= 1 and $failedCount >= 1) {
+                                                                                $requestStatus = 'Partial success';
+                                                                                $requestStatusIcon = 'warning.svg';
                                                                             }
 
-                                                                            // If there was packages to update, retrieve the number of packages updated
-                                                                            if ($responseJson['update']['status'] == 'done' or $responseJson['update']['status'] == 'failed') {
-                                                                                $successCount = $responseJson['update']['success']['count'];
-                                                                                $failedCount  = $responseJson['update']['failed']['count'];
-
-                                                                                // If the update was successful
-                                                                                if ($responseJson['update']['status'] == 'done') {
-                                                                                    $requestStatus = 'Successful';
-                                                                                    $requestStatusIcon = 'check.svg';
-                                                                                }
-
-                                                                                // If the update failed
-                                                                                if ($responseJson['update']['status'] == 'failed') {
-                                                                                    $requestStatus = 'Failed with errors';
-                                                                                    $requestStatusIcon = 'error.svg';
-                                                                                }
-
-                                                                                // If there was packages updated AND packages failed
-                                                                                if ($successCount >= 1 and $failedCount >= 1) {
-                                                                                    $requestStatus = 'Partial success';
-                                                                                    $requestStatusIcon = 'warning.svg';
-                                                                                }
-
-                                                                                // If there was no packages updated AND packages failed
-                                                                                if ($successCount == 0 and $failedCount >= 1) {
-                                                                                    $requestStatus = 'Failed';
-                                                                                    $requestStatusIcon = 'error.svg';
-                                                                                }
-
-                                                                                // Build a short info message
-                                                                                $responseDetails = $successCount . ' package(s) updated, ' . $failedCount . ' failed';
-
-                                                                                // Retrieve the list of packages updated
-                                                                                // $successPackages = $responseJson['update']['success']['packages'];
-
-                                                                                // Retrieve the list of packages failed
-                                                                                // $failedPackages = $responseJson['update']['failed']['packages'];
+                                                                            // If there was no packages updated AND packages failed
+                                                                            if ($successCount == 0 and $failedCount >= 1) {
+                                                                                $requestStatus = 'Failed';
+                                                                                $requestStatusIcon = 'error.svg';
                                                                             }
+
+                                                                            // Build a short info message
+                                                                            $responseDetails = $successCount . ' package(s) updated, ' . $failedCount . ' failed';
+
+                                                                            // Retrieve the list of packages updated
+                                                                            // $successPackages = $responseJson['update']['success']['packages'];
+
+                                                                            // Retrieve the list of packages failed
+                                                                            // $failedPackages = $responseJson['update']['failed']['packages'];
                                                                         }
                                                                     }
+                                                                }
 
-                                                                    // Only print the request title if it was executed less than 1h ago
-                                                                    if (strtotime($lastPendingRequest['Date'] . ' ' . $lastPendingRequest['Time']) >= strtotime(date('Y-m-d H:i:s') . ' - 1 hour')) : ?>
-                                                                        <h6>LAST REQUEST</h6>
-                                                                        <div class="flex align-item-center column-gap-5">
+                                                                // Only print the request title if it was executed less than 1h ago
+                                                                if (strtotime($lastPendingRequest['Date'] . ' ' . $lastPendingRequest['Time']) >= strtotime(date('Y-m-d H:i:s') . ' - 1 hour')) : ?>
+                                                                    <h6>LAST REQUEST</h6>
+                                                                    <div class="flex align-item-center column-gap-5">
+                                                                        <?php
+                                                                        if (!empty($requestStatusIcon)) {
+                                                                            if (str_ends_with($requestStatusIcon, '.svg')) {
+                                                                                echo '<img src="/assets/icons/' . $requestStatusIcon . '" class="icon-np" title="' . $requestStatus . '" />';
+                                                                            } else {
+                                                                                echo '<span class="' . $requestStatusIcon . '" title="' . $requestStatus . '"></span> ';
+                                                                            }
+                                                                        } ?>
+                                                                        <p class="mediumopacity-cst" title="<?= $requestTitle ?>">
                                                                             <?php
-                                                                            if (!empty($requestStatusIcon)) {
-                                                                                if (str_ends_with($requestStatusIcon, '.svg')) {
-                                                                                    echo '<img src="/assets/icons/' . $requestStatusIcon . '" class="icon-np" title="' . $requestStatus . '" />';
-                                                                                } else {
-                                                                                    echo '<span class="' . $requestStatusIcon . '" title="' . $requestStatus . '"></span> ';
-                                                                                }
+                                                                            echo $requestTitleShort;
+
+                                                                            if (!empty($requestInfo)) {
+                                                                                echo ' - ' . $requestInfo;
+                                                                            }
+
+                                                                            if (!empty($responseDetails)) {
+                                                                                echo ' - ' . $responseDetails;
                                                                             } ?>
-                                                                            <p class="mediumopacity-cst" title="<?= $requestTitle ?>">
-                                                                                <?php
-                                                                                echo $requestTitleShort;
-
-                                                                                if (!empty($requestInfo)) {
-                                                                                    echo ' - ' . $requestInfo;
-                                                                                }
-
-                                                                                if (!empty($responseDetails)) {
-                                                                                    echo ' - ' . $responseDetails;
-                                                                                } ?>
-                                                                            </p>                                                                            
-                                                                        </div>
-                                                                        <?php
-                                                                    endif;
+                                                                        </p>                                                                            
+                                                                    </div>
+                                                                    <?php
                                                                 endif;
-                                                            endif ?>
-                                                        </div>
-                                                        <?php
-                                                    endif ?>
-
-                                                    <div class="host-additionnal-info"></div>
-                                                </div>
+                                                            endif;
+                                                        endif ?>
+                                                    </div>
+                                                    <?php
+                                                endif ?>
 
-                                                <div class="align-self-center">
-                                                    <input type="checkbox" class="js-host-checkbox lowopacity pointer" name="checkbox-host[]" group="<?= $group['Name'] ?>" value="<?= $id ?>" title="Select <?= $hostname ?>">
-                                                </div>
+                                                <div class="host-additionnal-info"></div>
                                             </div>
+
+                                            <input type="checkbox" class="js-host-checkbox" name="checkbox-host[]" group="<?= $group['Name'] ?>" value="<?= $id ?>" title="Select <?= $hostname ?>">
                                         </div>
                                         <?php
                                     endforeach; ?>
+                                    </div>
                                 </div>
                                 <?php
                             endif ?>
diff --git a/www/views/includes/containers/hosts/overview.inc.php b/www/views/includes/containers/hosts/overview.inc.php
index 1e5051460..de2b2f44c 100644
--- a/www/views/includes/containers/hosts/overview.inc.php
+++ b/www/views/includes/containers/hosts/overview.inc.php
@@ -174,7 +174,6 @@
 
         <script>
             $(document).ready(function() {
-                new EChart('nightingale', 'hosts-count-chart');
                 new EChart('bar', 'hosts-os-chart');
                 new EChart('nightingale', 'hosts-arch-chart');
                 new EChart('nightingale', 'hosts-env-chart');
diff --git a/www/views/includes/containers/repo/kpi.inc.php b/www/views/includes/containers/repo/kpi.inc.php
new file mode 100644
index 000000000..c25743822
--- /dev/null
+++ b/www/views/includes/containers/repo/kpi.inc.php
@@ -0,0 +1,39 @@
+<section class="section-main reloadable-container" container="repo/kpi">
+    <h3>REPOSITORY</h3>
+
+    <?php
+    if ($repoController->getPackageType() == 'rpm') {
+        $repository = $repoController->getName() . ' ❯ ' . $repoController->getReleasever();
+        $accent = 'blue';
+    }
+    if ($repoController->getPackageType() == 'deb') {
+        $repository = $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection();
+        $accent = 'red';
+    } ?>
+
+    <div class="grid grid-rfr-1-3 column-gap-20 row-gap-20 margin-bottom-15">
+        <div class="kpi-card accent-<?= $accent ?>">
+            <img src="/assets/icons/package.svg" class="icon-np icon-medium" />
+            <div>
+                <span class="label-white"><?= $repository ?></span>
+                <p class="mediumopacity-cst">Repository</p>
+            </div>
+        </div>
+
+        <div class="kpi-card">
+            <img src="/assets/icons/stack.svg" class="icon-np icon-medium" />
+            <div>
+                <p class="kpi-value"><?= count($snapshots) ?></p>
+                <p class="mediumopacity-cst">Snapshots</p>
+            </div>
+        </div>
+
+        <div class="kpi-card">
+            <img src="/assets/icons/cloud-download.svg" class="icon-np icon-medium" />
+            <div>
+                <p class="kpi-value"><?= $accessCount ?></p>
+                <p class="mediumopacity-cst">Total accesses today</p>
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/www/views/includes/containers/stats/repo.inc.php b/www/views/includes/containers/repo/stats.inc.php
similarity index 83%
rename from www/views/includes/containers/stats/repo.inc.php
rename to www/views/includes/containers/repo/stats.inc.php
index edefbbcae..ae3fc4c29 100644
--- a/www/views/includes/containers/stats/repo.inc.php
+++ b/www/views/includes/containers/repo/stats.inc.php
@@ -1,37 +1,7 @@
 <?php
 use \Controllers\Layout\Table\Render as TableRender; ?>
 
-<section class="section-main">
-    <h3>REPOSITORY STATISTICS</h3>
-
-    <?php
-    if ($repoController->getPackageType() == 'rpm') {
-        $repo = $repoController->getName() . ' ❯ ' . $repoController->getReleasever();
-    }
-    if ($repoController->getPackageType() == 'deb') {
-        $repo = $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection();
-    } ?>
-
-    <div class="grid grid-rfr-1-5 row-gap-20 div-generic-blue margin-bottom-15">
-        <div>
-            <h6 class="margin-top-0">REPOSITORY</h6>
-            <div class="flex align-item-center column-gap-5">
-                <p><span class="label-white"><?= $repo ?></span></p>
-                <span class="label-pkg-<?= $repoController->getPackageType() ?>"><?= strtoupper($repoController->getPackageType()) ?></span>
-            </div>
-        </div>
-
-        <div>
-            <h6 class="margin-top-0">SNAPSHOTS</h6>
-            <p><?= count($snapshots) ?></p>
-        </div>
-
-        <div>
-            <h6 class="margin-top-0">TOTAL ACCESSES TODAY</h6>
-            <p><?= $accessCount ?></p>
-        </div>
-    </div>
-
+<section class="section-main reloadable-container" container="repo/stats">
     <div class="div-generic-blue">
         <div>
             <h6 class="margin-top-0">REPOSITORY SNAPSHOTS</h6>
@@ -110,7 +80,7 @@
         <div class="flex flex-wrap justify-space-between row-gap-15 margin-bottom-15">
             <div>
                 <h6 class="margin-top-0">ACCESS REQUESTS</h6>
-                <p class="note">Access requests to the repository. Sorted by most recent first.</p>
+                <p class="note">Access requests to the repository, sorted by most recent first.</p>
             </div>
 
             <div class="flex flex-wrap align-item-center column-gap-20 row-gap-15">
diff --git a/www/views/includes/containers/repos/group.inc.php b/www/views/includes/containers/repos/group.inc.php
new file mode 100644
index 000000000..7a5f3cd80
--- /dev/null
+++ b/www/views/includes/containers/repos/group.inc.php
@@ -0,0 +1,106 @@
+<div class="repos-list-group veil-on-reload" group-id="<?= $groupId ?>" group="<?= $group['name'] ?>">
+    <div class="group-header">
+        <div class="flex align-item-center column-gap-10">
+            <img src="/assets/icons/folder.svg" class="group-header-icon lowopacity-cst" />
+            <span class="group-header-name hide-repo-group pointer" group-id="<?= $groupId ?>" state="visible" title="Collapse group <?= $group['name'] ?>"><?= $group['name'] ?></span>
+            <span class="group-header-count"><?= $group['count'] ?></span>
+        </div>
+
+        <div class="flex align-item-center column-gap-15 row-gap-15">
+            <div class="select-all-btn repos-list-group-select-latest-btns btn-fit-tr align-item-center column-gap-8 pointer hide" group-id="<?= $groupId ?>">
+                <span>Select latest snapshots</span>
+                <input type="checkbox" group-id="<?= $groupId ?>" aria-hidden="true" tabindex="-1">
+            </div>
+
+            <div class="select-all-btn repos-list-select-all-btns btn-fit-tr align-item-center column-gap-8 pointer hide" group-id="<?= $groupId ?>">
+                <span>Select all snapshots</span>
+                <input type="checkbox" group-id="<?= $groupId ?>" aria-hidden="true" tabindex="-1">
+            </div>
+        </div>
+    </div>
+
+    <div class="group-content">
+        <?php
+        $previousName = null;
+
+        // Count how many repos share the same Name within this group, so we know
+        // whether a repo is alone on its row (and can then be expanded on full width)
+        $repoNameCounts = [];
+        foreach ($group['repos'] as $repoId) {
+            $groupRepo = array_filter($repos, function ($repo) use ($repoId) {
+                return $repo['repoId'] == $repoId;
+            });
+
+            if (empty($groupRepo)) {
+                continue;
+            }
+
+            $groupRepoName = array_values($groupRepo)[0]['Name'];
+            $repoNameCounts[$groupRepoName] = ($repoNameCounts[$groupRepoName] ?? 0) + 1;
+        }
+
+        $repoNameIndex = [];
+
+        foreach ($group['repos'] as $repoId) {
+            // Find the repo in the $repos array using array_filter
+            $repo = array_filter($repos, function ($repo) use ($repoId) {
+                return $repo['repoId'] == $repoId;
+            });
+
+            // If the repo is not found, skip to the next one
+            if (empty($repo)) {
+                continue;
+            }
+
+            // Get the first element of the array (there should be only one element since repoId is unique)
+            $repo = array_values($repo)[0];
+
+            // Track the position of this repo among the ones sharing the same Name
+            $repoNameIndex[$repo['Name']] = ($repoNameIndex[$repo['Name']] ?? 0) + 1;
+
+            $class = 'grid grid-rfr-1-2';
+            $expandAlone = false;
+
+            // If expand is enabled, expand the repo container if it's the only one on its row
+            if ($userPreferences['repositories']['list']['expand']) {
+                if ($repoNameCounts[$repo['Name']] == 1) {
+                    // Only one repo with this Name: expand the whole wrapper on full width
+                    $class = '';
+                } elseif ($repoNameCounts[$repo['Name']] % 2 != 0 && $repoNameIndex[$repo['Name']] == $repoNameCounts[$repo['Name']]) {
+                    // Odd number of repos with this Name: the last one ends up alone
+                    // on its row, so make it span the full width of the grid
+                    $expandAlone = true;
+                }
+            }
+
+            if ($userPreferences['repositories']['list']['one-line']) {
+                $class = 'grid';
+            }
+
+            if ($previousName != $repo['Name']) :
+                // Close previous repo div if it's not the first repo
+                if ($previousName != null) {
+                    echo '</div>';
+                } ?>
+             
+                <!-- Opening repo div -->
+                <div class="<?= $class ?> repos-row row-gap-20 column-gap-40 margin-bottom-40">
+                <?php
+            endif;
+
+            include(ROOT . '/views/includes/containers/repos/repo.inc.php');
+
+            $previousName = $repo['Name'];
+        }
+
+        // Close the last opened repos-row div, if any repo was rendered
+        if ($previousName != null) {
+            echo '</div>';
+        } else { ?>
+            <div class="empty-state">
+                <p class="empty-state-title">No repository yet!</p>
+            </div>
+            <?php
+        } ?>
+    </div>
+</div>
diff --git a/www/views/includes/containers/repos/kpi.inc.php b/www/views/includes/containers/repos/kpi.inc.php
new file mode 100644
index 000000000..33a963692
--- /dev/null
+++ b/www/views/includes/containers/repos/kpi.inc.php
@@ -0,0 +1,92 @@
+<?php
+use \Controllers\Utils\Generate\Html\Label; ?>
+
+<section class="section-main reloadable-container" container="repos/kpi">
+    <h3 class="margin-bottom-40">REPOSITORIES</h3>
+
+    <div class="flex flex-wrap column-gap-20 row-gap-15 margin-bottom-10 kpi-container">
+        <div class="kpi-card">
+            <img src="/assets/icons/package.svg" class="icon-np icon-medium" />
+            <div>
+                <p class="kpi-value"><?= $totalRepos ?></p>
+                <p class="mediumopacity-cst"><?= $totalRepos <= 1 ? 'Repository' : 'Repositories' ?></p>
+            </div>
+        </div>
+
+        <div class="kpi-card">
+            <img src="/assets/icons/disk.svg" class="icon-np icon-medium" />
+            <div class="flex flex-direction-column flex-wrap width-100">
+                <div class="flex flex-wrap-mobile align-item-center column-gap-30 justify-space-between">
+                    <p class="kpi-value"><?= $diskUsedSpacePercent ?>%</p>
+
+                    <div class="storage-meter" title="<?= $diskUsedSpacePercent ?>% used storage">
+                        <span style="width: <?= $diskUsedSpacePercent ?>%"></span>
+                    </div>
+                </div>
+
+                <div class="flex flex-wrap align-item-center column-gap-10 row-gap-5 justify-space-between">
+                    <p class="mediumopacity-cst">Used storage</p>
+                    <p class="mediumopacity-cst margin-top-5"><?= $diskUsedSpaceHuman ?> used / <?= $diskFreeSpaceHuman ?> free</p>
+                </div>
+            </div>
+        </div>
+
+        <?php
+        // KPI card: last scheduled task status
+        if (!empty($lastScheduledTask) and !empty($lastScheduledTask['Date']) and !empty($lastScheduledTask['Time']) and (time() - strtotime($lastScheduledTask['Date'] . ' ' . $lastScheduledTask['Time']) <= 1296000)) :
+            if ($lastScheduledTask['Status'] == 'error' or $lastScheduledTask['Status'] == 'stopped') {
+                $lastTaskIcon = 'warning-red';
+                $lastTaskValue = 'Failed';
+            } else {
+                $lastTaskIcon = 'check';
+                $lastTaskValue = 'Success';
+            }
+
+            // If the task dispatched sub-tasks, its real status is a summary of their statuses
+            if (!empty($lastScheduledTaskSummary)) {
+                $lastTaskValue = 'Success';
+
+                if ($lastScheduledTaskSummary['status'] == 'running') {
+                    $lastTaskIcon = 'loading';
+                } elseif ($lastScheduledTaskSummary['status'] == 'error') {
+                    $lastTaskIcon = 'warning-red';
+                } else {
+                    $lastTaskIcon = 'check';
+                }
+            } ?>
+
+            <a href="/task/<?= $lastScheduledTask['Id'] ?>" class="kpi-card">
+                <img src="/assets/icons/<?= $lastTaskIcon ?>.svg" class="icon-np icon-medium" />
+                <div>
+                    <div class="flex align-item-center column-gap-10">
+                        <p class="kpi-value"><?= $lastTaskValue ?></p>
+                        <?php
+                        // Add a label with the number of successful sub-tasks if the last scheduled task has sub-tasks
+                        if (!empty($lastScheduledTaskSummary)) {
+                            echo Label::white($lastScheduledTaskSummary['success'] . '/' . $lastScheduledTaskSummary['total']);
+                        } ?>
+                    </div>
+                    <p class="mediumopacity-cst">Last scheduled task</p>
+                </div>
+            </a>
+            <?php
+        endif;
+
+        // KPI card: next scheduled task
+        if (!empty($nextScheduledTasks)) : ?>
+            <a href="/tasks" class="kpi-card">
+                <img src="/assets/icons/time.svg" class="icon-np icon-medium" />
+                <div>
+                    <p class="kpi-value"><?php
+                    if ($nextScheduledTasks[0]['left']['days'] > 0) {
+                        echo $nextScheduledTasks[0]['left']['days'] . ' day' . ($nextScheduledTasks[0]['left']['days'] > 1 ? 's' : '');
+                    } else {
+                        echo $nextScheduledTasks[0]['left']['time'];
+                    } ?></p>
+                    <p class="mediumopacity-cst">Next scheduled task</p>
+                </div>
+            </a>
+            <?php
+        endif ?>
+    </div>
+</section>
diff --git a/www/views/includes/containers/repos/list.inc.php b/www/views/includes/containers/repos/list.inc.php
index fcb81eeaf..6a6ff2d97 100644
--- a/www/views/includes/containers/repos/list.inc.php
+++ b/www/views/includes/containers/repos/list.inc.php
@@ -2,128 +2,72 @@
 use \Controllers\User\Permission\Repo as RepoPermission; ?>
 
 <section class="section-main reloadable-container" container="repos/list">
-    <div class="reposList">
-        <h3 class="margin-bottom-40">REPOSITORIES</h3>
-
-        <div class="flex align-item-center justify-space-between column-gap-10 margin-bottom-10">
-            <div class="flex flex-wrap align-item-center column-gap-10 row-gap-5">
-                <div class="flex align-item-center column-gap-5 mediumopacity-cst" title="Total repositories">
-                    <img src="/assets/icons/package.svg" class="icon-np icon-medium" />
-                    <p class="font-size-14"><?= $totalRepos ?></p>
-                </div>
-
-                <p class="mediumopacity-cst dot">●</p>
-
-                <div class="flex align-item-center column-gap-15" title="Used storage: <?= $diskUsedSpaceHuman ?> / Free storage: <?= $diskFreeSpaceHuman ?>">
-                    <div class="flex align-item-center column-gap-6">
-                        <div class="echart-container">
-                            <div id="repo-storage-chart-loading" class="echart-loading">
-                                <img src="/assets/icons/loading.svg" class="icon-np icon-medium" />
+    <div id="repositories-list">
+        <?php
+        // Print repositories
+        if (IS_ADMIN or (!empty(USER_PERMISSIONS['repositories']['view']['groups']) or !empty(USER_PERMISSIONS['repositories']['view']['repos']) or in_array('all', USER_PERMISSIONS['repositories']['view']))) : ?>
+            <div class="flex flex-direction-column row-gap-10 margin-top-15 margin-bottom-30">
+                <div class="flex column-gap-10 justify-space-between">
+                    <div class="flex flex-wrap align-item-center column-gap-10 row-gap-10">
+                        <?php
+                        if (RepoPermission::allowedAction('edit-source')) : ?>
+                            <div class="slide-btn get-panel-btn mediumopacity" panel="repos/sources/list" title="Manage source repositories">
+                                <img src="/assets/icons/internet.svg" />
+                                <span>Source repositories</span>
                             </div>
+                            <?php
+                        endif;
 
-                            <div id="repo-storage-chart" class="echart"></div>
-                        </div>
-
-                        <p class="font-size-14 mediumopacity-cst"><?= $diskUsedSpacePercent ?>% used storage</p>
-                    </div>
-                </div>
-
-                <?php
-                // Print last scheduled task status, only if it was less than 15 days ago
-                if (!empty($lastScheduledTask) and !empty($lastScheduledTask['Date']) and !empty($lastScheduledTask['Time']) and (time() - strtotime($lastScheduledTask['Date'] . ' ' . $lastScheduledTask['Time']) <= 1296000)) :
-                    if ($lastScheduledTask['Status'] == 'error' or $lastScheduledTask['Status'] == 'stopped') {
-                        $icon = 'warning-red';
-                        $message = 'Last sched. task failed';
-                    } else {
-                        $icon = 'check';
-                        $message = 'Last sched. task successful';
-                    } ?>
-
-                    <p class="mediumopacity-cst dot">●</p>
-
-                    <div class="flex align-item-center column-gap-5" title="Last scheduled task: <?= DateTime::createFromFormat('Y-m-d', $lastScheduledTask['Date'])->format('d-m-Y') . ' ' . $lastScheduledTask['Time'] ?>">
-                        <img src="/assets/icons/<?= $icon ?>.svg" class="icon-np icon-medium" />
-
-                        <p class="mediumopacity">
-                            <a href="/run/<?= $lastScheduledTask['Id'] ?>"><?= $message ?></a>
-                        </p>
-                    </div>
-                    <?php
-                endif;
-
-                // Print next scheduled task info
-                if (!empty($nextScheduledTasks)) : ?>
-                    <p class="mediumopacity-cst dot">●</p>
-
-                    <div class="flex align-item-center column-gap-5" title="Next scheduled task: <?= DateTime::createFromFormat('Y-m-d', $nextScheduledTasks[0]['date'])->format('d-m-Y') . ' ' . $nextScheduledTasks[0]['time'] ?>">
-                        <img src="/assets/icons/time.svg" class="icon-np icon-medium mediumopacity-cst" />
+                        if (RepoPermission::allowedAction('edit-groups')) : ?>
+                            <div class="slide-btn get-panel-btn mediumopacity" panel="repos/groups/list" title="Manage repos groups">
+                                <img src="/assets/icons/folder.svg" />
+                                <span>Groups</span>
+                            </div>
+                            <?php
+                        endif;
 
-                        <p class="mediumopacity">
-                            <a href="/run">
+                        if (RepoPermission::allowedAction('update') or RepoPermission::allowedAction('env') or RepoPermission::allowedAction('rebuild')) : ?>
+                            <div class="slide-btn get-panel-btn mediumopacity" panel="repos/scheduled-task" title="Schedule a recurring task on all repositories latest snapshots">
+                                <img src="/assets/icons/calendar.svg" />
+                                <span>Schedule a task</span>
+                            </div>
                             <?php
-                            // If days left = 0 (current day) then print hours left instead
-                            if ($nextScheduledTasks[0]['left']['days'] > 0) {
-                                echo $nextScheduledTasks[0]['left']['days'] . ' days left until next sched. task';
-                            } else {
-                                echo $nextScheduledTasks[0]['left']['time'] . ' left until next sched. task';
-                            } ?>
-                            </a>
-                        </p>
-                    </div>
-                    <?php
-                endif ?>
-            </div>
+                        endif; ?>
 
-            <div class="flex align-item-center">
-                <?php
-                if (RepoPermission::allowedAction('edit-groups')) : ?>
-                    <div class="slide-btn get-panel-btn mediumopacity" panel="repos/groups/list" title="Manage repos groups">
-                        <img src="/assets/icons/folder.svg" />
-                        <span>Groups</span>
-                    </div>
-                    <?php
-                endif ;
+                        <div class="slide-btn get-panel-btn mediumopacity" panel="repos/settings" title="Manage repositories settings">
+                            <img src="/assets/icons/cog.svg" />
+                            <span>Settings</span>
+                        </div>
 
-                if (RepoPermission::allowedAction('edit-source')) : ?>
-                    <div class="slide-btn get-panel-btn mediumopacity" panel="repos/sources/list" title="Manage source repositories">
-                        <img src="/assets/icons/internet.svg" />
-                        <span>Source repositories</span>
+                        <div id="hide-all-repo-groups" class="slide-btn mediumopacity" state="visible" title="Hide all repository groups">
+                            <img src="/assets/icons/view.svg" />
+                            <span>Collapse all</span>
+                        </div>
                     </div>
-                    <?php
-                endif;
 
-                if (RepoPermission::allowedAction('create')) : ?>
-                    <div class="slide-btn get-panel-btn bkg-green" panel="repos/new" title="Create a new mirror or local repository">
-                        <img src="/assets/icons/plus.svg" />
-                        <span>Create a new repository</span>
-                    </div>
                     <?php
-                endif ?>
-            </div>
-        </div>
-
-        <?php
-        if (IS_ADMIN or (!empty(USER_PERMISSIONS['repositories']['view']['groups']) or in_array('all', USER_PERMISSIONS['repositories']['view']))) { ?>
-            <input id="repo-search-input" class="margin-bottom-10" type="text" placeholder="Search" onkeyup="myrepo.search()" title="Search by repository name, distribution, section or release version" />
-
-            <div class="flex justify-end column-gap-5 margin-bottom-10 margin-right-15">
-                <div id="hide-all-repo-groups" state="visible">
-                    <img src="/assets/icons/view.svg" class="icon lowopacity pointer" title="Hide/Show all repositories groups" />
+                    if (RepoPermission::allowedAction('create')) : ?>
+                        <div class="slide-btn slide-btn-green get-panel-btn" panel="repos/new" title="Create a new mirror or local repository">
+                            <img src="/assets/icons/plus.svg" />
+                            <span>Create a new repository</span>
+                        </div>
+                        <?php
+                    endif ?>
                 </div>
+
+                <input id="repo-search-input" type="text" placeholder="Search repositories, snapshots, environments..." onkeyup="myrepo.search()" title="Search by repository name, distribution, section or release version" />
             </div>
 
             <div id="repos-list-container">
                 <?php include_once(ROOT . '/views/includes/repos-list.inc.php'); ?>
             </div>
             <?php
-        } else {
-            echo '<p class="note">Nothing to show here!</p>';
-        } ?>
+        else : ?>
+            <div class="empty-state">
+                <p class="empty-state-title">Nothing to see here!</p>
+                <p class="note">You don't have permission to view any repository. Contact your administrator to request access.</p>
+            </div>
+            <?php
+        endif ?>
     </div>
-
-    <script>
-        $(document).ready(function() {
-            new EChart('doughnut', 'repo-storage-chart');
-        });
-    </script>
 </section>
\ No newline at end of file
diff --git a/www/views/includes/containers/repos/properties.inc.php b/www/views/includes/containers/repos/properties.inc.php
deleted file mode 100644
index f9de977aa..000000000
--- a/www/views/includes/containers/repos/properties.inc.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<section class="section-right reloadable-container" container="repos/properties">
-    <h3>PROPERTIES</h3>
-
-    <div class="grid grid-2 column-gap-15 align-item-center justify-space-between div-generic-blue padding-right-40">
-        <div>
-            <div class="flex column-gap-15 align-item-center">
-                <div class="circle-div-container-count-green">
-                    <span>
-                        <?= $totalRepos ?>
-                    </span>
-                </div>
-                <div>
-                    <span>
-                        <?php
-                        if ($totalRepos <= 1) {
-                            echo 'Repository';
-                        } else {
-                            echo 'Repositories';
-                        } ?>
-                    </span>
-                </div>
-            </div>
-        </div>
-
-        <!-- <div class="echart-container width-100">
-            <div id="repo-storage-chart-loading" class="echart-loading">
-                <img src="/assets/icons/loading.svg" class="icon-np" />
-            </div>
-
-            <p class="donut-legend-title lowopacity-cst">Storage</p>
-            <span class="donut-legend-content"><?= $diskUsedSpacePercent . '%' ?></span>
-
-            <div id="repo-storage-chart" class="echart min-height-120"></div>
-        </div> -->
-    </div>
-
-    <?php
-    if (!empty($lastScheduledTask) or !empty($nextScheduledTasks)) : ?>
-        <div class="div-generic-blue flex-direction-column flex row-gap-20">
-            <?php
-            if (!empty($lastScheduledTask) and !empty($lastScheduledTask['Date']) and !empty($lastScheduledTask['Time'])) : ?>
-                <div>
-                    <?php
-                    if ($lastScheduledTask['Status'] == 'error' or $lastScheduledTask['Status'] == 'stopped') {
-                        $taskStatus = 'Error';
-                        $borderColor = 'red';
-                    } else {
-                        $taskStatus = 'OK';
-                        $borderColor = 'green';
-                    } ?>
-
-                    <h6 class="margin-top-0">LAST SCHEDULED TASK</h6>
-                    <br>
-                    <div class="flex column-gap-15 align-item-center">
-                        <div class="circle-div-container-count-<?= $borderColor ?>">
-                            <span>
-                                <?= $taskStatus ?>
-                            </span>
-                        </div>
-                        <div>
-                            <span>
-                                <a href="/run/<?= $lastScheduledTask['Id'] ?>"><?= DateTime::createFromFormat('Y-m-d', $lastScheduledTask['Date'])->format('d-m-Y') . ' ' . $lastScheduledTask['Time'] ?></a>
-                            </span>
-                        </div>
-                    </div>
-                </div>
-                <?php
-            endif ?>
-
-            <?php
-            if (!empty($nextScheduledTasks)) : ?>
-                <div>
-                    <h6 class="margin-top-0">NEXT SCHEDULED TASKS</h6>
-                    <br>
-
-                    <div class="flex flex-direction-column row-gap-15">
-                        <?php
-                        foreach ($nextScheduledTasks as $scheduledTask) : ?>
-                            <div class="flex column-gap-15 align-item-center">
-                                <div class="circle-div-container-count-yellow">
-                                    <span>
-                                        <?php
-                                        /**
-                                         *  If days left = 0 (current day) then print hours left instead
-                                         */
-                                        if ($scheduledTask['left']['days'] > 0) {
-                                            echo $scheduledTask['left']['days'] . 'd';
-                                        } else {
-                                            echo $scheduledTask['left']['time'];
-                                        } ?>
-                                    </span>
-                                </div>
-
-                                <div>
-                                    <p>
-                                        <a href="/run"> 
-                                            <?php
-                                            if (!empty($scheduledTask['date'])) {
-                                                echo DateTime::createFromFormat('Y-m-d', $scheduledTask['date'])->format('d-m-Y') . ' ';
-                                            }
-
-                                            if (!empty($scheduledTask['time'])) {
-                                                echo $scheduledTask['time'];
-                                            } ?>
-                                        </a>
-                                    </p>
-                                </div>
-                            </div>
-                            <?php
-                        endforeach ?>
-                    </div>
-                </div>
-                <?php
-            endif ?>
-        </div>
-        <?php
-    endif ?>
-
-    <script>
-        // $(document).ready(function() {
-        //     new EChart('doughnut', 'repo-storage-chart');
-        // });
-    </script>
-</section>
\ No newline at end of file
diff --git a/www/views/includes/containers/repos/repo.inc.php b/www/views/includes/containers/repos/repo.inc.php
new file mode 100644
index 000000000..0906498e8
--- /dev/null
+++ b/www/views/includes/containers/repos/repo.inc.php
@@ -0,0 +1,205 @@
+<?php
+use \Controllers\Utils\Generate\Html\Label;
+use \Controllers\User\Permission\Repo as RepoPermission;
+
+$canEditRepo = RepoPermission::allowedAction('edit');
+
+// 'editable' classes only add the pointer cursor hint (and the click-to-add placeholder) when the user is allowed to edit
+$descriptionClass = $canEditRepo ? 'repo-description-editable' : '';
+if ($canEditRepo && empty($repo['Description'])) {
+    $descriptionClass .= ' repo-description-empty';
+}
+
+$tagsClass = $canEditRepo ? 'repo-tags-editable' : '';
+
+if ($repo['Package_type'] == 'deb') {
+    $accent = 'red';
+}
+
+if ($repo['Package_type'] == 'rpm') {
+    $accent = 'blue';
+} ?>
+
+<div class="repo-item-wrapper <?= !empty($expandAlone) ? 'repo-span-full' : '' ?>" repo-id="<?= $repo['repoId'] ?>">
+    <div class="div-generic-blue margin-0 repo-item accent-<?= $accent ?> overflowx-auto" data-name="<?= $repo['Name'] ?>" data-dist="<?= $repo['Dist'] ?? '' ?>" data-section="<?= $repo['Section'] ?? '' ?>" data-releasever="<?= $repo['Releasever'] ?? '' ?>" data-type="<?= $repo['Type'] ?>" data-package-type="<?= $repo['Package_type'] ?>" data-description="<?= htmlspecialchars($repo['Description'] ?? '') ?>" data-tags="<?= $repo['Tags'] ?? '' ?>">
+        <div class="flex row-gap-15 column-gap-20 justify-space-between">
+            <div class="flex flex-wrap align-item-center row-gap-15 column-gap-15">
+                <p class="font-size-16 mediumopacity-cst">
+                    <a href="/repository/<?= $repo['repoId'] ?>" class="flex align-item-center column-gap-5">
+                        <?php
+                        if ($repo['Package_type'] == 'deb') : ?>
+                            <span title="Repository name" class="repo-name"><?= $repo['Name'] ?></span>
+                            <span class="dot">●</span>
+                            <span title="Distribution"><?= $repo['Dist'] ?></span>
+                            <span class="dot">●</span>
+                            <span title="Component"><?= $repo['Section'] ?></span>
+                            <?php
+                        endif;
+
+                        if ($repo['Package_type'] == 'rpm') : ?>
+                            <span title="Repository name" class="repo-name"><?= $repo['Name'] ?></span>
+                            <span class="dot">●</span>
+                            <span title="Release version"><?= $repo['Releasever'] ?></span>
+                            <?php
+                        endif ?>
+                    </a>
+                </p>
+
+                <?php
+                if (RepoPermission::allowedAction('rename')) : ?>
+                    <div class="repo-rename-btn" repo-id="<?= $repo['repoId'] ?>" title="Rename repository">
+                        <img src="/assets/icons/edit.svg" class="icon-np icon-small" />
+                        <span>Rename</span>
+                    </div>
+                    <?php
+                endif;
+
+                if ($canEditRepo) : ?>
+                    <div class="repo-add-description-btn" repo-id="<?= $repo['repoId'] ?>" title="Add a description"<?= empty($repo['Description']) ? '' : ' style="display: none;"' ?>>
+                        <img src="/assets/icons/plus.svg" class="icon-np icon-small" />
+                        <span>Description</span>
+                    </div>
+
+                    <div class="repo-add-tags-btn" repo-id="<?= $repo['repoId'] ?>" title="Add tags"<?= empty($repo['Tags']) ? '' : ' style="display: none;"' ?>>
+                        <img src="/assets/icons/plus.svg" class="icon-np icon-small" />
+                        <span>Tags</span>
+                    </div>
+                    <?php
+                endif ?>
+            </div>
+
+            <div class="flex align-item-start column-gap-15 mediumopacity-cst">
+                <div class="flex align-item-center column-gap-5">
+                    <?php
+                    if ($repo['Type'] == 'local') {
+                        echo '<img src="/assets/icons/pin.svg" class="icon-np icon-medium" title="This is a local repository." />';
+                        echo '<span class="font-size-13">local</span>';
+                    } elseif ($repo['Type'] == 'mirror') {
+                        echo '<img src="/assets/icons/internet.svg" class="icon-np icon-medium" title="This repository is a mirror of an external repository." />';
+                        echo '<span class="font-size-13">mirror</span>';
+                    } ?>
+                </div>
+
+                <div class="flex align-item-center column-gap-5">
+                    <?php
+                    if ($repo['Package_type'] == 'deb') {
+                        echo '<img src="/assets/icons/package.svg" class="icon-np icon-medium" title="This is a deb repository." />';
+                        echo '<span class="font-size-13">deb</span>';
+                    } elseif ($repo['Package_type'] == 'rpm') {
+                        echo '<img src="/assets/icons/package.svg" class="icon-np icon-medium" title="This is a rpm repository." />';
+                        echo '<span class="font-size-13">rpm</span>';
+                    } ?>
+                </div>
+            </div>
+        </div>
+
+        <div class="repo-description-container"<?= empty($repo['Description']) ? ' style="display: none;"' : '' ?>>
+            <p class="note repo-description-input width-100 <?= $descriptionClass ?>" repo-id="<?= $repo['repoId'] ?>" env-id="<?= $repo['envId'] ?>" title="Double-click to edit the description"><?= $repo['Description'] ?></p>
+        </div>
+
+        <div class="repo-snapshots flex flex-1 flex-direction-column row-gap-10 margin-top-20 margin-bottom-5">
+            <?php
+            foreach ($repoListingController->listSnapshots($repo['repoId']) as $snapshot) :
+                // Generate repo relative path
+                if ($repo['Package_type'] == 'rpm') {
+                    $repoRelativePath = 'rpm/' .$repo['Name'] . '/' . $repo['Releasever'] . '/' . $snapshot['Date'];
+                }
+
+                if ($repo['Package_type'] == 'deb') {
+                    $repoRelativePath = 'deb/' . $repo['Name'] . '/' . $repo['Dist'] . '/' . $repo['Section'] . '/' . $snapshot['Date'];
+                }
+
+                // Check if a task is running on the snapshot
+                $taskRunning = $repoSnapshotController->taskRunning($snapshot['Id']); ?>
+
+                <div class="snap-container grid-rfr-1-2 pointer" cid="<?= $repo['repoId'] . $snapshot['Id'] ?>" repo-id="<?= $repo['repoId'] ?>" snap-id="<?= $snapshot['Id'] ?>" repo-type="<?= $repo['Type'] ?>" group-id="<?= $groupId ?>" title="Select and execute an action.">
+                    <div class="flex align-item-center column-gap-20">
+                        <?php
+                        if ($taskRunning) : ?>
+                            <img src="/assets/icons/loading.svg" class="icon-np" title="A task is running on this repository snaphot." />
+                            <?php
+                        else : ?>
+                            <input type="checkbox" class="snap-checkbox-input" cid="<?= $repo['repoId'] . $snapshot['Id'] ?>" name="checkbox-repo" repo-id="<?= $repo['repoId'] ?>" snap-id="<?= $snapshot['Id'] ?>" repo-type="<?= $repo['Type'] ?>" group-id="<?= $groupId ?>">
+                            <?php
+                        endif ?>
+
+                        <div class="flex align-item-center column-gap-10" title="Browse snapshot content">
+                            <img src="/assets/icons/calendar.svg" class="snap-icon icon-np lowopacity-cst" />
+                            <a href="/snapshot/<?= $snapshot['Id'] ?>"><span class="snap-date lowopacity"><?= DateTime::createFromFormat('Y-m-d', $snapshot['Date'])->format('d-m-Y') ?></span></a>
+                        </div>
+
+                        <div class="snap-separator"></div>
+
+                        <div class="flex flex-wrap column-gap-20 row-gap-10">
+                            <div class="flex align-item-center column-gap-6" title="Repository snapshot size">
+                                <img src="/assets/icons/package.svg" class="icon-medium icon-np mediumopacity-cst" />
+                                <span class="snap-size mediumopacity-cst" repo-id="<?= $repo['repoId'] ?>" snap-id="<?= $snapshot['Id'] ?>" repo-relative-path="<?= $repoRelativePath ?>"><?= $snapshot['Size_human'] ?? '?' ?></span>
+                            </div>
+
+                            <div class="flex align-item-center column-gap-6">
+                                <?php
+                                if ($snapshot['Signed'] == 'true') : ?>
+                                    <img src="/assets/icons/check.svg" class="icon-medium icon-np" />
+                                    <span class="snap-signed mediumopacity-cst" title="This snapshot is signed with GPG">Signed</span>
+                                    <?php
+                                else : ?>
+                                    <img src="/assets/icons/error.svg" class="icon-medium icon-np" />
+                                    <span class="snap-signed mediumopacity-cst" title="This snapshot is not signed with GPG">Unsigned</span>
+                                    <?php
+                                endif ?>
+                            </div>
+
+                            <div class="flex align-item-center column-gap-10">
+                                <?php
+                                if ($snapshot['Reconstruct'] == 'needed') : ?>
+                                    <img src="/assets/icons/warning.svg" class="icon-np" title="Snapshot content has been modified. Metadata rebuild is needed." />
+                                    <?php
+                                endif ?>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="snap-envs">
+                        <?php
+                        if (!empty($snapshot['Environments'])) :
+                            $envNames = explode(',', $snapshot['Environments']);
+                            $envIds = explode(',', $snapshot['EnvironmentIds']);
+
+                            foreach ($envNames as $index => $env) :
+                                $envId = $envIds[$index] ?? '';
+                                $protectedEnv = in_array($env, $protectedEnvs, true); ?>
+
+                                <div class="snap-env-container<?= $protectedEnv ? ' nopointer' : '' ?>" repo-id="<?= $repo['repoId'] ?>" snap-id="<?= $snapshot['Id'] ?>" env-id="<?= $envId ?>" env="<?= $env ?>"<?= $protectedEnv ? ' data-protected="true"' : '' ?>>
+                                    <input type="checkbox" class="select-env-checkbox" name="env-checkbox" repo-id="<?= $repo['repoId'] ?>" snap-id="<?= $snapshot['Id'] ?>" env-id="<?= $envId ?>" env="<?= $env ?>"<?= $protectedEnv ? ' disabled' : '' ?>>
+                                    <?= Label::envtag($env, 'snap-env') ?>
+                                </div>
+                                <?php
+                            endforeach;
+                        endif ?>
+                    </div>
+                </div>
+                <?php
+            endforeach; ?>
+        </div>
+
+        <?php
+        if ($canEditRepo && empty($repo['Tags'])) {
+            $tagsClass .= ' repo-tags-empty';
+        } ?>
+
+        <div class="repo-tags-container"<?= empty($repo['Tags']) ? ' style="display: none;"' : '' ?>>
+            <div class="repo-tags-display flex align-item-center flex-wrap column-gap-10 <?= $tagsClass ?>" repo-id="<?= $repo['repoId'] ?>" data-tags="<?= $repo['Tags'] ?? '' ?>">
+                <?php
+                if (!empty($repo['Tags'])) :
+                    foreach (explode(',', $repo['Tags']) as $tag) : ?>
+                        <div class="flex align-item-center column-gap-5 mediumopacity repo-tag-item" title="Click to filter by <?= htmlspecialchars($tag) ?> tag. Double-click to edit tags." repo-id="<?= $repo['repoId'] ?>">
+                            <img src="/assets/icons/tag.svg" class="icon-np icon-small" />
+                            <p class="font-size-13"><?= htmlspecialchars($tag) ?></p>
+                        </div>
+                        <?php
+                    endforeach;
+                endif ?>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/www/views/includes/containers/settings/right-section.inc.php b/www/views/includes/containers/settings/right-section.inc.php
index 4e5a3e13c..6586a0038 100644
--- a/www/views/includes/containers/settings/right-section.inc.php
+++ b/www/views/includes/containers/settings/right-section.inc.php
@@ -1,6 +1,5 @@
 <section class="section-right reloadable-container" container="settings/right-section">
     <?php
     \Controllers\Layout\Container\Render::render('settings/users');
-    \Controllers\Layout\Container\Render::render('settings/debug-mode');
-    \Controllers\Layout\Container\Render::render('settings/status'); ?>
+    \Controllers\Layout\Container\Render::render('settings/debug-mode'); ?>
 </section>
\ No newline at end of file
diff --git a/www/views/includes/containers/settings/settings.inc.php b/www/views/includes/containers/settings/settings.inc.php
index e62bb4e10..a95368cb7 100644
--- a/www/views/includes/containers/settings/settings.inc.php
+++ b/www/views/includes/containers/settings/settings.inc.php
@@ -42,7 +42,7 @@
             
             <?php
             if (!empty(EMAIL_RECIPIENT)) {
-                echo '<button type="button" id="send-test-email-btn" class="btn-medium-blue margin-top-5" title="Send a test email">Send a test email</button>';
+                echo '<button type="button" id="send-test-email-btn" class="btn-medium-green margin-top-5" title="Send a test email">Send a test email</button>';
             } ?>
 
             <h6>SESSION TIMEOUT</h6>
@@ -311,11 +311,11 @@
         <p class="note">You can edit environments names and colors. The default environment is the first one in the list, it will be pre-selected in tasks forms.</p>
         <p class="note">Renaming an environment here will not rename it in repositories, this to prevent breaking existing configurations.</p>
 
-        <div id="envs-div">
-            <div id="current-envs-div">
+        <div id="envs-container">
+            <div id="current-envs">
                 <?php
                 if (empty(ENVS)) {
-                    echo '<p class="note yellowtext"><img src="/assets/icons/warning.svg" class="icon" /> At least 1 environment must be configured</p>';
+                    echo '<p class="note yellowtext"><img src="/assets/icons/warning.svg" class="icon" /> At least one environment should be configured</p>';
                 }
 
                 if (!empty(ENVS)) :
@@ -324,9 +324,21 @@
                             $color = '#ffffff';
                         } else {
                             $color = $env['Color'];
+                        }
+
+                        if ($env['Protected'] == 'true') {
+                            $protected = 'true';
+                            $protectionIcon = 'locked-red';
+                            $protectedClass = 'icon';
+                            $title = 'Unprotect environment';
+                        } else {
+                            $protected = 'false';
+                            $protectionIcon = 'unlocked';
+                            $protectedClass = 'icon-lowopacity';
+                            $title = 'Protect environment';
                         } ?>
 
-                        <div class="env-line flex align-item-center column-gap-10" env-id="<?= $env['Id'] ?>">
+                        <div class="env-line flex align-item-center column-gap-15" env-id="<?= $env['Id'] ?>">
                             <div>
                                 <div class="input-color-wrapper">
                                     <input type="color" name="env-color" value="<?= $color ?>" /> 
@@ -334,36 +346,34 @@
                             </div>
 
                             <input type="text" name="env-name" value="<?= $env['Name'] ?>" autocomplete="off" />
+
+                            <img src="/assets/icons/<?= $protectionIcon ?>.svg" class="<?= $protectedClass ?> env-protection" env-id="<?= $env['Id'] ?>" env-name="<?= $env['Name'] ?>" title="<?= $title ?>" protected="<?= $protected ?>" />
                             
-                            <div>
-                                <span class="round-btn-tr-to-red delete-env-btn" env-id="<?= $env['Id'] ?>" env-name="<?= $env['Name'] ?>" title="Delete <?= $env['Name'] ?> environment">
-                                    <img src="/assets/icons/delete.svg" />
-                                </span>
-                            </div>
+                            <img src="/assets/icons/trash.svg" class="icon-lowopacity pointer delete-env-btn" env-id="<?= $env['Id'] ?>" env-name="<?= $env['Name'] ?>" title="Delete <?= $env['Name'] ?> environment" />
                         </div>
                         <?php
                     endforeach ?>
+
                     <br>
                     <button id="edit-env-btn" type="button" class="btn-small-green">Save</button>
                     <?php
                 endif ?>
             </div>
 
-            <h6>ADD NEW ENVIRONMENT</h6>
+            <h6>ADD A NEW ENVIRONMENT</h6>
             <p class="note">Choose a color and a name for the new environment.</p>
-            <div class="flex align-item-center column-gap-10">
+            <div class="flex align-item-center column-gap-15">
                 <div>
                     <div class="input-color-wrapper">
                         <input type="color" name="add-env-color" class="color-xsmall" value="#F32F63" /> 
                     </div>
                 </div>
-                
-                <input type="text" name="add-env-name" placeholder="Name" autocomplete="off" />
 
-                <div>
-                    <button type="button" id="add-env-btn" class="btn-xxsmall-green">+</button>
-                </div>
+                <input type="text" name="add-env-name" placeholder="Name" autocomplete="off" />
             </div>
+
+            <br>
+            <button type="button" id="add-env-btn" class="btn-small-green">Add</button>
         </div>
 
         <hr class="margin-top-20 margin-bottom-20">
diff --git a/www/views/includes/containers/settings/status.inc.php b/www/views/includes/containers/settings/status.inc.php
deleted file mode 100644
index 6baccfddb..000000000
--- a/www/views/includes/containers/settings/status.inc.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="reloadable-container" container="settings/status">
-    <div>
-        <h3 class="margin-bottom-10">STATUS & MONITORING</h3>
-        <a href="/status"><img src="/assets/icons/external-link.svg" class="icon icon-medium mediumopacity" title="Access status page" /></a>
-    </div>
-</div>
diff --git a/www/views/includes/containers/snapshot/kpi.inc.php b/www/views/includes/containers/snapshot/kpi.inc.php
new file mode 100644
index 000000000..d1cb7fa9d
--- /dev/null
+++ b/www/views/includes/containers/snapshot/kpi.inc.php
@@ -0,0 +1,79 @@
+<section class="section-main reloadable-container" container="snapshot/kpi">
+    <h3>SNAPSHOT</h3>
+
+    <?php
+    if ($repoController->getPackageType() == 'rpm') {
+        $repository = $repoController->getName() . ' ❯ ' . $repoController->getReleasever();
+        $accent = 'blue';
+    }
+    if ($repoController->getPackageType() == 'deb') {
+        $repository = $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection();
+        $accent = 'red';
+    }
+
+    $class = 'grid-rfr-1-4';
+
+    if (in_array($rebuild, ['needed', 'running'])) {
+        $class = 'grid-rfr-1-5';
+
+        if ($rebuild == 'needed') {
+            $title = 'Repository snapshot content has been modified, metadata rebuild is required';
+            $icon = 'warning';
+            $text = 'Rebuild required';
+            $kpiAccent = 'yellow';
+        }
+
+        if ($rebuild == 'running') {
+            $title = 'A task is running on this repository snapshot';
+            $icon = 'loading';
+            $text = 'Rebuild running';
+            $kpiAccent = 'purple';
+        }
+    } ?>
+
+    <div class="grid <?= $class ?> column-gap-20 row-gap-20 margin-bottom-15">
+        <div class="kpi-card accent-<?= $accent ?>">
+            <img src="/assets/icons/package.svg" class="icon-np icon-medium" />
+            <div>
+                <span class="label-white"><?= $repository ?></span>
+                <p class="mediumopacity-cst">Repository</p>
+            </div>
+        </div>
+
+        <div class="kpi-card">
+            <img src="/assets/icons/calendar.svg" class="icon-np icon-medium" />
+            <div>
+                <p class="kpi-value"><?= $repoController->getDateFormatted() ?></p>
+                <p class="mediumopacity-cst">Date</p>
+            </div>
+        </div>
+
+        <div class="kpi-card">
+            <img src="/assets/icons/save.svg" class="icon-np icon-medium" />
+            <div>
+                <p class="kpi-value"><?= $repoSize ?></p>
+                <p class="mediumopacity-cst">Size</p>
+            </div>
+        </div>
+
+        <div class="kpi-card">
+            <img src="/assets/icons/package.svg" class="icon-np icon-medium" />
+            <div>
+                <p class="kpi-value"><?= $packagesCount ?></p>
+                <p class="mediumopacity-cst">Packages</p>
+            </div>
+        </div>
+
+        <?php
+        if (in_array($rebuild, ['needed', 'running'])) : ?>
+            <div class="kpi-card kpi-accent-<?= $kpiAccent ?>">
+                <img src="/assets/icons/<?= $icon ?>.svg" class="icon-np icon-medium" />
+                <div>
+                    <p class="kpi-value" title="<?= $title ?>"><?= $text ?></p>
+                    <p class="mediumopacity-cst">Metadata</p>
+                </div>
+            </div>
+            <?php
+        endif ?>
+    </div>
+</section>
diff --git a/www/views/includes/containers/snapshot/list.inc.php b/www/views/includes/containers/snapshot/list.inc.php
new file mode 100644
index 000000000..d3585ec76
--- /dev/null
+++ b/www/views/includes/containers/snapshot/list.inc.php
@@ -0,0 +1,50 @@
+<section class="section-main reloadable-container" container="snapshot/list">
+    <div id="loading-tree" class="flex align-item-center column-gap-5">
+        <img src="/assets/icons/loading.svg" class="icon" />
+        <p class="note">Generating tree structure...</p>
+    </div>
+
+    <div class="flex flex-direction-column row-gap-10 margin-top-15 margin-bottom-15">
+        <div class="flex flex-wrap align-item-center column-gap-10 row-gap-10">
+            <?php
+            // If the snapshot does not have a protected environment, display the upload and rebuild buttons
+            if (!$protectedEnv) : ?>
+                <div class="slide-btn get-panel-btn mediumopacity" panel="snapshot/upload" title="Upload packages to this snapshot">
+                    <img src="/assets/icons/upload.svg" />
+                    <span>Upload packages</span>
+                </div>
+
+                <?php
+                // If a task is not running for this snapshot, display the rebuild button
+                if (!$taskRunning) : ?>
+                    <div class="slide-btn get-panel-btn mediumopacity" panel="snapshot/rebuild" title="Rebuild metadata for this snapshot">
+                        <img src="/assets/icons/update.svg" />
+                        <span>Rebuild metadata</span>
+                    </div>
+                    <?php
+                endif;
+            else : ?>
+                <div class="flex align-item-center column-gap-5">
+                    <img src="/assets/icons/warning.svg" class="icon" />
+                    <span class="note">This snapshot has a protected environment and cannot be modified.</span>
+                </div>
+                <?php
+            endif ?>
+        </div>
+
+        <input type="text" id="browse-search-input" placeholder="Search files by name..." autocomplete="off" />
+    </div>
+
+    <div id="browse-search-results" class="hide"></div>
+
+    <div id="explorer" class="hide">
+        <form id="packages-list" snap-id="<?= $snapId ?>">
+        </form>
+    </div>
+
+    <script>
+        $(document).ready(function () {
+            mysnapshot.printTree('<?= $snapshotPath ?>');
+        });
+    </script>
+</section>
\ No newline at end of file
diff --git a/www/views/includes/containers/status/health.inc.php b/www/views/includes/containers/status/health.inc.php
index e80b26ac3..0c5678606 100644
--- a/www/views/includes/containers/status/health.inc.php
+++ b/www/views/includes/containers/status/health.inc.php
@@ -1,40 +1,35 @@
 <section id="health" class="section-main reloadable-container" container="settings/health">
     <h3>DATABASES HEALTH</h3>
 
-    <div class="div-generic-blue">
-        <div class="grid grid-rfr-1-4 row-gap-30 column-gap-20">
-            <?php
-            foreach ($appDatabases as $name => $properties) :
-                $icon = 'check'; ?>
-
-                <div>
-                    <div class="flex align-item-center column-gap-5">
-                        <h6 class="margin-top-0"><?= strtoupper($properties['title']) ?></h6>
-                        <img src="/assets/icons/info.svg" class="icon-lowopacity icon-small icon-np tooltip" tooltip="<?= $properties['description'] ?>">
-                    </div>
+    <div class="grid grid-rfr-1-4 row-gap-30 column-gap-20">
+        <?php
+        foreach ($appDatabases as $name => $properties) :
+            $icon = 'check';
 
-                    <?php
-                    if (!empty($properties['errors'])) {
-                        $icon = 'warning';
-                    } ?>
+            if (!empty($properties['errors'])) {
+                $icon = 'warning';
+            } ?>
 
+            <div class="kpi-card">
+                <img src="/assets/icons/<?= $icon ?>.svg" class="icon-np icon-medium" />
+                <div>
+                    <p class="kpi-value tooltip" tooltip="<?= $properties['description'] ?>"><?= $properties['title'] ?></p>
                     <div class="flex align-item-center column-gap-5 row-gap-5">
-                        <img src="/assets/icons/<?= $icon ?>.svg" class="icon-np" />
-                        <div class="flex flex-direction-column row-gap-5">
+                        <p class="mediumopacity-cst" title="Health status of the database">
                             <?php
                             if (empty($properties['errors'])) {
-                                echo '<p>Healthy</p>';
+                                echo 'Healthy';
                             } else {
                                 foreach ($properties['errors'] as $error) {
-                                    echo '<p>' . $error . '</p>';
+                                    echo $error;
                                 }
                             } ?>
-                        </div>
+                        </p>
                         <p class="font-size-13 mediumopacity-cst" title="Total tables">(<?= $properties['total'] ?>)</p>
                     </div>
                 </div>
-                <?php
-            endforeach ?>
-        </div>
+            </div>
+            <?php
+        endforeach ?>
     </div>
 </section>
\ No newline at end of file
diff --git a/www/views/includes/containers/tasks/log.inc.php b/www/views/includes/containers/tasks/log.inc.php
index 77e1301a5..9e3153dd9 100644
--- a/www/views/includes/containers/tasks/log.inc.php
+++ b/www/views/includes/containers/tasks/log.inc.php
@@ -1,39 +1,9 @@
-<section class="section-left reloadable-container" container="tasks/log">
-    <h3>LOG</h3>
-
-    <div class="flex justify-space-between">
-        <div id="log-refresh-container" task-id="<?= $taskId ?>" task-status="<?= $taskInfo['Status'] ?>" <?php echo ($legacyLog === true) ? 'legacy="true"' : '' ?>>
-            <?= $output ?>
-        </div>
-
-        <div id="scroll-btns-container">
-            <div id="scroll-btns">
-                <?php
-                // Print the auto scroll button only if the task is running
-                if ($taskInfo['Status'] == 'running') : ?>
-                    <div class="pointer margin-bottom-15">
-                        <?php
-                        $autoscroll = 'true';
-
-                        if (!empty($_COOKIE['autoscroll'])) {
-                            $autoscroll = $_COOKIE['autoscroll'];
-                        }
-
-                        if ($autoscroll == 'true') : ?>
-                            <div id="autoscroll-btn" class="round-btn-yellow" title="Disable auto refresh and scroll">
-                                <img src="/assets/icons/pause.svg" />
-                            </div>
-                            <?php
-                        else : ?>
-                            <div id="autoscroll-btn" class="round-btn-green" title="Enable auto refresh and scroll">
-                                <img src="/assets/icons/play.svg" />
-                            </div>
-                            <?php
-                        endif ?>
-                    </div>
-                    <?php
-                endif ?>
-            </div>
-        </div>
-    </div>
+<section class="section-main reloadable-container" container="tasks/log">
+    <?php
+    // If task exists and has a log, show the log, otherwise show a message that the log is not found
+    if ($taskFound) {
+        include_once(ROOT . '/views/includes/containers/tasks/log/log-found.inc.php');
+    } else {
+        include_once(ROOT . '/views/includes/containers/tasks/log/log-not-found.inc.php');
+    } ?>
 </section>
\ No newline at end of file
diff --git a/www/views/includes/containers/tasks/log/log-found.inc.php b/www/views/includes/containers/tasks/log/log-found.inc.php
new file mode 100644
index 000000000..33ffc11dd
--- /dev/null
+++ b/www/views/includes/containers/tasks/log/log-found.inc.php
@@ -0,0 +1,164 @@
+<?php
+use \Controllers\Task\Task;
+use \Controllers\App\DebugMode;
+use \Controllers\User\Permission\Task as TaskPermission; ?>
+
+<div class="flex align-item-center column-gap-15 justify-space-between">
+    <div class="flex align-item-center column-gap-30">
+        <h3>TASK #<?= $taskId ?></h3>
+
+        <?php
+        // If the task has been generated by another task, print a link to it
+        if (!empty($taskInfo['Parent_task_id'])) : ?>
+            <a href="/task/<?= $taskInfo['Parent_task_id'] ?>" title="View the scheduled task that generated this task"><p id="stop-task-log-btn" class="label-white pointer" task-id="<?= $taskId ?>">View parent task</p></a>
+            <?php
+        endif; ?>
+    </div>
+
+    <?php
+    // Print the stop button if the task is running and the user has permission to stop it
+    if ($taskInfo['Status'] == 'running') :
+        if (TaskPermission::allowedAction('stop')) : ?>
+            <p id="stop-task-log-btn" class="label-red stop-task-btn pointer" task-id="<?= $taskId ?>" title="Stop the task">Stop</p>
+            <?php
+        endif;
+    endif ?>
+</div>
+
+<div id="task-refresh-container" task-id="<?= $taskId ?>" task-status="<?= $taskInfo['Status'] ?>" <?php echo ($legacyLog === true) ? 'legacy="true"' : '' ?>>
+    <div class="flex flex-wrap align-item-center column-gap-15 row-gap-15 margin-bottom-15 kpi-container">
+        <?php
+        $statusText = ucfirst($taskInfo['Status']);
+        $statusLabel = 'Status';
+
+        if ($taskInfo['Status'] == 'done') {
+            $statusText = 'Success'; // Override status text for better readability
+            $icon = 'check';
+            $accent = 'green';
+        } elseif ($taskInfo['Status'] == 'error') {
+            $statusText = 'Failed'; // Override status text for better readability
+            $icon = 'warning-red';
+            $accent = 'red';
+        } elseif ($taskInfo['Status'] == 'stopped') {
+            $icon = 'warning-red';
+            $accent = 'red';
+        } elseif ($taskInfo['Status'] == 'scheduled') {
+            $icon = 'time';
+            $accent = 'yellow';
+        } elseif ($taskInfo['Status'] == 'running') {
+            $icon = 'loading';
+            $accent = 'purple';
+        }
+
+        /**
+         *  If the task has sub-tasks, its own status is meaningless as it only dispatched them,
+         *  so the status displayed is a summary of the sub-tasks statuses
+         */
+        if (!empty($subTasksSummary)) {
+            $statusText = 'Success ' . $subTasksSummary['success'] . '/' . $subTasksSummary['total'];
+
+            if ($subTasksSummary['status'] == 'running') {
+                $icon = 'loading';
+                $accent = 'purple';
+            } elseif ($subTasksSummary['status'] == 'error') {
+                $icon = 'warning-red';
+                $accent = 'red';
+            } else {
+                $icon = 'check';
+                $accent = 'green';
+            }
+
+            $statusDetails = [];
+
+            if ($subTasksSummary['failed'] > 0) {
+                $statusDetails[] = $subTasksSummary['failed'] . ' failed';
+            }
+            if ($subTasksSummary['ongoing'] > 0) {
+                $statusDetails[] = $subTasksSummary['ongoing'] . ' in progress';
+            }
+
+            $statusLabel = !empty($statusDetails) ? 'Sub-tasks status (' . implode(', ', $statusDetails) . ')' : 'Sub-tasks status';
+        } ?>
+
+        <div class="kpi-card kpi-accent-<?= $accent ?>">
+            <img src="/assets/icons/<?= $icon ?>.svg" class="icon-np icon-medium" />
+
+            <div>
+                <div class="flex align-item-center column-gap-10">
+                    <p class="kpi-value"><?= $statusText ?></p>
+                    <?php
+                    if ((DEVEL or DebugMode::enabled()) and file_exists(MAIN_LOGS_DIR . '/repomanager-task-' . $taskId . '-log.process')) {
+                        echo '<img src="/assets/icons/file.svg" class="icon view-task-process-log" task-id="' . $taskId . '" title="Debug log" />';
+                    } ?>
+                </div>
+                <p class="mediumopacity-cst"><?= $statusLabel ?></p>
+            </div>
+        </div>
+
+        <div class="kpi-card">
+            <img src="/assets/icons/rocket.svg" class="icon-np icon-medium" />
+            <div>
+                <p class="kpi-value"><?= !empty($rawParams['action']) ? Task::generateLiteralAction($rawParams['action']) : 'Unknown action' ?></p>
+                <p class="mediumopacity-cst">Action</p>
+            </div>
+        </div>
+
+        <?php
+        // A task that has never been executed yet (e.g. a scheduled task) has no date
+        $taskDate = !empty($taskInfo['Date']) ? DateTime::createFromFormat('Y-m-d', $taskInfo['Date']) : false;
+
+        if ($taskDate !== false) : ?>
+            <div class="kpi-card">
+                <img src="/assets/icons/calendar.svg" class="icon-np icon-medium" />
+                <div>
+                    <p class="kpi-value"><?= $taskDate->format('d-m-Y') ?> <?= $taskInfo['Time'] ?></p>
+                    <p class="mediumopacity-cst"><?= $taskInfo['Status'] == 'scheduled' ? 'Last execution' : 'Date' ?></p>
+                </div>
+            </div>
+            <?php
+        endif;
+
+        if (!empty($taskInfo['Duration'])) : ?>
+            <div class="kpi-card">
+                <img src="/assets/icons/time.svg" class="icon-np icon-medium" />
+                <div>
+                    <p class="kpi-value"><?= $taskInfo['Duration'] ?></p>
+                    <p class="mediumopacity-cst">Total duration</p>
+                </div>
+            </div>
+            <?php
+        endif ?>
+    </div>
+
+    <?= $output ?>
+</div>
+
+<div id="scroll-btns-container">
+    <div id="scroll-btns">
+        <?php
+        // Print the auto scroll button if the task is running
+        if ($taskInfo['Status'] == 'running') : ?>
+            <div class="pointer margin-bottom-15">
+                <?php
+                $autoscroll = 'true';
+
+                if (!empty($_COOKIE['autoscroll'])) {
+                    $autoscroll = $_COOKIE['autoscroll'];
+                }
+
+                if ($autoscroll == 'true') : ?>
+                    <div id="autoscroll-btn" class="round-btn-yellow" title="Disable auto refresh and scroll">
+                        <span class="round-btn-icon" style="--icon: url('/assets/icons/pause.svg')"></span>
+                    </div>
+                    <?php
+                else : ?>
+                    <div id="autoscroll-btn" class="round-btn-green" title="Enable auto refresh and scroll">
+                        <span class="round-btn-icon" style="--icon: url('/assets/icons/play.svg')"></span>
+                    </div>
+                    <?php
+                endif ?>
+            </div>
+            <?php
+        endif ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/www/views/includes/containers/tasks/log/log-not-found.inc.php b/www/views/includes/containers/tasks/log/log-not-found.inc.php
new file mode 100644
index 000000000..11a8e9590
--- /dev/null
+++ b/www/views/includes/containers/tasks/log/log-not-found.inc.php
@@ -0,0 +1,15 @@
+<div class="flex align-item-center column-gap-15 justify-space-between">
+    <h3><?= !empty($taskId) ? 'TASK #' . $taskId : 'TASK' ?></h3>
+</div>
+
+<div class="flex flex-wrap align-item-center column-gap-15 row-gap-15 margin-bottom-15 kpi-container">
+    <div class="kpi-card kpi-accent-red">
+        <img src="/assets/icons/warning-red.svg" class="icon-np icon-medium" />
+        <div>
+            <p class="kpi-value">Error</p>
+            <p class="mediumopacity-cst"><?= !empty($taskErrorMessage) ? $taskErrorMessage : 'This task does not exist or has been removed.' ?></p>
+        </div>
+    </div>
+</div>
+
+<p class="note">Go back to the <a href="/tasks" class="font-size-13"><b>tasks list</b></a></p>
\ No newline at end of file
diff --git a/www/views/includes/containers/tasks/log/step.inc.php b/www/views/includes/containers/tasks/log/step.inc.php
index e5f9bb56a..27a2fe630 100644
--- a/www/views/includes/containers/tasks/log/step.inc.php
+++ b/www/views/includes/containers/tasks/log/step.inc.php
@@ -1,6 +1,5 @@
 <?php
 $stepClass = '';
-$titleClass = '';
 
 // If the step has substeps content
 if (!empty($step['substeps'])) {
@@ -13,30 +12,26 @@
     $message = 'Running';
 }
 
-// If the step has an error, the title will be red
+// If the step has an error
 if ($step['status'] == 'error') {
-    $titleClass = 'bkg-red';
     $icon = 'error.svg';
     $message = 'Error';
 }
 
-// If the step is stopped, the title will be red
+// If the step is stopped
 if ($step['status'] == 'stopped') {
-    $titleClass = 'bkg-red';
     $icon = 'warning-red.svg';
     $message = 'Task stopped by the user';
 }
 
-// If the step has a warning, the title will be orange
+// If the step has a warning
 if ($step['status'] == 'warning') {
-    $titleClass = 'bkg-yellow';
     $icon = 'warning.svg';
     $message = 'Completed with warnings';
 }
 
-// If the step is completed, the title will be green
+// If the step is completed
 if ($step['status'] == 'completed') {
-    $titleClass = 'bkg-green';
     $icon = 'check.svg';
     $message = 'Completed';
 }
@@ -47,7 +42,7 @@
 } ?>
 
 <div class="task-step <?= $stepClass ?>" task-id="<?= $taskId ?>" step="<?=  $stepIdentifier ?>" status="<?= $step['status'] ?>">
-    <div class="task-step-title <?= $titleClass ?>">
+    <div class="task-step-title">
         <!-- Step title -->
         <p><?= $step['title'] ?></p>
 
diff --git a/www/views/includes/containers/tasks/tasks.inc.php b/www/views/includes/containers/tasks/tasks.inc.php
new file mode 100644
index 000000000..6b218ad02
--- /dev/null
+++ b/www/views/includes/containers/tasks/tasks.inc.php
@@ -0,0 +1,59 @@
+<?php
+use \Controllers\Layout\Table\Render as TableRender; ?>
+
+<section class="section-main reloadable-container" container="tasks/tasks">
+    <h3>TASKS</h3>
+
+    <div class="grid grid-rfr-1-3 column-gap-20 row-gap-20 margin-bottom-20">
+        <div class="kpi-card">
+            <img src="/assets/icons/rocket.svg" class="icon-np icon-medium" />
+            <div>
+                <p class="kpi-value"><?= $totalCount ?></p>
+                <p class="mediumopacity-cst">Total tasks</p>
+            </div>
+        </div>
+
+        <div class="kpi-card">
+            <img src="/assets/icons/rocket.svg" class="icon-np icon-medium" />
+            <div>
+                <p class="kpi-value"><?= $runningCount ?></p>
+                <p class="mediumopacity-cst">Running tasks</p>
+            </div>
+        </div>
+
+        <div class="kpi-card">
+            <img src="/assets/icons/time.svg" class="icon-np icon-medium" />
+            <div>
+                <p class="kpi-value"><?= $scheduledCount ?></p>
+                <p class="mediumopacity-cst">Scheduled tasks</p>
+            </div>
+        </div>
+    </div>
+
+    <?php
+    if ($totalCount === 0) : ?>
+        <div class="empty-state">
+            <p class="empty-state-title">No task yet!</p>
+            <p class="note">Start by creating a new repository or scheduling a task.</p>
+        </div>
+        <?php
+    endif;
+
+    if ($totalCount > 0) : ?>
+        <div class="div-generic-blue">
+            <?php
+            // Print running tasks table
+            TableRender::render('tasks/list-running');
+
+            // Print queued tasks table
+            TableRender::render('tasks/list-queued');
+
+            // Print scheduled tasks table
+            TableRender::render('tasks/list-scheduled');
+
+            // Print done tasks table
+            TableRender::render('tasks/list-done'); ?>
+        </div>
+        <?php
+    endif ?>
+</section>
diff --git a/www/views/includes/footer.inc.php b/www/views/includes/footer.inc.php
index 2bfc0a110..1dfed0bf8 100644
--- a/www/views/includes/footer.inc.php
+++ b/www/views/includes/footer.inc.php
@@ -1,5 +1,5 @@
 <footer>
-    <div class="flex flex-direction-column row-gap-10">
+    <div class="flex align-item-center flex-wrap column-gap-20 row-gap-10">
         <div class="flex align-item-center column-gap-5 max-width-fit mediumopacity">
             <img src="/assets/icons/file.svg" class="icon-np" />
             <a target="_blank" rel="noopener noreferrer" href="https://docs.repomanager.net">
@@ -29,11 +29,9 @@
         </div>
     </div>
 
-    <div class="flex flex-direction-column align-item-center row-gap-10 mediumopacity-cst">
-        <img src="/assets/official-logo/repomanager-white.svg" class="icon-np" />
-        <p>Repomanager - release version <?= VERSION ?></p>
-        <p>Repomanager is a free and open source software, licensed under the <a target="_blank" rel="noopener noreferrer" href="https://www.gnu.org/licenses/gpl-3.0.en.html">GPLv3</a> license.</p>
-        <p>Support development, star me on <a href='https://github.com/lbr38/repomanager'><b>GitHub</b> ⭐</a></p>
+    <div class="flex align-item-center column-gap-20 mediumopacity-cst">
+        <p>Version <?= VERSION ?></p>
+        <p><a href='https://github.com/lbr38/repomanager'>Star me on GitHub ⭐</a></p>
     </div>
 </footer>
 
@@ -51,6 +49,8 @@
 <script src="/resources/js/classes/Table.js?<?= VERSION ?>"></script>
 <script src="/resources/js/classes/Panel.js?<?= VERSION ?>"></script>
 <script src="/resources/js/classes/Cookie.js?<?= VERSION ?>"></script>
+<script src="/resources/js/classes/Permission/Repo.js?<?= VERSION ?>"></script>
+<script src="/resources/js/classes/Permission/Tasks.js?<?= VERSION ?>"></script>
 <script src="/resources/js/classes/Alert.js?<?= VERSION ?>"></script>
 <script src="/resources/js/classes/ConfirmBox.js?<?= VERSION ?>"></script>
 <script src="/resources/js/classes/Checkbox.js?<?= VERSION ?>"></script>
@@ -69,6 +69,8 @@
     const mytable = new Table();
     const mypanel = new Panel();
     const mycookie = new Cookie();
+    const myrepopermission = new RepoPermission();
+    const mytaskpermission = new TaskPermission();
     const myalert = new Alert();
     const myconfirmbox = new ConfirmBox();
     const mycheckbox = new Checkbox();
@@ -82,9 +84,7 @@
 
 <script>
 <?php
-/**
- *  Store each environment and its colors in browser localStorage for later use
- */
+// Store each environment and its colors in browser localStorage for later use
 if (!empty(ENVS)) {
     foreach (ENVS as $env) {
         $name = $env['Name'];
@@ -98,27 +98,27 @@
 </script>
 
 <?php
-/**
- *  Additional JS classes and files to load, depending on the current page
- */
+// Additional JS classes and files to load, depending on the current page
 if (__ACTUAL_URI__[1] == '') {
     $jsClasses = [
-        'Environment',
-        'Repo'
+        'Repo',
+        'ScheduledTask'
     ];
 
     $jsFiles = [
         'repo',
         'task',
-        'group',
         'source',
         'events/repo/source/distribution',
         'events/repo/source/releasever',
         'events/repo/source/source',
         'events/repo/list',
+        'events/repo/preferences',
         'events/repo/env',
         'events/repo/edit',
         'events/repo/install',
+        'events/repo/group',
+        'events/repo/scheduled-task',
         'events/task/stop'
     ];
 }
@@ -137,14 +137,14 @@
         'events/task/stop'
     ];
 }
-if (__ACTUAL_URI__[1] == 'browse') {
+if (__ACTUAL_URI__[1] == 'snapshot') {
     $jsClasses = [
-        'Repo'
+        'Repo',
+        'Snapshot'
     ];
 
     $jsFiles = [
-        'functions/browse',
-        'events/browse/repository',
+        'events/snapshot/browse',
         'events/task/stop'
     ];
 }
@@ -155,8 +155,11 @@
     ];
 }
 if (__ACTUAL_URI__[1] == 'settings') {
+    $jsClasses = [
+        'Environment'
+    ];
+
     $jsFiles = [
-        'functions/environment',
         'events/settings/environment',
         'events/settings/user',
         'events/settings/debug-mode',
@@ -164,7 +167,7 @@
         'settings'
     ];
 }
-if (__ACTUAL_URI__[1] == 'run') {
+if (in_array(__ACTUAL_URI__[1], ['tasks', 'task'])) {
     $jsFiles = [
         'functions/task',
         'events/task/actions',
diff --git a/www/views/includes/forms/edit.inc.php b/www/views/includes/forms/edit.inc.php
index 3f2c328df..aabbd68aa 100644
--- a/www/views/includes/forms/edit.inc.php
+++ b/www/views/includes/forms/edit.inc.php
@@ -1,4 +1,3 @@
-<h6>REPOSITORY</h6>
 <?php
 if ($repoController->getPackageType() == 'rpm') {
     echo '<span class="label-white">' . $repoController->getName() . ' ❯ ' . $repoController->getReleasever() . '</span>';
diff --git a/www/views/includes/forms/tasks/delete.inc.php b/www/views/includes/forms/tasks/delete.inc.php
index 34620fa8f..2acc6efa9 100644
--- a/www/views/includes/forms/tasks/delete.inc.php
+++ b/www/views/includes/forms/tasks/delete.inc.php
@@ -1,5 +1,3 @@
-<h6>DELETE</h6>
-<p class="note">The repository snapshot to delete.</p>
 <?php
 if ($repoController->getPackageType() == 'rpm') {
     echo '<span class="label-white">' . $repoController->getName() . ' ❯ ' . $repoController->getReleasever() . '</span>⸺<span class="label-black">' . $repoController->getDateFormatted() . '</span>';
diff --git a/www/views/includes/forms/tasks/duplicate.inc.php b/www/views/includes/forms/tasks/duplicate.inc.php
index 01da6af14..40f6967d6 100644
--- a/www/views/includes/forms/tasks/duplicate.inc.php
+++ b/www/views/includes/forms/tasks/duplicate.inc.php
@@ -1,5 +1,5 @@
-<h6>DUPLICATE</h6>
-<p class="note">The repository snapshot to be duplicated.</p>
+<?php
+use \Controllers\Group\Repo as RepoGroup; ?>
 
 <div class="flex align-item-center">
     <p class="label-white">
@@ -21,7 +21,7 @@
 
 <h6>POINT AN ENVIRONMENT</h6>
 <p class="note">Select one or multiple environments to point to the new repository snapshot.</p>
-<select id="duplicate-repo-target-env-select-<?= $repoController->getSnapId() ?>" class="task-param" param-name="env" multiple>
+<select class="task-param" param-name="env" multiple>
     <option value=""></option>
     <?php
     foreach (ENVS as $env) {
@@ -33,10 +33,18 @@
     } ?>
 </select>
 
-<div id="duplicate-repo-target-description-div">
-    <h6>DESCRIPTION</h6>
-    <input type="text" class="task-param" param-name="description" />
-</div>
+<h6>DESCRIPTION</h6>
+<p class="note">Optional. A description for this repository.</p>
+<input type="text" class="task-param" param-name="description" />
+
+<h6>TAGS</h6>
+<p class="note">Optional. Add tags to the repository. Tags can be used to filter repositories.</p>
+<select class="task-param" param-name="tags" multiple>
+    <?php
+    foreach ($tags as $tag) {
+        echo '<option value="' . htmlspecialchars($tag, ENT_QUOTES) . '">' . htmlspecialchars($tag) . '</option>';
+    } ?>
+</select>
 
 <select class="task-param hide" param-name="arch" multiple>
     <?php
@@ -49,10 +57,11 @@
 
 <?php
 /**
- *  Print group list
+ *
  */
-$group = new \Controllers\Group\Repo();
-$groupList = $group->listAll();
+// Print group list
+$groupController = new RepoGroup();
+$groupList = $groupController->listAll();
 
 if (!empty($groupList)) : ?>
     <h6>ADD TO GROUP</h6>
@@ -70,18 +79,8 @@
 $scheduleForm['action'] = 'duplicate'; ?>
 
 <script>
-$(document).ready(function(){
-    myselect2.convert('#duplicate-repo-target-env-select-<?= $repoController->getSnapId()?> ');
-
-    /**
-     *  Print description field only if an environment is specified
-     */
-    $(document).on('change','#duplicate-repo-target-env-select-<?= $repoController->getSnapId() ?>',function(){
-        if ($('#duplicate-repo-target-env-select-<?= $repoController->getSnapId() ?>').val() == "") {
-            $('#duplicate-repo-target-description-div').hide();
-        } else {
-            $('#duplicate-repo-target-description-div').show();
-        }
-    }).trigger('change');
-});
+    $(document).ready(function(){
+        myselect2.convert('select.task-param[param-name="env"]', 'Select environment(s)', true);
+        myselect2.convert('select.task-param[param-name="tags"]', 'Specify tags', true);
+    });
 </script>
\ No newline at end of file
diff --git a/www/views/includes/forms/tasks/env.inc.php b/www/views/includes/forms/tasks/env.inc.php
index 04c71a4fe..cb30225a8 100644
--- a/www/views/includes/forms/tasks/env.inc.php
+++ b/www/views/includes/forms/tasks/env.inc.php
@@ -1,6 +1,3 @@
-<h6>POINT AN ENVIRONMENT</h6>
-<p class="note">The repository snapshot to point the environment(s) to.</p>
-
 <div class="flex align-item-center">
     <p class="label-white">
         <?php
@@ -37,9 +34,6 @@
     } ?>
 </select>
 
-<h6>DESCRIPTION</h6>
-<input type="text" class="task-param" param-name="description" />
-
 <?php
 // Define schedule form action (useful for the schedule form)
 $scheduleForm['action'] = 'env'; ?>
diff --git a/www/views/includes/forms/tasks/rebuild.inc.php b/www/views/includes/forms/tasks/rebuild.inc.php
index 547e2983c..22cebde8c 100644
--- a/www/views/includes/forms/tasks/rebuild.inc.php
+++ b/www/views/includes/forms/tasks/rebuild.inc.php
@@ -1,6 +1,3 @@
-<h6>REBUILD METADATA</h6>
-<p class="note">The repository snapshot to rebuild metadata for.</p>
-
 <div class="flex align-item-center">
     <p class="label-white">
         <?php
diff --git a/www/views/includes/forms/tasks/rename.inc.php b/www/views/includes/forms/tasks/rename.inc.php
index 331af4830..fbbfc6f8d 100644
--- a/www/views/includes/forms/tasks/rename.inc.php
+++ b/www/views/includes/forms/tasks/rename.inc.php
@@ -1,6 +1,3 @@
-<h6>RENAME</h6>
-<p class="note">The repository to be renamed.</p>
-
 <div class="flex align-item-center">
     <p class="label-white">
         <?php
@@ -17,17 +14,8 @@
 <p class="note">The new name of the repository.</p>
 <input type="text" class="task-param" param-name="name" required />
 
-<select class="task-param hide" param-name="arch" multiple>
-    <?php
-    foreach ($repoController->getArch() as $arch) {
-        echo '<option value="' . $arch . '" selected>' . $arch . '</option>';
-    } ?>
-</select>
-
 <input type="hidden" class="task-param" param-name="old-name" value="<?= $repoController->getName() ?>" />
 
-<input type="hidden" class="task-param" param-name="gpg-sign" value="<?= $repoController->getSigned() ?>" />
-
 <?php
 // Define schedule form action (useful for the schedule form)
 $scheduleForm['action'] = 'rename';
diff --git a/www/views/includes/forms/tasks/schedule.inc.php b/www/views/includes/forms/tasks/schedule.inc.php
index cffce77d0..41d4b5c1c 100644
--- a/www/views/includes/forms/tasks/schedule.inc.php
+++ b/www/views/includes/forms/tasks/schedule.inc.php
@@ -1,18 +1,31 @@
 <?php
-use Controllers\Utils\Random; ?>
+use Controllers\Utils\Random;
 
-<div class="task-schedule-form-params" action="<?= $scheduleForm['action'] ?>">
+$showScheduleIntro = $scheduleForm['show-intro'] ?? true;
+$showScheduleToggle = $scheduleForm['show-toggle'] ?? true; ?>
+
+<div class="task-schedule-form-params form-block form-block-accent-green margin-top-15" action="<?= $scheduleForm['action'] ?>">
     <h6>TASK SCHEDULING</h6>
-    <p class="note">Don't want to execute the task immediately? Schedule it!</p>
+    <?php
+    if ($showScheduleIntro) : ?>
+        <p class="note">Don't want to execute the task immediately? Schedule it!</p>
+        <?php
+    endif;
 
-    <h6>SCHEDULE IT</h6>
-    <label class="onoff-switch-label">
-        <input type="checkbox" class="task-schedule-btn onoff-switch-input task-param" param-name="scheduled" value="true" />
-        <span class="onoff-switch-slider"></span>
-    </label>
+    if ($showScheduleToggle) : ?>
+        <h6>SCHEDULE IT</h6>
+        <label class="onoff-switch-label">
+            <input type="checkbox" class="task-schedule-btn onoff-switch-input task-param" param-name="scheduled" value="true" />
+            <span class="onoff-switch-slider"></span>
+        </label>
+        <?php
+    else : ?>
+        <input type="hidden" class="task-param" param-name="scheduled" value="true" />
+        <?php
+    endif; ?>
 
     <!-- Scheduling params -->
-    <div class="task-schedule-params hide">
+    <div class="task-schedule-params<?= $showScheduleToggle ? ' hide' : '' ?>">
         <h6 class="required">SCHEDULE TYPE</h6>
         <?php
         // Generate a random string to make radio Id unique and avoid conflicts with other forms
diff --git a/www/views/includes/forms/tasks/update.inc.php b/www/views/includes/forms/tasks/update.inc.php
index 1f21650e1..5743b0d51 100644
--- a/www/views/includes/forms/tasks/update.inc.php
+++ b/www/views/includes/forms/tasks/update.inc.php
@@ -1,6 +1,3 @@
-<h6>UPDATE</h6>
-<p class="note">Task will create a new snapshot of the repository.</p>
-
 <div class="flex align-item-center">
     <p class="label-white">
         <?php
diff --git a/www/views/includes/head.inc.php b/www/views/includes/head.inc.php
index 90ff11ee3..a4732e90e 100644
--- a/www/views/includes/head.inc.php
+++ b/www/views/includes/head.inc.php
@@ -8,6 +8,7 @@
     <link rel="stylesheet" type="text/css" href="/resources/styles/normalize.css?<?= VERSION ?>">
     <link rel="stylesheet" type="text/css" href="/resources/styles/common.css?<?= VERSION ?>">
     <link rel="stylesheet" type="text/css" href="/resources/styles/components/layout.css?<?= VERSION ?>">
+    <link rel="stylesheet" type="text/css" href="/resources/styles/components/card.css?<?= VERSION ?>">
     <link rel="stylesheet" type="text/css" href="/resources/styles/components/alert.css?<?= VERSION ?>">
     <link rel="stylesheet" type="text/css" href="/resources/styles/components/icon.css?<?= VERSION ?>">
     <link rel="stylesheet" type="text/css" href="/resources/styles/components/input.css?<?= VERSION ?>">
@@ -28,19 +29,18 @@
     <meta name="viewport" content="width=device-width,initial-scale=1">
 
     <?php
-    /**
-     *  Load additional CSS files depending on the current URI
-     */
+    // Load additional CSS files depending on the current URI
     $additionalCss = [
-        "run"      => "run.css",
-        "browse"   => "browse.css",
-        "stat"     => "stats-hosts.css",
-        "stats"    => "stats-hosts.css",
-        "hosts"    => "stats-hosts.css",
-        "host"     => "stats-hosts.css",
-        "settings" => "settings.css",
-        "cves"     => "cve.css",
-        "cve"      => "cve.css"
+        'tasks'    => 'tasks',
+        'task'     => 'tasks.css',
+        'snapshot' => 'snapshot.css',
+        'stat'     => 'stats-hosts.css',
+        'stats'    => 'stats-hosts.css',
+        'hosts'    => 'stats-hosts.css',
+        'host'     => 'stats-hosts.css',
+        'settings' => 'settings.css',
+        'cves'     => 'cve.css',
+        'cve'      => 'cve.css'
     ];
 
     foreach ($additionalCss as $uri => $css) {
@@ -70,23 +70,21 @@
     <?php
     $title = 'Repomanager';
 
-    if (__ACTUAL_URI__[1] == "") {
+    if (__ACTUAL_URI__[1] == '') {
         $title .= ' - Repositories';
-    } elseif (__ACTUAL_URI__[1] == "run") {
+    } elseif (in_array(__ACTUAL_URI__[1], ['tasks', 'task'])) {
         $title .= ' - Tasks';
-    } elseif (__ACTUAL_URI__[1] == "browse") {
-        $title .= ' - Browse repo';
-    } elseif (__ACTUAL_URI__[1] == "stats") {
-        $title .= ' - Statistics and metrics';
-    } elseif (__ACTUAL_URI__[1] == "hosts") {
-        $title .= ' - Manage hosts';
-    } elseif (__ACTUAL_URI__[1] == "host") {
-        $title .= ' - Manage host';
-    } elseif (__ACTUAL_URI__[1] == "settings") {
+    } elseif (__ACTUAL_URI__[1] == 'repository') {
+        $title .= ' - Repository';
+    } elseif (__ACTUAL_URI__[1] == 'snapshot') {
+        $title .= ' - Snapshot';
+    } elseif (in_array(__ACTUAL_URI__[1], ['hosts', 'host'])) {
+        $title .= ' - Hosts';
+    } elseif (__ACTUAL_URI__[1] == 'settings') {
         $title .= ' - Settings';
-    } elseif (__ACTUAL_URI__[1] == "history") {
+    } elseif (__ACTUAL_URI__[1] == 'history') {
         $title .= ' - History';
-    } elseif (__ACTUAL_URI__[1] == "status") {
+    } elseif (__ACTUAL_URI__[1] == 'status') {
         $title .= ' - Status';
     } ?>
 
diff --git a/www/views/includes/host/package/event-packages-details.inc.php b/www/views/includes/host/package/event-packages-details.inc.php
index 85f3cea90..cbfdfdb47 100644
--- a/www/views/includes/host/package/event-packages-details.inc.php
+++ b/www/views/includes/host/package/event-packages-details.inc.php
@@ -30,7 +30,7 @@
         <p class="copy"><?= $package['Name'] ?></p>
     </div>
     
-    <p class="copy"><?= $package['Version'] ?></p>
+    <p class="copy"><span class="label-white"><?= $package['Version'] ?></span></p>
 
     <div>
         <?php
diff --git a/www/views/includes/host/package/timeline.inc.php b/www/views/includes/host/package/timeline.inc.php
index aa4bf7a11..2e68a25d8 100644
--- a/www/views/includes/host/package/timeline.inc.php
+++ b/www/views/includes/host/package/timeline.inc.php
@@ -54,7 +54,7 @@
 
                     <div class="flex flex-direction-column row-gap-5">
                         <h6 class="margin-top-0">VERSION</h6>
-                        <p class="lowopacity-cst copy"><?= $event['Version'] ?></p>
+                        <p class="copy"><span class="label-white"><?= $event['Version'] ?></span></p>
                     </div>
                 </div>
 
diff --git a/www/views/includes/panels/general/notification.inc.php b/www/views/includes/panels/general/notification.inc.php
index 9b8706b65..fb2ac04a8 100644
--- a/www/views/includes/panels/general/notification.inc.php
+++ b/www/views/includes/panels/general/notification.inc.php
@@ -1,17 +1,19 @@
 <?php ob_start(); ?>
 
 <?php
-if (NOTIFICATION == 0) :
-    echo '<p class="note">Nothing for now!</p>';
+if (NOTIFICATION == 0) : ?>
+    <div class="empty-state">
+        <p class="empty-state-title">Nothing for now!</p>
+        <p class="note">You have no notifications at the moment. Repomanager will notify you when an update is available or if there are any important messages to read.</p>
+    </div>
+    <?php
 else :
-    /**
-     *  If an update is available, generate the update notification
-     */
+    // If an update is available, generate the update notification
     if (IS_ADMIN && UPDATE_AVAILABLE) : ?>
-        <div class="margin-bottom-50">
+        <div class="form-block">
             <h5 class="margin-top-10 margin-bottom-0"><?= strtoupper('Update available: ' . GIT_VERSION) ?></h5>
 
-            <div class="flex column-gap-10 margin-bottom-10">
+            <div class="flex align-item-center column-gap-10 margin-bottom-10">
                 <?php
                 // Case its a major release
                 if ($currentVersionDigit != $newVersionDigit) : ?>
@@ -19,6 +21,7 @@
                         <p class="yellowtext"><b>Major release</b></p>
                         <img src="/assets/icons/warning.svg" class="icon-medium icon-np" />
                     </div>
+                    <span class="dot mediumopacity-cst">●</span>
                     <?php
                 endif ?>
 
@@ -26,6 +29,8 @@
                     <a href="<?= PROJECT_GIT_REPO ?>/releases/latest" target="_blank" rel="noopener noreferrer" title="See changelog"><p class="mediumopacity">Changelog</p></a>
                     <img src="/assets/icons/external-link.svg" class="mediumopacity-cst icon-small icon-np" />
                 </div>
+
+                <span class="dot mediumopacity-cst">●</span>
                 
                 <div class="flex align-item-center column-gap-5">
                     <a href="<?= PROJECT_UPDATE_DOC_URL ?>" target="_blank" rel="noopener noreferrer"><p class="mediumopacity">Update instructions</p></a>
@@ -56,26 +61,21 @@
         <?php
     endif;
 
-    /**
-     *  All other notifications
-     */
+    // All other notifications
     foreach (NOTIFICATION_MESSAGES as $notification) : ?>
-        <div class="margin-bottom-50">
+        <div class="form-block">
             <?php
             if (!empty($notification['Title'])) : ?>
                 <h5 class="margin-top-10 margin-bottom-10"><?= strtoupper($notification['Title']) ?></h5>
                 <?php
             endif ?>
 
-            <div class="flex flex-direction-column margin-bottom-40">
+            <div class="flex flex-direction-column">
                 <p><?= htmlspecialchars_decode($notification['Message']) ?></p>
             
                 <?php
                 if (!empty($notification['Id'])) : ?>
-                    <div class="flex align-item-center column-gap-5 mediumopacity acquit-notification-btn margin-top-10" notification-id="<?= $notification['Id'] ?>" title="Mark as read">
-                        <img src="/assets/icons/enabled.svg" class="icon" />
-                        <p class="pointer">Mark as read</p>
-                    </div>
+                    <button type="button" class="btn-fit-tr acquit-notification-btn margin-top-10" notification-id="<?= $notification['Id'] ?>" title="Mark as read">Mark as read</button>
                     <?php
                 endif ?>
             </div>
diff --git a/www/views/includes/panels/general/userspace.inc.php b/www/views/includes/panels/general/userspace.inc.php
index 8ce46696e..41699ec7f 100644
--- a/www/views/includes/panels/general/userspace.inc.php
+++ b/www/views/includes/panels/general/userspace.inc.php
@@ -10,15 +10,10 @@
 <p class="note">The API key is used to authenticate for most of the API endpoints. Keep it secret.</p>
 <input type="text" id="user-apikey" value="(hashed) Generate a new key to retrieve it in clear." />
 
-<div class="flex column-gap-10 margin-top-5">
-    <button type="button" id="user-generate-apikey-btn" class="btn-medium-blue" title="Generate a new key">Generate new key</button>
+<div class="flex column-gap-10 margin-top-10">
+    <button type="button" id="user-generate-apikey-btn" class="btn-medium-tr" title="Generate a new key">Generate new key</button>
 </div>
 
-<h6 class="margin-bottom-5">LOGOUT FROM REPOMANAGER</h6>
-<a href="/logout" title="Logout">
-    <button class="btn-small-red" >Logout</button>
-</a>
-
 <h5>PERSONAL INFORMATIONS</h5>
 
 <div>
@@ -60,8 +55,15 @@
         </form>
     </div>
     <?php
-endif;
+endif; ?>
+
+<h5>LOGOUT</h5>
 
+<a href="/logout" title="Logout">
+    <button class="btn-small-red" >Logout</button>
+</a>
+
+<?php
 $content = ob_get_clean();
 $slidePanelName = 'general/userspace';
 $slidePanelTitle = 'USERSPACE';
diff --git a/www/views/includes/panels/header/menu-burger.inc.php b/www/views/includes/panels/header/menu-burger.inc.php
index ac2d87f61..013ff6142 100644
--- a/www/views/includes/panels/header/menu-burger.inc.php
+++ b/www/views/includes/panels/header/menu-burger.inc.php
@@ -8,11 +8,11 @@
 
     <div class="flex column-gap-10">
         <img src="/assets/icons/rocket.svg" class="icon" />
-        <a href="/run"><h5 class="margin-0">TASKS</h5></a>
+        <a href="/tasks"><h5 class="margin-0">TASKS</h5></a>
     </div>
 
     <div class="flex column-gap-10">
-        <img src="/assets/icons/server.svg" class="icon" />
+        <img src="/assets/icons/disk.svg" class="icon" />
         <a href="/hosts"><h5 class="margin-0">HOSTS</h5></a>
     </div>
 
diff --git a/www/views/includes/panels/hosts/groups/list.inc.php b/www/views/includes/panels/hosts/groups/list.inc.php
index 3ce61eff8..d890cdfee 100644
--- a/www/views/includes/panels/hosts/groups/list.inc.php
+++ b/www/views/includes/panels/hosts/groups/list.inc.php
@@ -2,34 +2,28 @@
 
 <h6>CREATE A NEW GROUP</h6>
 
-<form id="newGroupForm" autocomplete="off">
-    <input id="newGroupInput" type="text" class="input-medium" placeholder="Group name" /></td>
-    <button type="submit" class="btn-xxsmall-green" title="Add">+</button></td>
+<form id="new-group" autocomplete="off">
+    <input name="group-name" type="text" placeholder="Group name" />
+    <button type="submit" class="btn-small-green margin-top-5" title="Create">Create</button>
 </form>
 
-<br>
-
 <?php
 if (!empty($hostGroupsList)) : ?>
-    <h6>CURRENT GROUPS</h6>
+    <h6 class="margin-top-30 margin-bottom-5">CURRENT GROUPS</h6>
 
     <?php
     foreach ($hostGroupsList as $group) :
-        /**
-         *  Ignore if group name is 'Default'
-         */
+        // Ignore if group name is 'Default'
         if ($group['Name'] === 'Default') {
             continue;
         }
 
-        /**
-         *  Retrieve hosts members and hosts not members of the group
-         */
+        // Retrieve hosts members and hosts not members of the group
         $hostsIn = $mygroup->getHostsMembers($group['Id']);
         $hostsNotIn = $mygroup->getHostsNotMembers();
         $hostsInCount = count($hostsIn); ?>
 
-        <div class="table-container grid-fr-4-1 bck-blue-alt group-config-btn pointer" group-id="<?= $group['Id'] ?>">
+        <div class="table-container-2 panel-list-item group-config-btn pointer" group-id="<?= $group['Id'] ?>">
             <div>
                 <p><?= $group['Name'] ?></p>
                 <p class="lowopacity-cst"><?= $hostsInCount ?> host<?= $hostsInCount > 1 ? 's' : '' ?></p>
@@ -48,18 +42,14 @@
                 <h6>HOSTS</h6>
                 <select class="group-hosts-list" group-id="<?= $group['Id'] ?>" name="group-hosts[]" multiple>
                     <?php
-                    /**
-                     *  Hosts members of the group will be selected by default in the list
-                     */
+                    // Hosts members of the group will be selected by default in the list
                     if (!empty($hostsIn)) {
                         foreach ($hostsIn as $host) {
                             echo '<option value="' . $host['Id'] . '" selected>' . $host['Hostname'] . ' (' . $host['Ip'] . ')</option>';
                         }
                     }
 
-                    /**
-                     *  Hosts not members of the group will be unselected in the list
-                     */
+                    // Hosts not members of the group will be unselected in the list
                     if (!empty($hostsNotIn)) {
                         foreach ($hostsNotIn as $host) {
                             echo '<option value="' . $host['Id'] . '">' . $host['Hostname'] . ' (' . $host['Ip'] . ')</option>';
diff --git a/www/views/includes/panels/hosts/profiles.inc.php b/www/views/includes/panels/hosts/profiles.inc.php
index c6d62c5a6..43692f084 100644
--- a/www/views/includes/panels/hosts/profiles.inc.php
+++ b/www/views/includes/panels/hosts/profiles.inc.php
@@ -8,13 +8,13 @@
 
 <h6>CREATE A NEW PROFILE</h6>
 <form id="create-new-profile-form" autocomplete="off">
-    <input id="profile-name" type="text" class="input-medium" placeholder="Profile name" />
-    <button type="submit" class="btn-xxsmall-green" title="Add">+</button>
+    <input id="profile-name" type="text" placeholder="Profile name" />
+    <button type="submit" class="btn-small-green margin-top-5" title="Create">Create</button>
 </form>
 
 <?php
 if (!empty($profiles)) :
-    echo '<h6 class="margin-bottom-5">CURRENT PROFILES</h6>';
+    echo '<h6 class="margin-top-30 margin-bottom-5">CURRENT PROFILES</h6>';
 
     foreach ($profiles as $profile) :
         $packageExclude         = explode(',', $profile['Package_exclude']);
diff --git a/www/views/includes/panels/hosts/settings.inc.php b/www/views/includes/panels/hosts/settings.inc.php
index c90dcd990..8e996fa69 100644
--- a/www/views/includes/panels/hosts/settings.inc.php
+++ b/www/views/includes/panels/hosts/settings.inc.php
@@ -16,6 +16,14 @@
             <input type="number" name="compliance-threshold-days" value="<?= $complianceThresholdDays ?>" />
         </div>
 
+        <div>
+            <p>Host is not compliant when a security update is available:</p>
+            <label class="onoff-switch-label">
+                <input name="compliance-security-update" type="checkbox" class="onoff-switch-input" <?= $complianceSecurityUpdate ? 'checked' : '' ?> />
+                <span class="onoff-switch-slider"></span>
+            </label>
+        </div>
+
         <div>
             <p>Host is not compliant when a reboot is required:</p>
             <label class="onoff-switch-label">
diff --git a/www/views/includes/panels/repos/groups/list.inc.php b/www/views/includes/panels/repos/groups/list.inc.php
index ba4649541..d7d6f3467 100644
--- a/www/views/includes/panels/repos/groups/list.inc.php
+++ b/www/views/includes/panels/repos/groups/list.inc.php
@@ -2,27 +2,23 @@
 
 <h6>CREATE A NEW GROUP</h6>
 
-<form id="newGroupForm" autocomplete="off">
-    <input id="newGroupInput" type="text" class="input-medium" placeholder="Group name" />
-    <button type="submit" class="btn-xxsmall-green" title="Add">+</button>
+<form id="new-group" autocomplete="off">
+    <input name="group-name" type="text" placeholder="Group name" />
+    <button type="submit" class="btn-small-green margin-top-5" title="Create">Create</button>
 </form>
 
-<br>
-
 <?php
 if (!empty($repoGroupsList)) : ?>
-    <h6>CURRENT GROUPS</h6>
+    <h6 class="margin-top-30 margin-bottom-5">CURRENT GROUPS</h6>
 
     <?php
     foreach ($repoGroupsList as $group) :
-        /**
-         *  Retrieve repos members and repos not members of the group
-         */
+        // Retrieve repos members and repos not members of the group
         $reposIn = $mygroup->getReposMembers($group['Id']);
         $reposNotIn = $mygroup->getReposNotMembers();
         $reposInCount = count($reposIn); ?>
 
-        <div class="table-container grid-fr-4-1 bck-blue-alt group-config-btn pointer veil-on-reload" group-id="<?= $group['Id'] ?>">
+        <div class="table-container-2 panel-list-item group-config-btn pointer veil-on-reload" group-id="<?= $group['Id'] ?>">
             <div>
                 <p><?= $group['Name'] ?></p>
                 <p class="lowopacity-cst"><?= $reposInCount ?> <?= $reposInCount > 1 ? 'repositories' : 'repository' ?></p>
@@ -41,9 +37,7 @@
                 <h6>REPOSITORIES</h6>
                 <select class="group-repos-list" group-id="<?= $group['Id'] ?>" name="group-repos[]" multiple>
                     <?php
-                    /**
-                     *  Repos members of the group will be selected by default in the list
-                     */
+                    // Repos members of the group will be selected by default in the list
                     if (!empty($reposIn)) {
                         foreach ($reposIn as $repo) {
                             if ($repo['Package_type'] == 'rpm') {
@@ -55,9 +49,7 @@
                         }
                     }
 
-                    /**
-                     *  Repos not members of the group will be unselected in the list
-                     */
+                    // Repos not members of the group will be unselected in the list
                     if (!empty($reposNotIn)) {
                         foreach ($reposNotIn as $repo) {
                             if ($repo['Package_type'] == 'rpm') {
diff --git a/www/views/includes/panels/repos/install.inc.php b/www/views/includes/panels/repos/install.inc.php
index 91340d2e2..f52317270 100644
--- a/www/views/includes/panels/repos/install.inc.php
+++ b/www/views/includes/panels/repos/install.inc.php
@@ -1,7 +1,7 @@
 <?php ob_start(); ?>
 <h6 class="required">SELECT AN ENVIRONMENT</h6>
 
-<select id="repo-install-select-env">
+<select id="repo-install-select-env" class="margin-bottom-20">
     <option value=""></option>
     <?php
     foreach (ENVS as $env) {
diff --git a/www/views/includes/panels/repos/new.inc.php b/www/views/includes/panels/repos/new.inc.php
index 9b6715926..32ab6981f 100644
--- a/www/views/includes/panels/repos/new.inc.php
+++ b/www/views/includes/panels/repos/new.inc.php
@@ -1,7 +1,7 @@
 <?php ob_start(); ?>
        
 <form id="task-form" autocomplete="off">
-    <div class="task-form-params" repo-id="none" action="create">
+    <div class="task-form-params form-block" repo-id="none" action="create">
         <h6 class="required">PACKAGE TYPE</h6>
         <?php
         // Case where the server manages several different types of repo
@@ -42,15 +42,15 @@
             <div field-type="mirror rpm">
                 <?php
                 if (RPM_REPO == 'true') :
-                    if (empty($newRepoRpmSourcesList)) {
+                    if (empty($rpmSourcesList)) {
                         echo '<div class="flex align-item-center column-gap-5 margin-top-10" field-type="mirror rpm"><img src="/assets/icons/warning.svg" class="icon vertical-align-text-top" /><p class="note">No rpm source repositories available. Please add a source repository first.</p></div>';
                     }
 
-                    if (!empty($newRepoRpmSourcesList)) : ?>
+                    if (!empty($rpmSourcesList)) : ?>
                         <select class="task-param" param-name="source" field-type="mirror rpm" package-type="rpm">
                             <option value="">Select a source repository</option>
                             <?php
-                            foreach ($newRepoRpmSourcesList as $source) {
+                            foreach ($rpmSourcesList as $source) {
                                 $definition = json_decode($source['Definition'], true);
                                 $name = $definition['name'];
                                 echo '<option value="' . $name . '">' . $name . '</option>';
@@ -64,15 +64,15 @@
             <div field-type="mirror deb">
                 <?php
                 if (DEB_REPO == 'true') :
-                    if (empty($newRepoDebSourcesList)) {
+                    if (empty($debSourcesList)) {
                         echo '<div class="flex align-item-center column-gap-5 margin-top-10" field-type="mirror deb"><img src="/assets/icons/warning.svg" class="icon vertical-align-text-top" /><p class="note">No deb source repositories available. Please add a source repository first.</p></div>';
                     }
 
-                    if (!empty($newRepoDebSourcesList)) : ?>
+                    if (!empty($debSourcesList)) : ?>
                         <select class="task-param" param-name="source" field-type="mirror deb" package-type="deb">
                             <option value="">Select a source repository</option>
                             <?php
-                            foreach ($newRepoDebSourcesList as $source) {
+                            foreach ($debSourcesList as $source) {
                                 $definition = json_decode($source['Definition'], true);
                                 $name = $definition['name'];
                                 echo '<option value="' . $name . '">' . $name . '</option>';
@@ -153,7 +153,7 @@
 
         <h6>POINT AN ENVIRONMENT</h6>
         <p class="note">Point an environment to the newly created repository.</p>
-        <select id="new-repo-target-env-select" class="task-param" param-name="env" package-type="all" multiple>
+        <select class="task-param" param-name="env" package-type="all" multiple>
             <option value=""></option>
             <?php
             foreach (ENVS as $env) {
@@ -165,19 +165,27 @@
             } ?>
         </select>
 
-        <div id="new-repo-target-description-tr">
-            <h6>DESCRIPTION</h6>
-            <input type="text" class="task-param" param-name="description" package-type="all" />
-        </div>
+        <h6>DESCRIPTION</h6>
+        <p class="note">Optional. A description for this repository.</p>
+        <input type="text" class="task-param" param-name="description" package-type="all" />
+
+        <h6>TAGS</h6>
+        <p class="note">Optional. Add tags to the repository. Tags can be used to filter repositories.</p>
+        <select class="task-param" param-name="tags" multiple>
+            <?php
+            foreach ($tags as $tag) {
+                echo '<option value="' . htmlspecialchars($tag, ENT_QUOTES) . '">' . htmlspecialchars($tag) . '</option>';
+            } ?>
+        </select>
 
         <?php
         // Possibility to add to a group, if there is at least one group
-        if (!empty($newRepoFormGroupList)) : ?>
+        if (!empty($groups)) : ?>
             <h6>ADD TO GROUP</h6>
             <select class="task-param" param-name="group" package-type="all" >
                 <option value="">Select a group</option>
                 <?php
-                foreach ($newRepoFormGroupList as $group) {
+                foreach ($groups as $group) {
                     echo '<option value="' . $group['Name'] . '">' . $group['Name'] . '</option>';
                 } ?>
             </select>
@@ -271,9 +279,6 @@
         </div>
     </div>
 
-    <br>
-    <hr>
-
     <?php
     // Define schedule form action (useful for the schedule form)
     $scheduleForm['action'] = 'create';
@@ -292,7 +297,8 @@
     myselect2.convert('select.task-param[param-name="dist"]', 'Select distribution', true);
     myselect2.convert('select.task-param[param-name="section"]', 'Select component', true);
     myselect2.convert('select.task-param[param-name="arch"]', 'Select architecture', true);
-    myselect2.convert('select#new-repo-target-env-select', 'Select environment(s)', true);
+    myselect2.convert('select.task-param[param-name="env"]', 'Select environment(s)', true);
+    myselect2.convert('select.task-param[param-name="tags"]', 'Specify tags', true);
     myselect2.convert('select.task-param[param-name="advanced-params.packages.include"]', 'Specify package(s)', true);
     myselect2.convert('select.task-param[param-name="advanced-params.packages.exclude"]', 'Specify package(s)', true);
     myselect2.convert('select.task-param[param-name="schedule-day"]', 'Select day(s)', true);
diff --git a/www/views/includes/panels/repos/rename.inc.php b/www/views/includes/panels/repos/rename.inc.php
new file mode 100644
index 000000000..bea24150b
--- /dev/null
+++ b/www/views/includes/panels/repos/rename.inc.php
@@ -0,0 +1,9 @@
+<?php ob_start(); ?>
+
+<?= $formContent; ?>
+
+<?php
+$content = ob_get_clean();
+$slidePanelName = 'repos/rename';
+
+include(ROOT . '/views/includes/slide-panel.inc.php');
diff --git a/www/views/includes/panels/repos/scheduled-task.inc.php b/www/views/includes/panels/repos/scheduled-task.inc.php
new file mode 100644
index 000000000..bea266e70
--- /dev/null
+++ b/www/views/includes/panels/repos/scheduled-task.inc.php
@@ -0,0 +1,136 @@
+<?php ob_start(); ?>
+
+<p class="note">Schedule a task on the <b>latest snapshot</b> of every repository matching the filters below.</p>
+<p class="note margin-bottom-10">Repositories created later are automatically included, so the task never has to be recreated.</p>
+
+<form id="scheduled-task-form" autocomplete="off">
+    <div class="scheduled-task-form-params form-block">
+        <h6 class="required">ACTION</h6>
+        <select id="scheduled-task-action" class="scheduled-task-param" param-name="action">
+            <?php
+            foreach ($allowedActions as $action) {
+                echo '<option value="' . $action . '">' . $actionsTitles[$action] . '</option>';
+            } ?>
+        </select>
+
+        <h6>TARGET</h6>
+        <p class="note"><b>By default, all repositories are targeted.</b> Use the filters below to restrict the target. Leave a filter empty to not filter on it, filters are combined.</p>
+
+        <h6>REPOSITORY GROUP</h6>
+        <select id="scheduled-task-target-group" class="scheduled-task-target-param" param-name="group">
+            <option value="">No group filter (all repositories)</option>
+            <?php
+            foreach ($groups as $group) {
+                echo '<option value="' . intval($group['Id']) . '">' . htmlspecialchars($group['Name']) . '</option>';
+            } ?>
+        </select>
+
+        <h6>TAGS</h6>
+        <p class="note">Only repositories having <b>all</b> the selected tags will be targeted.</p>
+        <select id="scheduled-task-target-tags" class="scheduled-task-target-param" param-name="tags" multiple>
+            <?php
+            foreach ($tags as $tag) {
+                echo '<option value="' . htmlspecialchars($tag, ENT_QUOTES) . '">' . htmlspecialchars($tag) . '</option>';
+            } ?>
+        </select>
+
+        <h6>PACKAGE TYPE</h6>
+        <select id="scheduled-task-target-package-type" class="scheduled-task-target-param" param-name="package-type">
+            <option value="">No package type filter</option>
+            <option value="deb">deb</option>
+            <option value="rpm">rpm</option>
+        </select>
+
+        <div class="flex align-item-center column-gap-5 margin-top-15">
+            <img src="/assets/icons/info.svg" class="icon-np" />
+            <p id="scheduled-task-target-count">Calculating...</p>
+        </div>
+
+        <!-- Parameters for the 'update' action -->
+        <div class="scheduled-task-action-params" action="update">
+            <h6>POINT AN ENVIRONMENT</h6>
+            <p class="note">Optional. Select one or multiple environments to point to each new snapshot.</p>
+            <select id="scheduled-task-update-env" class="scheduled-task-param" param-name="env" multiple>
+                <?php
+                foreach (ENVS as $env) {
+                    echo '<option value="' . htmlspecialchars($env['Name'], ENT_QUOTES) . '">' . htmlspecialchars($env['Name']) . '</option>';
+                } ?>
+            </select>
+
+            <h6>CHECK GPG SIGNATURES</h6>
+            <p class="note">Check GPG signature of repository / packages. Only applies to mirror repositories.</p>
+            <label class="onoff-switch-label">
+                <input type="checkbox" class="onoff-switch-input scheduled-task-param" param-name="gpg-check" value="true" checked />
+                <span class="onoff-switch-slider"></span>
+            </label>
+
+            <h6>SIGN WITH GPG</h6>
+            <p class="note">Sign repository / packages with GPG.</p>
+            <label class="onoff-switch-label">
+                <input type="checkbox" class="onoff-switch-input scheduled-task-param" param-name="gpg-sign" value="true" checked />
+                <span class="onoff-switch-slider"></span>
+            </label>
+
+            <p class="note margin-top-15">
+                <img src="/assets/icons/info.svg" class="icon-np" />
+                Each repository is updated using its own architectures and advanced parameters.
+            </p>
+        </div>
+
+        <!-- Parameters for the 'env' action -->
+        <div class="scheduled-task-action-params hide" action="env">
+            <h6 class="required">ENVIRONMENT</h6>
+            <p class="note">Select one or multiple environments to point to the latest snapshot of each repository.</p>
+            <select id="scheduled-task-env-env" class="scheduled-task-param" param-name="env" multiple>
+                <?php
+                foreach (ENVS as $env) {
+                    echo '<option value="' . htmlspecialchars($env['Name'], ENT_QUOTES) . '">' . htmlspecialchars($env['Name']) . '</option>';
+                } ?>
+            </select>
+        </div>
+
+        <!-- Parameters for the 'rebuild' action -->
+        <div class="scheduled-task-action-params hide" action="rebuild">
+            <h6>SIGN WITH GPG</h6>
+            <p class="note">Sign repository / packages with GPG.</p>
+            <label class="onoff-switch-label">
+                <input type="checkbox" class="onoff-switch-input scheduled-task-param" param-name="gpg-sign" value="true" checked />
+                <span class="onoff-switch-slider"></span>
+            </label>
+        </div>
+    </div>
+
+    <?php
+    // Reuse the same scheduling form as regular tasks (avoid code duplication)
+    $scheduleForm = [
+        'action' => 'update',
+        'show-intro' => false,
+        'show-toggle' => false
+    ];
+
+    include(ROOT . '/views/includes/forms/tasks/schedule.inc.php'); ?>
+
+    <br>
+    <button type="button" class="scheduled-task-confirm-btn btn-large-green">Schedule task</button>
+</form>
+<br><br>
+
+<script>
+$(document).ready(function () {
+    myselect2.convert('#scheduled-task-target-tags', 'Select tag(s)...', true);
+    myselect2.convert('#scheduled-task-update-env', 'Select environment(s)...');
+    myselect2.convert('#scheduled-task-env-env', 'Select environment(s)...');
+
+    // Show the parameters of the selected action and refresh the number of targeted repositories
+    myscheduledtask.initScheduleForm();
+    myscheduledtask.printActionParams();
+    myscheduledtask.refreshCount();
+});
+</script>
+
+<?php
+$content = ob_get_clean();
+$slidePanelName = 'repos/scheduled-task';
+$slidePanelTitle = 'SCHEDULE A TASK';
+
+include(ROOT . '/views/includes/slide-panel.inc.php');
diff --git a/www/views/includes/panels/repos/settings.inc.php b/www/views/includes/panels/repos/settings.inc.php
new file mode 100644
index 000000000..4a0945022
--- /dev/null
+++ b/www/views/includes/panels/repos/settings.inc.php
@@ -0,0 +1,30 @@
+<?php
+use \Controllers\Utils\Convert;
+ob_start(); ?>
+
+<form id="repos-list-preferences">
+    <h6>EXPAND REPOSITORY LIST</h6>
+    <p class="note">If enabled, repositories will expand to take up the full width of the list when there is only one repository in the list.</p>
+    <label class="onoff-switch-label">
+        <input type="checkbox" class="onoff-switch-input" name="repositories.list.expand" value="true" <?= Convert::toBool($preferences['repositories']['list']['expand']) === true ? 'checked' : '' ?> />
+        <span class="onoff-switch-slider"></span>
+    </label>
+
+    <h6>ONE-LINE REPOSITORY LIST</h6>
+    <p class="note">If enabled, repositories will be displayed in a single line instead of a columnar list.</p>
+    <label class="onoff-switch-label">
+        <input type="checkbox" class="onoff-switch-input" name="repositories.list.one-line" value="true" <?= Convert::toBool($preferences['repositories']['list']['one-line']) === true ? 'checked' : '' ?> />
+        <span class="onoff-switch-slider"></span>
+    </label>
+
+    <br><br>
+
+    <button type="submit" class="btn-large-green margin-top-5" title="Save preferences">Save</button>
+</form>
+
+<?php
+$content = ob_get_clean();
+$slidePanelName = 'repos/settings';
+$slidePanelTitle = 'SETTINGS';
+
+include(ROOT . '/views/includes/slide-panel.inc.php');
diff --git a/www/views/includes/panels/repos/sources/list.inc.php b/www/views/includes/panels/repos/sources/list.inc.php
index b7a43a3e0..cc3452a76 100644
--- a/www/views/includes/panels/repos/sources/list.inc.php
+++ b/www/views/includes/panels/repos/sources/list.inc.php
@@ -7,14 +7,13 @@
         <img src="/assets/icons/close.svg" class="slide-panel-close-btn float-right lowopacity" slide-panel="repos/sources/list" title="Close" />
 
         <div class="slide-panel-reloadable-div" slide-panel="repos/sources/list">
-
             <h3>SOURCE REPOSITORIES</h3>
 
             <h6>ADD</h6>
             <p class="note">Import a predefined list or add a source repository manually.</p>
 
             <div class="flex column-gap-10 margin-top-5 margin-bottom-30">
-                <button type="button" class="btn-medium-blue get-panel-btn" panel="repos/sources/import">Import</button>
+                <button type="button" class="btn-medium-green get-panel-btn" panel="repos/sources/import">Import</button>
                 <button type="button" class="btn-medium-tr get-panel-btn" panel="repos/sources/new">Manually add</button>
             </div>
 
diff --git a/www/views/includes/panels/settings/user/permissions.inc.php b/www/views/includes/panels/settings/user/permissions.inc.php
index dd27e89fe..6e013088c 100644
--- a/www/views/includes/panels/settings/user/permissions.inc.php
+++ b/www/views/includes/panels/settings/user/permissions.inc.php
@@ -22,6 +22,20 @@
                 echo '<option value="group-' . $group['Id'] . '" ' . $selected . '>Group ' . $group['Name'] . '</option>';
             } ?>
         </optgroup>
+
+        <optgroup label="Repositories">
+            <?php
+            // Display repositories and select them if they are in the permissions
+            foreach ($reposList as $repoId => $repoLabel) {
+                $selected = '';
+
+                if (in_array($repoId, $permissions['repositories']['view']['repos'])) {
+                    $selected = 'selected';
+                }
+
+                echo '<option value="repo-' . $repoId . '" ' . $selected . '>' . $repoLabel . '</option>';
+            } ?>
+        </optgroup>
     </select>
 
     <h6>ALLOW ACTIONS ON REPOSITORIES</h6>
diff --git a/www/views/includes/panels/snapshot/rebuild.inc.php b/www/views/includes/panels/snapshot/rebuild.inc.php
new file mode 100644
index 000000000..1296f968c
--- /dev/null
+++ b/www/views/includes/panels/snapshot/rebuild.inc.php
@@ -0,0 +1,18 @@
+<?php ob_start(); ?>
+
+<h6 class="margin-top-0">SIGN WITH GPG</h6>
+<p class="note">Signature can extend the task duration.</p>
+<label class="onoff-switch-label">
+    <input name="gpgSign" type="checkbox" class="onoff-switch-input" <?= $gpgSignChecked ?>>
+    <span class="onoff-switch-slider"></span>
+</label>
+
+<br><br>
+<button id="snapshot-rebuild-btn" snap-id="<?= $snapId ?>" type="button" class="btn-large-red">Execute</button>
+
+<?php
+$content = ob_get_clean();
+$slidePanelName = 'snapshot/rebuild';
+$slidePanelTitle = 'REBUILD METADATA';
+
+include(ROOT . '/views/includes/slide-panel.inc.php');
diff --git a/www/views/includes/panels/snapshot/upload.inc.php b/www/views/includes/panels/snapshot/upload.inc.php
new file mode 100644
index 000000000..f8e7b93b7
--- /dev/null
+++ b/www/views/includes/panels/snapshot/upload.inc.php
@@ -0,0 +1,52 @@
+<?php ob_start(); ?>
+
+<form id="snapshot-upload" enctype="multipart/form-data">
+    <input type="hidden" name="action" value="upload-package" />
+    <input type="hidden" name="snapId" value="<?= $snapId ?>" />
+
+    <h6 class="margin-top-0">SELECT PACKAGES TO UPLOAD</h6>
+    <p class="note">Max upload size: <?= ini_get('upload_max_filesize') ?></p>
+    <p class="note">Valid MIME types: <code class="font-size-11">application/x-rpm</code> and <code class="font-size-11">application/vnd.debian.binary-package</code></p>
+
+    <br>
+    <input type="file" name="packages[]" accept="application/vnd.debian.binary-package" multiple />
+    
+    <h6 class="">OVERWRITE EXISTING PACKAGES</h6>
+    <p class="note">If a package with the same name already exists in the snapshot, it will be overwritten.</p>
+    <label class="onoff-switch-label">
+        <input name="overwrite" type="checkbox" class="onoff-switch-input">
+        <span class="onoff-switch-slider"></span>
+    </label>
+
+    <br><br>
+    <button type="submit" class="btn-large-green">Upload package</button>
+</form>
+
+<div class="margin-top-10">
+    <?php
+    // Print success messages from uploading packages if there are
+    if (!empty($uploadSuccessMessage)) {
+        echo '<p class="greentext">' . $uploadSuccessMessage . '</p>';
+    }
+
+    // Print error messages from uploading packages if there are
+    if (!empty($uploadErrorDetails)) {
+        foreach ($uploadErrorDetails as $errorTitle => $errorPackages) {
+            echo '<p class="redtext">' . htmlspecialchars($errorTitle) . ':</p>';
+            foreach ($errorPackages as $pkg) {
+                echo '<p class="redtext">' . htmlspecialchars($pkg) . '</p>';
+            }
+        }
+    }
+
+    if (!empty($uploadErrorMessage)) {
+        echo '<p class="redtext">' . $uploadErrorMessage . '</p>';
+    } ?>
+</div>
+
+<?php
+$content = ob_get_clean();
+$slidePanelName = 'snapshot/upload';
+$slidePanelTitle = 'UPLOAD PACKAGES';
+
+include(ROOT . '/views/includes/slide-panel.inc.php');
diff --git a/www/views/includes/repos-list.inc.php b/www/views/includes/repos-list.inc.php
index 79a6cb611..eebe1af81 100644
--- a/www/views/includes/repos-list.inc.php
+++ b/www/views/includes/repos-list.inc.php
@@ -1,419 +1,16 @@
 <?php
-use \Controllers\User\Permission\Repo as RepoPermission;
-use \Controllers\Utils\Generate\Html\Label;
-use \Controllers\Utils\Array\Sort;
-
-/**
- *  Print groups and repos
- */
-if (!empty($groupsList)) {
-    foreach ($groupsList as $group) :
-        /**
-         *  Permissions
-         *  If the user is not an admin, check if the group is in the user permissions
-         */
-        if (!IS_ADMIN) {
-            // If 'all' is not in the user permissions, then it means the user has specific permissions and cannot view all groups
-            if (!in_array('all', USER_PERMISSIONS['repositories']['view'])) {
-                // Check if the current group Id is in the user permissions, if not then skip to the next group
-                if (!in_array($group['Id'], USER_PERMISSIONS['repositories']['view']['groups'])) {
-                    continue;
-                }
-            }
-        }
-
-        /**
-         *  Getting repos list of the group
-         */
-        $reposList = $myrepoListing->listByGroup($group['Name']);
-
-        /**
-         *  Count repositories
-         *  To have the exact number of repos, count by their repoId (to avoid duplicate repos)
-         */
-        $reposCount = count(array_unique(array_column($reposList, 'repoId')));
-
-        /**
-         *  Generate count message
-         */
-        if ($reposCount < 2) {
-            $countMessage = $reposCount . ' repository';
-        } else {
-            $countMessage = $reposCount . ' repositories';
-        } ?>
-
-        <div class="repos-list-group div-generic-blue veil-on-reload" group-id="<?= $group['Id'] ?>" group="<?= $group['Name'] ?>">
-            <div class="flex justify-space-between">
-                <div>
-                    <p class="font-size-16"><?= $group['Name'] ?></p>
-                    <p class="lowopacity-cst"><?= $countMessage ?></p>
-                </div>
-                <img src="/assets/icons/view.svg" class="hide-repo-group pointer icon-lowopacity" group-id="<?= $group['Id'] ?>" state="visible" title="Hide/Show group">
-            </div>
-
-            <div class="repos-list-group-select-all-btns mediumopacity pointer hide" group-id="<?= $group['Id'] ?>">
-                <input type="checkbox" group-id="<?= $group['Id'] ?>"><p>Select latest snapshots</p>
-            </div>
-
-            <?php
-            // If the group is empty, move to the next group
-            if (empty($reposList)) {
-                // close div.repos-list-group:
-                echo '</div>';
-                continue;
-            } ?>
-
-            <!-- div only used to the show / hide group feature -->
-            <div class="repo-list-group-container margin-top-20" group-id="<?= $group['Id'] ?>">
-                <?php
-                // Sort repos by name
-                $reposList = Sort::byKey('Name', $reposList);
-
-                // Variables to keep the previous values in the loop and decide if we need to print or not some values (to avoid duplicates)
-                $previousName = null;
-                $previousDist = null;
-                $previousSection = null;
-                $previousEnv = null;
-                $previousSnapId = null;
-                $previousPackageType = null;
-                $previousReleaseVersion = null;
-
-                /**
-                 *  $envCounter will be used to count the number of env for the current repo
-                 *  If the current env is the third to be print for the current repo, then print an empty line to let a space between the previous env
-                 */
-                $envCounter = 1;
-
-                foreach ($reposList as $repoArray) : ?>
-                    <div class="repos-list-group-flex-div" group-id="<?= $group['Id'] ?>" group="<?= $group['Name'] ?>">
-                        <?php
-                        foreach ($repoArray as $repo) :
-                            // Retrieve values from database
-                            $name           = $repo['Name'];
-                            $dist           = $repo['Dist'];
-                            $section        = $repo['Section'];
-                            $releaseVersion = $repo['Releasever'];
-                            $source         = $repo['Source'];
-                            $rebuild        = $repo['Reconstruct'];
-                            $status         = $repo['Status'];
-                            $size           = $repo['Size'] ?? '?';
-                            $sizeHuman      = $repo['Size_human'] ?? '?';
-                            $packageType    = $repo['Package_type'];
-                            $date           = $repo['Date'];
-                            $dateFormatted  = DateTime::createFromFormat('Y-m-d', $repo['Date'])->format('d-m-Y');
-                            $time           = $repo['Time'];
-                            $type           = $repo['Type'];
-                            $signed         = $repo['Signed'];
-                            $arch           = $repo['Arch'];
-                            $env            = $repo['Env'];
-                            $description    = $repo['Description'];
-                            $repoId         = $repo['repoId'];
-                            $snapId         = $repo['snapId'];
-                            $envId          = $repo['envId'];
-
-                            // Conditional variables to print or not some informations
-                            $printRepoName        = true;
-                            $printRepoDist        = true;
-                            $printRepoSection     = true;
-                            $printReleaseVersion  = true;
-                            $printEmptyLine       = false;
-                            $printDoubleEmptyLine = false;
-
-                            if ($name == $previousName) {
-                                $printRepoName = false;
-                            }
-
-                            if ($packageType != $previousPackageType) {
-                                $printRepoName = true;
-                                $envCounter    = 1;
-                            }
-
-                            if ($packageType == 'rpm') {
-                                $snapshotPath = REPOS_DIR . '/rpm/' . $name . '/' . $releaseVersion . '/' . $date;
-
-                                if ($name == $previousName and $snapId != $previousSnapId) {
-                                    $printEmptyLine = true;
-                                    $envCounter = 1;
-                                }
-                                if ($name == $previousName and $releaseVersion === $previousReleaseVersion) {
-                                    $printReleaseVersion = false;
-                                }
-                                if ($name == $previousName and $releaseVersion !== $previousReleaseVersion) {
-                                    $printDoubleEmptyLine = true;
-                                    $envCounter = 1;
-                                }
-
-                                // Reset previous dist and section values to avoid some display bugs with deb repos having the same name as rpm repos
-                                $previousDist = '';
-                                $previousSection = '';
-                            }
-
-                            if ($packageType == 'deb') {
-                                $snapshotPath = REPOS_DIR . '/deb/' . $name . '/' . $dist . '/' . $section . '/' . $date;
-
-                                if ($name == $previousName and $dist == $previousDist and $section == $previousSection) {
-                                    $printRepoName    = false;
-                                    $printRepoDist    = false;
-                                    $printRepoSection = false;
-                                }
-                                if ($name == $previousName and $previousDist != $dist) {
-                                    $printDoubleEmptyLine = true;
-                                    $envCounter = 1;
-                                }
-                                if ($name == $previousName and $previousDist == $dist and $section != $previousSection) {
-                                    $printDoubleEmptyLine = true;
-                                    $envCounter = 1;
-                                }
-                                if ($name == $previousName and $dist == $previousDist and $section == $previousSection and $snapId != $previousSnapId) {
-                                    $printEmptyLine = true;
-                                    $envCounter = 1;
-                                }
-                                if ($previousPackageType == 'deb' and $packageType == 'deb' and $name == $previousName) {
-                                    $printRepoName = false;
-                                }
-
-                                // Reset previous release version value to avoid some display bugs with rpm repos having the same name as deb repos
-                                $previousReleaseVersion = '';
-                            }
-
-                            // If the current env is the third to be print for the current repo, then print an empty line before to let a space between the previous env
-                            if ($envCounter >= 3) {
-                                $printEmptyLine = true;
-                            }
-
-                            // Check if a task is running on the snapshot
-                            $taskRunning = $repoSnapshotController->taskRunning($snapId);
-
-                            // Print double empty line
-                            if ($printDoubleEmptyLine) {
-                                echo '<div class="item-empty-line"></div>';
-                            } ?>
-
-                            <div class="item-repo" name="<?= $name ?>" dist="<?= $dist ?>" section="<?= $section ?>" releasever="<?= $releaseVersion ?>">
-                                <?php
-                                if ($printRepoName) : ?>
-                                    <div class="flex align-item-center column-gap-8">
-                                        <span class="copy bold wordbreakall"><?= $name ?></span>
-                                        <span class="label-pkg-<?= $packageType ?>" title="This repository contains <?= $packageType ?> packages"><?= strtoupper($packageType) ?></span>
-                                    </div>
-                                    <?php
-                                endif;
-
-                                if ($packageType == 'deb') {
-                                    if ($printRepoDist or $printRepoSection) {
-                                        if ($printRepoDist) :
-                                            if (STATS_ENABLED == "true" and RepoPermission::allowedAction('view-stats')) : ?>
-                                                <a href="/stats/repo/<?= $repoId ?>">
-                                                    <div class="flex align-item-center column-gap-5" title="<?= (DEB_DISTRIBUTIONS[$dist] ?? $dist) ?> - <?= $section ?> - See stats">
-                                                        <p class="mediumopacity-cst font-size-13"><?= (DEB_DISTRIBUTIONS[$dist] ?? $dist) ?></p>
-                                                        <p class="mediumopacity-cst dot">●</p>
-                                                        <p class="mediumopacity-cst font-size-13"><?= $section ?></p>
-                                                    </div>
-                                                </a>
-                                                <?php
-                                            else : ?>
-                                                <div class="flex align-item-center column-gap-5" title="<?= (DEB_DISTRIBUTIONS[$dist] ?? $dist) ?> - <?= $section ?> - See stats">
-                                                    <p class="mediumopacity-cst font-size-13"><?= (DEB_DISTRIBUTIONS[$dist] ?? $dist) ?></p>
-                                                    <p class="mediumopacity-cst dot">●</p>
-                                                    <p class="mediumopacity-cst font-size-13"><?= $section ?></p>
-                                                </div>
-                                                <?php
-                                            endif;
-                                        endif;
-                                    }
-                                }
-
-                                if ($packageType == 'rpm') {
-                                    if ($printReleaseVersion) {
-                                        if (STATS_ENABLED == "true" and RepoPermission::allowedAction('view-stats')) {
-                                            echo '<a href="/stats/repo/' . $repoId . '">';
-                                            echo '<p class="lowopacity-cst font-size-13" title="Release version - See stats">Release version ' . $releaseVersion . '</p>';
-                                            echo '</a>';
-                                        } else {
-                                            echo '<p class="lowopacity-cst font-size-13" title="Release version">Release version ' . $releaseVersion . '</p>';
-                                        }
-                                    }
-                                } ?>
-                            </div>
-
-                            <div class="item-checkbox">
-                                <?php
-                                if ($snapId != $previousSnapId) {
-                                    // Print a warning icon if repo snapshot needs to be rebuild
-                                    if (!empty($rebuild)) {
-                                        if ($rebuild == 'needed') {
-                                            echo '<img class="icon-np" src="/assets/icons/warning.svg" title="Repository snapshot content has been modified. You have to rebuild metadata." />';
-                                        }
-
-                                        /**
-                                         *  Print a failed icon if repo snapshot rebuild has failed
-                                         */
-                                        if ($rebuild == 'failed') {
-                                            echo '<img class="icon-np" src="/assets/icons/error.svg" title="Metadata building has failed." />';
-                                        }
-                                    }
-
-                                    /**
-                                     *  Print a warning icon if snapshot directory does not exist on the server
-                                     *  Only print it if there is no task running on the snapshot because some tasks like rename can temporarily remove the snapshot directory
-                                     */
-                                    if (!$taskRunning) {
-                                        if ($packageType == 'rpm') {
-                                            if (!is_dir($snapshotPath)) {
-                                                echo '<img class="icon-np" src="/assets/icons/warning.svg" title="This snapshot directory is missing on the server." />';
-                                            }
-                                        }
-                                        if ($packageType == 'deb') {
-                                            if (!is_dir($snapshotPath)) {
-                                                echo '<img class="icon-np" src="/assets/icons/warning.svg" title="This snapshot directory is missing on the server." />';
-                                            }
-                                        }
-                                    }
-                                }
-
-                                /**
-                                 *  Checkbox are printed for all users
-                                 *  Admins can execute all actions
-                                 *  Regular users can execute actions only if they have the permission to do so (but they can at least 'Install' the repository)
-                                 */
-                                // Print checkbox only if the snapshot is different from the previous one and there is no operation running on the snapshot
-                                if ($snapId != $previousSnapId) :
-                                    if ($taskRunning) : ?>
-                                        <img src="/assets/icons/loading.svg" class="icon-np" title="A task is running on this repository snaphot." />
-                                        <?php
-                                    else : ?>
-                                        <input type="checkbox" cid="<?= $repoId . $snapId ?>" class="icon-lowopacity" name="checkbox-repo" repo-id="<?= $repoId ?>" snap-id="<?= $snapId ?>" <?php echo !empty($envId) ? 'env-id="' . $envId . '"' : ''; ?> env-name="<?= $env ?>" repo-type="<?= $type ?>" group-id="<?= $group['Id'] ?>" title="Select and execute an action.">
-                                        <?php
-                                    endif;
-                                endif ?>
-                            </div>
-
-                            <div class="item-snapshot">
-                                <?php
-                                if ($snapId != $previousSnapId) : ?>
-                                    <div class="item-date">
-                                        <?php
-                                        if (RepoPermission::allowedAction('browse')) : ?>
-                                            <a href="/browse/<?= $snapId ?>" title="<?= "Browse snapshot ($dateFormatted $time) content" ?>">
-                                                <span><?= $dateFormatted ?></span>
-                                            </a>
-                                            <?php
-                                        else : ?>
-                                            <span><?= $dateFormatted ?></span>
-                                            <?php
-                                        endif ?>
-                                    </div>
-
-                                    <div class="item-info">
-                                        <span>
-                                            <?php
-                                            if ($type == "mirror") {
-                                                echo '<img class="icon-np lowopacity-cst" src="/assets/icons/internet.svg" title="Type: mirror (source repository: ' . $source . ')&#10;Arch: ' . $arch . '" />';
-                                            }
-                                            if ($type == "local") {
-                                                echo '<img class="icon-np lowopacity-cst" src="/assets/icons/pin.svg" title="Type: local&#10;Arch: ' . $arch . '" />';
-                                            } ?>
-                                        </span>
-                                        
-                                        <span>
-                                            <?php
-                                            if ($signed == "true") {
-                                                echo '<img class="icon-np lowopacity-cst" src="/assets/icons/key.svg" title="Signed with GPG" />';
-                                            }
-                                            if ($signed == "false") {
-                                                echo '<img class="icon-np" src="/assets/icons/key2.svg" title="Not signed with GPG" />';
-                                            } ?>
-                                        </span>
-
-                                        <span class="lowopacity-cst" title="Snapshot size"><?= $sizeHuman ?></span>
-                                    </div>
-                                    <?php
-                                endif ?>
-                            </div>
-                            
-                            <?php
-                            /**
-                             *  Print an arrow only if an environment points to the snapshot
-                             */
-                            if ($snapId == $previousSnapId) {
-                                echo '<div class="item-arrow-up">';
-                            } else {
-                                echo '<div class="item-arrow">';
-                            }
-                            if (!empty($env)) {
-                                echo '<span></span>';
-                            }
-                            echo '</div>'; ?>
-
-                            <div class="item-env" env-id="<?= $envId ?>" title="<?= !empty($env) ? "Environment: $env" : "" ?>">
-                                <?php
-                                if (!empty($env)) {
-                                    echo Label::envtag($env, 'fit');
-                                    $envCounter++;
-                                } ?>
-                            </div>
-
-                            <div class="item-env-info" env-id="<?= $envId ?>">
-                                <?php
-                                // Environment checkbox
-                                if (!empty($env)) {
-                                    // Print a warning icon if the env link is broken (target environment link does not exist). Only print it if there is no task running on the snapshot.
-                                    if (!$taskRunning) {
-                                        if ($packageType == 'rpm') {
-                                            if (!is_link(REPOS_DIR . '/rpm/' . $name . '/' . $releaseVersion . '/' . $env)) {
-                                                echo '<img class="icon-np" src="/assets/icons/warning.svg" title="This environment link is broken." />';
-                                            }
-                                        }
-
-                                        if ($packageType == 'deb') {
-                                            if (!is_link(REPOS_DIR . '/deb/' . $name . '/' . $dist . '/' . $section . '/' . $env)) {
-                                                echo '<img class="icon-np" src="/assets/icons/warning.svg" title="This environment link is broken." />';
-                                            }
-                                        }
-                                    }
-
-                                    // If the user is an admin or is a regular user with the 'removeEnv' permission
-                                    if (RepoPermission::allowedAction('removeEnv')) { ?>
-                                        <input type="checkbox" cid="<?= $repoId . $snapId . $envId ?>" class="select-env-checkbox icon-lowopacity" name="env-checkbox" repo-id="<?= $repoId ?>" snap-id="<?= $snapId ?>" env-id="<?= $envId ?>" env="<?= $env ?>" title="Select environment">
-                                        <?php
-                                    }
-                                } ?>
-                            </div>
-
-                            <?php
-                            // Description input
-                            echo '<div class="item-desc hide-mobile">';
-                            if (!empty($env)) {
-                                echo '<input type="text" class="repo-description-input" env-id="' . $envId . '" value=\'' . htmlspecialchars_decode($description) . '\' />';
-                            }
-                            echo '</div>'; ?>
-
-                            <div class="item-task-status" snap-id="<?= $snapId ?>">
-                            </div>
-
-                            <?php
-                            $previousName = $name;
-
-                            if (!empty($dist)) {
-                                $previousDist = $dist;
-                            }
-                            if (!empty($section)) {
-                                $previousSection = $section;
-                            }
-                            if (!empty($releaseVersion)) {
-                                $previousReleaseVersion = $releaseVersion;
-                            }
-                            $previousSnapId = $snapId;
-                            $previousPackageType = $packageType;
-                        endforeach ?>
-                    </div>
-                    <?php
-                endforeach ?>
-            </div>
-        </div>
-        <?php
-    endforeach;
-} ?>
+// Print groups and repos
+if (empty($groups)) : ?>
+    <div class="empty-state">
+        <p class="empty-state-title">Nothing to see here!</p>
+        <p class="note">There is no repository to display.</p>
+    </div>
+    <?php
+else :
+    foreach ($groups as $groupId => $group) {
+        include(ROOT . '/views/includes/containers/repos/group.inc.php');
+    }
+endif; ?>
 
 <script>
 $(document).ready(function() {
diff --git a/www/views/includes/tables/history/list.inc.php b/www/views/includes/tables/history/list.inc.php
index cd649ea68..20da1d71c 100644
--- a/www/views/includes/tables/history/list.inc.php
+++ b/www/views/includes/tables/history/list.inc.php
@@ -31,18 +31,18 @@
     }
 
     if (!empty($reloadableTableContent)) :
-        foreach ($reloadableTableContent as $item) : ?>
-            <div class="table-container grid-rfr-1-2 column-gap-15 row-gap-15 bck-blue-alt margin-top-5">
+        foreach ($reloadableTableContent as $item) :
+            if ($item['State'] == 'error') {
+                $accent = 'red';
+            }
+
+            if ($item['State'] == 'success') {
+                $accent = 'green';
+            } ?>
+
+            <div class="table-container panel-list-item accent-<?= $accent ?> grid-rfr-1-2 column-gap-15 row-gap-15 margin-top-5">
                 <div class="grid grid-rfr-1-2 column-gap-15 row-gap-15 align-item-center">
                     <div class="flex align-item-center column-gap-15">
-                        <?php
-                        if ($item['State'] == 'error') {
-                            echo '<img src="/assets/icons/error.svg" class="icon-np" title="Success" />';
-                        }
-                        if ($item['State'] == 'success') {
-                            echo '<img src="/assets/icons/check.svg" class="icon-np" tiel="Error" />';
-                        } ?>
-
                         <div class="flex flex-direction-column row-gap-5">
                             <p><b><?= $item['Date'] ?> <?= $item['Time'] ?></b></p>
                             <div class="flex align-item-center column-gap-5">
diff --git a/www/views/includes/tables/host/available-packages.inc.php b/www/views/includes/tables/host/available-packages.inc.php
index ccfff84a6..2eaddc6c9 100644
--- a/www/views/includes/tables/host/available-packages.inc.php
+++ b/www/views/includes/tables/host/available-packages.inc.php
@@ -1,3 +1,7 @@
+<?php
+use \Controllers\Utils\Generate\Html\Icon;
+use \Controllers\Utils\Convert; ?>
+
 <div class="reloadable-table" table="<?= $table ?>" offset="<?= $reloadableTableOffset ?>">
     <?php
     if (!empty($reloadableTableContent)) :
@@ -25,36 +29,54 @@
             </div>
         </div>
 
-        <?php
-        foreach ($reloadableTableContent as $item) :
-            $checked = '';
-            $excluded = false;
-            $title = 'Select package'; ?>
+        <div class="flex flex-direction-column row-gap-10">
+            <?php
+            foreach ($reloadableTableContent as $item) :
+                $checked = '';
+                $excluded = false;
+                $securityUpdate = Convert::toBool($item['Security']);
+                $title = 'Click to select';
 
-            <div class="table-container-3 bck-blue-alt">
-                <div class="text-center">
-                    <?= \Controllers\Utils\Generate\Html\Icon::product($item['Name']) ?>
-                </div>
+                // If the package is in the "exclude on major update" list
+                foreach ($packageExcludedMajor as $package) {
+                    if (preg_match('#' . $package . '#', $item['Name'])) {
+                        $excluded = true;
+                        $title = 'This package is marked as excluded on major update in the profile configuration';
+                        break;
+                    }
+                }
 
-                <div class="get-package-timeline pointer" hostid="<?= $id ?>" packagename="<?= $item['Name'] ?>" title="See package history">
-                    <div class="flex align-item-center column-gap-5">
-                        <p class="copy" title="Available package"><?= $item['Name'] ?></p>
-                        <p class="copy" title="Available version"><code class="wordbreakall"><?= $item['Current_version'] ?> ❯ <?= $item['Version'] ?></code></p>
+                // If the package is in the "always exclude" list
+                foreach ($packageExcluded as $package) {
+                    if (preg_match('#' . $package . '#', $item['Name'])) {
+                        $excluded = true;
+                        $title = 'This package is marked as excluded in the profile configuration';
+                        break;
+                    }
+                } ?>
+
+                <div class="host-package-item pointer <?= $excluded ? 'host-package-excluded' : '' ?>" title="<?= $title ?>">
+                    <div class="flex align-item-center column-gap-10">
+                        <?= Icon::product($item['Name']) ?>
+
+                        <div class="get-package-timeline" hostid="<?= $id ?>" packagename="<?= $item['Name'] ?>">
+                            <p class="copy" title="Available package"><?= $item['Name'] ?></p>
+
+                            <?php
+                            if (!empty($item['Repository'])) : ?>
+                                <p class="note wordbreakall copy" title="Repository"><?= $item['Repository'] ?></p>
+                                <?php
+                            endif ?>
+                        </div>
                     </div>
 
-                    <?php
-                    if (!empty($item['Repository'])) : ?>
-                        <p class="note wordbreakall copy" title="Repository"><?= $item['Repository'] ?></p>
-                        <?php
-                    endif ?>
-                </div>
+                    <div class="flex align-item-center column-gap-10">
+                        <p class="copy" title="<?= $securityUpdate ? 'Security update available' : 'Update available' ?>">
+                            <span class="label-<?= $securityUpdate ? 'yellow' : 'white' ?> wordbreakall"><?= $item['Current_version'] ?> ❯ <?= $item['Version'] ?></span>
+                        </p>
 
-                <div class="text-right margin-right-5">
-                    <div class="flex align-iten-center justify-end column-gap-10 row-gap-5 flex-wrap">
                         <?php
-                        /**
-                         *  If package was selected, we check the checkbox
-                         */
+                        // If package was selected, we check the checkbox
                         if (!empty($selectedPackages['packages'])) {
                             foreach ($selectedPackages['packages'] as $package) {
                                 if ($package['name'] === $item['Name'] and $package['available_version'] === $item['Version']) {
@@ -62,42 +84,30 @@
                                     break;
                                 }
                             }
-                        } ?>
+                        }
 
-                        <?php
                         if (IS_ADMIN) {
-                            // If the package is in the "exclude on major update" list, print a warning icon
-                            foreach ($packageExcludedMajor as $package) {
-                                if (preg_match('#' . $package . '#', $item['Name'])) {
-                                    $excluded = true;
-                                    $title = 'Warning: this package is marked as excluded on major update in the profile configuration';
-                                }
-                            }
-
-                            // If the package is in the "always exclude" list, print a warning icon
-                            foreach ($packageExcluded as $package) {
-                                if (preg_match('#' . $package . '#', $item['Name'])) {
-                                    $excluded = true;
-                                    $title = 'Warning: this package is marked as excluded in the profile configuration';
-                                }
-                            }
-
-                            // If there is no package update already running, display the checkbox
+                            // If there is no package update already running, add the checkbox
                             if ($packageUpdateRunning == false) { ?>
-                                <input type="checkbox" class="available-package-checkbox lowopacity <?= $excluded ? 'checkbox-warning' : '' ?>" host-id="<?= $id ?>" package="<?= $item['Name'] ?>" version="<?= $item['Version'] ?>" <?= $checked ?> <?= $excluded ? 'excluded="true"' : 'excluded="false"' ?> title="<?= $title ?>" />
+                                <input type="checkbox" class="available-package-checkbox <?= $excluded ? 'checkbox-warning' : '' ?>" host-id="<?= $id ?>" package="<?= $item['Name'] ?>" version="<?= $item['Version'] ?>" <?= $checked ?> <?= $excluded ? 'excluded="true"' : 'excluded="false"' ?> title="<?= $title ?>" />
                                 <?php
                             }
                         } ?>
                     </div>
                 </div>
+                <?php
+            endforeach; ?>
+            
+            <div class="flex justify-end margin-top-10">
+                <?php \Controllers\Layout\Table\Render::paginationBtn($reloadableTableCurrentPage, $reloadableTableTotalPages); ?>
             </div>
-            <?php
-        endforeach; ?>
-        
-        <div class="flex justify-end margin-top-10">
-            <?php \Controllers\Layout\Table\Render::paginationBtn($reloadableTableCurrentPage, $reloadableTableTotalPages); ?>
-        </div>
 
+            <script>
+            $(function() {
+                $('.available-package-checkbox:checked').closest('.host-package-item').addClass('host-package-selected');
+            });
+            </script>
+        </div>
         <?php
     endif ?>
 </div>
diff --git a/www/views/includes/tables/host/history.inc.php b/www/views/includes/tables/host/history.inc.php
index 347c14dbc..f36dc6a03 100644
--- a/www/views/includes/tables/host/history.inc.php
+++ b/www/views/includes/tables/host/history.inc.php
@@ -1,77 +1,80 @@
 <div class="reloadable-table margin-top-15" table="<?= $table ?>" offset="<?= $reloadableTableOffset ?>">
-    <?php
-    if (empty($reloadableTableContent)) : ?>
-        <div class="empty-state">
-            <p class="empty-state-title">Nothing for now!</p>
-            <p class="note">The host did not send any history yet.</p>
-        </div>
+    <div class="flex flex-direction-column row-gap-10">
         <?php
-    endif;
+        if (empty($reloadableTableContent)) : ?>
+            <div class="empty-state">
+                <p class="empty-state-title">Nothing for now!</p>
+                <p class="note">The host did not send any history yet.</p>
+            </div>
+            <?php
+        endif;
 
-    if (!empty($reloadableTableContent)) :
-        foreach ($reloadableTableContent as $date => $packageState) : ?>
-            <div class="table-container-3 row-gap-15 column-gap-30 bck-blue-alt event-packages-btn pointer" host-id="<?= $id ?>" event-date="<?= $date ?>">
-                <div>
-                    <p><b><?= DateTime::createFromFormat('Y-m-d', $date)->format('d-m-Y') ?></b></p>
-                </div>
+        if (!empty($reloadableTableContent)) :
+            foreach ($reloadableTableContent as $date => $packageState) : ?>
+                <div class="host-event-item event-packages-btn pointer" host-id="<?= $id ?>" event-date="<?= $date ?>">
+                    <div class="flex align-item-center column-gap-15">
+                        <img src="/assets/icons/calendar.svg" class="icon-np lowopacity-cst" />
+                        <p><b><?= DateTime::createFromFormat('Y-m-d', $date)->format('d-m-Y') ?></b></p>
+                    </div>
 
-                <div class="grid grid-rfr-1-4 row-gap-15 column-gap-30">
-                    <?php
-                    foreach ($packageState as $state => $packages) :
-                        if (empty($packages)) {
-                            continue;
-                        }
+                    <div class="flex align-item-center column-gap-20 flex-wrap">
+                        <?php
+                        foreach ($packageState as $state => $packages) :
+                            if (empty($packages)) {
+                                continue;
+                            }
 
-                        if ($state == 'installed') {
-                            $title = 'INSTALLED';
-                            $icon = 'package-installed.svg';
-                        }
+                            if ($state == 'installed') {
+                                $title = 'INSTALLED';
+                                $icon = 'package-installed.svg';
+                            }
 
-                        if ($state == 'reinstalled') {
-                            $title = 'REINSTALLED';
-                            $icon = 'package-installed.svg';
-                        }
+                            if ($state == 'reinstalled') {
+                                $title = 'REINSTALLED';
+                                $icon = 'package-installed.svg';
+                            }
 
-                        if ($state == 'dep-installed') {
-                            $title = 'DEP. INSTALLED';
-                            $icon = 'package-installed.svg';
-                        }
+                            if ($state == 'dep-installed') {
+                                $title = 'DEP. INSTALLED';
+                                $icon = 'package-installed.svg';
+                            }
 
-                        if ($state == 'upgraded') {
-                            $title = 'UPDATED';
-                            $icon = 'package-updated.svg';
-                        }
+                            if ($state == 'upgraded') {
+                                $title = 'UPDATED';
+                                $icon = 'package-updated.svg';
+                            }
 
-                        if ($state == 'downgraded') {
-                            $title = 'DOWNGRADED';
-                            $icon = 'package-updated.svg';
-                        }
+                            if ($state == 'downgraded') {
+                                $title = 'DOWNGRADED';
+                                $icon = 'package-updated.svg';
+                            }
 
-                        if ($state == 'removed') {
-                            $title = 'UNINSTALLED';
-                            $icon = 'package-removed.svg';
-                        }
+                            if ($state == 'removed') {
+                                $title = 'UNINSTALLED';
+                                $icon = 'package-removed.svg';
+                            }
 
-                        if ($state == 'purged') {
-                            $title = 'PURGED';
-                            $icon = 'package-removed.svg';
-                        }
+                            if ($state == 'purged') {
+                                $title = 'PURGED';
+                                $icon = 'package-removed.svg';
+                            }
 
-                        $count = count($packages);
+                            $count = count($packages);
 
-                        include(ROOT . '/views/includes/labels/label-icon-tr.inc.php');
-                    endforeach ?>
+                            include(ROOT . '/views/includes/labels/label-icon-tr.inc.php');
+                        endforeach ?>
+                    </div>
                 </div>
-            </div>
 
-            <?php
-        endforeach;
+                <?php
+            endforeach;
 
-        unset($date, $packageState, $state, $packages, $title, $icon, $count); ?>
+            unset($date, $packageState, $state, $packages, $title, $icon, $count); ?>
 
-        <div class="flex justify-end margin-top-10">
-            <?php \Controllers\Layout\Table\Render::paginationBtn($reloadableTableCurrentPage, $reloadableTableTotalPages); ?>
-        </div>
-        <?php
-    endif ?>
+            <div class="flex justify-end margin-top-10">
+                <?php \Controllers\Layout\Table\Render::paginationBtn($reloadableTableCurrentPage, $reloadableTableTotalPages); ?>
+            </div>
+            <?php
+        endif ?>
+    </div>
 </div>
diff --git a/www/views/includes/tables/host/installed-packages.inc.php b/www/views/includes/tables/host/installed-packages.inc.php
new file mode 100644
index 000000000..42617a919
--- /dev/null
+++ b/www/views/includes/tables/host/installed-packages.inc.php
@@ -0,0 +1,40 @@
+<div class="reloadable-table" table="<?= $table ?>" offset="<?= $reloadableTableOffset ?>">
+    <p class="margin-top-15 margin-bottom-15 mediumopacity-cst">
+        <?= $reloadableTableTotalItems ?> package<?= $reloadableTableTotalItems > 1 ? 's' : '' ?> inventored<?= $search !== '' ? ' (filtered)' : '' ?>
+    </p>
+
+    <?php
+    if (empty($reloadableTableContent)) : ?>
+        <p class="note"><?= $search !== '' ? 'No package matches your search.' : 'No package inventored.' ?></p>
+        <?php
+    else : ?>
+        <div class="flex flex-direction-column row-gap-10">
+            <?php
+            foreach ($reloadableTableContent as $item) : ?>
+                <div class="host-package-item host-package-item-installed get-package-timeline pointer" hostid="<?= $id ?>" packagename="<?= $item['Name'] ?>" packageversion="<?= $item['Version'] ?>" title="See package history">
+                    <div class="flex align-item-center column-gap-10">
+                        <?= \Controllers\Utils\Generate\Html\Icon::product($item['Name']); ?>
+
+                        <div>
+                            <p class="copy">
+                                <?php
+                                if ($item['State'] == 'removed' or $item['State'] == 'purged') {
+                                    echo '<span class="redtext">' . $item['Name'] . ' (uninstalled)</span>';
+                                } else {
+                                    echo $item['Name'];
+                                } ?>
+                            </p>
+                            <p class="font-size-12 lowopacity-cst copy"><?= $item['Version'] ?></p>
+                        </div>
+                    </div>
+                </div>
+                <?php
+            endforeach; ?>
+        </div>
+
+        <div class="flex justify-end margin-top-10">
+            <?php \Controllers\Layout\Table\Render::paginationBtn($reloadableTableCurrentPage, $reloadableTableTotalPages); ?>
+        </div>
+        <?php
+    endif ?>
+</div>
diff --git a/www/views/includes/tables/host/requests.inc.php b/www/views/includes/tables/host/requests.inc.php
index c81eb882c..ffa569a5a 100644
--- a/www/views/includes/tables/host/requests.inc.php
+++ b/www/views/includes/tables/host/requests.inc.php
@@ -10,418 +10,429 @@
         <?php
     endif;
 
-    if (!empty($reloadableTableContent)) :
-        foreach ($reloadableTableContent as $item) :
-            $class = 'table-container bck-blue-alt';
-            $request = '';
-            $requestData = [];
-            $requestInfo = null;
-            $requestDetails = null;
-            $responseDetails = null;
-            $responseJson = null;
-            $successPackages = [];
-            $failedPackages = [];
-            $dryRun = null;
-            $ignoreExclusions = null;
-            $fullUpgrade = null;
-            $keepConfigFiles = null;
-
-            /**
-             *  Retrieve and decode JSON data
-             */
-            $requestJson = json_decode($item['Request'], true);
-
-            /**
-             *  Request name
-             */
-            $request = $requestJson['request'];
-
-            /**
-             *  Request data
-             */
-            if (isset($requestJson['data'])) {
-                $requestData = $requestJson['data'];
-            }
-
-            /**
-             *  Update params
-             */
-            if (!empty($requestData['update-params'])) {
-                // Retrieve dry-run value
-                if (!empty($requestData['update-params']['dry-run'])) {
-                    $dryRun = \Controllers\Utils\Convert::toBool($requestData['update-params']['dry-run']);
-                }
+    if (!empty($reloadableTableContent)) : ?>
+        <div class="flex flex-direction-column row-gap-10">
+            <?php
+            foreach ($reloadableTableContent as $item) :
+                $class = 'host-request-item';
+                $request = '';
+                $requestData = [];
+                $requestInfo = null;
+                $requestDetails = null;
+                $responseDetails = null;
+                $responseJson = null;
+                $successPackages = [];
+                $failedPackages = [];
+                $dryRun = null;
+                $ignoreExclusions = null;
+                $fullUpgrade = null;
+                $keepConfigFiles = null;
 
-                // Retrieve ignore-exclusions value
-                if (!empty($requestData['update-params']['ignore-exclusions'])) {
-                    $ignoreExclusions = \Controllers\Utils\Convert::toBool($requestData['update-params']['ignore-exclusions']);
-                }
+                /**
+                 *  Retrieve and decode JSON data
+                 */
+                $requestJson = json_decode($item['Request'], true);
 
-                // Retrieve full-upgrade value
-                if (!empty($requestData['update-params']['full-upgrade'])) {
-                    $fullUpgrade = \Controllers\Utils\Convert::toBool($requestData['update-params']['full-upgrade']);
-                }
+                /**
+                 *  Request name
+                 */
+                $request = $requestJson['request'];
 
-                // Retrieve keep-config-files value
-                if (!empty($requestData['update-params']['keep-config-files'])) {
-                    $keepConfigFiles = \Controllers\Utils\Convert::toBool($requestData['update-params']['keep-config-files']);
+                /**
+                 *  Request data
+                 */
+                if (isset($requestJson['data'])) {
+                    $requestData = $requestJson['data'];
                 }
-            }
-
-            /**
-             *  Request info
-             */
-            $requestInfo = $item['Info'];
-
-            /**
-             *  Response data
-             */
-            if (!empty($item['Response_json'])) {
-                $responseJson = json_decode($item['Response_json'], true);
-            }
-
-            /**
-             *  Request status
-             */
-            if ($item['Status'] == 'new') {
-                $requestStatus = 'Pending';
-                $requestStatusIcon = 'pending.svg';
-            }
-            if ($item['Status'] == 'sent') {
-                $requestStatus = 'Sent';
-                $requestStatusIcon = 'pending.svg';
-            }
-            if ($item['Status'] == 'running') {
-                $requestStatus = 'Running';
-                $requestStatusIcon = 'loading.svg';
-            }
-            if ($item['Status'] == 'canceled') {
-                $requestStatus = 'Canceled';
-                $requestStatusIcon = 'warning-red.svg';
-            }
-            if ($item['Status'] == 'failed') {
-                $requestStatus = 'Failed';
-                $requestStatusIcon = 'error.svg';
-            }
-            if ($item['Status'] == 'completed') {
-                $requestStatus = 'Completed';
-                $requestStatusIcon = 'check.svg';
-            }
-
-            /**
-             *  Request title
-             */
-            if ($request == 'request-general-infos') {
-                $requestString = 'Requested general informations';
-                $requestTitle = 'Requested the host to send its general informations';
-            }
-
-            if ($request == 'request-packages-infos') {
-                $requestString = 'Requested packages informations';
-                $requestTitle = 'Requested the host to send its packages informations';
-            }
-
-            if ($request == 'request-packages-update') {
-                $requestString = 'Request to update a list of package(s)';
-                $requestTitle = 'Requested the host to install a list of package(s)';
-
-
-                if (!empty($responseJson)) {
-                    if (!empty($requestJson['packages'])) {
-                        $requestDetails = count($requestJson['packages']) . ' package(s) to install';
-                    }
 
-                    /**
-                     *  If there was no packages to update
-                     */
-                    if ($responseJson['update']['status'] == 'nothing-to-do') {
-                        $responseDetails = 'No packages to update';
+                /**
+                 *  Update params
+                 */
+                if (!empty($requestData['update-params'])) {
+                    // Retrieve dry-run value
+                    if (!empty($requestData['update-params']['dry-run'])) {
+                        $dryRun = \Controllers\Utils\Convert::toBool($requestData['update-params']['dry-run']);
                     }
 
-                    /**
-                     *  If there was packages to update, retrieve the number of packages updated
-                     */
-                    if ($responseJson['update']['status'] == 'done' or $responseJson['update']['status'] == 'failed') {
-                        $successCount = $responseJson['update']['success']['count'];
-                        $failedCount  = $responseJson['update']['failed']['count'];
-
-                        // If the update was successful
-                        if ($responseJson['update']['status'] == 'done') {
-                            $requestStatus = 'Successful';
-                            $requestStatusIcon = 'check.svg';
-                        }
-
-                        // If the update failed
-                        if ($responseJson['update']['status'] == 'failed') {
-                            $requestStatus = 'Failed with errors';
-                            $requestStatusIcon = 'error.svg';
-                        }
+                    // Retrieve ignore-exclusions value
+                    if (!empty($requestData['update-params']['ignore-exclusions'])) {
+                        $ignoreExclusions = \Controllers\Utils\Convert::toBool($requestData['update-params']['ignore-exclusions']);
+                    }
 
-                        // If there was packages updated AND packages failed
-                        if ($successCount >= 1 and $failedCount >= 1) {
-                            $requestStatus = 'Partial success';
-                            $requestStatusIcon = 'warning.svg';
-                        }
+                    // Retrieve full-upgrade value
+                    if (!empty($requestData['update-params']['full-upgrade'])) {
+                        $fullUpgrade = \Controllers\Utils\Convert::toBool($requestData['update-params']['full-upgrade']);
+                    }
 
-                        // If there was no packages updated AND packages failed
-                        if ($successCount == 0 and $failedCount >= 1) {
-                            $requestStatus = 'Failed';
-                            $requestStatusIcon = 'error.svg';
-                        }
+                    // Retrieve keep-config-files value
+                    if (!empty($requestData['update-params']['keep-config-files'])) {
+                        $keepConfigFiles = \Controllers\Utils\Convert::toBool($requestData['update-params']['keep-config-files']);
+                    }
+                }
 
-                        // Build a short info message
-                        $responseDetails .= $successCount . ' package(s) updated, ' . $failedCount . ' failed';
+                /**
+                 *  Request info
+                 */
+                $requestInfo = $item['Info'];
 
-                        // Retrieve the list of packages updated
-                        $successPackages = $responseJson['update']['success']['packages'];
+                /**
+                 *  Response data
+                 */
+                if (!empty($item['Response_json'])) {
+                    $responseJson = json_decode($item['Response_json'], true);
+                }
 
-                        // Retrieve the list of packages failed
-                        $failedPackages = $responseJson['update']['failed']['packages'];
-                    }
+                /**
+                 *  Request status
+                 */
+                if ($item['Status'] == 'new') {
+                    $requestStatus = 'Pending';
+                    $requestStatusIcon = 'pending.svg';
+                }
+                if ($item['Status'] == 'sent') {
+                    $requestStatus = 'Sent';
+                    $requestStatusIcon = 'pending.svg';
+                }
+                if ($item['Status'] == 'running') {
+                    $requestStatus = 'Running';
+                    $requestStatusIcon = 'loading.svg';
+                }
+                if ($item['Status'] == 'canceled') {
+                    $requestStatus = 'Canceled';
+                    $requestStatusIcon = 'warning-red.svg';
+                }
+                if ($item['Status'] == 'failed') {
+                    $requestStatus = 'Failed';
+                    $requestStatusIcon = 'error.svg';
+                }
+                if ($item['Status'] == 'completed') {
+                    $requestStatus = 'Completed';
+                    $requestStatusIcon = 'check.svg';
                 }
-            }
 
-            if ($request == 'request-all-packages-update') {
-                $requestString = 'Requested to update all packages';
-                $requestTitle = 'Requested the host to update all of its packages';
+                /**
+                 *  Request title
+                 */
+                if ($request == 'request-general-infos') {
+                    $requestString = 'Requested general informations';
+                    $requestTitle = 'Requested the host to send its general informations';
+                }
 
-                if (!empty($responseJson)) {
-                    /**
-                     *  If there was no packages to update
-                     */
-                    if ($responseJson['update']['status'] == 'nothing-to-do') {
-                        $responseDetails = 'No packages to update';
-                    }
+                if ($request == 'request-packages-infos') {
+                    $requestString = 'Requested packages informations';
+                    $requestTitle = 'Requested the host to send its packages informations';
+                }
 
-                    /**
-                     *  If there was packages to update, retrieve the number of packages updated
-                     */
-                    if ($responseJson['update']['status'] == 'done' or $responseJson['update']['status'] == 'failed') {
-                        $successCount = $responseJson['update']['success']['count'];
-                        $failedCount  = $responseJson['update']['failed']['count'];
-
-                        // If the update was successful
-                        if ($responseJson['update']['status'] == 'done') {
-                            $requestStatus = 'Successful';
-                            $requestStatusIcon = 'check.svg';
-                        }
+                if ($request == 'request-packages-update') {
+                    $requestString = 'Request to update a list of package(s)';
+                    $requestTitle = 'Requested the host to install a list of package(s)';
 
-                        // If the update failed
-                        if ($responseJson['update']['status'] == 'failed') {
-                            $requestStatus = 'Failed with errors';
-                            $requestStatusIcon = 'error.svg';
+                    if (!empty($responseJson)) {
+                        if (!empty($requestJson['packages'])) {
+                            $requestDetails = count($requestJson['packages']) . ' package(s) to install';
                         }
 
-                        // If there was packages updated AND packages failed
-                        if ($successCount >= 1 and $failedCount >= 1) {
-                            $requestStatus = 'Partial success';
-                            $requestStatusIcon = 'warning.svg';
+                        /**
+                         *  If there was no packages to update
+                         */
+                        if ($responseJson['update']['status'] == 'nothing-to-do') {
+                            $responseDetails = 'No packages to update';
                         }
 
-                        // If there was no packages updated AND packages failed
-                        if ($successCount == 0 and $failedCount >= 1) {
-                            $requestStatus = 'Failed';
-                            $requestStatusIcon = 'error.svg';
+                        /**
+                         *  If there was packages to update, retrieve the number of packages updated
+                         */
+                        if ($responseJson['update']['status'] == 'done' or $responseJson['update']['status'] == 'failed') {
+                            $successCount = $responseJson['update']['success']['count'];
+                            $failedCount  = $responseJson['update']['failed']['count'];
+
+                            // If the update was successful
+                            if ($responseJson['update']['status'] == 'done') {
+                                $requestStatus = 'Successful';
+                                $requestStatusIcon = 'check.svg';
+                            }
+
+                            // If the update failed
+                            if ($responseJson['update']['status'] == 'failed') {
+                                $requestStatus = 'Failed with errors';
+                                $requestStatusIcon = 'error.svg';
+                            }
+
+                            // If there was packages updated AND packages failed
+                            if ($successCount >= 1 and $failedCount >= 1) {
+                                $requestStatus = 'Partial success';
+                                $requestStatusIcon = 'warning.svg';
+                            }
+
+                            // If there was no packages updated AND packages failed
+                            if ($successCount == 0 and $failedCount >= 1) {
+                                $requestStatus = 'Failed';
+                                $requestStatusIcon = 'error.svg';
+                            }
+
+                            // Build a short info message
+                            $responseDetails .= $successCount . ' package(s) updated, ' . $failedCount . ' failed';
+
+                            // Retrieve the list of packages updated
+                            $successPackages = $responseJson['update']['success']['packages'];
+
+                            // Retrieve the list of packages failed
+                            $failedPackages = $responseJson['update']['failed']['packages'];
                         }
-
-                        // Build a short info message
-                        $responseDetails .= $successCount . ' package(s) updated, ' . $failedCount . ' failed';
-
-                        // Retrieve the list of packages updated
-                        $successPackages = $responseJson['update']['success']['packages'];
-
-                        // Retrieve the list of packages failed
-                        $failedPackages = $responseJson['update']['failed']['packages'];
                     }
                 }
-            }
 
-            if ($request == 'request-packages-update' or $request == 'request-all-packages-update') {
-                $class .= ' request-show-more-info-btn pointer';
-            }
+                if ($request == 'request-all-packages-update') {
+                    $requestString = 'Requested to update all packages';
+                    $requestTitle = 'Requested the host to update all of its packages';
 
-            // If the request was a profile update or a disconnect, skip it
-            if ($request == 'update-profile' or $request == 'disconnect') {
-                continue;
-            } ?>
-
-            <div class="<?= $class ?>" request-id="<?= $item['Id'] ?>">
-                <div class="text-center">
-                    <?php
-                    if (!empty($requestStatusIcon)) {
-                        if (str_ends_with($requestStatusIcon, '.svg')) {
-                            echo '<img class="icon-np" src="/assets/icons/' . $requestStatusIcon . '" title="' . $requestStatus . '">';
-                        } else {
-                            echo '<span class="' . $requestStatusIcon . '" title="' . $requestStatus . '"></span> ';
+                    if (!empty($responseJson)) {
+                        /**
+                         *  If there was no packages to update
+                         */
+                        if ($responseJson['update']['status'] == 'nothing-to-do') {
+                            $responseDetails = 'No packages to update';
                         }
-                    } ?>
-                </div>
-
-                <div>
-                    <p><b><?= DateTime::createFromFormat('Y-m-d', $item['Date'])->format('d-m-Y') ?></b></p>
-                    <p class="lowopacity-cst"><?= $item['Time']; ?>
-                </div>
 
-                <div>
-                    <p title="<?= $requestTitle ?>"><?= $requestString ?></p>
-
-                    <p class="lowopacity-cst">
-                        <?php
-                        echo $requestStatus;
-
-                        if (!empty($requestInfo)) {
-                            echo ' - ' . $requestInfo;
+                        /**
+                         *  If there was packages to update, retrieve the number of packages updated
+                         */
+                        if ($responseJson['update']['status'] == 'done' or $responseJson['update']['status'] == 'failed') {
+                            $successCount = $responseJson['update']['success']['count'];
+                            $failedCount  = $responseJson['update']['failed']['count'];
+
+                            // If the update was successful
+                            if ($responseJson['update']['status'] == 'done') {
+                                $requestStatus = 'Successful';
+                                $requestStatusIcon = 'check.svg';
+                            }
+
+                            // If the update failed
+                            if ($responseJson['update']['status'] == 'failed') {
+                                $requestStatus = 'Failed with errors';
+                                $requestStatusIcon = 'error.svg';
+                            }
+
+                            // If there was packages updated AND packages failed
+                            if ($successCount >= 1 and $failedCount >= 1) {
+                                $requestStatus = 'Partial success';
+                                $requestStatusIcon = 'warning.svg';
+                            }
+
+                            // If there was no packages updated AND packages failed
+                            if ($successCount == 0 and $failedCount >= 1) {
+                                $requestStatus = 'Failed';
+                                $requestStatusIcon = 'error.svg';
+                            }
+
+                            // Build a short info message
+                            $responseDetails .= $successCount . ' package(s) updated, ' . $failedCount . ' failed';
+
+                            // Retrieve the list of packages updated
+                            $successPackages = $responseJson['update']['success']['packages'];
+
+                            // Retrieve the list of packages failed
+                            $failedPackages = $responseJson['update']['failed']['packages'];
                         }
+                    }
+                }
 
-                        if (!empty($responseDetails)) {
-                            echo ' - ' . $responseDetails;
-                        } ?>
-                    </p>
-                </div>
+                /**
+                 *  Add accent color based on status
+                 */
+                if ($item['Status'] == 'completed' or $requestStatus == 'Successful') {
+                    $class .= ' request-accent-green';
+                } elseif ($item['Status'] == 'failed' or $item['Status'] == 'canceled' or $requestStatus == 'Failed' or $requestStatus == 'Failed with errors') {
+                    $class .= ' request-accent-red';
+                } elseif ($requestStatus == 'Partial success') {
+                    $class .= ' request-accent-yellow';
+                }
 
-                <div class="flex align-item-center justify-end column-gap-15">
-                    <?php
-                    if (!empty($dryRun) and $dryRun) {
-                        echo '<img class="icon-np lowopacity-cst" src="/assets/icons/build.svg" title="Task as been executed in dry-run mode">';
-                    }
+                if ($request == 'request-packages-update' or $request == 'request-all-packages-update') {
+                    $class .= ' request-show-more-info-btn pointer';
+                }
 
-                    if (file_exists(WS_REQUESTS_LOGS_DIR . '/request-' . $item['Id'] . '.log')) : ?>
-                        <img class="icon-lowopacity request-show-log-btn" request-id="<?= $item['Id'] ?>" src="/assets/icons/view.svg" title="Show global log">
-                        <?php
-                    endif;
+                // If the request was a profile update or a disconnect, skip it
+                if ($request == 'update-profile' or $request == 'disconnect') {
+                    continue;
+                } ?>
 
-                    if ($item['Status'] == 'new') : ?>
-                        <img class="icon-lowopacity cancel-request-btn" src="/assets/icons/delete.svg" request-id="<?= $item['Id'] ?>" title="Cancel request">
+                <div class="<?= $class ?>" request-id="<?= $item['Id'] ?>">
+                    <div class="flex align-item-center column-gap-15">
                         <?php
-                    endif ?>
-                </div>
-            </div>
+                        if (!empty($requestStatusIcon)) {
+                            if (str_ends_with($requestStatusIcon, '.svg')) {
+                                echo '<img class="icon-np" src="/assets/icons/' . $requestStatusIcon . '" title="' . $requestStatus . '">';
+                            } else {
+                                echo '<span class="' . $requestStatusIcon . '" title="' . $requestStatus . '"></span> ';
+                            }
+                        } ?>
 
-            <div class="request-details details-div hide margin-bottom-10" request-id="<?= $item['Id'] ?>">
-                <?php
-                /**
-                 *  If there are update params
-                 */
-                if (!empty($requestData['update-params'])) : ?>
-                    <div class="grid grid-4 column-gap-15 row-gap-15 justify-space-between">
                         <div>
-                            <h6 class="margin-top-0">DRY RUN</h6>
-                            <?php
-                            if (isset($dryRun)) {
-                                if ($dryRun) {
-                                    echo '<p>Enabled</p>';
-                                } else {
-                                    echo '<p>Disabled</p>';
-                                }
-                            } ?>
+                            <p><b><?= DateTime::createFromFormat('Y-m-d', $item['Date'])->format('d-m-Y') ?></b> <span class="lowopacity-cst"><?= $item['Time']; ?></span></p>
+                            <p class="lowopacity-cst" title="<?= $requestTitle ?>"><?= $requestString ?></p>
                         </div>
+                    </div>
 
-                        <div>
-                            <h6 class="margin-top-0">IGNORE EXCLUSIONS</h6>
+                    <div class="flex align-item-center column-gap-10">
+                        <p class="lowopacity-cst font-size-12">
                             <?php
-                            if (isset($ignoreExclusions)) {
-                                if ($ignoreExclusions) {
-                                    echo '<p>Enabled</p>';
-                                } else {
-                                    echo '<p>Disabled</p>';
-                                }
+                            echo $requestStatus;
+
+                            if (!empty($requestInfo)) {
+                                echo ' - ' . $requestInfo;
+                            }
+
+                            if (!empty($responseDetails)) {
+                                echo ' - ' . $responseDetails;
                             } ?>
-                        </div>
+                        </p>
+                    </div>
 
-                        <div>
-                            <h6 class="margin-top-0">FULL UPGRADE</h6>
+                    <div class="flex align-item-center justify-end column-gap-15">
+                        <?php
+                        if (!empty($dryRun) and $dryRun) {
+                            echo '<img class="icon-np lowopacity-cst" src="/assets/icons/build.svg" title="Task as been executed in dry-run mode">';
+                        }
+
+                        if (file_exists(WS_REQUESTS_LOGS_DIR . '/request-' . $item['Id'] . '.log')) : ?>
+                            <img class="icon-lowopacity request-show-log-btn" request-id="<?= $item['Id'] ?>" src="/assets/icons/view.svg" title="Show global log">
                             <?php
-                            if (isset($fullUpgrade)) {
-                                if ($fullUpgrade) {
-                                    echo '<p>Enabled</p>';
-                                } else {
-                                    echo '<p>Disabled</p>';
-                                }
-                            } ?>
-                        </div>
+                        endif;
 
-                        <div>
-                            <h6 class="margin-top-0">KEEP CONFIG FILES</h6>
+                        if ($item['Status'] == 'new') : ?>
+                            <img class="icon-lowopacity cancel-request-btn" src="/assets/icons/delete.svg" request-id="<?= $item['Id'] ?>" title="Cancel request">
                             <?php
-                            if (isset($keepConfigFiles)) {
-                                if ($keepConfigFiles) {
-                                    echo '<p>Enabled</p>';
-                                } else {
-                                    echo '<p>Disabled</p>';
-                                }
-                            } ?>
-                        </div>
+                        endif ?>
                     </div>
-                    <br>
-                    <?php
-                endif;
+                </div>
 
-                /**
-                 *  If there was packages updated
-                 */
-                if (!empty($successPackages)) :
-                    $icon = 'update-yellow.svg';
-                    $title = count($successPackages) . ' package' . (count($successPackages) > 1 ? 's' : '') . ' updated';
-                    include(ROOT . '/views/includes/labels/label-icon-tr.inc.php'); ?>
+                <div class="request-details details-div hide margin-bottom-10" request-id="<?= $item['Id'] ?>">
+                    <?php
+                    /**
+                     *  If there are update params
+                     */
+                    if (!empty($requestData['update-params'])) : ?>
+                        <div class="grid grid-4 column-gap-15 row-gap-15 justify-space-between">
+                            <div>
+                                <h6 class="margin-top-0">DRY RUN</h6>
+                                <?php
+                                if (isset($dryRun)) {
+                                    if ($dryRun) {
+                                        echo '<p>Enabled</p>';
+                                    } else {
+                                        echo '<p>Disabled</p>';
+                                    }
+                                } ?>
+                            </div>
 
-                    <div class="grid grid-3 row-gap-10 justify-space-between margin-top-15 margin-bottom-15 margin-left-10">
-                        <?php
-                        // Print each package with its version and log
-                        foreach ($successPackages as $package => $details) : ?>
-                            <div class="flex align-flex-start column-gap-5">
-                                <?= \Controllers\Utils\Generate\Html\Icon::product($package) ?>
-                                <p class="get-package-timeline pointer wordbreakall copy" hostid="<?= $id ?>" packagename="<?= $package ?>" title="See package timeline"><?= $package ?></p>
+                            <div>
+                                <h6 class="margin-top-0">IGNORE EXCLUSIONS</h6>
+                                <?php
+                                if (isset($ignoreExclusions)) {
+                                    if ($ignoreExclusions) {
+                                        echo '<p>Enabled</p>';
+                                    } else {
+                                        echo '<p>Disabled</p>';
+                                    }
+                                } ?>
                             </div>
 
-                            <p class="wordbreakall copy"><?= $details['version'] ?></p>
+                            <div>
+                                <h6 class="margin-top-0">FULL UPGRADE</h6>
+                                <?php
+                                if (isset($fullUpgrade)) {
+                                    if ($fullUpgrade) {
+                                        echo '<p>Enabled</p>';
+                                    } else {
+                                        echo '<p>Disabled</p>';
+                                    }
+                                } ?>
+                            </div>
 
-                            <p class="text-right">
+                            <div>
+                                <h6 class="margin-top-0">KEEP CONFIG FILES</h6>
                                 <?php
-                                if (!empty($details['log'])) : ?>
-                                    <img class="icon-lowopacity request-show-package-log-btn" request-id="<?= $item['Id'] ?>" package="<?= $package ?>" status="success" src="/assets/icons/view.svg" title="Show package log" />
-                                    <?php
-                                endif ?>
-                            </p>
+                                if (isset($keepConfigFiles)) {
+                                    if ($keepConfigFiles) {
+                                        echo '<p>Enabled</p>';
+                                    } else {
+                                        echo '<p>Disabled</p>';
+                                    }
+                                } ?>
+                            </div>
+                        </div>
+                        <br>
+                        <?php
+                    endif;
+
+                    /**
+                     *  If there was packages updated
+                     */
+                    if (!empty($successPackages)) :
+                        $icon = 'update-yellow.svg';
+                        $title = count($successPackages) . ' package' . (count($successPackages) > 1 ? 's' : '') . ' updated';
+                        include(ROOT . '/views/includes/labels/label-icon-tr.inc.php'); ?>
+
+                        <div class="grid grid-3 row-gap-10 justify-space-between margin-top-15 margin-bottom-15 margin-left-10">
                             <?php
-                        endforeach ?>
-                    </div>
-                    <?php
-                endif;
+                            // Print each package with its version and log
+                            foreach ($successPackages as $package => $details) : ?>
+                                <div class="flex align-flex-start column-gap-5">
+                                    <?= \Controllers\Utils\Generate\Html\Icon::product($package) ?>
+                                    <p class="get-package-timeline pointer wordbreakall copy" hostid="<?= $id ?>" packagename="<?= $package ?>" title="See package timeline"><?= $package ?></p>
+                                </div>
 
-                /**
-                 *  If there was packages failed
-                 */
-                if (!empty($failedPackages)) :
-                    $icon = 'warning-red.svg';
-                    $title = count($failedPackages) . ' package' . (count($failedPackages) > 1 ? 's' : '') . ' failed';
-                    include(ROOT . '/views/includes/labels/label-icon-tr.inc.php'); ?>
+                                <p class="wordbreakall copy"><?= $details['version'] ?></p>
 
-                    <div class="grid grid-3 row-gap-10 justify-space-between margin-top-15 margin-bottom-15 margin-left-10">
+                                <p class="text-right">
+                                    <?php
+                                    if (!empty($details['log'])) : ?>
+                                        <img class="icon-lowopacity request-show-package-log-btn" request-id="<?= $item['Id'] ?>" package="<?= $package ?>" status="success" src="/assets/icons/view.svg" title="Show package log" />
+                                        <?php
+                                    endif ?>
+                                </p>
+                                <?php
+                            endforeach ?>
+                        </div>
                         <?php
-                        // Print each package with its version and log
-                        foreach ($failedPackages as $package => $details) : ?>
-                            <div class="flex align-flex-start column-gap-5">
-                                <?= \Controllers\Utils\Generate\Html\Icon::product($package) ?>
-                                <p class="get-package-timeline pointer wordbreakall copy" hostid="<?= $id ?>" packagename="<?= $package ?>" title="See package timeline"><?= $package ?></p>
-                            </div>
+                    endif;
 
-                            <p class="wordbreakall copy"><?= $details['version'] ?></p>
+                    /**
+                     *  If there was packages failed
+                     */
+                    if (!empty($failedPackages)) :
+                        $icon = 'warning-red.svg';
+                        $title = count($failedPackages) . ' package' . (count($failedPackages) > 1 ? 's' : '') . ' failed';
+                        include(ROOT . '/views/includes/labels/label-icon-tr.inc.php'); ?>
 
-                            <p class="text-right">
-                                <?php
-                                if (!empty($details['log'])) : ?>
-                                    <img class="icon-lowopacity request-show-package-log-btn" request-id="<?= $item['Id'] ?>" package="<?= $package ?>" status="failed" src="/assets/icons/view.svg" title="Show package log" />
-                                    <?php
-                                endif ?>
-                            </p>
+                        <div class="grid grid-3 row-gap-10 justify-space-between margin-top-15 margin-bottom-15 margin-left-10">
                             <?php
-                        endforeach ?>
-                    </div>
-                    <?php
-                endif ?>
-            </div>
-            <?php
-        endforeach; ?>
+                            // Print each package with its version and log
+                            foreach ($failedPackages as $package => $details) : ?>
+                                <div class="flex align-flex-start column-gap-5">
+                                    <?= \Controllers\Utils\Generate\Html\Icon::product($package) ?>
+                                    <p class="get-package-timeline pointer wordbreakall copy" hostid="<?= $id ?>" packagename="<?= $package ?>" title="See package timeline"><?= $package ?></p>
+                                </div>
+
+                                <p class="wordbreakall copy"><?= $details['version'] ?></p>
+
+                                <p class="text-right">
+                                    <?php
+                                    if (!empty($details['log'])) : ?>
+                                        <img class="icon-lowopacity request-show-package-log-btn" request-id="<?= $item['Id'] ?>" package="<?= $package ?>" status="failed" src="/assets/icons/view.svg" title="Show package log" />
+                                        <?php
+                                    endif ?>
+                                </p>
+                                <?php
+                            endforeach ?>
+                        </div>
+                        <?php
+                    endif ?>
+                </div>
+                <?php
+            endforeach; ?>
+        </div>
         
         <div class="flex justify-end margin-top-10">
             <?php \Controllers\Layout\Table\Render::paginationBtn($reloadableTableCurrentPage, $reloadableTableTotalPages); ?>
diff --git a/www/views/includes/tables/repos/sources/gpgkeys.inc.php b/www/views/includes/tables/repos/sources/gpgkeys.inc.php
index 96b84698d..a7653ebc3 100644
--- a/www/views/includes/tables/repos/sources/gpgkeys.inc.php
+++ b/www/views/includes/tables/repos/sources/gpgkeys.inc.php
@@ -12,7 +12,7 @@
 
         <?php
         foreach ($reloadableTableContent as $item) : ?>
-            <div class="table-container grid-fr-4-1 bck-blue-alt">
+            <div class="table-container-2 panel-list-item">
                 <div>
                     <p title="Key name"><?= $item['name'] ?></p>
                     <p title="Key ID" class="lowopacity-cst copy"><?= $item['id'] ?></p>
diff --git a/www/views/includes/tables/repos/sources/list.inc.php b/www/views/includes/tables/repos/sources/list.inc.php
index d27f7f505..bf4dd1fa6 100644
--- a/www/views/includes/tables/repos/sources/list.inc.php
+++ b/www/views/includes/tables/repos/sources/list.inc.php
@@ -18,7 +18,7 @@
             <p class="empty-state-title">No source repository configured yet.</p>
             <p class="note">Import a predefined list to get started quickly, or add a source repository manually.</p>
             <div class="empty-state-actions">
-                <button type="button" class="btn-medium-blue get-panel-btn" panel="repos/sources/import">Import</button>
+                <button type="button" class="btn-medium-green get-panel-btn" panel="repos/sources/import">Import</button>
                 <button type="button" class="btn-medium-tr get-panel-btn" panel="repos/sources/new">Manually add</button>
             </div>
         </div>
@@ -48,6 +48,8 @@
 
             // Case it is a deb source repository
             if ($type == 'deb') {
+                $accent = 'red';
+
                 if (isset($definition['distributions'])) {
                     $distAndComponent = $definition['distributions'];
                 }
@@ -55,6 +57,8 @@
 
             // Case it is a rpm source repository
             if ($type == 'rpm') {
+                $accent = 'blue';
+
                 if (isset($definition['releasever'])) {
                     $releasevers = $definition['releasever'];
                 }
@@ -71,17 +75,7 @@
                 $sslCaCertificate = $definition['ssl-authentication']['ca-certificate'];
             } ?>
 
-            <div class="table-container-3 bck-blue-alt pointer source-repo-edit-param-btn" source-id="<?= $item['Id'] ?>">
-                <div>
-                    <?php
-                    if ($type == 'rpm') {
-                        echo ' <span class="label-pkg-rpm">rpm</span>';
-                    }
-                    if ($type == 'deb') {
-                        echo ' <span class="label-pkg-deb">deb</span>';
-                    } ?>
-                </div>
-
+            <div class="table-container-2 panel-list-item accent-<?= $accent ?> pointer source-repo-edit-param-btn" source-id="<?= $item['Id'] ?>">
                 <div>
                     <p><?= $name ?></p>
                     <?php
diff --git a/www/views/includes/tables/tasks/list-children.inc.php b/www/views/includes/tables/tasks/list-children.inc.php
new file mode 100644
index 000000000..c4d9e0175
--- /dev/null
+++ b/www/views/includes/tables/tasks/list-children.inc.php
@@ -0,0 +1,5 @@
+<?php
+$taskTableType = 'sub-tasks';
+
+// Include the list.inc.php which is a common file for all scheduled, running, done and sub-tasks
+include('list.inc.php');
diff --git a/www/views/includes/tables/tasks/list-done.inc.php b/www/views/includes/tables/tasks/list-done.inc.php
index 5e9f3d2c8..a600ae467 100644
--- a/www/views/includes/tables/tasks/list-done.inc.php
+++ b/www/views/includes/tables/tasks/list-done.inc.php
@@ -1,7 +1,5 @@
 <?php
 $taskTableType = 'done';
 
-/**
- *  Include the list.inc.php which is a common file for all scheduled, running and done tasks
- */
+// Include the list.inc.php which is a common file for all scheduled, running and done tasks
 include('list.inc.php');
diff --git a/www/views/includes/tables/tasks/list-queued.inc.php b/www/views/includes/tables/tasks/list-queued.inc.php
index 1448ded7d..aa377d379 100644
--- a/www/views/includes/tables/tasks/list-queued.inc.php
+++ b/www/views/includes/tables/tasks/list-queued.inc.php
@@ -1,7 +1,5 @@
 <?php
 $taskTableType = 'queued';
 
-/**
- *  Include the list.inc.php which is a common file for all scheduled, running and done tasks
- */
+// Include the list.inc.php which is a common file for all scheduled, running and done tasks
 include('list.inc.php');
diff --git a/www/views/includes/tables/tasks/list-running.inc.php b/www/views/includes/tables/tasks/list-running.inc.php
index f16345842..5deacf612 100644
--- a/www/views/includes/tables/tasks/list-running.inc.php
+++ b/www/views/includes/tables/tasks/list-running.inc.php
@@ -1,7 +1,5 @@
 <?php
 $taskTableType = 'running';
 
-/**
- *  Include the list.inc.php which is a common file for all scheduled, running and done tasks
- */
+// Include the list.inc.php which is a common file for all scheduled, running and done tasks
 include('list.inc.php');
diff --git a/www/views/includes/tables/tasks/list-scheduled.inc.php b/www/views/includes/tables/tasks/list-scheduled.inc.php
index 3324ac3b8..ab0172208 100644
--- a/www/views/includes/tables/tasks/list-scheduled.inc.php
+++ b/www/views/includes/tables/tasks/list-scheduled.inc.php
@@ -1,7 +1,5 @@
 <?php
 $taskTableType = 'scheduled';
 
-/**
- *  Include the list.inc.php which is a common file for all scheduled, running and done tasks
- */
+// Include the list.inc.php which is a common file for all scheduled, running and done tasks
 include('list.inc.php');
diff --git a/www/views/includes/tables/tasks/list.inc.php b/www/views/includes/tables/tasks/list.inc.php
index 199a8c18e..39c08bda5 100644
--- a/www/views/includes/tables/tasks/list.inc.php
+++ b/www/views/includes/tables/tasks/list.inc.php
@@ -1,343 +1,378 @@
+<?php
+use \Controllers\User\Permission\Task as TaskPermission;
+use \Controllers\Layout\Table\Render as TableRender;
+use \Controllers\Utils\Generate\Html\Label;
+use \Controllers\Task\Task; ?>
+
 <div class="reloadable-table" table="<?= $table ?>" offset="<?= $reloadableTableOffset ?>">
     <?php
     if (!empty($reloadableTableContent)) : ?>
-        <div class="flex align-item-center justify-space-between">
-            <h6 class="margin-top-0 margin-bottom-5"><?= strtoupper($taskTableType) ?></h6>
+        <div class="flex align-item-center column-gap-20 margin-bottom-10">
+            <h6 class="margin-top-0 margin-bottom-0"><?= strtoupper($taskTableType) ?></h6>
 
             <?php
-            if (in_array($taskTableType, ['scheduled', 'queued'])) : ?>
-                <div class="flex justify-end margin-bottom-10 margin-right-15">
-                    <input type="checkbox" class="select-all-checkbox lowopacity" checkbox-id="<?= $taskTableType . '-task' ?>" title="Select all" />
+            // Print Select all checkbox for scheduled and queued tasks if there are more than 1 task
+            if (in_array($taskTableType, ['scheduled', 'queued']) and (count($reloadableTableContent) > 1)) : ?>
+                <div class="select-all-btn task-select-all-btns btn-fit-tr align-item-center column-gap-8 pointer" checkbox-id="<?= $taskTableType . '-task' ?>" title="Select all">
+                    <span>Select all</span>
+                    <input type="checkbox" class="select-all-checkbox" checkbox-id="<?= $taskTableType . '-task' ?>" title="Select all" aria-hidden="true" tabindex="-1" />
                 </div>
                 <?php
             endif ?>
         </div>
 
-        <?php
-        foreach ($reloadableTableContent as $item) :
-            $headerColor = '';
-            $actionBtn = 'show-task-btn';
-
-            /**
-             *  Retrieve task parameters
-             */
-            $taskRawParams = json_decode($item['Raw_params'], true);
-
-            /**
-             *  If the current task item was made in a scheduled task, we display the scheduled task header
-             */
-            if (in_array($item['Status'], ['scheduled', 'queued', 'disabled'])) {
-                $headerColor = 'header-blue-min';
-                $actionBtn = 'show-scheduled-task-info-btn';
-            }
-
-            $tableClass = 'table-container grid-40p-45p-10p column-gap-10 justify-space-between pointer ' . $actionBtn . ' ' . $headerColor; ?>
-
-            <div class="<?= $tableClass ?>" task-id="<?= $item['Id'] ?>" title="View task details">
-                <div class="flex align-item-center column-gap-15">
-                    <div>
-                        <?php
-                        if ($taskRawParams['action'] == 'create') {
-                            $icon = 'plus';
-
-                            /**
-                             *  To keep compatibility with old tasks (old operations table)
-                             *  TODO: delete this in 1year
-                             */
-                            if (!isset($taskRawParams['repo-type'])) {
-                                $actionTitle = 'New repository';
-                            } else {
-                                if ($taskRawParams['repo-type'] == 'local') {
-                                    $actionTitle = 'New local repository';
-                                }
-                                if ($taskRawParams['repo-type'] == 'mirror') {
-                                    $actionTitle = 'New mirror repository';
-                                }
-                            }
-                        }
+        <div class="flex flex-direction-column row-gap-10">
+            <?php
+            // Parent tasks have no status of their own, their real status is a summary of their sub-tasks statuses
+            $subTasksSummaries = $taskListingController->getSubTasksSummaries(array_column($reloadableTableContent, 'Id'));
+
+            foreach ($reloadableTableContent as $item) :
+                $taskAccent = '';
+
+                // Retrieve task parameters
+                try {
+                    $taskRawParams = json_decode($item['Raw_params'], true, 512, JSON_THROW_ON_ERROR);
+                } catch (JsonException $e) {
+                    echo '<p class="note">Error decoding task #' . $item['Id'] . ' parameters: ' . $e->getMessage() . '</p>';
+                    continue;
+                }
+
+                $subTasksSummary = $subTasksSummaries[$item['Id']] ?? [];
+                $itemStatus = !empty($subTasksSummary) ? $subTasksSummary['status'] : $item['Status'];
+
+                // Determine status accent color
+                if ($itemStatus == 'done') {
+                    $taskAccent = 'accent-green';
+                } elseif ($itemStatus == 'error' or $itemStatus == 'stopped') {
+                    $taskAccent = 'accent-red';
+                } elseif ($itemStatus == 'running') {
+                    $taskAccent = 'accent-cyan';
+                } elseif ($itemStatus == 'queued') {
+                    $taskAccent = 'accent-yellow';
+                } elseif ($itemStatus == 'scheduled') {
+                    $taskAccent = 'accent-orange';
+                }
+
+                // Determine action title and icon
+                $icon = 'plus';
+                $actionTitle = Task::generateLiteralAction($taskRawParams['action']);
+
+                if ($taskRawParams['action'] == 'create') {
+                    $icon = 'plus';
+                    if (!isset($taskRawParams['repo-type'])) {
+                        $actionTitle = 'New repository';
+                    } else {
+                        $actionTitle = $taskRawParams['repo-type'] == 'local' ? 'New local repository' : 'New mirror repository';
+                    }
+                }
+                if ($taskRawParams['action'] == 'update') {
+                    $icon = 'update';
+                }
+                if ($taskRawParams['action'] == 'rebuild') {
+                    $icon = 'update';
+                }
+                if ($taskRawParams['action'] == 'rename') {
+                    $icon = 'edit';
+                }
+                if ($taskRawParams['action'] == 'env') {
+                    $icon = 'link';
+                }
+                if ($taskRawParams['action'] == 'duplicate') {
+                    $icon = 'duplicate';
+                }
+                if ($taskRawParams['action'] == 'delete') {
+                    $icon = 'delete';
+                }
+                if ($taskRawParams['action'] == 'removeEnv') {
+                    $icon = 'delete';
+                }
+                if ($itemStatus == 'running') {
+                    $icon = 'loading';
+                }
+
+                // Determine click behavior class
+                $actionBtn = in_array($item['Status'], ['scheduled', 'queued', 'disabled']) ? 'task-item-selectable' : ''; ?>
+
+                <div class="task-item <?= $taskAccent ?> <?= $actionBtn ?> pointer" task-id="<?= $item['Id'] ?>" title="<?= in_array($item['Status'], ['scheduled', 'queued', 'disabled']) ? 'Click to select' : 'View task details' ?>">
+                    <a <?= in_array($item['Status'], ['scheduled', 'queued', 'disabled']) ? '' : 'href="/task/' . $item['Id'] . '"'; ?>>
+                        <div class="flex align-item-center column-gap-20">
+                            <?php
+                            // Checkbox for scheduled/queued tasks (hidden like snap checkboxes)
+                            if (in_array($item['Status'], ['scheduled', 'queued', 'disabled'])) :
+                                if (TaskPermission::allowedAction('delete')) : ?>
+                                    <input type="checkbox" class="task-checkbox-input child-checkbox" checkbox-id="<?= $taskTableType ?>-task" checkbox-data-attribute="task-id" task-id="<?= $item['Id'] ?>" title="Select task" />
+                                    <?php
+                                endif;
+                            endif ?>
 
-                        if ($taskRawParams['action'] == 'update') {
-                            $icon = 'update';
-                            $actionTitle = 'Update repository';
-                        }
+                            <img class="icon-np <?= $itemStatus != 'running' ? 'icon-lowopacity' : '' ?>" src="/assets/icons/<?= $icon ?>.svg" title="<?= $actionTitle ?>" />
 
-                        if ($taskRawParams['action'] == 'rebuild') {
-                            $icon = 'update';
-                            $actionTitle = 'Rebuild metadata';
-                        }
+                            <div class="flex flex-direction-column row-gap-2">
+                                <?php
+                                // Date and time for immediate tasks
+                                if (!empty($item['Date']) and !empty($item['Time'])) : ?>
+                                    <p class="task-item-date"><?= $item['Status'] == 'scheduled' ? 'Last execution: ' : '' ?><?= DateTime::createFromFormat('Y-m-d', $item['Date'])->format('d-m-Y') ?> <?= $item['Time'] ?></p>
+                                    <?php
+                                endif;
 
-                        if ($taskRawParams['action'] == 'rename') {
-                            $icon = 'edit';
-                            $actionTitle = 'Rename repository';
-                        }
+                                if ($item['Status'] == 'queued') : ?>
+                                    <div class="flex align-item-center column-gap-8">
+                                        <span class="mediumopacity-cst">Task #<?= $item['Id'] ?></span>
+                                        <span class="label-yellow">Pending</span>
+                                    </div>
+                                    <?php
+                                endif;
+
+                                // Schedule info for scheduled tasks
+                                if ($item['Type'] == 'scheduled') : ?>
+                                    <div class="task-item-schedule flex align-item-center column-gap-8">
+                                        <span class="mediumopacity-cst">
+                                            <?php
+                                            if ($taskRawParams['schedule']['schedule-type'] == 'unique') {
+                                                echo 'Scheduled on ' . DateTime::createFromFormat('Y-m-d', $taskRawParams['schedule']['schedule-date'])->format('d-m-Y') . ' ' . $taskRawParams['schedule']['schedule-time'] . ':00';
+                                            }
+                                            if ($taskRawParams['schedule']['schedule-type'] == 'recurring') {
+                                                $scheduleTime = ' at ' . htmlspecialchars($taskRawParams['schedule']['schedule-time'] ?? '', ENT_QUOTES, 'UTF-8') . ':00';
+
+                                                if ($taskRawParams['schedule']['schedule-frequency'] == 'hourly') {
+                                                    echo 'Hourly';
+                                                }
+                                                if ($taskRawParams['schedule']['schedule-frequency'] == 'daily') {
+                                                    echo 'Daily' . $scheduleTime;
+                                                }
+                                                if ($taskRawParams['schedule']['schedule-frequency'] == 'weekly') {
+                                                    echo 'Weekly' . $scheduleTime;
+                                                }
+                                                if ($taskRawParams['schedule']['schedule-frequency'] == 'monthly') {
+                                                    echo 'Monthly' . $scheduleTime;
+                                                }
+                                                if ($taskRawParams['schedule']['schedule-frequency'] == 'cron') {
+                                                    echo 'Cron: ' . htmlspecialchars($taskRawParams['schedule']['schedule-cron'] ?? '', ENT_QUOTES, 'UTF-8');
+                                                }
+                                            } ?>
+                                        </span>
+
+                                        <?php
+                                        // If task date schedule is in the past, print a label
+                                        if (!empty($taskRawParams['schedule']['schedule-date']) and !empty($taskRawParams['schedule']['schedule-time']) and $item['Status'] == 'scheduled') {
+                                            $taskDateTime = DateTime::createFromFormat('Y-m-d H:i:s', $taskRawParams['schedule']['schedule-date'] . ' ' . $taskRawParams['schedule']['schedule-time'] . ':00');
+                                            $now = new DateTime();
+
+                                            if ($taskDateTime < $now) {
+                                                echo '<span class="label-red" title="This task is scheduled in the past and will not be executed">Past schedule</span>';
+                                            }
+                                        }
 
-                        if ($taskRawParams['action'] == 'env') {
-                            $icon = 'link';
-                            $actionTitle = 'Point an environment';
-                        }
+                                        // If the task is disabled, print a label
+                                        if ($item['Status'] == 'disabled') : ?>
+                                            <span class="label-white">Disabled</span>
+                                            <?php
+                                        endif;
+
+                                        // If the task is scheduled, queued or disabled, print a button to view its parameters
+                                        if (in_array($item['Status'], ['scheduled', 'queued', 'disabled']) and $item['Type'] == 'scheduled') {
+                                            echo '<img class="icon-lowopacity show-scheduled-task-info-btn" src="/assets/icons/view.svg" task-id="' . $item['Id'] . '" title="Show task details" />';
+                                        } ?>
+                                    </div>
+                                    <?php
+                                endif ?>
 
-                        if ($taskRawParams['action'] == 'duplicate') {
-                            $icon = 'duplicate';
-                            $actionTitle = 'Duplicate repository';
-                        }
+                                <span class="task-item-action mediumopacity-cst"><?= $actionTitle ?></span>
+                            </div>
+                        </div>
+                    </a>
 
-                        if ($taskRawParams['action'] == 'delete') {
-                            $icon = 'delete';
-                            $actionTitle = 'Delete repository';
-                        }
+                    <div class="task-item-repo">
+                        <?php
+                        // If the task has sub-tasks, print a summary of their results
+                        if (!empty($subTasksSummary)) {
+                            if ($subTasksSummary['status'] == 'error') {
+                                $subTasksLabel = 'label-red';
+                            } elseif ($subTasksSummary['status'] == 'running') {
+                                $subTasksLabel = 'label-yellow';
+                            } else {
+                                $subTasksLabel = 'label-green';
+                            }
 
-                        if ($taskRawParams['action'] == 'removeEnv') {
-                            $icon = 'delete';
-                            $actionTitle = 'Remove environment';
+                            echo '<a href="/task/' . $item['Id'] . '"><span class="' . $subTasksLabel . '" title="' . $subTasksSummary['success'] . ' sub-task(s) succeeded out of ' . $subTasksSummary['total'] . ', click to view">' . $subTasksSummary['success'] . '/' . $subTasksSummary['total'] . '</span></a>';
                         } ?>
 
-                        <img class="icon" src="/assets/icons/<?= $icon ?>.svg" title="<?= $actionTitle ?>" />
-                    </div>
+                        <span class="label-white"><?= $taskController->getRepo($item['Id']); ?></span>
 
-                    <div class="flex flex-direction-column row-gap-4">
                         <?php
-                        /**
-                         *  If task is immediate, display the date and time
-                         */
-                        if (!empty($item['Date']) and !empty($item['Time'])) :
-                            echo '<span><b>' . DateTime::createFromFormat('Y-m-d', $item['Date'])->format('d-m-Y') . ' ' . $item['Time'] . '</b></span>';
-                        endif;
-
-                        /**
-                         *  If task is scheduled
-                         */
-                        if ($item['Type'] == 'scheduled') :
-                            if (!empty($item['Date']) and !empty($item['Time'])) {
-                                $class = 'margin-top-5';
-                            } else {
-                                $class = '';
-                            } ?>
+                        if (in_array($taskRawParams['action'], ['env', 'removeEnv'])) {
+                            if (is_string($taskRawParams['env'])) {
+                                echo Label::envtag($taskRawParams['env']);
+                            }
 
-                            <span class="<?= $class ?>">
-                                <?php
-                                /**
-                                 *  Case it is a unique scheduled task
-                                 */
-                                if ($taskRawParams['schedule']['schedule-type'] == 'unique') {
-                                    echo 'Scheduled on<br>';
-                                    echo DateTime::createFromFormat('Y-m-d', $taskRawParams['schedule']['schedule-date'])->format('d-m-Y') . ' ' . $taskRawParams['schedule']['schedule-time'] . ':00';
+                            if (is_array($taskRawParams['env'])) {
+                                foreach ($taskRawParams['env'] as $env) {
+                                    echo Label::envtag($env);
                                 }
-
-                                /**
-                                 *  Case it is a recurring scheduled task
-                                 */
-                                if ($taskRawParams['schedule']['schedule-type'] == 'recurring') {
-                                    if ($taskRawParams['schedule']['schedule-frequency'] == 'hourly') {
-                                        echo 'Hourly scheduled task';
-                                    }
-
-                                    if ($taskRawParams['schedule']['schedule-frequency'] == 'daily') {
-                                        echo 'Daily scheduled task';
-                                    }
-
-                                    if ($taskRawParams['schedule']['schedule-frequency'] == 'weekly') {
-                                        echo 'Weekly scheduled task';
-                                    }
-
-                                    if ($taskRawParams['schedule']['schedule-frequency'] == 'monthly') {
-                                        echo 'Monthly scheduled task';
-                                    }
-
-                                    if ($taskRawParams['schedule']['schedule-frequency'] == 'cron') {
-                                        echo 'Cron scheduled task';
-                                    }
-                                } ?>
-                            </span>
-                            <?php
-                        endif ?>
-
-                        <span class="lowopacity-cst">
-                            <?= $actionTitle ?>
-                        </span>
+                            }
+                        } ?>
                     </div>
-                </div>
-  
-                <div class="flex row-gap-5 column-gap-5 flex-wrap">
-                    <span class="label-white">
-                        <?= $myTask->getRepo($item['Id']); ?>
-                    </span>
 
-                    <?php
-                    /**
-                     *  If action is 'env' or 'removeEnv', print environment
-                     */
-                    if (in_array($taskRawParams['action'], ['env', 'removeEnv'])) {
-                        if (is_string($taskRawParams['env'])) {
-                            echo \Controllers\Utils\Generate\Html\Label::envtag($taskRawParams['env']);
-                        }
-                        if (is_array($taskRawParams['env'])) {
-                            foreach ($taskRawParams['env'] as $env) {
-                                echo \Controllers\Utils\Generate\Html\Label::envtag($env);
+                    <div class="task-item-status">
+                        <?php
+                        // If the task is scheduled, queued or disabled, print a button to view its parameters
+                        // if (in_array($item['Status'], ['scheduled', 'queued', 'disabled']) and $item['Type'] == 'scheduled') {
+                        //     echo '<img class="icon-lowopacity show-scheduled-task-info-btn" src="/assets/icons/view.svg" task-id="' . $item['Id'] . '" title="Show task details" />';
+                        // }
+
+                        if (($item['Status'] == 'error' or $item['Status'] == 'stopped') and !empty($item['Id'])) {
+                            if (TaskPermission::allowedAction('relaunch')) {
+                                echo '<img class="icon-lowopacity relaunch-task-btn" src="/assets/icons/update.svg" task-id="' . $item['Id'] . '" title="Relaunch this task" />';
                             }
                         }
-                    } ?>
-                </div>
 
-                <div class="flex align-item-center justify-end column-gap-10 row-gap-10 flex-wrap">
-                    <?php
-                    // If task is a scheduled task and is disabled
-                    if ($item['Type'] == 'scheduled' and $item['Status'] == 'disabled') {
-                            echo '<img class="icon-np mediumopacity-cst" src="/assets/icons/pause.svg" title="Task execution is disabled" />';
-                    }
-
-                    // Print relaunch button if task has failed
-                    if (($item['Status'] == 'error' or $item['Status'] == 'stopped') and !empty($item['Id'])) {
-                        if (IS_ADMIN or in_array('relaunch', USER_PERMISSIONS['tasks']['allowed-actions'])) {
-                            echo '<img class="icon-lowopacity relaunch-task-btn" src="/assets/icons/update.svg" task-id="' . $item['Id'] . '" title="Relaunch this task with the same parameters." />';
+                        if ($item['Status'] == 'queued') {
+                            echo '<img class="icon-np" src="/assets/icons/pending.svg" title="Pending" />';
                         }
-                    }
 
-                    if ($item['Status'] == 'queued') {
-                        echo '<img class="icon-np" src="/assets/icons/pending.svg" title="Task is pending" />';
-                    }
-
-                    if ($item['Status'] == 'running') {
-                        if (IS_ADMIN or in_array('stop', USER_PERMISSIONS['tasks']['allowed-actions'])) {
-                            echo '<span title="Stop task" class="stop-task-btn" task-id="' . $item['Id'] . '"><img src="/assets/icons/stop.svg" class="icon-lowopacity"></span>';
-                        }
-                        echo '<img src="/assets/icons/loading.svg" class="icon-np" title="Task running" />';
-                    }
+                        if ($item['Status'] == 'running') {
+                            if (TaskPermission::allowedAction('stop')) {
+                                echo '<span title="Stop task" class="stop-task-btn" task-id="' . $item['Id'] . '"><img src="/assets/icons/stop.svg" class="icon-lowopacity"></span>';
+                            }
+                        } ?>
+                    </div>
+                </div>
 
-                    if ($item['Status'] == 'done') {
-                        echo '<img class="icon-np" src="/assets/icons/check.svg" title="Task completed" />';
-                    }
+                <?php
+                // If task is scheduled, print task info div
+                if ($item['Type'] == 'scheduled') : ?>
+                    <div class="scheduled-task-info div-generic-blue margin-bottom-10 hide" task-id="<?= $item['Id'] ?>">
+                        <div class="grid grid-2">
+                            <div>
+                                <h6 class="margin-top-0">SCHEDULE TYPE</h6>
+                                <?php
+                                if ($taskRawParams['schedule']['schedule-type'] == 'unique') : ?>
+                                    <p>Single execution</p>
+                                    <?php
+                                endif;
+                                if ($taskRawParams['schedule']['schedule-type'] == 'recurring') : ?>
+                                    <p>Recurring execution</p>
+                                    <?php
+                                endif ?>
+                            </div>
 
-                    if ($item['Status'] == 'error') {
-                        echo '<img class="icon-np" src="/assets/icons/error.svg" title="Task has failed" />';
-                    }
+                            <div>
+                                <?php
+                                if ($taskRawParams['schedule']['schedule-type'] == 'unique') : ?>
+                                    <h6 class="margin-top-0">SCHEDULE DATE</h6>
+                                    <p><?= DateTime::createFromFormat('Y-m-d', $taskRawParams['schedule']['schedule-date'])->format('d-m-Y') . ' ' . $taskRawParams['schedule']['schedule-time'] . ':00' ?></p>
+                                    <?php
+                                endif;
+                                if ($taskRawParams['schedule']['schedule-type'] == 'recurring') : ?>
+                                    <h6 class="margin-top-0">SCHEDULE FREQUENCY</h6>
+                                    <p>
+                                        <?php
+                                        if ($taskRawParams['schedule']['schedule-frequency'] == 'hourly') {
+                                            echo 'Every hour';
+                                        }
+                                        if ($taskRawParams['schedule']['schedule-frequency'] == 'daily') {
+                                            echo 'Every day at ' . $taskRawParams['schedule']['schedule-time'] . ':00';
+                                        }
+                                        if ($taskRawParams['schedule']['schedule-frequency'] == 'weekly') {
+                                            echo 'Every week on ' . implode(', ', $taskRawParams['schedule']['schedule-day']) . ' at ' . $taskRawParams['schedule']['schedule-time'] . ':00';
+                                        }
+                                        if ($taskRawParams['schedule']['schedule-frequency'] == 'monthly') {
+                                            echo 'Every ' . $taskRawParams['schedule']['schedule-monthly-day-position'] . ' ' . $taskRawParams['schedule']['schedule-monthly-day'] . ' of the month at ' . $taskRawParams['schedule']['schedule-time'] . ':00';
+                                        }
+                                        if ($taskRawParams['schedule']['schedule-frequency'] == 'cron') {
+                                            echo 'Cron: ' . htmlspecialchars($taskRawParams['schedule']['schedule-cron'] ?? '', ENT_QUOTES, 'UTF-8');
+                                        } ?>
+                                    </p>
+                                    <?php
+                                endif ?>
+                            </div>
+                        </div>
 
-                    if ($item['Status'] == 'stopped') {
-                        echo '<img class="icon-np" src="/assets/icons/warning-red.svg" title="Task stopped by the user" />';
-                    }
+                        <?php
+                        if ($taskRawParams['action'] == 'duplicate') : ?>
+                            <h6>DUPLICATE TO</h6>
+                            <p><?= $taskRawParams['name'] ?></p>
+                            <?php
+                        endif;
 
-                    /**
-                     *  Delete task button, only for scheduled and queued tasks
-                     */
-                    if (in_array($item['Status'], ['scheduled', 'queued', 'disabled'])) {
-                        if (IS_ADMIN or in_array('delete', USER_PERMISSIONS['tasks']['allowed-actions'])) {
-                            echo '<input type="checkbox" class="child-checkbox lowopacity" checkbox-id="' . $taskTableType . '-task" checkbox-data-attribute="task-id" task-id="' . $item['Id'] . '" title="Select scheduled task" />';
-                        }
-                    } ?>
-                </div>
-            </div>
+                        if ($taskRawParams['action'] == 'rename') : ?>
+                            <h6>RENAME TO</h6>
+                            <p><?= $taskRawParams['name'] ?></p>
+                            <?php
+                        endif ?>
 
-            <?php
-            /**
-             *  If task is scheduled, print task info div
-             */
-            if ($item['Type'] == 'scheduled') : ?>
-                <div class="scheduled-task-info details-div margin-bottom-10 hide" task-id="<?= $item['Id'] ?>">
-                    <div class="grid grid-2">
-                        <div>
-                            <h6 class="margin-top-0">SCHEDULE TYPE</h6>
+                        <div class="grid grid-2">
                             <?php
-                            // Case it is a unique scheduled task
-                            if ($taskRawParams['schedule']['schedule-type'] == 'unique') : ?>
-                                <p>Single execution</p>
+                            if (!empty($taskRawParams['arch'])) : ?>
+                                <div>
+                                    <h6>ARCHITECTURE</h6>
+                                    <div class="flex align-item-center row-gap-5 column-gap-5">
+                                        <?php
+                                        foreach ($taskRawParams['arch'] as $architecture) {
+                                            echo '<p>' . Label::white($architecture) . '</p>';
+                                        } ?>
+                                    </div>
+                                </div>
                                 <?php
                             endif;
 
-                            // Case it is a recurring scheduled task
-                            if ($taskRawParams['schedule']['schedule-type'] == 'recurring') : ?>
-                                <p>Recurring execution</p>
+                            if (!empty($taskRawParams['env'])) : ?>
+                                <div>
+                                    <h6>ENVIRONMENT</h6>
+                                    <div class="flex align-item-center row-gap-5 column-gap-5">
+                                        <?php
+                                        foreach ($taskRawParams['env'] as $env) {
+                                            echo '<p>' . Label::envtag($env) . '</p>';
+                                        } ?>
+                                    </div>
+                                </div>
                                 <?php
                             endif ?>
                         </div>
 
-                        <div>
+                        <div class="grid grid-2">
                             <?php
-                            // Case it is a unique scheduled task
-                            if ($taskRawParams['schedule']['schedule-type'] == 'unique') : ?>
-                                <h6 class="margin-top-0">SCHEDULE DATE</h6>
-                                <p><?=  DateTime::createFromFormat('Y-m-d', $taskRawParams['schedule']['schedule-date'])->format('d-m-Y') . ' ' . $taskRawParams['schedule']['schedule-time'] . ':00' ?></p>
+                            if (!empty($taskRawParams['gpg-check'])) : ?>
+                                <div>
+                                    <h6>CHECK GPG SIGNATURES</h6>
+                                    <div class="flex align-item-center column-gap-5">
+                                        <?php
+                                        if ($taskRawParams['gpg-check'] == 'true') {
+                                            echo '<img src="/assets/icons/check.svg" class="icon" />';
+                                            echo '<span>Enabled</span>';
+                                        } else {
+                                            echo '<img src="/assets/icons/error.svg" class="icon" />';
+                                            echo '<span>Disabled</span>';
+                                        } ?>
+                                    </div>
+                                </div>
                                 <?php
                             endif;
 
-                            // Case it is a recurring scheduled task
-                            if ($taskRawParams['schedule']['schedule-type'] == 'recurring') : ?>
-                                <h6 class="margin-top-0">SCHEDULE FREQUENCY</h6>
-                                <p>
-                                    <?php
-                                    if ($taskRawParams['schedule']['schedule-frequency'] == 'hourly') {
-                                        echo 'Every hour';
-                                    }
-
-                                    if ($taskRawParams['schedule']['schedule-frequency'] == 'daily') {
-                                        echo 'Every day at ' . $taskRawParams['schedule']['schedule-time'] . ':00';
-                                    }
-
-                                    if ($taskRawParams['schedule']['schedule-frequency'] == 'weekly') {
-                                        echo 'Every week on ' . implode(', ', $taskRawParams['schedule']['schedule-day']) . ' at ' . $taskRawParams['schedule']['schedule-time'] . ':00';
-                                    }
-
-                                    if ($taskRawParams['schedule']['schedule-frequency'] == 'monthly') {
-                                        echo 'Every ' . $taskRawParams['schedule']['schedule-monthly-day-position'] . ' ' . $taskRawParams['schedule']['schedule-monthly-day'] . ' of the month at ' . $taskRawParams['schedule']['schedule-time'] . ':00';
-                                    } ?>
-                                    <?php
-                                    if ($taskRawParams['schedule']['schedule-frequency'] == 'cron') {
-                                        echo 'Cron: ' . htmlspecialchars($taskRawParams['schedule']['schedule-cron'] ?? '', ENT_QUOTES, 'UTF-8');
-                                    } ?>
-                                </p>
+                            if (!empty($taskRawParams['gpg-sign'])) : ?>
+                                <div>
+                                    <h6>SIGN WITH GPG</h6>
+                                    <div class="flex align-item-center column-gap-5">
+                                        <?php
+                                        if ($taskRawParams['gpg-sign'] == 'true') {
+                                            echo '<img src="/assets/icons/check.svg" class="icon" />';
+                                            echo '<span>Enabled</span>';
+                                        } else {
+                                            echo '<img src="/assets/icons/error.svg" class="icon" />';
+                                            echo '<span>Disabled</span>';
+                                        } ?>
+                                    </div>
+                                </div>
                                 <?php
                             endif ?>
                         </div>
-                    </div>
-
-                    <?php
-                    if ($taskRawParams['action'] == 'duplicate') : ?>
-                        <h6>DUPLICATE TO</h6>
-                        <p><?= $taskRawParams['name'] ?></p>
-                        <?php
-                    endif;
-
-                    if ($taskRawParams['action'] == 'rename') : ?>
-                        <h6>RENAME TO</h6>
-                        <p><?= $taskRawParams['name'] ?></p>
-                        <?php
-                    endif ?>
-
-                    <div class="grid grid-2">
-                        <?php
-                        if (!empty($taskRawParams['arch'])) : ?>
-                            <div>
-                                <h6>ARCHITECTURE</h6>
-                                <div class="flex align-item-center row-gap-5 column-gap-5">
-                                    <?php
-                                    foreach ($taskRawParams['arch'] as $architecture) {
-                                        echo '<div><span class="label-black">' . $architecture . '</span></div>';
-                                    } ?>
-                                </div>
-                            </div>
-                            <?php
-                        endif;
 
-                        if (!empty($taskRawParams['env'])) : ?>
+                        <div class="grid grid-2">
                             <div>
-                                <h6>ENVIRONMENT</h6>
-                                <div class="flex align-item-center row-gap-5 column-gap-5">
-                                    <?php
-                                    foreach ($taskRawParams['env'] as $env) {
-                                        echo '<div>' . \Controllers\Utils\Generate\Html\Label::envtag($env) . '</div>';
-                                    } ?>
-                                </div>
-                            </div>
-                            <?php
-                        endif ?>
-                    </div>
-
-                    <div class="grid grid-2">
-                        <?php
-                        if (!empty($taskRawParams['gpg-check'])) : ?>
-                            <div>
-                                <h6>CHECK GPG SIGNATURES</h6>
+                                <h6>NOTIFY ON TASK ERROR</h6>
                                 <div class="flex align-item-center column-gap-5">
                                     <?php
-                                    if ($taskRawParams['gpg-check'] == 'true') {
+                                    if ($taskRawParams['schedule']['schedule-notify-error'] == 'true') {
                                         echo '<img src="/assets/icons/check.svg" class="icon" />';
                                         echo '<span>Enabled</span>';
                                     } else {
@@ -346,15 +381,12 @@
                                     } ?>
                                 </div>
                             </div>
-                            <?php
-                        endif;
 
-                        if (!empty($taskRawParams['gpg-sign'])) : ?>
                             <div>
-                                <h6>SIGN WITH GPG</h6>
+                                <h6>NOTIFY ON TASK SUCCESS</h6>
                                 <div class="flex align-item-center column-gap-5">
                                     <?php
-                                    if ($taskRawParams['gpg-sign'] == 'true') {
+                                    if ($taskRawParams['schedule']['schedule-notify-success'] == 'true') {
                                         echo '<img src="/assets/icons/check.svg" class="icon" />';
                                         echo '<span>Enabled</span>';
                                     } else {
@@ -363,80 +395,49 @@
                                     } ?>
                                 </div>
                             </div>
-                            <?php
-                        endif ?>
-                    </div>
-
-                    <div class="grid grid-2">
-                        <div>
-                            <h6>NOTIFY ON TASK ERROR</h6>
-                            <div class="flex align-item-center column-gap-5">
-                                <?php
-                                if ($taskRawParams['schedule']['schedule-notify-error'] == 'true') {
-                                    echo '<img src="/assets/icons/check.svg" class="icon" />';
-                                    echo '<span>Enabled</span>';
-                                } else {
-                                    echo '<img src="/assets/icons/error.svg" class="icon" />';
-                                    echo '<span>Disabled</span>';
-                                } ?>
-                            </div>
                         </div>
 
-                        <div>
-                            <h6>NOTIFY ON TASK SUCCESS</h6>
-                            <div class="flex align-item-center column-gap-5">
-                                <?php
-                                if ($taskRawParams['schedule']['schedule-notify-success'] == 'true') {
-                                    echo '<img src="/assets/icons/check.svg" class="icon" />';
-                                    echo '<span>Enabled</span>';
-                                } else {
-                                    echo '<img src="/assets/icons/error.svg" class="icon" />';
-                                    echo '<span>Disabled</span>';
-                                } ?>
+                        <div class="grid grid-2">
+                            <div>
+                                <h6>SEND A REMINDER</h6>
+                                <p>
+                                    <?php
+                                    if (empty($taskRawParams['schedule']['schedule-reminder'])) {
+                                        echo 'None';
+                                    } else {
+                                        foreach ($taskRawParams['schedule']['schedule-reminder'] as $reminder) {
+                                            if ($reminder == 1) {
+                                                echo '1 day before<br>';
+                                            } else {
+                                                echo $reminder . ' days before<br>';
+                                            }
+                                        }
+                                    } ?>
+                                </p>
                             </div>
-                        </div>
-                    </div>
 
-                    <div class="grid grid-2">
-                        <div>
-                            <h6>SEND A REMINDER</h6>
-                            <p>
-                                <?php
-                                if (empty($taskRawParams['schedule']['schedule-reminder'])) {
-                                    echo 'None';
-                                } else {
-                                    foreach ($taskRawParams['schedule']['schedule-reminder'] as $reminder) {
-                                        if ($reminder == 1) {
-                                            echo '1 day before<br>';
-                                        } else {
-                                            echo $reminder . ' days before<br>';
+                            <div>
+                                <h6>CONTACT</h6>
+                                <p>
+                                    <?php
+                                    if (empty($taskRawParams['schedule']['schedule-recipient'])) {
+                                        echo 'None';
+                                    } else {
+                                        foreach ($taskRawParams['schedule']['schedule-recipient'] as $recipient) {
+                                            echo $recipient . '<br>';
                                         }
-                                    }
-                                } ?>
-                            </p>
-                        </div>
-
-                        <div>
-                            <h6>CONTACT</h6>
-                            <p>
-                                <?php
-                                if (empty($taskRawParams['schedule']['schedule-recipient'])) {
-                                    echo 'None';
-                                } else {
-                                    foreach ($taskRawParams['schedule']['schedule-recipient'] as $recipient) {
-                                        echo $recipient . '<br>';
-                                    }
-                                } ?>
-                            </p>
+                                    } ?>
+                                </p>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <?php
-            endif;
-        endforeach; ?>
+                    <?php
+                endif;
+            endforeach; ?>
+        </div>
 
         <div class="flex justify-end margin-top-10">
-            <?php \Controllers\Layout\Table\Render::paginationBtn($reloadableTableCurrentPage, $reloadableTableTotalPages); ?>
+            <?php TableRender::paginationBtn($reloadableTableCurrentPage, $reloadableTableTotalPages); ?>
         </div>
 
         <br><br>
diff --git a/www/views/layout.html.php b/www/views/layout.html.php
index 6471302aa..823783083 100644
--- a/www/views/layout.html.php
+++ b/www/views/layout.html.php
@@ -3,28 +3,33 @@
     <?php include_once(ROOT . '/views/includes/head.inc.php'); ?>
 
     <body>
-        <div id="top"></div> <!-- to go to the top of the page -->
+        <div class="flex flex-1 column-gap-40">
+            <!-- Left side menu -->
+            <?php \Controllers\Layout\Container\Render::render('header/menu'); ?>
 
-        <?php
-            \Controllers\Layout\Container\Render::render('header/menu');
-            include_once(ROOT . '/views/includes/containers/header/general-error-messages.inc.php');
-            include_once(ROOT . '/views/includes/containers/header/general-log-messages.inc.php');
-            include_once(ROOT . '/views/includes/containers/header/service-status.inc.php');
-            include_once(ROOT . '/views/includes/containers/header/debug-mode.inc.php');
-            include_once(ROOT . '/views/includes/maintenance.inc.php');
-        ?>
+            <!-- Main content -->
+            <div id="main-column">
+                <article>
+                    <div id="menu-burger">
+                        <img src="/assets/icons/menu.svg" class="icon-large get-panel-btn" panel="header/menu-burger" title="Open menu" />
+                    </div>
 
-        <article>
-            <?= $content ?>
-        </article>
+                    <?php
+                        include_once(ROOT . '/views/includes/containers/header/general-error-messages.inc.php');
+                        include_once(ROOT . '/views/includes/containers/header/general-log-messages.inc.php');
+                        include_once(ROOT . '/views/includes/containers/header/service-status.inc.php');
+                        include_once(ROOT . '/views/includes/containers/header/debug-mode.inc.php');
+                        include_once(ROOT . '/views/includes/maintenance.inc.php');
+                    ?>
 
-        <?php
-            /**
-             *  Footer
-             */
-            include_once(ROOT . '/views/includes/footer.inc.php');
-        ?>
+                    <?= $content ?>
+                </article>
 
-        <div id="bottom"></div> <!-- to go to the bottom of the page -->
+                <?php include_once(ROOT . '/views/includes/footer.inc.php'); ?>
+            </div>
+
+            <!-- Right side virtual space -->
+            <div id="virtual-space"></div>
+        </div>
     </body>
 </html>
\ No newline at end of file
diff --git a/www/views/templates/tasks/create.inc.php b/www/views/templates/tasks/create.inc.php
index 4f65d6cb3..9148b94c9 100644
--- a/www/views/templates/tasks/create.inc.php
+++ b/www/views/templates/tasks/create.inc.php
@@ -1,51 +1,25 @@
-<div class="div-generic-blue margin-bottom-15">
-    <div class="flex align-item-center justify-space-between">
-        <h3>
-            <?php
-            if ($repoController->getType() == 'mirror') {
-                echo strtoupper($repoController->getPackageType()) . ' MIRROR REPOSITORY';
-            }
-            if ($repoController->getType() == 'local') {
-                echo 'LOCAL ' . strtoupper($repoController->getPackageType()) . ' REPOSITORY';
-            } ?>
-        </h3>
+<?php
+use \Controllers\Utils\Generate\Html\Label; ?>
 
-        <div class="text-right">
-            <p title="Task execution date"><?= DateTime::createFromFormat('Y-m-d', $taskInfo['Date'])->format('d-m-Y') . ' ' . $taskInfo['Time'] ?></p>
-            <div class="flex align-item-center column-gap-5 justify-end">
-                <p title="Task Id">Task #<?= $taskId ?></p>
-                <?php
-                if ((DEVEL or \Controllers\App\DebugMode::enabled()) and file_exists(MAIN_LOGS_DIR . '/repomanager-task-' . $taskId . '-log.process')) {
-                    echo '<img src="/assets/icons/file.svg" class="icon view-task-process-log" task-id="' . $taskId . '" title="Debug log" />';
-                } ?>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="div-generic-blue margin-bottom-15">
+<div id="task-details" class="div-generic-blue margin-bottom-15">
     <div class="grid grid-2 row-gap-10 column-gap-20">
         <div>
             <h6 class="margin-top-0">REPOSITORY</h6>
-            <p>
-                <span class="label-white">
-                    <?php
-                    if ($repoController->getPackageType() == 'deb') {
-                        echo $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection();
-                    }
+            <?php
+            if ($repoController->getPackageType() == 'deb') {
+                echo Label::white($repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection());
+            }
 
-                    if ($repoController->getPackageType() == 'rpm') {
-                        echo $repoController->getName();
-                    } ?>
-                </span>
-            </p>
+            if ($repoController->getPackageType() == 'rpm') {
+                echo Label::white($repoController->getName());
+            } ?>
         </div>
 
         <?php
         if ($repoController->getType() == 'mirror') : ?>
             <div>
                 <h6 class="margin-top-0">SOURCE REPOSITORY</h6>
-                <p class="copy"><span class="label-white"><?= $repoController->getSource() ?></span></p>
+                <p class="copy"><?= Label::white($repoController->getSource()) ?></p>
             </div>
             <?php
         endif ?>
@@ -70,7 +44,7 @@
                 <div class="flex column-gap-5 row-gap-5 flex-wrap">
                     <?php
                     foreach ($repoController->getArch() as $arch) {
-                        echo '<span class="label-black">' . $arch . '</span>';
+                        echo Label::white($arch);
                     } ?>
                 </div>
             </div>
@@ -84,7 +58,7 @@
                 <div class="flex column-gap-5 row-gap-5 flex-wrap">
                     <?php
                     foreach ($rawParams['env'] as $env) {
-                        echo \Controllers\Utils\Generate\Html\Label::envtag($env);
+                        echo Label::envtag($env);
                     } ?>
                 </div>
             </div>
@@ -101,7 +75,7 @@
                     <div class="flex column-gap-5 row-gap-5 flex-wrap">
                         <?php
                         foreach ($repoController->getAdvancedParams()['packages']['include'] as $package) {
-                            echo '<span class="label-black">' . $package . '</span>';
+                            echo Label::white($package);
                         } ?>
                     </div>
                 </div>
@@ -114,7 +88,7 @@
                     <div class="flex column-gap-5 row-gap-5 flex-wrap">
                         <?php
                         foreach ($repoController->getAdvancedParams()['packages']['exclude'] as $package) {
-                            echo '<span class="label-black">' . $package . '</span>';
+                            echo Label::white($package);
                         } ?>
                     </div>
                 </div>
@@ -131,7 +105,7 @@
                 <div class="flex column-gap-5 row-gap-5 flex-wrap">
                     <?php
                     foreach ($rawParams['advanced-params']['packages']['include'] as $package) {
-                        echo '<span class="label-black">' . $package . '</span>';
+                        echo Label::white($package);
                     } ?>
                 </div>
             </div>
@@ -144,7 +118,7 @@
                 <div class="flex column-gap-5 row-gap-5 flex-wrap">
                     <?php
                     foreach ($rawParams['advanced-params']['packages']['exclude'] as $package) {
-                        echo '<span class="label-black">' . $package . '</span>';
+                        echo Label::white($package);
                     } ?>
                 </div>
             </div>
@@ -180,7 +154,7 @@
                         }
 
                         $displayName = $metadataMap[$metadata] ?? $metadata;
-                        echo '<span class="label-black">' . $displayName . '</span>';
+                        echo Label::white($displayName);
                     } ?>
                 </div>
             </div>
@@ -247,6 +221,22 @@
             <?php
         endif;
 
+        if (!empty($repoController->getTags())) : ?>
+            <div>
+                <h6>TAGS</h6>
+                <div class="flex column-gap-5 row-gap-5 flex-wrap">
+                    <?php
+                    foreach ($repoController->getTags() as $tag) {
+                        echo Label::white($tag);
+                    } ?>
+                </div>
+            </div>
+            <?php
+        endif ?>
+    </div>
+
+    <div class="grid grid-2 row-gap-10 column-gap-20">
+        <?php
         if (!empty($repoController->getGroup())) : ?>
             <div>
                 <h6>ADD TO GROUP</h6>
diff --git a/www/views/templates/tasks/delete.inc.php b/www/views/templates/tasks/delete.inc.php
index be76fa47b..e77e247d0 100644
--- a/www/views/templates/tasks/delete.inc.php
+++ b/www/views/templates/tasks/delete.inc.php
@@ -1,40 +1,22 @@
-<div class="div-generic-blue margin-bottom-15">
-    <div class="flex align-item-center justify-space-between">
-        <h3>DELETE REPOSITORY SNAPSHOT</h3>
+<?php
+use \Controllers\Utils\Generate\Html\Label; ?>
 
-        <div class="text-right">
-            <p title="Task execution date"><?= DateTime::createFromFormat('Y-m-d', $taskInfo['Date'])->format('d-m-Y') . ' ' . $taskInfo['Time'] ?></p>
-            <div class="flex align-item-center column-gap-5 justify-end">
-                <p title="Task Id">Task #<?= $taskId ?></p>
-                <?php
-                if ((DEVEL or \Controllers\App\DebugMode::enabled()) and file_exists(MAIN_LOGS_DIR . '/repomanager-task-' . $taskId . '-log.process')) {
-                    echo '<img src="/assets/icons/file.svg" class="icon view-task-process-log" task-id="' . $taskId . '" title="Debug log" />';
-                } ?>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="div-generic-blue margin-bottom-15">
+<div id="task-details" class="div-generic-blue margin-bottom-15">
     <div class="grid grid-2 row-gap-10 column-gap-20">
         <div>
             <h6 class="margin-top-0">REPOSITORY</h6>
-            <p>
-                <span class="label-white">
-                    <?php
-                    if ($repoController->getPackageType() == 'deb') {
-                        echo $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection();
-                    }
-                    if ($repoController->getPackageType() == 'rpm') {
-                        echo $repoController->getName() . ' ❯ ' . $repoController->getReleasever();
-                    } ?>
-                </span>
-            </p>
+            <?php
+            if ($repoController->getPackageType() == 'deb') {
+                echo Label::white($repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection());
+            }
+            if ($repoController->getPackageType() == 'rpm') {
+                echo Label::white($repoController->getName() . ' ❯ ' . $repoController->getReleasever());
+            } ?>
         </div>
 
         <div>
             <h6 class="margin-top-0">DATE</h6>
-            <p class="label-black"><?= $repoController->getDateFormatted() ?></p>
+            <?= Label::white($repoController->getDateFormatted()) ?>
         </div>
     </div>
 </div>
diff --git a/www/views/templates/tasks/duplicate.inc.php b/www/views/templates/tasks/duplicate.inc.php
index a05ae03d9..3917e2cd2 100644
--- a/www/views/templates/tasks/duplicate.inc.php
+++ b/www/views/templates/tasks/duplicate.inc.php
@@ -1,59 +1,35 @@
-<div class="div-generic-blue margin-bottom-15">
-    <div class="flex align-item-center justify-space-between">
-        <h3>DUPLICATE REPOSITORY SNAPSHOT</h3>
+<?php
+use \Controllers\Utils\Generate\Html\Label; ?>
 
-        <div class="text-right">
-            <p title="Task execution date"><?= DateTime::createFromFormat('Y-m-d', $taskInfo['Date'])->format('d-m-Y') . ' ' . $taskInfo['Time'] ?></p>
-            <div class="flex align-item-center column-gap-5 justify-end">
-                <p title="Task Id">Task #<?= $taskId ?></p>
-                <?php
-                if ((DEVEL or \Controllers\App\DebugMode::enabled()) and file_exists(MAIN_LOGS_DIR . '/repomanager-task-' . $taskId . '-log.process')) {
-                    echo '<img src="/assets/icons/file.svg" class="icon view-task-process-log" task-id="' . $taskId . '" title="Debug log" />';
-                } ?>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="div-generic-blue margin-bottom-15">
+<div id="task-details" class="div-generic-blue margin-bottom-15">
     <div class="grid grid-2 row-gap-10 column-gap-20">
         <div>
             <h6 class="margin-top-0">REPOSITORY</h6>
-            <p>
-                <span class="label-white">
-                    <?php
-                    if ($repoController->getPackageType() == 'rpm') {
-                        echo $repoController->getName() . ' ❯ ' . $repoController->getReleasever();
-                    }
-                    if ($repoController->getPackageType() == 'deb') {
-                        echo $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection();
-                    } ?>
-                </span>
-            </p>
+            <?php
+            if ($repoController->getPackageType() == 'rpm') {
+                echo Label::white($repoController->getName() . ' ❯ ' . $repoController->getReleasever());
+            }
+            if ($repoController->getPackageType() == 'deb') {
+                echo Label::white($repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection());
+            } ?>
         </div>
 
         <div>
             <h6 class="margin-top-0">SNAPSHOT</h6>
-            <p>
-                <span class="label-black"><?= $repoController->getDateFormatted() ?></span>
-            </p>
+            <?= Label::white($repoController->getDateFormatted()) ?>
         </div>
     </div>
 
     <div class="grid grid-2 row-gap-10 column-gap-20">
         <div>
             <h6>DUPLICATE TO</h6>
-            <p>
-                <span class="label-white">
-                    <?php
-                    if ($repoController->getPackageType() == 'rpm') {
-                        echo $rawParams['name'] . ' ❯ ' . $repoController->getReleasever();
-                    }
-                    if ($repoController->getPackageType() == 'deb') {
-                        echo $rawParams['name'] . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection();
-                    } ?>
-                </span>
-            </p>
+            <?php
+            if ($repoController->getPackageType() == 'rpm') {
+                echo Label::white($rawParams['name'] . ' ❯ ' . $repoController->getReleasever());
+            }
+            if ($repoController->getPackageType() == 'deb') {
+                echo Label::white($rawParams['name'] . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection());
+            } ?>
         </div>
 
         <?php
@@ -63,20 +39,30 @@
                 <div class="flex column-gap-5 row-gap-5 flex-wrap">
                     <?php
                     foreach ($rawParams['env'] as $env) {
-                        echo \Controllers\Utils\Generate\Html\Label::envtag($env) . ' ';
+                        echo Label::envtag($env) . ' ';
                     } ?>
                 </div>
             </div>
             <?php
-        endif ?>
-    </div>
+        endif;
 
-    <div class="grid grid-2 row-gap-10 column-gap-20">
-        <?php
-        if (!empty($repoController->getDescription())) : ?>
+        if (!empty($rawParams['description'])) : ?>
             <div>
                 <h6>DESCRIPTION</h6>
-                <p><?= $repoController->getDescription() ?></p>
+                <p><?= $rawParams['description'] ?></p>
+            </div>
+            <?php
+        endif;
+
+        if (!empty($rawParams['tags'])) : ?>
+            <div>
+                <h6>TAGS</h6>
+                <div class="flex column-gap-5 row-gap-5 flex-wrap">
+                    <?php
+                    foreach ($rawParams['tags'] as $tag) {
+                        echo Label::white($tag);
+                    } ?>
+                </div>
             </div>
             <?php
         endif;
diff --git a/www/views/templates/tasks/env.inc.php b/www/views/templates/tasks/env.inc.php
index f1c6b9b95..09d20a586 100644
--- a/www/views/templates/tasks/env.inc.php
+++ b/www/views/templates/tasks/env.inc.php
@@ -1,42 +1,22 @@
-<div class="div-generic-blue margin-bottom-15">
-    <div class="flex align-item-center justify-space-between">
-        <h3>POINT AN ENVIRONMENT</h3>
+<?php
+use \Controllers\Utils\Generate\Html\Label; ?>
 
-        <div class="text-right">
-            <p title="Task execution date"><?= DateTime::createFromFormat('Y-m-d', $taskInfo['Date'])->format('d-m-Y') . ' ' . $taskInfo['Time'] ?></p>
-            <div class="flex align-item-center column-gap-5 justify-end">
-                <p title="Task Id">Task #<?= $taskId ?></p>
-                <?php
-                if ((DEVEL or \Controllers\App\DebugMode::enabled()) and file_exists(MAIN_LOGS_DIR . '/repomanager-task-' . $taskId . '-log.process')) {
-                    echo '<img src="/assets/icons/file.svg" class="icon view-task-process-log" task-id="' . $taskId . '" title="Debug log" />';
-                } ?>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="div-generic-blue margin-bottom-15">
+<div id="task-details" class="div-generic-blue margin-bottom-15">
     <div class="grid grid-2 row-gap-10 column-gap-20">
         <div>
             <h6 class="margin-top-0">REPOSITORY</h6>
-            <p>
-                <span class="label-white">
-                    <?php
-                    if ($repoController->getPackageType() == 'rpm') {
-                        echo $repoController->getName() . ' ❯ ' . $repoController->getReleasever();
-                    }
-                    if ($repoController->getPackageType() == 'deb') {
-                        echo $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection();
-                    } ?>
-                </span>
-            </p>
+            <?php
+            if ($repoController->getPackageType() == 'rpm') {
+                echo Label::white($repoController->getName() . ' ❯ ' . $repoController->getReleasever());
+            }
+            if ($repoController->getPackageType() == 'deb') {
+                echo Label::white($repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection());
+            } ?>
         </div>
 
         <div>
             <h6 class="margin-top-0">SNAPSHOT</h6>
-            <p>
-                <span class="label-black"><?= $repoController->getDateFormatted() ?></span>
-            </p>
+            <?= Label::white($repoController->getDateFormatted()) ?>
         </div>
     </div>
 
@@ -46,20 +26,9 @@
             <div class="flex column-gap-5 row-gap-5 flex-wrap">
                 <?php
                 foreach ($rawParams['env'] as $env) {
-                    echo \Controllers\Utils\Generate\Html\Label::envtag($env);
+                    echo Label::envtag($env);
                 } ?>
             </div>
         </div>
     </div>
-
-    <div class="grid grid-2 row-gap-10 column-gap-20">
-        <?php
-        if (!empty($repoController->getDescription())) : ?>
-            <div>
-                <h6>DESCRIPTION</h6>
-                <p><?= $repoController->getDescription() ?></p>
-            </div>
-            <?php
-        endif ?>
-    </div>
 </div>
diff --git a/www/views/templates/tasks/rebuild.inc.php b/www/views/templates/tasks/rebuild.inc.php
index 133809ba8..93f98fac8 100644
--- a/www/views/templates/tasks/rebuild.inc.php
+++ b/www/views/templates/tasks/rebuild.inc.php
@@ -1,42 +1,22 @@
-<div class="div-generic-blue margin-bottom-15">
-    <div class="flex align-item-center justify-space-between">
-        <h3>REBUILD REPOSITORY METADATA</h3>
+<?php
+use \Controllers\Utils\Generate\Html\Label; ?>
 
-        <div class="text-right">
-            <p title="Task execution date"><?= DateTime::createFromFormat('Y-m-d', $taskInfo['Date'])->format('d-m-Y') . ' ' . $taskInfo['Time'] ?></p>
-            <div class="flex align-item-center column-gap-5 justify-end">
-                <p title="Task Id">Task #<?= $taskId ?></p>
-                <?php
-                if ((DEVEL or \Controllers\App\DebugMode::enabled()) and file_exists(MAIN_LOGS_DIR . '/repomanager-task-' . $taskId . '-log.process')) {
-                    echo '<img src="/assets/icons/file.svg" class="icon view-task-process-log" task-id="' . $taskId . '" title="Debug log" />';
-                } ?>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="div-generic-blue margin-bottom-15">
+<div id="task-details" class="div-generic-blue margin-bottom-15">
     <div class="grid grid-2 row-gap-10 column-gap-20">
         <div>
             <h6 class="margin-top-0">REPOSITORY</h6>
-            <p>
-                <span class="label-white">
-                    <?php
-                    if ($repoController->getPackageType() == 'deb') {
-                        echo $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection();
-                    }
-                    if ($repoController->getPackageType() == 'rpm') {
-                        echo $repoController->getName() . ' ❯ ' . $repoController->getReleasever();
-                    } ?>
-                </span>
-            </p>
+            <?php
+            if ($repoController->getPackageType() == 'deb') {
+                echo Label::white($repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection());
+            }
+            if ($repoController->getPackageType() == 'rpm') {
+                echo Label::white($repoController->getName() . ' ❯ ' . $repoController->getReleasever());
+            } ?>
         </div>
 
         <div>
             <h6 class="margin-top-0">SNAPSHOT</h6>
-            <p>
-                <span class="label-black"><?= $repoController->getDateFormatted() ?></span>
-            </p>
+            <?= Label::white($repoController->getDateFormatted()) ?>
         </div>
     </div>
 
@@ -48,7 +28,7 @@
                 <div class="flex column-gap-5 row-gap-5 flex-wrap">
                     <?php
                     foreach ($repoController->getArch() as $arch) {
-                        echo '<span class="label-black">' . $arch . '</span>';
+                        echo Label::white($arch);
                     } ?>
                 </div>
             </div>
diff --git a/www/views/templates/tasks/removeEnv.inc.php b/www/views/templates/tasks/removeEnv.inc.php
index 4a0f9edd0..033e64b69 100644
--- a/www/views/templates/tasks/removeEnv.inc.php
+++ b/www/views/templates/tasks/removeEnv.inc.php
@@ -1,40 +1,22 @@
-<div class="div-generic-blue margin-bottom-15">
-    <div class="flex align-item-center justify-space-between">
-        <h3>REMOVE ENVIRONMENT</h3>
+<?php
+use \Controllers\Utils\Generate\Html\Label; ?>
 
-        <div class="text-right">
-            <p title="Task execution date"><?= DateTime::createFromFormat('Y-m-d', $taskInfo['Date'])->format('d-m-Y') . ' ' . $taskInfo['Time'] ?></p>
-            <div class="flex align-item-center column-gap-5 justify-end">
-                <p title="Task Id">Task #<?= $taskId ?></p>
-                <?php
-                if ((DEVEL or \Controllers\App\DebugMode::enabled()) and file_exists(MAIN_LOGS_DIR . '/repomanager-task-' . $taskId . '-log.process')) {
-                    echo '<img src="/assets/icons/file.svg" class="icon view-task-process-log" task-id="' . $taskId . '" title="Debug log" />';
-                } ?>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="div-generic-blue margin-bottom-15">
+<div id="task-details" class="div-generic-blue margin-bottom-15">
     <div class="grid grid-2 row-gap-10 column-gap-20">
         <div>
             <h6 class="margin-top-0">REPOSITORY</h6>
-            <p>
-                <span class="label-white">
-                    <?php
-                    if ($repoController->getPackageType() == 'deb') {
-                        echo $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection();
-                    }
-                    if ($repoController->getPackageType() == 'rpm') {
-                        echo $repoController->getName() . ' ❯ ' . $repoController->getReleasever();
-                    } ?>
-                </span>
-            </p>
+            <?php
+            if ($repoController->getPackageType() == 'deb') {
+                echo Label::white($repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection());
+            }
+            if ($repoController->getPackageType() == 'rpm') {
+                echo Label::white($repoController->getName() . ' ❯ ' . $repoController->getReleasever());
+            } ?>
         </div>
 
         <div>
             <h6 class="margin-top-0">ENVIRONNEMENT</h6>
-            <p><?= \Controllers\Utils\Generate\Html\Label::envtag($rawParams['env']) ?></p>
+            <?= Label::envtag($rawParams['env']) ?>
         </div>
     </div>
 </div>
diff --git a/www/views/templates/tasks/rename.inc.php b/www/views/templates/tasks/rename.inc.php
index 6add4eb43..5dbe9943b 100644
--- a/www/views/templates/tasks/rename.inc.php
+++ b/www/views/templates/tasks/rename.inc.php
@@ -1,50 +1,28 @@
-<div class="div-generic-blue margin-bottom-15">
-    <div class="flex align-item-center justify-space-between">
-        <h3>RENAME REPOSITORY</h3>
+<?php
+use \Controllers\Utils\Generate\Html\Label; ?>
 
-        <div class="text-right">
-            <p title="Task execution date"><?= DateTime::createFromFormat('Y-m-d', $taskInfo['Date'])->format('d-m-Y') . ' ' . $taskInfo['Time'] ?></p>
-            <div class="flex align-item-center column-gap-5 justify-end">
-                <p title="Task Id">Task #<?= $taskId ?></p>
-                <?php
-                if ((DEVEL or \Controllers\App\DebugMode::enabled()) and file_exists(MAIN_LOGS_DIR . '/repomanager-task-' . $taskId . '-log.process')) {
-                    echo '<img src="/assets/icons/file.svg" class="icon view-task-process-log" task-id="' . $taskId . '" title="Debug log" />';
-                } ?>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="div-generic-blue margin-bottom-15">
+<div id="task-details" class="div-generic-blue margin-bottom-15">
     <div class="grid grid-2 row-gap-10 column-gap-20">
         <div>
             <h6 class="margin-top-0">REPOSITORY</h6>
-            <p>
-                <span class="label-white">
-                    <?php
-                    if ($repoController->getPackageType() == 'rpm') {
-                        echo $rawParams['old-name'] . ' ❯ ' . $repoController->getReleasever();
-                    }
-                    if ($repoController->getPackageType() == 'deb') {
-                        echo $rawParams['old-name'] . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection();
-                    } ?>
-                </span>
-            </p>
+            <?php
+            if ($repoController->getPackageType() == 'rpm') {
+                echo Label::white($rawParams['old-name'] . ' ❯ ' . $repoController->getReleasever());
+            }
+            if ($repoController->getPackageType() == 'deb') {
+                echo Label::white($rawParams['old-name'] . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection());
+            } ?>
         </div>
 
         <div>
             <h6 class="margin-top-0">RENAME TO</h6>
-            <p>
-                <span class="label-white">
-                    <?php
-                    if ($repoController->getPackageType() == 'rpm') {
-                        echo $rawParams['name'] . ' ❯ ' . $repoController->getReleasever();
-                    }
-                    if ($repoController->getPackageType() == 'deb') {
-                        echo $rawParams['name'] . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection();
-                    } ?>
-                </span>
-            </p>
+            <?php
+            if ($repoController->getPackageType() == 'rpm') {
+                echo Label::white($rawParams['name'] . ' ❯ ' . $repoController->getReleasever());
+            }
+            if ($repoController->getPackageType() == 'deb') {
+                echo Label::white($rawParams['name'] . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection());
+            } ?>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/www/views/templates/tasks/update.inc.php b/www/views/templates/tasks/update.inc.php
index 5aede9a3a..9983fa826 100644
--- a/www/views/templates/tasks/update.inc.php
+++ b/www/views/templates/tasks/update.inc.php
@@ -1,40 +1,22 @@
-<div class="div-generic-blue margin-bottom-15">
-    <div class="flex align-item-center justify-space-between">
-        <h3>UPDATE REPOSITORY</h3>
+<?php
+use \Controllers\Utils\Generate\Html\Label; ?>
 
-        <div class="text-right">
-            <p title="Task execution date"><?= DateTime::createFromFormat('Y-m-d', $taskInfo['Date'])->format('d-m-Y') . ' ' . $taskInfo['Time'] ?></p>
-            <div class="flex align-item-center column-gap-5 justify-end">
-                <p title="Task Id">Task #<?= $taskId ?></p>
-                <?php
-                if ((DEVEL or \Controllers\App\DebugMode::enabled()) and file_exists(MAIN_LOGS_DIR . '/repomanager-task-' . $taskId . '-log.process')) {
-                    echo '<img src="/assets/icons/file.svg" class="icon view-task-process-log" task-id="' . $taskId . '" title="Debug log" />';
-                } ?>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="div-generic-blue margin-bottom-15">
+<div id="task-details" class="div-generic-blue margin-bottom-15">
     <div class="grid grid-2 row-gap-10 column-gap-20">
         <div>
             <h6 class="margin-top-0">REPOSITORY</h6>
-            <p>
-                <span class="label-white">
-                    <?php
-                    if ($repoController->getPackageType() == 'deb') {
-                        echo $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection();
-                    }
-                    if ($repoController->getPackageType() == 'rpm') {
-                        echo $repoController->getName();
-                    } ?>
-                </span>
-            </p>
+            <?php
+            if ($repoController->getPackageType() == 'deb') {
+                echo Label::white($repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection());
+            }
+            if ($repoController->getPackageType() == 'rpm') {
+                echo Label::white($repoController->getName());
+            } ?>
         </div>
 
         <div>
             <h6 class="margin-top-0">SOURCE REPOSITORY</h6>
-            <p class="copy"><span class="label-white"><?= $repoController->getSource() ?></span></p>
+            <p class="copy"><?= Label::white($repoController->getSource()) ?></p>
         </div>
     </div>
 
@@ -57,7 +39,7 @@
                 <div class="flex column-gap-5 row-gap-5 flex-wrap">
                     <?php
                     foreach ($rawParams['arch'] as $arch) {
-                        echo '<span class="label-black">' . $arch . '</span>';
+                        echo Label::white($arch);
                     } ?>
                 </div>
             </div>
@@ -70,7 +52,7 @@
                 <div class="flex column-gap-5 row-gap-5 flex-wrap">
                     <?php
                     foreach ($rawParams['env'] as $env) {
-                        echo \Controllers\Utils\Generate\Html\Label::envtag($env);
+                        echo Label::envtag($env);
                     } ?>
                 </div>
             </div>
@@ -86,7 +68,7 @@
                 <div class="flex column-gap-5 row-gap-5 flex-wrap">
                     <?php
                     foreach ($rawParams['advanced-params']['packages']['include'] as $package) {
-                        echo '<span class="label-black">' . $package . '</span>';
+                        echo Label::white($package);
                     } ?>
                 </div>
             </div>
@@ -99,7 +81,7 @@
                 <div class="flex column-gap-5 row-gap-5 flex-wrap">
                     <?php
                     foreach ($rawParams['advanced-params']['packages']['exclude'] as $package) {
-                        echo '<span class="label-black">' . $package . '</span>';
+                        echo Label::white($package);
                     } ?>
                 </div>
             </div>
@@ -135,7 +117,7 @@
                         }
 
                         $displayName = $metadataMap[$metadata] ?? $metadata;
-                        echo '<span class="label-black">' . $displayName . '</span>';
+                        echo Label::white($displayName);
                     } ?>
                 </div>
             </div>