diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index d11d82982..6d14434ce 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -570,6 +570,7 @@ dependencies = [
  "hyper-tls 0.5.0",
  "hyper-util",
  "lazy_static",
+ "mime_guess",
  "once_cell",
  "paris",
  "predicates",
@@ -1481,6 +1482,16 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
+[[package]]
+name = "mime_guess"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
 [[package]]
 name = "miniz_oxide"
 version = "0.8.0"
@@ -2706,6 +2717,12 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
+[[package]]
+name = "unicase"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.17"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index cade562c6..d008a3cd9 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -48,6 +48,7 @@ testcontainers = "0.23.1"
 slug = "0.1.5"
 regex = "1.11.1"
 zip = "2.2.1"
+mime_guess = "2.0.5"
 
 [dependencies.uuid]
 version = "1.7.0"
diff --git a/cli/src/commands/assets.rs b/cli/src/commands/assets.rs
index 74db8ba1e..4c00488f6 100644
--- a/cli/src/commands/assets.rs
+++ b/cli/src/commands/assets.rs
@@ -1,7 +1,7 @@
 use std::{
     fs::{self, File},
     io::Read,
-    path::PathBuf,
+    path::{Path, PathBuf},
     str::FromStr,
 };
 
@@ -18,6 +18,7 @@ use crate::{
 use bytes::Bytes;
 
 use hyper::header;
+use mime_guess::mime;
 use serde::{Deserialize, Serialize};
 use walkdir::WalkDir;
 
@@ -126,21 +127,24 @@ async fn add(
 
     let project = get_default_project()?;
 
-    let mut file = File::open(
-        PathBuf::from_str(&project.path)
-            .unwrap()
-            .join("assets")
-            .join(path.unwrap_or("".to_string()))
-            .join(filename),
-    )
-    .map_err(|err| DaikokuCliError::FileSystem(err.to_string()))?;
+    let filepath = PathBuf::from_str(&project.path)
+        .unwrap()
+        .join("assets")
+        .join(path.unwrap_or("".to_string()))
+        .join(filename);
+    let mut file =
+        File::open(filepath.clone()).map_err(|err| DaikokuCliError::FileSystem(err.to_string()))?;
 
     let mut contents = Vec::new();
     let _ = file
         .read_to_end(&mut contents)
         .map_err(|err| DaikokuCliError::FileSystem(err.to_string()));
 
-    let _ = daikoku_cms_api_post(&url, Bytes::from(contents), false).await?;
+    let content_type = mime_guess::from_path(filepath.to_string_lossy().into_owned())
+        .first()
+        .unwrap_or(mime::APPLICATION_OCTET_STREAM);
+
+    let _ = daikoku_cms_api_post(&url, Bytes::from(contents), false, Some(content_type)).await?;
 
     logger::success("New asset has been pushed".to_string());
 
@@ -327,6 +331,7 @@ async fn sync() -> DaikokuResult<()> {
             DaikokuCliError::ParsingError("failed to convert assets to json array".to_string())
         })?),
         false,
+        None
     )
     .await?;
 
diff --git a/cli/src/commands/cms.rs b/cli/src/commands/cms.rs
index cd82799d1..3a7856350 100644
--- a/cli/src/commands/cms.rs
+++ b/cli/src/commands/cms.rs
@@ -472,12 +472,6 @@ async fn migrate(name: String, path: String, server: String, apikey: String) ->
 
     let sources_path = project_path.join("src");
 
-    let root_mail_tenant = bytes_to_struct::<TenantMailBody>(
-        raw_daikoku_cms_api_get("/tenants/default", &server, &apikey)
-            .await?
-            .response,
-    )?;
-
     let root_mail_user_translations = bytes_to_struct::<IntlTranslationBody>(
         raw_daikoku_cms_api_get(
             "/translations/_mail?domain=tenant.mail.template",
@@ -507,7 +501,6 @@ async fn migrate(name: String, path: String, server: String, apikey: String) ->
     .filter(|api| !EXCLUDE_API.contains(&api._id.as_str()))
     .collect();
 
-    create_mail_tenant(root_mail_tenant, sources_path.clone())?;
     create_mail_folder(root_mail_user_translations, sources_path.clone(), true)?;
     create_mail_folder(mail_user_template, sources_path.clone(), false)?;
 
@@ -616,30 +609,6 @@ pub(crate) fn create_api_folder(
     Ok(created)
 }
 
-pub(crate) fn create_mail_tenant(
-    mail_settings: TenantMailBody,
-    project_path: PathBuf,
-) -> DaikokuResult<()> {
-    let filename = "page.html".to_string();
-
-    let file_path = project_path
-        .clone()
-        .join(get_mail_page_path(&filename, true).unwrap());
-
-    let _ = create_path_and_file(
-        file_path,
-        mail_settings
-            .mailer_settings
-            .map(|mailer| mailer.template.unwrap_or("".to_string()))
-            .unwrap_or("".to_string()),
-        filename,
-        HashMap::new(),
-        SourceExtension::HTML,
-    );
-
-    Ok(())
-}
-
 pub(crate) fn create_mail_folder(
     intl_translation: IntlTranslationBody,
     project_path: PathBuf,
diff --git a/cli/src/commands/pull.rs b/cli/src/commands/pull.rs
index 035c306e1..a5ddfe758 100644
--- a/cli/src/commands/pull.rs
+++ b/cli/src/commands/pull.rs
@@ -10,8 +10,8 @@ use crate::{
 
 use super::{
     cms::{
-        self, create_api_folder, create_mail_folder, create_mail_tenant, Api, CmsPage,
-        IntlTranslationBody, TenantMailBody, EXCLUDE_API,
+        self, create_api_folder, create_mail_folder, Api, CmsPage, IntlTranslationBody,
+        TenantMailBody, EXCLUDE_API,
     },
     environments::{get_default_environment, read_apikey_from_secrets},
 };
@@ -81,10 +81,6 @@ async fn mails_synchronization(project: &cms::Project) -> DaikokuResult<()> {
         .collect::<Vec<&CmsPage>>();
 
     if existing_emails_pages.is_empty() {
-        let root_mail_tenant = bytes_to_struct::<TenantMailBody>(
-            daikoku_cms_api_get("/tenants/default").await?.response,
-        )?;
-
         let root_mail_user_translations = bytes_to_struct::<IntlTranslationBody>(
             daikoku_cms_api_get("/translations/_mail?domain=tenant.mail.template")
                 .await?
@@ -97,7 +93,6 @@ async fn mails_synchronization(project: &cms::Project) -> DaikokuResult<()> {
                 .response,
         )?;
 
-        create_mail_tenant(root_mail_tenant, sources_path.clone())?;
         create_mail_folder(root_mail_user_translations, sources_path.clone(), true)?;
         create_mail_folder(mail_user_template, sources_path.clone(), false)?;
     } else {
@@ -107,15 +102,16 @@ async fn mails_synchronization(project: &cms::Project) -> DaikokuResult<()> {
                 .join(item.path.clone().unwrap().replacen("/", "", 1))
                 .join("page.html");
 
-            let mut file = std::fs::OpenOptions::new()
+            let file = std::fs::OpenOptions::new()
                 .write(true)
                 .truncate(true)
-                .open(file_path)
-                .unwrap();
+                .open(file_path);
 
-            let _ = file.write_all(item.content.clone().as_bytes());
+            if let Ok(mut email) = file {
+                let _ = email.write_all(item.content.clone().as_bytes());
 
-            let _ = file.flush();
+                let _ = email.flush();
+            }
         });
     }
 
diff --git a/cli/src/commands/push.rs b/cli/src/commands/push.rs
index 4bdb4e5c8..fae30e539 100644
--- a/cli/src/commands/push.rs
+++ b/cli/src/commands/push.rs
@@ -111,7 +111,7 @@ async fn synchronization(body: &mut Vec<CmsFile>, dry_run: bool) -> DaikokuResul
     );
 
     if !dry_run {
-        daikoku_cms_api_post("/sync", body, true).await?;
+        daikoku_cms_api_post("/sync", body, true, None).await?;
     }
 
     Ok(())
diff --git a/cli/src/commands/watch.rs b/cli/src/commands/watch.rs
index d48187f0c..3c2ec29eb 100644
--- a/cli/src/commands/watch.rs
+++ b/cli/src/commands/watch.rs
@@ -1,3 +1,4 @@
+use hyper::header::{HeaderValue, LOCATION};
 use regex::Regex;
 use std::collections::HashMap;
 use std::io::Read;
@@ -8,7 +9,7 @@ use http_body_util::{BodyExt, Empty, Full};
 use hyper::body::Bytes;
 use hyper::server::conn::http1;
 use hyper::service::service_fn;
-use hyper::{header, Method};
+use hyper::{header, Method, StatusCode};
 use hyper::{Request, Response};
 
 use hyper_util::rt::TokioIo;
@@ -110,8 +111,18 @@ async fn watcher(
 ) -> Result<Response<Full<Bytes>>, DaikokuCliError> {
     let uri = req.uri().path().to_string();
 
-    if uri.starts_with("/api/") || uri.starts_with("/tenant-assets/") {
-        logger::println("forward to api or /tenant-assets".to_string());
+    if uri.starts_with("/tenant-assets/") {
+        let redirect_url = "http://localhost:5173/tenant-assets/api3.jpeg";
+
+        let mut response = Response::new(Full::<Bytes>::new(Bytes::from("")));
+        *response.status_mut() = StatusCode::FOUND; // 302 status
+        response
+            .headers_mut()
+            .insert(LOCATION, HeaderValue::from_str(redirect_url).unwrap());
+
+        Ok(response)
+    } else if uri.starts_with("/api/") {
+        logger::println("forward to api".to_string());
         forward_api_call(uri, req, environment).await
     } else {
         let path = uri.replace("_/", "");
@@ -242,13 +253,12 @@ async fn forward_api_call(
 
     let url: String = format!("{}{}", environment.server, uri);
 
-    let cookie = read_cookie_from_environment(true)?;
-
     let raw_req = Request::builder()
         .method(Method::from_str(&method).unwrap())
         .uri(&url)
         .header(header::HOST, &host)
-        .header(header::COOKIE, cookie);
+        .header("Accept", "*/*")
+        .header(header::COOKIE, read_cookie_from_environment(true)?);
 
     let req = if method == "GET" {
         raw_req.body(Empty::<Bytes>::new().boxed()).unwrap()
@@ -292,7 +302,9 @@ async fn forward_api_call(
 
     let (
         hyper::http::response::Parts {
-            headers: _, status, ..
+            headers: _headers,
+            status,
+            ..
         },
         body,
     ) = upstream_resp.into_parts();
@@ -301,6 +313,8 @@ async fn forward_api_call(
 
     let status = status.as_u16();
 
+    println!("{:?}", _headers);
+
     if status >= 300 && status < 400 {
         Ok(Response::new(Full::new(Bytes::from(
             "Authentication needed! Refresh this page once done",
@@ -340,7 +354,9 @@ async fn render_page(
         fields.insert(param.key, param.value);
     }
 
-    if watch_path.starts_with("/mails") {
+    if watch_path.starts_with("/mails")
+        && !watch_path.starts_with("/mails/root/tenant-mail-template")
+    {
         let language = if watch_path.contains("/fr") {
             "fr"
         } else {
@@ -449,7 +465,6 @@ async fn render_page(
 
             let source = src.replace('"', "&quot;");
 
-            
             let children: String = if SourceExtension::from_str(&page.content_type()).unwrap()
                 == SourceExtension::HTML
             {
diff --git a/cli/src/helpers.rs b/cli/src/helpers.rs
index de498f052..ef7d4f2a3 100644
--- a/cli/src/helpers.rs
+++ b/cli/src/helpers.rs
@@ -2,6 +2,7 @@ use std::any::type_name;
 
 use bytes::Buf;
 use hyper::header;
+use mime_guess::Mime;
 use serde::Deserialize;
 
 use crate::{
@@ -45,6 +46,7 @@ pub(crate) async fn daikoku_cms_api_post<T: Buf + std::marker::Send + 'static>(
     path: &str,
     body: T,
     is_json_content: bool,
+    content_type: Option<Mime>,
 ) -> DaikokuResult<Vec<u8>>
 where
     reqwest::Body: From<T>,
@@ -60,18 +62,24 @@ where
 
     let url: String = format!("{}/cms-api{}", environment.server, &path);
 
-    let builder = reqwest::Client::new().post(url).header(header::HOST, host);
+    let mut builder = reqwest::Client::new().post(url).header(header::HOST, host);
 
-    let resp = if is_json_content {
+    builder = if is_json_content {
         builder.header(header::CONTENT_TYPE, "application/json")
     } else {
         builder
     }
-    .header(header::AUTHORIZATION, format!("Basic {}", apikey))
-    .body(body)
-    .send()
-    .await
-    .map_err(|err| DaikokuCliError::DaikokuStrError(err.to_string()))?;
+    .header(header::AUTHORIZATION, format!("Basic {}", apikey));
+
+    if let Some(content) = content_type {
+        builder = builder.header("Asset-Content-Type", content.to_string());
+    }
+
+    let resp = builder
+        .body(body)
+        .send()
+        .await
+        .map_err(|err| DaikokuCliError::DaikokuStrError(err.to_string()))?;
 
     let status = resp.status().as_u16();
 
diff --git a/daikoku/app/controllers/HomeController.scala b/daikoku/app/controllers/HomeController.scala
index 01a53351e..f9ed8b16c 100644
--- a/daikoku/app/controllers/HomeController.scala
+++ b/daikoku/app/controllers/HomeController.scala
@@ -284,8 +284,6 @@ class HomeController(
                       true
                     )
 
-//                  println(strictPage)
-
                   val (page, urlSearchParams) =
                     if (strictPage._1.nonEmpty)
                       strictPage
diff --git a/daikoku/app/services/AssetsService.scala b/daikoku/app/services/AssetsService.scala
index 4056f52cc..d67fb8666 100644
--- a/daikoku/app/services/AssetsService.scala
+++ b/daikoku/app/services/AssetsService.scala
@@ -1,13 +1,14 @@
 package fr.maif.otoroshi.daikoku.services
 
 import fr.maif.otoroshi.daikoku.actions.ApiActionContext
+import fr.maif.otoroshi.daikoku.audit.AuditTrailEvent
+import fr.maif.otoroshi.daikoku.ctrls.CmsApiActionContext
 import fr.maif.otoroshi.daikoku.domain.{Asset, AssetId}
 import fr.maif.otoroshi.daikoku.env.Env
 import fr.maif.otoroshi.daikoku.logger.AppLogger
 import fr.maif.otoroshi.daikoku.services.NormalizeSupport.normalize
 import fr.maif.otoroshi.daikoku.utils.IdGenerator
 import fr.maif.otoroshi.daikoku.utils.StringImplicits.BetterString
-import org.apache.pekko.http.scaladsl.model.{ContentType, ContentTypes, HttpResponse}
 import org.apache.pekko.http.scaladsl.util.FastFuture
 import org.apache.pekko.stream.connectors.s3.ObjectMetadata
 import org.apache.pekko.stream.scaladsl.{Sink, Source}
@@ -152,10 +153,6 @@ class AssetsService {
       .flatMap(slug => if (slug.isEmpty) None else Some(slug))
     val assetId = AssetId(IdGenerator.uuid)
 
-    println(contentType)
-
-    Future.successful(Ok(Json.obj()))
-
     ctx.tenant.bucketSettings match {
       case None =>
         FastFuture.successful(
@@ -386,7 +383,6 @@ class AssetsService {
   ) = {
     implicit val ec = env.defaultExecutionContext
 
-
     ctx.tenant.bucketSettings match {
       case None =>
         FastFuture.successful(
@@ -420,38 +416,28 @@ class AssetsService {
             case Some(_) if download =>
               env.assetsStore
                 .getTenantAsset(ctx.tenant.id, AssetId(assetId))(cfg)
-                .map { case (metadata, data, s3Source) =>
-
-//                  case None =>
-//                    NotFound(Json.obj("error" -> "Asset not found!"))
-//                  case Some((source, meta)) =>
-//                    val filename = meta.metadata
-//                      .filter(_.name().startsWith("x-amz-meta-"))
-//                      .find(_.name() == "x-amz-meta-filename")
-//                      .map(_.value())
-//                      .getOrElse("asset.txt")
-
-//                    Ok.send(
-                      val entity = org.apache.pekko.http.scaladsl.model.HttpEntity(
-                          metadata.contentType
-                            .flatMap(ContentType.parse(_).toOption)
-                            .getOrElse(ContentTypes.`application/octet-stream`),
-                          metadata.contentLength,
-                          s3Source)
-
-                      Ok.sendEntity(HttpEntity.Streamed(entity, None, None))
-
-//                  )
-//                        HttpEntity.Streamed(
-//                          Source.single(source),
-//                          None,
-//                          meta.contentType
-//                            .map(Some.apply)
-//                            .getOrElse(Some("application/octet-stream"))
-//                        )
-//                      .withHeaders(
-//                        "Content-Disposition" -> s"""attachment; filename="$filename""""
-//                      )
+                .map {
+                  case None =>
+                    NotFound(Json.obj("error" -> "Asset not found!"))
+                  case Some((source, meta)) =>
+                    val filename = meta.metadata
+                      .filter(_.name().startsWith("x-amz-meta-"))
+                      .find(_.name() == "x-amz-meta-filename")
+                      .map(_.value())
+                      .getOrElse("asset.txt")
+
+                    Ok.sendEntity(
+                        HttpEntity.Streamed(
+                          source,
+                          None,
+                          meta.contentType
+                            .map(Some.apply)
+                            .getOrElse(Some("application/octet-stream"))
+                        )
+                      )
+                      .withHeaders(
+                        "Content-Disposition" -> s"""attachment; filename="$filename""""
+                      )
                 }
             case Some(url) =>
               env.wsClient
@@ -480,4 +466,4 @@ class AssetsService {
     }
   }
 
-}
+}
\ No newline at end of file
diff --git a/daikoku/app/utils/s3.scala b/daikoku/app/utils/s3.scala
index a1125a63c..dccad54af 100644
--- a/daikoku/app/utils/s3.scala
+++ b/daikoku/app/utils/s3.scala
@@ -3,11 +3,14 @@ package fr.maif.otoroshi.daikoku.utils
 import com.amazonaws.auth.{AWSStaticCredentialsProvider, BasicAWSCredentials}
 import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration
 import com.amazonaws.services.s3.AmazonS3ClientBuilder
-import com.amazonaws.services.s3.model.PutObjectRequest
 import com.amazonaws.{ClientConfiguration, HttpMethod, SdkClientException}
 import fr.maif.otoroshi.daikoku.domain._
 import org.apache.pekko.actor.ActorSystem
-import org.apache.pekko.http.scaladsl.model.{ContentType, ContentTypes, HttpHeader}
+import org.apache.pekko.http.scaladsl.model.{
+  ContentType,
+  ContentTypes,
+  HttpHeader
+}
 import org.apache.pekko.stream.Materializer
 import org.apache.pekko.stream.connectors.s3.headers.CannedAcl
 import org.apache.pekko.stream.connectors.s3.scaladsl.S3
@@ -120,9 +123,7 @@ class AssetsDataStore(actorSystem: ActorSystem)(implicit
         override def getRegion: Region = Region.of(conf.region)
       },
       listBucketApiVersion = ApiVersion.ListBucketVersion2
-    )
-      .withEndpointUrl(conf.endpoint)
-      .withAccessStyle(AccessStyle.PathAccessStyle)
+    ).withEndpointUrl(conf.endpoint)
     S3Attributes.settings(settings)
   }
 
@@ -141,7 +142,6 @@ class AssetsDataStore(actorSystem: ActorSystem)(implicit
     val ctype = ContentType
       .parse(contentType)
       .getOrElse(ContentTypes.`application/octet-stream`)
-
     val meta = MetaHeaders(
       Map(
         "filename" -> name,
@@ -153,14 +153,6 @@ class AssetsDataStore(actorSystem: ActorSystem)(implicit
         "content-type" -> ctype.value
       )
     )
-
-    lazy val opts = new ClientConfiguration()
-    lazy val endpointConfiguration =
-      new EndpointConfiguration(conf.endpoint, conf.region)
-    lazy val credentialsProvider = new AWSStaticCredentialsProvider(
-      new BasicAWSCredentials(conf.access, conf.secret)
-    )
-
     val sink = S3
       .multipartUpload(
         bucket = conf.bucket,
@@ -288,7 +280,7 @@ class AssetsDataStore(actorSystem: ActorSystem)(implicit
         contentType = ctype,
         metaHeaders = meta,
         cannedAcl = CannedAcl.Private, // CannedAcl.PublicRead
-        chunkingParallelism = 1,
+        chunkingParallelism = 1
       )
       .withAttributes(s3ClientSettingsAttrs)
     content.toMat(sink)(Keep.right).run()
@@ -322,24 +314,17 @@ class AssetsDataStore(actorSystem: ActorSystem)(implicit
     val attrs = s3ClientSettingsAttrs
     S3.listBucket(conf.bucket, Some(s"/${tenant.value}/tenant-assets"))
       .mapAsync(1) { content =>
-//        S3.getObjectMetadata(conf.bucket, content.key)
-//            .withAttributes(s3ClientSettingsAttrs)
-//              .toMat(Sink.head)(Keep.both)
-//              .run()
-//          ._2
-//          .map(meta => S3ListItem(content, meta.getOrElse(ObjectMetadata(Seq.empty))))
-          val (metadataFuture, _dataFuture) = S3.getObject(
-                conf.bucket,
-                content.key
+        val none: Option[ObjectMetadata] = None
+        S3.getObjectMetadata(conf.bucket, content.key)
+          .withAttributes(attrs)
+          .runFold(none)((_, opt) => opt)
+          .map {
+            case None =>
+              S3ListItem(
+                content,
+                ObjectMetadata(collection.immutable.Seq.empty[HttpHeader])
               )
-              .withAttributes(s3ClientSettingsAttrs)
-              .toMat(Sink.head)(Keep.both)
-              .run()
-
-          for {
-            metadata <- metadataFuture
-          } yield {
-            S3ListItem(content, metadata)
+            case Some(meta) => S3ListItem(content, meta)
           }
       }
       .withAttributes(attrs)
@@ -360,45 +345,11 @@ class AssetsDataStore(actorSystem: ActorSystem)(implicit
 
   def getTenantAsset(tenant: TenantId, asset: AssetId)(implicit
       conf: S3Configuration
-  ): Future[(ObjectMetadata, ByteString, Source[ByteString, Future[ObjectMetadata]])] = {
-//    val none: Option[(Source[ByteString, NotUsed], ObjectMetadata)] = None
-
-//    val s3Source: Source[ByteString, Future[ObjectMetadata]] = S3.getObject(conf.bucket, s"/${tenant.value}/tenant-assets/${asset.value}")
-//    s3Source
-     val s3Source: Source[ByteString, Future[ObjectMetadata]] =
-       S3.getObject(conf.bucket, s"/${tenant.value}/tenant-assets/${asset.value}")
-
-    val (metadataFuture, dataFuture) =
-      s3Source.toMat(Sink.head)(Keep.both).run()
-
-        for {
-          m <- metadataFuture
-          d <- dataFuture
-        } yield {
-          (m, d, s3Source)
-        }
-
-//    val (meta, data) = S3.getObject(conf.bucket, s"/${tenant.value}/tenant-assets/${asset.value}")
-//          .withAttributes(s3ClientSettingsAttrs)
-//          .toMat(Sink.head)(Keep.both)
-//          .run()
-//
-//    for {
-//      m <- meta
-//      d <- data
-//    } yield {
-//      (d, m)
-//    }
-
-//    S3.getObject(conf.bucket, s"/${tenant.value}/tenant-assets/${asset.value}")
-//      .withAttributes(s3ClientSettingsAttrs)
-//      .runFold(none) { case (meta, data) =>
-//
-//        println(meta)
-//        println(data)
-//
-//        meta
-//      }
+  ): Future[Option[(Source[ByteString, NotUsed], ObjectMetadata)]] = {
+    val none: Option[(Source[ByteString, NotUsed], ObjectMetadata)] = None
+    S3.getObject(conf.bucket, s"/${tenant.value}/tenant-assets/${asset.value}")
+      .withAttributes(s3ClientSettingsAttrs)
+      .runFold(none)((opt, _) => opt)
   }
 
   //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -526,4 +477,4 @@ class AssetsDataStore(actorSystem: ActorSystem)(implicit
     getPresignedUrl(path)
   }
 
-}
+}
\ No newline at end of file
diff --git a/daikoku/javascript/src/components/adminbackoffice/cms/Body.tsx b/daikoku/javascript/src/components/adminbackoffice/cms/Body.tsx
deleted file mode 100644
index bd4756fcc..000000000
--- a/daikoku/javascript/src/components/adminbackoffice/cms/Body.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import { Form, FormRef, type } from '@maif/react-forms';
-import React, { useContext, useEffect, useImperativeHandle, useRef, useState } from 'react';
-
-import { I18nContext } from '../../../contexts';
-import { ContentSideView } from './ContentSideView';
-import DragAndDropWrapper from './DragAndDropWrapper';
-
-export type BodyRef = {
-  handleSubmit: () => void
-}
-export default React.forwardRef<BodyRef, any>(({ contentType, setFinalValue, show, pages, inValue, publish, history, editable }, ref) => {
-  const { translate } = useContext(I18nContext);
-  const r = useRef<FormRef>();
-
-  useEffect(() => {
-    setValue({ draft: inValue || '' });
-  }, [inValue]);
-
-  const [value, setValue] = useState<any>({});
-
-  useImperativeHandle(ref, () => ({
-    handleSubmit() {
-      r.current?.handleSubmit();
-    },
-  }));
-
-  const handleDrop = (file: any) => {
-    const reader = new FileReader();
-    reader.onload = (e) => {
-      const text = e.target?.result;
-      setValue({ draft: text });
-    };
-    reader.readAsText(file);
-  };
-
-  const schema = {
-    draft: {
-      type: type.string,
-      label: null,
-      help: translate('cms.create.draft_help'),
-      render: (formProps: any) => {
-        const [draft, setDraft] = useState('');
-
-        useEffect(() => {
-          setDraft(value.draft);
-        }, [value.draft]);
-
-        return (
-          <DragAndDropWrapper handleDrop={handleDrop}>
-            <ContentSideView
-              {...formProps}
-              pages={pages}
-              editable={editable}
-              contentType={contentType}
-              publish={publish}
-              value={draft}
-              onChange={(e: any) => {
-                setDraft(e);
-                formProps.onChange(e);
-              }}
-            />
-          </DragAndDropWrapper>
-        );
-      },
-    },
-  };
-
-  const flow = ['draft'];
-
-  return (
-    <div
-      style={{
-        display: show ? 'block' : 'none',
-        flex: 1,
-      }}
-    >
-      <Form
-        schema={schema}
-        value={value}
-        flow={flow}
-        onSubmit={(body) => {
-          setValue(body);
-          setFinalValue(body);
-        }}
-        ref={r}
-        footer={() => <></>}
-      />
-    </div>
-  );
-}
-);
diff --git a/daikoku/javascript/src/components/adminbackoffice/cms/ContentSideView.tsx b/daikoku/javascript/src/components/adminbackoffice/cms/ContentSideView.tsx
deleted file mode 100644
index 0aea0c480..000000000
--- a/daikoku/javascript/src/components/adminbackoffice/cms/ContentSideView.tsx
+++ /dev/null
@@ -1,431 +0,0 @@
-import { CodeInput, SelectInput } from '@maif/react-forms';
-import RefAutoComplete from 'antd/lib/auto-complete';
-import React, { useContext, useEffect, useRef, useState } from 'react';
-import { Link, useNavigate } from 'react-router-dom';
-import Select, { SingleValue } from 'react-select';
-import { ModalContext } from '../../../contexts';
-
-import { I18nContext } from '../../../contexts';
-import Editor from './Editor';
-import Helpers from './helpers.json';
-
-const CONTENT_TYPES_TO_MODE = {
-  'application/json': 'json',
-  'text/html': 'html',
-  'text/javascript': 'javascript',
-  'text/css': 'css',
-  'text/markdown': 'mardown',
-  'text/plain': 'plain_text',
-  'text/xml': 'xml',
-};
-
-const LinksView = ({
-  editor,
-  onChange
-}: any) => {
-  const { translate } = useContext(I18nContext);
-
-  return (
-    <div>
-      <span>{translate('cms.content_side_view.choose_link')}</span>
-      <Copied>
-        {(setShow: any) => <Select
-          options={[
-            {
-              label: translate('cms.content_side_view.notifications'),
-              value: 'notifications',
-            },
-            { label: translate('cms.content_side_view.sign_in'), value: 'login' },
-            { label: translate('cms.content_side_view.logout'), value: 'logout' },
-            { label: translate('cms.content_side_view.language'), value: 'language' },
-            { label: translate('cms.content_side_view.back_office'), value: 'backoffice' },
-            { label: translate('cms.content_side_view.sign_up'), value: 'signup' },
-            { label: translate('cms.content_side_view.home'), value: 'home' },
-          ]}
-          onChange={(link: SingleValue<{ label: string, value: string }>) => {
-            setShow(true);
-            onChange();
-            copy(editor, `{{daikoku-links-${link?.value}}}`);
-          }}
-        />}
-      </Copied>
-    </div>
-  );
-};
-
-const Copied = ({
-  children
-}: any) => {
-  const { translate } = useContext(I18nContext);
-  const [show, setShow] = useState(false);
-
-  useEffect(() => {
-    if (show) setTimeout(() => setShow(false), 500);
-  }, [show]);
-
-  if (show)
-    return (
-      <div
-        className="my-2 text-center py-2"
-        style={{
-          backgroundColor: '#fff',
-          borderRadius: '6px',
-        }}
-      >
-        <span>{translate('cms.inserted')}</span>
-      </div>
-    );
-  else return children(setShow);
-};
-interface Range {
-  from: any;
-  to: any;
-}
-const copy = (editor: any, text: string) => {
-  editor.dispatch(editor.state.changeByRange((range: Range) => ({
-    changes: [{ from: range.from, insert: text }],
-    range
-  })))
-  editor.focus()
-
-  // r.session.insert(r.getCursorPosition(), text);
-};
-
-const PagesView = ({
-  editor,
-  pages,
-  prefix,
-  title,
-  onChange
-}: any) => (
-  <div>
-    <span>{title}</span>
-    <Copied>
-      {(setShow: any) => <Select
-        options={pages.map((page: any) => ({
-          label: page.name,
-          value: page.id
-        }))}
-        onChange={(page: SingleValue<{ label: string, value: string }>) => {
-          setShow(true);
-          onChange();
-          copy(editor, `{{${prefix} "${page?.value}"}}`);
-        }}
-      />}
-    </Copied>
-  </div>
-);
-
-const TopActions = ({
-  setSideView,
-  publish,
-  setSelector
-}: any) => {
-  const { translate } = useContext(I18nContext);
-  const { confirm } = useContext(ModalContext);
-  const navigate = useNavigate();
-  const select = (id: any) => {
-    setSelector(undefined);
-    setSideView(true);
-  };
-
-  return (
-    <div
-      className="d-flex justify-content-between"
-      style={{
-        position: 'absolute',
-        top: '-42px',
-        right: 0,
-        left: 0,
-      }}
-      id="content_sideview_parent"
-    >
-      <button className="btn btn-sm btn-outline-info me-1" type="button" onClick={select}>
-        <i className="fas fa-plus pe-1" />
-        {translate('cms.content_side.new_action')}
-      </button>
-      <div className="d-flex">
-        <button className="btn btn-sm btn-outline-info" onClick={() => navigate('revisions')}>
-          Révisions
-        </button>
-        <button
-          className="btn btn-sm btn-outline-success ms-1"
-          type="button"
-          onClick={() => {
-            (confirm({ message: translate('cms.content_side.publish_label') }))
-              .then((ok) => {
-                if (ok) {
-                  publish();
-                }
-              });
-          }}
-        >
-          {translate('cms.content_side.publish_button')}
-        </button>
-      </div>
-    </div>
-  );
-};
-
-const HelperView = ({
-  content,
-  onChange,
-  editor
-}: any) => {
-  const [value, setValue] = useState(content.example);
-  const { translate } = useContext(I18nContext);
-
-  useEffect(() => {
-    setValue(content.example);
-  }, [content.example]);
-
-  return (
-    <div>
-      <h5>{translate(`cms.content_side_view.${content.name}`)}</h5>
-      {content.parameters && (
-        <div>
-          <h6>Parameters</h6>
-          <ul>
-            {(content.parameters || []).map((name: any) => <li key={`${name}`}>{name}</li>)}
-          </ul>
-        </div>
-      )}
-      {content.link && (
-        <a
-          className="btn btn-sm btn-outline-info my-2"
-          href={`https://maif.github.io/daikoku/swagger-ui/index.html${content.link}`}
-          target="_blank"
-          rel="noreferrer noopener"
-        >
-          Link to the model
-        </a>
-      )}
-      <CodeInput onChange={setValue} value={value} />
-      <button
-        className="btn btn-sm btn-outline-success mt-3"
-        onClick={() => {
-          onChange();
-          copy(editor, value);
-        }}
-      >
-        Insérer
-      </button>
-    </div>
-  );
-};
-
-export const ContentSideView = ({
-  value,
-  onChange,
-  pages,
-  publish,
-  contentType,
-  editable
-}: any) => {
-  const { translate } = useContext(I18nContext);
-  const [sideView, setSideView] = useState(false);
-  const [selector, setSelector] = useState<any>('');
-  const [search, setSearch] = useState('');
-  const [helpersList, setHelpers] = useState<any>([]);
-
-  const editorRef = useRef<any>();
-
-  const [selectedPage, setSelectedPage] = useState<any>({
-    top: 0,
-    left: 0,
-    pageName: undefined,
-  });
-
-  const [height, setHeight] = useState(500);
-
-  useEffect(() => {
-    setHelpers(
-      Helpers.reduce(
-        (acc, curr) => ({
-          ...acc,
-
-          [curr.important || curr.category]: {
-            collapsed: true,
-            helpers: [
-              ...((acc[curr.important || curr.category] || {}).helpers || []),
-              {
-                ...curr,
-                term: translate(`cms.content_side_view.${curr.name}`)
-                  .toLowerCase()
-                  .replace(/[\[\]&]+/g, ''),
-              },
-            ],
-          }
-        }), {}
-      )
-    );
-
-    searchHeight();
-  }, []);
-
-  const searchHeight = () => {
-    const elem = document.getElementById('content_sideview_parent')
-    if (!elem) {
-      setTimeout(searchHeight, 250);
-    } else {
-      setHeight(window.innerHeight - elem.getBoundingClientRect().top - 75);
-    }
-  };
-
-  //@ts-ignore //FIXME???
-  window.pages = pages;
-
-  const navigate = useNavigate()
-
-  const filterHelpers = (value: any) => {
-    const term = value.toLowerCase().replace(/[\[\]&]+/g, '');
-    setSearch(value);
-
-    setHelpers(Object.fromEntries(Object.entries(helpersList).map(([g, { helpers, ...rest }]: any) => [
-      g,
-      {
-        ...rest,
-        collapsed: term.length > 0 ? false : true,
-        helpers: (helpers as any).map((helper: any) => ({
-          ...helper,
-          filtered: term.length === 0 ? false : !helper.term.includes(term)
-        })),
-      },
-    ])));
-  };
-
-  return (<div className="d-flex flex-column" style={{
-    position: 'relative',
-    marginTop: editable ? '52px' : 0,
-    flex: 1,
-  }}>
-    <button className="btn btn-sm btn-outline-info m-1" type="button" style={{ maxWidth: 200 }}
-      onClick={() => navigate('/settings/pages', { state: { reload: true } })}>
-      {translate('cms.create.back_to_pages')}
-    </button>
-    {editable && <>
-      <TopActions setSideView={setSideView} publish={publish} setSelector={setSelector} />
-      <span style={{
-        fontStyle: 'italic',
-        fontSize: '13px',
-      }}>
-        {translate('cms.body.drag_and_drop_advice')}
-      </span>
-    </>}
-    <div style={{
-      position: 'relative',
-      border: '1px solid rgba(225,225,225,.5)',
-      flex: 1,
-    }}>
-      {selectedPage.pageName && (
-        <Link
-          className="btn btn-sm px-1"
-          style={{
-            position: 'absolute',
-            zIndex: 100,
-            top: selectedPage.top - 42,
-            left: selectedPage.left,
-            backgroundColor: '#fff',
-            border: '1px solid #f0f1f6',
-            boxShadow: '0 1px 3px rgb(0 0 0 / 15%)',
-          }}
-          to={`/settings/pages/edit/${(selectedPage as any).id}`}
-          onClick={() => setSelectedPage({ pageName: undefined })}>
-          {`${translate('cms.content_side_view.edit')} ${selectedPage.pageName}`}
-        </Link>)}
-      <Editor value={value} onChange={onChange} readOnly={!editable} setRef={(editorInstance: any) => {
-        editorRef.current = editorInstance
-        // editorInstance.container.style.resize = 'both';
-        // document.addEventListener('mouseup', (e) => editorInstance.resize());
-      }} mode={CONTENT_TYPES_TO_MODE[contentType] || 'html'} height={height} width="-1" />
-      {sideView && (<div style={{
-        backgroundColor: '#fff',
-        position: 'absolute',
-        inset: 0,
-      }}>
-        <div className="d-flex" style={{ height: '100%', position: 'relative' }}>
-          {selector !== 'history' && (<div className="p-3" style={{
-            flex: !selector ? 1 : 0.75,
-            backgroundColor: '#efefef',
-            overflowY: 'scroll',
-          }}>
-            <div>
-              <input type="text" className="form-control mb-2" placeholder={translate('cms.content_side_view.search_text')} value={search} onChange={(e) => filterHelpers(e.target.value)} style={{ border: 'none' }} />
-            </div>
-            <div className="d-flex flex-column">
-              {Object.entries(helpersList)
-                .map(([groupName, { helpers, collapsed }]: any) => (
-                  <div
-                    onClick={() => setHelpers(Object.fromEntries(Object.entries(helpersList).map(([g, { collapsed, ...rest }]: any) => {
-                      if (g === groupName)
-                        return [
-                          g,
-                          {
-                            ...rest,
-                            collapsed: !collapsed,
-                            helpers: rest.helpers.map((helper: any) => ({
-                              ...helper,
-                              filtered: false
-                            })),
-                          },
-                        ];
-                      return [g, { ...rest, collapsed }];
-                    })))}>
-                    {helpers.filter((helper) => !helper.filtered).length > 0 && (
-                      <div
-                        style={{
-                          background: '#fff',
-                        }}
-                        className="p-2 px-3 mb-1 d-flex justify-content-between align-items-center">
-                        <span>{groupName}</span>
-                        <i className={`fas fa-chevron-${collapsed ? 'down' : 'up'}`}></i>
-                      </div>
-                    )}
-                    {!collapsed &&
-                      helpers.filter((helper) => !helper.filtered)
-                        .map((helper) => (
-                          <button
-                            id={helper.name}
-                            type="button"
-                            key={helper.name}
-                            className="py-2 ps-3 mb-2"
-                            style={{
-                              textAlign: 'left',
-                              flex: 1,
-                              width: '100%',
-                              border: 'none',
-                              backgroundColor: selector?.name === helper.name ? '#bdc3c7' : '#ddd',
-                              borderRight: `${selector?.name === helper.name ? 2 : 0}px solid`,
-                              fontSize: '14px',
-                            }}
-                            onClick={(e) => {
-                              e.preventDefault();
-                              e.stopPropagation();
-                              setSelector(helper);
-                            }}>
-                            {translate(`cms.content_side_view.${helper.name}`)}
-                          </button>
-                        ))}
-                  </div>))}
-            </div>
-          </div>)}
-          <div style={{ flex: selector ? 1 : 0 }} className="ms-2 p-3">
-            <i className="fas fa-times" style={{
-              cursor: 'pointer',
-              padding: '6px',
-              position: 'absolute',
-              top: '6px',
-              right: '6px',
-            }} onClick={() => setSideView(false)} />
-            {(selector as any)?.name === 'links' && (<LinksView editor={editorRef.current} onChange={() => setSideView(false)} />)}
-            {(selector as any)?.name === 'pages' && (<PagesView pages={pages} prefix="daikoku-page-url" title={translate('cms.content_side_view.link_to_insert')} editor={editorRef.current} onChange={() => setSideView(false)} />)}
-            {(selector as any)?.name === 'blocks' && (<PagesView pages={pages} prefix="daikoku-include-block" title={translate('cms.content_side_view.block_to_render')} editor={editorRef.current} onChange={() => setSideView(false)} />)}
-            {((selector as any)?.name.startsWith('daikoku') ||
-              !['links', 'blocks', 'pages'].includes((selector as any)?.name)) &&
-              selector && (<HelperView editor={editorRef.current} onChange={() => setSideView(false)} content={selector} />)}
-          </div>
-        </div>
-      </div>)}
-    </div>
-  </div>);
-};
diff --git a/daikoku/javascript/src/components/adminbackoffice/cms/Create.tsx b/daikoku/javascript/src/components/adminbackoffice/cms/Create.tsx
index 9e3cca6a5..99e51bc77 100644
--- a/daikoku/javascript/src/components/adminbackoffice/cms/Create.tsx
+++ b/daikoku/javascript/src/components/adminbackoffice/cms/Create.tsx
@@ -1,191 +1,63 @@
-import React, { useContext, useEffect, useRef, useState } from 'react';
+import { useContext, useEffect, useState } from 'react';
 import { I18nContext } from '../../../contexts';
 import { useNavigate, useParams } from 'react-router-dom';
 import * as Services from '../../../services';
 import { getApolloContext } from '@apollo/client';
 
-import Sidebar, { SideBarRef } from './Sidebar';
-import Body, { BodyRef } from './Body';
-import { ModalContext } from '../../../contexts';
 import { Spinner } from '../../utils/Spinner';
+import { Form, format, type } from '@maif/react-forms';
 
 export const Create = (props: any) => {
   const { client } = useContext(getApolloContext());
   const { translate } = useContext(I18nContext);
-  const { alert } = useContext(ModalContext)
 
   const params = useParams();
   const navigate = useNavigate();
 
   const [loading, setLoading] = useState(true);
-  const [tab, setTab] = useState(0);
 
-  const sideRef = useRef<SideBarRef>(null);
-  const bodyRef = useRef<BodyRef>(null);
-
-  const [inValue, setInValue] = useState<any>({});
-  const [savePath, setSavePath] = useState();
-  const [contentType, setContentType] = useState();
-
-  const [finalSideValue, setFinalSideValue] = useState<any>();
-  const [finalBodyValue, setFinalBodyValue] = useState<any>();
-  const [action, setFormAction] = useState<string>();
+  const [value, setValue] = useState<any>({});
+  // const [contentType, setContentType] = useState();
 
   useEffect(() => {
     const id = params.id;
     if (id) {
       setLoading(true);
-      //FIXME handle client is not setted
       client && client.query({ query: Services.graphql.getCmsPage(id) }).then((res) => {
         if (res.data) {
-          const { draft, history, ...side } = res.data.cmsPage;
-          setFinalBodyValue(undefined);
-          setFinalSideValue(undefined);
-          setFormAction(undefined);
-          setInValue({
-            side: {
-              ...side,
-              metadata: side.metadata ? JSON.parse(side.metadata) : {},
-              isBlockPage: !side.path || side.path.length === 0,
-            },
-            history,
-            draft,
-          });
-          setContentType(side.contentType);
-          setSavePath(side.path);
+          const { history, ...side } = res.data.cmsPage;
+          setValue(side.body);
+          // setContentType(side.contentType);
         }
         setLoading(false);
       });
     }
   }, [params.id]);
 
-  useEffect(() => {
-    const onUpdatePreview = action === 'update_before_preview';
-    const onPublish = action === 'publish';
-
-    if ((action === 'update' || onUpdatePreview || onPublish) && finalSideValue && finalBodyValue) {
-      if (onPublish) {
-        const lastPublishedDate = Date.now();
-        const updatedPage = {
-          ...finalSideValue,
-          ...finalBodyValue,
-          body: (finalBodyValue as any).draft,
-          lastPublishedDate,
-        };
-        Services.createCmsPage(params.id, updatedPage).then(() => {
-          const { draft, ...side } = updatedPage;
-          setInValue({
-            draft,
-            side,
-          });
-          reset();
-        });
-      } else {
-        Services.createCmsPage(params.id, {
-          ...finalSideValue,
-          ...finalBodyValue,
-        }).then((res) => {
-          reset();
-          if (!res.error && !params.id)
-            navigate('/settings/pages', {
-              state: {
-                reload: true,
-              },
-            });
-          else if (res.error) {
-            alert({ message: res.error });
-          } else setSavePath((finalSideValue as any).path);
-
-          if (onUpdatePreview) setTimeout(() => setTab(1), 100);
-        });
-      }
-    }
-  }, [action, finalSideValue, finalBodyValue]);
-
-  const reset = () => {
-    setFormAction(undefined);
-    setFinalSideValue(undefined);
-    setFinalBodyValue(undefined);
-  };
-
-  const updatePage = () => {
-    setFormAction('update');
-    [bodyRef, sideRef].map((r) => r.current?.handleSubmit());
-  };
-
-  const onPublish = () => {
-    setFormAction('publish');
-    [bodyRef, sideRef].map((r) => r.current?.handleSubmit());
-  };
-
-  const TabButton = ({
-    title,
-    onClose,
-    onClick,
-    selected
-  }: any) => (
-    <div
-      style={{
-        height: '42px',
-        display: 'flex',
-        alignItems: 'center',
-        zIndex: selected ? 2 : 0,
-        borderTopLeftRadius: "4px",
-        borderTopRightRadius:"4px"
-      }}
-      onClick={onClick}
-      className={`px-3 level2-link__with-bg ${selected ? 'level2-link__active-bg' : ''}`}
-    >
-      <button className="btn btn-sm level2-link" type="button">
-        {title}
-      </button>
-      {onClose && <i className="fas fa-times" />}
-    </div>
-  );
 
   if (loading) {
     return <Spinner />;
   }
 
-  const editable = !inValue.side.metadata.from;
-
-  return (
-    <div className='d-flex'>
-      {editable && <Sidebar
-        setFinalValue={setFinalSideValue}
-        updatePage={updatePage}
-        ref={sideRef}
-        savePath={savePath}
-        pages={props.pages}
-        setContentType={setContentType}
-        inValue={inValue.side} />}
-      <div className="p-2 d-flex flex-column level2" style={{ flex: 1, overflow: 'hidden' }}>
-        {editable && <div className="d-flex align-items-center mt-2">
-          {[
-            { title: translate('cms.create.draft'), id: 0, showPreview: () => setTab(0) },
-            {
-              title: translate('cms.create.draft_preview'),
-              id: 1,
-              showPreview: () => {
-                setFormAction('update_before_preview');
-                [bodyRef, sideRef].map((r) => r.current?.handleSubmit());
-              },
-            },
-            { title: translate('cms.create.content'), id: 2 },
-          ].map(({ title, id, showPreview }) => !savePath ? null : (<TabButton title={title} selected={tab === id} key={`tabButton${id}`} onClick={() => {
-            if (showPreview)
-              showPreview();
-            else {
-              setFormAction(undefined);
-              [bodyRef, sideRef].map((r) => r.current?.handleSubmit());
-              setTab(id);
-            }
-          }} />))}
-        </div>}
-        <Body show={tab === 0} ref={bodyRef} pages={props.pages} contentType={contentType} setFinalValue={setFinalBodyValue} inValue={(inValue as any).draft} history={(inValue as any).history} publish={onPublish} editable={editable} />
-        {tab === 1 && (<iframe className="mt-3" style={{ flex: 1 }} src={`/_${savePath || '/'}?draft=true`} />)}
-        {tab === 2 && (<iframe className="mt-3" style={{ flex: 1 }} src={`/_${savePath || '/'}?force_reloading=true`} />)}
-      </div>
-    </div>
-  );
+  const schema = {
+    content: {
+      label: translate('cms.create.content'),
+      type: type.string,
+      format: format.code
+    }
+  }
+  const flow = ['content']
+
+  return <>
+    <button className="btn btn-sm btn-outline-info my-3" style={{ flex: 1 }} type="button"
+      onClick={() => navigate('/settings/pages', { state: { reload: true } })}>
+      {translate('cms.create.back_to_pages')}
+    </button>
+    <Form
+      schema={schema}
+      flow={flow}
+      value={{ content: value }}
+      footer={() => <></>}
+      onSubmit={() => { }} />
+  </>
 };
diff --git a/daikoku/javascript/src/components/adminbackoffice/cms/DragAndDropWrapper.tsx b/daikoku/javascript/src/components/adminbackoffice/cms/DragAndDropWrapper.tsx
deleted file mode 100644
index aa2175ed2..000000000
--- a/daikoku/javascript/src/components/adminbackoffice/cms/DragAndDropWrapper.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-
-export default ({
-  children,
-  handleDrop
-}: any) => {
-  const dropRef = useRef<HTMLDivElement | null>();
-
-  const handleDrag = (e: any) => {
-    e.stopPropagation();
-    e.preventDefault();
-  };
-
-  const handle = (e: any) => {
-    e.preventDefault();
-    e.stopPropagation();
-
-    if (e.dataTransfer.files && e.dataTransfer.files.length > 0) {
-      handleDrop(e.dataTransfer.files[0]);
-      e.dataTransfer.clearData();
-    }
-  };
-
-  useEffect(() => {
-        dropRef.current?.addEventListener('dragenter', handleDrag);
-        dropRef.current?.addEventListener('dragleave', handleDrag);
-        dropRef.current?.addEventListener('dragover', handleDrag);
-        dropRef.current?.addEventListener('drop', handle);
-
-    return () => {
-      dropRef.current?.removeEventListener('dragenter', handleDrag);
-      dropRef.current?.removeEventListener('dragleave', handleDrag);
-      dropRef.current?.removeEventListener('dragover', handleDrag);
-      dropRef.current?.removeEventListener('drop', handle);
-    };
-  }, []);
-
-  return (
-        <div style={{ position: 'relative' }} ref={r => dropRef.current = r}>
-      {children}
-    </div>
-  );
-};
diff --git a/daikoku/javascript/src/components/adminbackoffice/cms/Editor.tsx b/daikoku/javascript/src/components/adminbackoffice/cms/Editor.tsx
deleted file mode 100644
index f47304aad..000000000
--- a/daikoku/javascript/src/components/adminbackoffice/cms/Editor.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import { CodeInput } from '@maif/react-forms';
-
-// import 'brace/theme/idle_fingers';
-
-export default ({
-  onChange,
-  value,
-  className = '',
-  readOnly,
-  mode = 'javascript',
-  setRef
-}: any) => {
-  return (
-    <CodeInput
-      className={className}
-      readOnly={readOnly}
-      mode={mode}
-      onChange={onChange}
-      value={value}
-      setRef={setRef}
-    />
-  );
-};
diff --git a/daikoku/javascript/src/components/adminbackoffice/cms/Pages.tsx b/daikoku/javascript/src/components/adminbackoffice/cms/Pages.tsx
index d684d8071..505954448 100644
--- a/daikoku/javascript/src/components/adminbackoffice/cms/Pages.tsx
+++ b/daikoku/javascript/src/components/adminbackoffice/cms/Pages.tsx
@@ -101,7 +101,7 @@ export const Pages = ({
         return (
           <div className="d-flex align-items-center">
             <Link
-              to={`/settings/pages/edit/${value.id}`}
+              to={`/settings/pages/${value.id}`}
               onClick={(e) => e.stopPropagation()}>
               <button className="btn btn-outline-info btn-sm me-1">
                 <i className="fas fa-pen" />
diff --git a/daikoku/javascript/src/components/adminbackoffice/cms/Revisions.tsx b/daikoku/javascript/src/components/adminbackoffice/cms/Revisions.tsx
deleted file mode 100644
index 7d0055caa..000000000
--- a/daikoku/javascript/src/components/adminbackoffice/cms/Revisions.tsx
+++ /dev/null
@@ -1,188 +0,0 @@
-import React, { useContext, useEffect, useState } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
-
-import { getApolloContext } from '@apollo/client';
-import moment from 'moment';
-import * as Services from '../../../services';
-import { Spinner } from '../../utils/Spinner';
-import { SwitchButton } from '../../inputs';
-import { I18nContext } from '../../../contexts';
-import { ModalContext } from '../../../contexts/modalContext';
-
-const CURRENT_VERSION_ITEM = {
-  value: {
-    id: 'LATEST',
-  },
-  label: 'Current version',
-};
-
-export default ({ }) => {
-  const { client } = useContext(getApolloContext());
-  const params = useParams();
-  const navigate = useNavigate();
-  const { translate } = useContext(I18nContext);
-  const { confirm } = useContext(ModalContext);
-
-  const [reloading, setReloading] = useState(false);
-
-  const [loading, setLoading] = useState(true);
-  const [value, setValue] = useState({});
-  const [html, setHtml] = useState({
-    html: '',
-    hasDiff: false,
-  });
-  const [selectedDiff, setSelectedDiff] = useState(CURRENT_VERSION_ITEM);
-
-  const [latestVersion, setLatestVersion] = useState<any>();
-  const [showDiffs, toggleDiffs] = useState(false);
-
-  useEffect(() => {
-    const id = params.id;
-    if (id) {
-      setLoading(true);
-      //FIXME:handle client is not setted
-      client && client.query({ query: Services.graphql.getCmsPageHistory(id) }).then((res) => {
-        if (res.data) {
-          setSelectedDiff(CURRENT_VERSION_ITEM);
-          setLatestVersion({
-            draft: res.data.cmsPage.draft,
-            ...CURRENT_VERSION_ITEM,
-          });
-          setHtml({
-            html: res.data.cmsPage.draft,
-            hasDiff: false,
-          });
-          setValue(
-            res.data.cmsPage.history.slice(1).reduce(
-              (diffsByMonth: any, current: any) => {
-                const month = moment(current.date).format('MMMM');
-                return {
-                  ...diffsByMonth,
-                  [month]: [
-                    ...(diffsByMonth[month] || []),
-                    {
-                      value: current,
-                      label: moment(current.date).format('DD MMMM, HH:mm:ss'),
-                    },
-                  ],
-                };
-              },
-              {
-                latest: [CURRENT_VERSION_ITEM],
-              }
-            )
-          );
-        }
-        setLoading(false);
-      });
-    }
-  }, [params.id, reloading]);
-
-  const loadDiff = (item: any, nearValue?: any) => {
-    if (item.value.id === 'LATEST') {
-      setSelectedDiff(latestVersion);
-      setHtml({
-        html: latestVersion.draft,
-        hasDiff: false,
-      });
-    } else {
-      setLoading(true);
-      Services.getDiffOfCmsPage(
-        params.id,
-        item.value.id,
-        nearValue !== undefined ? nearValue : showDiffs
-      ).then((res) => {
-        if (res.html) {
-          setHtml({
-            html: res.html.replace(/&para;/g, ''),
-            hasDiff: res.hasDiff,
-          });
-        }
-        setLoading(false);
-      });
-      setSelectedDiff(item);
-    }
-  };
-
-  return <>
-    <nav className="col-md-3 d-md-block">
-      <div className="d-flex flex-column">
-        <div className="d-flex p-3 align-items-baseline">
-          <div style={{
-            backgroundColor: '#fff',
-            borderRadius: '50%',
-            maxHeight: '42px',
-            maxWidth: '42px',
-            cursor: 'pointer',
-          }} className="p-3 me-2 d-flex align-items-center" onClick={() => navigate(-1)}>
-            <i className="fas fa-arrow-left" />
-          </div>
-          <h5 className="m-0">{translate('cms.revisions.version_history')}</h5>
-        </div>
-        <div>
-          {Object.entries(value)
-            .map(([month, diffs]: any) => {
-              return (<div key={month}>
-                <div className="py-2 px-3 d-flex" style={{
-                  border: '1px solid rgb(225,225,225)',
-                  borderLeft: 'none',
-                  background: '#fff',
-                }}>
-                  <span className="me-1" style={{ fontWeight: 'bold' }}>{`${month.toLocaleUpperCase()}`}</span>
-                  <span>{`(${moment(diffs[0].value.date).format('YYYY')})`}</span>
-                </div>
-                {diffs.map((item: any) => {
-                  const isCurrentVersion = item.value.id === 'LATEST';
-                  const isSelected = selectedDiff.value.id === item.value.id;
-                  return (<div key={item.value.id} style={{
-                    backgroundColor: '#fff',
-                    borderBottom: '1px solid rgb(225,225,225)',
-                    borderRight: '1px solid rgb(225,225,225)',
-                    cursor: 'pointer',
-                    marginBottom: isCurrentVersion ? '12px' : 0,
-                    minHeight: '50px',
-                  }} onClick={() => loadDiff(item)} className="p-1 px-3 d-flex flex-column">
-                    <div className="d-flex align-items-center justify-content-between" style={{ flex: 1 }}>
-                      <span>{item.label}</span>
-                      {isSelected && <i className="fas fa-arrow-right" />}
-                    </div>
-                    {item.value.user && (<div style={{ fontStyle: 'italic', fontWeight: 'bold' }}>
-                      <span>{item.value.user.name}</span>
-                    </div>)}
-                    {!isCurrentVersion && isSelected && (<button className="btn btn-sm btn-outline-info mt-2" onClick={() => {
-                      confirm({ message: translate('cms.revisions.delete_sentence') })
-                        .then((ok) => {
-                          if (ok) {
-                            Services.restoreCmsDiff(params.id, item.value.id).then(() => setReloading(true));
-                          }
-                        });
-                    }}>
-                      {translate('cms.revisions.restore')}
-                    </button>)}
-                  </div>);
-                })}
-              </div>);
-            })}
-        </div>
-      </div>
-    </nav>
-    <div className="p-2" style={{ flex: 1, position: 'relative' }}>
-      {loading ? (<Spinner />) : (<>
-        <div className="pt-4" style={{ borderBottom: '1px solid #eee' }}>
-          <h5>
-            {selectedDiff && moment((selectedDiff.value as any).date).format('DD MMMM, YY, (HH:mm)')}
-          </h5>
-          {selectedDiff && (<div className="d-flex align-items-center pb-3">
-            <span className="me-2">Show differences</span>
-            <SwitchButton checked={showDiffs} disabled={selectedDiff.value.id === 'LATEST'} onSwitch={() => {
-              loadDiff(selectedDiff, !showDiffs);
-              toggleDiffs(!showDiffs);
-            }} />
-          </div>)}
-        </div>
-        {html &&
-          (html.hasDiff ? (<div dangerouslySetInnerHTML={{ __html: html.html }}></div>) : (<pre>{html.html}</pre>))}
-      </>)}
-    </div>
-  </>;
-};
diff --git a/daikoku/javascript/src/components/adminbackoffice/cms/Sidebar.tsx b/daikoku/javascript/src/components/adminbackoffice/cms/Sidebar.tsx
deleted file mode 100644
index 8f34d3583..000000000
--- a/daikoku/javascript/src/components/adminbackoffice/cms/Sidebar.tsx
+++ /dev/null
@@ -1,168 +0,0 @@
-import React, { MutableRefObject, useContext, useEffect, useImperativeHandle, useRef, useState } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
-import moment from 'moment';
-import { constraints, Form, format, type, FormRef } from '@maif/react-forms';
-import { I18nContext } from '../../../contexts';
-
-export type SideBarRef = {
-  handleSubmit: () => void
-}
-
-export default React.memo(React.forwardRef<SideBarRef, any>(({ setFinalValue, updatePage, setContentType, pages, inValue, savePath }, ref) => {
-  const { translate } = useContext(I18nContext);
-  const params = useParams();
-  const navigate = useNavigate();
-  const r: MutableRefObject<any> = useRef<FormRef>();
-  useEffect(() => {
-    setValue(inValue || {
-      name: '',
-      path: '',
-      contentType: 'text/html',
-      visible: true,
-      authenticated: false,
-      metadata: {},
-      tags: [],
-      isBlockPage: false,
-      exact: true,
-      history: [],
-    });
-  }, [inValue]);
-  const schema = {
-    lastPublishedDate: {
-      type: type.string,
-    },
-    body: {
-      type: type.string,
-    },
-    name: {
-      type: type.string,
-      placeholder: translate('cms.create.name_placeholder'),
-      label: translate('Name'),
-      constraints: [constraints.required()],
-    },
-    isBlockPage: {
-      type: type.bool,
-      label: translate('cms.sidebar.is_block_page'),
-    },
-    path: {
-      type: type.string,
-      placeholder: '/index',
-      deps: ['isBlockPage'],
-      visible: ({ rawValues }) => !rawValues.isBlockPage,
-      help: translate('cms.create.path_placeholder'),
-      label: translate('cms.create.path'),
-      constraints: [
-        constraints.when('isBlockPage', (v) => !!v, [
-          constraints.matches(/^\//, translate('cms.create.path_slash_constraints')),
-          constraints.test('path', translate('cms.create.path_paths_constraints'), (value) => (value === savePath ? true : !pages.find((p: any) => p.path === value))),
-        ]),
-      ],
-    },
-    exact: {
-      type: type.bool,
-      label: translate('cms.create.exact'),
-      help: translate('cms.create.exact.help'),
-      deps: ['isBlockPage'],
-      visible: ({ rawValues }) => !rawValues.isBlockPage,
-    },
-    contentType: {
-      type: type.string,
-      format: format.select,
-      label: translate('Content type'),
-      options: [
-        { label: 'HTML document', value: 'text/html' },
-        { label: 'CSS stylesheet', value: 'text/css' },
-        { label: 'Javascript script', value: 'text/javascript' },
-        { label: 'Markdown document', value: 'text/markdown' },
-        { label: 'Text plain', value: 'text/plain' },
-        { label: 'XML content', value: 'text/xml' },
-        { label: 'JSON content', value: 'application/json' },
-      ],
-      onAfterChange: ({ value }) => setContentType(value), //FIXME: test if entry works well
-    },
-    visible: {
-      type: type.bool,
-      label: translate('Visible'),
-      help: translate('cms.create.visible_label'),
-    },
-    authenticated: {
-      type: type.bool,
-      label: translate('cms.create.authenticated'),
-      help: translate('cms.create.authenticated_help'),
-    },
-    metadata: {
-      type: type.object,
-      label: 'Metadata',
-      help: translate('cms.create.metadata_help'),
-    },
-    tags: {
-      type: type.string,
-      format: format.select,
-      createOption: true,
-      isMulti: true,
-      label: 'Tags',
-      help: translate('cms.create.tags_help'),
-    },
-  };
-  const flow = [
-    'name',
-    'isBlockPage',
-    'exact',
-    'path',
-    'contentType',
-    'visible',
-    'authenticated',
-    {
-      label: translate('cms.create.advanced'),
-      flow: ['tags', 'metadata'],
-      collapsed: true,
-    },
-  ];
-  const [value, setValue] = useState<any>({});
-
-  useImperativeHandle(ref, () => ({
-    handleSubmit() {
-      r.current?.handleSubmit();
-    },
-  }));
-
-  return (<>
-    <nav className="col-md-3 d-md-block">
-      <div className="d-flex flex-column">
-        <ul className="nav d-flex flex-column mb-2 px-3">
-          <li className="nav-item">
-            <Form
-              schema={schema}
-              value={value}
-              flow={flow}
-              onSubmit={(v) => {
-                setValue(v);
-                setFinalValue(v);
-              }}
-              ref={r}
-              footer={() => <></>} />
-          </li>
-        </ul>
-        <div className="px-2 mb-4 mt-auto">
-          {value.lastPublishedDate && (<div>
-            <span>{translate('cms.create.last_update')} </span>
-            <span>
-              {value.lastPublishedDate && moment(value.lastPublishedDate).format('DD/MM/yy kk:mm')}
-            </span>
-          </div>)}
-          <div className="d-flex mt-3">
-            <button className="btn btn-sm btn-outline-info me-1" style={{ flex: 1 }} type="button" onClick={() => navigate('/settings/pages', { state: { reload: true } })}>
-              {translate('cms.create.back_to_pages')}
-            </button>
-            <button className="btn btn-sm btn-outline-success" style={{ flex: 1 }} type="button" onClick={updatePage}>
-              {params.id
-                ? translate('cms.create.save_modifications')
-                : translate('cms.create.create_page')}
-            </button>
-          </div>
-        </div>
-      </div>
-    </nav>
-  </>);
-}), (prevProps, nextProps) => JSON.stringify((prevProps as any).inValue) === JSON.stringify((nextProps as any).inValue) &&
-  (prevProps as any).savePath === (nextProps as any).savePath);
\ No newline at end of file
diff --git a/daikoku/javascript/src/components/adminbackoffice/cms/helpers.json b/daikoku/javascript/src/components/adminbackoffice/cms/helpers.json
deleted file mode 100644
index 7da2dad4e..000000000
--- a/daikoku/javascript/src/components/adminbackoffice/cms/helpers.json
+++ /dev/null
@@ -1,287 +0,0 @@
-[
-    {
-        "name": "links",
-        "category": "LINK",
-        "important": "MUST USEFUL"
-    },
-    {
-        "name": "pages",
-        "category": "LINK",
-        "important": "MUST USEFUL"
-    },
-    {
-        "name": "blocks",
-        "category": "HTML",
-        "important": "MUST USEFUL"
-    },
-    {
-        "name": "daikoku-user",
-        "parameters": [
-            "id of the user, String value expected"
-        ],
-        "example": "{{#daikoku-user \"{{userId}}\"}}\n<div>\n<span>{{user.name}}</span>\n<img src=\"{{user.picture}}\"/>\n</div>\n{{/daikoku-user}}",
-        "category": "USER"
-    },
-    {
-        "name": "daikoku-owned-apis",
-        "parameters": [
-            "The visibility value : Private, Public or All"
-        ],
-        "link": "#/api/apis.findAll",
-        "example": "{{#daikoku-owned-apis visibility=\"Private\"}}\n<span>Mon api : {{api.name}}\n{{/daikoku-owned-apis}}",
-        "category": "API"
-    },
-    {
-        "name": "daikoku-owned-api",
-        "parameters": [
-            "The id of the api, String value expected",
-            "The version, as named parameter, optional or set as 1.0.0 by default"
-        ],
-        "link": "#/api/apis.findAll",
-        "example": "{{#daikoku-owned-api \"{{apiId}}\" version=\"1.0.0\"}}\n<span>Mon api : {{api.name}}\n{{/daikoku-owned-api}}",
-        "category": "API"
-    },
-    {
-        "name": "daikoku-json-owned-apis",
-        "parameters": [
-            "The visibility value : Private, Public or All"
-        ],
-        "link": "#/api/apis.findAll",
-        "example": "{{#daikoku-json-owned-apis visibility=\"Private\"}}{{/daikoku-json-owned-apis}}",
-        "category": "API"
-    },
-    {
-        "name": "daikoku-json-owned-api",
-        "parameters": [
-            "The id of the api, String value expected",
-            "The version, as named parameter, optional or set as 1.0.0 by default"
-        ],
-        "link": "#/api/apis.findAll",
-        "example": "{{#daikoku-json-owned-api \"{{apiId}}\" version=\"1.0.0\"}}{{/daikoku-json-owned-api}}",
-        "category": "API"
-    },
-    {
-        "name": "daikoku-owned-teams",
-        "parameters": [],
-        "link": "#/team/teams.findAll",
-        "example": "{{#daikoku-owned-teams}}\n<span>Ma team : {{team.name}}\n{{/daikoku-owned-teams}}",
-        "category": "TEAM"
-    },
-    {
-        "name": "daikoku-owned-team",
-        "parameters": [
-            "The id of the team, String value expected"
-        ],
-        "link": "#/team/teams.findAll",
-        "example": "{{#daikoku-owned-team \"{{teamId}}\"}}\n<span>Mon team : {{team.name}}\n{{/daikoku-owned-team}}",
-        "category": "TEAM"
-    },
-    {
-        "name": "daikoku-json-owned-teams",
-        "parameters": [],
-        "link": "#/team/teams.findAll",
-        "example": "{{daikoku-json-owned-teams}}",
-        "category": "TEAM"
-    },
-    {
-        "name": "daikoku-json-owned-team",
-        "parameters": [
-            "The id of the team, String value expected"
-        ],
-        "link": "#/team/teams.findAll",
-        "example": "{{#daikoku-json-owned-team \"{{teamId}}\"}}{{/daikoku-json-owned-team}}",
-        "category": "TEAM"
-    },
-    {
-        "name": "tenant",
-        "category": "TENANT",
-        "link": "#/tenant/tenants.findAll",
-        "example": "{{tenant.name}} - {{tenant.style.description}}"
-    },
-    {
-        "name": "is_admin",
-        "example": "{{is_admin}}",
-        "category": "USER"
-    },
-    {
-        "name": "connected",
-        "example": "{{connected}}",
-        "category": "USER",
-        "important": "MUST USEFUL"
-    },
-    {
-        "name": "user",
-        "fields": [
-            "name",
-            "email",
-            "_id",
-            "_humandReadableId",
-            "picture",
-            "isDaikokuAdmin",
-            "starredApis"
-        ],
-        "example": "{{user.name}} - {{user.email}}",
-        "category": "USER"
-    },
-    {
-        "name": "request",
-        "example": "{{request.path}} - {{request.method}} - {{request.headers}}",
-        "category": "REQUEST"
-    },
-    {
-        "name": "daikoku-css",
-        "example": "{{daikoku-css}}",
-        "category": "LINK"
-    },
-    {
-        "name": "for",
-        "parameters": [
-            "the fieldname used in the helper content"
-        ],
-        "example": "{{#for '{{team.users}}' field='myuser' }}\n{{myuser.userId}}{{/for}}",
-        "category": "OPERATION"
-    },
-    {
-        "name": "size",
-        "example": "{{size '{{team.users}}'}}",
-        "category": "OPERATION"
-    },
-    {
-        "name": "ifeq",
-        "example": "{{#ifeq \"{{plan.type}}\" \"FreeWithoutQuotas\"}}You'll pay nothing and do whatever you want :){{/ifeq}}",
-            "category": "OPERATION"
-    },
-    {
-        "name": "ifnoteq",
-        "example": "{{#ifnoteq \"{{plan.type}}\" \"FreeWithoutQuotas\"}}You'll pay nothing and do whatever you want :){{/ifnoteq}}",
-            "category": "OPERATION"
-    },
-    {
-        "name": "getOrElse",
-        "example": "{{getOrElse \"{{plan.customName}}\" \"Un plan\"}}",
-            "category": "OPERATION"
-    },
-    {
-        "name": "translate",
-        "example": "{{translate 'Logout'}}}",
-        "category": "OPERATION"
-    },
-    {
-        "name": "daikoku-query-param",
-        "parameters": [
-            "the name of the query param"
-        ],
-        "example": "{{daikoku-query-param 'my-query-param'}}",
-        "category": "OPERATION"
-    },
-    {
-        "name": "daikoku-template-wrapper",
-        "parameters": [
-            "The id of the block",
-            "All defined named parameters inside the block"
-        ],
-        "category": "HTML",
-        "example": "{{#daikoku-template-wrapper '<wrapper-id>' <named-parameter>=\"<value>\" }} #child content {{/daikoku-template-wrapper}}",
-        "important": "MUST USEFUL"
-    },
-    {
-        "name": "daikoku-apis",
-        "category": "API",
-        "link": "#/api/apis.findAll",
-        "example": "{{#daikoku-apis}}\n<span>Api : {{api.name}}\n{{/daikoku-apis}}",
-        "important": "MUST USEFUL"
-    },
-    {
-        "name": "daikoku-api",
-        "category": "API",
-        "parameters": [
-            "The id of the api, String value expected"
-        ],
-        "link": "#/api/apis.findAll",
-        "example": "{{#daikoku-api \"{{apiId}}\" version=\"1.0.0\"}}\n<span>Mon api : {{api.name}}\n{{/daikoku-api}}"
-    },
-    {
-        "name": "daikoku-json-apis",
-        "category": "API",
-        "example": "{{daikoku-json-apis}}",
-        "link": "#/api/apis.findAll"
-    },
-    {
-        "name": "daikoku-json-api",
-        "category": "API",
-        "parameters": [
-            "The id of the api, String value expected"
-        ],
-        "link": "#/api/apis.findAll",
-        "example": "{{#daikoku-json-api \"{{apiId}}\" version=\"1.0.0\"}}{{/daikoku-json-api}}"
-    },
-    {
-        "name": "daikoku-teams",
-        "category": "TEAM",
-        "link": "#/team/teams.findAll",
-        "example": "{{#daikoku-teams}}\n<span>Team : {{team.name}}\n{{/daikoku-teams}}",
-        "important": "MUST USEFUL"
-    },
-    {
-        "name": "daikoku-team",
-        "category": "TEAM",
-        "parameters": [
-            "The id of the team, String value expected"
-        ],
-        "link": "#/team/teams.findAll",
-        "example": "{{#daikoku-team \"{{<teamId>}}\"}}\n<span>My team : {{team.name}}\n{{/daikoku-team}}"
-    },
-    {
-        "name": "daikoku-json-teams",
-        "category": "TEAM",
-        "example": "{{daikoku-json-teams}}",
-        "link": "#/team/teams.findAll"
-    },
-    {
-        "name": "daikoku-json-team",
-        "category": "TEAM",
-        "parameters": [
-            "The id of the team, String value expected"
-        ],
-        "link": "#/team/teams.findAll",
-        "example": "{{#daikoku-json-team \"{{<teamId>}}\"}}{{/daikoku-json-team}}"
-    },
-    {
-        "name": "daikoku-documentations",
-        "category": "DOCUMENTATION",
-        "parameters": [
-            "The id of the api, String value expected"
-        ],
-        "link": "#/api-documentation-page/api-documentation-pages.findAll",
-        "example": "{{#daikoku-documentations \"{{<apiId>}}\"}}\n<span>{{documentation.title}}\n{{/daikoku-documentations}}"
-    },
-    {
-        "name": "daikoku-documentations-page",
-        "category": "DOCUMENTATION",
-        "parameters": [
-            "The id of the api, String value expected",
-            "The named page parameter as String value"
-        ],
-        "link": "#/api-documentation-page/api-documentation-pages.findAll",
-        "example": "{{#daikoku-documentations-page \"<apiId>\" page=\"<pageId>\"}}\n{{documentation.content}}\n{{/daikoku-documentations-page}}"
-    },
-    {
-        "name": "daikoku-documentations-page-id",
-        "category": "DOCUMENTATION",
-        "parameters": [
-            "The id of the team, String value expected",
-            "The named page parameter corresponding to the id of the expected page"
-        ],
-        "link": "#/api-documentation-page/api-documentation-pages.findAll",
-        "example": "{{#daikoku-documentations-page-id \"<apiId>\" page=\"<pageId>\"}}\n{{content}}\n{{/daikoku-documentations-page-id}}"
-    },
-    {
-        "name": "daikoku-plans",
-        "category": "PLAN",
-        "parameters": [
-            "The id of the API"
-        ],
-        "link": "#/api/apis.findAll",
-        "example": "{{#daikoku-plans \"<apiId>\"}}\n<span>{{plan.type}}</span>\n{{/daikoku-plans}}"
-    }
-]
\ No newline at end of file
diff --git a/daikoku/javascript/src/components/adminbackoffice/cms/index.tsx b/daikoku/javascript/src/components/adminbackoffice/cms/index.tsx
index ead80e53d..a815d9b5d 100644
--- a/daikoku/javascript/src/components/adminbackoffice/cms/index.tsx
+++ b/daikoku/javascript/src/components/adminbackoffice/cms/index.tsx
@@ -1,5 +1,5 @@
 import { getApolloContext, gql } from '@apollo/client';
-import React, { useContext, useEffect, useRef, useState } from 'react';
+import { useContext, useEffect, useRef, useState } from 'react';
 import { Route, Routes, useLocation, useNavigate } from 'react-router-dom';
 import { I18nContext } from '../../../contexts';
 import { Can, manage, tenant } from '../../utils';
@@ -7,16 +7,13 @@ import { Create } from './Create';
 import { CONTENT_TYPES, Pages } from './Pages';
 import * as Services from '../../../services';
 import { Spinner } from '../..';
-import Revisions from './Revisions';
 import { ModalContext, useTenantBackOffice } from '../../../contexts';
-import { constraints, type } from '@maif/react-forms';
 
 export interface IPage {
   id: string
   name: string
   path: string
   contentType: string
-  lastPublishedDate: string
   metadata: any
 }
 
@@ -34,7 +31,6 @@ const getAllPages = () => ({
         name
         path
         contentType
-        lastPublishedDate
         metadata
       }
     }
@@ -45,17 +41,13 @@ export const CMSOffice = () => {
   useTenantBackOffice();
 
   const location = useLocation();
-  const navigate = useNavigate();
 
   const { client } = useContext(getApolloContext());
   const { translate } = useContext(I18nContext);
-  const { prompt, openFormModal } = useContext(ModalContext);
 
   const [cmsPages, setPages] = useState<Array<IPage>>([]);
   const [downloading, setDownloading] = useState(false);
 
-  const importRef = useRef<HTMLInputElement | null>();
-
   useEffect(() => {
     reload();
   }, []);
@@ -70,53 +62,6 @@ export const CMSOffice = () => {
       .then((r) => setPages(r.data.pages));
   };
 
-  const loadFiles = (e) => {
-    if (e.target.files.length === 1) {
-      Services.uploadZip(e.target.files[0])
-        .then(reload);
-    }
-  };
-
-  const calculateGroups = (items: Array<IPage>) => {
-    const pages: Array<IPage> = []
-    const apis: Array<IPage> = []
-    const blocks: Array<IPage> = []
-    const data: Array<IPage> = []
-    const mails: Array<IPage> = []
-    const scripts: Array<IPage> = []
-    const styles: Array<IPage> = []
-    const documentations: Array<IPage> = []
-
-    items.forEach(item => {
-      const group = item.path?.split("/")[1]
-
-      if (group === 'mails')
-        mails.push(item)
-      else if (group === "blocks")
-        blocks.push(item)
-      else if (group === "apis")
-        apis.push(item)
-      else if (group === "documentations")
-        documentations.push(item)
-      else {
-        const type = CONTENT_TYPES.find((f) => f.value === item.contentType)?.label || 'HTML'
-
-        if (type === "JS")
-          scripts.push(item)
-        else if (type === "CSS")
-          styles.push(item)
-        else if (type !== "HTML")
-          data.push(item)
-        else
-          pages.push(item)
-      }
-    })
-
-    return { pages, apis, blocks, data, mails, scripts, styles, documentations }
-  }
-
-  const { pages, apis, blocks, data, mails, scripts, styles, documentations } = calculateGroups(cmsPages)
-
   const Index = ({ }) => {
     return (<div className="p-3">
       <div className="d-flex flex-row align-items-center justify-content-between mb-2">
@@ -141,16 +86,6 @@ export const CMSOffice = () => {
         </div>
       </div>
 
-      <Stats
-        pages={pages}
-        apis={apis}
-        blocks={blocks}
-        data={data}
-        mails={mails}
-        scripts={scripts}
-        styles={styles}
-        documentations={documentations}
-      />
       <Pages pages={cmsPages} removePage={(id: string) => setPages(cmsPages.filter((f) => f.id !== id))} />
     </div>);
   };
@@ -158,37 +93,9 @@ export const CMSOffice = () => {
   return (
     <Can I={manage} a={tenant} dispatchError>
       <Routes>
-        <Route path={`/new`} element={<Create pages={cmsPages} />} />
-        <Route path={`/edit/:id/revisions`} element={<Revisions />} />
-        <Route path={`/edit/:id`} element={<Create pages={cmsPages} />} />
+        <Route path={`/:id`} element={<Create pages={cmsPages} />} />
         <Route path="*" element={<Index />} />
       </Routes>
     </Can>
   );
-};
-
-function Stats({ pages, apis, blocks, data, mails, scripts, styles, documentations }) {
-
-  const arr = [
-    { value: pages.length, label: 'Pages' },
-    { label: "Blocks", value: blocks.length },
-    { label: "APIs", value: apis.length },
-    { label: "Data", value: data.length },
-    { label: "Mails", value: mails.length },
-    { label: "Scripts", value: scripts.length },
-    { label: "Styles", value: styles.length },
-    { label: "Documentations", value: documentations.length },
-  ].sort((a, b) => a.value > b.value ? -1 : 1)
-
-  return <div className='d-flex flex-wrap items-center gap-2 my-3'>
-    {arr.map(page => <Stat key={page.label} title={page.label} value={page.value} />)}
-  </div>
-}
-
-function Stat({ value, title }) {
-  return <div className="level3 p-2 pt-0 d-flex flex-column align-items-center justify-content-between rounded" style={{ flex: 1 }}>
-    <div style={{ fontSize: '3rem' }} className='text-center'>{value}</div>
-    <div style={{ fontSize: '1rem' }} className='text-center'>{title}</div>
-  </div>
-}
-
+};
\ No newline at end of file
diff --git a/daikoku/javascript/src/components/adminbackoffice/tenants/MailingInternalization.tsx b/daikoku/javascript/src/components/adminbackoffice/tenants/MailingInternalization.tsx
index b803a22a8..f088d9877 100644
--- a/daikoku/javascript/src/components/adminbackoffice/tenants/MailingInternalization.tsx
+++ b/daikoku/javascript/src/components/adminbackoffice/tenants/MailingInternalization.tsx
@@ -228,10 +228,8 @@ export const MailingInternalization = () => {
       {domain === 'mail' && <div>
         <div className="alert alert-warning" role="alert">
           You have to use the CLI to customize your Daikoku mails.
-        </div>
 
-        <div className='section p-2'>
-          <a href="https://maif.github.io/daikoku/docs/cli" target="_blank"> Follow these following instructions to start</a>
+          <a className="alert-link" href="https://maif.github.io/daikoku/docs/cli" target="_blank"> Follow these instructions to start</a>
         </div>
       </div>}
 
diff --git a/daikoku/javascript/src/locales/en/translation.json b/daikoku/javascript/src/locales/en/translation.json
index bfd88b3eb..3514d06bf 100644
--- a/daikoku/javascript/src/locales/en/translation.json
+++ b/daikoku/javascript/src/locales/en/translation.json
@@ -1055,95 +1055,10 @@
     "ask.api.access.info": "Your request for access to %s has been sent.",
     "daikokuapp.pages_title": "Pages edition",
     "cms.create.back_to_pages": "Back to list",
-    "cms.create.save_modifications": "Update page",
-    "cms.create.create_page": "Create the new page",
-    "cms.create.default_body_text": "Home page",
-    "cms.create.name_placeholder": "The name of the page.",
-    "cms.create.path_placeholder": "The path where the page will be displayed",
-    "cms.create.path_slash_constraints": "the path must start with a slash",
-    "cms.create.path_paths_constraints": "this path is already taken",
-    "cms.create.body_help": "The content of the page. It must be of the same type than the content-type",
-    "cms.create.draft_help": "The content of the draft page. This is useful when you want to work on a future version of your page without exposing it.",
-    "cms.create.visible_label": "If not enabled, the page will not be exposed",
-    "cms.create.authenticated": "Authenticated",
-    "cms.create.authenticated_help": "If enabled, the page will be only visible for authenticated user",
-    "cms.create.metadata_help": "Linked metadata",
-    "cms.create.tags_help": "Linked tags",
-    "cms.create.content": "Production version",
-    "cms.create.draft": "Draft",
-    "cms.create.advanced": "Advanced",
-    "cms.content_side.publish_button": "Publish this version",
-    "cms.content_side.publish_label": "Are you sur to publish this version ?",
-    "cms.create.last_update": "Last update :",
-    "cms.create.version_label": "Version",
-    "cms.create.draft_preview": "Viewed draft page",
-    "cms.inserted": "The text has been added",
-    "cms.create.exact": "Exact path",
-    "cms.create.exact.help": "This page will be visible only if path is exactly equal to the exposed path",
-    "cms.pages.remove_confirm": "Are your sure to delete this page?",
-    "cms.content_side_view.choose_link": "A link to a back office page",
-    "cms.content_side_view.link_to_insert": "A link to your own other pages",
-    "cms.content_side_view.block_to_render": "A page or block to display in this page",
-    "cms.content_side_view.notifications": "Notifications",
-    "cms.content_side_view.sign_in": "Sign in",
-    "cms.content_side_view.logout": "Logout",
-    "cms.content_side_view.language": "Language",
-    "cms.content_side_view.back_office": "Back office",
-    "cms.content_side_view.sign_up": "Sign up",
-    "cms.content_side_view.home": "Home",
-    "cms.content_side_view.edit": "Edit",
-    "cms.content_side_view.links": "Choose a link to the back office",
-    "cms.content_side_view.pages": "Insert a link to a cms page",
-    "cms.content_side_view.blocks": "Render a block",
-    "cms.content_side_view.daikoku-user": "Get user information (name, email and picture)",
-    "cms.content_side_view.daikoku-owned-apis": "Get owned APIs",
-    "cms.content_side_view.daikoku-owned-api": "Get owned API",
-    "cms.content_side_view.daikoku-json-owned-apis": "Get owned APIs as stringified JSON format",
-    "cms.content_side_view.daikoku-json-owned-api": "Get owned API as stringified JSON format",
-    "cms.content_side_view.daikoku-owned-teams": "Get owned teams",
-    "cms.content_side_view.daikoku-owned-team": "Get owned team",
-    "cms.content_side_view.daikoku-json-owned-teams": "Get owned APIs as stringified JSON format",
-    "cms.content_side_view.daikoku-json-owned-team": "Get owned team as stringified JSON format",
-    "cms.content_side_view.tenant": "Get informations about the tenant",
-    "cms.content_side_view.is_admin": "Retrieves if the current user is an tenant administrator",
-    "cms.content_side_view.connected": "Retrieves if the current user is connected",
-    "cms.content_side_view.user": "If the user is connected, retrieve his informations",
-    "cms.content_side_view.request": "Get path, method and headers of the request",
-    "cms.content_side_view.daikoku-css": "Get the link to the Daikoku stylesheet",
-    "cms.content_side_view.for": "Iterates on an array field",
-    "cms.content_side_view.size": "Get the length of the variable",
-    "cms.content_side_view.ifeq": "Checks if the variable if equals to the value",
-    "cms.content_side_view.ifnoteq": "Checks if the variable if not equals to the value",
-    "cms.content_side_view.getOrElse": "Evaluates the value of the variable and return us the alternative value if the value is empty",
-    "cms.content_side_view.translate": "Translates the variable using Daikoku translations",
-    "cms.content_side_view.daikoku-query-param": "Get the query param of name",
-    "cms.content_side_view.daikoku-template-wrapper": "Display a wrapper block of the passed id",
-    "cms.content_side_view.daikoku-apis": "Get all APIs",
-    "cms.content_side_view.daikoku-api": "Get an specific API",
-    "cms.content_side_view.daikoku-json-apis": "Get all APIs as stringified JSON format",
-    "cms.content_side_view.daikoku-json-api": "Get a specific API as stringified JSON format",
-    "cms.content_side_view.daikoku-teams": "Get all teams",
-    "cms.content_side_view.daikoku-team": "Get an specific team",
-    "cms.content_side_view.daikoku-json-teams": "Get all teams as stringified JSON format",
-    "cms.content_side_view.daikoku-json-team": "Get a specific team as stringified JSON format",
-    "cms.content_side_view.daikoku-documentations": "Get all documentation pages of an API",
-    "cms.content_side_view.daikoku-documentations-page": "Get a specific page of the documentation of an API",
-    "cms.content_side_view.daikoku-documentations-page-id": "Get a specific page of the documentation of an API by id",
-    "cms.content_side_view.daikoku-plans": "Get the plans of an API",
-    "cms.content_side_view.search_text": "Search your directive...",
-    "cms.index.new_page": "New page",
-    "cms.pages.block": "BLOCK",
-    "cms.sidebar.is_block_page": "Is a block ?",
-    "cms.pages.publish_date": "Publish Date",
+    "cms.create.content": "Production content",
     "cms.pages.name": "Name",
     "cms.pages.path": "Path",
-    "cms.create.path": "Path",
-    "cms.body.drag_and_drop_advice": "Drop a file in the editor to easily import its content",
-    "cms.content_side.new_action": "Add an element",
     "cms.export_all": "Export all files",
-    "cms.revisions.restore": "Restore this version",
-    "cms.revisions.delete_sentence": "Are you sure to restore this version ?",
-    "cms.revisions.version_history": "Version history",
     "updated password can't be saved": "Updated password can't be saved",
     "incorrect password": "Incorrect password",
     "Standard mode": "Standard mode",
diff --git a/daikoku/javascript/src/locales/fr/translation.json b/daikoku/javascript/src/locales/fr/translation.json
index 720bae3fc..f36365d73 100644
--- a/daikoku/javascript/src/locales/fr/translation.json
+++ b/daikoku/javascript/src/locales/fr/translation.json
@@ -1056,96 +1056,10 @@
   "You're not authorized on this api": "Vous n'êtes pas autorisé à accéder à cette API",
   "ask.api.access.info": "Votre demande d'accès à %s à bien été envoyée.",
   "daikokuapp.pages_title": "Edition des pages",
-  "cms.create.back_to_pages": "Retour",
-  "cms.create.save_modifications": "Mettre à jour",
-  "cms.create.create_page": "Créer la page",
-  "cms.create.default_body_text": "Home page",
-  "cms.create.name_placeholder": "Le nom de la page.",
-  "cms.create.path_placeholder": "Le chemin sur lequel la page sera affiché",
-  "cms.create.path_slash_constraints": "Le chemin doit commencer par un slash",
-  "cms.create.path_paths_constraints": "Ce chemin est déjà pris",
-  "cms.create.body_help": "Le contenu doit être du même type que celui du Content-Type",
-  "cms.create.draft_help": "Le brouillon est utile lorsqu'on souhaite faire une version en avance de phase, sans pour autant l'exposer",
-  "cms.create.visible_label": "Si non activé, la page ne sera pas exposée sur le chemin indiqué",
-  "cms.create.authenticated": "Besoin d'être connecté",
-  "cms.create.authenticated_help": "Si activé, la page sera seulement visible pour les utilisateurs connectés, les autres seront redirigés vers la page de connexion",
-  "cms.create.metadata_help": "Metadata",
-  "cms.create.tags_help": "Tags",
-  "cms.create.content": "Version en production",
-  "cms.create.draft": "Contenu non publié",
-  "cms.create.advanced": "Informations avancées",
-  "cms.content_side.publish_button": "Publier cette version",
-  "cms.content_side.publish_label": "Êtes-vous sûr de vouloir publier cette version ?",
-  "cms.create.last_update": "Dernier changement : ",
-  "cms.create.version_label": "Version",
-  "cms.inserted": "Le texte a été ajouté",
-  "cms.create.draft_preview": "Voir la page en cours",
-  "cms.pages.remove_confirm": "Êtes-vous sûr de vouloir supprimer cette page ?",
-  "cms.create.exact": "Chemin exact",
-  "cms.create.exact.help": "Cette page ne sera visible que si le chemin est exactement égal au chemin exposé",
-  "cms.content_side_view.choose_link": "Un lien vers une page du back office",
-  "cms.content_side_view.link_to_insert": "Un lien vers l'une de vos autres pages",
-  "cms.content_side_view.block_to_render": "Une page/bloc à rendre dans cette page",
-  "cms.content_side_view.notifications": "Notifications",
-  "cms.content_side_view.sign_in": "Se connecter",
-  "cms.content_side_view.logout": "Déconnexion",
-  "cms.content_side_view.language": "Langage courant",
-  "cms.content_side_view.back_office": "Back office",
-  "cms.content_side_view.sign_up": "S'inscrire",
-  "cms.content_side_view.home": "Page d'accueil",
-  "cms.content_side_view.edit": "Editer",
-  "cms.content_side_view.links": "Insérer un lien vers le back office",
-  "cms.content_side_view.pages": "Insérer un lien vers une page cms",
-  "cms.content_side_view.blocks": "Bloc à rendre",
-  "cms.content_side_view.daikoku-user": "Récupère les informations d'un utilisateur (name, email et picture)",
-  "cms.content_side_view.daikoku-owned-apis": "Récupère les apis de l'utilisateur connecté",
-  "cms.content_side_view.daikoku-owned-api": "Récupère une api de l'utilisateur connecté",
-  "cms.content_side_view.daikoku-json-owned-apis": "Récupère les apis de l'utilisateur connecté (format JSON)",
-  "cms.content_side_view.daikoku-json-owned-api": "Récupère une api de l'utilisateur connecté (format JSON)",
-  "cms.content_side_view.daikoku-owned-teams": "Récupère les équipes de l'utilisateur connecté",
-  "cms.content_side_view.daikoku-owned-team": "Récupère une équipe de l'utilisateur connecté",
-  "cms.content_side_view.daikoku-json-owned-teams": "Récupère les équipes de l'utilisateur connecté (format JSON)",
-  "cms.content_side_view.daikoku-json-owned-team": "Récupère une équipe de l'utilisateur connecté (format JSON)",
-  "cms.content_side_view.tenant": "Récupère les informations du tenant",
-  "cms.content_side_view.is_admin": "Indique si l'utilisateur connecté est un administrateur du tenant ou non",
-  "cms.content_side_view.connected": "Indique si l'utilisateur est connecté",
-  "cms.content_side_view.user": "Récupère, si connecté, les informations de l'utilisateur",
-  "cms.content_side_view.request": "Récupère le chemin, la méthode et les entêtes de la requête",
-  "cms.content_side_view.daikoku-css": "Récupère le lien vers la feuille de style de Daikoku",
-  "cms.content_side_view.for": "Itére sur une variable de type tableau passé en paramètre",
-  "cms.content_side_view.size": "Récupère la longueur de la variable",
-  "cms.content_side_view.ifeq": "S'assure que la variable est égale à la valeur souhaitée",
-  "cms.content_side_view.ifnoteq": "S'assure que la variable n'est pas égale à la valeur souhaitée",
-  "cms.content_side_view.getOrElse": "Évalue la valeur de la variable et retourne l'alternative de la valeur si elle est non définie",
-  "cms.content_side_view.translate": "Traduit une variable en utilisant les traduction de Daikoku",
-  "cms.content_side_view.daikoku-query-param": "Récupère le query param avec le nom passé en paramètre",
-  "cms.content_side_view.daikoku-template-wrapper": "Affiche un bloc englobant un contenu enfant (avec ID)",
-  "cms.content_side_view.daikoku-apis": "Récupère toutes les APIs",
-  "cms.content_side_view.daikoku-api": "Récupère une API spécifique",
-  "cms.content_side_view.daikoku-json-apis": "Récupère toutes les APIs au format JSON",
-  "cms.content_side_view.daikoku-json-api": "Récupère une API au format JSON",
-  "cms.content_side_view.daikoku-teams": "Récupère toutes les APIs",
-  "cms.content_side_view.daikoku-team": "Récupère une équipe",
-  "cms.content_side_view.daikoku-json-teams": "Récupère toutes les équipes au format JSON",
-  "cms.content_side_view.daikoku-json-team": "Récupère une équipe au format JSON",
-  "cms.content_side_view.daikoku-documentations": "Récupère toutes les pages de documentation d'une API",
-  "cms.content_side_view.daikoku-documentations-page": "Récupère la énième page de documentation d'une api souhaitée",
-  "cms.content_side_view.daikoku-documentations-page-id": "Récupère la page de documentation d'une api souhaitée (via Id)",
-  "cms.content_side_view.daikoku-plans": "Récupère les plans d'une API",
-  "cms.content_side_view.search_text": "Tapez le nom de la directive",
-  "cms.index.new_page": "Nouvelle page",
-  "cms.pages.block": "BLOC",
-  "cms.sidebar.is_block_page": "Est-ce un bloc ?",
-  "cms.pages.publish_date": "Date de publication",
+  "cms.create.back_to_pages": "Retour à la liste",
+  "cms.create.content": "Contenu en production",
   "cms.pages.name": "Nom",
   "cms.pages.path": "Chemin",
-  "cms.create.path": "Chemin d'exposition",
-  "cms.body.drag_and_drop_advice": "Dépose un fichier dans l'éditeur pour importer le contenu directement",
-  "cms.content_side.new_action": "Ajouter un élément",
-  "cms.export_all": "Exporter",
-  "cms.revisions.restore": "Restaurer cette version",
-  "cms.revisions.delete_sentence": "Êtes-vous sûr de vouloir restaurer cette version ?",
-  "cms.revisions.version_history": "Historique",
   "updated password can't be saved": "Le mots de passe n'a pu être mis à jour.",
   "incorrect password": "Mots de passe incorrect",
   "Standard mode": "Mode standard",
diff --git a/daikoku/javascript/src/services/index.ts b/daikoku/javascript/src/services/index.ts
index ba0e9dbf2..c799d6296 100644
--- a/daikoku/javascript/src/services/index.ts
+++ b/daikoku/javascript/src/services/index.ts
@@ -1908,7 +1908,6 @@ export const graphql = {
         cmsPage(id: "${id}") {
             name
             path
-            draft
             body
             exact
             visible
@@ -1924,7 +1923,6 @@ export const graphql = {
   query GetCmsPage {
       cmsPage(id: "${id}") {
           name
-          draft
           history {
             id
             date
diff --git a/manual/docs/04-cli/042-apis-to-business-website/01-create-your-first-project.mdx b/manual/docs/04-cli/042-apis-to-business-website/01-create-your-first-project.mdx
index 66ff5d3e8..327b41e07 100644
--- a/manual/docs/04-cli/042-apis-to-business-website/01-create-your-first-project.mdx
+++ b/manual/docs/04-cli/042-apis-to-business-website/01-create-your-first-project.mdx
@@ -1,7 +1,7 @@
 import HomeAPIs from '@site/static/img/home-apis.png';
 import Welcome from '@site/static/img/welcome.png';
 
-# 1 - Create your first project
+# Create your first project
 
 # Run Daikoku CLI in dev mode
 
diff --git a/manual/docs/04-cli/042-apis-to-business-website/02-edit-your-home-page.mdx b/manual/docs/04-cli/042-apis-to-business-website/02-edit-your-home-page.mdx
index 90f7579f6..d80ad4f27 100644
--- a/manual/docs/04-cli/042-apis-to-business-website/02-edit-your-home-page.mdx
+++ b/manual/docs/04-cli/042-apis-to-business-website/02-edit-your-home-page.mdx
@@ -1,4 +1,4 @@
-# 2 - Edit your home page
+# Edit your home page
 
 In your code editor, navigate in the Explorer file pane to `src/pages/page.html` and click on it to open the file’s contents in an editable tab.
 
diff --git a/manual/docs/04-cli/042-apis-to-business-website/03-deploy-your-website copy.mdx b/manual/docs/04-cli/042-apis-to-business-website/03-deploy-your-website copy.mdx
index c02c2cc81..7c2424bd5 100644
--- a/manual/docs/04-cli/042-apis-to-business-website/03-deploy-your-website copy.mdx	
+++ b/manual/docs/04-cli/042-apis-to-business-website/03-deploy-your-website copy.mdx	
@@ -1,4 +1,4 @@
-# 3 - Deploy your site
+# Deploy your site
 
 To synchronize your site with your Daikoku, you can push your changes by running the command:
 
diff --git a/manual/docs/04-cli/042-apis-to-business-website/04-create-your-first-page copy.mdx b/manual/docs/04-cli/042-apis-to-business-website/04-create-your-first-page copy.mdx
index e01b319d3..9e918eaa9 100644
--- a/manual/docs/04-cli/042-apis-to-business-website/04-create-your-first-page copy.mdx	
+++ b/manual/docs/04-cli/042-apis-to-business-website/04-create-your-first-page copy.mdx	
@@ -1,4 +1,4 @@
-# 4 - Create your first page
+# Create your first page
 
 # Create a new page.html file
 
diff --git a/manual/docs/04-cli/042-apis-to-business-website/05-add-dynamic-content.mdx b/manual/docs/04-cli/042-apis-to-business-website/05-add-dynamic-content.mdx
index 3f2622709..bcf083542 100644
--- a/manual/docs/04-cli/042-apis-to-business-website/05-add-dynamic-content.mdx
+++ b/manual/docs/04-cli/042-apis-to-business-website/05-add-dynamic-content.mdx
@@ -1,6 +1,6 @@
 import APIImage from '@site/static/img/api.png';
 
-# 5 - Add dynamic content
+# Add dynamic content
 
 # Use your first directive
 
diff --git a/manual/docs/04-cli/042-apis-to-business-website/06-style-your-apis-page.mdx b/manual/docs/04-cli/042-apis-to-business-website/06-style-your-apis-page.mdx
index ccdd7141a..204ba40cf 100644
--- a/manual/docs/04-cli/042-apis-to-business-website/06-style-your-apis-page.mdx
+++ b/manual/docs/04-cli/042-apis-to-business-website/06-style-your-apis-page.mdx
@@ -1,6 +1,6 @@
 import APIStyling from '@site/static/img/apis-styling.png';
 
-# 6 - Style your APIs page
+# Style your APIs page
 
 # Style an individual page
 
diff --git a/manual/docs/04-cli/042-apis-to-business-website/07-build-your-first-layout.mdx b/manual/docs/04-cli/042-apis-to-business-website/07-build-your-first-layout.mdx
index 10992330c..3ab84e3e2 100644
--- a/manual/docs/04-cli/042-apis-to-business-website/07-build-your-first-layout.mdx
+++ b/manual/docs/04-cli/042-apis-to-business-website/07-build-your-first-layout.mdx
@@ -1,4 +1,4 @@
-# 7 - Build your first layout
+# Build your first layout
 
 You still have some links and components repeatedly rendered on every page. It’s time to refactor again to create a shared page layout!
 
diff --git a/manual/docs/04-cli/042-apis-to-business-website/08-define-and-use-a-variable.mdx b/manual/docs/04-cli/042-apis-to-business-website/08-define-and-use-a-variable.mdx
index 73ef10ac4..07e43800d 100644
--- a/manual/docs/04-cli/042-apis-to-business-website/08-define-and-use-a-variable.mdx
+++ b/manual/docs/04-cli/042-apis-to-business-website/08-define-and-use-a-variable.mdx
@@ -1,4 +1,4 @@
-# 8 - Define and use a variable
+# Define and use a variable
 
 Any HTML file is valid Daikoku language. But, you can do more with Daikoku than just regular HTML!
 
diff --git a/manual/docs/04-cli/042-apis-to-business-website/09-create-react-component.mdx b/manual/docs/04-cli/042-apis-to-business-website/09-create-react-component.mdx
index 7688d02fe..59aa56b5c 100644
--- a/manual/docs/04-cli/042-apis-to-business-website/09-create-react-component.mdx
+++ b/manual/docs/04-cli/042-apis-to-business-website/09-create-react-component.mdx
@@ -1,4 +1,4 @@
-# 9 - Create react component
+# Create react component
 
 Now that you have added a layout to your APIs page, it's time to explore a different approach to creating files.
 
diff --git a/manual/docs/04-cli/042-apis-to-business-website/10-configure-custom-emails.mdx b/manual/docs/04-cli/042-apis-to-business-website/10-configure-custom-emails.mdx
index ec927f198..1df40638d 100644
--- a/manual/docs/04-cli/042-apis-to-business-website/10-configure-custom-emails.mdx
+++ b/manual/docs/04-cli/042-apis-to-business-website/10-configure-custom-emails.mdx
@@ -1,4 +1,4 @@
-# 10 - Configure custom emails 
+# Configure custom emails 
 
 Your website and Daikoku are almost ready to be published, but before that, you need to configure the email content.
 
diff --git a/manual/docs/04-cli/042-apis-to-business-website/11-dev-mode.mdx b/manual/docs/04-cli/042-apis-to-business-website/11-dev-mode.mdx
index 32b23d17e..595df77e1 100644
--- a/manual/docs/04-cli/042-apis-to-business-website/11-dev-mode.mdx
+++ b/manual/docs/04-cli/042-apis-to-business-website/11-dev-mode.mdx
@@ -1,6 +1,6 @@
 import DeveloperMode from '@site/static/img/developer-mode.png';
 
-# 11 - Developer mode
+# Developer mode
 
 In the first steps of this tutorial, we used the `watch` command to preview the project files as a website.
 
diff --git a/manual/docs/04-cli/042-apis-to-business-website/12-add-personal-assets.mdx b/manual/docs/04-cli/042-apis-to-business-website/12-add-personal-assets.mdx
index 7e5bea177..1609dd258 100644
--- a/manual/docs/04-cli/042-apis-to-business-website/12-add-personal-assets.mdx
+++ b/manual/docs/04-cli/042-apis-to-business-website/12-add-personal-assets.mdx
@@ -1,4 +1,4 @@
-# 12 - Add personal assets
+# Add personal assets
 
 In this tutorial, you’ve only used assets from external resources.
 However, Daikoku also provides a way to upload, store, and publish your own assets to your CMS.
@@ -22,4 +22,24 @@ daikoku assets push --filename=api.jpeg \
   --slug=api.jpeg
 ```
 
-You can now use this asset on the CMS.
+You can now use the asset on the CMS.
+
+Open the `src/pages/components/api.jsx` and edit the content
+
+```jsx title="src/pages/components/api.jsx"
+function MyAPIs() {
+
+    const apis = JSON.parse(`{{{apis}}}`);
+
+    return apis.map(api => {
+        return <div key={api.name} className="card bg-base-100 w-96 shadow-xl">
+            <figure>
+                <img
+            // deletion
+                    src="https://images.pexels.com/photos/1148820/pexels-photo-1148820.jpeg"
+              <img
+            // addition
+                    src="/tenant-assets/api.jpeg"
+```
+
+Check the browser preview again to notice what did (or, spoiler alert: did not!) change.