diff --git a/.gitignore b/.gitignore
index 67f79d3..9b68313 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,5 @@
 ###> symfony/asset-mapper ###
 /public/assets/
 /assets/vendor/
+/.idea
 ###< symfony/asset-mapper ###
diff --git a/.idea/codeception.xml b/.idea/codeception.xml
index 9d23cc2..98ba8dd 100644
--- a/.idea/codeception.xml
+++ b/.idea/codeception.xml
@@ -39,6 +39,12 @@
         <Configuration>
           <option name="path" value="$PROJECT_DIR$/tests" />
         </Configuration>
+        <Configuration>
+          <option name="path" value="$PROJECT_DIR$/tests" />
+        </Configuration>
+        <Configuration>
+          <option name="path" value="$PROJECT_DIR$/tests" />
+        </Configuration>
       </list>
     </option>
   </component>
diff --git a/.idea/inventory.iml b/.idea/inventory.iml
index f6442d7..a30e21f 100644
--- a/.idea/inventory.iml
+++ b/.idea/inventory.iml
@@ -131,6 +131,14 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/doctrine-messenger" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/messenger" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/ux-autocomplete" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/babdev/pagerfanta-bundle" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/cuyz/valinor" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/cuyz/valinor-bundle" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/pagerfanta/core" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/pagerfanta/doctrine-orm-adapter" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/pagerfanta/twig" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/psr/simple-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/strictify/lazy" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/.idea/php.xml b/.idea/php.xml
index a106b2e..1448d1d 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -140,6 +140,14 @@
       <path value="$PROJECT_DIR$/vendor/symfony/messenger" />
       <path value="$PROJECT_DIR$/vendor/symfony/doctrine-messenger" />
       <path value="$PROJECT_DIR$/vendor/symfony/ux-autocomplete" />
+      <path value="$PROJECT_DIR$/vendor/cuyz/valinor-bundle" />
+      <path value="$PROJECT_DIR$/vendor/cuyz/valinor" />
+      <path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
+      <path value="$PROJECT_DIR$/vendor/pagerfanta/core" />
+      <path value="$PROJECT_DIR$/vendor/babdev/pagerfanta-bundle" />
+      <path value="$PROJECT_DIR$/vendor/pagerfanta/doctrine-orm-adapter" />
+      <path value="$PROJECT_DIR$/vendor/pagerfanta/twig" />
+      <path value="$PROJECT_DIR$/vendor/strictify/lazy" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="8.3" />
diff --git a/.idea/phpspec.xml b/.idea/phpspec.xml
index afb0d3c..fdb0fed 100644
--- a/.idea/phpspec.xml
+++ b/.idea/phpspec.xml
@@ -38,6 +38,12 @@
       <PhpSpecSuiteConfiguration>
         <option name="myPath" value="$PROJECT_DIR$" />
       </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
     </suites>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/symfony2.xml b/.idea/symfony2.xml
index c3f403f..b7f705d 100644
--- a/.idea/symfony2.xml
+++ b/.idea/symfony2.xml
@@ -7,5 +7,6 @@
     <option name="codeFoldingPhpTemplate" value="false" />
     <option name="codeFoldingTwigRoute" value="false" />
     <option name="codeFoldingTwigTemplate" value="false" />
+    <option name="profilerCsvPath" value="" />
   </component>
 </project>
\ No newline at end of file
diff --git a/assets/app.js b/assets/app.js
index 014a421..bccebbf 100644
--- a/assets/app.js
+++ b/assets/app.js
@@ -5,6 +5,8 @@ import '@hotwired/turbo';
 import 'bootstrap/dist/css/bootstrap.min.css';
 import 'bootstrap-icons/font/bootstrap-icons.min.css'
 import './styles/admin.css';
+import './styles/app.css';
+
 import './styles/extras.css';
 import 'animate.css/animate.min.css';
 
diff --git a/assets/styles/app.css b/assets/styles/app.css
index dd6181a..4097418 100644
--- a/assets/styles/app.css
+++ b/assets/styles/app.css
@@ -1,3 +1,8 @@
-body {
-    background-color: skyblue;
+@import url('../../vendor/babdev/pagerfanta-bundle/public/css/pagerfanta.css');
+
+table colgroup col.xxx {
+ /*display: none;*/
+    visibility: collapse;
+    width: 0;
+    /*background-color: red;*/
 }
diff --git a/composer.json b/composer.json
index 37ede4c..aca8e49 100644
--- a/composer.json
+++ b/composer.json
@@ -9,14 +9,19 @@
         "php": ">=8.3.3",
         "ext-ctype": "*",
         "ext-iconv": "*",
+        "babdev/pagerfanta-bundle": "^4.4",
+        "cuyz/valinor-bundle": "^0.2.3",
         "dbrekelmans/bdi": "^1.3",
         "doctrine/dbal": "^3",
-        "doctrine/doctrine-bundle": "^2.11",
+        "doctrine/doctrine-bundle": "*",
         "doctrine/doctrine-migrations-bundle": "^3.3",
-        "doctrine/orm": "^3.1",
+        "doctrine/orm": "dev-psalmify-query-builder as 3.1.1",
+        "pagerfanta/doctrine-orm-adapter": "^4.4",
+        "pagerfanta/twig": "^4.4",
         "ramsey/uuid-doctrine": "^2.0",
         "runtime/frankenphp-symfony": "^0.2.0",
         "strictify/form-mapper-bundle": "dev-master",
+        "strictify/lazy": "dev-master",
         "symfony/asset": "7.0.*",
         "symfony/asset-mapper": "7.0.*",
         "symfony/console": "7.0.*",
@@ -47,6 +52,10 @@
         {
             "type": "github",
             "url": "https://github.com/strictify/form-mapper-bundle"
+        },
+        {
+            "type": "github",
+            "url": "https://github.com/zmitic/orm.git"
         }
     ],
     "config": {
@@ -66,6 +75,9 @@
         ]
     },
     "autoload-dev": {
+        "files": [
+            "vendor/cuyz/valinor/qa/Psalm/ValinorPsalmPlugin.php"
+        ],
         "psr-4": {
             "App\\Tests\\": "tests/"
         }
@@ -104,7 +116,7 @@
         }
     },
     "require-dev": {
-        "doctrine/doctrine-fixtures-bundle": "^3.5",
+        "doctrine/doctrine-fixtures-bundle": "^3|^4",
         "symfony/debug-bundle": "7.0.*",
         "symfony/maker-bundle": "^1.56",
         "symfony/monolog-bundle": "^3.0",
diff --git a/composer.lock b/composer.lock
index 64fae49..95bc976 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,95 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0c869fa063eda466e2f3c7a163818acc",
+    "content-hash": "13260d40ed6102b30e3dc713b5ff4769",
     "packages": [
+        {
+            "name": "babdev/pagerfanta-bundle",
+            "version": "v4.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/BabDev/PagerfantaBundle.git",
+                "reference": "b2f0d87ed0592830ebea54238ffe9702e8524972"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/BabDev/PagerfantaBundle/zipball/b2f0d87ed0592830ebea54238ffe9702e8524972",
+                "reference": "b2f0d87ed0592830ebea54238ffe9702e8524972",
+                "shasum": ""
+            },
+            "require": {
+                "pagerfanta/core": "^3.7 || ^4.0",
+                "php": "^8.1",
+                "psr/container": "^1.0 || ^2.0",
+                "symfony/config": "^5.4 || ^6.3 || ^7.0",
+                "symfony/dependency-injection": "^5.4 || ^6.3 || ^7.0",
+                "symfony/http-foundation": "^5.4 || ^6.3 || ^7.0",
+                "symfony/http-kernel": "^5.4 || ^6.3 || ^7.0",
+                "symfony/property-access": "^5.4 || ^6.3 || ^7.0",
+                "symfony/routing": "^5.4 || ^6.3 || ^7.0"
+            },
+            "conflict": {
+                "jms/serializer": "<3.18",
+                "jms/serializer-bundle": "<4.2",
+                "pagerfanta/twig": "<3.7",
+                "symfony/serializer": "<5.4 || >=6.0,<6.3",
+                "symfony/translation": "<5.4 || >=6.0,<6.3",
+                "symfony/twig-bridge": "<5.4 || >=6.0,<6.3",
+                "symfony/twig-bundle": "<5.4 || >=6.0,<6.3",
+                "twig/twig": "<2.13",
+                "white-october/pagerfanta-bundle": "*"
+            },
+            "require-dev": {
+                "jms/serializer": "^3.18",
+                "jms/serializer-bundle": "^4.2 || ^5.0",
+                "matthiasnoback/symfony-dependency-injection-test": "^5.0",
+                "pagerfanta/twig": "^3.7 || ^4.0",
+                "phpstan/extension-installer": "^1.2",
+                "phpstan/phpstan": "1.10.49",
+                "phpstan/phpstan-phpunit": "1.3.15",
+                "phpstan/phpstan-symfony": "1.3.5",
+                "phpunit/phpunit": "9.6.15",
+                "symfony/phpunit-bridge": "^5.4 || ^6.3 || ^7.0",
+                "symfony/serializer": "^5.4 || ^6.3 || ^7.0",
+                "symfony/translation": "^5.4 || ^6.3 || ^7.0",
+                "symfony/twig-bridge": "^5.4 || ^6.3 || ^7.0",
+                "symfony/twig-bundle": "^5.4 || ^6.3 || ^7.0",
+                "twig/twig": "^2.13 || ^3.0"
+            },
+            "suggest": {
+                "jms/serializer-bundle": "To use the Pagerfanta class with the JMS Serializer",
+                "symfony/serializer": "To use the Pagerfanta class with the Symfony Serializer",
+                "symfony/translation": "To use the Twig templates with translation support",
+                "twig/twig": "To integrate Pagerfanta with Twig through extensions"
+            },
+            "type": "symfony-bundle",
+            "autoload": {
+                "psr-4": {
+                    "BabDev\\PagerfantaBundle\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Bundle integrating Pagerfanta with Symfony",
+            "keywords": [
+                "pagerfanta",
+                "pagination",
+                "symfony"
+            ],
+            "support": {
+                "issues": "https://github.com/BabDev/PagerfantaBundle/issues",
+                "source": "https://github.com/BabDev/PagerfantaBundle/tree/v4.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/mbabker",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-12-20T23:40:09+00:00"
+        },
         {
             "name": "brick/math",
             "version": "0.11.0",
@@ -142,6 +229,144 @@
             ],
             "time": "2023-08-31T09:50:34+00:00"
         },
+        {
+            "name": "cuyz/valinor",
+            "version": "1.11.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/CuyZ/Valinor.git",
+                "reference": "3f1d86f1bcb7f48f802e02cb50f449b589a68990"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/CuyZ/Valinor/zipball/3f1d86f1bcb7f48f802e02cb50f449b589a68990",
+                "reference": "3f1d86f1bcb7f48f802e02cb50f449b589a68990",
+                "shasum": ""
+            },
+            "require": {
+                "composer-runtime-api": "^2.0",
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+                "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.4",
+                "infection/infection": "^0.27",
+                "marcocesarato/php-conventional-changelog": "^1.12",
+                "mikey179/vfsstream": "^1.6.10",
+                "phpstan/phpstan": "^1.3",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpstan/phpstan-strict-rules": "^1.0",
+                "phpunit/phpunit": "^10.5",
+                "rector/rector": "^1.0",
+                "vimeo/psalm": "^5.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "CuyZ\\Valinor\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Romain Canon",
+                    "email": "romain.hydrocanon@gmail.com",
+                    "homepage": "https://github.com/romm"
+                }
+            ],
+            "description": "Library that helps to map any input into a strongly-typed value object structure.",
+            "homepage": "https://github.com/CuyZ/Valinor",
+            "keywords": [
+                "array",
+                "conversion",
+                "hydrator",
+                "json",
+                "mapper",
+                "mapping",
+                "object",
+                "tree",
+                "yaml"
+            ],
+            "support": {
+                "issues": "https://github.com/CuyZ/Valinor/issues",
+                "source": "https://github.com/CuyZ/Valinor/tree/1.11.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/romm",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-27T13:22:48+00:00"
+        },
+        {
+            "name": "cuyz/valinor-bundle",
+            "version": "0.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/CuyZ/Valinor-Bundle.git",
+                "reference": "d928556c527635ec9d4aa3449761c181e2532940"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/CuyZ/Valinor-Bundle/zipball/d928556c527635ec9d4aa3449761c181e2532940",
+                "reference": "d928556c527635ec9d4aa3449761c181e2532940",
+                "shasum": ""
+            },
+            "require": {
+                "cuyz/valinor": "^1.0",
+                "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
+                "symfony/config": "^5.4 || ^6.4 || ^7.0",
+                "symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0",
+                "symfony/http-kernel": "^5.4 || ^6.4 || ^7.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.21",
+                "infection/infection": "^0.27.0",
+                "marcocesarato/php-conventional-changelog": "^1.17",
+                "phpstan/phpstan": "^1.10",
+                "phpstan/phpstan-phpunit": "^1.3",
+                "phpstan/phpstan-strict-rules": "^1.5",
+                "phpstan/phpstan-symfony": "^1.3",
+                "phpunit/phpunit": "^10.2",
+                "symfony/console": "^5.4 || ^6.4 || ^7.0",
+                "symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0",
+                "symfony/runtime": "^5.4 || ^6.4 || ^7.0"
+            },
+            "type": "symfony-bundle",
+            "autoload": {
+                "psr-4": {
+                    "CuyZ\\ValinorBundle\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Romain Canon",
+                    "email": "romain.hydrocanon@gmail.com",
+                    "homepage": "https://github.com/romm"
+                }
+            ],
+            "description": "Symfony integration of `cuyz/valinor` — a library that helps to map any input into a strongly-typed value object structure.",
+            "homepage": "https://github.com/CuyZ/Valinor-Bundle",
+            "support": {
+                "issues": "https://github.com/CuyZ/Valinor-Bundle/issues",
+                "source": "https://github.com/CuyZ/Valinor-Bundle/tree/0.2.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/romm",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-01-13T16:57:03+00:00"
+        },
         {
             "name": "dbrekelmans/bdi",
             "version": "1.3.0",
@@ -1174,16 +1399,16 @@
         },
         {
             "name": "doctrine/orm",
-            "version": "3.1.1",
+            "version": "dev-psalmify-query-builder",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/orm.git",
-                "reference": "9c560713925ac5859342e6ff370c4c997acf2fd4"
+                "url": "https://github.com/zmitic/orm.git",
+                "reference": "d2d7491d1fadad0173c42bd99de50a00c6efb064"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/orm/zipball/9c560713925ac5859342e6ff370c4c997acf2fd4",
-                "reference": "9c560713925ac5859342e6ff370c4c997acf2fd4",
+                "url": "https://api.github.com/repos/zmitic/orm/zipball/d2d7491d1fadad0173c42bd99de50a00c6efb064",
+                "reference": "d2d7491d1fadad0173c42bd99de50a00c6efb064",
                 "shasum": ""
             },
             "require": {
@@ -1222,7 +1447,26 @@
                     "Doctrine\\ORM\\": "src"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
+            "autoload-dev": {
+                "psr-4": {
+                    "Doctrine\\Tests\\": "tests/Tests",
+                    "Doctrine\\StaticAnalysis\\": "tests/StaticAnalysis",
+                    "Doctrine\\Performance\\": "tests/Performance"
+                }
+            },
+            "archive": {
+                "exclude": [
+                    "!vendor",
+                    "tests",
+                    "*phpunit.xml",
+                    "build.xml",
+                    "build.properties",
+                    "composer.phar",
+                    "vendor/satooshi",
+                    "lib/vendor",
+                    "*.swp"
+                ]
+            },
             "license": [
                 "MIT"
             ],
@@ -1255,10 +1499,9 @@
                 "orm"
             ],
             "support": {
-                "issues": "https://github.com/doctrine/orm/issues",
-                "source": "https://github.com/doctrine/orm/tree/3.1.1"
+                "source": "https://github.com/zmitic/orm/tree/psalmify-query-builder"
             },
-            "time": "2024-03-21T11:37:52+00:00"
+            "time": "2024-03-30T17:50:35+00:00"
         },
         {
             "name": "doctrine/persistence",
@@ -1636,6 +1879,140 @@
             },
             "time": "2022-09-21T07:43:36+00:00"
         },
+        {
+            "name": "pagerfanta/core",
+            "version": "v4.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Pagerfanta/core.git",
+                "reference": "93246f475f4f2d90d5f186dd9d01d96dc98eaa31"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Pagerfanta/core/zipball/93246f475f4f2d90d5f186dd9d01d96dc98eaa31",
+                "reference": "93246f475f4f2d90d5f186dd9d01d96dc98eaa31",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Pagerfanta\\": "./"
+                },
+                "exclude-from-classmap": [
+                    "Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Core Pagerfanta API",
+            "keywords": [
+                "pagerfanta"
+            ],
+            "support": {
+                "source": "https://github.com/Pagerfanta/core/tree/v4.4.0"
+            },
+            "time": "2024-03-24T20:29:46+00:00"
+        },
+        {
+            "name": "pagerfanta/doctrine-orm-adapter",
+            "version": "v4.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Pagerfanta/doctrine-orm-adapter.git",
+                "reference": "c51e5c7b2c704e83442a365604d94ebcdec3d054"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Pagerfanta/doctrine-orm-adapter/zipball/c51e5c7b2c704e83442a365604d94ebcdec3d054",
+                "reference": "c51e5c7b2c704e83442a365604d94ebcdec3d054",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/orm": "^2.14 || ^3.0",
+                "pagerfanta/core": "^3.7 || ^4.0",
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.5",
+                "symfony/cache": "^5.4 || ^6.3 || ^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Pagerfanta\\Doctrine\\ORM\\": "./"
+                },
+                "exclude-from-classmap": [
+                    "Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Pagerfanta adapter for Doctrine ORM",
+            "keywords": [
+                "doctrine",
+                "orm",
+                "pagerfanta"
+            ],
+            "support": {
+                "source": "https://github.com/Pagerfanta/doctrine-orm-adapter/tree/v4.4.0"
+            },
+            "time": "2024-03-06T23:51:47+00:00"
+        },
+        {
+            "name": "pagerfanta/twig",
+            "version": "v4.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Pagerfanta/twig.git",
+                "reference": "74d43875490442a59ddca66e6e3fc66a9b583dd4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Pagerfanta/twig/zipball/74d43875490442a59ddca66e6e3fc66a9b583dd4",
+                "reference": "74d43875490442a59ddca66e6e3fc66a9b583dd4",
+                "shasum": ""
+            },
+            "require": {
+                "pagerfanta/core": "^3.7 || ^4.0",
+                "php": "^8.1",
+                "twig/twig": "^2.13 || ^3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Pagerfanta\\Twig\\": "./"
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Twig integration for Pagerfanta",
+            "keywords": [
+                "pagerfanta"
+            ],
+            "support": {
+                "source": "https://github.com/Pagerfanta/twig/tree/v4.4.0"
+            },
+            "time": "2024-03-06T23:51:47+00:00"
+        },
         {
             "name": "php-webdriver/webdriver",
             "version": "1.15.1",
@@ -2008,6 +2385,57 @@
             },
             "time": "2021-07-14T16:46:02+00:00"
         },
+        {
+            "name": "psr/simple-cache",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/simple-cache.git",
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865",
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\SimpleCache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for simple caching",
+            "keywords": [
+                "cache",
+                "caching",
+                "psr",
+                "psr-16",
+                "simple-cache"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/simple-cache/tree/3.0.0"
+            },
+            "time": "2021-10-29T13:26:27+00:00"
+        },
         {
             "name": "ramsey/collection",
             "version": "2.0.0",
@@ -2401,6 +2829,51 @@
             },
             "time": "2024-03-11T16:57:31+00:00"
         },
+        {
+            "name": "strictify/lazy",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/strictify/lazy.git",
+                "reference": "711a56979b4f83475911c77c957a3830a2387c5c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/strictify/lazy/zipball/711a56979b4f83475911c77c957a3830a2387c5c",
+                "reference": "711a56979b4f83475911c77c957a3830a2387c5c",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5",
+                "roave/security-advisories": "dev-latest",
+                "vimeo/psalm": "^5"
+            },
+            "default-branch": true,
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Strictify\\Lazy\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "zmitic",
+                    "email": "mitke013@gmail.com"
+                }
+            ],
+            "support": {
+                "issues": "https://github.com/strictify/lazy/issues",
+                "source": "https://github.com/strictify/lazy/tree/master"
+            },
+            "time": "2024-03-30T15:06:45+00:00"
+        },
         {
             "name": "symfony/asset",
             "version": "v7.0.3",
@@ -9814,6 +10287,12 @@
         }
     ],
     "aliases": [
+        {
+            "package": "doctrine/orm",
+            "version": "dev-psalmify-query-builder",
+            "alias": "3.1.1",
+            "alias_normalized": "3.1.1.0"
+        },
         {
             "package": "vimeo/psalm",
             "version": "9999999-dev",
@@ -9823,7 +10302,9 @@
     ],
     "minimum-stability": "dev",
     "stability-flags": {
+        "doctrine/orm": 20,
         "strictify/form-mapper-bundle": 20,
+        "strictify/lazy": 20,
         "psalm/plugin-symfony": 20,
         "vimeo/psalm": 20
     },
diff --git a/config/bundles.php b/config/bundles.php
index ea32795..96b8ced 100644
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -18,4 +18,6 @@
     Strictify\FormMapper\StrictifyFormMapperBundle::class => ['all' => true],
     Tbbc\MoneyBundle\TbbcMoneyBundle::class => ['all' => true],
     Symfony\UX\Autocomplete\AutocompleteBundle::class => ['all' => true],
+    CuyZ\ValinorBundle\ValinorBundle::class => ['all' => true],
+    BabDev\PagerfantaBundle\BabDevPagerfantaBundle::class => ['all' => true],
 ];
diff --git a/config/packages/babdev_pagerfanta.yaml b/config/packages/babdev_pagerfanta.yaml
new file mode 100644
index 0000000..7449986
--- /dev/null
+++ b/config/packages/babdev_pagerfanta.yaml
@@ -0,0 +1,3 @@
+babdev_pagerfanta:
+    default_view: twig
+    default_twig_template: '@BabDevPagerfanta/twitter_bootstrap5.html.twig'
diff --git a/psalm.xml b/psalm.xml
index ba1cd97..d31fab4 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -34,12 +34,18 @@
         <file name="stubs/Symfony/Contracts/Service/ServiceProviderInterface.stubphp"/>
         <file name="stubs/Symfony/Form/Extension/Core/Type/TextType.stubphp"/>
         <file name="stubs/Symfony/FrameworkBundle/Controller/AbstractController.stubphp"/>
+        <file name="stubs/Doctrine/Bundle/DoctrineBundle/Repository/ServiceEntityRepositoryProxy.stubphp"/>
+<!--        <file name="stubs/Doctrine/ORM/EntityRepository.stubphp"/>-->
+<!--        <file name="stubs/Doctrine/ORM/AbstractQuery.stubphp"/>-->
+<!--        <file name="stubs/Doctrine/ORM/Query.stubphp"/>-->
+<!--        <file name="stubs/Doctrine/ORM/QueryBuilder.stubphp"/>-->
     </stubs>
 
     <issueHandlers>
     </issueHandlers>
 
     <plugins>
+        <pluginClass class="CuyZ\Valinor\QA\Psalm\ValinorPsalmPlugin"/>
         <pluginClass class="Psalm\SymfonyPsalmPlugin\Plugin">
             <containerXml>var/cache/dev/App_KernelDevDebugContainer.xml</containerXml>
             <containerXml>var/cache/dev/App_KernelTestDebugContainer.xml</containerXml>
diff --git a/src/Attribute/Page.php b/src/Attribute/Page.php
new file mode 100644
index 0000000..7705f7c
--- /dev/null
+++ b/src/Attribute/Page.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Attribute;
+
+use Attribute;
+use App\ValueResolver\PageValueResolver;
+
+#[Attribute(Attribute::TARGET_PARAMETER)]
+class Page
+{
+    /**
+     * @see PageValueResolver
+     */
+    public function __construct(
+        public string $name = 'page',
+    )
+    {
+    }
+}
diff --git a/src/Controller/Application/Products/ProductCrudController.php b/src/Controller/Application/Products/ProductCrudController.php
index 7730799..60ae1af 100644
--- a/src/Controller/Application/Products/ProductCrudController.php
+++ b/src/Controller/Application/Products/ProductCrudController.php
@@ -4,23 +4,28 @@
 
 namespace App\Controller\Application\Products;
 
-use Generator;
-use App\Attribute\TurboFrame;
+use App\Attribute\Page;
+use Pagerfanta\Pagerfanta;
 use App\Attribute\MainRequest;
 use App\Entity\Product\Product;
-use App\Response\TurboRedirectResponse;
+use Doctrine\ORM\AbstractQuery;
+use CuyZ\Valinor\Mapper\TreeMapper;
+use CuyZ\Valinor\Mapper\Source\Source;
 use App\Form\Entity\Product\ProductType;
 use Symfony\Component\HttpFoundation\Request;
 use App\Repository\Product\ProductRepository;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Form\FormFactoryInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use CuyZ\ValinorBundle\Configurator\Attributes\SupportDateFormats;
+use CuyZ\ValinorBundle\Configurator\Attributes\AllowSuperfluousKeys;
 
 class ProductCrudController extends AbstractController
 {
     public function __construct(
+        #[SupportDateFormats('Y-m-d', 'Y-m-d H:i'), AllowSuperfluousKeys]
+        private TreeMapper $treeMapper,
         protected ProductRepository $productRepository,
         private FormFactoryInterface $formFactory,
     )
@@ -35,24 +40,27 @@ public function filters(#[MainRequest] Request $request): Response
             'csrf_protection' => false,
             'method' => 'GET',
             'required' => false,
+            'attr' => [
+                'autocomplete' => 'off',
+            ],
         ])
             ->add('name', options: [
                 'required' => false,
-            ])
-        ;
+            ]);
         $filterForm->handleRequest($request);
 
-
         return $this->renderBlock('app/products/list.html.twig', 'filters', [
             'form' => $filterForm,
         ]);
     }
 
     #[Route('/', name: 'app_products_list', methods: ['GET'])]
-    public function list(): Response
+    public function list(Request $request, #[Page] int $page): Response
     {
+//        $_data = $this->treeMapper->map('array{name?: ?string}', Source::array($request->query->all('filters')));
+
         return $this->render('app/products/list.html.twig', [
-            'products' => $this->getProducts(),
+            'pager' => $this->getProducts($page),
         ]);
     }
 
@@ -65,8 +73,6 @@ public function create(Request $request): Response
             $this->productRepository->persistAndFlush($data);
 
             return $this->redirectToRoute('app_products_list');
-
-//            return new TurboRedirectResponse($this->generateUrl('app_products_list'), 'main');
         }
 
         return $this->render('app/products/form.html.twig', [
@@ -83,7 +89,6 @@ public function update(Request $request, Product $product): Response
             $this->productRepository->flush();
 
             return $this->redirectToRoute('app_products_list', ['_filters' => true], status: 303);
-//            return new TurboRedirectResponse($this->generateUrl('app_products_list'), 'main');
         }
 
         return $this->render('app/products/form.html.twig', [
@@ -91,11 +96,8 @@ public function update(Request $request, Product $product): Response
         ]);
     }
 
-    /**
-     * @return Generator<array-key, Product>
-     */
-    protected function getProducts(): Generator
+    protected function getProducts(int $page): Pagerfanta
     {
-        yield from $this->productRepository->findAll();
+        return $this->productRepository->paginateWhere($page);
     }
 }
diff --git a/src/Controller/Application/Products/ProductDetailsController.php b/src/Controller/Application/Products/ProductDetailsController.php
index decc404..1a65ee0 100644
--- a/src/Controller/Application/Products/ProductDetailsController.php
+++ b/src/Controller/Application/Products/ProductDetailsController.php
@@ -5,6 +5,7 @@
 namespace App\Controller\Application\Products;
 
 use Generator;
+use App\Attribute\Page;
 use App\Attribute\TurboFrame;
 use App\Entity\Product\Product;
 use App\Response\TurboRedirectResponse;
@@ -18,20 +19,20 @@
 class ProductDetailsController extends ProductCrudController
 {
     #[Route('/transport/{id}', name: 'app_products_transport', methods: ['GET', 'POST'])]
-    public function transport(Product $product): Response
+    public function transport(Product $product, #[Page] int $page): Response
     {
         return $this->render('app/products/details/transport.html.twig', [
             'product' => $product,
-            'products' => $this->getProducts(),
+            'pager' => $this->getProducts($page),
         ]);
     }
 
     #[Route('/sales/{id}', name: 'app_products_sales', methods: ['GET', 'POST'])]
-    public function sales(Product $product): Response
+    public function sales(Product $product, #[Page] int $page): Response
     {
         return $this->render('app/products/details/sales.html.twig', [
             'product' => $product,
-            'products' => $this->getProducts(),
+            'pager' => $this->getProducts($page),
         ]);
     }
 }
diff --git a/src/Decorator/FilterPassThruRouterDecorator.php b/src/Decorator/FilterPassThruRouterDecorator.php
index bd37df3..d83d761 100644
--- a/src/Decorator/FilterPassThruRouterDecorator.php
+++ b/src/Decorator/FilterPassThruRouterDecorator.php
@@ -4,6 +4,7 @@
 
 namespace App\Decorator;
 
+use Override;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\RouterInterface;
@@ -71,7 +72,7 @@ private function doProcess(array $parameters, Request $request): array
         return $parameters;
     }
 
-    #[\Override]
+    #[Override]
     public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         return $this->router->warmUp($cacheDir, $buildDir);
diff --git a/src/Repository/AbstractRepository.php b/src/Repository/AbstractRepository.php
index c38354e..6805654 100644
--- a/src/Repository/AbstractRepository.php
+++ b/src/Repository/AbstractRepository.php
@@ -3,6 +3,9 @@
 
 namespace App\Repository;
 
+use Pagerfanta\Pagerfanta;
+use Doctrine\ORM\QueryBuilder;
+use Pagerfanta\Doctrine\ORM\QueryAdapter;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 
 /**
@@ -12,6 +15,21 @@
  */
 abstract class AbstractRepository extends ServiceEntityRepository
 {
+    public function paginateWhere(int $page, array $_filters = []): Pagerfanta
+    {
+        $qb = $this->createQueryBuilder('o');
+        if (!$qb->getDQLPart('orderBy')) {
+            $this->setDefaultOrder($qb);
+        }
+        $adapter = new QueryAdapter($qb->getQuery());
+
+        $pagerfanta = new Pagerfanta($adapter);
+        $pagerfanta->setMaxPerPage(10);
+        $pagerfanta->setCurrentPage($page);
+
+        return $pagerfanta;
+    }
+
     /**
      * @param T $entity
      */
@@ -41,4 +59,8 @@ public function flush(): void
     {
         $this->getEntityManager()->flush();
     }
+
+    protected function setDefaultOrder(QueryBuilder $qb): void
+    {
+    }
 }
diff --git a/src/ValueResolver/PageValueResolver.php b/src/ValueResolver/PageValueResolver.php
new file mode 100644
index 0000000..9b3ccc7
--- /dev/null
+++ b/src/ValueResolver/PageValueResolver.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\ValueResolver;
+
+use App\Attribute\Page;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
+
+/**
+ * Use this attribute to inject ``page`` query parameter to your controller.
+ *
+ * Defaults to 1, and ``page`` as name. Future versions will support (if needed) multiples of them with different names.
+ *
+ * <code>
+ *   public function __invoke(#[Page] int $page)
+ * </code>
+ */
+class PageValueResolver implements ValueResolverInterface
+{
+    public function resolve(Request $request, ArgumentMetadata $argument): iterable
+    {
+        if (!$this->getAttribute($argument)) {
+            return [];
+        }
+        $name = $argument->getName();
+
+        yield $request->query->getInt($name, 1);
+    }
+
+    private function getAttribute(ArgumentMetadata $argument): ?Page
+    {
+        $attributes = $argument->getAttributes(Page::class, ArgumentMetadata::IS_INSTANCEOF);
+        $first = $attributes[0] ?? null;
+
+        return $first instanceof Page ? $first : null;
+    }
+}
diff --git a/stubs/Doctrine/Bundle/DoctrineBundle/Repository/ServiceEntityRepositoryProxy.stubphp b/stubs/Doctrine/Bundle/DoctrineBundle/Repository/ServiceEntityRepositoryProxy.stubphp
new file mode 100644
index 0000000..4fad5f7
--- /dev/null
+++ b/stubs/Doctrine/Bundle/DoctrineBundle/Repository/ServiceEntityRepositoryProxy.stubphp
@@ -0,0 +1,32 @@
+declare(strict_types=1);
+
+namespace Doctrine\Bundle\DoctrineBundle\Repository;
+
+use Doctrine\Common\Collections\AbstractLazyCollection;
+use Doctrine\Common\Collections\Criteria;
+use Doctrine\Common\Collections\Selectable;
+use Doctrine\DBAL\LockMode;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Mapping\ClassMetadata;
+use Doctrine\ORM\Query\ResultSetMappingBuilder;
+use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ManagerRegistry;
+use LogicException;
+use Symfony\Component\VarExporter\LazyObjectInterface;
+
+use function sprintf;
+
+/**
+ * @internal Extend {@see ServiceEntityRepository} instead.
+ *
+ * @template T of object
+ * @template-extends EntityRepository<T>
+ */
+class ServiceEntityRepositoryProxy extends EntityRepository implements ServiceEntityRepositoryInterface
+{
+    /**
+     * @return QueryBuilder<T>
+     */
+    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder{}
+}
diff --git a/stubs/Doctrine/ORM/AbstractQuery.stubphp b/stubs/Doctrine/ORM/AbstractQuery.stubphp
new file mode 100644
index 0000000..4001dff
--- /dev/null
+++ b/stubs/Doctrine/ORM/AbstractQuery.stubphp
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\ORM;
+
+/**
+ * @template T
+ */
+abstract class AbstractQuery
+{
+    /**
+     * @psalm-param string|AbstractQuery::HYDRATE_*|null $hydrationMode
+     *
+     * @return (
+     *    $hydrationMode is self::HYDRATE_OBJECT|null
+     *    ? array<array-key, T>
+     *    : mixed
+     * )
+     */
+    public function getResult($hydrationMode = self::HYDRATE_OBJECT)
+    {
+    }
+
+    /**
+     * @psalm-param string|AbstractQuery::HYDRATE_*|null $hydrationMode
+     *
+     * @return (
+     *    $hydrationMode is self::HYDRATE_OBJECT|null
+     *    ? null|T
+     *    : mixed
+     * )
+     */
+    public function getOneOrNullResult(string|int|null $hydrationMode = null)
+    {}
+
+    /**
+     * @psalm-param string|AbstractQuery::HYDRATE_*|null $hydrationMode
+     *
+     * @return (
+     *    $hydrationMode is self::HYDRATE_OBJECT|null
+     *    ? T
+     *    : mixed
+     * )
+     */
+    public function getSingleResult(string|int|null $hydrationMode = null)
+    {}
+}
diff --git a/stubs/Doctrine/ORM/EntityRepository.stubphp b/stubs/Doctrine/ORM/EntityRepository.stubphp
new file mode 100644
index 0000000..45333cf
--- /dev/null
+++ b/stubs/Doctrine/ORM/EntityRepository.stubphp
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\ORM;
+
+use Doctrine\Common\Collections\Criteria;
+use Doctrine\Common\Collections\Selectable;
+use Doctrine\Persistence\ObjectRepository;
+
+/**
+ * @template T of object
+ * @template-implements Selectable<int,T>
+ * @template-implements ObjectRepository<T>
+ */
+class EntityRepository implements ObjectRepository, Selectable
+{
+    /**
+     * @return QueryBuilder<T>
+     */
+    public function createQueryBuilder(string $alias, string|null $indexBy = null): QueryBuilder
+    {}
+}
diff --git a/stubs/Doctrine/ORM/Query.stubphp b/stubs/Doctrine/ORM/Query.stubphp
new file mode 100644
index 0000000..63ac621
--- /dev/null
+++ b/stubs/Doctrine/ORM/Query.stubphp
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\ORM;
+
+/**
+ * @template T
+ * @extends AbstractQuery<T>
+ */
+class Query extends AbstractQuery
+{
+    /**
+     * @psalm-this-out self<mixed>
+     *
+     * @return self<mixed>
+     */
+    public function setHydrationMode(string|int $hydrationMode): static
+    {}
+}
diff --git a/stubs/Doctrine/ORM/QueryBuilder.stubphp b/stubs/Doctrine/ORM/QueryBuilder.stubphp
new file mode 100644
index 0000000..074c061
--- /dev/null
+++ b/stubs/Doctrine/ORM/QueryBuilder.stubphp
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\ORM;
+
+/**
+ * @template T
+ */
+class QueryBuilder implements \Stringable
+{
+    /**
+     * @return Query<T>
+     */
+    public function getQuery(): Query
+    {}
+
+    /**
+     * @psalm-this-out self<mixed>
+     *
+     * @psalm-return QueryBuilder<mixed>
+     */
+    public function select(mixed ...$select): static
+    {}
+
+
+}
diff --git a/symfony.lock b/symfony.lock
index 1bedac8..807a4ef 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -1,4 +1,10 @@
 {
+    "babdev/pagerfanta-bundle": {
+        "version": "v4.4.0"
+    },
+    "cuyz/valinor-bundle": {
+        "version": "0.2.3"
+    },
     "doctrine/doctrine-bundle": {
         "version": "2.11",
         "recipe": {
diff --git a/templates/app/embedded/table.html.twig b/templates/app/embedded/table.html.twig
new file mode 100644
index 0000000..e69de29
diff --git a/templates/app/embedded/table_card.html.twig b/templates/app/embedded/table_card.html.twig
new file mode 100644
index 0000000..8497418
--- /dev/null
+++ b/templates/app/embedded/table_card.html.twig
@@ -0,0 +1,33 @@
+<div class="card">
+    <div class="card-body">
+        <table class="table caption-top">
+            <caption>{{ caption|default('') }}</caption>
+
+{#            <colgroup>#}
+{#                <col class="col-200" span="1" />#}
+{#                <col class="xxx" span="1" />#}
+{#                <col class="col-edit" span="1" />#}
+{#            </colgroup>#}
+
+            <thead>
+            <tr>
+                {% for column in columns|default([]) %}
+                    <th scope="col">{{ column }}</th>
+                {% endfor %}
+                <th scope="col" class="text-end">Actions</th>
+            </tr>
+            </thead>
+            <tbody>
+            {% block tbody -%}{%- endblock tbody %}
+            </tbody>
+
+            <tfoot>
+            {% if pager is defined %}
+                <tr>
+                    <td colspan="20">{{ pagerfanta(pager) }}</td>
+                </tr>
+            {% endif %}
+            </tfoot>
+        </table>
+    </div>
+</div>
diff --git a/templates/app/products/details/_details_base.html.twig b/templates/app/products/details/_details_base.html.twig
index 5345d61..e06d4dc 100644
--- a/templates/app/products/details/_details_base.html.twig
+++ b/templates/app/products/details/_details_base.html.twig
@@ -5,7 +5,7 @@
         <div class="card">
             <div class="card-header hide-empty">
                 {% block details_header %}BLOCK: details_header{% endblock %}
-                 <a href="{{ path('app_products_list') }}" class="bi bi-x-circle" data-turbo-frame="inner" data-turbo-action="advance"></a>
+                 <a href="{{ path('app_products_list', {'_filters': true}) }}" class="bi bi-x-circle" data-turbo-frame="inner" data-turbo-action="advance"></a>
             </div>
 
             <div class="card-body">
diff --git a/templates/app/products/form.html.twig b/templates/app/products/form.html.twig
index 8af3451..8e2c5cf 100644
--- a/templates/app/products/form.html.twig
+++ b/templates/app/products/form.html.twig
@@ -13,16 +13,22 @@
                         <div class="row">
                             <div class="col-6 pt-3">
                                 {{ form_row(form.name) }}
-                                {{ form_row(form.description) }}
                             </div>
                             <div class="col-6 pt-2">
                                 {{ form_row(form.price) }}
                             </div>
                         </div>
+
+                        <div class="row">
+                            <div class="col">
+                                {{ form_row(form.description) }}
+                            </div>
+                        </div>
                     {% endblock %}
 
                     {% block footer %}
                         <button type="submit" class="btn btn-primary">Submit</button>
+                        <a class="btn btn-secondary" href="{{ path('app_products_list', {_filters: true}) }}">Back</a>
                     {% endblock %}
                 {% endembed %}
             </div>
diff --git a/templates/app/products/list.html.twig b/templates/app/products/list.html.twig
index f75b551..d015aee 100644
--- a/templates/app/products/list.html.twig
+++ b/templates/app/products/list.html.twig
@@ -12,57 +12,51 @@
                         <a href="{{ path('app_products_list') }}">Products</a>
                     </li>
                     <li class="breadcrumb-item">
-                        <a class="bi bi-plus-circle" href="{{ path('app_products_create') }}"></a>
+                        <a class="bi bi-plus-circle" href="{{ path('app_products_create', {_filters: true}) }}" data-turbo-frame="inner"></a>
                     </li>
                 </ol>
             </nav>
         </div>
 
         <div class="row" data-turbo-action="advance">
-            <div class="col-1">
+            <div class="col-2">
                 {{ render(path('app_products_filters')) }}
             </div>
 
             {% block inner %}
                 <turbo-frame id="inner" class="col" data-turbo-action="advance">
-                    {{ random() }}
-                    <div class="card">
-                        <div class="card-body">
-                            <table class="table caption-top">
-                                <caption>Products</caption>
-                                <thead>
-                                <tr>
-                                    <th scope="col">#</th>
-                                    <th scope="col">Name</th>
-                                    <th scope="col">Price</th>
-                                    <th scope="col" class="text-end">Actions</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                {% for product in products %}
-                                    <tr>
-                                        <th scope="row">1</th>
-                                        <td>
-                                            <a href="{{ path('app_products_update', {'id': product.id, '_filters': true}) }}" data-turbo-action="advance">
-                                                {{ product.name }}
-                                            </a>
-                                        </td>
-                                        <td>
-                                            {{ product.price|money_localized_format }}
-                                        </td>
-                                        <td class="text-end">
-                                            <a href="{{ path('app_products_transport', {'id': product.id}) }}" data-turbo-frame="details" data-turbo-action="advance">Transport</a>|
-                                            <a href="{{ path('app_products_sales', {'id': product.id}) }}" data-turbo-frame="details" data-turbo-action="advance">Sales</a>
-                                        </td>
-                                    </tr>
-                                {% endfor %}
-                                </tbody>
-                            </table>
+                    <div class="row">
+                        <div class="col">
+                            {% embed 'app/embedded/table_card.html.twig' with {caption: 'Products', columns: ['Name', 'Price']} %}
+                                {% block tbody %}
+                                    {% for product in pager %}
+                                        <tr>
+                                            <td>
+                                                <a href="{{ path('app_products_update', {'id': product.id, '_filters': true}) }}" data-turbo-action="advance">
+                                                    {{ product.name }}
+                                                </a>
+                                            </td>
+                                            <td>
+                                                {{ product.price|money_localized_format }}
+                                            </td>
+                                            <td class="text-end">
+                                                <a href="{{ path('app_products_transport', {'id': product.id, '_filters': true}) }}" data-turbo-frame="details" data-turbo-action="advance">Transport</a>|
+                                                <a href="{{ path('app_products_sales', {'id': product.id, '_filters': true}) }}" data-turbo-frame="details" data-turbo-action="advance">Sales</a>
+                                            </td>
+                                        </tr>
+                                    {% endfor %}
+                                {% endblock %}
+
+                            {% endembed %}
                         </div>
+
+                        {% block details -%}
+                            <turbo-frame class="col-4 hide-empty" id="details"></turbo-frame>
+                        {%- endblock details %}
+
                     </div>
-                </turbo-frame>
 
-                {% block details -%}<turbo-frame class="col-4 hide-empty" id="details"></turbo-frame>{%- endblock details %}
+                </turbo-frame>
 
             {% endblock inner %}
         </div>
@@ -70,9 +64,14 @@
 {%- endblock main %}
 
 {% block filters %}
-    {{ form_start(form) }}
-    {{ random(1, 99999999) }}
-    {{ form_rest(form) }}
-    <button type="submit" class="btn btn-primary">Filter</button>
-    {{ form_end(form) }}
+    <div class="card">
+        <div class="card-body">
+            <h5 class="card-title">Filters</h5>
+            {{ form_start(form) }}
+            {{ form_rest(form) }}
+            <button type="submit" class="btn btn-primary">Filter</button>
+            <a class="btn btn-secondary" href="{{ path('app_products_list') }}">Reset</a>
+            {{ form_end(form) }}
+        </div>
+    </div>
 {% endblock filters %}