diff --git a/package-lock.json b/package-lock.json
index 498a15d570..5c90ad6c8b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,8 +10,8 @@
       "dependencies": {
         "@hello-pangea/dnd": "^16.5.0",
         "@mui/material": "^5.15.21",
-        "@mui/x-date-pickers": "^7.6.1",
-        "@reduxjs/toolkit": "^2.2.5",
+        "@mui/x-date-pickers": "^7.8.0",
+        "@reduxjs/toolkit": "^2.2.6",
         "@types/dompurify": "^3.0.5",
         "@types/react-router-dom": "^5.3.3",
         "array-move": "^4.0.0",
@@ -37,7 +37,7 @@
         "react-i18next": "^14.1.2",
         "react-icons": "^5.2.1",
         "react-redux": "^7.2.9",
-        "react-router-dom": "^6.23.1",
+        "react-router-dom": "^6.24.0",
         "react-select": "^5.8.0",
         "redux": "^5.0.1",
         "redux-persist": "^6.0.0",
@@ -54,7 +54,7 @@
         "@types/lodash": "^4.17.6",
         "@types/node": "^20.14.9",
         "@types/react-dom": "^18.3.0",
-        "@types/uuid": "^9.0.8",
+        "@types/uuid": "^10.0.0",
         "@typescript-eslint/eslint-plugin": "^7.14.1",
         "@vitejs/plugin-react-swc": "^3.7.0",
         "eslint": "^8.57.0",
@@ -63,7 +63,7 @@
         "rollup-preserve-directives": "^1.1.1",
         "sass": "^1.77.6",
         "typescript": "^5.5.2",
-        "uuid": "^9.0.1",
+        "uuid": "^10.0.0",
         "vite": "^5.3.2",
         "vite-plugin-svgr": "^4.2.0",
         "vite-tsconfig-paths": "^4.3.2",
@@ -2188,9 +2188,9 @@
       "license": "MIT"
     },
     "node_modules/@babel/runtime": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.6.tgz",
-      "integrity": "sha512-Ja18XcETdEl5mzzACGd+DKgaGJzPTCow7EglgwTmHdwokzDFYh/MHua6lU6DV/hjF2IaOJ4oX2nqnjG7RElKOw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz",
+      "integrity": "sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -3308,14 +3308,14 @@
       }
     },
     "node_modules/@mui/x-date-pickers": {
-      "version": "7.6.1",
-      "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.6.1.tgz",
-      "integrity": "sha512-erSq5cnOUyBgBmpHnMxIit5yhT3bl/lOaNZKpObvJtvEJetvNA9xWQ7dz/J/AufLzDuvThjusuRD0y+GmeXtiw==",
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.8.0.tgz",
+      "integrity": "sha512-SkolW0vZ4XiUeD5FBevG9NQ3pAgfNYlJA5XFhSLFD/swNQRO4EYOUXw38O/ccOh1lkAcwVR+rrGPCoT4/0YGEg==",
       "dependencies": {
-        "@babel/runtime": "^7.24.6",
+        "@babel/runtime": "^7.24.7",
         "@mui/base": "^5.0.0-beta.40",
-        "@mui/system": "^5.15.15",
-        "@mui/utils": "^5.15.14",
+        "@mui/system": "^5.15.20",
+        "@mui/utils": "^5.15.20",
         "@types/react-transition-group": "^4.4.10",
         "clsx": "^2.1.1",
         "prop-types": "^15.8.1",
@@ -3467,9 +3467,9 @@
       }
     },
     "node_modules/@reduxjs/toolkit": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.2.5.tgz",
-      "integrity": "sha512-aeFA/s5NCG7NoJe/MhmwREJxRkDs0ZaSqt0MxhWUrwCf1UQXpwR87RROJEql0uAkLI6U7snBOYOcKw83ew3FPg==",
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.2.6.tgz",
+      "integrity": "sha512-kH0r495c5z1t0g796eDQAkYbEQ3a1OLYN9o8jQQVZyKyw367pfRGS+qZLkHYvFHiUUdafpoSlQ2QYObIApjPWA==",
       "dependencies": {
         "immer": "^10.0.3",
         "redux": "^5.0.1",
@@ -3490,9 +3490,9 @@
       }
     },
     "node_modules/@remix-run/router": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.1.tgz",
-      "integrity": "sha512-es2g3dq6Nb07iFxGk5GuHN20RwBZOsuDQN7izWIisUcv9r+d2C5jQxqmgkdebXgReWfiyUabcki6Fg77mSNrig==",
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.17.0.tgz",
+      "integrity": "sha512-2D6XaHEVvkCn682XBnipbJjgZUU7xjLtA4dGJRBVUKpEaDYOZMENZoZjAOSb7qirxt5RupjzZxz4fK2FO+EFPw==",
       "engines": {
         "node": ">=14.0.0"
       }
@@ -4455,9 +4455,9 @@
       "integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA=="
     },
     "node_modules/@types/uuid": {
-      "version": "9.0.8",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz",
-      "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==",
       "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
@@ -9920,11 +9920,11 @@
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
     },
     "node_modules/react-router": {
-      "version": "6.23.1",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.23.1.tgz",
-      "integrity": "sha512-fzcOaRF69uvqbbM7OhvQyBTFDVrrGlsFdS3AL+1KfIBtGETibHzi3FkoTRyiDJnWNc2VxrfvR+657ROHjaNjqQ==",
+      "version": "6.24.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.24.0.tgz",
+      "integrity": "sha512-sQrgJ5bXk7vbcC4BxQxeNa5UmboFm35we1AFK0VvQaz9g0LzxEIuLOhHIoZ8rnu9BO21ishGeL9no1WB76W/eg==",
       "dependencies": {
-        "@remix-run/router": "1.16.1"
+        "@remix-run/router": "1.17.0"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -9934,12 +9934,12 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "6.23.1",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.23.1.tgz",
-      "integrity": "sha512-utP+K+aSTtEdbWpC+4gxhdlPFwuEfDKq8ZrPFU65bbRJY+l706qjR7yaidBpo3MSeA/fzwbXWbKBI6ftOnP3OQ==",
+      "version": "6.24.0",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.24.0.tgz",
+      "integrity": "sha512-960sKuau6/yEwS8e+NVEidYQb1hNjAYM327gjEyXlc6r3Skf2vtwuJ2l7lssdegD2YjoKG5l8MsVyeTDlVeY8g==",
       "dependencies": {
-        "@remix-run/router": "1.16.1",
-        "react-router": "6.23.1"
+        "@remix-run/router": "1.17.0",
+        "react-router": "6.24.0"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -11149,9 +11149,9 @@
       }
     },
     "node_modules/uuid": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
-      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
       "dev": true,
       "funding": [
         "https://github.com/sponsors/broofa",
diff --git a/package.json b/package.json
index 6aad3d1ddf..6d27006400 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,8 @@
   "dependencies": {
     "@hello-pangea/dnd": "^16.5.0",
     "@mui/material": "^5.15.21",
-    "@mui/x-date-pickers": "^7.6.1",
-    "@reduxjs/toolkit": "^2.2.5",
+    "@mui/x-date-pickers": "^7.8.0",
+    "@reduxjs/toolkit": "^2.2.6",
     "@types/dompurify": "^3.0.5",
     "@types/react-router-dom": "^5.3.3",
     "array-move": "^4.0.0",
@@ -34,7 +34,7 @@
     "react-i18next": "^14.1.2",
     "react-icons": "^5.2.1",
     "react-redux": "^7.2.9",
-    "react-router-dom": "^6.23.1",
+    "react-router-dom": "^6.24.0",
     "react-select": "^5.8.0",
     "redux": "^5.0.1",
     "redux-persist": "^6.0.0",
@@ -69,7 +69,7 @@
     "@types/lodash": "^4.17.6",
     "@types/node": "^20.14.9",
     "@types/react-dom": "^18.3.0",
-    "@types/uuid": "^9.0.8",
+    "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^7.14.1",
     "@vitejs/plugin-react-swc": "^3.7.0",
     "eslint": "^8.57.0",
@@ -78,7 +78,7 @@
     "rollup-preserve-directives": "^1.1.1",
     "sass": "^1.77.6",
     "typescript": "^5.5.2",
-    "uuid": "^9.0.1",
+    "uuid": "^10.0.0",
     "vite": "^5.3.2",
     "vite-plugin-svgr": "^4.2.0",
     "vite-tsconfig-paths": "^4.3.2",
diff --git a/src/components/configuration/Themes.tsx b/src/components/configuration/Themes.tsx
index 14ca28b38c..14a265aaeb 100644
--- a/src/components/configuration/Themes.tsx
+++ b/src/components/configuration/Themes.tsx
@@ -87,16 +87,6 @@ const Themes = ({
 		<>
 			<Header />
 			<NavBar>
-				{/* Add theme button */}
-				<div className="btn-group">
-					{hasAccess("ROLE_UI_THEMES_CREATE", user) && (
-						<button className="add" onClick={() => showNewThemesModal()}>
-							<i className="fa fa-plus" />
-							<span>{t("CONFIGURATION.ACTIONS.ADD_THEME")}</span>
-						</button>
-					)}
-				</div>
-
 				{/* Display modal for new series if add series button is clicked */}
 				<NewResourceModal
 					showModal={displayNewThemesModal}
@@ -118,6 +108,16 @@ const Themes = ({
 						</Link>
 					)}
 				</nav>
+
+				{/* Add theme button */}
+				<div className="btn-group">
+					{hasAccess("ROLE_UI_THEMES_CREATE", user) && (
+						<button className="add" onClick={() => showNewThemesModal()}>
+							<i className="fa fa-plus" />
+							<span>{t("CONFIGURATION.ACTIONS.ADD_THEME")}</span>
+						</button>
+					)}
+				</div>
 			</NavBar>
 
 			<MainView open={displayNavigation}>
diff --git a/src/components/events/Events.tsx b/src/components/events/Events.tsx
index 98ca33bb16..80e4e14983 100644
--- a/src/components/events/Events.tsx
+++ b/src/components/events/Events.tsx
@@ -195,15 +195,6 @@ const Events = ({
 		<>
 			<Header />
 			<NavBar>
-				<div className="btn-group">
-					{hasAccess("ROLE_UI_EVENTS_CREATE", user) && (
-						<button className="add" onClick={() => showNewEventModal()}>
-							<i className="fa fa-plus" />
-							<span>{t("EVENTS.EVENTS.ADD_EVENT")}</span>
-						</button>
-					)}
-				</div>
-
 				{
 					/* Display modal for new event if add event button is clicked */
 					!isFetchingAssetUploadOptions && (
@@ -258,6 +249,15 @@ const Events = ({
 						<Stats />
 					</div>
 				)}
+				
+				<div className="btn-group">
+					{hasAccess("ROLE_UI_EVENTS_CREATE", user) && (
+						<button className="add" onClick={() => showNewEventModal()}>
+							<i className="fa fa-plus" />
+							<span>{t("EVENTS.EVENTS.ADD_EVENT")}</span>
+						</button>
+					)}
+				</div>
 			</NavBar>
 
 			<MainView open={displayNavigation}>
diff --git a/src/components/events/Series.tsx b/src/components/events/Series.tsx
index 9b3e981936..3df361b7fd 100644
--- a/src/components/events/Series.tsx
+++ b/src/components/events/Series.tsx
@@ -163,15 +163,6 @@ const Series = ({
 		<>
 			<Header />
 			<NavBar>
-				<div className="btn-group">
-					{hasAccess("ROLE_UI_SERIES_CREATE", user) && (
-						<button className="add" onClick={() => showNewSeriesModal()}>
-							<i className="fa fa-plus" />
-							<span>{t("EVENTS.EVENTS.ADD_SERIES")}</span>
-						</button>
-					)}
-				</div>
-
 				{/* Display modal for new series if add series button is clicked */}
 				<NewResourceModal
 					showModal={displayNewSeriesModal}
@@ -206,6 +197,15 @@ const Series = ({
 						</Link>
 					)}
 				</nav>
+				
+				<div className="btn-group">
+					{hasAccess("ROLE_UI_SERIES_CREATE", user) && (
+						<button className="add" onClick={() => showNewSeriesModal()}>
+							<i className="fa fa-plus" />
+							<span>{t("EVENTS.EVENTS.ADD_SERIES")}</span>
+						</button>
+					)}
+				</div>
 			</NavBar>
 
 			<MainView open={displayNavigation}>
diff --git a/src/components/events/partials/ModalTabsAndPages/EventDetailsAccessPolicyTab.tsx b/src/components/events/partials/ModalTabsAndPages/EventDetailsAccessPolicyTab.tsx
index b22fb56e90..3ea781cc16 100644
--- a/src/components/events/partials/ModalTabsAndPages/EventDetailsAccessPolicyTab.tsx
+++ b/src/components/events/partials/ModalTabsAndPages/EventDetailsAccessPolicyTab.tsx
@@ -34,7 +34,7 @@ const EventDetailsAccessPolicyTab = ({
 	const fetchHasActiveTransactionsWrapper = async(eventId: any) => {
 		return await dispatch(fetchHasActiveTransactions(eventId)).then(unwrapResult);
 	}
-	const saveNewAccessPoliciesWrapper = async(eventId: any, policies: any) => {
+	const saveNewAccessPoliciesWrapper = (eventId: any, policies: any) => {
 		return dispatch(saveAccessPolicies({eventId, policies}));
 	}
 
diff --git a/src/components/events/partials/ModalTabsAndPages/NewSourcePage.tsx b/src/components/events/partials/ModalTabsAndPages/NewSourcePage.tsx
index bc960a158d..19741e27b5 100644
--- a/src/components/events/partials/ModalTabsAndPages/NewSourcePage.tsx
+++ b/src/components/events/partials/ModalTabsAndPages/NewSourcePage.tsx
@@ -318,6 +318,7 @@ const Upload = ({ formik }) => {
 											</td>
 											<td className="fit">
 												<button
+													style={{ visibility: asset.file ? "visible" : "hidden" }}
 													className="button-like-anchor remove"
 													onClick={(e) => {
 														formik.setFieldValue(
@@ -433,7 +434,7 @@ const Schedule = <T extends {
 									value={typeof formik.values.scheduleStartDate === "string" ? parseISO(formik.values.scheduleStartDate): formik.values.scheduleStartDate}
 									onChange={(value) => {
 										if (formik.values.sourceMode === "SCHEDULE_MULTIPLE") {
-											changeStartDateMultiple(
+											value && changeStartDateMultiple(
 												value,
 												formik.values,
 												formik.setFieldValue
@@ -464,7 +465,7 @@ const Schedule = <T extends {
 											name="scheduleEndDate"
 											value={typeof formik.values.scheduleEndDate === "string" ? parseISO(formik.values.scheduleEndDate) : formik.values.scheduleEndDate}
 											onChange={(value) =>
-												changeEndDateMultiple(
+												value && changeEndDateMultiple(
 													value,
 													formik.values,
 													formik.setFieldValue
diff --git a/src/components/events/partials/ModalTabsAndPages/SeriesDetailsAccessTab.tsx b/src/components/events/partials/ModalTabsAndPages/SeriesDetailsAccessTab.tsx
index f9d73c0e6c..baa432e8f0 100644
--- a/src/components/events/partials/ModalTabsAndPages/SeriesDetailsAccessTab.tsx
+++ b/src/components/events/partials/ModalTabsAndPages/SeriesDetailsAccessTab.tsx
@@ -31,8 +31,8 @@ const SeriesDetailsAccessTab = ({
 	const fetchSeriesDetailsAclsWrapper = (id: any) => {
 		dispatch(fetchSeriesDetailsAcls(id));
 	}
-	const updateSeriesAccessWrapper = async (id: any, policies: any) => {
-		dispatch(updateSeriesAccess({id, policies}));
+	const updateSeriesAccessWrapper = (id: any, policies: any) => {
+		return dispatch(updateSeriesAccess({id, policies}));
 	}
 
 	useEffect(() => {
diff --git a/src/components/events/partials/modals/StartTaskModal.tsx b/src/components/events/partials/modals/StartTaskModal.tsx
index fdc7c0e772..a2fedd9e9e 100644
--- a/src/components/events/partials/modals/StartTaskModal.tsx
+++ b/src/components/events/partials/modals/StartTaskModal.tsx
@@ -8,6 +8,7 @@ import StartTaskGeneralPage from "../ModalTabsAndPages/StartTaskGeneralPage";
 import StartTaskWorkflowPage from "../ModalTabsAndPages/StartTaskWorkflowPage";
 import StartTaskSummaryPage from "../ModalTabsAndPages/StartTaskSummaryPage";
 import { postTasks } from "../../../../thunks/taskThunks";
+import { changeAllSelected } from "../../../../thunks/tableThunks";
 import { usePageFunctions } from "../../../../hooks/wizardHooks";
 import { checkValidityStartTaskEventSelection } from "../../../../utils/bulkActionUtils";
 import { useHotkeys } from "react-hotkeys-hook";
@@ -17,8 +18,9 @@ import { availableHotkeys } from "../../../../configs/hotkeysConfig";
  * This component manages the pages of the task start bulk action
  */
 const StartTaskModal = ({
-    close,
-    postTasks
+	close,
+	postTasks,
+	changeAllSelected
 }: any) => {
 	const { t } = useTranslation();
 
@@ -79,6 +81,7 @@ const StartTaskModal = ({
 // @ts-expect-error TS(7006): Parameter 'values' implicitly has an 'any' type.
 	const handleSubmit = (values) => {
 		postTasks(values);
+		changeAllSelected(false);
 		close();
 	};
 
@@ -153,6 +156,8 @@ const StartTaskModal = ({
 const mapDispatchToState = (dispatch) => ({
 // @ts-expect-error TS(7006): Parameter 'values' implicitly has an 'any' type.
 	postTasks: (values) => dispatch(postTasks(values)),
+	// @ts-expect-error TS(7006): Parameter 'values' implicitly has an 'any' type.
+	changeAllSelected: (selected) => dispatch(changeAllSelected(selected)),
 });
 
 export default connect(null, mapDispatchToState)(StartTaskModal);
diff --git a/src/components/shared/BarChart.tsx b/src/components/shared/BarChart.tsx
index 6baf66015b..0048451498 100644
--- a/src/components/shared/BarChart.tsx
+++ b/src/components/shared/BarChart.tsx
@@ -1,14 +1,19 @@
 import React from "react";
 import { Bar } from "react-chartjs-2";
+import type { ChartDataset, ChartOptions } from 'chart.js';
 
 /**
  * This component provides a bar chart for visualising (statistics) data
  */
 const BarChart = ({
-    values,
-    axisLabels,
-    options
-}: any) => {
+	values,
+	axisLabels,
+	options
+}: {
+	values: ChartDataset<'bar'>,
+	axisLabels: string[],
+	options: ChartOptions<'bar'>,
+}) => {
 	const data = {
 		labels: axisLabels,
 		datasets: [
diff --git a/src/components/shared/DropDown.tsx b/src/components/shared/DropDown.tsx
index 12982eaefe..c9fc7c94d0 100644
--- a/src/components/shared/DropDown.tsx
+++ b/src/components/shared/DropDown.tsx
@@ -19,19 +19,6 @@ import Select from "react-select";
  */
 export type DropDownType = "language" | "isPartOf" | "license" | "captureAgent" | "aclRole" | "workflow" | "aclTemplate" | "newTheme" | "comment" | "theme" | "time";
 
-// type DPTime = {
-// 	index: number,
-// 	value: string,
-// }
-// type DPCaptureAgent = any;
-// type DPComment = string[];
-// type DPWorkflow = Workflow[];
-// type DPAclTemplate = never[];
-// type DPAclRole = any;
-// type DPNewTheme = Theme[];
-// type DPTheme = any;
-
-
 /**
  * This component provides a bar chart for visualising (statistics) data
  */
@@ -69,7 +56,7 @@ const DropDown = <T,>({
 	return (
 		<Select
 			tabIndex={tabIndex}
-			theme={dropDownSpacingTheme}
+			theme={(theme) => (dropDownSpacingTheme(theme))}
 			styles={style}
 			defaultMenuIsOpen={defaultOpen}
 			autoFocus={autoFocus}
@@ -85,7 +72,7 @@ const DropDown = <T,>({
 			placeholder={placeholder}
 			noOptionsMessage={() => "No matching results."}
 			onInputChange={(value) => setSearch(value)}
-			onChange={(element) => handleChange(element)}
+			onChange={(element) => handleChange(element as {value: T, label: string} )}
 			isDisabled={disabled}
 		/>
 	);
diff --git a/src/components/shared/MainNav.tsx b/src/components/shared/MainNav.tsx
index 53ef96a5cf..2ed243d1de 100644
--- a/src/components/shared/MainNav.tsx
+++ b/src/components/shared/MainNav.tsx
@@ -234,11 +234,11 @@ const MainNav = ({
 	return (
 		<>
 			<div className="menu-top" >
-				<Tooltip title={t("HOTKEYS.DESCRIPTIONS.GENERAL.MAIN_MENU")}>
-					<button className="button-like-anchor" onClick={() => toggleMenu()}>
+				<button className="button-like-anchor" onClick={() => toggleMenu()}>
+					<Tooltip title={t("HOTKEYS.DESCRIPTIONS.GENERAL.MAIN_MENU")} placement={"right"}>
 						<i className="fa fa-bars" />
-					</button>
-				</Tooltip>
+					</Tooltip>
+				</button>
 				{isOpen && (
 					<nav id="roll-up-menu">
 						<div id="nav-container">
diff --git a/src/components/shared/RegistrationModal.tsx b/src/components/shared/RegistrationModal.tsx
index 2a12ba7351..ba22d4b493 100644
--- a/src/components/shared/RegistrationModal.tsx
+++ b/src/components/shared/RegistrationModal.tsx
@@ -6,6 +6,7 @@ import { countries, states } from "../../configs/adopterRegistrationConfig";
 import cn from "classnames";
 import { AdopterRegistrationSchema } from "../../utils/validate";
 import {
+	Registration,
 	deleteAdopterRegistration,
 	fetchAdopterRegistration,
 	postRegistration,
@@ -16,14 +17,33 @@ import { availableHotkeys } from "../../configs/hotkeysConfig";
 /**
  * This component renders the adopter registration modal. This modal has various states.
  */
-// @ts-expect-error TS(7031): Binding element 'close' implicitly has an 'any' ty... Remove this comment to see the full error message
-const RegistrationModal = ({ close }) => {
+const RegistrationModal = ({
+	close
+}: {
+	close: () => void
+}) => {
 	const { t } = useTranslation();
 
 	// current state of the modal that is shown
-	const [state, setState] = useState("form");
+	const [state, setState] = useState<keyof typeof states>("form");
 	// initial values for Formik
-	const [initialValues, setInitialValues] = useState({});
+	const [initialValues, setInitialValues] = useState<Registration & { agreedToPolicy: boolean, registered: boolean }>({
+		contactMe: false,
+		allowsStatistics: false,
+		allowsErrorReports: false,
+		organisationName: "",
+		departmentName: "",
+		country: "",
+		postalCode: "",
+		city: "",
+		firstName: "",
+		lastName: "",
+		street: "",
+		streetNo: "",
+		email: "",
+		agreedToPolicy: false,
+		registered: false,
+	});
 
 	useHotkeys(
 		availableHotkeys.general.CLOSE_MODAL.sequence,
@@ -45,8 +65,7 @@ const RegistrationModal = ({ close }) => {
 		if (state === "delete_submit") {
 			await resetRegistrationData();
 		} else {
-// @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
-			setState(states[state].nextState[1]);
+			setState(states[state].nextState[1] as keyof typeof states);
 		}
 	};
 
@@ -57,19 +76,16 @@ const RegistrationModal = ({ close }) => {
 		setInitialValues(registrationInfo);
 	};
 
-// @ts-expect-error TS(7006): Parameter 'values' implicitly has an 'any' type.
-	const handleSubmit = (values) => {
+	const handleSubmit = (values: Registration) => {
 		// post request for adopter information
 		postRegistration(values)
 			.then(() => {
 				// show thank you state
-// @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
-				return setState(states[state].nextState[0]);
+				return setState(states[state].nextState[0] as keyof typeof states);
 			})
 			.catch(() => {
 				// show error state
-// @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
-				return setState(states[state].nextState[1]);
+				return setState(states[state].nextState[1] as keyof typeof states);
 			});
 	};
 
@@ -78,13 +94,11 @@ const RegistrationModal = ({ close }) => {
 		deleteAdopterRegistration()
 			.then(() => {
 				// show thank you state
-// @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
-				return setState(states[state].nextState[0]);
+				return setState(states[state].nextState[0] as keyof typeof states);
 			})
 			.catch(() => {
 				// show error state
-// @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
-				return setState(states[state].nextState[1]);
+				return setState(states[state].nextState[1] as keyof typeof states);
 			});
 	};
 
@@ -289,7 +303,6 @@ const RegistrationModal = ({ close }) => {
 																className="form-control-placeholder"
 																htmlFor="adopter_organisation"
 																style={
-// @ts-expect-error TS(2339): Property 'organisationName' does not exist on type... Remove this comment to see the full error message
 																	formik.values.organisationName
 																		? styleWithContent
 																		: {}
@@ -313,7 +326,6 @@ const RegistrationModal = ({ close }) => {
 																className="form-control-placeholder"
 																htmlFor="adopter_department"
 																style={
-// @ts-expect-error TS(2339): Property 'departmentName' does not exist on type '... Remove this comment to see the full error message
 																	formik.values.departmentName
 																		? styleWithContent
 																		: {}
@@ -347,7 +359,6 @@ const RegistrationModal = ({ close }) => {
 																className="form-control-placeholder"
 																htmlFor="adopter_country"
 																style={
-// @ts-expect-error TS(2339): Property 'country' does not exist on type '{}'.
 																	formik.values.country ? styleWithContent : {}
 																}
 															>
@@ -370,7 +381,6 @@ const RegistrationModal = ({ close }) => {
 																	className="form-control-placeholder"
 																	htmlFor="adopter_postalcode"
 																	style={
-// @ts-expect-error TS(2339): Property 'postalCode' does not exist on type '{}'.
 																		formik.values.postalCode
 																			? styleWithContent
 																			: {}
@@ -392,7 +402,6 @@ const RegistrationModal = ({ close }) => {
 																	className="form-control-placeholder"
 																	htmlFor="adopter_city"
 																	style={
-// @ts-expect-error TS(2339): Property 'city' does not exist on type '{}'.
 																		formik.values.city ? styleWithContent : {}
 																	}
 																>
@@ -424,7 +433,6 @@ const RegistrationModal = ({ close }) => {
 																className="form-control-placeholder"
 																htmlFor="adopter_firstname"
 																style={
-// @ts-expect-error TS(2339): Property 'firstName' does not exist on type '{}'.
 																	formik.values.firstName
 																		? styleWithContent
 																		: {}
@@ -448,7 +456,6 @@ const RegistrationModal = ({ close }) => {
 																className="form-control-placeholder"
 																htmlFor="adopter_lastname"
 																style={
-// @ts-expect-error TS(2339): Property 'lastName' does not exist on type '{}'.
 																	formik.values.lastName ? styleWithContent : {}
 																}
 															>
@@ -472,7 +479,6 @@ const RegistrationModal = ({ close }) => {
 																className="form-control-placeholder"
 																htmlFor="adopter_street"
 																style={
-// @ts-expect-error TS(2339): Property 'street' does not exist on type '{}'.
 																	formik.values.street ? styleWithContent : {}
 																}
 															>
@@ -494,7 +500,6 @@ const RegistrationModal = ({ close }) => {
 																className="form-control-placeholder"
 																htmlFor="adopter_streetnumber"
 																style={
-// @ts-expect-error TS(2339): Property 'streetNo' does not exist on type '{}'.
 																	formik.values.streetNo ? styleWithContent : {}
 																}
 															>
@@ -518,7 +523,6 @@ const RegistrationModal = ({ close }) => {
 																className="form-control-placeholder"
 																htmlFor="adopter_emailadr"
 																style={
-// @ts-expect-error TS(2339): Property 'email' does not exist on type '{}'.
 																	formik.values.email ? styleWithContent : {}
 																}
 															>
@@ -600,7 +604,7 @@ const RegistrationModal = ({ close }) => {
 														<span
 															className="link"
 															onClick={() =>
-																setState(states[state].nextState[2])
+																setState(states[state].nextState[2] as keyof typeof states)
 															}
 														>
 															{t(
@@ -622,23 +626,19 @@ const RegistrationModal = ({ close }) => {
 
 							{/* navigation buttons depending on state of modal */}
 							<footer>
-{/* @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message */}
 								{states[state].buttons.submit && (
 									<div className="pull-right">
 										{/* submit of form content */}
 										{state === "form" ? (
 											<button
 												disabled={
-// @ts-expect-error TS(2339): Property 'agreedToPolicy' does not exist on type '... Remove this comment to see the full error message
 													!(formik.isValid && formik.values.agreedToPolicy)
 												}
 												onClick={() => formik.handleSubmit()}
 												className={cn("submit", {
 													active:
-// @ts-expect-error TS(2339): Property 'agreedToPolicy' does not exist on type '... Remove this comment to see the full error message
 														formik.isValid && formik.values.agreedToPolicy,
 													inactive: !(
-// @ts-expect-error TS(2339): Property 'agreedToPolicy' does not exist on type '... Remove this comment to see the full error message
 														formik.isValid && formik.values.agreedToPolicy
 													),
 												})}
@@ -651,7 +651,6 @@ const RegistrationModal = ({ close }) => {
 												className="continue-registration"
 												onClick={() => onClickContinue()}
 											>
-{/* @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message */}
 												{t(states[state].buttons.submitButtonText)}
 											</button>
 										)}
@@ -660,7 +659,6 @@ const RegistrationModal = ({ close }) => {
 
 								{/* back, delete or cancel button depending on state */}
 								<div className="pull-left">
-{/* @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message */}
 									{state !== "form" && states[state].buttons.back && (
 										<button
 											className="cancel"
@@ -670,16 +668,14 @@ const RegistrationModal = ({ close }) => {
 											{t("ADOPTER_REGISTRATION.MODAL.BACK")}
 										</button>
 									)}
-{/* @ts-expect-error TS(2339): Property 'registered' does not exist on type '{}'. */}
 									{state === "form" && formik.values.registered && (
 										<button
 											className="danger"
-											onClick={() => setState(states[state].nextState[4])}
+											onClick={() => setState(states[state].nextState[4] as keyof typeof states)}
 										>
 											{t("WIZARD.DELETE")}
 										</button>
 									)}
-{/* @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message */}
 									{states[state].buttons.skip && (
 										<button
 											className="cancel"
diff --git a/src/components/shared/Stats.tsx b/src/components/shared/Stats.tsx
index 8ca7ee2de3..aa267ea7b1 100644
--- a/src/components/shared/Stats.tsx
+++ b/src/components/shared/Stats.tsx
@@ -10,7 +10,6 @@ import { connect } from "react-redux";
 import { loadEventsIntoTable } from "../../thunks/tableThunks";
 import { useAppDispatch, useAppSelector } from "../../store";
 import { fetchEvents } from "../../slices/eventSlice";
-import { Tooltip } from "./Tooltip";
 
 /**
  * This component renders the status bar of the event view and filters depending on these
@@ -59,25 +58,20 @@ const Stats = ({
 				{/* Show one counter for each status */}
 				{stats.map((st, key) => (
 					<div className="col" key={key}>
-						<Tooltip title={t(st.description)}>
-							<button
-								className="stat"
-								onClick={() => showStatsFilter(st)}
-							>
-								<h1>{st.count}</h1>
-								{/* Show the description of the status, if defined,
-                        	    else show name of filter and its value*/}
-								{!!st.description ? (
-									<span>{t(st.description)}</span>
-								) : (
-									st.filters.map((filter, key) => (
-										<span key={key}>
-											{t(filter.filter)}: {t(filter.value)}
-										</span>
-									))
-								)}
-							</button>
-						</Tooltip>
+						<button className="stat" onClick={() => showStatsFilter(st)}>
+							<h1>{st.count}</h1>
+							{/* Show the description of the status, if defined,
+								else show name of filter and its value*/}
+							{!!st.description ? (
+								<span>{t(st.description)}</span>
+							) : (
+								st.filters.map((filter, key) => (
+									<span key={key}>
+										{t(filter.filter)}: {t(filter.value)}
+									</span>
+								))
+							)}
+						</button>
 					</div>
 				))}
 			</div>
diff --git a/src/components/shared/TimeSeriesStatistics.tsx b/src/components/shared/TimeSeriesStatistics.tsx
index ee1b2d9e13..35b98231d8 100644
--- a/src/components/shared/TimeSeriesStatistics.tsx
+++ b/src/components/shared/TimeSeriesStatistics.tsx
@@ -160,7 +160,7 @@ const TimeSeriesStatistics = ({
 	// format selected time to display as name of timeframe
 // @ts-expect-error TS(7006): Parameter 'from' implicitly has an 'any' type.
 	const formatSelectedTimeframeName = (from, timeMode) => {
-		return localizedMoment(from, currentLanguage).format(
+		return localizedMoment(from, currentLanguage ? currentLanguage.dateLocale.code : "en").format(
 // @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
 			formatStrings[timeMode]
 		);
diff --git a/src/components/shared/modals/ResourceDetailsAccessPolicyTab.tsx b/src/components/shared/modals/ResourceDetailsAccessPolicyTab.tsx
index 8b72d0be4d..130c318d15 100644
--- a/src/components/shared/modals/ResourceDetailsAccessPolicyTab.tsx
+++ b/src/components/shared/modals/ResourceDetailsAccessPolicyTab.tsx
@@ -177,13 +177,13 @@ const ResourceDetailsAccessPolicyTab = ({
 
 	/* checks validity of the policies
 	 * each policy needs a role and at least one of: read-rights, write-rights, additional action
-	 * there needs to be at least one role, which has both read and write rights */
+	 * if not admin, there needs to be at least one role, which has both read and write rights */
 	const validatePolicies = (values: { policies: TransformedAcl[] }) => {
 		let roleWithFullRightsExists = false;
 		let allRulesValid = true;
 
 		values.policies.forEach((policy) => {
-			if (policy.read && policy.write) {
+			if ((policy.read && policy.write) || user.isAdmin) {
 				roleWithFullRightsExists = true;
 			}
 
diff --git a/src/components/shared/wizard/WizardStepper.tsx b/src/components/shared/wizard/WizardStepper.tsx
index ad2b1cf99e..e2a127f64e 100644
--- a/src/components/shared/wizard/WizardStepper.tsx
+++ b/src/components/shared/wizard/WizardStepper.tsx
@@ -1,3 +1,4 @@
+import React from "react";
 import { useTranslation } from "react-i18next";
 import cn from "classnames";
 import { Step, StepButton, StepLabel, Stepper } from "@mui/material";
@@ -63,9 +64,8 @@ const WizardStepper = ({
 			activeStep={page}
 			nonLinear
 			alternativeLabel
-// @ts-expect-error TS(2322): Type 'boolean' is not assignable to type 'ReactEle... Remove this comment to see the full error message
-			connector={false}
-			sx={stepperStyle.root }
+			connector={<></>}
+			sx={stepperStyle.root}
 			className={cn("step-by-step")}
 		>
 			{steps.map((label, key) =>
@@ -77,7 +77,7 @@ const WizardStepper = ({
 							</StepLabel>
 						</StepButton>
 					</Step>
-				) : <></>
+				) : <React.Fragment key={label.translation} />
 			)}
 		</Stepper>
 	);
diff --git a/src/components/users/Acls.tsx b/src/components/users/Acls.tsx
index 8461f9abb7..afda3f9d10 100644
--- a/src/components/users/Acls.tsx
+++ b/src/components/users/Acls.tsx
@@ -105,16 +105,6 @@ const Acls: React.FC = () => {
 		<>
 			<Header />
 			<NavBar>
-				{/* Add acl button */}
-				<div className="btn-group">
-					{hasAccess("ROLE_UI_ACLS_CREATE", user) && (
-						<button className="add" onClick={() => showNewAclModal()}>
-							<i className="fa fa-plus" />
-							<span>{t("USERS.ACTIONS.ADD_ACL")}</span>
-						</button>
-					)}
-				</div>
-
 				{/* Display modal for new acl if add acl button is clicked */}
 				<NewResourceModal
 					showModal={displayNewAclModal}
@@ -154,6 +144,16 @@ const Acls: React.FC = () => {
 						</Link>
 					)}
 				</nav>
+				
+				{/* Add acl button */}
+				<div className="btn-group">
+					{hasAccess("ROLE_UI_ACLS_CREATE", user) && (
+						<button className="add" onClick={() => showNewAclModal()}>
+							<i className="fa fa-plus" />
+							<span>{t("USERS.ACTIONS.ADD_ACL")}</span>
+						</button>
+					)}
+				</div>
 			</NavBar>
 
 			<MainView open={displayNavigation}>
diff --git a/src/components/users/Groups.tsx b/src/components/users/Groups.tsx
index 600a17bf1e..5f10700310 100644
--- a/src/components/users/Groups.tsx
+++ b/src/components/users/Groups.tsx
@@ -120,16 +120,6 @@ const Groups = ({
 		<>
 			<Header />
 			<NavBar>
-				{/* Add group button */}
-				<div className="btn-group">
-					{hasAccess("ROLE_UI_GROUPS_CREATE", user) && (
-						<button className="add" onClick={() => showNewGroupModal()}>
-							<i className="fa fa-plus" />
-							<span>{t("USERS.ACTIONS.ADD_GROUP")}</span>
-						</button>
-					)}
-				</div>
-
 				{/* Display modal for new acl if add acl button is clicked */}
 				<NewResourceModal
 					showModal={displayNewGroupModal}
@@ -169,6 +159,16 @@ const Groups = ({
 						</Link>
 					)}
 				</nav>
+				
+				{/* Add group button */}
+				<div className="btn-group">
+					{hasAccess("ROLE_UI_GROUPS_CREATE", user) && (
+						<button className="add" onClick={() => showNewGroupModal()}>
+							<i className="fa fa-plus" />
+							<span>{t("USERS.ACTIONS.ADD_GROUP")}</span>
+						</button>
+					)}
+				</div>
 			</NavBar>
 
 			<MainView open={displayNavigation}>
diff --git a/src/components/users/Users.tsx b/src/components/users/Users.tsx
index c90424b8db..67b21af14c 100644
--- a/src/components/users/Users.tsx
+++ b/src/components/users/Users.tsx
@@ -110,16 +110,6 @@ const Users: React.FC = () => {
 		<>
 			<Header />
 			<NavBar>
-				{/* Add user button */}
-				<div className="btn-group">
-					{hasAccess("ROLE_UI_USERS_CREATE", user) && (
-						<button className="add" onClick={() => showNewUserModal()}>
-							<i className="fa fa-plus" />
-							<span>{t("USERS.ACTIONS.ADD_USER")}</span>
-						</button>
-					)}
-				</div>
-
 				{/* Display modal for new acl if add acl button is clicked */}
 				<NewResourceModal
 					showModal={displayNewUserModal}
@@ -159,6 +149,16 @@ const Users: React.FC = () => {
 						</Link>
 					)}
 				</nav>
+				
+				{/* Add user button */}
+				<div className="btn-group">
+					{hasAccess("ROLE_UI_USERS_CREATE", user) && (
+						<button className="add" onClick={() => showNewUserModal()}>
+							<i className="fa fa-plus" />
+							<span>{t("USERS.ACTIONS.ADD_USER")}</span>
+						</button>
+					)}
+				</div>
 			</NavBar>
 
 			<MainView open={displayNavigation}>
diff --git a/src/components/users/partials/modal/UserDetails.tsx b/src/components/users/partials/modal/UserDetails.tsx
index ee5f984a3e..c78a57b023 100644
--- a/src/components/users/partials/modal/UserDetails.tsx
+++ b/src/components/users/partials/modal/UserDetails.tsx
@@ -9,7 +9,7 @@ import EditUserGeneralTab from "../wizard/EditUserGeneralTab";
 import UserEffectiveRolesTab from "../wizard/UserEffectiveRolesTab";
 import ModalNavigation from "../../../shared/modals/ModalNavigation";
 import { useAppDispatch, useAppSelector } from "../../../../store";
-import { updateUserDetails } from "../../../../slices/userDetailsSlice";
+import { UpdateUser, updateUserDetails } from "../../../../slices/userDetailsSlice";
 
 /**
  * This component manages the pages of the user details
@@ -29,6 +29,7 @@ const UserDetails: React.FC<{
 	const initialValues = {
 		...userDetails,
 		password: "",
+		passwordConfirmation: "",
 	};
 
 	// information about tabs
@@ -50,13 +51,11 @@ const UserDetails: React.FC<{
 		},
 	];
 
-// @ts-expect-error TS(7006): Parameter 'tabNr' implicitly has an 'any' type.
-	const openTab = (tabNr) => {
+	const openTab = (tabNr: number) => {
 		setPage(tabNr);
 	};
 
-// @ts-expect-error TS(7006): Parameter 'values' implicitly has an 'any' type.
-	const handleSubmit = (values) => {
+	const handleSubmit = (values: UpdateUser) => {
 		dispatch(updateUserDetails({values: values, username: userDetails.username}));
 		close();
 	};
diff --git a/src/components/users/partials/modal/UserDetailsModal.tsx b/src/components/users/partials/modal/UserDetailsModal.tsx
index 82529bcb48..ec6f264887 100644
--- a/src/components/users/partials/modal/UserDetailsModal.tsx
+++ b/src/components/users/partials/modal/UserDetailsModal.tsx
@@ -8,9 +8,12 @@ import { availableHotkeys } from "../../../../configs/hotkeysConfig";
  * This component renders the modal for displaying user details
  */
 const UserDetailsModal = ({
-    close,
-    username
-}: any) => {
+	close,
+	username
+}: {
+	close: () => void,
+	username: string,
+}) => {
 	const { t } = useTranslation();
 
 	useHotkeys(
diff --git a/src/components/users/partials/wizard/EditUserGeneralTab.tsx b/src/components/users/partials/wizard/EditUserGeneralTab.tsx
index 220f4aa906..8f3c5d4082 100644
--- a/src/components/users/partials/wizard/EditUserGeneralTab.tsx
+++ b/src/components/users/partials/wizard/EditUserGeneralTab.tsx
@@ -1,14 +1,25 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
 import cn from "classnames";
-import { Field } from "formik";
+import { Field, FormikProps } from "formik";
 
 /**
  * This component renders the general user information tab in the users details modal.
  */
-const EditUserGeneralTab = ({
-    formik
-}: any) => {
+interface RequiredFormProps {
+	manageable: boolean,
+	username: string,
+	name: string,
+	email: string,
+	password: string,
+	passwordConfirmation: string,
+}
+
+const EditUserGeneralTab = <T extends RequiredFormProps>({
+	formik
+}: {
+	formik: FormikProps<T>
+}) => {
 	const { t } = useTranslation();
 
 	// style used in user details modal
diff --git a/src/components/users/partials/wizard/NewUserGeneralTab.tsx b/src/components/users/partials/wizard/NewUserGeneralTab.tsx
index 17177d27c9..6136e405d3 100644
--- a/src/components/users/partials/wizard/NewUserGeneralTab.tsx
+++ b/src/components/users/partials/wizard/NewUserGeneralTab.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { Field } from "formik";
+import { Field, FormikProps } from "formik";
 import Notifications from "../../../shared/Notifications";
 import { useTranslation } from "react-i18next";
 import cn from "classnames";
@@ -7,9 +7,19 @@ import cn from "classnames";
 /**
  * This component renders the general user information tab for new users in the new users wizard.
  */
-const NewUserGeneralTab = ({
-    formik
-}: any) => {
+interface RequiredFormProps {
+	username: string,
+	name: string,
+	email: string,
+	password: string,
+	passwordConfirmation: string,
+}
+
+const NewUserGeneralTab = <T extends RequiredFormProps>({
+	formik
+}: {
+	formik: FormikProps<T>
+}) => {
 	const { t } = useTranslation();
 
 	return (
diff --git a/src/components/users/partials/wizard/NewUserWizard.tsx b/src/components/users/partials/wizard/NewUserWizard.tsx
index c9fc403c9a..7047933efb 100644
--- a/src/components/users/partials/wizard/NewUserWizard.tsx
+++ b/src/components/users/partials/wizard/NewUserWizard.tsx
@@ -7,7 +7,7 @@ import UserRolesTab from "./UserRolesTab";
 import { initialFormValuesNewUser } from "../../../../configs/modalConfig";
 import { getUsernames } from "../../../../selectors/userSelectors";
 import { NewUserSchema } from "../../../../utils/validate";
-import { postNewUser } from "../../../../slices/userSlice";
+import { NewUser, postNewUser } from "../../../../slices/userSlice";
 import { useAppDispatch, useAppSelector } from "../../../../store";
 import { Tooltip } from "../../../shared/Tooltip";
 
@@ -36,8 +36,7 @@ const NewUserWizard = ({
 		setTab(tabNr);
 	};
 
-// @ts-expect-error TS(7006): Parameter 'values' implicitly has an 'any' type.
-	const handleSubmit = (values) => {
+	const handleSubmit = (values: NewUser) => {
 		const response = dispatch(postNewUser(values));
 		console.info(response);
 		close();
diff --git a/src/components/users/partials/wizard/UserEffectiveRolesTab.tsx b/src/components/users/partials/wizard/UserEffectiveRolesTab.tsx
index daf9f40408..8d58cd1800 100644
--- a/src/components/users/partials/wizard/UserEffectiveRolesTab.tsx
+++ b/src/components/users/partials/wizard/UserEffectiveRolesTab.tsx
@@ -1,12 +1,21 @@
+import { FormikProps } from "formik";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 
 /**
  * This component renders the effective role tab of the user details modal
  */
-const UserEffectiveRolesTab = ({
-    formik
-}: any) => {
+interface RequiredFormProps {
+	roles: {
+		name: string
+	}[]
+}
+
+const UserEffectiveRolesTab = <T extends RequiredFormProps>({
+	formik
+}: {
+	formik: FormikProps<T>
+}) => {
 	const { t } = useTranslation();
 
 	const [searchField, setSearchField] = useState("");
@@ -18,9 +27,7 @@ const UserEffectiveRolesTab = ({
 		setItems(defaultItems);
 	};
 
-// @ts-expect-error TS(7006): Parameter 'input' implicitly has an 'any' type.
-	const handleChangeSearch = async (input) => {
-// @ts-expect-error TS(7006): Parameter 'item' implicitly has an 'any' type.
+	const handleChangeSearch = async (input: string) => {
 		const filtered = defaultItems.filter((item) => {
 			return item.name.toLowerCase().includes(input.toLowerCase());
 		});
@@ -47,7 +54,6 @@ const UserEffectiveRolesTab = ({
 					/>
 
 					<select multiple style={{ height: "26em" }}>
-{/* @ts-expect-error TS(7006): Parameter 'item' implicitly has an 'any' type. */}
 						{items.map((item, key) => (
 							<option key={key} value={item.name}>
 								{item.name}
diff --git a/src/components/users/partials/wizard/UserRolesTab.tsx b/src/components/users/partials/wizard/UserRolesTab.tsx
index 03870b30ff..7d1c500598 100644
--- a/src/components/users/partials/wizard/UserRolesTab.tsx
+++ b/src/components/users/partials/wizard/UserRolesTab.tsx
@@ -1,13 +1,20 @@
 import React, { useEffect, useState } from "react";
 import { Role, fetchRolesWithTarget } from "../../../../slices/aclSlice";
 import SelectContainer from "../../../shared/wizard/SelectContainer";
+import { FormikProps } from "formik";
 
 /**
  * This component renders the role selection tab of the new user wizard and the user details modal
  */
-const UserRolesTab = ({
-    formik
-}: any) => {
+interface RequiredFormProps {
+	manageable: boolean,
+}
+
+const UserRolesTab = <T extends RequiredFormProps>({
+	formik
+}: {
+	formik: FormikProps<T>
+}) => {
 	// roles that can be chosen by user
 	const [roles, setRoles] = useState<Role[]>([]);
 	// flag for API call
diff --git a/src/configs/adopterRegistrationConfig.ts b/src/configs/adopterRegistrationConfig.ts
index fe12b82ff4..ecf1197ec0 100644
--- a/src/configs/adopterRegistrationConfig.ts
+++ b/src/configs/adopterRegistrationConfig.ts
@@ -42,7 +42,7 @@ export const states = {
 			back: false,
 			skip: false,
 			close: false,
-			submitButtonText: null,
+			submitButtonText: "",
 		},
 	},
 	update: {
@@ -55,7 +55,7 @@ export const states = {
 			back: false,
 			skip: false,
 			close: false,
-			submitButtonText: null,
+			submitButtonText: "",
 		},
 	},
 	delete_submit: {
@@ -82,7 +82,7 @@ export const states = {
 			back: false,
 			skip: false,
 			close: false,
-			submitButtonText: null,
+			submitButtonText: "",
 		},
 	},
 	thank_you: {
@@ -95,19 +95,20 @@ export const states = {
 			back: false,
 			skip: false,
 			close: true,
-			submitButtonText: null,
+			submitButtonText: "",
 		},
 	},
 	error: {
 		nextState: {
 			0: "close",
+			1: "error",
 		},
 		buttons: {
 			submit: false,
 			back: false,
 			skip: false,
 			close: true,
-			submitButtonText: null,
+			submitButtonText: "",
 		},
 	},
 	skip: {
@@ -120,7 +121,7 @@ export const states = {
 			back: false,
 			skip: false,
 			close: true,
-			submitButtonText: null,
+			submitButtonText: "",
 		},
 	},
 	legal_info: {
@@ -134,7 +135,7 @@ export const states = {
 			back: true,
 			skip: false,
 			close: true,
-			submitButtonText: null,
+			submitButtonText: "",
 		},
 	},
 };
diff --git a/src/configs/modalConfig.ts b/src/configs/modalConfig.ts
index 4ba5c04dd8..6160ecf944 100644
--- a/src/configs/modalConfig.ts
+++ b/src/configs/modalConfig.ts
@@ -3,6 +3,7 @@
 import { initArray } from "../utils/utils";
 import { EditedEvents, Event, UploadAssetsTrack } from "../slices/eventSlice";
 import { TransformedAcl } from "../slices/aclDetailsSlice";
+import { Role } from "../slices/aclSlice";
 
 // Context for notifications shown in modals
 export const NOTIFICATION_CONTEXT = "modal-form";
@@ -148,7 +149,8 @@ export const initialFormValuesNewUser: {
 	email: string,
 	password: string,
 	passwordConfirmation: string,
-	roles: string[],
+	roles: Role[],
+	manageable: boolean,
 } = {
 	username: "",
 	name: "",
@@ -156,6 +158,7 @@ export const initialFormValuesNewUser: {
 	password: "",
 	passwordConfirmation: "",
 	roles: [],
+	manageable: true,
 };
 
 // All fields for start task form that are fix and not depending on response of backend
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-am_ET.json b/src/i18n/org/opencastproject/adminui/languages/lang-am_ET.json
index 8e1a452d7a..2062ca6eba 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-am_ET.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-am_ET.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-cs_CZ.json b/src/i18n/org/opencastproject/adminui/languages/lang-cs_CZ.json
index 64c20dc3c9..52150cfed0 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-cs_CZ.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-cs_CZ.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-da_DK.json b/src/i18n/org/opencastproject/adminui/languages/lang-da_DK.json
index 422e882cc0..9d60433c4f 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-da_DK.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-da_DK.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-de_DE.json b/src/i18n/org/opencastproject/adminui/languages/lang-de_DE.json
index e33d68831d..67f2009f20 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-de_DE.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-de_DE.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Medienübersicht",
+	"STUDIO": "Opencast Studio",
 	"SYSTEM_NOTIFICATIONS": "Systemwarnungen und Benachrichtigungen",
 	"LANGUAGE": "Sprache wählen",
 	"HELP": {
@@ -480,7 +481,7 @@
 						"RECORDING_ELEMENTS": "Aufnahme-Elemente",
 						"RECORDING_METADATA": "Aufnahme-Metadaten",
 						"SEGMENTABLE": {
-							"SHORT": "Folien",
+							"SHORT": "Präsentation",
 							"DETAIL": "Die Datei enthält die Aufnahme einer Präsentation (Keynote, Powerpoint, etc.)."
 						},
 						"NON_SEGMENTABLE": {
@@ -702,7 +703,7 @@
 						"CAPTION": "Hochladen",
 						"RECORDING_ELEMENTS": "Aufnahme-Elemente",
 						"SEGMENTABLE": {
-							"SHORT": "Folien",
+							"SHORT": "Präsentation",
 							"DETAIL": "Die Datei enthält die Aufnahme einer Präsentation (Keynote, Powerpoint, etc.)."
 						},
 						"NON_SEGMENTABLE": {
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-el_GR.json b/src/i18n/org/opencastproject/adminui/languages/lang-el_GR.json
index a281917c51..77c05ac082 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-el_GR.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-el_GR.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Μονάδα πολυμέσων",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "Προειδοποιήσεις και ειδοποιήσεις συστήματος",
 	"LANGUAGE": "Επιλέξτε γλώσσα",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Στοιχεία καταγραφής",
 						"RECORDING_METADATA": "Μετά-δεδομένα εγγραφής",
 						"SEGMENTABLE": {
-							"SHORT": "Διαφάνειες",
-							"DETAIL": "Το αρχείο περιέχει μια καταγραφή  παρουσίασης διαφανειών (Keynote, Powerpoint, κλπ)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Παρουσιαστής",
@@ -702,8 +703,8 @@
 						"CAPTION": "Ανέβασμα αρχείων",
 						"RECORDING_ELEMENTS": "Στοιχεία καταγραφής",
 						"SEGMENTABLE": {
-							"SHORT": "Διαφάνειες",
-							"DETAIL": "Το αρχείο περιέχει μια καταγραφή παρουσίασης διαφανειών (Keynote, Powerpoint, κλπ)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Παρουσιαστής",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-en_GB.json b/src/i18n/org/opencastproject/adminui/languages/lang-en_GB.json
index 3fd868d5a2..10a36e3e33 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-en_GB.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-en_GB.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json b/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json
index 488dcdb2ec..7e2070d0aa 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json
@@ -138,6 +138,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -483,8 +484,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -705,8 +706,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-es_ES.json b/src/i18n/org/opencastproject/adminui/languages/lang-es_ES.json
index 27892f928c..27db7eb171 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-es_ES.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-es_ES.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-fi_FI.json b/src/i18n/org/opencastproject/adminui/languages/lang-fi_FI.json
index 8e1a452d7a..2062ca6eba 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-fi_FI.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-fi_FI.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-fil_PH.json b/src/i18n/org/opencastproject/adminui/languages/lang-fil_PH.json
index 8e1a452d7a..2062ca6eba 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-fil_PH.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-fil_PH.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-fr_FR.json b/src/i18n/org/opencastproject/adminui/languages/lang-fr_FR.json
index cef29227cb..d3d9f5b575 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-fr_FR.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-fr_FR.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Module Multimédia",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "Avertissements et notifications du système",
 	"LANGUAGE": "Choisir une langue",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Éléments de l'enregistrement",
 						"RECORDING_METADATA": "Métadonnées de l'enregistrement",
 						"SEGMENTABLE": {
-							"SHORT": "Diapositives",
-							"DETAIL": "Le fichier contient un enregistrement d'une présentation de diapositives (Keynote, Powerpoint, etc.)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Présentateur",
@@ -702,8 +703,8 @@
 						"CAPTION": "Envoi",
 						"RECORDING_ELEMENTS": "Éléments de l'enregistrement",
 						"SEGMENTABLE": {
-							"SHORT": "Diapositives",
-							"DETAIL": "Le fichier contient un enregistrement d'une présentation de diapositives (Keynote, Powerpoint, etc.)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Présentateur",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-gl_ES.json b/src/i18n/org/opencastproject/adminui/languages/lang-gl_ES.json
index 9ed5843a1c..3c00d0e06f 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-gl_ES.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-gl_ES.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Módulo Multimedia",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "Alertas de sistema e notificacións",
 	"LANGUAGE": "Seleccione idioma",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Elementos da gravación",
 						"RECORDING_METADATA": "Metadatos da gravación",
 						"SEGMENTABLE": {
-							"SHORT": "Diapositivas",
-							"DETAIL": "O arquivo contén a gravación dunha presentación de diapositivas (Keynote, Powerpoint, etc.)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Relator",
@@ -702,8 +703,8 @@
 						"CAPTION": "Subir",
 						"RECORDING_ELEMENTS": "Elementos da gravación",
 						"SEGMENTABLE": {
-							"SHORT": "Diapositivas",
-							"DETAIL": "O arquivo contén a gravación dunha presentación de diapositivas (Keynote, Powerpoint, etc.)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Relator",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-he_IL.json b/src/i18n/org/opencastproject/adminui/languages/lang-he_IL.json
index bd42073329..7a33605631 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-he_IL.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-he_IL.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "מודול מדיה",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "אזהרות והתראות מערכתיות",
 	"LANGUAGE": "בחירת שפה",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "רכיבי הקלטה",
 						"RECORDING_METADATA": "הקלטת מטא נתונים",
 						"SEGMENTABLE": {
-							"SHORT": "שקופיות",
-							"DETAIL": "הקובץ מכיל הקלטה של מצגת שקופיות (Keynote, Powerpoint, וכו ')."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "מציג",
@@ -702,8 +703,8 @@
 						"CAPTION": "העלאה",
 						"RECORDING_ELEMENTS": "רכיבי הקלטה",
 						"SEGMENTABLE": {
-							"SHORT": "שקופיות",
-							"DETAIL": "הקובץ מכיל הקלטה של מצגת שקופיות (Keynote, Powerpoint, וכו ')."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "מציג",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-hi_IN.json b/src/i18n/org/opencastproject/adminui/languages/lang-hi_IN.json
index 8e1a452d7a..2062ca6eba 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-hi_IN.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-hi_IN.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-id_ID.json b/src/i18n/org/opencastproject/adminui/languages/lang-id_ID.json
index 8e1a452d7a..2062ca6eba 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-id_ID.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-id_ID.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-it_IT.json b/src/i18n/org/opencastproject/adminui/languages/lang-it_IT.json
index 2435abba33..e77b528f86 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-it_IT.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-it_IT.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Modulo Media",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "Avvisi di sistema e notifiche",
 	"LANGUAGE": "Seleziona lingua",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Registrazione elementi",
 						"RECORDING_METADATA": "Registrazione metadati",
 						"SEGMENTABLE": {
-							"SHORT": "Diapositive",
-							"DETAIL": "Il file contiene una registrazione di una presentazione con diapositive (Keynote, Powerpoint, ecc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Conduttore",
@@ -702,8 +703,8 @@
 						"CAPTION": "Carica",
 						"RECORDING_ELEMENTS": "Registrazione elementi",
 						"SEGMENTABLE": {
-							"SHORT": "Diapositive",
-							"DETAIL": "Il file contiene una registrazione di una presentazione con diapositive (Keynote, Powerpoint, ecc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Conduttore",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-ja_JP.json b/src/i18n/org/opencastproject/adminui/languages/lang-ja_JP.json
index 8e1a452d7a..2062ca6eba 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-ja_JP.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-ja_JP.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-kn_IN.json b/src/i18n/org/opencastproject/adminui/languages/lang-kn_IN.json
index 8e1a452d7a..2062ca6eba 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-kn_IN.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-kn_IN.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-ml_IN.json b/src/i18n/org/opencastproject/adminui/languages/lang-ml_IN.json
index 8e1a452d7a..2062ca6eba 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-ml_IN.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-ml_IN.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-nl_NL.json b/src/i18n/org/opencastproject/adminui/languages/lang-nl_NL.json
index c96879a4ae..bf73c037e4 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-nl_NL.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-nl_NL.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Mediemodul",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "Systemadvarsler og notifikationer",
 	"LANGUAGE": "Vælg sprog",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Optagelseselementer",
 						"RECORDING_METADATA": "Optagelsesmetadata",
 						"SEGMENTABLE": {
-							"SHORT": "Diaser",
-							"DETAIL": "Filen indeholder en diaspræsentationsoptagelse (hovedindlæg, Powerpoint, mv.)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Oplægsholder",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Optagelseselementer",
 						"SEGMENTABLE": {
-							"SHORT": "Diaser",
-							"DETAIL": "Filen indeholder en diaspræsentationsoptagelse (hovedindlæg, Powerpoint, mv.)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Oplægsholder",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-no_NO.json b/src/i18n/org/opencastproject/adminui/languages/lang-no_NO.json
index 8e1a452d7a..2062ca6eba 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-no_NO.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-no_NO.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-pl_PL.json b/src/i18n/org/opencastproject/adminui/languages/lang-pl_PL.json
index 06724352e3..e7a198e0a4 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-pl_PL.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-pl_PL.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Galeria",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "Ostrzeżenia i uwagi systemowe",
 	"LANGUAGE": "Wybierz język",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Elementy nagrywające",
 						"RECORDING_METADATA": "Informacje o nagraniu",
 						"SEGMENTABLE": {
-							"SHORT": "Slajdy",
-							"DETAIL": "Plik zawiera nagranie prezentacji slajdów (Keynote, Powerpoint itd.)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Prezenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Wysyłanie",
 						"RECORDING_ELEMENTS": "Elementy nagrywające",
 						"SEGMENTABLE": {
-							"SHORT": "Slajdy",
-							"DETAIL": "Plik zawiera nagranie prezentacji slajdów (Keynote, Powerpoint itd.)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Prezenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-pt_BR.json b/src/i18n/org/opencastproject/adminui/languages/lang-pt_BR.json
index 8e1a452d7a..2062ca6eba 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-pt_BR.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-pt_BR.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-pt_PT.json b/src/i18n/org/opencastproject/adminui/languages/lang-pt_PT.json
index 8e1a452d7a..2062ca6eba 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-pt_PT.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-pt_PT.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-ru_RU.json b/src/i18n/org/opencastproject/adminui/languages/lang-ru_RU.json
index faaa340a9c..bae3d52bfc 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-ru_RU.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-ru_RU.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Слайды",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-si_LK.json b/src/i18n/org/opencastproject/adminui/languages/lang-si_LK.json
index 8e1a452d7a..2062ca6eba 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-si_LK.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-si_LK.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-sl_SI.json b/src/i18n/org/opencastproject/adminui/languages/lang-sl_SI.json
index 06d3450ff8..47d2500061 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-sl_SI.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-sl_SI.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Predstavnostni modul",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "Sistemska opozorila in obvestila",
 	"LANGUAGE": "Izberite jezik",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Elementi posnetka",
 						"RECORDING_METADATA": "Metapodatki posnetka",
 						"SEGMENTABLE": {
-							"SHORT": "Diapozitivi",
-							"DETAIL": "Datoteka vsebuje posnetek predstavitve z diapozitivi (Keynote, Powerpoint ipd.)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Predavatelj",
@@ -702,8 +703,8 @@
 						"CAPTION": "Naloži",
 						"RECORDING_ELEMENTS": "Elementi posnetka",
 						"SEGMENTABLE": {
-							"SHORT": "Diapozitivi",
-							"DETAIL": "Datoteka vsebuje posnetek predstavitve z diapozitivi (Keynote, Powerpoint ipd.)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Predavatelj",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-sv_SE.json b/src/i18n/org/opencastproject/adminui/languages/lang-sv_SE.json
index 8e1a452d7a..2062ca6eba 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-sv_SE.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-sv_SE.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-ta_IN.json b/src/i18n/org/opencastproject/adminui/languages/lang-ta_IN.json
index 8e1a452d7a..2062ca6eba 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-ta_IN.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-ta_IN.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-te_IN.json b/src/i18n/org/opencastproject/adminui/languages/lang-te_IN.json
index 8e1a452d7a..2062ca6eba 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-te_IN.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-te_IN.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-tl_PH.json b/src/i18n/org/opencastproject/adminui/languages/lang-tl_PH.json
index 8e1a452d7a..2062ca6eba 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-tl_PH.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-tl_PH.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-tr_TR.json b/src/i18n/org/opencastproject/adminui/languages/lang-tr_TR.json
index fb29218635..3941806788 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-tr_TR.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-tr_TR.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Ortam Modülü",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "Sistem uyarıları ve bildirimleri",
 	"LANGUAGE": "Dil seç",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Ögeler kaydediliyor",
 						"RECORDING_METADATA": "Metaveri kaydediliyor",
 						"SEGMENTABLE": {
-							"SHORT": "Slaytlar",
-							"DETAIL": "Dosya bir slayt sunumunun kaydını içeriyor (Keynote, Powerpoint vb.)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Hediye Eden",
@@ -702,8 +703,8 @@
 						"CAPTION": "Karşıya Yükle",
 						"RECORDING_ELEMENTS": "Öğeler kaydediliyor",
 						"SEGMENTABLE": {
-							"SHORT": "Slaytlar",
-							"DETAIL": "Bu dosya bir slayt sunum kaydını içerir (Keynote, Powerpoint, vs.)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Sunan",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-zh_CN.json b/src/i18n/org/opencastproject/adminui/languages/lang-zh_CN.json
index 8e1a452d7a..2062ca6eba 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-zh_CN.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-zh_CN.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-zh_TW.json b/src/i18n/org/opencastproject/adminui/languages/lang-zh_TW.json
index 8e1a452d7a..2062ca6eba 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-zh_TW.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-zh_TW.json
@@ -136,6 +136,7 @@
 		}
 	},
 	"MEDIAMODULE": "Media Module",
+	"STUDIO": "Studio",
 	"SYSTEM_NOTIFICATIONS": "System warnings and notifications",
 	"LANGUAGE": "Select language",
 	"HELP": {
@@ -480,8 +481,8 @@
 						"RECORDING_ELEMENTS": "Recording elements",
 						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
@@ -702,8 +703,8 @@
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
 						"SEGMENTABLE": {
-							"SHORT": "Slides",
-							"DETAIL": "The file contains a recording of a slide presentation (Keynote, Powerpoint, etc)."
+							"SHORT": "Presentation",
+							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."
 						},
 						"NON_SEGMENTABLE": {
 							"SHORT": "Presenter",
diff --git a/src/slices/aclSlice.ts b/src/slices/aclSlice.ts
index 8b631b12fe..92237704de 100644
--- a/src/slices/aclSlice.ts
+++ b/src/slices/aclSlice.ts
@@ -5,6 +5,7 @@ import { getURLParams, prepareAccessPolicyRulesForPost, transformAclTemplatesRes
 import { transformToIdValueArray } from '../utils/utils';
 import { NOTIFICATION_CONTEXT_ACCESS } from '../configs/modalConfig';
 import { addNotification, removeNotificationWizardAccess } from './notificationSlice';
+import { getUserInformation } from "../selectors/userInfoSelectors";
 import { AppDispatch } from '../store';
 import { createAppAsyncThunk } from '../createAsyncThunkWithTypes';
 
@@ -159,11 +160,13 @@ export const deleteAcl = (id) => async (dispatch: AppDispatch) => {
 };
 
 // @ts-expect-error TS(7006):
-export const checkAcls = (acls) => async (dispatch: AppDispatch) => {
+export const checkAcls = (acls) => async (dispatch: AppDispatch, getState) => {
 	// Remove old notifications of context event-access
 	// Helps to prevent multiple notifications for same problem
 	dispatch(removeNotificationWizardAccess());
 
+	let user = getUserInformation(getState());
+
 	let check = true;
 	let bothRights = false;
 
@@ -173,8 +176,8 @@ export const checkAcls = (acls) => async (dispatch: AppDispatch) => {
 			check = false;
 		}
 
-		// check if there is at least one policy with read and write rights
-		if (acls[i].read && acls[i].write) {
+		// if not admin, check if there is at least one policy with read and write rights
+		if ((acls[i].read && acls[i].write) || user.isAdmin) {
 			bothRights = true;
 		}
 
diff --git a/src/slices/eventDetailsSlice.ts b/src/slices/eventDetailsSlice.ts
index c3fce1520e..e01fd5e6a3 100644
--- a/src/slices/eventDetailsSlice.ts
+++ b/src/slices/eventDetailsSlice.ts
@@ -2204,20 +2204,6 @@ const eventDetailsSlice = createSlice({
 				// This is the empty workflow data from the original reducer
 				// TODO: Figure out why it is so vastly different from our initial state
 				// and maybe fix our initial state if this is actually correct
-				// const emptyWorkflowData = {
-				// 	creator: {
-				// 		name: "",
-				// 		email: "",
-				// 	},
-				// 	title: "",
-				// 	description: "",
-				// 	submittedAt: "",
-				// 	state: "",
-				// 	executionTime: "",
-				// 	wiid: "",
-				// 	wdid: "",
-				// 	configuration: {},
-				// };
 				const emptyWorkflowData = {
 					workflowId: "",
 					description: "",
diff --git a/src/slices/userDetailsSlice.ts b/src/slices/userDetailsSlice.ts
index 478d152621..c4f577dda8 100644
--- a/src/slices/userDetailsSlice.ts
+++ b/src/slices/userDetailsSlice.ts
@@ -2,23 +2,35 @@ import { PayloadAction, SerializedError, createSlice } from '@reduxjs/toolkit'
 import axios from 'axios';
 import { addNotification } from './notificationSlice';
 import { buildUserBody } from "../utils/resourceUtils";
-import { NewUser } from './userSlice';
 import { createAppAsyncThunk } from '../createAsyncThunkWithTypes';
 
 /**
  * This file contains redux reducer for actions affecting the state of details of a user
  */
+export type UserDetailsRole = {
+	name: string,
+	type: string,
+}
+
 export type UserDetailsState = {
 	status: 'uninitialized' | 'loading' | 'succeeded' | 'failed',
 	error: SerializedError | null,
 	provider: string,
-	roles: string[],
+	roles: UserDetailsRole[],
 	name: string,
 	username: string,
 	email: string,
 	manageable: boolean,
 };
 
+export type UpdateUser = {
+	email: string,
+	name: string,
+	password: string,
+	roles: UserDetailsRole[],
+	username: string,
+}
+
 // Initial state of userDetails in redux store
 const initialState: UserDetailsState = {
 	status: 'uninitialized',
@@ -42,7 +54,7 @@ export const fetchUserDetails = createAppAsyncThunk('userDetails/fetchUserDetail
 
 // update existing user with changed values
 export const updateUserDetails = createAppAsyncThunk('userDetails/updateUserDetails', async (params: {
-	values: NewUser,
+	values: UpdateUser,
 	username: string
 }, {dispatch}) => {
 	const { username, values } = params
diff --git a/src/slices/userSlice.ts b/src/slices/userSlice.ts
index 4aae42282f..6efb36c959 100644
--- a/src/slices/userSlice.ts
+++ b/src/slices/userSlice.ts
@@ -6,6 +6,7 @@ import { buildUserBody, getURLParams } from "../utils/resourceUtils";
 import { addNotification } from './notificationSlice';
 import { TableConfig } from '../configs/tableConfigs/aclsTableConfig';
 import { createAppAsyncThunk } from '../createAsyncThunkWithTypes';
+import { Role } from './aclSlice';
 
 /**
  * This file contains redux reducer for actions affecting the state of users
@@ -23,7 +24,7 @@ export type NewUser = {
 	email: string,
 	name: string,
 	password: string,
-	roles: string,
+	roles: Role[],
 	username: string,
 }
 
diff --git a/src/styles/components/_header.scss b/src/styles/components/_header.scss
index 901ac1502d..c44feb9381 100644
--- a/src/styles/components/_header.scss
+++ b/src/styles/components/_header.scss
@@ -174,14 +174,15 @@
 .action-nav-bar {
     $height: 80px;
     width: 100%;
-    height: $height;
-    position: relative;
+    min-height: $height;
+    display: flex;
+    flex-direction: row;
+    align-items: flex-end;
     background: $d-blue;
 
     .btn-group {
-         float: right;
          margin-right: $side-margin;
-         margin-top: 18px;
+         align-self: center;
 
         // btn specific styles
         .add {
@@ -250,9 +251,8 @@
         @include border-top-radius(4px);
         border: $thin-border-stroke darken(#1e364b, 3%);
         border-bottom: none;
-        position: absolute;
-        top: 36px;
-        left: $side-margin;
+        margin: 0 $side-margin;
+        position: relative;
 
         > button {
             width: 100%;
@@ -268,9 +268,7 @@
 
     // Subpage Navigation
     nav {
-        position: absolute;
-        top: 50px;
-        left: 120px;
+        flex-grow: 1;
 
         a {
             display: inline-block;
@@ -278,6 +276,7 @@
             text-align: center;
             position: relative;
             padding: 0 20px;
+            margin-bottom: 16px;
 
             &:hover {
                 color: $subpage-navigation-link-hover-color;
diff --git a/src/styles/components/_stats.scss b/src/styles/components/_stats.scss
index f6ba80279d..c7bd459b85 100644
--- a/src/styles/components/_stats.scss
+++ b/src/styles/components/_stats.scss
@@ -21,7 +21,7 @@
 @use "sass:math";
 
 .stats-container {
-  text-align: right;
+  align-self: center;
 
   .col {
     $num-cols: 8;
@@ -29,9 +29,7 @@
     box-sizing: border-box;
     display: inline-block;
     vertical-align: top;
-    min-width: math.div(40%, $num-cols);
-    margin-bottom: 20px;
-    margin-top: 12px;
+    min-width: 80px;
     padding: 0 5px;
 
     &:last-child{
diff --git a/src/styles/main.scss b/src/styles/main.scss
index 728d63d86c..caceeeb3d2 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -559,7 +559,14 @@ table.main-tbl {
     display: none !important;
   }
 
-  th,
+  th {
+    span {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+    }
+  }
+
   td {
     max-width: 800px;
     word-wrap: anywhere;
diff --git a/src/utils/aclUtils.ts b/src/utils/aclUtils.ts
index c30c92eb6b..dc4b1e1545 100644
--- a/src/utils/aclUtils.ts
+++ b/src/utils/aclUtils.ts
@@ -1,9 +1,17 @@
 /*This File contains functions that are needed in several access right views*/
 
-export const getAclTemplateText = (aclTemplates: any, formikTemplate: any) => {
+import { TransformedAcl } from "../slices/aclDetailsSlice";
+import { Role } from "../slices/aclSlice";
+
+export const getAclTemplateText = (
+	aclTemplates: {
+		id: string
+		value: string
+	}[],
+	formikTemplate: string
+) => {
 	if (!!aclTemplates && aclTemplates.length > 0) {
 		const template = aclTemplates.find(
-// @ts-expect-error TS(7006): Parameter 'template' implicitly has an 'any' type.
 			(template) => formikTemplate === template.id
 		);
 		return !!template ? template.value : "";
@@ -12,10 +20,8 @@ export const getAclTemplateText = (aclTemplates: any, formikTemplate: any) => {
 	}
 };
 
-// @ts-expect-error TS(7006): Parameter 'roles' implicitly has an 'any' type.
-export const filterRoles = (roles, policies) => {
+export const filterRoles = (roles: Role[], policies: TransformedAcl[]) => {
 	return roles.filter(
-// @ts-expect-error TS(7006): Parameter 'role' implicitly has an 'any' type.
 		(role) => !policies.find((policy) => policy.role === role.name)
 	);
 };
diff --git a/src/utils/adopterRegistrationUtils.ts b/src/utils/adopterRegistrationUtils.ts
index 977db3776a..1b30459b64 100644
--- a/src/utils/adopterRegistrationUtils.ts
+++ b/src/utils/adopterRegistrationUtils.ts
@@ -8,14 +8,31 @@ export const fetchAdopterRegistration = async () => {
 	return await response.data;
 };
 
+export type Registration = {
+	contactMe: boolean,
+	allowsStatistics: boolean,
+	allowsErrorReports: boolean,
+	organisationName: string,
+	departmentName: string,
+	country: string,
+	postalCode: string,
+	city: string,
+	firstName: string,
+	lastName: string,
+	street: string,
+	streetNo: string,
+	email: string,
+}
+
 // post request for adopter information
-// @ts-expect-error TS(7006): Parameter 'values' implicitly has an 'any' type.
-export const postRegistration = async (values) => {
+export const postRegistration = async (
+	values: Registration
+) => {
 	// build body
 	let body = new URLSearchParams();
-	body.append("contactMe", values.contactMe);
-	body.append("allowsStatistics", values.allowsStatistics);
-	body.append("allowsErrorReports", values.allowsErrorReports);
+	body.append("contactMe", values.contactMe.toString());
+	body.append("allowsStatistics", values.allowsStatistics.toString());
+	body.append("allowsErrorReports", values.allowsErrorReports.toString());
 	body.append("organisationName", values.organisationName);
 	body.append("departmentName", values.departmentName);
 	body.append("country", values.country);
diff --git a/src/utils/bulkActionUtils.ts b/src/utils/bulkActionUtils.ts
index ef386988ad..44e1e248cc 100644
--- a/src/utils/bulkActionUtils.ts
+++ b/src/utils/bulkActionUtils.ts
@@ -2,9 +2,12 @@
 import { hasDeviceAccess } from "./resourceUtils";
 import { NOTIFICATION_CONTEXT } from "../configs/modalConfig";
 import { addNotification } from "../slices/notificationSlice";
+import { EditedEvents, Event } from "../slices/eventSlice";
+import { UserInfoState } from "../slices/userInfoSlice";
+import { AppDispatch } from "../store";
 
 // Check if event is scheduled and therefore the schedule is editable
-export const isScheduleEditable = (event: any) => {
+export const isScheduleEditable = (event: Event) => {
 	return (
 		event.event_status.toUpperCase().indexOf("SCHEDULED") > -1 ||
 		!event.selected
@@ -12,8 +15,7 @@ export const isScheduleEditable = (event: any) => {
 };
 
 // Check if multiple events are scheduled and therefore the schedule is editable
-// @ts-expect-error TS(7006): Parameter 'events' implicitly has an 'any' type.
-export const isAllScheduleEditable = (events) => {
+export const isAllScheduleEditable = (events: Event[]) => {
 	for (let i = 0; i < events.length; i++) {
 		if (!isScheduleEditable(events[i])) {
 			return false;
@@ -23,14 +25,12 @@ export const isAllScheduleEditable = (events) => {
 };
 
 // Check if user has access rights for capture agent of event
-// @ts-expect-error TS(7006): Parameter 'event' implicitly has an 'any' type.
-export const isAgentAccess = (event, user) => {
+export const isAgentAccess = (event: Event, user: UserInfoState) => {
 	return !event.selected || hasDeviceAccess(user, event.agent_id);
 };
 
 // Check if user has access rights for capture agent of several events
-// @ts-expect-error TS(7006): Parameter 'events' implicitly has an 'any' type.
-export const isAllAgentAccess = (events, user) => {
+export const isAllAgentAccess = (events: Event[], user: UserInfoState) => {
 	for (let i = 0; i < events.length; i++) {
 		if (!events[i].selected || !isScheduleEditable(events[i])) {
 			continue;
@@ -44,17 +44,16 @@ export const isAllAgentAccess = (events, user) => {
 
 // Check validity of selected event list for bulk schedule update for activating next button
 export const checkValidityUpdateScheduleEventSelection = (
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'user' implicitly has an 'any' type.
-	user
+	formikValues: {
+		events: Event[]
+	},
+	user: UserInfoState
 ) => {
 	if (formikValues.events.length > 0) {
 		if (
 			isAllScheduleEditable(formikValues.events) &&
 			isAllAgentAccess(formikValues.events, user)
 		) {
-// @ts-expect-error TS(7006): Parameter 'event' implicitly has an 'any' type.
 			return formikValues.events.some((event) => event.selected === true);
 		} else {
 			return false;
@@ -66,29 +65,27 @@ export const checkValidityUpdateScheduleEventSelection = (
 
 // check changed events in formik for scheduling conflicts
 export const checkSchedulingConflicts = async (
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setConflicts' implicitly has an 'any' t... Remove this comment to see the full error message
-	setConflicts,
-// @ts-expect-error TS(7006): Parameter 'checkConflicts' implicitly has an 'any'... Remove this comment to see the full error message
-	checkConflicts,
-// @ts-expect-error TS(7006):
-	dispatch,
+	formikValues: {
+		editedEvents: EditedEvents[]
+	},
+	setConflicts: (conflicts: any) => void,
+	checkConflicts: (editedEvents: EditedEvents[]) => Promise<any[]>,
+	dispatch: AppDispatch,
 ) => {
 	// Check if each start is before end
 	for (let i = 0; i < formikValues.editedEvents.length; i++) {
 		let event = formikValues.editedEvents[i];
 		let startTime = new Date();
 		startTime.setHours(
-			event.changedStartTimeHour,
-			event.changedStartTimeMinutes,
+			parseInt(event.changedStartTimeHour),
+			parseInt(event.changedStartTimeMinutes),
 			0,
 			0
 		);
 		let endTime = new Date();
 		endTime.setHours(
-			event.changedEndTimeHour,
-			event.changedEndTimeMinutes,
+			parseInt(event.changedEndTimeHour),
+			parseInt(event.changedEndTimeMinutes),
 			0,
 			0
 		);
@@ -118,8 +115,7 @@ export const checkSchedulingConflicts = async (
 };
 
 // Check if an event is in a state that a task on it can be started
-// @ts-expect-error TS(7006): Parameter 'event' implicitly has an 'any' type.
-export const isStartable = (event) => {
+export const isStartable = (event: Event) => {
 	return (
 		event.event_status.toUpperCase().indexOf("PROCESSED") > -1 ||
 		event.event_status.toUpperCase().indexOf("PROCESSING_FAILURE") > -1 ||
@@ -129,8 +125,7 @@ export const isStartable = (event) => {
 };
 
 // Check if multiple events are in a state that a task on them can be started
-// @ts-expect-error TS(7006): Parameter 'events' implicitly has an 'any' type.
-export const isTaskStartable = (events) => {
+export const isTaskStartable = (events: Event[]) => {
 	for (let i = 0; i < events.length; i++) {
 		if (!isStartable(events[i])) {
 			return false;
@@ -140,11 +135,9 @@ export const isTaskStartable = (events) => {
 };
 
 // Check validity of selected event list for bulk start task for activating next button
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-export const checkValidityStartTaskEventSelection = (formikValues) => {
+export const checkValidityStartTaskEventSelection = (formikValues: { events: Event[] }) => {
 	if (formikValues.events.length > 0) {
 		if (isTaskStartable(formikValues.events)) {
-// @ts-expect-error TS(7006): Parameter 'event' implicitly has an 'any' type.
 			return formikValues.events.some((event) => event.selected === true);
 		} else {
 			return false;
diff --git a/src/utils/componentStyles.ts b/src/utils/componentStyles.ts
index f34f2b1a76..837c90b217 100644
--- a/src/utils/componentStyles.ts
+++ b/src/utils/componentStyles.ts
@@ -1,5 +1,6 @@
 /* this file contains syles as javascript objects for syled components */
 
+import { StylesConfig, Theme } from "react-select";
 import { DropDownType } from "../components/shared/DropDown";
 
 // colors
@@ -7,7 +8,8 @@ const colorDropDownMain = "#aaa";
 const colorDropDownNormalFocus = "#5897fb";
 const colorDropDownDarkerFocus = "#2a62bc";
 
-export const dropDownStyle = (type: DropDownType) => {
+
+export function dropDownStyle(type: DropDownType): StylesConfig {
 	const width =
 		type === "theme" || type === "newTheme" || type === "workflow"
 			? "100%"
@@ -20,7 +22,6 @@ export const dropDownStyle = (type: DropDownType) => {
 			: 250;
 
 	return {
-// @ts-expect-error TS(7006): Parameter 'provided' implicitly has an 'any' type.
 		container: (provided, state) => ({
 			...provided,
 			width: width,
@@ -34,7 +35,6 @@ export const dropDownStyle = (type: DropDownType) => {
 			marginBottom: 0,
 			marginRight: 1,
 		}),
-// @ts-expect-error TS(7006): Parameter 'provided' implicitly has an 'any' type.
 		control: (provided, state) => ({
 			...provided,
 			marginBottom: 0,
@@ -55,7 +55,6 @@ export const dropDownStyle = (type: DropDownType) => {
 				borderColor: colorDropDownMain,
 			},
 		}),
-// @ts-expect-error TS(7006): Parameter 'provided' implicitly has an 'any' type.
 		dropdownIndicator: (provided, state) => ({
 			...provided,
 			transform: state.selectProps.menuIsOpen
@@ -68,12 +67,10 @@ export const dropDownStyle = (type: DropDownType) => {
 				color: colorDropDownNormalFocus,
 			},
 		}),
-// @ts-expect-error TS(7006): Parameter 'provided' implicitly has an 'any' type.
 		indicatorSeparator: (provided, state) => ({
 			...provided,
 			display: "none",
 		}),
-// @ts-expect-error TS(7006): Parameter 'provided' implicitly has an 'any' type.
 		input: (provided, state) => ({
 			...provided,
 			position: "relative",
@@ -85,28 +82,24 @@ export const dropDownStyle = (type: DropDownType) => {
 			paddingTop: 0,
 			paddingBottom: 0,
 		}),
-// @ts-expect-error TS(7006): Parameter 'provided' implicitly has an 'any' type.
 		menu: (provided, state) => ({
 			...provided,
 			zIndex: 9000,
 			marginTop: 1,
 			border: "none",
 		}),
-// @ts-expect-error TS(7006): Parameter 'provided' implicitly has an 'any' type.
 		menuList: (provided, state) => ({
 			...provided,
 			marginTop: 0,
 			border: `1px solid ${colorDropDownMain}`,
 			borderRadius: 4,
 		}),
-// @ts-expect-error TS(7006): Parameter 'provided' implicitly has an 'any' type.
 		noOptionsMessage: (provided, state) => ({
 			...provided,
 			textAlign: "left",
 			paddingTop: 0,
 			paddingBottom: 0,
 		}),
-// @ts-expect-error TS(7006): Parameter 'provided' implicitly has an 'any' type.
 		option: (provided, state) => ({
 			...provided,
 			paddingTop:
@@ -127,7 +120,6 @@ export const dropDownStyle = (type: DropDownType) => {
 			overflowWrap: "normal",
 			lineHeight: type === "comment" ? "105%" : "inherit",
 		}),
-// @ts-expect-error TS(7006): Parameter 'provided' implicitly has an 'any' type.
 		singleValue: (provided, state) => ({
 			...provided,
 			marginTop: 0,
@@ -135,7 +127,6 @@ export const dropDownStyle = (type: DropDownType) => {
 			paddingTop: 0,
 			paddingBottom: 0,
 		}),
-// @ts-expect-error TS(7006): Parameter 'provided' implicitly has an 'any' type.
 		valueContainer: (provided, state) => ({
 			...provided,
 			marginTop: 0,
@@ -147,8 +138,7 @@ export const dropDownStyle = (type: DropDownType) => {
 	};
 };
 
-// @ts-expect-error TS(7006): Parameter 'theme' implicitly has an 'any' type.
-export const dropDownSpacingTheme = (theme) => ({
+export const dropDownSpacingTheme = (theme: Theme) => ({
 	...theme,
 	spacing: {
 		...theme.spacing,
@@ -156,8 +146,3 @@ export const dropDownSpacingTheme = (theme) => ({
 		baseUnit: 2,
 	},
 });
-
-export const overflowStyle = {
-	overflow: "auto",
-	overflowWrap: "normal" as const,
-};
diff --git a/src/utils/dateUtils.ts b/src/utils/dateUtils.ts
index b3611922b9..f413f776d8 100644
--- a/src/utils/dateUtils.ts
+++ b/src/utils/dateUtils.ts
@@ -1,5 +1,6 @@
 import moment from "moment";
 import { makeTwoDigits } from "./utils";
+import { FormikErrors } from "formik";
 
 /**
  * This File contains methods concerning dates
@@ -16,29 +17,26 @@ export const renderValidDate = (date: string) => {
 }
 
 // transform relative date to an absolute date
-export const relativeToAbsoluteDate = (relative: any, type: any, from: any) => {
+export const relativeToAbsoluteDate = (relative: string, type: string, from: boolean) => {
 	let localMoment = moment();
 
 	let absolute;
 	if (from) {
-		absolute = localMoment.startOf(type);
+		absolute = localMoment.startOf(type as moment.unitOfTime.StartOf);
 	} else {
-		absolute = localMoment.endOf(type);
+		absolute = localMoment.endOf(type  as moment.unitOfTime.StartOf);
 	}
 
-	absolute = absolute.add(relative, type);
+	absolute = absolute.add(relative, type as moment.unitOfTime.Base);
 
 	return absolute.toDate();
 };
 
 // transform from relative date span to filter value containing absolute dates
 export const relativeDateSpanToFilterValue = (
-// @ts-expect-error TS(7006): Parameter 'fromRelativeDate' implicitly has an 'an... Remove this comment to see the full error message
-	fromRelativeDate,
-// @ts-expect-error TS(7006): Parameter 'toRelativeDate' implicitly has an 'any'... Remove this comment to see the full error message
-	toRelativeDate,
-// @ts-expect-error TS(7006): Parameter 'type' implicitly has an 'any' type.
-	type
+	fromRelativeDate: string,
+	toRelativeDate: string,
+	type: string
 ) => {
 	let fromAbsoluteDate = relativeToAbsoluteDate(fromRelativeDate, type, true);
 	let toAbsoluteDate = relativeToAbsoluteDate(toRelativeDate, type, false);
@@ -51,19 +49,24 @@ export const relativeDateSpanToFilterValue = (
 };
 
 // creates a date object from a date, hour and minute
-// @ts-expect-error TS(7006): Parameter 'date' implicitly has an 'any' type.
-export const makeDate = (date, hour, minute) => {
+export const makeDate = (
+	date: string | number | Date,
+	hour: string,
+	minute: string
+) => {
 	const madeDate = new Date(date);
-	madeDate.setHours(hour);
-	madeDate.setMinutes(minute);
+	madeDate.setHours(parseInt(hour));
+	madeDate.setMinutes(parseInt(minute));
 
 	return madeDate;
 };
 
 // calculates the duration between a start and end date in hours and minutes
-// @ts-expect-error TS(7006): Parameter 'startDate' implicitly has an 'any' type... Remove this comment to see the full error message
-export const calculateDuration = (startDate, endDate) => {
-	const duration = (endDate - startDate) / 1000;
+export const calculateDuration = (
+	startDate: Date,
+	endDate: Date
+) => {
+	const duration = (endDate.getTime() - startDate.getTime()) / 1000;
 	const durationHours = (duration - (duration % 3600)) / 3600;
 	const durationMinutes = (duration % 3600) / 60;
 
@@ -71,8 +74,11 @@ export const calculateDuration = (startDate, endDate) => {
 };
 
 // sets the duration in the formik
-// @ts-expect-error TS(7006): Parameter 'startDate' implicitly has an 'any' type... Remove this comment to see the full error message
-const setDuration = (startDate, endDate, setFieldValue) => {
+const setDuration = (
+	startDate: Date,
+	endDate: Date ,
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>
+) => {
 	const { durationHours, durationMinutes } = calculateDuration(
 		startDate,
 		endDate
@@ -83,22 +89,30 @@ const setDuration = (startDate, endDate, setFieldValue) => {
 };
 
 // checks if the time of the endDate is before the time of the startDate
-// @ts-expect-error TS(7006): Parameter 'startDate' implicitly has an 'any' type... Remove this comment to see the full error message
-const isEndBeforeStart = (startDate, endDate) => {
+const isEndBeforeStart = (
+	startDate: Date,
+	endDate: Date
+) => {
 	return startDate > endDate;
 };
 
+type RequiredFormikValues = {
+	scheduleEndHour: string,
+	scheduleEndMinute: string,
+	captureAgent?: string,	// Ideally this should be required if "checkConflicts" is not undefined
+}
+
 // changes the start in the formik
 const changeStart = (
-// @ts-expect-error TS(7006): Parameter 'eventId' implicitly has an 'any' type.
-	eventId,
-// @ts-expect-error TS(7006): Parameter 'start' implicitly has an 'any' type.
-	start,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
-	checkConflicts: any
+	eventId: string,
+	start: {
+		date: string | number | Date,
+		hour: string,
+		minute: string,
+	},
+	formikValues: RequiredFormikValues,
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown,
 ) => {
 	const startDate = makeDate(start.date, start.hour, start.minute);
 	let endDate = makeDate(
@@ -115,7 +129,7 @@ const changeStart = (
 	setFieldValue("scheduleEndDate", getISODateString(endDate));
 	setFieldValue("scheduleStartDate", getISODateString(startDate));
 
-	if (!!checkConflicts) {
+	if (!!checkConflicts && !!formikValues.captureAgent) {
 		checkConflicts(
 			eventId,
 			startDate,
@@ -127,12 +141,10 @@ const changeStart = (
 
 export const changeStartDate = (
 	value: Date,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
+	formikValues: RequiredFormikValues & { scheduleStartHour: string, scheduleStartMinute: string },
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
 	eventId = "",
-	checkConflicts: any = null
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	changeStart(
 		eventId,
@@ -148,14 +160,11 @@ export const changeStartDate = (
 };
 
 export const changeStartHour = async (
-// @ts-expect-error TS(7006): Parameter 'value' implicitly has an 'any' type.
-	value,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
+	value: string,
+	formikValues: RequiredFormikValues & { scheduleStartDate: string | number, scheduleStartMinute: string },
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
 	eventId = "",
-	checkConflicts: any = null
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	changeStart(
 		eventId,
@@ -173,14 +182,11 @@ export const changeStartHour = async (
 };
 
 export const changeStartMinute = async (
-// @ts-expect-error TS(7006): Parameter 'value' implicitly has an 'any' type.
-	value,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
+	value: string,
+	formikValues: RequiredFormikValues & { scheduleStartDate: string | number, scheduleStartHour: string },
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
 	eventId = "",
-	checkConflicts: any = null
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	changeStart(
 		eventId,
@@ -199,15 +205,14 @@ export const changeStartMinute = async (
 
 // changes the end in the formik
 const changeEnd = (
-// @ts-expect-error TS(7006): Parameter 'eventId' implicitly has an 'any' type.
-	eventId,
-// @ts-expect-error TS(7006): Parameter 'end' implicitly has an 'any' type.
-	end,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
-	checkConflicts: any
+	eventId: string,
+	end: {
+		hour: string,
+		minute: string,
+	},
+	formikValues: RequiredFormikValues & { scheduleStartDate: string | number, scheduleStartHour: string, scheduleStartMinute: string },
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	const endDate = makeDate(
 		formikValues.scheduleStartDate,
@@ -227,7 +232,7 @@ const changeEnd = (
 	setDuration(startDate, endDate, setFieldValue);
 	setFieldValue("scheduleEndDate", getISODateString(endDate));
 
-	if (!!checkConflicts) {
+	if (!!checkConflicts && !!formikValues.captureAgent) {
 		checkConflicts(
 			eventId,
 			startDate,
@@ -238,14 +243,11 @@ const changeEnd = (
 };
 
 export const changeEndHour = async (
-// @ts-expect-error TS(7006): Parameter 'value' implicitly has an 'any' type.
-	value,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
+	value: string,
+	formikValues: RequiredFormikValues & { scheduleStartDate: string | number, scheduleStartHour: string, scheduleStartMinute: string },
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
 	eventId = "",
-	checkConflicts: any = null
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	changeEnd(
 		eventId,
@@ -262,14 +264,11 @@ export const changeEndHour = async (
 };
 
 export const changeEndMinute = async (
-// @ts-expect-error TS(7006): Parameter 'value' implicitly has an 'any' type.
-	value,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
+	value: string,
+	formikValues: RequiredFormikValues & { scheduleStartDate: string | number, scheduleStartHour: string, scheduleStartMinute: string },
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
 	eventId = "",
-	checkConflicts: any = null
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	changeEnd(
 		eventId,
@@ -287,20 +286,16 @@ export const changeEndMinute = async (
 
 // changes the duration in the formik
 const changeDuration = (
-// @ts-expect-error TS(7006): Parameter 'eventId' implicitly has an 'any' type.
-	eventId,
-// @ts-expect-error TS(7006): Parameter 'duration' implicitly has an 'any' type.
-	duration,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
-	checkConflicts: any
+	eventId: string,
+	duration: { hours: string, minutes: string },
+	formikValues: RequiredFormikValues & { scheduleStartDate: string | number, scheduleStartHour: string, scheduleStartMinute: string },
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	const startDate = makeDate(
 		formikValues.scheduleStartDate,
 		formikValues.scheduleStartHour,
-		formikValues.scheduleStartMinute
+		formikValues.scheduleStartMinute,
 	);
 	const endDate = new Date(startDate.toISOString());
 
@@ -311,7 +306,7 @@ const changeDuration = (
 	setFieldValue("scheduleEndMinute", makeTwoDigits(endDate.getMinutes()));
 	setFieldValue("scheduleEndDate", getISODateString(endDate));
 
-	if (!!checkConflicts) {
+	if (!!checkConflicts && !!formikValues.captureAgent) {
 		checkConflicts(
 			eventId,
 			startDate,
@@ -322,14 +317,16 @@ const changeDuration = (
 };
 
 export const changeDurationHour = async (
-// @ts-expect-error TS(7006): Parameter 'value' implicitly has an 'any' type.
-	value,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
+	value: string,
+	formikValues: RequiredFormikValues & {
+		scheduleStartDate: string | number,
+		scheduleStartHour: string,
+		scheduleStartMinute: string,
+		scheduleDurationMinutes: string
+	},
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
 	eventId = "",
-	checkConflicts: any = null
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	changeDuration(
 		eventId,
@@ -346,14 +343,16 @@ export const changeDurationHour = async (
 };
 
 export const changeDurationMinute = async (
-// @ts-expect-error TS(7006): Parameter 'value' implicitly has an 'any' type.
-	value,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
+	value: string,
+	formikValues: RequiredFormikValues & {
+		scheduleStartDate: string | number,
+		scheduleStartHour: string,
+		scheduleStartMinute: string,
+		scheduleDurationHours: string
+	},
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
 	eventId = "",
-	checkConflicts: any = null
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	changeDuration(
 		eventId,
@@ -371,15 +370,17 @@ export const changeDurationMinute = async (
 
 // changes the start in the formik
 const changeStartMultiple = (
-// @ts-expect-error TS(7006): Parameter 'eventId' implicitly has an 'any' type.
-	eventId,
-// @ts-expect-error TS(7006): Parameter 'start' implicitly has an 'any' type.
-	start,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
-	checkConflicts: any
+	eventId: string,
+	start: {
+		date: string | number | Date,
+		hour: string,
+		minute: string,
+	},
+	formikValues: RequiredFormikValues & {
+		scheduleEndDate: string,
+	},
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	const startDate = makeDate(start.date, start.hour, start.minute);
 	let endDate = makeDate(
@@ -407,7 +408,7 @@ const changeStartMultiple = (
 	setFieldValue("scheduleEndDate", getISODateString(endDate));
 	setFieldValue("scheduleStartDate", getISODateString(startDate));
 
-	if (!!checkConflicts) {
+	if (!!checkConflicts && !! formikValues.captureAgent) {
 		checkConflicts(
 			eventId,
 			startDate,
@@ -418,14 +419,15 @@ const changeStartMultiple = (
 };
 
 export const changeStartDateMultiple = (
-// @ts-expect-error TS(7006): Parameter 'value' implicitly has an 'any' type.
-	value,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
+	value: Date,
+	formikValues: RequiredFormikValues & {
+		scheduleEndDate: string,
+		scheduleStartHour: string,
+		scheduleStartMinute: string,
+	},
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
 	eventId = "",
-	checkConflicts: any = null
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	changeStartMultiple(
 		eventId,
@@ -441,14 +443,15 @@ export const changeStartDateMultiple = (
 };
 
 export const changeStartHourMultiple = async (
-// @ts-expect-error TS(7006): Parameter 'value' implicitly has an 'any' type.
-	value,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
+	value: string,
+	formikValues: RequiredFormikValues & {
+		scheduleEndDate: string,
+		scheduleStartDate: string,
+		scheduleStartMinute: string,
+	},
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
 	eventId = "",
-	checkConflicts: any = null
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	changeStartMultiple(
 		eventId,
@@ -466,14 +469,15 @@ export const changeStartHourMultiple = async (
 };
 
 export const changeStartMinuteMultiple = async (
-// @ts-expect-error TS(7006): Parameter 'value' implicitly has an 'any' type.
-	value,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
+	value: string,
+	formikValues: RequiredFormikValues & {
+		scheduleEndDate: string,
+		scheduleStartDate: string,
+		scheduleStartHour: string,
+	},
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
 	eventId = "",
-	checkConflicts: any = null
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	changeStartMultiple(
 		eventId,
@@ -492,14 +496,16 @@ export const changeStartMinuteMultiple = async (
 
 // changes the end in the formik
 export const changeEndDateMultiple = async (
-// @ts-expect-error TS(7006): Parameter 'value' implicitly has an 'any' type.
-	value,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
+	value: string | Date,
+	formikValues: RequiredFormikValues & {
+		scheduleEndDate: string,
+		scheduleStartDate: string,
+		scheduleStartHour: string,
+		scheduleStartMinute: string,
+	},
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
 	eventId = "",
-	checkConflicts: any = null
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	const endDate = makeDate(
 		value,
@@ -522,7 +528,7 @@ export const changeEndDateMultiple = async (
 	setFieldValue("scheduleEndDate", getISODateString(endDate));
 	setFieldValue("scheduleStartDate", getISODateString(startDate));
 
-	if (!!checkConflicts) {
+	if (!!checkConflicts && !!formikValues.captureAgent) {
 		checkConflicts(
 			eventId,
 			startDate,
@@ -534,15 +540,19 @@ export const changeEndDateMultiple = async (
 
 // changes the end in the formik
 const changeEndMultiple = (
-// @ts-expect-error TS(7006): Parameter 'eventId' implicitly has an 'any' type.
-	eventId,
-// @ts-expect-error TS(7006): Parameter 'end' implicitly has an 'any' type.
-	end,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
-	checkConflicts: any
+	eventId: string,
+	end: {
+		hour: string,
+		minute: string,
+	},
+	formikValues: RequiredFormikValues & {
+		scheduleEndDate: string,
+		scheduleStartDate: string,
+		scheduleStartHour: string,
+		scheduleStartMinute: string,
+	},
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	let endDate = makeDate(formikValues.scheduleStartDate, end.hour, end.minute);
 	const startDate = makeDate(
@@ -564,7 +574,7 @@ const changeEndMultiple = (
 	  setFieldValue("scheduleEndDate", getISODateString(endDate));
 	}
 
-	if (!!checkConflicts) {
+	if (!!checkConflicts && !!formikValues.captureAgent) {
 		checkConflicts(
 			eventId,
 			startDate,
@@ -575,14 +585,16 @@ const changeEndMultiple = (
 };
 
 export const changeEndHourMultiple = async (
-// @ts-expect-error TS(7006): Parameter 'value' implicitly has an 'any' type.
-	value,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
+	value: string,
+	formikValues: RequiredFormikValues & {
+		scheduleEndDate: string,
+		scheduleStartDate: string,
+		scheduleStartHour: string,
+		scheduleStartMinute: string,
+	},
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
 	eventId = "",
-	checkConflicts: any = null
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	changeEndMultiple(
 		eventId,
@@ -599,14 +611,16 @@ export const changeEndHourMultiple = async (
 };
 
 export const changeEndMinuteMultiple = async (
-// @ts-expect-error TS(7006): Parameter 'value' implicitly has an 'any' type.
-	value,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
+	value: string,
+	formikValues: RequiredFormikValues & {
+		scheduleEndDate: string,
+		scheduleStartDate: string,
+		scheduleStartHour: string,
+		scheduleStartMinute: string,
+	},
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
 	eventId = "",
-	checkConflicts: any = null
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	changeEndMultiple(
 		eventId,
@@ -624,15 +638,19 @@ export const changeEndMinuteMultiple = async (
 
 // changes the duration in the formik
 const changeDurationMultiple = (
-// @ts-expect-error TS(7006): Parameter 'eventId' implicitly has an 'any' type.
-	eventId,
-// @ts-expect-error TS(7006): Parameter 'duration' implicitly has an 'any' type.
-	duration,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
-	checkConflicts: any
+	eventId: string,
+	duration: {
+		hours: string,
+		minutes: string,
+	},
+	formikValues: RequiredFormikValues & {
+		scheduleEndDate: string,
+		scheduleStartDate: string,
+		scheduleStartHour: string,
+		scheduleStartMinute: string,
+	},
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	const startDate = makeDate(
 		formikValues.scheduleStartDate,
@@ -652,7 +670,7 @@ const changeDurationMultiple = (
 	setFieldValue("scheduleEndMinute", makeTwoDigits(endDate.getMinutes()));
 	setFieldValue("scheduleEndDate", getISODateString(endDate));
 
-	if (!!checkConflicts) {
+	if (!!checkConflicts && !!formikValues.captureAgent) {
 		checkConflicts(
 			eventId,
 			startDate,
@@ -663,14 +681,17 @@ const changeDurationMultiple = (
 };
 
 export const changeDurationHourMultiple = async (
-// @ts-expect-error TS(7006): Parameter 'value' implicitly has an 'any' type.
-	value,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
+	value: string,
+	formikValues: RequiredFormikValues & {
+		scheduleEndDate: string,
+		scheduleStartDate: string,
+		scheduleStartHour: string,
+		scheduleStartMinute: string,
+		scheduleDurationMinutes: string,
+	},
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
 	eventId = "",
-	checkConflicts: any = null
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	changeDurationMultiple(
 		eventId,
@@ -687,14 +708,17 @@ export const changeDurationHourMultiple = async (
 };
 
 export const changeDurationMinuteMultiple = async (
-// @ts-expect-error TS(7006): Parameter 'value' implicitly has an 'any' type.
-	value,
-// @ts-expect-error TS(7006): Parameter 'formikValues' implicitly has an 'any' t... Remove this comment to see the full error message
-	formikValues,
-// @ts-expect-error TS(7006): Parameter 'setFieldValue' implicitly has an 'any' ... Remove this comment to see the full error message
-	setFieldValue,
+	value: string,
+	formikValues: RequiredFormikValues & {
+		scheduleEndDate: string,
+		scheduleStartDate: string,
+		scheduleStartHour: string,
+		scheduleStartMinute: string,
+		scheduleDurationHours: string,
+	},
+	setFieldValue: (field: string, value: string) => Promise<void | FormikErrors<any>>,
 	eventId = "",
-	checkConflicts: any = null
+	checkConflicts?: (id: string, startDate: Date, endDate: Date, ca: string) => unknown
 ) => {
 	changeDurationMultiple(
 		eventId,
@@ -711,7 +735,6 @@ export const changeDurationMinuteMultiple = async (
 };
 
 // get localized time
-// @ts-expect-error TS(7006): Parameter 'm' implicitly has an 'any' type.
-export const localizedMoment = (m, currentLanguage) => {
-	return moment(m).locale(currentLanguage.dateLocale.code);
+export const localizedMoment = (m: string, currentLanguageCode: string) => {
+	return moment(m).locale(currentLanguageCode);
 };
diff --git a/src/utils/resourceUtils.ts b/src/utils/resourceUtils.ts
index a634e795e9..10e262af7a 100644
--- a/src/utils/resourceUtils.ts
+++ b/src/utils/resourceUtils.ts
@@ -15,6 +15,7 @@ import { hasAccess, isJson } from "./utils";
 import { RootState } from "../store";
 import { MetadataCatalog } from "../slices/eventSlice";
 import { initialFormValuesNewGroup } from '../configs/modalConfig';
+import { UpdateUser } from '../slices/userDetailsSlice';
 
 /**
  * This file contains methods that are needed in more than one resource thunk
@@ -74,7 +75,7 @@ export const getURLParams = (
 };
 
 // used for create URLSearchParams for API requests used to create/update user
-export const buildUserBody = (values: NewUser) => {
+export const buildUserBody = (values: NewUser | UpdateUser) => {
 	let data = new URLSearchParams();
 	// fill form data with user inputs
 	data.append("username", values.username);
diff --git a/src/utils/wizardUtils.ts b/src/utils/wizardUtils.ts
index a9d105a512..b906ddf664 100644
--- a/src/utils/wizardUtils.ts
+++ b/src/utils/wizardUtils.ts
@@ -35,10 +35,16 @@ export const stepIcon = {
  * If the clicked page is summary then it only should be clickable/reachable if all other
  * visible pages of the wizard are valid.
  */
-// @ts-expect-error TS(7006): Parameter 'key' implicitly has an 'any' type.
-export const isSummaryReachable = (key, steps, completed) => {
+
+export const isSummaryReachable = (
+	key: number,
+	steps: {
+		name: string,
+		hidden?: boolean,
+	}[],
+	completed: Record<number, boolean>,
+) => {
 	if (steps[key].name === "summary") {
-// @ts-expect-error TS(7006): Parameter 'step' implicitly has an 'any' type.
 		const visibleSteps = steps.filter((step) => !step.hidden);
 
 		return Object.keys(completed).length >= visibleSteps.length - 2;