diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 0e9306f..8ab3256 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1,3 +1,3 @@
 # Contributors
 
-- Lur Ibargutxi [libargutxi@codesyntax.com]
+- Plone Community [collective@plone.org]
diff --git a/LICENSE.md b/LICENSE.md
index a3a620a..d7e00b9 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-cs_dynamicpages Copyright 2025, Lur Ibargutxi
+cs_dynamicpages Copyright 2025, Plone Community
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License version 2
diff --git a/Makefile b/Makefile
index fef1930..72b1955 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ requirements-mxdev.txt: pyproject.toml mx.ini ## Generate constraints file
 
 $(VENV_FOLDER): requirements-mxdev.txt ## Install dependencies
 	@echo "$(GREEN)==> Install environment$(RESET)"
-	@uv venv --python=3.10 $(VENV_FOLDER)
+	@uv venv $(VENV_FOLDER)
 	@uv pip install -r requirements-mxdev.txt
 
 .PHONY: sync
@@ -131,4 +131,10 @@ test-coverage: $(VENV_FOLDER) ## run tests with coverage
 
 ## Add bobtemplates features (check bobtemplates.plone's documentation to get the list of available features)
 add: $(VENV_FOLDER)
-	/home/lur/plonecli_azkena/bin/plonecli add $(filter-out $@,$(MAKECMDGOALS))
+	@uvx plonecli add -b .mrbob.ini $(filter-out $@,$(MAKECMDGOALS))
+
+.PHONY: release
+release: $(VENV_FOLDER) ## Create a release
+	@echo "$(GREEN)==> Create a release$(RESET)"
+	@uv pip install -e ".[release]"
+	@uv run fullrelease
\ No newline at end of file
diff --git a/README.md b/README.md
index 99e93b6..ce2ecf7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # cs_dynamicpages
 
-An addon to create dynamic pages for Plone
+A new addon for Plone
 
 ## Features
 
@@ -22,8 +22,8 @@ make create-site
 
 ## Contribute
 
-- [Issue tracker](https://github.com/cs/cs_dynamicpages/issues)
-- [Source code](https://github.com/cs/cs_dynamicpages/)
+- [Issue tracker](https://github.com/collective/cs_dynamicpages/issues)
+- [Source code](https://github.com/collective/cs_dynamicpages/)
 
 ### Prerequisites ✅
 
@@ -38,7 +38,7 @@ make create-site
 1.  Clone this repository, then change your working directory.
 
     ```shell
-    git clone git@github.com:cs/cs_dynamicpages.git
+    git clone git@github.com:collective/cs_dynamicpages.git
     cd cs_dynamicpages
     ```
 
@@ -83,4 +83,4 @@ The project is licensed under GPLv2.
 
 ## Credits and acknowledgements 🙏
 
-Generated using [Cookieplone (0.9.7)](https://github.com/plone/cookieplone) and [cookieplone-templates (6782781)](https://github.com/plone/cookieplone-templates/commit/6782781dae4bafb227467828066ab16b84c23750) on 2025-07-07 09:25:15.108762. A special thanks to all contributors and supporters!
+Generated using [Cookieplone (0.9.7)](https://github.com/plone/cookieplone) and [cookieplone-templates (4d55553)](https://github.com/plone/cookieplone-templates/commit/4d55553d61416df56b3360914b398d675b3f72a6) on 2025-07-17 11:59:12.982862. A special thanks to all contributors and supporters!
diff --git a/pyproject.toml b/pyproject.toml
index 601e8cd..811ef4c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,31 +1,30 @@
 [project]
 name = "cs_dynamicpages"
 dynamic = ["version"]
-description = "An addon to create dynamic pages for Plone"
+description = "A new addon for Plone"
 readme = "README.md"
 license = "GPL-2.0-only"
 requires-python = ">=3.10"
-authors = [
-    { name = "Lur Ibargutxi", email = "libargutxi@codesyntax.com" },
-]
-keywords = [
-    "CMS",
-    "Plone",
-    "Python",
-]
+authors = [{ name = "Plone Community", email = "collective@plone.org" }]
+keywords = ["CMS", "Plone", "Python"]
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Environment :: Web Environment",
-    "Framework :: Plone","Framework :: Plone :: 6.0","Framework :: Plone :: 6.1",
+    "Framework :: Plone",
+    "Framework :: Plone :: 6.0",
+    "Framework :: Plone :: 6.1",
     "Framework :: Plone :: Addon",
     "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
     "Operating System :: OS Independent",
-    "Programming Language :: Python","Programming Language :: Python :: 3.10","Programming Language :: Python :: 3.11","Programming Language :: Python :: 3.12","Programming Language :: Python :: 3.13",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
     "Products.CMFPlone",
     "plone.api",
-    "z3c.jbot",
     "collective.z3cform.datagridfield",
 ]
 
@@ -33,17 +32,24 @@ dependencies = [
 test = [
     "horse-with-no-namespace",
     "plone.app.testing",
-    "plone.classicui","plone.restapi[test]",
+    "plone.app.contenttypes[test]",
+    "plone.classicui",
+    "plone.restapi[test]",
     "pytest",
     "pytest-cov",
     "pytest-plone>=0.5.0",
 ]
+release = [
+    "zest.releaser[recommended]",
+    "zestreleaser.towncrier",
+    "zest.pocompile",
+]
 
 [project.urls]
-Homepage = "https://github.com/cs/cs_dynamicpages"
+Homepage = "https://github.com/collective/cs_dynamicpages"
 PyPI = "https://pypi.org/project/cs_dynamicpages"
-Source = "https://github.com/cs/cs_dynamicpages"
-Tracker = "https://github.com/cs/cs_dynamicpages/issues"
+Source = "https://github.com/collective/cs_dynamicpages"
+Tracker = "https://github.com/collective/cs_dynamicpages/issues"
 
 
 [project.entry-points."plone.autoinclude.plugin"]
@@ -63,9 +69,7 @@ build-backend = "hatchling.build"
 strict-naming = true
 
 [tool.hatch.build.targets.sdist]
-exclude = [
-  "/.github",
-]
+exclude = ["/.github"]
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/cs_dynamicpages"]
@@ -76,7 +80,7 @@ filename = "CHANGELOG.md"
 start_string = "<!-- towncrier release notes start -->\n"
 title_format = "## {version} ({project_date})"
 template = "news/.changelog_template.jinja"
-issue_format = "[#{issue}](https://github.com/cs/cs_dynamicpages/issues/{issue})"
+issue_format = "[#{issue}](https://github.com/collective/cs_dynamicpages/issues/{issue})"
 underlines = ["", "", ""]
 
 [[tool.towncrier.type]]
@@ -131,7 +135,8 @@ lint.select = [
     # mccabe
     "C90",
     # pycodestyle
-    "E", "W",
+    "E",
+    "W",
     # pyflakes
     "F",
     # pygrep-hooks
@@ -168,6 +173,8 @@ testpaths = ["tests"]
 source_pkgs = ["cs_dynamicpages", "tests"]
 branch = true
 parallel = true
-omit = [
-  "src/cs_dynamicpages/locales/*.py",
-]
\ No newline at end of file
+omit = ["src/cs_dynamicpages/locales/*.py"]
+
+
+[tool.zest-releaser]
+python-file-with-version = "src/cs_dynamicpages/__init__.py"
diff --git a/src/cs_dynamicpages/behaviors/configure.zcml b/src/cs_dynamicpages/behaviors/configure.zcml
index f1d4aeb..ea2852a 100644
--- a/src/cs_dynamicpages/behaviors/configure.zcml
+++ b/src/cs_dynamicpages/behaviors/configure.zcml
@@ -13,14 +13,14 @@
 
   <!-- -*- extra stuff goes here -*- -->
 
-    <plone:behavior
-        name="cs_dynamicpages.row_columns"
-        title="RowColumns"
-        description="This behavior provides..."
-        provides=".row_columns.IRowColumns"
-        factory=".row_columns.RowColumns"
-        marker=".row_columns.IRowColumnsMarker"
-        />
+  <plone:behavior
+      name="cs_dynamicpages.row_columns"
+      title="RowColumns"
+      description="This behavior provides..."
+      factory=".row_columns.RowColumns"
+      provides=".row_columns.IRowColumns"
+      marker=".row_columns.IRowColumnsMarker"
+      />
 
 
   <plone:behavior
diff --git a/src/cs_dynamicpages/behaviors/related_image.py b/src/cs_dynamicpages/behaviors/related_image.py
index 51a104e..afcf6d3 100644
--- a/src/cs_dynamicpages/behaviors/related_image.py
+++ b/src/cs_dynamicpages/behaviors/related_image.py
@@ -1,15 +1,28 @@
-from plone.app.z3cform.widgets.contentbrowser import ContentBrowserFieldWidget
+# from plone.app.z3cform.widgets.contentbrowser import ContentBrowserFieldWidget
 from plone.autoform import directives as form
 from plone.autoform.interfaces import IFormFieldProvider
 from plone.supermodel import model
 from Products.CMFPlone.utils import safe_hasattr
 from z3c.relationfield.schema import RelationChoice
 from z3c.relationfield.schema import RelationList
+from zope import schema
 from zope.component import adapter
 from zope.interface import implementer
 from zope.interface import Interface
 from zope.interface import provider
-from zope import schema
+
+
+try:
+    # This is for Plone 6.1
+    from plone.app.z3cform.widgets.contentbrowser import (
+        ContentBrowserFieldWidget as RelatedImageFieldWidget,
+    )
+except ImportError:
+    # This is for previous versions of Plone
+    from plone.app.z3cform.widgets.relateditems import (
+        RelatedItemsFieldWidget as RelatedImageFieldWidget,
+    )
+
 
 class IRelatedImageMarker(Interface):
     pass
@@ -29,7 +42,7 @@ class IRelatedImage(model.Schema):
 
     form.widget(
         "related_image",
-        ContentBrowserFieldWidget,
+        RelatedImageFieldWidget,
         vocabulary="plone.app.vocabularies.Catalog",
         pattern_options={
             "recentlyUsed": True,
@@ -68,4 +81,4 @@ def image_position(self):
 
     @image_position.setter
     def image_position(self, value):
-        self.context.image_position = value
\ No newline at end of file
+        self.context.image_position = value
diff --git a/src/cs_dynamicpages/behaviors/row_columns.py b/src/cs_dynamicpages/behaviors/row_columns.py
index f13decb..674e4a2 100644
--- a/src/cs_dynamicpages/behaviors/row_columns.py
+++ b/src/cs_dynamicpages/behaviors/row_columns.py
@@ -1,13 +1,10 @@
-# -*- coding: utf-8 -*-
-
-from cs_dynamicpages import _
 from plone import schema
 from plone.autoform.interfaces import IFormFieldProvider
 from plone.supermodel import model
 from Products.CMFPlone.utils import safe_hasattr
 from zope.component import adapter
-from zope.interface import Interface
 from zope.interface import implementer
+from zope.interface import Interface
 from zope.interface import provider
 
 
@@ -17,8 +14,7 @@ class IRowColumnsMarker(Interface):
 
 @provider(IFormFieldProvider)
 class IRowColumns(model.Schema):
-    """
-    """
+    """ """
 
     columns = schema.Choice(
         title="Columns",
@@ -30,13 +26,13 @@ class IRowColumns(model.Schema):
 
 @implementer(IRowColumns)
 @adapter(IRowColumnsMarker)
-class RowColumns(object):
+class RowColumns:
     def __init__(self, context):
         self.context = context
 
     @property
     def columns(self):
-        if safe_hasattr(self.context, 'columns'):
+        if safe_hasattr(self.context, "columns"):
             return self.context.columns
         return None
 
diff --git a/src/cs_dynamicpages/browser/configure.zcml b/src/cs_dynamicpages/browser/configure.zcml
index 624ce2f..140a7db 100644
--- a/src/cs_dynamicpages/browser/configure.zcml
+++ b/src/cs_dynamicpages/browser/configure.zcml
@@ -7,16 +7,6 @@
 
 
 
-  <!-- Set overrides folder for Just-a-Bunch-Of-Templates product -->
-  <include
-      package="z3c.jbot"
-      file="meta.zcml"
-      />
-  <browser:jbot
-      directory="overrides"
-      layer="cs_dynamicpages.interfaces.IBrowserLayer"
-      />
-
   <!-- Publish static files -->
   <plone:static
       directory="static"
diff --git a/src/cs_dynamicpages/configure.zcml b/src/cs_dynamicpages/configure.zcml
index 8909b49..7a411ec 100644
--- a/src/cs_dynamicpages/configure.zcml
+++ b/src/cs_dynamicpages/configure.zcml
@@ -21,10 +21,10 @@
 
   <!-- -*- extra stuff goes here -*- -->
 
-    <include package=".vocabularies" />
+  <include package=".vocabularies" />
 
 
-    <include package=".vocabularies" />
+  <include package=".vocabularies" />
 
 
   <include package=".controlpanels" />
diff --git a/src/cs_dynamicpages/content/dynamic_page_row.py b/src/cs_dynamicpages/content/dynamic_page_row.py
index aed9969..e7f71da 100644
--- a/src/cs_dynamicpages/content/dynamic_page_row.py
+++ b/src/cs_dynamicpages/content/dynamic_page_row.py
@@ -11,7 +11,7 @@
 # from z3c.form.browser.radio import RadioFieldWidget
 from zope import schema
 from zope.interface import implementer
-from plone import api
+
 
 log = getLogger(__name__)
 
@@ -52,10 +52,12 @@ def featured_list(self):
 
     def show_featured_add_button(self):
         row_type = self.row_type
-        row_type_fields = api.portal.get_registry_record('cs_dynamicpages.dynamica_pages_control_panel.row_type_fields')
+        row_type_fields = api.portal.get_registry_record(
+            "cs_dynamicpages.dynamica_pages_control_panel.row_type_fields"
+        )
         for row_type_field in row_type_fields:
-            if row_type_field['row_type'] == row_type:
-                return row_type_field['row_type_has_featured_add_button']
+            if row_type_field["row_type"] == row_type:
+                return row_type_field["row_type_has_featured_add_button"]
         return False
 
     def render(self, request):
diff --git a/src/cs_dynamicpages/content/dynamic_page_row_featured.py b/src/cs_dynamicpages/content/dynamic_page_row_featured.py
index 1a20140..27ad5f5 100644
--- a/src/cs_dynamicpages/content/dynamic_page_row_featured.py
+++ b/src/cs_dynamicpages/content/dynamic_page_row_featured.py
@@ -1,5 +1,6 @@
 # from plone.app.textfield import RichText
 # from plone.autoform import directives
+from plone import api
 from plone.dexterity.content import Item
 
 # from plone.namedfile import field as namedfile
@@ -9,7 +10,7 @@
 # from z3c.form.browser.radio import RadioFieldWidget
 # from zope import schema
 from zope.interface import implementer
-from plone import api
+
 
 # from cs_dynamicpages import _
 
diff --git a/src/cs_dynamicpages/controlpanels/dynamica_pages_control_panel/controlpanel.py b/src/cs_dynamicpages/controlpanels/dynamica_pages_control_panel/controlpanel.py
index 49009ca..3769ed6 100644
--- a/src/cs_dynamicpages/controlpanels/dynamica_pages_control_panel/controlpanel.py
+++ b/src/cs_dynamicpages/controlpanels/dynamica_pages_control_panel/controlpanel.py
@@ -1,15 +1,16 @@
+from collective.z3cform.datagridfield.datagridfield import DataGridFieldFactory
+from collective.z3cform.datagridfield.registry import DictRow
 from cs_dynamicpages import _
 from cs_dynamicpages.interfaces import IBrowserLayer
 from plone.app.registry.browser.controlpanel import ControlPanelFormWrapper
 from plone.app.registry.browser.controlpanel import RegistryEditForm
+from plone.autoform.directives import widget
 from plone.restapi.controlpanels import RegistryConfigletPanel
 from plone.z3cform import layout
 from zope import schema
 from zope.component import adapter
 from zope.interface import Interface
-from collective.z3cform.datagridfield.datagridfield import DataGridFieldFactory
-from collective.z3cform.datagridfield.registry import DictRow
-from plone.autoform.directives import widget
+
 
 class IRowTypeFieldsSchema(Interface):
     row_type = schema.Choice(
@@ -35,18 +36,31 @@ class IRowTypeFieldsSchema(Interface):
 class IDynamicaPagesControlPanel(Interface):
     widget(row_type_fields=DataGridFieldFactory)
     row_type_fields = schema.List(
-        title=u"Row Type Fields",
+        title="Row Type Fields",
         required=True,
-        value_type=DictRow(title=u"Row Type Fields", schema=IRowTypeFieldsSchema),
+        value_type=DictRow(title="Row Type Fields", schema=IRowTypeFieldsSchema),
         default=[
             {
                 "row_type": "cs_dynamicpages-featured-view",
-                "each_row_type_fields": ["IBasic.title", "IBasic.description", "IRelatedImage.related_image", "IRelatedImage.image_position", "ILinkInfo.link_text", "ILinkInfo.link_url"],
+                "each_row_type_fields": [
+                    "IBasic.title",
+                    "IBasic.description",
+                    "IRelatedImage.related_image",
+                    "IRelatedImage.image_position",
+                    "ILinkInfo.link_text",
+                    "ILinkInfo.link_url",
+                ],
                 "row_type_has_featured_add_button": False,
             },
             {
                 "row_type": "cs_dynamicpages-featured-overlay-view",
-                "each_row_type_fields": ["IBasic.title", "IBasic.description", "IRelatedImage.related_image", "ILinkInfo.link_text", "ILinkInfo.link_url"],
+                "each_row_type_fields": [
+                    "IBasic.title",
+                    "IBasic.description",
+                    "IRelatedImage.related_image",
+                    "ILinkInfo.link_text",
+                    "ILinkInfo.link_url",
+                ],
                 "row_type_has_featured_add_button": False,
             },
             {
@@ -76,7 +90,15 @@ class IDynamicaPagesControlPanel(Interface):
             },
             {
                 "row_type": "cs_dynamicpages-query-columns-view",
-                "each_row_type_fields": ["IBasic.title", "ICollection.query", "ICollection.sort_on", "ICollection.sort_order", "ICollection.betweeen", "ICollection.limit", "IRowColumns.columns"],
+                "each_row_type_fields": [
+                    "IBasic.title",
+                    "ICollection.query",
+                    "ICollection.sort_on",
+                    "ICollection.sort_order",
+                    "ICollection.betweeen",
+                    "ICollection.limit",
+                    "IRowColumns.columns",
+                ],
                 "row_type_has_featured_add_button": False,
             },
             {
diff --git a/src/cs_dynamicpages/dependencies.zcml b/src/cs_dynamicpages/dependencies.zcml
index 75ca76a..3a4d184 100644
--- a/src/cs_dynamicpages/dependencies.zcml
+++ b/src/cs_dynamicpages/dependencies.zcml
@@ -1,5 +1,5 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
   <!-- List all packages you depend here -->
-
+  <include package="collective.z3cform.datagridfield" />
 </configure>
diff --git a/src/cs_dynamicpages/locales/__main__.py b/src/cs_dynamicpages/locales/__main__.py
index a5677b6..cea189c 100644
--- a/src/cs_dynamicpages/locales/__main__.py
+++ b/src/cs_dynamicpages/locales/__main__.py
@@ -37,7 +37,7 @@ def locale_folder_setup(domain: str):
                 f"--input={locale_path}/{domain}.pot "
                 f"--output={locale_path}/{lang}/LC_MESSAGES/{domain}.po"
             )
-            subprocess.call(cmd, shell=True)  # noQA: S602
+            subprocess.call(cmd, shell=True)  # noqa: S602
 
 
 def _rebuild(domain: str):
@@ -46,7 +46,7 @@ def _rebuild(domain: str):
         f"--exclude {excludes} "
         f"--create {domain} {target_path}"
     )
-    subprocess.call(cmd, shell=True)  # noQA: S602
+    subprocess.call(cmd, shell=True)  # noqa: S602
 
 
 def _sync(domain: str):
@@ -54,7 +54,7 @@ def _sync(domain: str):
         f"{i18ndude} sync --pot {locale_path}/{domain}.pot "
         f"{locale_path}/*/LC_MESSAGES/{domain}.po"
     )
-    subprocess.call(cmd, shell=True)  # noQA: S602
+    subprocess.call(cmd, shell=True)  # noqa: S602
 
 
 def main():
diff --git a/src/cs_dynamicpages/locales/cs_dynamicpages.pot b/src/cs_dynamicpages/locales/cs_dynamicpages.pot
new file mode 100644
index 0000000..ca28bf5
--- /dev/null
+++ b/src/cs_dynamicpages/locales/cs_dynamicpages.pot
@@ -0,0 +1,18 @@
+#--- PLEASE EDIT THE LINES BELOW CORRECTLY ---
+#SOME DESCRIPTIVE TITLE.
+#FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2022-05-25 17:12+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"Language-Code: en\n"
+"Language-Name: English\n"
+"Preferred-Encodings: utf-8 latin1\n"
+"Domain: cs_dynamicpages\n"
diff --git a/src/cs_dynamicpages/permissions.zcml b/src/cs_dynamicpages/permissions.zcml
index 6773a76..cf82d48 100644
--- a/src/cs_dynamicpages/permissions.zcml
+++ b/src/cs_dynamicpages/permissions.zcml
@@ -17,7 +17,7 @@
       title="cs_dynamicpages: Add DynamicPageRow"
       />
 
-   <permission
+  <permission
       id="cs_dynamicpages.AddDynamicPageFolder"
       title="cs_dynamicpages: Add DynamicPageFolder"
       />
diff --git a/src/cs_dynamicpages/profiles/default/metadata.xml b/src/cs_dynamicpages/profiles/default/metadata.xml
index ec58cba..999094f 100644
--- a/src/cs_dynamicpages/profiles/default/metadata.xml
+++ b/src/cs_dynamicpages/profiles/default/metadata.xml
@@ -2,5 +2,8 @@
 <metadata>
   <version>1000</version>
   <dependencies>
-    <dependency>profile-plone.app.dexterity:default</dependency></dependencies>
+    <dependency>profile-plone.app.dexterity:default</dependency>
+    <dependency>profile-collective.z3cform.datagridfield:default</dependency>
+
+  </dependencies>
 </metadata>
diff --git a/src/cs_dynamicpages/profiles/default/registry/dynamic_bundle.xml b/src/cs_dynamicpages/profiles/default/registry/dynamic_bundle.xml
index 2419b1c..908eb65 100644
--- a/src/cs_dynamicpages/profiles/default/registry/dynamic_bundle.xml
+++ b/src/cs_dynamicpages/profiles/default/registry/dynamic_bundle.xml
@@ -1,50 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <registry>
-    <records interface="cs_dynamicpages.controlpanels.dynamica_pages_control_panel.controlpanel.IDynamicaPagesControlPanel" />
+  <!-- Resource bundle for DynamicPageRow edit page -->
 
-    <!-- Resource bundle for DynamicPageRow edit page -->
-
-     <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
            prefix="plone.bundles/cs_dynamicpages.dynamicpagerow_edit"
   >
-        <value key="enabled">True</value>
-        <value key="jscompilation">++plone++cs_dynamicpages.edit/edit_dynamicpagerow.js</value>
-        <value key="csscompilation">++plone++cs_dynamicpages.edit/dynamicpageview.css</value>
-        <value key="depends">plone</value>
-        <value key="load_async">True</value>
-        <value key="load_defer">False</value>
-        <value key="expression" />
+    <value key="enabled">True</value>
+    <value key="jscompilation">++plone++cs_dynamicpages.edit/edit_dynamicpagerow.js</value>
+    <value key="csscompilation">++plone++cs_dynamicpages.edit/dynamicpageview.css</value>
+    <value key="depends">plone</value>
+    <value key="load_async">True</value>
+    <value key="load_defer">False</value>
+    <value key="expression" />
   </records>
   <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
            prefix="plone.bundles/cs_dynamicpages.dynamicpagerow_view_delete"
   >
-        <value key="enabled">True</value>
-        <value key="jscompilation">++plone++cs_dynamicpages.edit/delete-row.js</value>
-        <value key="depends">plone</value>
-        <value key="load_async">True</value>
-        <value key="load_defer">False</value>
-        <value key="expression" />
+    <value key="enabled">True</value>
+    <value key="jscompilation">++plone++cs_dynamicpages.edit/delete-row.js</value>
+    <value key="depends">plone</value>
+    <value key="load_async">True</value>
+    <value key="load_defer">False</value>
+    <value key="expression" />
   </records>
 
   <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
            prefix="plone.bundles/cs_dynamicpages.dynamicpagerow_view_reorder"
   >
-        <value key="enabled">True</value>
-        <value key="jscompilation">++plone++cs_dynamicpages.edit/reorder-rows.js</value>
-        <value key="depends">plone</value>
-        <value key="load_async">True</value>
-        <value key="load_defer">False</value>
-        <value key="expression" />
+    <value key="enabled">True</value>
+    <value key="jscompilation">++plone++cs_dynamicpages.edit/reorder-rows.js</value>
+    <value key="depends">plone</value>
+    <value key="load_async">True</value>
+    <value key="load_defer">False</value>
+    <value key="expression" />
   </records>
 
   <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
            prefix="plone.bundles/cs_dynamicpages.editmode_toggle"
   >
-        <value key="enabled">True</value>
-        <value key="jscompilation">++plone++cs_dynamicpages.edit/editmode-toggle.js</value>
-        <value key="depends">plone</value>
-        <value key="load_async">True</value>
-        <value key="load_defer">False</value>
-        <value key="expression" />
+    <value key="enabled">True</value>
+    <value key="jscompilation">++plone++cs_dynamicpages.edit/editmode-toggle.js</value>
+    <value key="depends">plone</value>
+    <value key="load_async">True</value>
+    <value key="load_defer">False</value>
+    <value key="expression" />
   </records>
 </registry>
diff --git a/src/cs_dynamicpages/profiles/default/types/DynamicPageRow.xml b/src/cs_dynamicpages/profiles/default/types/DynamicPageRow.xml
index 787b2bd..cc8b6d4 100644
--- a/src/cs_dynamicpages/profiles/default/types/DynamicPageRow.xml
+++ b/src/cs_dynamicpages/profiles/default/types/DynamicPageRow.xml
@@ -54,7 +54,7 @@
     <element value="plone.constraintypes" />
     <!--<element value="plone.leadimage"/>-->
     <!--<element value="plone.relateditems"/>-->
-    <element value="plone.richtext"/>
+    <element value="plone.richtext" />
     <!--<element value="plone.tableofcontents"/>-->
     <!--<element value="plone.versioning" />-->
     <!--<element value="plone.translatable" />-->
diff --git a/src/cs_dynamicpages/profiles/default/types/DynamicPageRowFeatured.xml b/src/cs_dynamicpages/profiles/default/types/DynamicPageRowFeatured.xml
index 06e8789..e8d85e9 100644
--- a/src/cs_dynamicpages/profiles/default/types/DynamicPageRowFeatured.xml
+++ b/src/cs_dynamicpages/profiles/default/types/DynamicPageRowFeatured.xml
@@ -47,7 +47,7 @@
     <element value="cs_dynamicpages.related_image" />
     <!--<element value="plone.leadimage"/>-->
     <!--<element value="plone.relateditems"/>-->
-    <element value="plone.richtext"/>
+    <element value="plone.richtext" />
     <!--<element value="plone.tableofcontents"/>-->
     <!--<element value="plone.versioning" />-->
     <!--<element value="plone.translatable" />-->
diff --git a/src/cs_dynamicpages/profiles/uninstall/controlpanel.xml b/src/cs_dynamicpages/profiles/uninstall/controlpanel.xml
new file mode 100644
index 0000000..cafe9d2
--- /dev/null
+++ b/src/cs_dynamicpages/profiles/uninstall/controlpanel.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+        name="portal_controlpanel"
+        i18n:domain="cs_dynamicpages"
+>
+
+  <!-- -*- extra stuff goes here -*- -->
+
+  <configlet action_id="dynamica_pages_control_panel-controlpanel"
+             appId="dynamica_pages_control_panel-controlpanel"
+             category="Products"
+             condition_expr=""
+             icon_expr=""
+             remove="true"
+             title="Dynamica Pages Control Panel"
+             url_expr="string:${portal_url}/@@dynamica_pages_control_panel-controlpanel"
+             visible="True"
+             i18n:attributes="title"
+  />
+
+
+</object>
diff --git a/src/cs_dynamicpages/profiles/uninstall/registry/dynamic_bundle.xml b/src/cs_dynamicpages/profiles/uninstall/registry/dynamic_bundle.xml
new file mode 100644
index 0000000..dc49d67
--- /dev/null
+++ b/src/cs_dynamicpages/profiles/uninstall/registry/dynamic_bundle.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<registry>
+  <!-- Resource bundle for DynamicPageRow edit page -->
+
+  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+           prefix="plone.bundles/cs_dynamicpages.dynamicpagerow_edit"
+           remove="true"
+  />
+
+  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+           prefix="plone.bundles/cs_dynamicpages.dynamicpagerow_view_delete"
+           remove="true"
+  />
+
+  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+           prefix="plone.bundles/cs_dynamicpages.dynamicpagerow_view_reorder"
+           remove="true"
+  />
+
+
+</registry>
diff --git a/src/cs_dynamicpages/profiles/uninstall/registry/dynamica_pages_control_panel.xml b/src/cs_dynamicpages/profiles/uninstall/registry/dynamica_pages_control_panel.xml
new file mode 100644
index 0000000..24b3120
--- /dev/null
+++ b/src/cs_dynamicpages/profiles/uninstall/registry/dynamica_pages_control_panel.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<registry xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+          i18n:domain="cs_dynamicpages"
+>
+
+  <!-- -*- extra stuff goes here -*- -->
+
+  <records interface="cs_dynamicpages.controlpanels.dynamica_pages_control_panel.controlpanel.IDynamicaPagesControlPanel"
+           prefix="cs_dynamicpages.dynamica_pages_control_panel"
+           remove="true"
+  />
+
+
+</registry>
diff --git a/src/cs_dynamicpages/profiles/uninstall/types.xml b/src/cs_dynamicpages/profiles/uninstall/types.xml
new file mode 100644
index 0000000..a325b1b
--- /dev/null
+++ b/src/cs_dynamicpages/profiles/uninstall/types.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object meta_type="Plone Types Tool"
+        name="portal_types"
+>
+  <!--
+  <object meta_type="Dexterity FTI"
+          name="MyType"
+  />
+-->
+  <object meta_type="Dexterity FTI"
+          name="DynamicPageFolder"
+          remove="true"
+  />
+  <object meta_type="Dexterity FTI"
+          name="DynamicPageRow"
+          remove="true"
+  />
+  <object meta_type="Dexterity FTI"
+          name="DynamicPageRowFeatured"
+          remove="true"
+  />
+</object>
diff --git a/src/cs_dynamicpages/tests/test_behavior_row_columns.py b/src/cs_dynamicpages/tests/test_behavior_row_columns.py
index cfc4c29..4e56339 100644
--- a/src/cs_dynamicpages/tests/test_behavior_row_columns.py
+++ b/src/cs_dynamicpages/tests/test_behavior_row_columns.py
@@ -1,6 +1,5 @@
-# -*- coding: utf-8 -*-
 from cs_dynamicpages.behaviors.row_columns import IRowColumnsMarker
-from cs_dynamicpages.testing import CS_DYNAMICPAGES_INTEGRATION_TESTING  # noqa
+from cs_dynamicpages.testing import CS_DYNAMICPAGES_INTEGRATION_TESTING
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from plone.behavior.interfaces import IBehavior
@@ -10,16 +9,15 @@
 
 
 class RowColumnsIntegrationTest(unittest.TestCase):
-
     layer = CS_DYNAMICPAGES_INTEGRATION_TESTING
 
     def setUp(self):
         """Custom shared utility setup for tests."""
-        self.portal = self.layer['portal']
-        setRoles(self.portal, TEST_USER_ID, ['Manager'])
+        self.portal = self.layer["portal"]
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
 
     def test_behavior_row_columns(self):
-        behavior = getUtility(IBehavior, 'cs_dynamicpages.row_columns')
+        behavior = getUtility(IBehavior, "cs_dynamicpages.row_columns")
         self.assertEqual(
             behavior.marker,
             IRowColumnsMarker,
diff --git a/src/cs_dynamicpages/tests/test_view_dynamic_page_folder_view.py b/src/cs_dynamicpages/tests/test_view_dynamic_page_folder_view.py
index c00c836..caf7d16 100644
--- a/src/cs_dynamicpages/tests/test_view_dynamic_page_folder_view.py
+++ b/src/cs_dynamicpages/tests/test_view_dynamic_page_folder_view.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from cs_dynamicpages.testing import CS_DYNAMICPAGES_FUNCTIONAL_TESTING
 from cs_dynamicpages.testing import CS_DYNAMICPAGES_INTEGRATION_TESTING
 from cs_dynamicpages.views.dynamic_page_folder_view import IDynamicPageFolderView
@@ -12,19 +11,18 @@
 
 
 class ViewsIntegrationTest(unittest.TestCase):
-
     layer = CS_DYNAMICPAGES_INTEGRATION_TESTING
 
     def setUp(self):
-        self.portal = self.layer['portal']
-        setRoles(self.portal, TEST_USER_ID, ['Manager'])
-        api.content.create(self.portal, 'Folder', 'other-folder')
-        api.content.create(self.portal, 'Document', 'front-page')
+        self.portal = self.layer["portal"]
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
+        api.content.create(self.portal, "Folder", "other-folder")
+        api.content.create(self.portal, "Document", "front-page")
 
     def test_dynamic_page_folder_view_is_registered(self):
         view = getMultiAdapter(
-            (self.portal['other-folder'], self.portal.REQUEST),
-            name='dynamic-page-folder-view'
+            (self.portal["other-folder"], self.portal.REQUEST),
+            name="dynamic-page-folder-view",
         )
         self.assertTrue(IDynamicPageFolderView.providedBy(view))
 
@@ -32,8 +30,8 @@ def test_dynamic_page_folder_view_not_matching_interface(self):
         view_found = True
         try:
             view = getMultiAdapter(
-                (self.portal['front-page'], self.portal.REQUEST),
-                name='dynamic-page-folder-view'
+                (self.portal["front-page"], self.portal.REQUEST),
+                name="dynamic-page-folder-view",
             )
         except ComponentLookupError:
             view_found = False
@@ -43,9 +41,8 @@ def test_dynamic_page_folder_view_not_matching_interface(self):
 
 
 class ViewsFunctionalTest(unittest.TestCase):
-
     layer = CS_DYNAMICPAGES_FUNCTIONAL_TESTING
 
     def setUp(self):
-        self.portal = self.layer['portal']
-        setRoles(self.portal, TEST_USER_ID, ['Manager'])
+        self.portal = self.layer["portal"]
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
diff --git a/src/cs_dynamicpages/tests/test_view_dynamic_page_row_featured_view.py b/src/cs_dynamicpages/tests/test_view_dynamic_page_row_featured_view.py
index 29e6a8f..e8d71fa 100644
--- a/src/cs_dynamicpages/tests/test_view_dynamic_page_row_featured_view.py
+++ b/src/cs_dynamicpages/tests/test_view_dynamic_page_row_featured_view.py
@@ -1,7 +1,8 @@
-# -*- coding: utf-8 -*-
 from cs_dynamicpages.testing import CS_DYNAMICPAGES_FUNCTIONAL_TESTING
 from cs_dynamicpages.testing import CS_DYNAMICPAGES_INTEGRATION_TESTING
-from cs_dynamicpages.views.dynamic_page_row_featured_view import IDynamicPageRowFeaturedView
+from cs_dynamicpages.views.dynamic_page_row_featured_view import (
+    IDynamicPageRowFeaturedView,
+)
 from plone import api
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
@@ -12,19 +13,18 @@
 
 
 class ViewsIntegrationTest(unittest.TestCase):
-
     layer = CS_DYNAMICPAGES_INTEGRATION_TESTING
 
     def setUp(self):
-        self.portal = self.layer['portal']
-        setRoles(self.portal, TEST_USER_ID, ['Manager'])
-        api.content.create(self.portal, 'Folder', 'other-folder')
-        api.content.create(self.portal, 'Document', 'front-page')
+        self.portal = self.layer["portal"]
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
+        api.content.create(self.portal, "Folder", "other-folder")
+        api.content.create(self.portal, "Document", "front-page")
 
     def test_dynamic_page_row_featured_view_is_registered(self):
         view = getMultiAdapter(
-            (self.portal['other-folder'], self.portal.REQUEST),
-            name='dynamic-page-row-featured-view'
+            (self.portal["other-folder"], self.portal.REQUEST),
+            name="dynamic-page-row-featured-view",
         )
         self.assertTrue(IDynamicPageRowFeaturedView.providedBy(view))
 
@@ -32,8 +32,8 @@ def test_dynamic_page_row_featured_view_not_matching_interface(self):
         view_found = True
         try:
             view = getMultiAdapter(
-                (self.portal['front-page'], self.portal.REQUEST),
-                name='dynamic-page-row-featured-view'
+                (self.portal["front-page"], self.portal.REQUEST),
+                name="dynamic-page-row-featured-view",
             )
         except ComponentLookupError:
             view_found = False
@@ -43,9 +43,8 @@ def test_dynamic_page_row_featured_view_not_matching_interface(self):
 
 
 class ViewsFunctionalTest(unittest.TestCase):
-
     layer = CS_DYNAMICPAGES_FUNCTIONAL_TESTING
 
     def setUp(self):
-        self.portal = self.layer['portal']
-        setRoles(self.portal, TEST_USER_ID, ['Manager'])
+        self.portal = self.layer["portal"]
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
diff --git a/src/cs_dynamicpages/tests/test_vocab_image_position.py b/src/cs_dynamicpages/tests/test_vocab_image_position.py
index b5ce923..ad21df9 100644
--- a/src/cs_dynamicpages/tests/test_vocab_image_position.py
+++ b/src/cs_dynamicpages/tests/test_vocab_image_position.py
@@ -1,5 +1,5 @@
 from cs_dynamicpages import _
-from cs_dynamicpages.testing import CS_DYNAMICPAGES_INTEGRATION_TESTING  # noqa
+from cs_dynamicpages.testing import CS_DYNAMICPAGES_INTEGRATION_TESTING
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from zope.component import getUtility
@@ -10,22 +10,21 @@
 
 
 class ImagePositionIntegrationTest(unittest.TestCase):
-
     layer = CS_DYNAMICPAGES_INTEGRATION_TESTING
 
     def setUp(self):
         """Custom shared utility setup for tests."""
-        self.portal = self.layer['portal']
-        setRoles(self.portal, TEST_USER_ID, ['Manager'])
+        self.portal = self.layer["portal"]
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
 
     def test_vocab_image_position(self):
-        vocab_name = 'cs_dynamicpages.ImagePosition'
+        vocab_name = "cs_dynamicpages.ImagePosition"
         factory = getUtility(IVocabularyFactory, vocab_name)
         self.assertTrue(IVocabularyFactory.providedBy(factory))
 
         vocabulary = factory(self.portal)
         self.assertTrue(IVocabularyTokenized.providedBy(vocabulary))
         self.assertEqual(
-            vocabulary.getTerm('sony-a7r-iii').title,
-            _(u'Sony Aplha 7R III'),
+            vocabulary.getTerm("sony-a7r-iii").title,
+            _("Sony Aplha 7R III"),
         )
diff --git a/src/cs_dynamicpages/tests/test_vocab_row_columns.py b/src/cs_dynamicpages/tests/test_vocab_row_columns.py
index afe4d49..4bc54cd 100644
--- a/src/cs_dynamicpages/tests/test_vocab_row_columns.py
+++ b/src/cs_dynamicpages/tests/test_vocab_row_columns.py
@@ -1,5 +1,5 @@
 from cs_dynamicpages import _
-from cs_dynamicpages.testing import CS_DYNAMICPAGES_INTEGRATION_TESTING  # noqa
+from cs_dynamicpages.testing import CS_DYNAMICPAGES_INTEGRATION_TESTING
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from zope.component import getUtility
@@ -10,22 +10,21 @@
 
 
 class RowColumnsIntegrationTest(unittest.TestCase):
-
     layer = CS_DYNAMICPAGES_INTEGRATION_TESTING
 
     def setUp(self):
         """Custom shared utility setup for tests."""
-        self.portal = self.layer['portal']
-        setRoles(self.portal, TEST_USER_ID, ['Manager'])
+        self.portal = self.layer["portal"]
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
 
     def test_vocab_row_columns(self):
-        vocab_name = 'cs_dynamicpages.RowColumns'
+        vocab_name = "cs_dynamicpages.RowColumns"
         factory = getUtility(IVocabularyFactory, vocab_name)
         self.assertTrue(IVocabularyFactory.providedBy(factory))
 
         vocabulary = factory(self.portal)
         self.assertTrue(IVocabularyTokenized.providedBy(vocabulary))
         self.assertEqual(
-            vocabulary.getTerm('sony-a7r-iii').title,
-            _(u'Sony Aplha 7R III'),
+            vocabulary.getTerm("sony-a7r-iii").title,
+            _("Sony Aplha 7R III"),
         )
diff --git a/src/cs_dynamicpages/browser/overrides/.gitkeep b/src/cs_dynamicpages/upgrades/__init__.py
similarity index 100%
rename from src/cs_dynamicpages/browser/overrides/.gitkeep
rename to src/cs_dynamicpages/upgrades/__init__.py
diff --git a/src/cs_dynamicpages/upgrades/configure.zcml b/src/cs_dynamicpages/upgrades/configure.zcml
new file mode 100644
index 0000000..7a0a5a3
--- /dev/null
+++ b/src/cs_dynamicpages/upgrades/configure.zcml
@@ -0,0 +1,21 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
+    >
+
+  <!-- Example upgrade step
+  <genericsetup:upgradeSteps
+      profile="cs_dynamicpages:default"
+      source="1000"
+      destination="1001"
+      >
+    <genericsetup:upgradeDepends
+        title="Update registry value"
+        import_steps="plone.app.registry"
+        />
+  </genericsetup:upgradeSteps>
+  -->
+
+  <!-- -*- extra stuff goes here -*- -->
+
+</configure>
diff --git a/src/cs_dynamicpages/views/accordion_view.pt b/src/cs_dynamicpages/views/accordion_view.pt
index 491f6e8..196e04b 100644
--- a/src/cs_dynamicpages/views/accordion_view.pt
+++ b/src/cs_dynamicpages/views/accordion_view.pt
@@ -1,22 +1,42 @@
-<div class="my-5 accordion accordion-flush" id="accordionDynamicPage-${context/id}" tal:define="
+<div xmlns="http://www.w3.org/1999/xhtml"
+     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+     xmlns:metal="http://xml.zope.org/namespaces/metal"
+     xmlns:tal="http://xml.zope.org/namespaces/tal"
+     class="my-5 accordion accordion-flush"
+     id="accordionDynamicPage-${context/id}"
+     tal:define="
        elements view/elements;
-     " tal:condition="elements">
-  <div class="accordion-item" tal:repeat="brain elements">
+     "
+     tal:condition="elements"
+>
+  <div class="accordion-item"
+       tal:repeat="brain elements"
+  >
     <div class="accordion-header h3">
-      <button class="accordion-button collapsed" aria-controls="accordionDynamicPage-${context/id}-${brain/id}"
-        aria-expanded="false" type="button" data-bs-target="#accordionDynamicPage-${context/id}-${brain/id}"
-        data-bs-toggle="collapse">
+      <button class="accordion-button collapsed"
+              aria-controls="accordionDynamicPage-${context/id}-${brain/id}"
+              aria-expanded="false"
+              type="button"
+              data-bs-target="#accordionDynamicPage-${context/id}-${brain/id}"
+              data-bs-toggle="collapse"
+      >
         ${brain/Title}
       </button>
     </div>
-    <div class="accordion-collapse collapse" id="accordionDynamicPage-${context/id}-${brain/id}"
-      data-bs-parent="#accordionDynamicPage-${context/id}">
-      <div class="accordion-body" tal:define="
+    <div class="accordion-collapse collapse"
+         id="accordionDynamicPage-${context/id}-${brain/id}"
+         data-bs-parent="#accordionDynamicPage-${context/id}"
+    >
+      <div class="accordion-body"
+           tal:define="
              element brain/getObject;
-           ">
-        <tal:replace tal:condition="element/text" replace="structure element/text/output">
+           "
+      >
+        <tal:replace tal:condition="element/text"
+                     replace="structure element/text/output"
+        >
         </tal:replace>
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/cs_dynamicpages/views/configure.zcml b/src/cs_dynamicpages/views/configure.zcml
index 15a3539..931c9f1 100644
--- a/src/cs_dynamicpages/views/configure.zcml
+++ b/src/cs_dynamicpages/views/configure.zcml
@@ -2,28 +2,29 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser"
     xmlns:plone="http://namespaces.plone.org/plone"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="cs_dynamicpages"
     >
 
   <!-- -*- extra stuff goes here -*- -->
 
   <browser:page
-    name="view"
-    for="cs_dynamicpages.content.dynamic_page_row_featured.IDynamicPageRowFeatured"
-    class=".dynamic_page_row_featured_view.DynamicPageRowFeaturedView"
-    template="dynamic_page_row_featured_view.pt"
-    permission="zope2.View"
-    layer="cs_dynamicpages.interfaces.IBrowserLayer"
-    />
+      name="view"
+      for="cs_dynamicpages.content.dynamic_page_row_featured.IDynamicPageRowFeatured"
+      class=".dynamic_page_row_featured_view.DynamicPageRowFeaturedView"
+      template="dynamic_page_row_featured_view.pt"
+      permission="zope2.View"
+      layer="cs_dynamicpages.interfaces.IBrowserLayer"
+      />
 
   <browser:page
-    name="view"
-    for="cs_dynamicpages.content.dynamic_page_folder.IDynamicPageFolder"
-    class=".dynamic_page_folder_view.DynamicPageFolderView"
-    template="dynamic_page_folder_view.pt"
-    permission="zope2.View"
-    layer="cs_dynamicpages.interfaces.IBrowserLayer"
-    />
+      name="view"
+      for="cs_dynamicpages.content.dynamic_page_folder.IDynamicPageFolder"
+      class=".dynamic_page_folder_view.DynamicPageFolderView"
+      template="dynamic_page_folder_view.pt"
+      permission="zope2.View"
+      layer="cs_dynamicpages.interfaces.IBrowserLayer"
+      />
 
   <browser:page
       name="dynamic-view"
@@ -54,11 +55,13 @@
     <browser:page
         name="cs_dynamicpages-featured-view"
         template="featured_view.pt"
+        zcml:condition="have plone-61"
         />
 
     <browser:page
         name="cs_dynamicpages-featured-overlay-view"
         template="featured_overlay_view.pt"
+        zcml:condition="have plone-61"
         />
 
     <browser:page
@@ -86,6 +89,7 @@
     <browser:page
         name="cs_dynamicpages-query-columns-view"
         template="query_columns_view.pt"
+        zcml:condition="have plone-61"
         />
   </browser:pages>
 
@@ -98,6 +102,7 @@
     <browser:page
         name="cs_dynamicpages-slider-view"
         template="slider_view.pt"
+        zcml:condition="have plone-61"
         />
 
     <browser:page
@@ -108,6 +113,7 @@
     <browser:page
         name="cs_dynamicpages-features-view"
         template="features_view.pt"
+        zcml:condition="have plone-61"
         />
   </browser:pages>
 
diff --git a/src/cs_dynamicpages/views/dynamic_page_folder_view.pt b/src/cs_dynamicpages/views/dynamic_page_folder_view.pt
index 5a0d62b..ea6bf9d 100644
--- a/src/cs_dynamicpages/views/dynamic_page_folder_view.pt
+++ b/src/cs_dynamicpages/views/dynamic_page_folder_view.pt
@@ -1,34 +1,40 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:tal="http://xml.zope.org/namespaces/tal" xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  i18n:domain="cs_dynamicpages" metal:use-macro="context/main_template/macros/master">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      metal:use-macro="context/main_template/macros/master"
+      i18n:domain="cs_dynamicpages"
+>
 
-<body>
+  <body>
 
-  <metal:custom_title fill-slot="content-title">
-    <h1 tal:replace="structure context/@@title" />
-  </metal:custom_title>
+    <metal:custom_title fill-slot="content-title">
+      <h1 tal:replace="structure context/@@title"></h1>
+    </metal:custom_title>
 
-  <metal:custom_description fill-slot="content-description">
-    <p tal:replace="structure context/@@description" />
-  </metal:custom_description>
+    <metal:custom_description fill-slot="content-description">
+      <p tal:replace="structure context/@@description"></p>
+    </metal:custom_description>
 
-  <metal:content-core fill-slot="content-core">
-    <metal:block define-macro="content-core">
+    <metal:content-core fill-slot="content-core">
+      <metal:block define-macro="content-core">
 
-      <tal:define tal:define="
-                          isAnon context/@@plone_portal_state/anonymous;
-                        ">
-        <tal:condition tal:condition="isAnon">
-          <tal:replace tal:replace="python:context.REQUEST.RESPONSE.redirect(context.aq_parent.absolute_url(),301)">
-          </tal:replace>
-        </tal:condition>
-        <tal:conditionisanon tal:condition="not:isAnon">
-          <a class="btn btn-primary btn-lg" href="${context/aq_parent/absolute_url}">View dynamic page</a>
-        </tal:conditionisanon>
-      </tal:define>
+        <tal:define tal:define="
+                      isAnon context/@@plone_portal_state/anonymous;
+                    ">
+          <tal:condition tal:condition="isAnon">
+            <tal:replace tal:replace="python:context.REQUEST.RESPONSE.redirect(context.aq_parent.absolute_url(),301)">
+            </tal:replace>
+          </tal:condition>
+          <tal:conditionisanon tal:condition="not:isAnon">
+            <a class="btn btn-primary btn-lg"
+               href="${context/aq_parent/absolute_url}"
+            >View dynamic page</a>
+          </tal:conditionisanon>
+        </tal:define>
 
-    </metal:block>
-  </metal:content-core>
-</body>
+      </metal:block>
+    </metal:content-core>
+  </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/src/cs_dynamicpages/views/dynamic_page_folder_view.py b/src/cs_dynamicpages/views/dynamic_page_folder_view.py
index f8596ad..d58cd86 100644
--- a/src/cs_dynamicpages/views/dynamic_page_folder_view.py
+++ b/src/cs_dynamicpages/views/dynamic_page_folder_view.py
@@ -1,14 +1,14 @@
-# -*- coding: utf-8 -*-
-
 # from cs_dynamicpages import _
 from Products.Five.browser import BrowserView
 from zope.interface import implementer
 from zope.interface import Interface
 
+
 # from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 
+
 class IDynamicPageFolderView(Interface):
-    """ Marker Interface for IDynamicPageFolderView"""
+    """Marker Interface for IDynamicPageFolderView"""
 
 
 @implementer(IDynamicPageFolderView)
diff --git a/src/cs_dynamicpages/views/dynamic_page_row_featured_view.pt b/src/cs_dynamicpages/views/dynamic_page_row_featured_view.pt
index 980e00f..78af5c0 100644
--- a/src/cs_dynamicpages/views/dynamic_page_row_featured_view.pt
+++ b/src/cs_dynamicpages/views/dynamic_page_row_featured_view.pt
@@ -1,25 +1,29 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:tal="http://xml.zope.org/namespaces/tal" xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  i18n:domain="cs_dynamicpages" metal:use-macro="context/main_template/macros/master">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      metal:use-macro="context/main_template/macros/master"
+      i18n:domain="cs_dynamicpages"
+>
 
-<body>
+  <body>
 
-  <metal:custom_title fill-slot="content-title">
-    <h1 tal:replace="structure context/@@title" />
-  </metal:custom_title>
+    <metal:custom_title fill-slot="content-title">
+      <h1 tal:replace="structure context/@@title"></h1>
+    </metal:custom_title>
 
-  <metal:custom_description fill-slot="content-description">
-    <p tal:replace="structure context/@@description" />
-  </metal:custom_description>
+    <metal:custom_description fill-slot="content-description">
+      <p tal:replace="structure context/@@description"></p>
+    </metal:custom_description>
 
-  <metal:content-core fill-slot="content-core">
-    <metal:block define-macro="content-core">
+    <metal:content-core fill-slot="content-core">
+      <metal:block define-macro="content-core">
 
-      <tal:replace tal:replace="python:context.REQUEST.RESPONSE.redirect(context.aq_parent.absolute_url(),301)">
-      </tal:replace>
+        <tal:replace tal:replace="python:context.REQUEST.RESPONSE.redirect(context.aq_parent.absolute_url(),301)">
+        </tal:replace>
 
-    </metal:block>
-  </metal:content-core>
-</body>
+      </metal:block>
+    </metal:content-core>
+  </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/src/cs_dynamicpages/views/dynamic_page_row_featured_view.py b/src/cs_dynamicpages/views/dynamic_page_row_featured_view.py
index 0dd9585..84422a9 100644
--- a/src/cs_dynamicpages/views/dynamic_page_row_featured_view.py
+++ b/src/cs_dynamicpages/views/dynamic_page_row_featured_view.py
@@ -1,14 +1,14 @@
-# -*- coding: utf-8 -*-
-
 # from cs_dynamicpages import _
 from Products.Five.browser import BrowserView
 from zope.interface import implementer
 from zope.interface import Interface
 
+
 # from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 
+
 class IDynamicPageRowFeaturedView(Interface):
-    """ Marker Interface for IDynamicPageRowFeaturedView"""
+    """Marker Interface for IDynamicPageRowFeaturedView"""
 
 
 @implementer(IDynamicPageRowFeaturedView)
diff --git a/src/cs_dynamicpages/views/dynamic_page_row_view.pt b/src/cs_dynamicpages/views/dynamic_page_row_view.pt
index 7eb711f..38f6aae 100644
--- a/src/cs_dynamicpages/views/dynamic_page_row_view.pt
+++ b/src/cs_dynamicpages/views/dynamic_page_row_view.pt
@@ -1,26 +1,29 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:tal="http://xml.zope.org/namespaces/tal" xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  i18n:domain="cs_dynamicpages" metal:use-macro="context/main_template/macros/master">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      metal:use-macro="context/main_template/macros/master"
+      i18n:domain="cs_dynamicpages"
+>
 
-<body>
+  <body>
 
-  <metal:custom_title fill-slot="content-title">
-    <h1 tal:replace="structure context/@@title" />
-  </metal:custom_title>
+    <metal:custom_title fill-slot="content-title">
+      <h1 tal:replace="structure context/@@title"></h1>
+    </metal:custom_title>
 
-  <metal:custom_description fill-slot="content-description">
-    <p tal:replace="structure context/@@description" />
-  </metal:custom_description>
+    <metal:custom_description fill-slot="content-description">
+      <p tal:replace="structure context/@@description"></p>
+    </metal:custom_description>
 
-  <metal:content-core fill-slot="content-core">
-    <metal:block define-macro="content-core">
+    <metal:content-core fill-slot="content-core">
+      <metal:block define-macro="content-core">
 
-      <tal:replace
-        tal:replace="python:context.REQUEST.RESPONSE.redirect(context.aq_parent.aq_parent.absolute_url(),301)">
-      </tal:replace>
+        <tal:replace tal:replace="python:context.REQUEST.RESPONSE.redirect(context.aq_parent.aq_parent.absolute_url(),301)">
+        </tal:replace>
 
-    </metal:block>
-  </metal:content-core>
-</body>
+      </metal:block>
+    </metal:content-core>
+  </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/src/cs_dynamicpages/views/dynamic_page_row_view.py b/src/cs_dynamicpages/views/dynamic_page_row_view.py
index df39bd6..a15d1ea 100644
--- a/src/cs_dynamicpages/views/dynamic_page_row_view.py
+++ b/src/cs_dynamicpages/views/dynamic_page_row_view.py
@@ -3,6 +3,7 @@
 from zope.interface import implementer
 from zope.interface import Interface
 
+
 # from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 
 
diff --git a/src/cs_dynamicpages/views/dynamic_view.pt b/src/cs_dynamicpages/views/dynamic_view.pt
index 983a03e..2c78757 100644
--- a/src/cs_dynamicpages/views/dynamic_view.pt
+++ b/src/cs_dynamicpages/views/dynamic_view.pt
@@ -1,158 +1,248 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xmlns:metal="http://xml.zope.org/namespaces/metal" xmlns:tal="http://xml.zope.org/namespaces/tal"
-  metal:use-macro="context/main_template/macros/master" i18n:domain="cs_dynamicpages"
-  tal:define="portal_url context/portal_url;" data-portal-url="${portal_url}">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      metal:use-macro="context/main_template/macros/master"
+      data-portal-url="${portal_url}"
+      tal:define="
+        portal_url context/portal_url;
+      "
+      i18n:domain="cs_dynamicpages"
+>
 
-<body>
-  <metal:main fill-slot="main">
-    <main id="content">
-      <div class="fixed-top d-flex justify-content-end py-2 me-2" tal:condition="view/can_edit">
-        <div
-          class="d-inline-flex mb-3 px-3 py-2 fw-semibold text-warning-emphasis bg-warning-subtle border border-warning-subtle rounded-5">
-          <div class="form-check form-switch">
-            <input class="form-check-input" type="checkbox" role="switch" id="editModeToggle" checked>
-            <label class="form-check-label" for="editModeToggle">Edit Mode</label>
+  <body>
+    <metal:main fill-slot="main">
+      <main id="content">
+        <div class="fixed-top d-flex justify-content-end py-2 me-2"
+             tal:condition="view/can_edit"
+        >
+          <div class="d-inline-flex mb-3 px-3 py-2 fw-semibold text-warning-emphasis bg-warning-subtle border border-warning-subtle rounded-5">
+            <div class="form-check form-switch">
+              <input class="form-check-input"
+                     id="editModeToggle"
+                     role="switch"
+                     type="checkbox"
+              />
+              <label class="form-check-label"
+                     for="editModeToggle"
+              >Edit Mode</label>
+            </div>
           </div>
-        </div>
-      </div>
-      <tal:features define="
-                        rows view/rows;
-                      ">
-        <tal:featured repeat="brain rows">
-          <section tal:define="row brain/getObject;" class="dynamic-row ${row/row_template} state-${row/review_state}"
-            data-elementid="${row/id}" data-elementurl="${row/absolute_url}"
-            data-parenturl="${row/aq_parent/absolute_url}" data-delete-target="true" data-move-target="true">
-            <div class="edit-options edit-buttons d-flex gap-2" tal:condition="row/can_edit">
-              <small
-                class="d-inline-flex mb-3 px-2 py-1 fw-semibold text-warning-emphasis bg-warning-subtle border border-warning-subtle rounded-2 position-relative">
+          <tal:features define="
+                          rows view/rows;
+                        ">
+            <tal:featured repeat="brain rows">
+              <section class="dynamic-row ${row/row_template} state-${row/review_state}"
+                       data-delete-target="true"
+                       data-elementid="${row/id}"
+                       data-elementurl="${row/absolute_url}"
+                       data-move-target="true"
+                       data-parenturl="${row/aq_parent/absolute_url}"
+                       tal:define="
+                         row brain/getObject;
+                       "
+              >
+                <div class="edit-options edit-buttons d-flex gap-2"
+                     tal:condition="row/can_edit"
+                >
+                  <small class="d-inline-flex mb-3 px-2 py-1 fw-semibold text-warning-emphasis bg-warning-subtle border border-warning-subtle rounded-2 position-relative">
                 Template: ${row/row_template}
-              </small>
-              <!-- <a class="btn btn-outline-primary btn-sm align-self-start" href="${row/absolute_url}">View</a> -->
-              <a class="btn btn-outline-primary btn-sm align-self-start" href="${row/absolute_url}/edit">Edit</a>
-              <a class="btn btn-sm btn-danger align-self-start btn-delete-element" href="#" data-bs-toggle="modal"
-                data-bs-target="#deleteElementModal" data-rowid="${row/id}">Delete row</a>
+                  </small>
+                  <!-- <a class="btn btn-outline-primary btn-sm align-self-start" href="${row/absolute_url}">View</a> -->
+                  <a class="btn btn-outline-primary btn-sm align-self-start"
+                     href="${row/absolute_url}/edit"
+                  >Edit</a>
+                  <a class="btn btn-sm btn-danger align-self-start btn-delete-element"
+                     href="#"
+                     data-bs-target="#deleteElementModal"
+                     data-bs-toggle="modal"
+                     data-rowid="${row/id}"
+                  >Delete row</a>
 
-              <div class="ms-auto d-flex gap-2 align-items-start">
+                  <div class="ms-auto d-flex gap-2 align-items-start">
 
-                <a tal:condition="python:not(repeat['brain'].start)"
-                  class="btn btn-outline-primary btn-sm align-self-start" href="#" data-action="move-up">Move up</a>
-                <a tal:condition="python:not(repeat['brain'].end)"
-                  class="btn btn-outline-primary btn-sm align-self-start" href="#" data-action="move-down">Move
-                  down</a>
-                <div class="btn-group">
-                  <a tal:attributes="class python:row.review_state() == 'published' and
-                    'position-relative btn btn-outline-success btn-sm bg-success-subtle dropdown-toggle' or
-                    'position-relative btn btn-outline-danger btn-sm bg-danger-subtle dropdown-toggle'" type="button"
-                    class="btn btn-secondary dropdown-toggle" data-bs-toggle="dropdown" data-bs-display="static"
-                    aria-expanded="false">
+                    <a class="btn btn-outline-primary btn-sm align-self-start"
+                       href="#"
+                       data-action="move-up"
+                       tal:condition="python:not(repeat['brain'].start)"
+                    >Move up</a>
+                    <a class="btn btn-outline-primary btn-sm align-self-start"
+                       href="#"
+                       data-action="move-down"
+                       tal:condition="python:not(repeat['brain'].end)"
+                    >Move
+                      down</a>
+                    <div class="btn-group">
+                      <a class="btn btn-secondary dropdown-toggle"
+                         aria-expanded="false"
+                         type="button"
+                         data-bs-display="static"
+                         data-bs-toggle="dropdown"
+                         tal:attributes="
+                           class python:row.review_state() == 'published' and                     'position-relative btn btn-outline-success btn-sm bg-success-subtle dropdown-toggle' or                     'position-relative btn btn-outline-danger btn-sm bg-danger-subtle dropdown-toggle';
+                         "
+                      >
                     Review state: ${row/review_state}
-                    <span
-                      tal:attributes="class python:row.review_state() == 'published' and 'position-absolute top-0 start-100 translate-middle p-2 bg-success border border-light rounded-circle' or 'position-absolute top-0 start-100 translate-middle p-2 bg-danger border border-light rounded-circle'">
-                    </span>
-                  </a>
-                  <ul class="dropdown-menu"
-                    tal:define="transitions python:context.portal_workflow.getTransitionsFor(row)">
-                    <tal:transitions repeat="transition transitions">
-                      <li><a class="dropdown-item"
-                          href="${transition/url}&_authenticator=${context/@@authenticator/token}">${transition/name}</a>
-                      </li>
-                    </tal:transitions>
-                  </ul>
-                </div>
-              </div>
+                        <span tal:attributes="
+                                class python:row.review_state() == 'published' and 'position-absolute top-0 start-100 translate-middle p-2 bg-success border border-light rounded-circle' or 'position-absolute top-0 start-100 translate-middle p-2 bg-danger border border-light rounded-circle';
+                              ">
+                        </span>
+                      </a>
+                      <ul class="dropdown-menu"
+                          tal:define="
+                            transitions python:context.portal_workflow.getTransitionsFor(row);
+                          "
+                      >
+                        <tal:transitions repeat="transition transitions">
+                          <li><a class="dropdown-item"
+                               href="${transition/url}&amp;_authenticator=${context/@@authenticator/token}"
+                            >${transition/name}</a>
+                          </li>
+                        </tal:transitions>
+                      </ul>
+                    </div>
+                  </div>
 
-            </div>
-            <tal:condition tal:condition="row/can_edit">
-              <div class="edit-options features-list d-flex gap-2 align-items-start mb-3"
-                tal:define="features_list row/featured_list">
-                <tal:conditionfeatures tal:condition="features_list">
-                  <tal:featured repeat="featured_brain features_list">
-                    <div tal:define="featured_obj featured_brain/getObject;">
-                      <div class="btn-group" data-elementid="${featured_obj/id}" data-parenturl="${row/absolute_url}"
-                        data-elementurl="${featured_obj/absolute_url}" data-delete-target="true"
-                        data-move-target="true">
-                        <a tal:attributes="class python:featured_obj.review_state() == 'published' and
-                                          'position-relative btn btn-outline-success btn-sm bg-success-subtle dropdown-toggle' or
-                                          'position-relative btn btn-outline-danger btn-sm bg-danger-subtle dropdown-toggle'"
-                          type="button" class="btn btn-secondary dropdown-toggle" data-bs-toggle="dropdown"
-                          data-bs-display="static" aria-expanded="false">
+                </div>
+                <tal:condition tal:condition="row/can_edit">
+                  <div class="edit-options features-list d-flex gap-2 align-items-start mb-3"
+                       tal:define="
+                         features_list row/featured_list;
+                       "
+                  >
+                    <tal:conditionfeatures tal:condition="features_list">
+                      <tal:featured repeat="featured_brain features_list">
+                        <div tal:define="
+                               featured_obj featured_brain/getObject;
+                             ">
+                          <div class="btn-group"
+                               data-delete-target="true"
+                               data-elementid="${featured_obj/id}"
+                               data-elementurl="${featured_obj/absolute_url}"
+                               data-move-target="true"
+                               data-parenturl="${row/absolute_url}"
+                          >
+                            <a class="btn btn-secondary dropdown-toggle"
+                               aria-expanded="false"
+                               type="button"
+                               data-bs-display="static"
+                               data-bs-toggle="dropdown"
+                               tal:attributes="
+                                 class python:featured_obj.review_state() == 'published' and                                           'position-relative btn btn-outline-success btn-sm bg-success-subtle dropdown-toggle' or                                           'position-relative btn btn-outline-danger btn-sm bg-danger-subtle dropdown-toggle';
+                               "
+                            >
                           ${featured_obj/Title}
-                          <span
-                            tal:attributes="class python:featured_obj.review_state() == 'published' and 'text-white position-absolute top-0 start-100 translate-middle p-1 bg-success border border-light rounded-circle' or 'text-white position-absolute top-0 start-100 translate-middle p-1 bg-danger border border-light rounded-circle'">
-                          </span>
-                        </a>
-                        <ul class="dropdown-menu">
-                          <li><a class="dropdown-item" href="${featured_obj/absolute_url}/edit">Edit</a>
-                          </li>
-                          <li>
-                            <h5 class="dropdown-header">State</h5>
-                          </li>
-                          <tal:define
-                            tal:define="featured_transitions python:context.portal_workflow.getTransitionsFor(featured_obj)">
-                            <tal:featured_transitions repeat="featured_transition featured_transitions">
+                              <span tal:attributes="
+                                      class python:featured_obj.review_state() == 'published' and 'text-white position-absolute top-0 start-100 translate-middle p-1 bg-success border border-light rounded-circle' or 'text-white position-absolute top-0 start-100 translate-middle p-1 bg-danger border border-light rounded-circle';
+                                    ">
+                              </span>
+                            </a>
+                            <ul class="dropdown-menu">
                               <li><a class="dropdown-item"
-                                  href="${featured_transition/url}&_authenticator=${context/@@authenticator/token}">${featured_transition/name}</a>
+                                   href="${featured_obj/absolute_url}/edit"
+                                >Edit</a>
                               </li>
-                            </tal:featured_transitions>
-                          </tal:define>
-                          <li>
-                            <h5 class="dropdown-header">Move actions</h5>
-                          </li>
-                          <li><a class="dropdown-item" href="#" data-action="move-up"
-                              tal:condition="python:not(repeat['featured_brain'].start)">Move up</a></li>
-                          <li><a class="dropdown-item" href="#" data-action="move-down"
-                              tal:condition="python:not(repeat['featured_brain'].end)">Move down</a></li>
-                          <li>
-                            <hr class="dropdown-divider">
-                          </li>
-                          <li><a class="ms-3 btn btn-sm btn-danger align-self-start btn-delete-element" href="#"
-                              data-bs-toggle="modal" data-bs-target="#deleteElementModal">Delete</a></li>
-                        </ul>
-                      </div>
-                    </div>
-                  </tal:featured>
-                </tal:conditionfeatures>
+                              <li>
+                                <h5 class="dropdown-header">State</h5>
+                              </li>
+                              <tal:define tal:define="
+                                            featured_transitions python:context.portal_workflow.getTransitionsFor(featured_obj);
+                                          ">
+                                <tal:featured_transitions repeat="featured_transition featured_transitions">
+                                  <li><a class="dropdown-item"
+                                       href="${featured_transition/url}&amp;_authenticator=${context/@@authenticator/token}"
+                                    >${featured_transition/name}</a>
+                                  </li>
+                                </tal:featured_transitions>
+                              </tal:define>
+                              <li>
+                                <h5 class="dropdown-header">Move actions</h5>
+                              </li>
+                              <li><a class="dropdown-item"
+                                   href="#"
+                                   data-action="move-up"
+                                   tal:condition="python:not(repeat['featured_brain'].start)"
+                                >Move up</a></li>
+                              <li><a class="dropdown-item"
+                                   href="#"
+                                   data-action="move-down"
+                                   tal:condition="python:not(repeat['featured_brain'].end)"
+                                >Move down</a></li>
+                              <li>
+                                <hr class="dropdown-divider" />
+                                <li><a class="ms-3 btn btn-sm btn-danger align-self-start btn-delete-element"
+                                     href="#"
+                                     data-bs-target="#deleteElementModal"
+                                     data-bs-toggle="modal"
+                                  >Delete</a></li>
+                              </li>
+                            </ul>
+                          </div>
+                        </div>
+                      </tal:featured>
 
-                <tal:featured_add_button tal:condition="row/show_featured_add_button">
-                  <a class="btn btn-outline-primary btn-sm align-self-start"
-                    href="${row/absolute_url}/++add++DynamicPageRowFeatured">Add new featured</a>
-                </tal:featured_add_button>
+                      <tal:featured_add_button tal:condition="row/show_featured_add_button">
+                        <a class="btn btn-outline-primary btn-sm align-self-start"
+                           href="${row/absolute_url}/++add++DynamicPageRowFeatured"
+                        >Add new featured</a>
+                      </tal:featured_add_button>
+                    </tal:conditionfeatures>
+                  </div>
+                  <div class="content">
+                    <replace tal:replace="structure python:row.render(request)"></replace>
+                  </div>
+                </tal:condition>
+              </section>
+            </tal:featured>
+            <tal:condition tal:condition="view/can_edit">
+              <div class="edit-options dynamic-row d-flex justify-content-center align-items-center"
+                   tal:condition="view/dynamic_page_folder_element_url"
+              >
+                <a class="btn btn-primary btn-lg"
+                   href="${view/dynamic_page_folder_element_url}/++add++DynamicPageRow"
+                >Add new row</a>
               </div>
             </tal:condition>
-            <div class="content">
-              <replace tal:replace="structure python:row.render(request)"></replace>
-            </div>
-          </section>
-        </tal:featured>
-      </tal:features>
-      <tal:condition tal:condition="view/can_edit">
-        <div class="edit-options dynamic-row d-flex justify-content-center align-items-center"
-          tal:condition="view/dynamic_page_folder_element_url">
-          <a class="btn btn-primary btn-lg" href="${view/dynamic_page_folder_element_url}/++add++DynamicPageRow">Add
-            new row</a>
-        </div>
-      </tal:condition>
-      <!-- Delete Confirmation Modal -->
-      <div class="modal fade" id="deleteElementModal" tabindex="-1" aria-labelledby="deleteElementModalLabel"
-        aria-hidden="true">
-        <div class="modal-dialog">
-          <div class="modal-content">
-            <div class="modal-header">
-              <h5 class="modal-title" id="deleteElementModalLabel" i18n:translate="">Confirm Deletion</h5>
-              <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-            </div>
-            <div class="modal-body">
-              <p i18n:translate="">Are you sure you want to delete this item? This action cannot be undone.</p>
-            </div>
-            <div class="modal-footer">
-              <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" i18n:translate="">Cancel</button>
-              <button type="button" class="btn btn-danger" id="confirmDeleteElement" i18n:translate="">Delete</button>
+            <!-- Delete Confirmation Modal -->
+            <div class="modal fade"
+                 id="deleteElementModal"
+                 aria-hidden="true"
+                 aria-labelledby="deleteElementModalLabel"
+                 tabindex="-1"
+            >
+              <div class="modal-dialog">
+                <div class="modal-content">
+                  <div class="modal-header">
+                    <h5 class="modal-title"
+                        id="deleteElementModalLabel"
+                        i18n:translate=""
+                    >Confirm Deletion</h5>
+                    <button class="btn-close"
+                            aria-label="Close"
+                            type="button"
+                            data-bs-dismiss="modal"
+                    ></button>
+                  </div>
+                  <div class="modal-body">
+                    <p i18n:translate="">Are you sure you want to delete this item? This action cannot be undone.</p>
+                  </div>
+                  <div class="modal-footer">
+                    <button class="btn btn-secondary"
+                            type="button"
+                            data-bs-dismiss="modal"
+                            i18n:translate=""
+                    >Cancel</button>
+                    <button class="btn btn-danger"
+                            id="confirmDeleteElement"
+                            type="button"
+                            i18n:translate=""
+                    >Delete</button>
+                  </div>
+                </div>
+              </div>
             </div>
-          </div>
+          </tal:features>
         </div>
-      </div>
-    </main>
-  </metal:main>
-</body>
+      </main>
 
-</html>
\ No newline at end of file
+    </metal:main></body></html>
diff --git a/src/cs_dynamicpages/views/dynamic_view.py b/src/cs_dynamicpages/views/dynamic_view.py
index ed03e33..fb20f67 100644
--- a/src/cs_dynamicpages/views/dynamic_view.py
+++ b/src/cs_dynamicpages/views/dynamic_view.py
@@ -26,7 +26,10 @@ def rows(self):
 
     def dynamic_page_folder_element(self):
         return api.content.find(
-            portal_type="DynamicPageFolder", context=self.context, depth=1, sort_on="getObjPositionInParent"
+            portal_type="DynamicPageFolder",
+            context=self.context,
+            depth=1,
+            sort_on="getObjPositionInParent",
         )
 
     def dynamic_page_folder_element_url(self):
@@ -36,4 +39,4 @@ def dynamic_page_folder_element_url(self):
         return ""
 
     def can_edit(self):
-        return api.user.has_permission("Modify portal content", obj=self.context)
\ No newline at end of file
+        return api.user.has_permission("Modify portal content", obj=self.context)
diff --git a/src/cs_dynamicpages/views/featured_overlay_view.pt b/src/cs_dynamicpages/views/featured_overlay_view.pt
index 34fc3da..07742fc 100644
--- a/src/cs_dynamicpages/views/featured_overlay_view.pt
+++ b/src/cs_dynamicpages/views/featured_overlay_view.pt
@@ -2,18 +2,26 @@
 
   <tal:image tal:define="
                image view/related_image;
-             " tal:condition="image">
+             "
+             tal:condition="image"
+  >
     <img tal:define="
            images image/@@images;
-         " tal:replace="structure python:images.srcset(fieldname='image',
+         "
+         tal:replace="structure python:images.srcset(fieldname='image',
                                       scale_in_src='huge',
                                       sizes='(min-width: 1400px) 1400px, 100vw',
                                       alt=image.Title() ,
-                                      title=image.Title())" />
+                                      title=image.Title())"
+    />
   </tal:image>
   <div class="card-img-overlay">
     <h5 class="card-title">${context/Title}</h5>
-    <p class="card-text" tal:condition="context/Description">${context/Description}</p>
-    <a href="${context/link_url}" tal:condition="context/link_url">${context/link_text}</a>
+    <p class="card-text"
+       tal:condition="context/Description"
+    >${context/Description}</p>
+    <a href="${context/link_url}"
+       tal:condition="context/link_url"
+    >${context/link_text}</a>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/cs_dynamicpages/views/featured_view.pt b/src/cs_dynamicpages/views/featured_view.pt
index 915d80b..839626b 100644
--- a/src/cs_dynamicpages/views/featured_view.pt
+++ b/src/cs_dynamicpages/views/featured_view.pt
@@ -1,23 +1,35 @@
 <div class="row my-5">
   <div class="col-md-6">
     <tal:image tal:define="
-                   image view/related_image;
-                 " tal:condition="image">
+                 image view/related_image;
+               "
+               tal:condition="image"
+    >
       <img tal:define="
-               images image/@@images;
-             " tal:replace="structure python:images.srcset(fieldname='image',
+             images image/@@images;
+           "
+           tal:replace="structure python:images.srcset(fieldname='image',
                                           scale_in_src='huge',
                                           sizes='(min-width: 1400px) 1400px, 100vw',
                                           alt=image.Title() ,
-                                          title=image.Title())" />
+                                          title=image.Title())"
+      />
     </tal:image>
   </div>
   <div class="col-md-6"
-    tal:attributes="class python:context.image_position=='right' and 'col-md-6 order-first' or 'col-md-6'">
+       tal:attributes="
+         class python:context.image_position=='right' and 'col-md-6 order-first' or 'col-md-6';
+       "
+  >
     <h3>${context/Title}</h3>
     <p tal:condition="context/Description">${context/Description}</p>
-    <tal:replace tal:condition="context/text" replace="structure context/text/output">
+    <tal:replace tal:condition="context/text"
+                 replace="structure context/text/output"
+    >
     </tal:replace>
-    <a class="btn btn-primary" href="${context/link_url}" tal:condition="context/link_url">${context/link_text}</a>
+    <a class="btn btn-primary"
+       href="${context/link_url}"
+       tal:condition="context/link_url"
+    >${context/link_text}</a>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/cs_dynamicpages/views/featured_view.py b/src/cs_dynamicpages/views/featured_view.py
index 0f6e7c5..ae977c9 100644
--- a/src/cs_dynamicpages/views/featured_view.py
+++ b/src/cs_dynamicpages/views/featured_view.py
@@ -1,7 +1,7 @@
 # from cs_dynamicpages import _
+from cs_dynamicpages.views.dynamic_page_row_view import DynamicPageRowView
 from zope.interface import implementer
 from zope.interface import Interface
-from cs_dynamicpages.views.dynamic_page_row_view import DynamicPageRowView
 
 
 class IFeaturedView(Interface):
diff --git a/src/cs_dynamicpages/views/features_view.pt b/src/cs_dynamicpages/views/features_view.pt
index c85ec5d..664903b 100644
--- a/src/cs_dynamicpages/views/features_view.pt
+++ b/src/cs_dynamicpages/views/features_view.pt
@@ -1,32 +1,50 @@
-<div class="row my-5 features-view" tal:define="
+<div class="row my-5 features-view"
+     tal:define="
        elements view/elements;
-     " tal:condition="elements">
-  <div tal:repeat="brain elements" class="${context/columns} mb-5">
+     "
+     tal:condition="elements"
+>
+  <div class="${context/columns} mb-5"
+       tal:repeat="brain elements"
+  >
     <tal:define tal:define="
-                        element brain/getObject;
-                      ">
+                  element brain/getObject;
+                ">
 
       <div class="card">
         <tal:image tal:define="
-                             image element/related_image_object;
-                           " tal:condition="image" tal:on-error="nothing">
+                     image element/related_image_object;
+                   "
+                   tal:condition="image"
+                   tal:on-error="nothing"
+        >
           <img tal:define="
-                         images image/@@images;
-                       " tal:replace="structure python:images.srcset(fieldname='image',
+                 images image/@@images;
+               "
+               tal:replace="structure python:images.srcset(fieldname='image',
                                                                   scale_in_src='huge',
                                                                   sizes='(min-width: 1400px) 400px, 100vw',
                                                                   alt=element.Title() ,
-                                                                  title=element.Title())" />
+                                                                  title=element.Title())"
+          />
         </tal:image>
         <div class="card-body">
-          <a tal:condition="element/link_url" class="h5 card-title stretched-link mb-3"
-            href="${element/link_url}">${element/Title}</a>
-          <p class="h5 card-title mb-3" tal:condition="not:element/link_url">${element/Title}</p>
-          <p class="card-text" tal:condition="element/Description">${element/Description}</p>
-          <tal:replace tal:condition="element/text" replace="structure element/text/output">
+          <a class="h5 card-title stretched-link mb-3"
+             href="${element/link_url}"
+             tal:condition="element/link_url"
+          >${element/Title}</a>
+          <p class="h5 card-title mb-3"
+             tal:condition="not:element/link_url"
+          >${element/Title}</p>
+          <p class="card-text"
+             tal:condition="element/Description"
+          >${element/Description}</p>
+          <tal:replace tal:condition="element/text"
+                       replace="structure element/text/output"
+          >
           </tal:replace>
         </div>
       </div>
     </tal:define>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/cs_dynamicpages/views/horizontal_rule_view.pt b/src/cs_dynamicpages/views/horizontal_rule_view.pt
index 84af8ad..af383ee 100644
--- a/src/cs_dynamicpages/views/horizontal_rule_view.pt
+++ b/src/cs_dynamicpages/views/horizontal_rule_view.pt
@@ -1 +1 @@
-<hr class="my-5 border border-primary opacity-100" />
\ No newline at end of file
+<hr class="my-5 border border-primary opacity-100" />
diff --git a/src/cs_dynamicpages/views/query_columns_view.pt b/src/cs_dynamicpages/views/query_columns_view.pt
index 5b11405..5c23d4e 100644
--- a/src/cs_dynamicpages/views/query_columns_view.pt
+++ b/src/cs_dynamicpages/views/query_columns_view.pt
@@ -1,6 +1,8 @@
-<div class="my-5" tal:define="
-           batch view/results;
-         ">
+<div class="my-5"
+     tal:define="
+       batch view/results;
+     "
+>
   <h2 class="mb-5">${context/Title}</h2>
   <div class="row">
     <tal:repeat tal:repeat="brain batch">
@@ -11,21 +13,32 @@
           <div class="card">
             <tal:image tal:define="
                          image element/image;
-                       " tal:condition="image" tal:on-error="nothing">
+                       "
+                       tal:condition="image"
+                       tal:on-error="nothing"
+            >
               <img tal:define="
                      images element/@@images;
-                   " tal:replace="structure python:images.srcset(fieldname='image',
+                   "
+                   tal:replace="structure python:images.srcset(fieldname='image',
                                                               scale_in_src='huge',
                                                               sizes='(min-width: 1400px) 400px, 100vw',
                                                               alt=element.Title() ,
-                                                              title=element.Title())" />
+                                                              title=element.Title())"
+              />
             </tal:image>
             <div class="card-body">
-              <a class="h5 card-title stretched-link" href="${element/absolute_url}">${element/Title}</a>
-              <p class="mb-3" tal:condition="python:element.portal_type != 'Event'"
-                tal:content="python:element.toLocalizedTime(element.EffectiveDate())"></p>
-              <p class="mb-3" tal:condition="python:element.portal_type == 'Event'"
-                tal:content="python:element.toLocalizedTime(element.start)"></p>
+              <a class="h5 card-title stretched-link"
+                 href="${element/absolute_url}"
+              >${element/Title}</a>
+              <p class="mb-3"
+                 tal:condition="python:element.portal_type != 'Event'"
+                 tal:content="python:element.toLocalizedTime(element.EffectiveDate())"
+              ></p>
+              <p class="mb-3"
+                 tal:condition="python:element.portal_type == 'Event'"
+                 tal:content="python:element.toLocalizedTime(element.start)"
+              ></p>
 
               <p class="card-text">${element/Description}</p>
             </div>
@@ -36,7 +49,9 @@
     </tal:repeat>
   </div>
   <div class="d-flex justify-content-end">
-    <a href="${context/link_url}" tal:condition="context/link_url">${context/link_text}</a>
+    <a href="${context/link_url}"
+       tal:condition="context/link_url"
+    >${context/link_text}</a>
   </div>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/cs_dynamicpages/views/query_columns_view.py b/src/cs_dynamicpages/views/query_columns_view.py
index 5ae8b6d..29a923a 100644
--- a/src/cs_dynamicpages/views/query_columns_view.py
+++ b/src/cs_dynamicpages/views/query_columns_view.py
@@ -1,8 +1,9 @@
 # from cs_dynamicpages import _
+from cs_dynamicpages.views.dynamic_page_row_view import DynamicPageRowView
 from plone.app.contenttypes.browser.collection import CollectionView
 from zope.interface import implementer
 from zope.interface import Interface
-from cs_dynamicpages.views.dynamic_page_row_view import DynamicPageRowView
+
 
 # from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 
diff --git a/src/cs_dynamicpages/views/slider_view.pt b/src/cs_dynamicpages/views/slider_view.pt
index bad68cb..7892d95 100644
--- a/src/cs_dynamicpages/views/slider_view.pt
+++ b/src/cs_dynamicpages/views/slider_view.pt
@@ -1,44 +1,74 @@
-<div class="carousel slide my-5" id="DynamicPageSlider" tal:define="
+<div class="carousel slide my-5"
+     id="DynamicPageSlider"
+     tal:define="
        elements view/elements;
-     " tal:condition="elements">
+     "
+     tal:condition="elements"
+>
   <div class="carousel-indicators">
     <tal:indicators repeat="element elements">
-      <button class="active" aria-current="true" aria-label="Slide ${repeat/element/index}" type="button"
-        data-bs-slide-to="${repeat/element/index}" data-bs-target="#DynamicPageSlider"></button>
+      <button class="active"
+              aria-current="true"
+              aria-label="Slide ${repeat/element/index}"
+              type="button"
+              data-bs-slide-to="${repeat/element/index}"
+              data-bs-target="#DynamicPageSlider"
+      ></button>
     </tal:indicators>
   </div>
   <div class="carousel-inner">
     <tal:slides repeat="brain elements">
-      <div class="carousel-item active" tal:define="
+      <div class="carousel-item active"
+           tal:define="
              element brain/getObject;
-           " tal:attributes="
+           "
+           tal:attributes="
              class python: repeat['brain'].index == 0 and 'carousel-item active' or 'carousel-item';
-           ">
+           "
+      >
         <tal:image tal:define="
                      image element/related_image_object;
-                   " tal:condition="image">
+                   "
+                   tal:condition="image"
+        >
           <img tal:define="
                  images image/@@images;
-               " tal:replace="structure python:images.srcset(fieldname='image',
+               "
+               tal:replace="structure python:images.srcset(fieldname='image',
                                               scale_in_src='huge',
                                               sizes='(min-width: 1400px) 1400px, 100vw',
                                               alt=image.Title() ,
-                                              title=image.Title())" />
+                                              title=image.Title())"
+          />
         </tal:image>
         <div class="carousel-caption d-none d-md-block">
           <h5>${element/Title}</h5>
           <p>${element/Description}</p>
-          <a href="${element/link_url}" tal:condition="element/link_url">${element/link_text}</a>
+          <a href="${element/link_url}"
+             tal:condition="element/link_url"
+          >${element/link_text}</a>
         </div>
       </div>
     </tal:slides>
   </div>
-  <button class="carousel-control-prev" type="button" data-bs-slide="prev" data-bs-target="#DynamicPageSlider">
-    <span class="carousel-control-prev-icon" aria-hidden="true"></span>
+  <button class="carousel-control-prev"
+          type="button"
+          data-bs-slide="prev"
+          data-bs-target="#DynamicPageSlider"
+  >
+    <span class="carousel-control-prev-icon"
+          aria-hidden="true"
+    ></span>
     <span class="visually-hidden">Previous</span>
   </button>
-  <button class="carousel-control-next" type="button" data-bs-slide="next" data-bs-target="#DynamicPageSlider">
-    <span class="carousel-control-next-icon" aria-hidden="true"></span>
+  <button class="carousel-control-next"
+          type="button"
+          data-bs-slide="next"
+          data-bs-target="#DynamicPageSlider"
+  >
+    <span class="carousel-control-next-icon"
+          aria-hidden="true"
+    ></span>
     <span class="visually-hidden">Next</span>
   </button>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/cs_dynamicpages/views/slider_view.py b/src/cs_dynamicpages/views/slider_view.py
index ca22b3e..1ce0fd2 100644
--- a/src/cs_dynamicpages/views/slider_view.py
+++ b/src/cs_dynamicpages/views/slider_view.py
@@ -1,8 +1,8 @@
 # from cs_dynamicpages import _
+from cs_dynamicpages.views.dynamic_page_row_view import DynamicPageRowView
 from plone import api
 from zope.interface import implementer
 from zope.interface import Interface
-from cs_dynamicpages.views.dynamic_page_row_view import DynamicPageRowView
 
 
 class ISliderView(Interface):
diff --git a/src/cs_dynamicpages/views/spacer_view.pt b/src/cs_dynamicpages/views/spacer_view.pt
index ae4bf27..903b036 100644
--- a/src/cs_dynamicpages/views/spacer_view.pt
+++ b/src/cs_dynamicpages/views/spacer_view.pt
@@ -1,2 +1,2 @@
 <div class="my-5">
-</div>
\ No newline at end of file
+</div>
diff --git a/src/cs_dynamicpages/views/text_view.pt b/src/cs_dynamicpages/views/text_view.pt
index c739948..fd65f8d 100644
--- a/src/cs_dynamicpages/views/text_view.pt
+++ b/src/cs_dynamicpages/views/text_view.pt
@@ -1,4 +1,6 @@
 <div class="dynamic-text my-5">
-    <tal:replace tal:condition="context/text" replace="structure context/text/output">
-    </tal:replace>
-</div>
\ No newline at end of file
+  <tal:replace tal:condition="context/text"
+               replace="structure context/text/output"
+  >
+  </tal:replace>
+</div>
diff --git a/src/cs_dynamicpages/vocabularies/configure.zcml b/src/cs_dynamicpages/vocabularies/configure.zcml
index 4db2909..74e9b6b 100644
--- a/src/cs_dynamicpages/vocabularies/configure.zcml
+++ b/src/cs_dynamicpages/vocabularies/configure.zcml
@@ -2,16 +2,16 @@
 
   <!-- -*- extra stuff goes here -*- -->
 
-    <utility
-        component=".row_columns.RowColumnsFactory"
-        name="cs_dynamicpages.RowColumns"
-    />
+  <utility
+      name="cs_dynamicpages.RowColumns"
+      component=".row_columns.RowColumnsFactory"
+      />
 
 
-    <utility
-        component=".image_position.ImagePositionFactory"
-        name="cs_dynamicpages.ImagePosition"
-    />
+  <utility
+      name="cs_dynamicpages.ImagePosition"
+      component=".image_position.ImagePositionFactory"
+      />
 
 
   <utility
diff --git a/src/cs_dynamicpages/vocabularies/image_position.py b/src/cs_dynamicpages/vocabularies/image_position.py
index e29634f..8d2bac9 100644
--- a/src/cs_dynamicpages/vocabularies/image_position.py
+++ b/src/cs_dynamicpages/vocabularies/image_position.py
@@ -1,36 +1,33 @@
-# -*- coding: utf-8 -*-
-
 # from plone import api
-from zope.schema.interfaces import IVocabularyFactory
-from zope.interface import implementer
 from cs_dynamicpages import _
 from plone.dexterity.interfaces import IDexterityContent
 from zope.globalrequest import getRequest
+from zope.interface import implementer
+from zope.schema.interfaces import IVocabularyFactory
 from zope.schema.vocabulary import SimpleTerm
 from zope.schema.vocabulary import SimpleVocabulary
 
 
-class VocabItem(object):
+class VocabItem:
     def __init__(self, token, value):
         self.token = token
         self.value = value
 
 
 @implementer(IVocabularyFactory)
-class ImagePosition(object):
-    """
-    """
+class ImagePosition:
+    """ """
 
     def __call__(self, context):
         # Just an example list of content for our vocabulary,
         # this can be any static or dynamic data, a catalog result for example.
         items = [
-            VocabItem(u'left', _(u'Left')),
-            VocabItem(u'right', _(u'Right')),
+            VocabItem("left", _("Left")),
+            VocabItem("right", _("Right")),
         ]
 
         # Fix context if you are using the vocabulary in DataGridField.
-        # See https://github.com/collective/collective.z3cform.datagridfield/issues/31:  # NOQA: 501
+        # See https://github.com/collective/collective.z3cform.datagridfield/issues/31:  # noqa: E501
         if not IDexterityContent.providedBy(context):
             req = getRequest()
             context = req.PARENTS[0]
diff --git a/src/cs_dynamicpages/vocabularies/row_columns.py b/src/cs_dynamicpages/vocabularies/row_columns.py
index 6f97df7..94cbc55 100644
--- a/src/cs_dynamicpages/vocabularies/row_columns.py
+++ b/src/cs_dynamicpages/vocabularies/row_columns.py
@@ -1,37 +1,34 @@
-# -*- coding: utf-8 -*-
-
 # from plone import api
-from zope.schema.interfaces import IVocabularyFactory
-from zope.interface import implementer
 from cs_dynamicpages import _
 from plone.dexterity.interfaces import IDexterityContent
 from zope.globalrequest import getRequest
+from zope.interface import implementer
+from zope.schema.interfaces import IVocabularyFactory
 from zope.schema.vocabulary import SimpleTerm
 from zope.schema.vocabulary import SimpleVocabulary
 
 
-class VocabItem(object):
+class VocabItem:
     def __init__(self, token, value):
         self.token = token
         self.value = value
 
 
 @implementer(IVocabularyFactory)
-class RowColumns(object):
-    """
-    """
+class RowColumns:
+    """ """
 
     def __call__(self, context):
         # Just an example list of content for our vocabulary,
         # this can be any static or dynamic data, a catalog result for example.
         items = [
-            VocabItem(u'col-md-6', _(u'2')),
-            VocabItem(u'col-md-4', _(u'3')),
-            VocabItem(u'col-md-3', _(u'4')),
+            VocabItem("col-md-6", _("2")),
+            VocabItem("col-md-4", _("3")),
+            VocabItem("col-md-3", _("4")),
         ]
 
         # Fix context if you are using the vocabulary in DataGridField.
-        # See https://github.com/collective/collective.z3cform.datagridfield/issues/31:  # NOQA: 501
+        # See https://github.com/collective/collective.z3cform.datagridfield/issues/31:  # noqa: E501
         if not IDexterityContent.providedBy(context):
             req = getRequest()
             context = req.PARENTS[0]
diff --git a/src/cs_dynamicpages/vocabularies/row_type.py b/src/cs_dynamicpages/vocabularies/row_type.py
index 2838efa..e6fef0c 100644
--- a/src/cs_dynamicpages/vocabularies/row_type.py
+++ b/src/cs_dynamicpages/vocabularies/row_type.py
@@ -1,3 +1,4 @@
+from plone import api
 from plone.dexterity.interfaces import IDexterityContent
 from zope.component import getSiteManager
 from zope.globalrequest import getRequest
@@ -7,7 +8,7 @@
 from zope.schema.interfaces import IVocabularyFactory
 from zope.schema.vocabulary import SimpleTerm
 from zope.schema.vocabulary import SimpleVocabulary
-from plone import api
+
 
 class VocabItem:
     def __init__(self, token, value):
@@ -26,9 +27,10 @@ def __call__(self, context):
         items = []
         terms = []
         elements = api.content.find(
-                portal_type="DynamicPageRow",
-                context=api.portal.get(),
-            )
+            portal_type="DynamicPageRow",
+            context=api.portal.get(),
+        )
+        query_context = None
         if elements:
             query_context = elements[0].getObject()
         else:
@@ -46,7 +48,6 @@ def __call__(self, context):
         for view_name in available_view_names:
             items.append(VocabItem(view_name, view_name.replace(VIEW_PREFIX, "")))
         if not available_view_names:
-
             items.append(VocabItem("cs_dynamicpages-featured-view", "Featured View"))
         for item in items:
             terms.append(
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/base.py b/tests/base.py
new file mode 100644
index 0000000..d758a3e
--- /dev/null
+++ b/tests/base.py
@@ -0,0 +1,20 @@
+from cs_dynamicpages import logger
+from cs_dynamicpages import PACKAGE_NAME
+
+import pytest
+
+
+class TestBase:
+    @pytest.fixture(autouse=True)
+    def installed(self, portal, installer):
+        """
+        Workaround to test isolation problems when using
+        collective.z3cform.datagridfield
+
+        See: https://community.plone.org/t/test-isolation-errors-with-collective-z3cform-datagridfield/7424
+        """
+        try:
+            installer.install_product(PACKAGE_NAME)
+        except Exception as e:
+            logger.info(e)
+            logger.info("Package already installed")
diff --git a/tests/content/__init__.py b/tests/content/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/content/conftest.py b/tests/content/conftest.py
new file mode 100644
index 0000000..ea2cf40
--- /dev/null
+++ b/tests/content/conftest.py
@@ -0,0 +1,125 @@
+from base64 import b64decode
+from collections import defaultdict
+from cs_dynamicpages.interfaces import IBrowserLayer
+from plone import api
+from plone.app.multilingual.interfaces import ITranslationManager
+from plone.app.testing import SITE_OWNER_NAME
+from plone.app.testing import SITE_OWNER_PASSWORD
+from plone.namedfile import NamedBlobImage
+from plone.testing.zope import Browser
+from zope.interface import alsoProvides
+
+import pytest
+
+
+@pytest.fixture
+def contents() -> list:
+    """Content to be created."""
+    return [
+        # EU CONTENT
+        {
+            "_container": "",
+            "_language": "eu",
+            "_transitions": ["publish"],
+            "type": "Folder",
+            "id": "folder",
+            "title": "Folder",
+        },
+        {
+            "_container": "folder",
+            "_transitions": ["publish"],
+            "_language": "eu",
+            "type": "DynamicPageFolder",
+            "id": "dpf",
+            "title": "DPF",
+        },
+        {
+            "_container": "folder/dpf",
+            "_transitions": ["publish"],
+            "_language": "eu",
+            "type": "DynamicPageRow",
+            "id": "row-1",
+            "title": "Row 1",
+        },
+        {
+            "_container": "folder/dpf",
+            "_transitions": ["publish"],
+            "_language": "eu",
+            "type": "DynamicPageRow",
+            "id": "row-2",
+            "title": "Row 2",
+        },
+    ]
+
+
+@pytest.fixture()
+def portal(functional):
+    return functional["portal"]
+
+
+@pytest.fixture()
+def browser(functional):
+    browser = Browser(functional["app"])
+    browser.handleErrors = False
+    browser.addHeader("Authorization", f"Basic {SITE_OWNER_NAME}:{SITE_OWNER_PASSWORD}")
+    return browser
+
+
+@pytest.fixture()
+def my_request(functional):
+    req = functional["request"]
+    alsoProvides(req, IBrowserLayer)
+    return req
+
+
+@pytest.fixture
+def create_contents(contents):
+    """Helper fixture to create initial content."""
+
+    def func(portal) -> dict:
+        ids = defaultdict(list)
+        for item in contents:
+            container_path = item["_container"]
+            container = portal.unrestrictedTraverse(container_path)
+            payload = {"container": container, "language": item["_language"]}
+            if "_image" in item:
+                payload["image"] = NamedBlobImage(b64decode(item["_image"]))
+            for key, value in item.items():
+                if key.startswith("_"):
+                    continue
+                payload[key] = value
+
+            content = api.content.create(**payload)
+            content.language = payload["language"]
+            if "_view" in item:
+                content.setLayout(item["_view"])
+            # Set translation
+            if "_translation_of" in item:
+                source = portal.unrestrictedTraverse(item["_translation_of"])
+                ITranslationManager(source).register_translation(
+                    content.language, content
+                )
+            # Transition items
+            if "_transitions" in item:
+                transitions = item["_transitions"]
+                for transition in transitions:
+                    api.content.transition(content, transition=transition)
+            ids[container_path].append(content.getId())
+        return ids
+
+    return func
+
+
+@pytest.fixture()
+def portal_with_content(app, portal, create_contents):
+    """Plone portal with initial content."""
+    with api.env.adopt_roles(["Manager"]):
+        create_contents(portal)
+    # transaction.commit()
+    yield portal
+    # with api.env.adopt_roles(["Manager"]):
+    #     containers = sorted(content_ids.keys(), reverse=True)
+    #     for container_path in containers:
+    #         container = portal.unrestrictedTraverse(container_path)
+    #         container.manage_delObjects(content_ids[container_path])
+    # transaction.commit()
diff --git a/tests/content/test_content_operations.py b/tests/content/test_content_operations.py
new file mode 100644
index 0000000..9ed19fb
--- /dev/null
+++ b/tests/content/test_content_operations.py
@@ -0,0 +1,72 @@
+from ..base import TestBase
+from plone import api
+
+import pytest
+import transaction
+
+
+class TestContent(TestBase):
+    @pytest.fixture(autouse=True)
+    def create_content(self, portal):
+        with api.env.adopt_roles(["Manager"]):
+            self.folder = api.content.create(
+                container=portal,
+                type="Folder",
+                id="folder",
+            )
+
+            assert self.folder is not None
+            assert self.folder.id == "folder"
+
+            self.folder.setLayout("dynamic-view")
+
+            self.dpf = api.content.create(
+                container=self.folder, type="DynamicPageFolder", id="dpf", title="DPF"
+            )
+
+            assert self.dpf is not None
+            assert self.dpf.id == "dpf"
+
+            self.row1 = api.content.create(
+                container=self.dpf, type="DynamicPageRow", id="row-1", title="Row 1"
+            )
+            assert self.row1 is not None
+            assert self.row1.id == "row-1"
+
+            self.row2 = api.content.create(
+                container=self.dpf, type="DynamicPageRow", id="row-2", title="Row 2"
+            )
+            assert self.row2 is not None
+            assert self.row2.id == "row-2"
+
+            transaction.commit()
+
+    def test_view(self, browser):
+        """check that the folder is rendered correctly with the basic instructions"""
+
+        browser.open(self.folder.absolute_url())
+        # We have 2 rows, so there must be an option to delete a row
+        assert "Delete row" in browser.contents
+
+        # assert "Row 1" in browser.contents
+        # assert "Row 2" in browser.contents
+
+        # There must be an option to add a new row
+        assert "Add new row" in browser.contents
+
+    def test_add_row(self, browser):
+        """click add row"""
+        browser.open(self.folder.absolute_url())
+        link = browser.getLink("Add new row")
+        link.click()
+        assert "++add++DynamicPageRow" in browser.url
+
+        control = browser.getControl(name="form.widgets.IBasic.title")
+        control.value = "Row 3"
+
+        save = browser.getControl(name="form.buttons.save")
+        save.click()
+
+        browser.open(self.folder.absolute_url())
+
+        assert len(self.folder.dpf.keys()) == 3
diff --git a/tests/setup/__init__.py b/tests/setup/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/setup/test_setup_install.py b/tests/setup/test_setup_install.py
index e2efb57..77abfa1 100644
--- a/tests/setup/test_setup_install.py
+++ b/tests/setup/test_setup_install.py
@@ -1,7 +1,8 @@
+from ..base import TestBase
 from cs_dynamicpages import PACKAGE_NAME
 
 
-class TestSetupInstall:
+class TestSetupInstall(TestBase):
     def test_addon_installed(self, installer):
         """Test if cs_dynamicpages is installed."""
         assert installer.is_product_installed(PACKAGE_NAME) is True