diff --git a/examples/getstarted/api/address/models/Address.settings.json b/examples/getstarted/api/address/models/Address.settings.json
index 4a6474cdf1..eb771ba97f 100755
--- a/examples/getstarted/api/address/models/Address.settings.json
+++ b/examples/getstarted/api/address/models/Address.settings.json
@@ -46,6 +46,15 @@
       "type": "component",
       "repeatable": false,
       "component": "default.rrr"
+    },
+    "date": {
+      "type": "date"
+    },
+    "datetime": {
+      "type": "datetime"
+    },
+    "time": {
+      "type": "time"
     }
   }
 }
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/List/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/List/index.js
index b884e54b57..80fcbe6f37 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/List/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/List/index.js
@@ -59,7 +59,7 @@ function List({
     color: 'primary',
     label: formatMessage({
       id: !isSub
-        ? `${pluginId}.form.button.add.field.to.contentType`
+        ? `${pluginId}.form.button.add.field.to.${editTarget}`
         : `${pluginId}.form.button.add.field.to.component`,
     }),
     onClick: onClickAddField,
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/index.js
index 2dae81382b..382cc6e647 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/index.js
@@ -258,12 +258,12 @@ const ListPage = () => {
     },
   };
   const goToCMSettingsPage = () => {
-    push(
-      `/plugins/content-manager/${targetUid}/ctm-configurations/list-settings`
-    );
+    const endPoint = isInContentTypeView
+      ? `/plugins/content-manager/${targetUid}/ctm-configurations/edit-settings/content-types`
+      : `/plugins/content-manager/ctm-configurations/edit-settings/components/${targetUid}/`;
+    push(endPoint);
   };
 
-  // const listActions = isInDevelopmentMode ? [{ ...addButtonProps }] : [];
   const configureButtonProps = {
     icon: <LayoutIcon className="colored" fill="#007eff" />,
     color: 'secondary',
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/en.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/en.json
index f61cd7a1da..d2c58cfd18 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/en.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/en.json
@@ -59,8 +59,7 @@
 
   "form.attribute.settings.default.checkboxLabel": "Set to true",
   "form.button.add.field": "Add Another Field",
-  "form.button.add.field.to.contentType": "Add another field to this content-type",
-  "form.button.add.field.to.component": "Add another field to this component",
+
   "form.button.cancel": "Cancel",
   "form.button.continue": "Continue",
   "form.button.save": "Save",
@@ -176,6 +175,7 @@
   "attribute.component.description": "Set of fields that you can repeat or reuse",
   "attribute.date": "Date",
   "attribute.date.description": "Event date, opening hours",
+  "attribute.datetime": "Datetime",
   "attribute.dynamiczone": "Dynamic zone",
   "attribute.dynamiczone.description": "Dynamically pick component when editing content",
   "attribute.email": "Email",
@@ -197,6 +197,7 @@
   "attribute.richtext.description": "Formatting and creating text",
   "attribute.text": "Text",
   "attribute.text.description": "Small or long text like title or description",
+  "attribute.time": "Time",
   "attribute.uid": "Uuid",
   "attribute.uid.description": "Unique identifier",
 
@@ -280,5 +281,7 @@
   "components.componentSelect.value-component": "{number} component selected",
   "popUpWarning.bodyMessage.contentType.delete": "Are you sure you want to delete this content type?",
   "popUpWarning.bodyMessage.component.delete": "Are you sure you want to delete this component?",
-  "popUpWarning.bodyMessage.category.delete": "Are you sure you want to delete this category? All the components will also be deleted."
+  "popUpWarning.bodyMessage.category.delete": "Are you sure you want to delete this category? All the components will also be deleted.",
+  "form.button.add.field.to.contentType": "Add another field to this content-type",
+  "form.button.add.field.to.component": "Add another field to this component"
 }