diff --git a/src/page-modules/contact/means-of-transport/forms/delayForm.tsx b/src/page-modules/contact/means-of-transport/forms/delayForm.tsx
index b1d28263..7e0744c6 100644
--- a/src/page-modules/contact/means-of-transport/forms/delayForm.tsx
+++ b/src/page-modules/contact/means-of-transport/forms/delayForm.tsx
@@ -39,7 +39,7 @@ export const DelayForm = ({ state, send }: DelayFormProps) => {
         </Typo.p>
 
         <Select
-          label={t(PageText.Contact.inputFields.transportMode.label).toString()}
+          label={t(PageText.Contact.input.transportMode.label).toString()}
           value={state.context.transportMode}
           onChange={(value) =>
             send({
@@ -58,13 +58,11 @@ export const DelayForm = ({ state, send }: DelayFormProps) => {
           }
           valueToId={(val: TransportModeType) => val}
           options={['bus', 'water'] as TransportModeType[]}
-          placeholder={t(
-            PageText.Contact.inputFields.transportMode.optionLabel,
-          )}
+          placeholder={t(PageText.Contact.input.transportMode.optionLabel)}
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.line.label)}
+          label={t(PageText.Contact.input.line.label)}
           value={state.context.line}
           disabled={!state.context.transportMode}
           onChange={(value: Line | undefined) => {
@@ -80,7 +78,7 @@ export const DelayForm = ({ state, send }: DelayFormProps) => {
           )}
           valueToId={(line: Line) => line.id}
           valueToText={(line: Line) => line.name}
-          placeholder={t(PageText.Contact.inputFields.line.optionLabel)}
+          placeholder={t(PageText.Contact.input.line.optionLabel)}
           error={
             state.context?.errorMessages['line']?.[0]
               ? t(state.context?.errorMessages['line']?.[0])
@@ -89,7 +87,7 @@ export const DelayForm = ({ state, send }: DelayFormProps) => {
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.fromStop.label)}
+          label={t(PageText.Contact.input.fromStop.label)}
           value={state.context.fromStop}
           disabled={!state.context.line}
           onChange={(value) => {
@@ -103,7 +101,7 @@ export const DelayForm = ({ state, send }: DelayFormProps) => {
           options={
             state.context.line?.id ? getQuaysByLine(state.context.line.id) : []
           }
-          placeholder={t(PageText.Contact.inputFields.fromStop.optionLabel)}
+          placeholder={t(PageText.Contact.input.fromStop.optionLabel)}
           error={
             state.context?.errorMessages['fromStop']?.[0]
               ? t(state.context?.errorMessages['fromStop']?.[0])
@@ -114,7 +112,7 @@ export const DelayForm = ({ state, send }: DelayFormProps) => {
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.toStop.label)}
+          label={t(PageText.Contact.input.toStop.label)}
           value={state.context.toStop}
           disabled={!state.context.line}
           onChange={(value) => {
@@ -125,7 +123,7 @@ export const DelayForm = ({ state, send }: DelayFormProps) => {
               value: value,
             });
           }}
-          placeholder={t(PageText.Contact.inputFields.toStop.optionLabel)}
+          placeholder={t(PageText.Contact.input.toStop.optionLabel)}
           options={
             state.context.line?.id ? getQuaysByLine(state.context.line.id) : []
           }
@@ -139,10 +137,11 @@ export const DelayForm = ({ state, send }: DelayFormProps) => {
         />
 
         <Input
-          label={PageText.Contact.inputFields.date}
+          label={PageText.Contact.input.date.label}
           type="date"
           name="date"
           value={state.context.date}
+          errorMessage={state.context?.errorMessages['date']?.[0]}
           onChange={(e) =>
             send({
               type: 'ON_INPUT_CHANGE',
@@ -153,10 +152,13 @@ export const DelayForm = ({ state, send }: DelayFormProps) => {
         />
 
         <Input
-          label={PageText.Contact.inputFields.plannedDepartureTime}
+          label={PageText.Contact.input.plannedDepartureTime.label}
           type="time"
           name="time"
           value={state.context.plannedDepartureTime}
+          errorMessage={
+            state.context?.errorMessages['plannedDepartureTime']?.[0]
+          }
           onChange={(e) =>
             send({
               type: 'ON_INPUT_CHANGE',
@@ -167,9 +169,9 @@ export const DelayForm = ({ state, send }: DelayFormProps) => {
         />
       </SectionCard>
 
-      <SectionCard title={t(PageText.Contact.inputFields.feedback.title)}>
+      <SectionCard title={t(PageText.Contact.input.feedback.title)}>
         <Typo.p textType="body__primary">
-          {t(PageText.Contact.inputFields.feedback.description)}
+          {t(PageText.Contact.input.feedback.description)}
         </Typo.p>
         <Textarea
           value={state.context.feedback}
@@ -188,7 +190,7 @@ export const DelayForm = ({ state, send }: DelayFormProps) => {
         />
         <FileInput
           name="attachments"
-          label={t(PageText.Contact.inputFields.feedback.attachment)}
+          label={t(PageText.Contact.input.feedback.attachment)}
           onChange={(files) => {
             send({
               type: 'ON_INPUT_CHANGE',
@@ -200,7 +202,7 @@ export const DelayForm = ({ state, send }: DelayFormProps) => {
       </SectionCard>
       <SectionCard title={t(PageText.Contact.aboutYouInfo.optionalTitle)}>
         <Input
-          label={PageText.Contact.inputFields.firstName.label}
+          label={PageText.Contact.input.firstName.label}
           type="text"
           name="firstName"
           value={state.context.firstName}
@@ -214,7 +216,7 @@ export const DelayForm = ({ state, send }: DelayFormProps) => {
         />
 
         <Input
-          label={PageText.Contact.inputFields.lastName.label}
+          label={PageText.Contact.input.lastName.label}
           type="text"
           name="lastName"
           value={state.context.lastName}
@@ -228,7 +230,7 @@ export const DelayForm = ({ state, send }: DelayFormProps) => {
         />
 
         <Input
-          label={PageText.Contact.inputFields.email.label}
+          label={PageText.Contact.input.email.label}
           type="email"
           name="email"
           value={state.context.email}
diff --git a/src/page-modules/contact/means-of-transport/forms/driverForm.tsx b/src/page-modules/contact/means-of-transport/forms/driverForm.tsx
index 55a33c5e..d60e2045 100644
--- a/src/page-modules/contact/means-of-transport/forms/driverForm.tsx
+++ b/src/page-modules/contact/means-of-transport/forms/driverForm.tsx
@@ -40,7 +40,7 @@ export const DriverForm = ({ state, send }: DriverFormProps) => {
         </Typo.p>
 
         <Select
-          label={t(PageText.Contact.inputFields.area.label).toString()}
+          label={t(PageText.Contact.input.area.label).toString()}
           value={state.context.area}
           valueToId={(option) => option.id}
           valueToText={(option) => t(option.name)}
@@ -52,8 +52,8 @@ export const DriverForm = ({ state, send }: DriverFormProps) => {
               value: value,
             });
           }}
-          placeholder={t(PageText.Contact.inputFields.area.optionLabel)}
-          options={PageText.Contact.inputFields.area.options}
+          placeholder={t(PageText.Contact.input.area.optionLabel)}
+          options={PageText.Contact.input.area.options}
           error={
             state.context?.errorMessages['area']?.[0]
               ? t(state.context?.errorMessages['area']?.[0])
@@ -62,7 +62,7 @@ export const DriverForm = ({ state, send }: DriverFormProps) => {
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.transportMode.label).toString()}
+          label={t(PageText.Contact.input.transportMode.label).toString()}
           value={state.context.transportMode}
           onChange={(value) =>
             send({
@@ -81,13 +81,11 @@ export const DriverForm = ({ state, send }: DriverFormProps) => {
           }
           valueToId={(val: TransportModeType) => val}
           options={['bus', 'water'] as TransportModeType[]}
-          placeholder={t(
-            PageText.Contact.inputFields.transportMode.optionLabel,
-          )}
+          placeholder={t(PageText.Contact.input.transportMode.optionLabel)}
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.line.label)}
+          label={t(PageText.Contact.input.line.label)}
           value={state.context.line}
           disabled={!state.context.transportMode}
           onChange={(value: Line | undefined) => {
@@ -103,7 +101,7 @@ export const DriverForm = ({ state, send }: DriverFormProps) => {
           )}
           valueToId={(line: Line) => line.id}
           valueToText={(line: Line) => line.name}
-          placeholder={t(PageText.Contact.inputFields.line.optionLabel)}
+          placeholder={t(PageText.Contact.input.line.optionLabel)}
           error={
             state.context?.errorMessages['line']?.[0]
               ? t(state.context?.errorMessages['line']?.[0])
@@ -112,7 +110,7 @@ export const DriverForm = ({ state, send }: DriverFormProps) => {
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.fromStop.label)}
+          label={t(PageText.Contact.input.fromStop.label)}
           value={state.context.fromStop}
           disabled={!state.context.line}
           onChange={(value) => {
@@ -126,7 +124,7 @@ export const DriverForm = ({ state, send }: DriverFormProps) => {
           options={
             state.context.line?.id ? getQuaysByLine(state.context.line.id) : []
           }
-          placeholder={t(PageText.Contact.inputFields.fromStop.optionLabel)}
+          placeholder={t(PageText.Contact.input.fromStop.optionLabel)}
           error={
             state.context?.errorMessages['fromStop']?.[0]
               ? t(state.context?.errorMessages['fromStop']?.[0])
@@ -137,7 +135,7 @@ export const DriverForm = ({ state, send }: DriverFormProps) => {
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.toStop.label)}
+          label={t(PageText.Contact.input.toStop.label)}
           value={state.context.toStop}
           disabled={!state.context.line}
           onChange={(value) => {
@@ -148,7 +146,7 @@ export const DriverForm = ({ state, send }: DriverFormProps) => {
               value: value,
             });
           }}
-          placeholder={t(PageText.Contact.inputFields.toStop.optionLabel)}
+          placeholder={t(PageText.Contact.input.toStop.optionLabel)}
           options={
             state.context.line?.id ? getQuaysByLine(state.context.line.id) : []
           }
@@ -162,10 +160,11 @@ export const DriverForm = ({ state, send }: DriverFormProps) => {
         />
 
         <Input
-          label={PageText.Contact.inputFields.date}
+          label={PageText.Contact.input.date.label}
           type="date"
           name="date"
           value={state.context.date}
+          errorMessage={state.context?.errorMessages['date']?.[0]}
           onChange={(e) =>
             send({
               type: 'ON_INPUT_CHANGE',
@@ -176,10 +175,13 @@ export const DriverForm = ({ state, send }: DriverFormProps) => {
         />
 
         <Input
-          label={PageText.Contact.inputFields.plannedDepartureTime}
+          label={PageText.Contact.input.plannedDepartureTime.label}
           type="time"
           name="time"
           value={state.context.plannedDepartureTime}
+          errorMessage={
+            state.context?.errorMessages['plannedDepartureTime']?.[0]
+          }
           onChange={(e) =>
             send({
               type: 'ON_INPUT_CHANGE',
@@ -190,9 +192,9 @@ export const DriverForm = ({ state, send }: DriverFormProps) => {
         />
       </SectionCard>
 
-      <SectionCard title={t(PageText.Contact.inputFields.feedback.title)}>
+      <SectionCard title={t(PageText.Contact.input.feedback.title)}>
         <Typo.p textType="body__primary">
-          {t(PageText.Contact.inputFields.feedback.description)}
+          {t(PageText.Contact.input.feedback.description)}
         </Typo.p>
         <Textarea
           value={state.context.feedback}
@@ -211,7 +213,7 @@ export const DriverForm = ({ state, send }: DriverFormProps) => {
         />
         <FileInput
           name="attachments"
-          label={t(PageText.Contact.inputFields.feedback.attachment)}
+          label={t(PageText.Contact.input.feedback.attachment)}
           onChange={(files) => {
             send({
               type: 'ON_INPUT_CHANGE',
@@ -223,7 +225,7 @@ export const DriverForm = ({ state, send }: DriverFormProps) => {
       </SectionCard>
       <SectionCard title={t(PageText.Contact.aboutYouInfo.optionalTitle)}>
         <Input
-          label={PageText.Contact.inputFields.firstName.label}
+          label={PageText.Contact.input.firstName.label}
           type="text"
           name="firstName"
           value={state.context.firstName}
@@ -237,7 +239,7 @@ export const DriverForm = ({ state, send }: DriverFormProps) => {
         />
 
         <Input
-          label={PageText.Contact.inputFields.lastName.label}
+          label={PageText.Contact.input.lastName.label}
           type="text"
           name="lastName"
           value={state.context.lastName}
@@ -251,11 +253,11 @@ export const DriverForm = ({ state, send }: DriverFormProps) => {
         />
 
         <Typo.p textType="body__primary">
-          {t(PageText.Contact.inputFields.email.wantsToBeContacted.question)}
+          {t(PageText.Contact.input.email.wantsToBeContacted.question)}
         </Typo.p>
 
         <RadioInput
-          label={t(PageText.Contact.inputFields.email.wantsToBeContacted.yes)}
+          label={t(PageText.Contact.input.email.wantsToBeContacted.yes)}
           name="wantsToBeContacted"
           checked={state.context.wantsToBeContacted}
           onChange={() =>
@@ -267,7 +269,7 @@ export const DriverForm = ({ state, send }: DriverFormProps) => {
           }
         />
         <RadioInput
-          label={t(PageText.Contact.inputFields.email.wantsToBeContacted.no)}
+          label={t(PageText.Contact.input.email.wantsToBeContacted.no)}
           name="wantsToBeContacted"
           checked={!state.context.wantsToBeContacted}
           onChange={() =>
@@ -280,7 +282,7 @@ export const DriverForm = ({ state, send }: DriverFormProps) => {
         />
         {state.context.wantsToBeContacted && (
           <Input
-            label={PageText.Contact.inputFields.email.wantsToBeContacted.label}
+            label={PageText.Contact.input.email.wantsToBeContacted.label}
             type="email"
             name="email"
             value={state.context.email}
diff --git a/src/page-modules/contact/means-of-transport/forms/injuryForm.tsx b/src/page-modules/contact/means-of-transport/forms/injuryForm.tsx
index 1a391e39..94624307 100644
--- a/src/page-modules/contact/means-of-transport/forms/injuryForm.tsx
+++ b/src/page-modules/contact/means-of-transport/forms/injuryForm.tsx
@@ -39,7 +39,7 @@ export const InjuryForm = ({ state, send }: InjuryFormProps) => {
         </Typo.p>
 
         <Select
-          label={t(PageText.Contact.inputFields.area.label).toString()}
+          label={t(PageText.Contact.input.area.label).toString()}
           value={state.context.area}
           valueToId={(option) => option.id}
           valueToText={(option) => t(option.name)}
@@ -51,8 +51,8 @@ export const InjuryForm = ({ state, send }: InjuryFormProps) => {
               value: value,
             });
           }}
-          placeholder={t(PageText.Contact.inputFields.area.optionLabel)}
-          options={PageText.Contact.inputFields.area.options}
+          placeholder={t(PageText.Contact.input.area.optionLabel)}
+          options={PageText.Contact.input.area.options}
           error={
             state.context?.errorMessages['area']?.[0]
               ? t(state.context?.errorMessages['area']?.[0])
@@ -61,7 +61,7 @@ export const InjuryForm = ({ state, send }: InjuryFormProps) => {
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.transportMode.label).toString()}
+          label={t(PageText.Contact.input.transportMode.label).toString()}
           value={state.context.transportMode}
           onChange={(value) =>
             send({
@@ -80,13 +80,11 @@ export const InjuryForm = ({ state, send }: InjuryFormProps) => {
           }
           valueToId={(val: TransportModeType) => val}
           options={['bus', 'water'] as TransportModeType[]}
-          placeholder={t(
-            PageText.Contact.inputFields.transportMode.optionLabel,
-          )}
+          placeholder={t(PageText.Contact.input.transportMode.optionLabel)}
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.line.label)}
+          label={t(PageText.Contact.input.line.label)}
           value={state.context.line}
           disabled={!state.context.transportMode}
           onChange={(value: Line | undefined) => {
@@ -102,7 +100,7 @@ export const InjuryForm = ({ state, send }: InjuryFormProps) => {
           )}
           valueToId={(line: Line) => line.id}
           valueToText={(line: Line) => line.name}
-          placeholder={t(PageText.Contact.inputFields.line.optionLabel)}
+          placeholder={t(PageText.Contact.input.line.optionLabel)}
           error={
             state.context?.errorMessages['line']?.[0]
               ? t(state.context?.errorMessages['line']?.[0])
@@ -111,7 +109,7 @@ export const InjuryForm = ({ state, send }: InjuryFormProps) => {
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.fromStop.label)}
+          label={t(PageText.Contact.input.fromStop.label)}
           value={state.context.fromStop}
           disabled={!state.context.line}
           onChange={(value) => {
@@ -125,7 +123,7 @@ export const InjuryForm = ({ state, send }: InjuryFormProps) => {
           options={
             state.context.line?.id ? getQuaysByLine(state.context.line.id) : []
           }
-          placeholder={t(PageText.Contact.inputFields.fromStop.optionLabel)}
+          placeholder={t(PageText.Contact.input.fromStop.optionLabel)}
           error={
             state.context?.errorMessages['fromStop']?.[0]
               ? t(state.context?.errorMessages['fromStop']?.[0])
@@ -136,7 +134,7 @@ export const InjuryForm = ({ state, send }: InjuryFormProps) => {
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.toStop.label)}
+          label={t(PageText.Contact.input.toStop.label)}
           value={state.context.toStop}
           disabled={!state.context.line}
           onChange={(value) => {
@@ -147,7 +145,7 @@ export const InjuryForm = ({ state, send }: InjuryFormProps) => {
               value: value,
             });
           }}
-          placeholder={t(PageText.Contact.inputFields.toStop.optionLabel)}
+          placeholder={t(PageText.Contact.input.toStop.optionLabel)}
           options={
             state.context.line?.id ? getQuaysByLine(state.context.line.id) : []
           }
@@ -161,10 +159,11 @@ export const InjuryForm = ({ state, send }: InjuryFormProps) => {
         />
 
         <Input
-          label={PageText.Contact.inputFields.date}
+          label={PageText.Contact.input.date.label}
           type="date"
           name="date"
           value={state.context.date}
+          errorMessage={state.context?.errorMessages['date']?.[0]}
           onChange={(e) =>
             send({
               type: 'ON_INPUT_CHANGE',
@@ -175,10 +174,13 @@ export const InjuryForm = ({ state, send }: InjuryFormProps) => {
         />
 
         <Input
-          label={PageText.Contact.inputFields.plannedDepartureTime}
+          label={PageText.Contact.input.plannedDepartureTime.label}
           type="time"
           name="time"
           value={state.context.plannedDepartureTime}
+          errorMessage={
+            state.context?.errorMessages['plannedDepartureTime']?.[0]
+          }
           onChange={(e) =>
             send({
               type: 'ON_INPUT_CHANGE',
@@ -189,9 +191,9 @@ export const InjuryForm = ({ state, send }: InjuryFormProps) => {
         />
       </SectionCard>
 
-      <SectionCard title={t(PageText.Contact.inputFields.feedback.title)}>
+      <SectionCard title={t(PageText.Contact.input.feedback.title)}>
         <Typo.p textType="body__primary">
-          {t(PageText.Contact.inputFields.feedback.description)}
+          {t(PageText.Contact.input.feedback.description)}
         </Typo.p>
         <Textarea
           value={state.context.feedback}
@@ -210,7 +212,7 @@ export const InjuryForm = ({ state, send }: InjuryFormProps) => {
         />
         <FileInput
           name="attachments"
-          label={t(PageText.Contact.inputFields.feedback.attachment)}
+          label={t(PageText.Contact.input.feedback.attachment)}
           onChange={(files) => {
             send({
               type: 'ON_INPUT_CHANGE',
@@ -222,7 +224,7 @@ export const InjuryForm = ({ state, send }: InjuryFormProps) => {
       </SectionCard>
       <SectionCard title={t(PageText.Contact.aboutYouInfo.optionalTitle)}>
         <Input
-          label={PageText.Contact.inputFields.firstName.label}
+          label={PageText.Contact.input.firstName.label}
           type="text"
           name="firstName"
           value={state.context.firstName}
@@ -236,7 +238,7 @@ export const InjuryForm = ({ state, send }: InjuryFormProps) => {
         />
 
         <Input
-          label={PageText.Contact.inputFields.lastName.label}
+          label={PageText.Contact.input.lastName.label}
           type="text"
           name="lastName"
           value={state.context.lastName}
@@ -250,11 +252,11 @@ export const InjuryForm = ({ state, send }: InjuryFormProps) => {
         />
 
         <Typo.p textType="body__primary">
-          {t(PageText.Contact.inputFields.email.wantsToBeContacted.question)}
+          {t(PageText.Contact.input.email.wantsToBeContacted.question)}
         </Typo.p>
 
         <RadioInput
-          label={t(PageText.Contact.inputFields.email.wantsToBeContacted.yes)}
+          label={t(PageText.Contact.input.email.wantsToBeContacted.yes)}
           name="wantsToBeContacted"
           checked={state.context.wantsToBeContacted}
           onChange={() =>
@@ -266,7 +268,7 @@ export const InjuryForm = ({ state, send }: InjuryFormProps) => {
           }
         />
         <RadioInput
-          label={t(PageText.Contact.inputFields.email.wantsToBeContacted.no)}
+          label={t(PageText.Contact.input.email.wantsToBeContacted.no)}
           name="wantsToBeContacted"
           checked={!state.context.wantsToBeContacted}
           onChange={() =>
@@ -279,7 +281,7 @@ export const InjuryForm = ({ state, send }: InjuryFormProps) => {
         />
         {state.context.wantsToBeContacted && (
           <Input
-            label={PageText.Contact.inputFields.email.wantsToBeContacted.label}
+            label={PageText.Contact.input.email.wantsToBeContacted.label}
             type="email"
             name="email"
             value={state.context.email}
diff --git a/src/page-modules/contact/means-of-transport/forms/serviceOfferingForm.tsx b/src/page-modules/contact/means-of-transport/forms/serviceOfferingForm.tsx
index ef57130e..ced87dd7 100644
--- a/src/page-modules/contact/means-of-transport/forms/serviceOfferingForm.tsx
+++ b/src/page-modules/contact/means-of-transport/forms/serviceOfferingForm.tsx
@@ -44,7 +44,7 @@ export const ServiceOfferingForm = ({
         </Typo.p>
 
         <Select
-          label={t(PageText.Contact.inputFields.area.label).toString()}
+          label={t(PageText.Contact.input.area.label).toString()}
           value={state.context.area}
           valueToId={(option) => option.id}
           valueToText={(option) => t(option.name)}
@@ -56,8 +56,8 @@ export const ServiceOfferingForm = ({
               value: value,
             });
           }}
-          placeholder={t(PageText.Contact.inputFields.area.optionLabel)}
-          options={PageText.Contact.inputFields.area.options}
+          placeholder={t(PageText.Contact.input.area.optionLabel)}
+          options={PageText.Contact.input.area.options}
           error={
             state.context?.errorMessages['area']?.[0]
               ? t(state.context?.errorMessages['area']?.[0])
@@ -66,7 +66,7 @@ export const ServiceOfferingForm = ({
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.transportMode.label).toString()}
+          label={t(PageText.Contact.input.transportMode.label).toString()}
           value={state.context.transportMode}
           onChange={(value) =>
             send({
@@ -85,13 +85,11 @@ export const ServiceOfferingForm = ({
           }
           valueToId={(val: TransportModeType) => val}
           options={['bus', 'water'] as TransportModeType[]}
-          placeholder={t(
-            PageText.Contact.inputFields.transportMode.optionLabel,
-          )}
+          placeholder={t(PageText.Contact.input.transportMode.optionLabel)}
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.line.label)}
+          label={t(PageText.Contact.input.line.label)}
           value={state.context.line}
           disabled={!state.context.transportMode}
           onChange={(value: Line | undefined) => {
@@ -107,7 +105,7 @@ export const ServiceOfferingForm = ({
           )}
           valueToId={(line: Line) => line.id}
           valueToText={(line: Line) => line.name}
-          placeholder={t(PageText.Contact.inputFields.line.optionLabel)}
+          placeholder={t(PageText.Contact.input.line.optionLabel)}
           error={
             state.context?.errorMessages['line']?.[0]
               ? t(state.context?.errorMessages['line']?.[0])
@@ -116,9 +114,9 @@ export const ServiceOfferingForm = ({
         />
       </SectionCard>
 
-      <SectionCard title={t(PageText.Contact.inputFields.feedback.title)}>
+      <SectionCard title={t(PageText.Contact.input.feedback.title)}>
         <Typo.p textType="body__primary">
-          {t(PageText.Contact.inputFields.feedback.description)}
+          {t(PageText.Contact.input.feedback.description)}
         </Typo.p>
         <Textarea
           value={state.context.feedback}
@@ -137,7 +135,7 @@ export const ServiceOfferingForm = ({
         />
         <FileInput
           name="attachments"
-          label={t(PageText.Contact.inputFields.feedback.attachment)}
+          label={t(PageText.Contact.input.feedback.attachment)}
           onChange={(files) => {
             send({
               type: 'ON_INPUT_CHANGE',
@@ -149,7 +147,7 @@ export const ServiceOfferingForm = ({
       </SectionCard>
       <SectionCard title={t(PageText.Contact.aboutYouInfo.optionalTitle)}>
         <Input
-          label={PageText.Contact.inputFields.firstName.label}
+          label={PageText.Contact.input.firstName.label}
           type="text"
           name="firstName"
           value={state.context.firstName}
@@ -163,7 +161,7 @@ export const ServiceOfferingForm = ({
         />
 
         <Input
-          label={PageText.Contact.inputFields.lastName.label}
+          label={PageText.Contact.input.lastName.label}
           type="text"
           name="lastName"
           value={state.context.lastName}
diff --git a/src/page-modules/contact/means-of-transport/forms/stopForm.tsx b/src/page-modules/contact/means-of-transport/forms/stopForm.tsx
index 9b0cc5ee..cd21e394 100644
--- a/src/page-modules/contact/means-of-transport/forms/stopForm.tsx
+++ b/src/page-modules/contact/means-of-transport/forms/stopForm.tsx
@@ -35,7 +35,7 @@ export const StopForm = ({ state, send }: StopFormProps) => {
         </Typo.p>
 
         <Select
-          label={t(PageText.Contact.inputFields.transportMode.label).toString()}
+          label={t(PageText.Contact.input.transportMode.label).toString()}
           value={state.context.transportMode}
           onChange={(value) =>
             send({
@@ -54,13 +54,11 @@ export const StopForm = ({ state, send }: StopFormProps) => {
           }
           valueToId={(val: TransportModeType) => val}
           options={['bus', 'water'] as TransportModeType[]}
-          placeholder={t(
-            PageText.Contact.inputFields.transportMode.optionLabel,
-          )}
+          placeholder={t(PageText.Contact.input.transportMode.optionLabel)}
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.line.label)}
+          label={t(PageText.Contact.input.line.label)}
           value={state.context.line}
           disabled={!state.context.transportMode}
           onChange={(value: Line | undefined) => {
@@ -76,7 +74,7 @@ export const StopForm = ({ state, send }: StopFormProps) => {
           )}
           valueToId={(line: Line) => line.id}
           valueToText={(line: Line) => line.name}
-          placeholder={t(PageText.Contact.inputFields.line.optionLabel)}
+          placeholder={t(PageText.Contact.input.line.optionLabel)}
           error={
             state.context?.errorMessages['line']?.[0]
               ? t(state.context?.errorMessages['line']?.[0])
@@ -85,9 +83,7 @@ export const StopForm = ({ state, send }: StopFormProps) => {
         />
 
         <Select
-          label={t(
-            PageText.Contact.inputFields.fromStop.labelWhitoutSpecification,
-          )}
+          label={t(PageText.Contact.input.fromStop.labelWhitoutSpecification)}
           value={state.context.fromStop}
           disabled={!state.context.line}
           onChange={(value) => {
@@ -101,7 +97,7 @@ export const StopForm = ({ state, send }: StopFormProps) => {
           options={
             state.context.line?.id ? getQuaysByLine(state.context.line.id) : []
           }
-          placeholder={t(PageText.Contact.inputFields.fromStop.optionLabel)}
+          placeholder={t(PageText.Contact.input.fromStop.optionLabel)}
           error={
             state.context?.errorMessages['fromStop']?.[0]
               ? t(state.context?.errorMessages['fromStop']?.[0])
@@ -112,10 +108,11 @@ export const StopForm = ({ state, send }: StopFormProps) => {
         />
 
         <Input
-          label={PageText.Contact.inputFields.date}
+          label={PageText.Contact.input.date.label}
           type="date"
           name="date"
           value={state.context.date}
+          errorMessage={state.context?.errorMessages['date']?.[0]}
           onChange={(e) =>
             send({
               type: 'ON_INPUT_CHANGE',
@@ -126,9 +123,9 @@ export const StopForm = ({ state, send }: StopFormProps) => {
         />
       </SectionCard>
 
-      <SectionCard title={t(PageText.Contact.inputFields.feedback.title)}>
+      <SectionCard title={t(PageText.Contact.input.feedback.title)}>
         <Typo.p textType="body__primary">
-          {t(PageText.Contact.inputFields.feedback.description)}
+          {t(PageText.Contact.input.feedback.description)}
         </Typo.p>
         <Textarea
           value={state.context.feedback}
@@ -147,7 +144,7 @@ export const StopForm = ({ state, send }: StopFormProps) => {
         />
         <FileInput
           name="attachments"
-          label={t(PageText.Contact.inputFields.feedback.attachment)}
+          label={t(PageText.Contact.input.feedback.attachment)}
           onChange={(files) => {
             send({
               type: 'ON_INPUT_CHANGE',
@@ -159,7 +156,7 @@ export const StopForm = ({ state, send }: StopFormProps) => {
       </SectionCard>
       <SectionCard title={t(PageText.Contact.aboutYouInfo.optionalTitle)}>
         <Input
-          label={PageText.Contact.inputFields.firstName.label}
+          label={PageText.Contact.input.firstName.label}
           type="text"
           name="firstName"
           value={state.context.firstName}
@@ -173,7 +170,7 @@ export const StopForm = ({ state, send }: StopFormProps) => {
         />
 
         <Input
-          label={PageText.Contact.inputFields.lastName.label}
+          label={PageText.Contact.input.lastName.label}
           type="text"
           name="lastName"
           value={state.context.lastName}
@@ -187,7 +184,7 @@ export const StopForm = ({ state, send }: StopFormProps) => {
         />
 
         <Input
-          label={PageText.Contact.inputFields.email.label}
+          label={PageText.Contact.input.email.label}
           type="email"
           name="email"
           value={state.context.email}
diff --git a/src/page-modules/contact/means-of-transport/forms/transportationForm.tsx b/src/page-modules/contact/means-of-transport/forms/transportationForm.tsx
index 1dd7a302..0d0486e4 100644
--- a/src/page-modules/contact/means-of-transport/forms/transportationForm.tsx
+++ b/src/page-modules/contact/means-of-transport/forms/transportationForm.tsx
@@ -43,7 +43,7 @@ export const TransportationForm = ({
         </Typo.p>
 
         <Select
-          label={t(PageText.Contact.inputFields.transportMode.label).toString()}
+          label={t(PageText.Contact.input.transportMode.label).toString()}
           value={state.context.transportMode}
           onChange={(value) =>
             send({
@@ -62,13 +62,11 @@ export const TransportationForm = ({
           }
           valueToId={(val: TransportModeType) => val}
           options={['bus', 'water'] as TransportModeType[]}
-          placeholder={t(
-            PageText.Contact.inputFields.transportMode.optionLabel,
-          )}
+          placeholder={t(PageText.Contact.input.transportMode.optionLabel)}
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.line.label)}
+          label={t(PageText.Contact.input.line.label)}
           value={state.context.line}
           disabled={!state.context.transportMode}
           onChange={(value: Line | undefined) => {
@@ -84,7 +82,7 @@ export const TransportationForm = ({
           )}
           valueToId={(line: Line) => line.id}
           valueToText={(line: Line) => line.name}
-          placeholder={t(PageText.Contact.inputFields.line.optionLabel)}
+          placeholder={t(PageText.Contact.input.line.optionLabel)}
           error={
             state.context?.errorMessages['line']?.[0]
               ? t(state.context?.errorMessages['line']?.[0])
@@ -93,7 +91,7 @@ export const TransportationForm = ({
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.fromStop.label)}
+          label={t(PageText.Contact.input.fromStop.label)}
           value={state.context.fromStop}
           disabled={!state.context.line}
           onChange={(value) => {
@@ -107,7 +105,7 @@ export const TransportationForm = ({
           options={
             state.context.line?.id ? getQuaysByLine(state.context.line.id) : []
           }
-          placeholder={t(PageText.Contact.inputFields.fromStop.optionLabel)}
+          placeholder={t(PageText.Contact.input.fromStop.optionLabel)}
           error={
             state.context?.errorMessages['fromStop']?.[0]
               ? t(state.context?.errorMessages['fromStop']?.[0])
@@ -118,7 +116,7 @@ export const TransportationForm = ({
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.toStop.label)}
+          label={t(PageText.Contact.input.toStop.label)}
           value={state.context.toStop}
           disabled={!state.context.line}
           onChange={(value) => {
@@ -129,7 +127,7 @@ export const TransportationForm = ({
               value: value,
             });
           }}
-          placeholder={t(PageText.Contact.inputFields.toStop.optionLabel)}
+          placeholder={t(PageText.Contact.input.toStop.optionLabel)}
           options={
             state.context.line?.id ? getQuaysByLine(state.context.line.id) : []
           }
@@ -143,10 +141,11 @@ export const TransportationForm = ({
         />
 
         <Input
-          label={PageText.Contact.inputFields.date}
+          label={PageText.Contact.input.date.label}
           type="date"
           name="date"
           value={state.context.date}
+          errorMessage={state.context?.errorMessages['date']?.[0]}
           onChange={(e) =>
             send({
               type: 'ON_INPUT_CHANGE',
@@ -157,10 +156,13 @@ export const TransportationForm = ({
         />
 
         <Input
-          label={PageText.Contact.inputFields.plannedDepartureTime}
+          label={PageText.Contact.input.plannedDepartureTime.label}
           type="time"
           name="time"
           value={state.context.plannedDepartureTime}
+          errorMessage={
+            state.context?.errorMessages['plannedDepartureTime']?.[0]
+          }
           onChange={(e) =>
             send({
               type: 'ON_INPUT_CHANGE',
@@ -171,9 +173,9 @@ export const TransportationForm = ({
         />
       </SectionCard>
 
-      <SectionCard title={t(PageText.Contact.inputFields.feedback.title)}>
+      <SectionCard title={t(PageText.Contact.input.feedback.title)}>
         <Typo.p textType="body__primary">
-          {t(PageText.Contact.inputFields.feedback.description)}
+          {t(PageText.Contact.input.feedback.description)}
         </Typo.p>
         <Textarea
           value={state.context.feedback}
@@ -192,7 +194,7 @@ export const TransportationForm = ({
         />
         <FileInput
           name="attachments"
-          label={t(PageText.Contact.inputFields.feedback.attachment)}
+          label={t(PageText.Contact.input.feedback.attachment)}
           onChange={(files) => {
             send({
               type: 'ON_INPUT_CHANGE',
@@ -204,7 +206,7 @@ export const TransportationForm = ({
       </SectionCard>
       <SectionCard title={t(PageText.Contact.aboutYouInfo.optionalTitle)}>
         <Input
-          label={PageText.Contact.inputFields.firstName.label}
+          label={PageText.Contact.input.firstName.label}
           type="text"
           name="firstName"
           value={state.context.firstName}
@@ -218,7 +220,7 @@ export const TransportationForm = ({
         />
 
         <Input
-          label={PageText.Contact.inputFields.lastName.label}
+          label={PageText.Contact.input.lastName.label}
           type="text"
           name="lastName"
           value={state.context.lastName}
@@ -232,11 +234,11 @@ export const TransportationForm = ({
         />
 
         <Typo.p textType="body__primary">
-          {t(PageText.Contact.inputFields.email.wantsToBeContacted.question)}
+          {t(PageText.Contact.input.email.wantsToBeContacted.question)}
         </Typo.p>
 
         <RadioInput
-          label={t(PageText.Contact.inputFields.email.wantsToBeContacted.yes)}
+          label={t(PageText.Contact.input.email.wantsToBeContacted.yes)}
           name="wantsToBeContacted"
           checked={state.context.wantsToBeContacted}
           onChange={() =>
@@ -248,7 +250,7 @@ export const TransportationForm = ({
           }
         />
         <RadioInput
-          label={t(PageText.Contact.inputFields.email.wantsToBeContacted.no)}
+          label={t(PageText.Contact.input.email.wantsToBeContacted.no)}
           name="wantsToBeContacted"
           checked={!state.context.wantsToBeContacted}
           onChange={() =>
@@ -261,7 +263,7 @@ export const TransportationForm = ({
         />
         {state.context.wantsToBeContacted && (
           <Input
-            label={PageText.Contact.inputFields.email.wantsToBeContacted.label}
+            label={PageText.Contact.input.email.wantsToBeContacted.label}
             type="email"
             name="email"
             value={state.context.email}
diff --git a/src/page-modules/contact/ticket-control/forms/feeComplaintForm.tsx b/src/page-modules/contact/ticket-control/forms/feeComplaintForm.tsx
index d8c64156..c1f6a2d7 100644
--- a/src/page-modules/contact/ticket-control/forms/feeComplaintForm.tsx
+++ b/src/page-modules/contact/ticket-control/forms/feeComplaintForm.tsx
@@ -111,7 +111,7 @@ const FormContent = ({ state, send }: FormProps) => {
     <div>
       <SectionCard title={t(PageText.Contact.ticketControl.feeComplaint.title)}>
         <Input
-          label={PageText.Contact.inputFields.feeNumber.label}
+          label={PageText.Contact.input.feeNumber.label}
           type="text"
           name="feeNumber"
           value={state.context.feeNumber || ''}
@@ -126,11 +126,11 @@ const FormContent = ({ state, send }: FormProps) => {
         />
 
         <Typo.h3 textType="heading__component">
-          {t(PageText.Contact.inputFields.ticketStorage.question)}
+          {t(PageText.Contact.input.ticketStorage.question)}
         </Typo.h3>
 
         <RadioInput
-          label={t(PageText.Contact.inputFields.ticketStorage.app.title)}
+          label={t(PageText.Contact.input.ticketStorage.app.title)}
           name="isAppTicketStorageMode"
           checked={state.context.isAppTicketStorageMode}
           onChange={() =>
@@ -142,9 +142,7 @@ const FormContent = ({ state, send }: FormProps) => {
           }
         />
         <RadioInput
-          label={t(
-            PageText.Contact.inputFields.ticketStorage.travelCardNumber.label,
-          )}
+          label={t(PageText.Contact.input.ticketStorage.travelCardNumber.label)}
           name="isAppTicketStorageMode"
           checked={!state.context.isAppTicketStorageMode}
           onChange={() =>
@@ -160,8 +158,7 @@ const FormContent = ({ state, send }: FormProps) => {
           <div>
             <Input
               label={
-                PageText.Contact.inputFields.ticketStorage.app.appPhoneNumber
-                  .label
+                PageText.Contact.input.ticketStorage.app.appPhoneNumber.label
               }
               type="tel"
               name="appPhoneNumber"
@@ -178,8 +175,7 @@ const FormContent = ({ state, send }: FormProps) => {
 
             <Input
               label={
-                PageText.Contact.inputFields.ticketStorage.app.customerNumber
-                  .label
+                PageText.Contact.input.ticketStorage.app.customerNumber.label
               }
               type="number"
               name="customerNumber"
@@ -197,9 +193,7 @@ const FormContent = ({ state, send }: FormProps) => {
         )}
         {!state.context.isAppTicketStorageMode && (
           <Input
-            label={
-              PageText.Contact.inputFields.ticketStorage.travelCardNumber.label
-            }
+            label={PageText.Contact.input.ticketStorage.travelCardNumber.label}
             type="number"
             name="travelCardNumber"
             value={state.context.travelCardNumber || ''}
@@ -214,7 +208,7 @@ const FormContent = ({ state, send }: FormProps) => {
           />
         )}
       </SectionCard>
-      <SectionCard title={t(PageText.Contact.inputFields.feedback.title)}>
+      <SectionCard title={t(PageText.Contact.input.feedback.title)}>
         <Textarea
           value={state.context.feedback || ''}
           onChange={(e) =>
@@ -239,13 +233,13 @@ const FormContent = ({ state, send }: FormProps) => {
               value: files,
             });
           }}
-          label={t(PageText.Contact.inputFields.feedback.attachment)}
+          label={t(PageText.Contact.input.feedback.attachment)}
         />
       </SectionCard>
 
       <SectionCard title={t(PageText.Contact.aboutYouInfo.title)}>
         <Input
-          label={PageText.Contact.inputFields.firstName.label}
+          label={PageText.Contact.input.firstName.label}
           type="text"
           autoComplete="given-name additional-name"
           name="firstName"
@@ -261,7 +255,7 @@ const FormContent = ({ state, send }: FormProps) => {
         />
 
         <Input
-          label={PageText.Contact.inputFields.lastName.label}
+          label={PageText.Contact.input.lastName.label}
           type="text"
           autoComplete="family-name"
           name="lastName"
@@ -276,7 +270,7 @@ const FormContent = ({ state, send }: FormProps) => {
           }
         />
         <Input
-          label={PageText.Contact.inputFields.address.label}
+          label={PageText.Contact.input.address.label}
           type="text"
           autoComplete="street-address"
           name="address"
@@ -291,7 +285,7 @@ const FormContent = ({ state, send }: FormProps) => {
           }
         />
         <Input
-          label={PageText.Contact.inputFields.postalCode.label}
+          label={PageText.Contact.input.postalCode.label}
           type="number"
           autoComplete="postal-code"
           name="postalCode"
@@ -306,7 +300,7 @@ const FormContent = ({ state, send }: FormProps) => {
           }
         />
         <Input
-          label={PageText.Contact.inputFields.city.label}
+          label={PageText.Contact.input.city.label}
           type="text"
           name="city"
           value={state.context.city || ''}
@@ -320,7 +314,7 @@ const FormContent = ({ state, send }: FormProps) => {
           }
         />
         <Input
-          label={PageText.Contact.inputFields.email.label}
+          label={PageText.Contact.input.email.label}
           type="email"
           autoComplete="email"
           name="email"
@@ -335,7 +329,7 @@ const FormContent = ({ state, send }: FormProps) => {
           }
         />
         <Input
-          label={PageText.Contact.inputFields.phoneNumber.label}
+          label={PageText.Contact.input.phoneNumber.label}
           type="tel"
           name="phoneNumber"
           value={state.context.phoneNumber || ''}
@@ -350,7 +344,7 @@ const FormContent = ({ state, send }: FormProps) => {
         />
 
         <Checkbox
-          label={t(PageText.Contact.inputFields.bankAccountNumber.checkbox)}
+          label={t(PageText.Contact.input.bankAccountNumber.checkbox)}
           checked={state.context.hasInternationalBankAccount}
           onChange={() =>
             send({
@@ -363,9 +357,7 @@ const FormContent = ({ state, send }: FormProps) => {
 
         {!state.context.hasInternationalBankAccount && (
           <Input
-            label={
-              PageText.Contact.inputFields.bankAccountNumber.notForeignLabel
-            }
+            label={PageText.Contact.input.bankAccountNumber.notForeignLabel}
             type="number"
             name="bankAccountNumber"
             value={state.context.bankAccountNumber || ''}
@@ -385,7 +377,7 @@ const FormContent = ({ state, send }: FormProps) => {
         {state.context.hasInternationalBankAccount && (
           <div>
             <Input
-              label={PageText.Contact.inputFields.bankAccountNumber.IBAN}
+              label={PageText.Contact.input.bankAccountNumber.IBAN}
               type="number"
               name="IBAN"
               value={state.context.IBAN || ''}
@@ -399,7 +391,7 @@ const FormContent = ({ state, send }: FormProps) => {
             />
 
             <Input
-              label={PageText.Contact.inputFields.bankAccountNumber.SWIFT}
+              label={PageText.Contact.input.bankAccountNumber.SWIFT}
               type="number"
               name="SWIFT"
               value={state.context.SWIFT || ''}
diff --git a/src/page-modules/contact/ticket-control/forms/feedbackForm.tsx b/src/page-modules/contact/ticket-control/forms/feedbackForm.tsx
index c0260e55..eaa1e52e 100644
--- a/src/page-modules/contact/ticket-control/forms/feedbackForm.tsx
+++ b/src/page-modules/contact/ticket-control/forms/feedbackForm.tsx
@@ -28,7 +28,7 @@ export const FeedbackForm = ({ state, send }: FeedbackFormProps) => {
         </Typo.p>
 
         <Select
-          label={t(PageText.Contact.inputFields.transportMode.label).toString()}
+          label={t(PageText.Contact.input.transportMode.label).toString()}
           value={state.context.transportMode}
           onChange={(value) =>
             send({
@@ -46,13 +46,11 @@ export const FeedbackForm = ({ state, send }: FeedbackFormProps) => {
           }
           valueToId={(val: TransportModeType) => val}
           options={['bus', 'water'] as TransportModeType[]}
-          placeholder={t(
-            PageText.Contact.inputFields.transportMode.optionLabel,
-          )}
+          placeholder={t(PageText.Contact.input.transportMode.optionLabel)}
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.line.label)}
+          label={t(PageText.Contact.input.line.label)}
           value={state.context.line}
           disabled={!state.context.transportMode}
           onChange={(value: Line | undefined) => {
@@ -68,7 +66,7 @@ export const FeedbackForm = ({ state, send }: FeedbackFormProps) => {
           )}
           valueToId={(line: Line) => line.id}
           valueToText={(line: Line) => line.name}
-          placeholder={t(PageText.Contact.inputFields.line.optionLabel)}
+          placeholder={t(PageText.Contact.input.line.optionLabel)}
           error={
             state.context?.errorMessages['line']?.[0] &&
             t(state.context?.errorMessages['line']?.[0])
@@ -76,7 +74,7 @@ export const FeedbackForm = ({ state, send }: FeedbackFormProps) => {
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.fromStop.label)}
+          label={t(PageText.Contact.input.fromStop.label)}
           value={state.context.fromStop}
           disabled={!state.context.line}
           onChange={(value) => {
@@ -90,7 +88,7 @@ export const FeedbackForm = ({ state, send }: FeedbackFormProps) => {
           options={
             state.context.line?.id ? getQuaysByLine(state.context.line.id) : []
           }
-          placeholder={t(PageText.Contact.inputFields.fromStop.optionLabel)}
+          placeholder={t(PageText.Contact.input.fromStop.optionLabel)}
           error={
             state.context?.errorMessages['fromStop']?.[0]
               ? t(state.context?.errorMessages['fromStop']?.[0])
@@ -101,7 +99,7 @@ export const FeedbackForm = ({ state, send }: FeedbackFormProps) => {
         />
 
         <Select
-          label={t(PageText.Contact.inputFields.toStop.label)}
+          label={t(PageText.Contact.input.toStop.label)}
           value={state.context.toStop}
           disabled={!state.context.line}
           onChange={(value) => {
@@ -112,7 +110,7 @@ export const FeedbackForm = ({ state, send }: FeedbackFormProps) => {
               value: value,
             });
           }}
-          placeholder={t(PageText.Contact.inputFields.toStop.optionLabel)}
+          placeholder={t(PageText.Contact.input.toStop.optionLabel)}
           options={
             state.context.line?.id ? getQuaysByLine(state.context.line.id) : []
           }
@@ -126,10 +124,11 @@ export const FeedbackForm = ({ state, send }: FeedbackFormProps) => {
         />
 
         <Input
-          label={PageText.Contact.inputFields.date}
+          label={PageText.Contact.input.date.label}
           type="date"
           name="date"
           value={state.context.date}
+          errorMessage={state.context?.errorMessages['date']?.[0]}
           onChange={(e) =>
             send({
               type: 'ON_INPUT_CHANGE',
@@ -139,10 +138,13 @@ export const FeedbackForm = ({ state, send }: FeedbackFormProps) => {
           }
         />
         <Input
-          label={PageText.Contact.inputFields.plannedDepartureTime}
+          label={PageText.Contact.input.plannedDepartureTime.label}
           type="time"
           name="time"
           value={state.context.plannedDepartureTime}
+          errorMessage={
+            state.context?.errorMessages['plannedDepartureTime']?.[0]
+          }
           onChange={(e) =>
             send({
               type: 'ON_INPUT_CHANGE',
@@ -152,7 +154,7 @@ export const FeedbackForm = ({ state, send }: FeedbackFormProps) => {
           }
         />
       </SectionCard>
-      <SectionCard title={t(PageText.Contact.inputFields.feedback.title)}>
+      <SectionCard title={t(PageText.Contact.input.feedback.title)}>
         <Textarea
           value={state.context.feedback || ''}
           onChange={(e) =>
@@ -177,13 +179,13 @@ export const FeedbackForm = ({ state, send }: FeedbackFormProps) => {
               value: files,
             });
           }}
-          label={t(PageText.Contact.inputFields.feedback.attachment)}
+          label={t(PageText.Contact.input.feedback.attachment)}
         />
       </SectionCard>
 
       <SectionCard title={t(PageText.Contact.aboutYouInfo.title)}>
         <Input
-          label={PageText.Contact.inputFields.firstName.label}
+          label={PageText.Contact.input.firstName.label}
           type="text"
           autoComplete="given-name additonal-name"
           name="firstName"
@@ -200,7 +202,7 @@ export const FeedbackForm = ({ state, send }: FeedbackFormProps) => {
           }
         />
         <Input
-          label={PageText.Contact.inputFields.lastName.label}
+          label={PageText.Contact.input.lastName.label}
           type="text"
           autoComplete="family-name"
           name="lastName"
@@ -217,7 +219,7 @@ export const FeedbackForm = ({ state, send }: FeedbackFormProps) => {
           }
         />
         <Input
-          label={PageText.Contact.inputFields.email.label}
+          label={PageText.Contact.input.email.label}
           type="email"
           name="email"
           value={state.context.email || ''}
diff --git a/src/page-modules/contact/ticket-control/forms/postponePayment.tsx b/src/page-modules/contact/ticket-control/forms/postponePayment.tsx
index 1821c59e..77d209e4 100644
--- a/src/page-modules/contact/ticket-control/forms/postponePayment.tsx
+++ b/src/page-modules/contact/ticket-control/forms/postponePayment.tsx
@@ -26,7 +26,7 @@ export const PostponePaymentForm = ({
         </Typo.p>
 
         <Input
-          label={PageText.Contact.inputFields.feeNumber.label}
+          label={PageText.Contact.input.feeNumber.label}
           type="text"
           name="feeNumber"
           value={state.context.feeNumber || ''}
@@ -41,7 +41,7 @@ export const PostponePaymentForm = ({
         />
 
         <Input
-          label={PageText.Contact.inputFields.invoiceNumber.label}
+          label={PageText.Contact.input.invoiceNumber.label}
           type="text"
           name="invoiceNumber"
           value={state.context.invoiceNumber || ''}
@@ -57,7 +57,7 @@ export const PostponePaymentForm = ({
       </SectionCard>
       <SectionCard title={t(PageText.Contact.aboutYouInfo.title)}>
         <Input
-          label={PageText.Contact.inputFields.firstName.label}
+          label={PageText.Contact.input.firstName.label}
           type="text"
           autoComplete="given-name additional-name"
           name="firstName"
@@ -72,7 +72,7 @@ export const PostponePaymentForm = ({
           }
         />
         <Input
-          label={PageText.Contact.inputFields.lastName.label}
+          label={PageText.Contact.input.lastName.label}
           type="text"
           autoComplete="family-name"
           name="lastName"
@@ -87,7 +87,7 @@ export const PostponePaymentForm = ({
           }
         />
         <Input
-          label={PageText.Contact.inputFields.email.label}
+          label={PageText.Contact.input.email.label}
           type="email"
           name="email"
           value={state.context.email || ''}
diff --git a/src/page-modules/contact/travel-guarantee/form-selector.tsx b/src/page-modules/contact/travel-guarantee/form-selector.tsx
index 20119de7..734bba30 100644
--- a/src/page-modules/contact/travel-guarantee/form-selector.tsx
+++ b/src/page-modules/contact/travel-guarantee/form-selector.tsx
@@ -19,40 +19,35 @@ export const FormSelector = ({ state, send }: FormSelectorProps) => {
       {!state.context.isIntialAgreementChecked && (
         <SectionCard title={t(PageText.Contact.travelGuarantee.title)}>
           <Typo.p textType="body__primary">
-            {t(
-              PageText.Contact.travelGuarantee.layoutAgreement
-                .delayedRefundText,
-            )}
+            {t(PageText.Contact.travelGuarantee.agreement.delayedRefundText)}
           </Typo.p>
 
           <Typo.p textType="body__primary">
-            {t(
-              PageText.Contact.travelGuarantee.layoutAgreement.ticketRefundText,
-            )}
+            {t(PageText.Contact.travelGuarantee.agreement.ticketRefundText)}
           </Typo.p>
 
           <Typo.p textType="heading__component">
             {t(
-              PageText.Contact.travelGuarantee.layoutAgreement
+              PageText.Contact.travelGuarantee.agreement
                 .travelGuaranteeExceptions.label,
             )}
           </Typo.p>
 
           <Typo.p textType="body__primary">
             {t(
-              PageText.Contact.travelGuarantee.layoutAgreement
+              PageText.Contact.travelGuarantee.agreement
                 .travelGuaranteeExceptions.minimumTimeToNextDeparture,
             )}
           </Typo.p>
 
           <Typo.p textType="body__primary">
             {t(
-              PageText.Contact.travelGuarantee.layoutAgreement
+              PageText.Contact.travelGuarantee.agreement
                 .travelGuaranteeExceptions.externalFactors,
             )}
           </Typo.p>
           <ul className={style.rules__list}>
-            {PageText.Contact.travelGuarantee.layoutAgreement.travelGuaranteeExceptions.examples.map(
+            {PageText.Contact.travelGuarantee.agreement.travelGuaranteeExceptions.examples.map(
               (example: TranslatedString, index: number) => (
                 <li key={index}>
                   <Typo.p textType="body__primary">{t(example)}</Typo.p>
@@ -63,7 +58,7 @@ export const FormSelector = ({ state, send }: FormSelectorProps) => {
 
           <Typo.p textType="body__primary">
             {t(
-              PageText.Contact.travelGuarantee.layoutAgreement
+              PageText.Contact.travelGuarantee.agreement
                 .travelGuaranteeExceptions.exclusion,
             )}
           </Typo.p>
@@ -89,25 +84,19 @@ export const FormSelector = ({ state, send }: FormSelectorProps) => {
         <SectionCard title={t(PageText.Contact.travelGuarantee.title)}>
           <ul>
             <RadioInput
-              label={t(
-                PageText.Contact.travelGuarantee.subPageTitles.refundTaxi
-                  .description,
-              )}
+              label={t(PageText.Contact.travelGuarantee.refundTaxi.description)}
               checked={state.hasTag('taxi')}
               onChange={() => send({ type: 'TAXI' })}
             />
             <RadioInput
-              label={t(
-                PageText.Contact.travelGuarantee.subPageTitles.refundCar
-                  .description,
-              )}
+              label={t(PageText.Contact.travelGuarantee.refundCar.description)}
               checked={state.hasTag('car')}
               onChange={() => send({ type: 'CAR' })}
             />
             <RadioInput
               label={t(
-                PageText.Contact.travelGuarantee.subPageTitles
-                  .refundOtherPublicTransport.description,
+                PageText.Contact.travelGuarantee.refundOtherPublicTransport
+                  .description,
               )}
               checked={state.hasTag('other')}
               onChange={() => send({ type: 'OTHER' })}
diff --git a/src/page-modules/contact/travel-guarantee/index.tsx b/src/page-modules/contact/travel-guarantee/index.tsx
index 4ac0b4ca..02fb0704 100644
--- a/src/page-modules/contact/travel-guarantee/index.tsx
+++ b/src/page-modules/contact/travel-guarantee/index.tsx
@@ -42,9 +42,7 @@ export const RefundForm = () => {
           )}
         >
           <Select
-            label={t(
-              PageText.Contact.inputFields.transportMode.label,
-            ).toString()}
+            label={t(PageText.Contact.input.transportMode.label).toString()}
             value={state.context.transportMode}
             onChange={(value) =>
               send({
@@ -63,13 +61,11 @@ export const RefundForm = () => {
             }
             valueToId={(val: TransportModeType) => val}
             options={['bus', 'water'] as TransportModeType[]}
-            placeholder={t(
-              PageText.Contact.inputFields.transportMode.optionLabel,
-            )}
+            placeholder={t(PageText.Contact.input.transportMode.optionLabel)}
           />
 
           <Select
-            label={t(PageText.Contact.inputFields.line.label)}
+            label={t(PageText.Contact.input.line.label)}
             value={state.context.line}
             disabled={!state.context.transportMode}
             onChange={(value: Line | undefined) => {
@@ -85,7 +81,7 @@ export const RefundForm = () => {
             )}
             valueToId={(line: Line) => line.id}
             valueToText={(line: Line) => line.name}
-            placeholder={t(PageText.Contact.inputFields.line.optionLabel)}
+            placeholder={t(PageText.Contact.input.line.optionLabel)}
             error={
               state.context?.errorMessages['line']?.[0]
                 ? t(state.context?.errorMessages['line']?.[0])
@@ -94,7 +90,7 @@ export const RefundForm = () => {
           />
 
           <Select
-            label={t(PageText.Contact.inputFields.fromStop.label)}
+            label={t(PageText.Contact.input.fromStop.label)}
             value={state.context.fromStop}
             disabled={!state.context.line}
             onChange={(value) => {
@@ -110,7 +106,7 @@ export const RefundForm = () => {
                 ? getQuaysByLine(state.context.line.id)
                 : []
             }
-            placeholder={t(PageText.Contact.inputFields.fromStop.optionLabel)}
+            placeholder={t(PageText.Contact.input.fromStop.optionLabel)}
             error={
               state.context?.errorMessages['fromStop']?.[0]
                 ? t(state.context?.errorMessages['fromStop']?.[0])
@@ -121,7 +117,7 @@ export const RefundForm = () => {
           />
 
           <Select
-            label={t(PageText.Contact.inputFields.toStop.label)}
+            label={t(PageText.Contact.input.toStop.label)}
             value={state.context.toStop}
             disabled={!state.context.line}
             onChange={(value) => {
@@ -132,7 +128,7 @@ export const RefundForm = () => {
                 value: value,
               });
             }}
-            placeholder={t(PageText.Contact.inputFields.toStop.optionLabel)}
+            placeholder={t(PageText.Contact.input.toStop.optionLabel)}
             options={
               state.context.line?.id
                 ? getQuaysByLine(state.context.line.id)
@@ -148,10 +144,11 @@ export const RefundForm = () => {
           />
 
           <Input
-            label={PageText.Contact.inputFields.date}
+            label={PageText.Contact.input.date.label}
             type="date"
             name="date"
             value={state.context.date}
+            errorMessage={state.context?.errorMessages['date']?.[0]}
             onChange={(e) =>
               send({
                 type: 'ON_INPUT_CHANGE',
@@ -161,10 +158,13 @@ export const RefundForm = () => {
             }
           />
           <Input
-            label={PageText.Contact.inputFields.plannedDepartureTime}
+            label={PageText.Contact.input.plannedDepartureTime.label}
             type="time"
             name="time"
             value={state.context.plannedDepartureTime}
+            errorMessage={
+              state.context?.errorMessages['plannedDepartureTime']?.[0]
+            }
             onChange={(e) =>
               send({
                 type: 'ON_INPUT_CHANGE',
@@ -175,9 +175,7 @@ export const RefundForm = () => {
           />
 
           <Select
-            label={t(
-              PageText.Contact.inputFields.reasonForTransportFailure.label,
-            )}
+            label={t(PageText.Contact.input.reasonForTransportFailure.label)}
             value={state.context.reasonForTransportFailure}
             disabled={!state.context.line}
             onChange={(value) => {
@@ -189,12 +187,9 @@ export const RefundForm = () => {
               });
             }}
             placeholder={t(
-              PageText.Contact.inputFields.reasonForTransportFailure
-                .optionLabel,
+              PageText.Contact.input.reasonForTransportFailure.optionLabel,
             )}
-            options={
-              PageText.Contact.inputFields.reasonForTransportFailure.options
-            }
+            options={PageText.Contact.input.reasonForTransportFailure.options}
             error={
               state.context?.errorMessages['reasonForTransportFailure']?.[0]
                 ? t(
@@ -217,7 +212,7 @@ export const RefundForm = () => {
           )}
         >
           <Input
-            label={PageText.Contact.inputFields.kilometersDriven.label}
+            label={PageText.Contact.input.kilometersDriven.label}
             type="text"
             name="km"
             value={state.context.kilometersDriven}
@@ -236,9 +231,7 @@ export const RefundForm = () => {
       )}
       {state.hasTag('selected') && (
         <div>
-          <SectionCard
-            title={t(PageText.Contact.inputFields.feedback.optionalTitle)}
-          >
+          <SectionCard title={t(PageText.Contact.input.feedback.optionalTitle)}>
             <textarea
               className={style.feedback}
               name="feedback"
@@ -254,7 +247,7 @@ export const RefundForm = () => {
           </SectionCard>
           <SectionCard title={t(PageText.Contact.aboutYouInfo.title)}>
             <Input
-              label={PageText.Contact.inputFields.firstName.label}
+              label={PageText.Contact.input.firstName.label}
               type="text"
               name="firstName"
               value={state.context.firstName}
@@ -271,7 +264,7 @@ export const RefundForm = () => {
             />
 
             <Input
-              label={PageText.Contact.inputFields.lastName.label}
+              label={PageText.Contact.input.lastName.label}
               type="text"
               name="lastName"
               value={state.context.lastName}
@@ -287,7 +280,7 @@ export const RefundForm = () => {
               }
             />
             <Input
-              label={PageText.Contact.inputFields.address.label}
+              label={PageText.Contact.input.address.label}
               type="text"
               name="address"
               value={state.context.address}
@@ -303,7 +296,7 @@ export const RefundForm = () => {
               }
             />
             <Input
-              label={PageText.Contact.inputFields.postalCode.label}
+              label={PageText.Contact.input.postalCode.label}
               type="number"
               name="postalCode"
               value={state.context.postalCode}
@@ -319,7 +312,7 @@ export const RefundForm = () => {
               }
             />
             <Input
-              label={PageText.Contact.inputFields.city.label}
+              label={PageText.Contact.input.city.label}
               type="text"
               name="city"
               value={state.context.city}
@@ -335,7 +328,7 @@ export const RefundForm = () => {
               }
             />
             <Input
-              label={PageText.Contact.inputFields.email.label}
+              label={PageText.Contact.input.email.label}
               type="email"
               name="email"
               value={state.context.email}
@@ -351,7 +344,7 @@ export const RefundForm = () => {
               }
             />
             <Input
-              label={PageText.Contact.inputFields.phoneNumber.label}
+              label={PageText.Contact.input.phoneNumber.label}
               type="tel"
               name="phoneNumber"
               value={state.context.phoneNumber}
@@ -368,7 +361,7 @@ export const RefundForm = () => {
             />
 
             <Checkbox
-              label={t(PageText.Contact.inputFields.bankAccountNumber.checkbox)}
+              label={t(PageText.Contact.input.bankAccountNumber.checkbox)}
               checked={state.context.hasInternationalBankAccount}
               onChange={() =>
                 send({
@@ -381,9 +374,7 @@ export const RefundForm = () => {
 
             {!state.context.hasInternationalBankAccount && (
               <Input
-                label={
-                  PageText.Contact.inputFields.bankAccountNumber.notForeignLabel
-                }
+                label={PageText.Contact.input.bankAccountNumber.notForeignLabel}
                 type="text"
                 name="bankAccountNumber"
                 value={state.context.bankAccountNumber}
@@ -404,7 +395,7 @@ export const RefundForm = () => {
             {state.context.hasInternationalBankAccount && (
               <div>
                 <Input
-                  label={PageText.Contact.inputFields.bankAccountNumber.IBAN}
+                  label={PageText.Contact.input.bankAccountNumber.IBAN}
                   type="text"
                   name="bankAccountNumber"
                   value={state.context.IBAN}
@@ -418,7 +409,7 @@ export const RefundForm = () => {
                 />
 
                 <Input
-                  label={PageText.Contact.inputFields.bankAccountNumber.SWIFT}
+                  label={PageText.Contact.input.bankAccountNumber.SWIFT}
                   type="text"
                   name="bankAccountNumber"
                   value={state.context.SWIFT}
diff --git a/src/page-modules/contact/validation/commonInputValidator.ts b/src/page-modules/contact/validation/commonInputValidator.ts
index 607f7a7f..6035cee8 100644
--- a/src/page-modules/contact/validation/commonInputValidator.ts
+++ b/src/page-modules/contact/validation/commonInputValidator.ts
@@ -8,109 +8,116 @@ export const commonInputValidator = (context: any) => {
       inputName: 'firstName',
       validCondition: context.firstName || context.isContactInfoOptional,
 
-      errorMessage: PageText.Contact.inputFields.firstName.errorMessages.empty,
+      errorMessage: PageText.Contact.input.firstName.errorMessages.empty,
     },
     {
       inputName: 'lastName',
       validCondition: context.lastName || context.isContactInfoOptional,
-      errorMessage: PageText.Contact.inputFields.lastName.errorMessages.empty,
+      errorMessage: PageText.Contact.input.lastName.errorMessages.empty,
     },
     {
       inputName: 'email',
       validCondition: context.email || context.isContactInfoOptional,
-      errorMessage: PageText.Contact.inputFields.email.errorMessages.empty,
+      errorMessage: PageText.Contact.input.email.errorMessages.empty,
     },
     {
       inputName: 'address',
       validCondition: context.address,
-      errorMessage: PageText.Contact.inputFields.address.errorMessages.empty,
+      errorMessage: PageText.Contact.input.address.errorMessages.empty,
     },
     {
       inputName: 'postalCode',
       validCondition: context.postalCode,
-      errorMessage: PageText.Contact.inputFields.postalCode.errorMessages.empty,
+      errorMessage: PageText.Contact.input.postalCode.errorMessages.empty,
     },
     {
       inputName: 'city',
       validCondition: context.city,
-      errorMessage: PageText.Contact.inputFields.city.errorMessages.empty,
+      errorMessage: PageText.Contact.input.city.errorMessages.empty,
     },
     {
       inputName: 'phoneNumber',
       validCondition: context.phoneNumber,
-      errorMessage:
-        PageText.Contact.inputFields.phoneNumber.errorMessages.empty,
+      errorMessage: PageText.Contact.input.phoneNumber.errorMessages.empty,
     },
     {
       inputName: 'bankAccountNumber',
       validCondition:
         context.bankAccountNumber || context.IBAN || context.SWIFT,
       errorMessage:
-        PageText.Contact.inputFields.bankAccountNumber.errorMessages.empty,
+        PageText.Contact.input.bankAccountNumber.errorMessages.empty,
     },
     {
       inputName: 'area',
       validCondition: context.area,
-      errorMessage: PageText.Contact.inputFields.area.errorMessages.empty,
+      errorMessage: PageText.Contact.input.area.errorMessages.empty,
     },
     {
       inputName: 'transportMode',
       validCondition: context.transportMode,
-      errorMessage:
-        PageText.Contact.inputFields.transportMode.errorMessages.empty,
+      errorMessage: PageText.Contact.input.transportMode.errorMessages.empty,
     },
     {
       inputName: 'line',
       validCondition: context.line,
-      errorMessage: PageText.Contact.inputFields.line.errorMessages.empty,
+      errorMessage: PageText.Contact.input.line.errorMessages.empty,
     },
     {
       inputName: 'fromStop',
       validCondition: context.fromStop,
-      errorMessage: PageText.Contact.inputFields.fromStop.errorMessages.empty,
+      errorMessage: PageText.Contact.input.fromStop.errorMessages.empty,
     },
     {
       inputName: 'toStop',
       validCondition: context.toStop,
-      errorMessage: PageText.Contact.inputFields.toStop.errorMessages.empty,
+      errorMessage: PageText.Contact.input.toStop.errorMessages.empty,
+    },
+    {
+      inputName: 'date',
+      validCondition: context.date,
+      errorMessage: PageText.Contact.input.date.errorMessages.empty,
+    },
+    {
+      inputName: 'plannedDepartureTime',
+      validCondition: context.plannedDepartureTime,
+      errorMessage:
+        PageText.Contact.input.plannedDepartureTime.errorMessages.empty,
     },
     {
       inputName: 'reasonForTransportFailure',
       validCondition: context.reasonForTransportFailure,
       errorMessage:
-        PageText.Contact.inputFields.reasonForTransportFailure.errorMessages
-          .empty,
+        PageText.Contact.input.reasonForTransportFailure.errorMessages.empty,
     },
     {
       inputName: 'feeNumber',
       validCondition: context.feeNumber,
-      errorMessage: PageText.Contact.inputFields.feeNumber.errorMessages.empty,
+      errorMessage: PageText.Contact.input.feeNumber.errorMessages.empty,
     },
     {
       inputName: 'feeNumber',
       validCondition: context.feeNumber && context.feeNumber.length === 4,
       errorMessage:
-        PageText.Contact.inputFields.feeNumber.errorMessages.notFourDigits,
+        PageText.Contact.input.feeNumber.errorMessages.notFourDigits,
     },
     {
       inputName: 'invoiceNumber',
       validCondition: context.invoiceNumber,
-      errorMessage:
-        PageText.Contact.inputFields.invoiceNumber.errorMessages.empty,
+      errorMessage: PageText.Contact.input.invoiceNumber.errorMessages.empty,
     },
     {
       inputName: 'appPhoneNumber',
       validCondition: context.appPhoneNumber || context.travelCardNumber,
       errorMessage:
-        PageText.Contact.inputFields.ticketStorage.app.appPhoneNumber
-          .errorMessages.empty,
+        PageText.Contact.input.ticketStorage.app.appPhoneNumber.errorMessages
+          .empty,
     },
     {
       inputName: 'customerNumber',
       validCondition: context.customerNumber || context.travelCardNumber,
       errorMessage:
-        PageText.Contact.inputFields.ticketStorage.app.customerNumber
-          .errorMessages.empty,
+        PageText.Contact.input.ticketStorage.app.customerNumber.errorMessages
+          .empty,
     },
     {
       inputName: 'travelCardNumber',
@@ -118,13 +125,13 @@ export const commonInputValidator = (context: any) => {
         context.travelCardNumber ||
         (context.appPhoneNumber && context.customerNumber),
       errorMessage:
-        PageText.Contact.inputFields.ticketStorage.travelCardNumber
-          .errorMessages.empty,
+        PageText.Contact.input.ticketStorage.travelCardNumber.errorMessages
+          .empty,
     },
     {
       inputName: 'feedback',
       validCondition: context.feedback && context.feedback.length > 0,
-      errorMessage: PageText.Contact.inputFields.feedback.errorMessages.empty,
+      errorMessage: PageText.Contact.input.feedback.errorMessages.empty,
     },
   ];
 
diff --git a/src/page-modules/contact/validation/special-field-validators/travelGuaranteeInputValidator.ts b/src/page-modules/contact/validation/special-field-validators/travelGuaranteeInputValidator.ts
index 7d2a90dc..1b7cb3f1 100644
--- a/src/page-modules/contact/validation/special-field-validators/travelGuaranteeInputValidator.ts
+++ b/src/page-modules/contact/validation/special-field-validators/travelGuaranteeInputValidator.ts
@@ -7,46 +7,44 @@ export const travelGuaranteeInputValidator = (context: any) => {
     {
       inputName: 'firstName',
       validCondition: context.firstName,
-      errorMessage: PageText.Contact.inputFields.firstName.errorMessages.empty,
+      errorMessage: PageText.Contact.input.firstName.errorMessages.empty,
     },
     {
       inputName: 'lastName',
       validCondition: context.lastName,
-      errorMessage: PageText.Contact.inputFields.lastName.errorMessages.empty,
+      errorMessage: PageText.Contact.input.lastName.errorMessages.empty,
     },
     {
       inputName: 'email',
       validCondition: context.email,
-      errorMessage: PageText.Contact.inputFields.email.errorMessages.empty,
+      errorMessage: PageText.Contact.input.email.errorMessages.empty,
     },
     {
       inputName: 'address',
       validCondition: context.address,
-      errorMessage: PageText.Contact.inputFields.address.errorMessages.empty,
+      errorMessage: PageText.Contact.input.address.errorMessages.empty,
     },
     {
       inputName: 'postalCode',
       validCondition: context.postalCode,
-      errorMessage: PageText.Contact.inputFields.postalCode.errorMessages.empty,
+      errorMessage: PageText.Contact.input.postalCode.errorMessages.empty,
     },
     {
       inputName: 'city',
       validCondition: context.city,
-      errorMessage: PageText.Contact.inputFields.city.errorMessages.empty,
+      errorMessage: PageText.Contact.input.city.errorMessages.empty,
     },
     {
       inputName: 'phoneNumber',
       validCondition: context.phoneNumber,
-      errorMessage:
-        PageText.Contact.inputFields.phoneNumber.errorMessages.empty,
+      errorMessage: PageText.Contact.input.phoneNumber.errorMessages.empty,
     },
 
     {
       inputName: 'bankAccountNumber',
       validCondition:
         context.bankAccountNumber || context.IBAN || context.SWIFT,
-      errorMessage:
-        PageText.Contact.inputFields.transportMode.errorMessages.empty,
+      errorMessage: PageText.Contact.input.transportMode.errorMessages.empty,
     },
 
     {
@@ -56,8 +54,7 @@ export const travelGuaranteeInputValidator = (context: any) => {
           context.travelGuaranteeStateWhenSubmitted !== 'other') ||
         context.travelGuaranteeStateWhenSubmitted === 'other',
 
-      errorMessage:
-        PageText.Contact.inputFields.transportMode.errorMessages.empty,
+      errorMessage: PageText.Contact.input.transportMode.errorMessages.empty,
     },
     {
       inputName: 'line',
@@ -65,7 +62,7 @@ export const travelGuaranteeInputValidator = (context: any) => {
         (context.line &&
           context.travelGuaranteeStateWhenSubmitted !== 'other') ||
         context.travelGuaranteeStateWhenSubmitted === 'other',
-      errorMessage: PageText.Contact.inputFields.line.errorMessages.empty,
+      errorMessage: PageText.Contact.input.line.errorMessages.empty,
     },
     {
       inputName: 'fromStop',
@@ -73,7 +70,7 @@ export const travelGuaranteeInputValidator = (context: any) => {
         (context.fromStop &&
           context.travelGuaranteeStateWhenSubmitted !== 'other') ||
         context.travelGuaranteeStateWhenSubmitted === 'other',
-      errorMessage: PageText.Contact.inputFields.fromStop.errorMessages.empty,
+      errorMessage: PageText.Contact.input.fromStop.errorMessages.empty,
     },
     {
       inputName: 'toStop',
@@ -82,7 +79,7 @@ export const travelGuaranteeInputValidator = (context: any) => {
           context.travelGuaranteeStateWhenSubmitted !== 'other') ||
         context.travelGuaranteeStateWhenSubmitted === 'other',
 
-      errorMessage: PageText.Contact.inputFields.toStop.errorMessages.empty,
+      errorMessage: PageText.Contact.input.toStop.errorMessages.empty,
     },
     {
       inputName: 'reasonForTransportFailure',
@@ -92,8 +89,7 @@ export const travelGuaranteeInputValidator = (context: any) => {
         context.travelGuaranteeStateWhenSubmitted === 'other',
 
       errorMessage:
-        PageText.Contact.inputFields.reasonForTransportFailure.errorMessages
-          .empty,
+        PageText.Contact.input.reasonForTransportFailure.errorMessages.empty,
     },
     {
       inputName: 'kilometersDriven',
@@ -102,8 +98,7 @@ export const travelGuaranteeInputValidator = (context: any) => {
           context.travelGuaranteeStateWhenSubmitted == 'car') ||
         context.travelGuaranteeStateWhenSubmitted == 'taxi' ||
         context.travelGuaranteeStateWhenSubmitted == 'other',
-      errorMessage:
-        PageText.Contact.inputFields.kilometersDriven.errorMessages.empty,
+      errorMessage: PageText.Contact.input.kilometersDriven.errorMessages.empty,
     },
   ];
 
diff --git a/src/page-modules/contact/validation/utils.ts b/src/page-modules/contact/validation/utils.ts
index 92e3e5f3..21a1e68c 100644
--- a/src/page-modules/contact/validation/utils.ts
+++ b/src/page-modules/contact/validation/utils.ts
@@ -7,15 +7,15 @@ export type InputErrorMessages = {
 // Utility function to add error messages
 export const addErrorMessage = (
   context: any,
-  field: string,
+  inputName: string,
   validCondition: boolean,
   errorMessages: InputErrorMessages,
   errorMessage: TranslatedString,
 ) => {
-  if (context.hasOwnProperty(field) && !validCondition) {
-    if (!errorMessages[field]) {
-      errorMessages[field] = [];
+  if (context.hasOwnProperty(inputName) && !validCondition) {
+    if (!errorMessages[inputName]) {
+      errorMessages[inputName] = [];
     }
-    errorMessages[field].push(errorMessage);
+    errorMessages[inputName].push(errorMessage);
   }
 };
diff --git a/src/translations/pages/contact.ts b/src/translations/pages/contact.ts
index cfdf16ac..4c4986e5 100644
--- a/src/translations/pages/contact.ts
+++ b/src/translations/pages/contact.ts
@@ -21,6 +21,11 @@ export const Contact = {
     ),
 
     feeComplaint: {
+      title: _(
+        'Informasjon fra gebyret',
+        'Information from the fee',
+        'Informasjon frå gebyret',
+      ),
       description: _(
         'Jeg har fått gebyr og ønsker å klage',
         'I have received a fee and would like to file a complaint',
@@ -31,6 +36,7 @@ export const Contact = {
         'If you have received a fee on incorrect grounds, you can submit a written complaint to us.',
         'Dersom du har fått gebyr på feil grunnlag, kan du sende oss ei skriftleg klage.',
       ),
+
       firstAgreement: {
         title: _(
           'Har du fått gebyr etter billettkontroll?',
@@ -50,7 +56,7 @@ export const Contact = {
         rules: [
           _(
             'Du er selv ansvarlig for å ha gyldig billett og legitimasjon på hele reisen.',
-            'You are responsible for having a valid ticket and identification throughout the journey.',
+            'You are responsible for having a valid ticket and identification throughout the trip.',
             'Du er sjølv ansvarleg for å ha gyldig billett og legitimasjon på heile reisa.',
           ),
           _(
@@ -59,13 +65,13 @@ export const Contact = {
             'Reiser du med ein rabattert billett, må du også ha legitimasjon på at du har rett til rabatten for at billetten skal vere gyldig.',
           ),
           _(
-            'Har du kjøpt billett på forhånd, må du ha kjøpt og startet billetten før du går om bord.',
-            'If you have purchased a ticket in advance, you must have bought and activated the ticket before boarding.',
-            'Har du kjøpt billett på førehand, må du ha kjøpt og starta billetten før du går om bord.',
+            'Har du kjøpt billett på forhånd, må du ha startet billetten før du går om bord.',
+            'If you have purchased a ticket in advance, you must have activated the ticket before boarding.',
+            'Har du kjøpt billett på førehand, må du ha starta billetten før du går om bord.',
           ),
           _(
-            'Har du ikke gyldig billett for reiser, vil du få gebyr ved billettkontroll.',
-            'If you do not have a valid ticket for the journey, you will receive a fine during the ticket inspection.',
+            'Har du ikke gyldig billett for reisen, vil du få gebyr ved billettkontroll.',
+            'If you do not have a valid ticket for the trip, you will receive a fine during the ticket inspection.',
             'Har du ikkje gyldig billett for reisa, vil du få gebyr ved billettkontroll.',
           ),
           _(
@@ -76,6 +82,7 @@ export const Contact = {
         ],
         checkbox: _('Jeg forsår', 'I understand', 'Eg forstår'),
       },
+
       secondAgreement: {
         title: _(
           'Typiske saker som ikke får medhold',
@@ -83,8 +90,8 @@ export const Contact = {
           'Typiske saker som ikkje får medhald',
         ),
         info: _(
-          'Har du krav på rabatt men har fått gebyr fordi du ikke kunne framvise gyldig legitimasjon, kan du få redusert gebyret ditt til 200 kroner ved å sende oss dokumentasjon på at du har rett på rabatt.',
-          'If you are entitled to a discount but have been charged a fee because you could not present valid identification, you can have your fee reduced to 200 kroner by sending us documentation that you are eligible for the discount.',
+          'Har du krav på rabatt, men har fått gebyr fordi du ikke kunne framvise gyldig legitimasjon, kan du få redusert gebyret ditt til 200 kroner ved å sende oss dokumentasjon på at du har rett på rabatt.',
+          'If you are entitled to a discount, but have been charged a fee because you were unable to present valid identification, you can have your fee reduced to 200 kroner by sending us documentation that you are eligible for the discount.',
           'Dersom du har krav på rabatt, men har fått gebyr fordi du ikkje kunne framvise gyldig legitimasjon, kan du få redusert gebyret ditt til 200 kroner ved å sende oss dokumentasjon på at du har rett på rabatt.',
         ),
         rules: [
@@ -120,11 +127,6 @@ export const Contact = {
           'Eg forstår reglane og ønsker å klage på gebyret.',
         ),
       },
-      title: _(
-        'Informasjon fra gebyret',
-        'Information from the fee',
-        'Informasjon frå gebyret',
-      ),
     },
 
     postponePayment: {
@@ -135,9 +137,9 @@ export const Contact = {
         'Eg har fått gebyr og ønskjer å utsetje betalinga',
       ),
       info: _(
-        'Når du fyller ut skjemaet, blir betalingsfristen utsatt med 30 dager fra opprinnelig forfallsdato, dvs. totalt 60 dagers betalingsfrist. Du velger selv om du vil dele opp betalingen og gjøre flere innbetalinger i løpet av denne perioden eller betale hele beløpet på en gang',
-        'When you fill out the form, the payment deadline is extended by 30 days from the original due date, giving you a total payment deadline of 60 days. You can choose whether to divide the payment and make multiple installments during this period or pay the full amount at once',
-        'Når du fyller ut skjemaet, blir betalingsfristen utsett med 30 dagar frå opphaveleg forfallsdato, dvs. totalt 60 dagars betalingsfrist. Du vel sjølv om du vil dele opp betalinga og gjere fleire innbetalingar i løpet av denne perioden eller betale heile beløpet på ein gong',
+        'Ved å sende inn skjemaet, blir betalingsfristen utsatt med 30 dager fra opprinnelig forfallsdato, dvs. totalt 60 dagers betalingsfrist. Du velger selv om du vil dele opp betalingen og gjøre flere innbetalinger i løpet av denne perioden eller betale hele beløpet på en gang',
+        'By sending the form, the payment deadline is extended by 30 days from the original due date, providing a total of 60 days to make your payment. During this period, you can choose to either divide it into multiple installments or pay the full amount at once.',
+        'Ved å sende inn skjemaet, blir betalingsfristen utsett med 30 dagar frå opphaveleg forfallsdato, dvs. totalt 60 dagars betalingsfrist. Du vel sjølv om du vil dele opp betalinga og gjere fleire innbetalingar i løpet av denne perioden eller betale heile beløpet på ein gong',
       ),
     },
 
@@ -157,63 +159,13 @@ export const Contact = {
         'If you have feedback regarding a specific ticket inspection, we need a description of where and when the ticket inspection took place in order to proceed with the matter. If you have general feedback, you can skip the initial points.',
         'Har du tilbakemelding på ein bestemt billettkontroll, treng vi ei beskriving av kor og kva tid billettkontrollen var for å kunne gå vidare med saka. Har du ei generell tilbakemelding, kan du hoppe over dei første punkta.',
       ),
-      locationQuestion: _(
-        'Hvor var billettkontrollen?',
-        'Where was the ticket control conducted?',
-        'Kor var billettkontrollen?',
-      ),
-      transportMode: {
-        label: _('Reisemåte', 'Transport mode', 'Reisemåte'),
-        optionLabel: _(
-          'Velg reisemåte',
-          'Select transport mode',
-          'Velg reisemåte',
-        ),
-        errorMessage: _(
-          'Velg reisemåte',
-          'Select transport mode',
-          'Velg reisemåte',
-        ),
-      },
-      line: {
-        label: _('Linje', 'Line', 'Linje'),
-        optionLabel: _('Velg linje', 'Choose line', 'Velg linje'),
-        errorMessage: _('Velg linje', 'Select line', 'Velg linje'),
-      },
-      departureLocation: {
-        label: _('Avreisested', 'Departure location', 'Avreisested'),
-        optionLabel: _(
-          'Velg avreisested',
-          'Select departure loation',
-          'Velg avreisested',
-        ),
-        errorMessage: _(
-          'Velg avreisested',
-          'Select departure loation',
-          'Velg avreisested',
-        ),
-      },
-      arrivalLocation: {
-        label: _('Ankomststed', 'Arrival location', 'Ankomststed'),
-        optionLabel: _(
-          'Velg anskomststed',
-          'Select arrival location',
-          'Velg ankomststed',
-        ),
-        errorMessage: _(
-          'Velg anskomststed',
-          'Select arrival location',
-          'Velg ankomststed',
-        ),
-      },
-      date: _('Dato', 'Date', 'Dato'),
-      departureTime: _('Avgangstid', 'Departure time', 'Avgangstid'),
     },
   },
+
   travelGuarantee: {
     title: _('Reisegaranti', 'Travel guarantee', 'Reisegaranti'),
 
-    layoutAgreement: {
+    agreement: {
       delayedRefundText: _(
         'Ble du forsinket fordi vi ikke var i rute? Du kan ha krav på å få refundert utgifter til alternativ transport som for eksempel drosje, bil og annen kollektivtransport.',
         'Were you delayed because we were not on schedule? You may be entitled to reimbursement for expenses related to alternative transportation such as taxi, car, and other public transportation.',
@@ -233,7 +185,6 @@ export const Contact = {
 
         minimumTimeToNextDeparture: _(
           'Reisegarantien gjelder ikke dersom det er 20 minutter eller mindre til neste avgang i henhold til rutetabellen.',
-
           'The travel guarantee does not apply if there are 20 minutes or less until the next departure according to the timetable.',
           'Reisegarantien gjeld ikkje dersom det er 20 minutt eller mindre til neste avgang i følgje rutetabellen.',
         ),
@@ -282,44 +233,17 @@ export const Contact = {
       },
     },
 
-    subPageTitles: {
-      refundTaxi: {
-        description: _(
-          'Jeg ønsker refusjon for drosje',
-          'I would like refund for taxi',
-          'Eg ønsker refusjon for drosje',
-        ),
-        info: _(
-          'Hvis du ikke kommer frem med et annet rutetilbud, refunderer vi utgifter til drosje i henhold til gjeldende regler.',
-          'If you do not provide an alternative route offer, we will refund taxi expenses according to the applicable regulations.',
-          'Viss du ikkje kjem fram med eit anna rutetilbod, refunderer vi utlegg til drosje etter gjeldande reglar.',
-        ),
-      },
-
-      refundCar: {
-        description: _(
-          'Jeg ønsker refusjon for bruk av bil',
-          'I would like refund for the use of a car',
-          'Eg ønsker refusjon for bruk av en bil',
-        ),
-        info: _(
-          'Hvis du ikke kommer frem med et annet rutetilbud, refunderer vi dokumenterte utgifter for bruk av bil. Vi betaler kilometergodtgjørelse etter statens satser. Refusjonen dekker ikke bompenger, parkering eller andre utgifter knyttet til leiebil/delbil.',
-          'If you do not provide an alternative route offer, we will refund documented expenses for the use of a car. We will pay mileage reimbursement according to the state´s rates. The refund does not cover tolls, parking, or other expenses related to rental cars/sharing cars.',
-          'Viss du ikkje kjem fram med eit anna rutetilbod, refunderer vi dokumenterte utlegg for bruk av bil. Vi betalar kilometergodtgjersle etter statens satsar. Refusjonen dekker ikkje bompengar, parkering eller andre utgifter knytt til leigebil/delebil.',
-        ),
-      },
-
-      refundOtherPublicTransport: {
-        description: _(
-          'Jeg ønsker refusjon for annen kollektivtransport',
-          'I would like a refund for other public transport',
-          'Eg ønsker refusjon for annan kollektivtransport',
-        ),
-        info: _('', '', ''),
-      },
-    },
-
     refundTaxi: {
+      description: _(
+        'Jeg ønsker refusjon for drosje',
+        'I would like refund for taxi',
+        'Eg ønsker refusjon for drosje',
+      ),
+      info: _(
+        'Hvis du ikke kommer frem med et annet rutetilbud, refunderer vi utgifter til drosje i henhold til gjeldende regler.',
+        'If you are unable to reach your destination by an alternative service, we will refund taxi expenses according to the applicable regulations.',
+        'Viss du ikkje kjem fram med eit anna rutetilbod, refunderer vi utlegg til drosje etter gjeldande reglar.',
+      ),
       information: {
         title: _(
           'Informasjon fra drosjekvitteringen',
@@ -335,7 +259,19 @@ export const Contact = {
         ),
       },
     },
+
     refundCar: {
+      description: _(
+        'Jeg ønsker refusjon for bruk av bil',
+        'I would like refund for the use of a car',
+        'Eg ønsker refusjon for bruk av en bil',
+      ),
+      info: _(
+        'Hvis du ikke kommer frem med et annet rutetilbud, refunderer vi dokumenterte utgifter for bruk av bil. Vi betaler kilometergodtgjørelse etter statens satser. Refusjonen dekker ikke bompenger, parkering eller andre utgifter knyttet til leiebil/delbil.',
+        'If you are unable to reach your destination by an alternative service, we will refund documented expenses for the use of a car. We pay compensation per kilometer according to government rates. The refund does not cover tolls, parking, or other expenses related to rental cars/sharing cars',
+        'Viss du ikkje kjem fram med eit anna rutetilbod, refunderer vi dokumenterte utlegg for bruk av bil. Vi betalar kilometergodtgjersle etter statens satsar. Refusjonen dekker ikkje bompengar, parkering eller andre utgifter knytt til leigebil/delebil.',
+      ),
+
       aboutTheCarTrip: {
         title: _('Om bilturen', 'About the car trip', 'Om bilturen'),
       },
@@ -347,6 +283,14 @@ export const Contact = {
         ),
       },
     },
+
+    refundOtherPublicTransport: {
+      description: _(
+        'Jeg ønsker refusjon for annen kollektivtransport',
+        'I would like a refund for other public transport',
+        'Eg ønsker refusjon for annan kollektivtransport',
+      ),
+    },
   },
 
   modeOfTransport: {
@@ -371,7 +315,7 @@ export const Contact = {
         title: _('Om reisen', 'About the trip', 'Om reisa'),
         description: _(
           'Vi trenger å vite litt om reisen din. Da er det lettere for oss å følge opp saken.',
-          'We need to know a bit about your journey. Then it is easier for us to follow up on the case.',
+          'We need to know a bit about your trip. Then it is easier for us to follow up on the case.',
           'Vi treng å vite litt om reisa di. Då er det enklare for oss å følgje opp saka.',
         ),
       },
@@ -391,7 +335,7 @@ export const Contact = {
         title: _('Om reisen', 'About the trip', 'Om reisa'),
         description: _(
           'Vi trenger å vite litt om reisen din. Da er det lettere for oss å følge opp saken.',
-          'We need to know a bit about your journey. Then it is easier for us to follow up on the case.',
+          'We need to know a bit about your trip. Then it is easier for us to follow up on the case.',
           'Vi treng å vite litt om reisa di. Då er det enklare for oss å følgje opp saka.',
         ),
       },
@@ -411,7 +355,7 @@ export const Contact = {
         title: _('Om reisen', 'About the trip', 'Om reisa'),
         description: _(
           'Vi trenger å vite litt om reisen din. Da er det lettere for oss å følge opp saken.',
-          'We need to know a bit about your journey. Then it is easier for us to follow up on the case.',
+          'We need to know a bit about your trip. Then it is easier for us to follow up on the case.',
           'Vi treng å vite litt om reisa di. Då er det enklare for oss å følgje opp saka.',
         ),
       },
@@ -435,7 +379,7 @@ export const Contact = {
         ),
         description: _(
           'Vi trenger å vite litt om reisen din. Da er det lettere for oss å følge opp saken.',
-          'We need to know a bit about your journey. Then it is easier for us to follow up on the case.',
+          'We need to know a bit about your trip. Then it is easier for us to follow up on the case.',
           'Vi treng å vite litt om reisa di. Då er det enklare for oss å følgje opp saka.',
         ),
       },
@@ -443,12 +387,12 @@ export const Contact = {
     serviceOffering: {
       description: _(
         'Tilbakemelding på rutetilbudet',
-        'Feedback on route offering',
+        'Feedback on service offering',
         'Tilbakemelding på rutetilbodet',
       ),
       info: _(
         'Har du et forslag til ruteendring, eller vil du gi tilbakemelding på tilbudet vårt? Gi oss gjerne tilbakemelding her. Alle oppføringer lagres og systematiseres og inngår i den årlige ruteendringsprosessen. Vi kan ikke gi individuell tilbakemelding på hvilke innspill/forslag som innføres.',
-        'Do you have a suggestion for a route change, or would you like to give feedback on our offer? Feel free to give us feedback here. All entries are stored and systematized and are included in the annual route change process. We cannot give individual feedback on which input/suggestions are introduced.',
+        'Do you have a suggestion for a service change, or would you like to give feedback on our service offer? Feel free to give us feedback here. All entries are stored and systematized and are included in the annual service change process. We cannot give individual feedback on which input/suggestions are introduced.',
         'Har du eit forslag til ruteendring, eller ønsker du å gi tilbakemelding på tilbodet vårt? Gi oss gjerne tilbakemelding her. Alle innspel blir lagra og systematisert og blir tatt med i den årlege ruteendringsprosessen. Vi kan ikkje gi individuelle tilbakemeldingar på kva innspel/forslag som blir innførte. ',
       ),
 
@@ -456,7 +400,7 @@ export const Contact = {
         title: _('Om reisen', 'About the trip', 'Om reisa'),
         description: _(
           'Vi trenger å vite litt om reisen din. Da er det lettere for oss å følge opp saken.',
-          'We need to know a bit about your journey. Then it is easier for us to follow up on the case.',
+          'We need to know a bit about your trip. Then it is easier for us to follow up on the case.',
           'Vi treng å vite litt om reisa di. Då er det enklare for oss å følgje opp saka.',
         ),
       },
@@ -477,7 +421,7 @@ export const Contact = {
         title: _('Om reisen', 'About the trip', 'Om reisa'),
         description: _(
           'Vi trenger å vite litt om reisen din. Da er det lettere for oss å følge opp saken.',
-          'We need to know a bit about your journey. Then it is easier for us to follow up on the case.',
+          'We need to know a bit about your trip. Then it is easier for us to follow up on the case.',
           'Vi treng å vite litt om reisa di. Då er det enklare for oss å følgje opp saka.',
         ),
       },
@@ -504,42 +448,11 @@ export const Contact = {
       'Information about you (optinal)',
       'Informasjon om deg  (valfritt)',
     ),
-
-    firstname: _(
-      'Fornavn og mellomnavn',
-      'First name and middle name',
-      'Fornamn og mellomnamn',
-    ),
-    lastname: _('Etternavn', 'Lastname', 'Etternamn'),
-    address: _('Adresse', 'Address', 'Adresse'),
-    postalCode: _('Postnummer', 'Postal code', 'Postnummar'),
-    city: _('Bosted', 'City', 'Bustad'),
-    email: _('E-post', 'Email', 'E-post'),
-    phonenumber: _('Mobil', 'Mobile', 'Mobil'),
-    bankAccount: {
-      label: _('Bankkontonummer', 'Bank account number', 'Bankkontonummar'),
-      checkbox: _(
-        'Jeg har et utenlandsk bankkontonummer',
-        'I have a foreign bank account',
-        'Eg har eit utanlandsk bankkontonummar',
-      ),
-      iban: _('IBAN', 'IBAN', 'IBAN'),
-      swift: _('SWIFT ', 'SWIFT ', 'SWIFT '),
-      errorMessageBankAccount: _(
-        'Vennligst fyll ut ditt bankkontonummer',
-        'Please provide your bank account',
-        'Vennligst fyll ut ditt bankkontonummar',
-      ),
-    },
-    errorMessage: _(
-      'Vennligst fyll ut informasjon om deg',
-      'Please provide your information',
-      'Vennligst fyll ut din informasjon',
-    ),
   },
+
   submit: _('Send', 'Submit', 'Send'),
 
-  inputFields: {
+  input: {
     firstName: {
       label: _(
         'Fornavn og mellomnavn',
@@ -575,8 +488,8 @@ export const Contact = {
           'E-post (må fyllast ut viss du vil ha svar)',
         ),
         question: _(
-          'Ønsker du svar på angåande saka?',
-          'Ønsker du svar på angåande saka?',
+          'Ønsker du svar på angående saken?',
+          'Do you want an answer to the case?',
           'Ønsker du svar på angåande saka?',
         ),
 
@@ -591,6 +504,7 @@ export const Contact = {
         ),
       },
     },
+
     address: {
       label: _('Adresse', 'Address', 'Adresse'),
       errorMessages: {
@@ -603,7 +517,7 @@ export const Contact = {
     },
 
     postalCode: {
-      label: _('Postnummer', 'Postal code', 'Postnummar'),
+      label: _('Postnummer', 'Postal code', 'Postnummer'),
       errorMessages: {
         empty: _(
           'Vennligst fyll ut informasjon om deg',
@@ -625,7 +539,7 @@ export const Contact = {
     },
 
     phoneNumber: {
-      label: _('Telefonenummer', 'Phonenumber', 'Telefonenummar'),
+      label: _('Telefonnummer', 'Phonenumber', 'Telefonnummer'),
       errorMessages: {
         empty: _(
           'Vennligst fyll ut informasjon om deg',
@@ -639,12 +553,12 @@ export const Contact = {
       notForeignLabel: _(
         'Bankkontonummer',
         'Bank account number',
-        'Bankkontonummar',
+        'Bankkontonummer',
       ),
       checkbox: _(
         'Jeg har et utenlandsk bankkontonummer',
         'I have a foreign bank account',
-        'Eg har eit utanlandsk bankkontonummar',
+        'Eg har eit utanlandsk bankkontonummer',
       ),
       IBAN: _('IBAN', 'IBAN', 'IBAN'),
       SWIFT: _('SWIFT ', 'SWIFT ', 'SWIFT '),
@@ -653,7 +567,7 @@ export const Contact = {
         empty: _(
           'Vennligst fyll ut ditt bankkontonummer',
           'Please provide your bank account',
-          'Vennligst fyll ut ditt bankkontonummar',
+          'Vennligst fyll ut ditt bankkontonummer',
         ),
       },
     },
@@ -663,22 +577,22 @@ export const Contact = {
       optionLabel: _(
         'Velg transportmiddel',
         'Select transport mode',
-        'Velg transportmiddel',
+        'Vel transportmiddel',
       ),
       errorMessages: {
         empty: _(
           'Velg transportmiddel',
           'Select transport mode',
-          'Velg transportmiddel',
+          'Vel transportmiddel',
         ),
       },
     },
 
     line: {
       label: _('Linje', 'Line', 'Linje'),
-      optionLabel: _('Velg linje', 'Choose line', 'Velg linje'),
+      optionLabel: _('Velg linje', 'Choose line', 'Vel linje'),
       errorMessages: {
-        empty: _('Velg linje', 'Select line', 'Velg linje'),
+        empty: _('Velg linje', 'Select line', 'Vel linje'),
       },
     },
 
@@ -690,15 +604,15 @@ export const Contact = {
         'Haldeplass/kai',
       ),
       optionLabel: _(
-        'Velg avreisested',
-        'Select departure loation',
-        'Velg avreisested',
+        'Velg holdeplass/kai',
+        'Select stop/harbor',
+        'Vel haldeplass/kai',
       ),
       errorMessages: {
         empty: _(
-          'Velg avreisested',
-          'Select departure loation',
-          'Velg avreisested',
+          'Velg holdeplass/kai',
+          'Select stop/harbor',
+          'Vel haldeplass/kai',
         ),
       },
     },
@@ -706,24 +620,38 @@ export const Contact = {
     toStop: {
       label: _('Til holdeplass/kai', 'To stop/harbor', 'Til haldeplass/kai'),
       optionLabel: _(
-        'Velg anskomststed',
-        'Select arrival location',
-        'Velg ankomststed',
+        'Velg holdeplass/kai',
+        'Select stop/harbor',
+        'Vel haldeplass/kai',
       ),
       errorMessages: {
         empty: _(
-          'Velg anskomststed',
-          'Select arrival location',
-          'Velg ankomststed',
+          'Velg holdeplass/kai',
+          'Select stop/harbor',
+          'Vel haldeplass/kai',
+        ),
+      },
+    },
+    date: {
+      label: _('Dato', 'Date', 'Dato'),
+      errorMessages: {
+        empty: _('Velg dato', 'Select date', 'Vel dato'),
+      },
+    },
+    plannedDepartureTime: {
+      label: _(
+        'Planlagt avgangstid',
+        'Planned departure time',
+        'Planlagd avgangstid',
+      ),
+      errorMessages: {
+        empty: _(
+          'Velg planlagt avgangstid',
+          'Select planned departure time',
+          'Vel avgangstid',
         ),
       },
     },
-    date: _('Dato', 'Date', 'Dato'),
-    plannedDepartureTime: _(
-      'Planlagt avgangstid',
-      'Planned departure time',
-      'Planlagd avgangstid',
-    ),
     reasonForTransportFailure: {
       label: _('Mulige valg', 'Options', 'Moglege val'),
       optionLabel: _('Velg årsak', 'Select reason', 'Vel åtsak'),
@@ -765,49 +693,50 @@ export const Contact = {
         empty: _('Velg årsak', 'Select reason', 'Vel årsak'),
       },
     },
+
     kilometersDriven: {
       label: _(
         'Antall kjørte kilometer',
         'Number of kilometres driven',
-        'Antall kjørte kilometer',
+        'Antall køyrde kilometer',
       ),
       errorMessages: {
         empty: _(
           'Vennligst fyll ut antall kjørte kilometer',
           'Please provide the number of driven kilometres',
-          'Vennligst fyll ut antall kjørte kilometer',
+          'Vennligst fyll ut antall køyrde kilometer',
         ),
       },
     },
 
     feeNumber: {
-      label: _('Gebyrnummer', 'Fee number', 'Gebyrnummar'),
+      label: _('Gebyrnummer', 'Fee number', 'Gebyrnummer'),
       description: _(
         'Gebyrnummeret har fire siffer. Du finner det øverst i høyre hjørne på gebyret',
         'The fee number has four digits. You can find it in the top right corner of the fee',
-        'Gebyrnummeret har fire siffer. Du finn det øvst i høgre hjørne på gebyret',
+        'Gebyrnummert har fire siffer. Du finn det øvst i høgre hjørne på gebyret',
       ),
       instruction: _(
         'Fyll ut gebyrnummeret ditt',
         'Enter your fee number',
-        'Fyll ut gebyrnummaret ditt',
+        'Fyll ut gebyrnummeret ditt',
       ),
       errorMessages: {
         empty: _(
           'Fyll ut gebyrnummeret ditt',
           'Enter your fee number',
-          'Fyll ut gebyrnummaret ditt',
+          'Fyll ut gebyrnummeret ditt',
         ),
         notFourDigits: _(
           'Gebyrnummeret består av fire siffer',
           'The fee number consists of four digits',
-          'Gebyrnummaret består av fire siffer',
+          'Gebyrnummeret består av fire siffer',
         ),
       },
     },
 
     invoiceNumber: {
-      label: _('Fakturanummer', 'Invoice number', 'Fakturanummar'),
+      label: _('Fakturanummer', 'Invoice number', 'Fakturanummer'),
       description: _(
         'Fakturanummeret finner du øverst i høyre hjørne på fakturaen.',
         'The invoice number is found in the top right corner of the invoice.',
@@ -822,10 +751,11 @@ export const Contact = {
         empty: _(
           'Fyll ut fakturanummeret ditt',
           'Enter your invoice number',
-          'Fyll ut fakturanummaret ditt',
+          'Fyll ut fakturanummeret ditt',
         ),
       },
     },
+
     ticketStorage: {
       question: _(
         'Hvor pleier du å ha billetten din?',
@@ -839,27 +769,29 @@ export const Contact = {
           label: _(
             'Registrert mobilnummer',
             'Registered mobile number',
-            'Registrert mobilnummar',
+            'Registrert mobilnummer',
           ),
           errorMessages: {
             empty: _(
               'Legg til registrert mobilnummer',
               'Legg til registered mobile number',
-              'Legg til registrert mobilnummar',
+              'Legg til registrert mobilnummer',
             ),
           },
         },
+
         customerNumber: {
-          label: _('Kundenummer', 'Customer number', 'Kundenummar'),
+          label: _('Kundenummer', 'Customer number', 'Kundenummer'),
           errorMessages: {
             empty: _(
               'Fyll inn kundenummer',
               'Enter customer number',
-              'Fyll inn kundenummar',
+              'Fyll inn kundenummer',
             ),
           },
         },
       },
+
       travelCardNumber: {
         label: _('Reisekort', 'Travelcard', 'Reisekort'),
         errorMessages: {