diff --git a/frontend/src/lib/components/apps/editor/component/components.ts b/frontend/src/lib/components/apps/editor/component/components.ts
index 8f9ba9e62e..e30df63ba4 100644
--- a/frontend/src/lib/components/apps/editor/component/components.ts
+++ b/frontend/src/lib/components/apps/editor/component/components.ts
@@ -1009,7 +1009,7 @@ export const components = {
 					type: 'static',
 					fieldType: 'text',
 					value: '',
-					tooltip: 'Job id to display logs from'
+					tooltip: 'Job id to display status from'
 				}
 			}
 		}
@@ -1330,7 +1330,7 @@ export const components = {
 		}
 	},
 	formcomponent: {
-		name: 'Submit form',
+		name: 'Submit Form',
 		icon: FormInput,
 		documentationLink: `${documentationBaseUrl}/submit_form`,
 		dims: '3:5-6:5' as AppComponentDimensions,
@@ -3384,7 +3384,7 @@ See date-fns format for more information. By default, it is 'dd.MM.yyyy HH:mm'
 		}
 	},
 	conditionalwrapper: {
-		name: 'Conditional tabs',
+		name: 'Conditional Tabs',
 		icon: Split,
 		documentationLink: `${documentationBaseUrl}/conditional_tabs`,
 		dims: '2:8-6:8' as AppComponentDimensions,
@@ -3412,7 +3412,7 @@ See date-fns format for more information. By default, it is 'dd.MM.yyyy HH:mm'
 		}
 	},
 	statcomponent: {
-		name: 'Statistic card',
+		name: 'Statistic Card',
 		icon: FileBarChart,
 		documentationLink: `${documentationBaseUrl}/statistic_card`,
 		dims: '2:4-3:4' as AppComponentDimensions,
@@ -4022,7 +4022,7 @@ See date-fns format for more information. By default, it is 'dd.MM.yyyy HH:mm'
 		}
 	},
 	jobiddisplaycomponent: {
-		name: 'Rich result by Job Id',
+		name: 'Rich Result by Job Id',
 		icon: Monitor,
 		documentationLink: `${documentationBaseUrl}/rich_result_by_job_id`,
 		dims: '2:8-6:8' as AppComponentDimensions,
@@ -4036,7 +4036,7 @@ See date-fns format for more information. By default, it is 'dd.MM.yyyy HH:mm'
 					type: 'static',
 					fieldType: 'text',
 					value: '',
-					tooltip: 'Job id to display logs from'
+					tooltip: 'Job id to display result from'
 				},
 				title: {
 					type: 'static',
diff --git a/frontend/src/lib/components/apps/editor/component/sets.ts b/frontend/src/lib/components/apps/editor/component/sets.ts
index 634e8afe83..9113a3d404 100644
--- a/frontend/src/lib/components/apps/editor/component/sets.ts
+++ b/frontend/src/lib/components/apps/editor/component/sets.ts
@@ -48,6 +48,7 @@ const inputs: ComponentSet = {
 		'dateinputcomponent',
 		'timeinputcomponent',
 		'datetimeinputcomponent',
+		'dateselectcomponent',
 		'fileinputcomponent',
 		's3fileinputcomponent',
 		'checkboxcomponent',
@@ -55,8 +56,7 @@ const inputs: ComponentSet = {
 		'resourceselectcomponent',
 		'multiselectcomponentv2',
 		'selecttabcomponent',
-		'selectstepcomponent',
-		'dateselectcomponent'
+		'selectstepcomponent'
 	]
 } as const
 
diff --git a/frontend/src/lib/components/apps/editor/componentsPanel/cssUtils.ts b/frontend/src/lib/components/apps/editor/componentsPanel/cssUtils.ts
index 4585a3692a..f213ca6108 100644
--- a/frontend/src/lib/components/apps/editor/componentsPanel/cssUtils.ts
+++ b/frontend/src/lib/components/apps/editor/componentsPanel/cssUtils.ts
@@ -567,7 +567,7 @@ export const customisationByComponent: Customisation[] = [
 	{
 		components: ['conditionalwrapper'],
 		selectors: [
-			{ selector: '.wm-conditional-tabs', comment: 'Conditional tabs', customCssKey: 'container' }
+			{ selector: '.wm-conditional-tabs', comment: 'Conditional Tabs', customCssKey: 'container' }
 		],
 		variables: []
 	},