diff --git a/sbb-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs b/sbb-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs
index f4d0770..e02c18b 100644
--- a/sbb-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs
+++ b/sbb-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,5 +1,5 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.sbb.demo
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:useProjectSettings=true
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
 ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
-eclipse.preferences.version=1
\ No newline at end of file
+eclipse.preferences.version=1
diff --git a/sbb-connector-demo/src_hd/com/axonivy/connector/sbb/demo/InputTripSearchData/InputTripSearchData.xhtml b/sbb-connector-demo/src_hd/com/axonivy/connector/sbb/demo/InputTripSearchData/InputTripSearchData.xhtml
index b8b8fcb..9957cb2 100644
--- a/sbb-connector-demo/src_hd/com/axonivy/connector/sbb/demo/InputTripSearchData/InputTripSearchData.xhtml
+++ b/sbb-connector-demo/src_hd/com/axonivy/connector/sbb/demo/InputTripSearchData/InputTripSearchData.xhtml
@@ -50,7 +50,7 @@
 					</p:datePicker>
 
 					<p:outputLabel for="departureOrArrival" value="Departure | Arrival" />
-					<p:panelGrid columns="3" styleClass="departureOrArrivalContainer">
+					<p:panelGrid columns="3" styleClass="departureOrArrivalContainer" layout="tabular">
 						<p:outputLabel value="Dep" />
 						<p:toggleSwitch id="departureOrArrival" value="#{data.arrival}" />
 						<p:outputLabel value="Arr" />
diff --git a/sbb-connector-demo/webContent/layouts/frame-10.xhtml b/sbb-connector-demo/webContent/layouts/frame-10.xhtml
index 936a73b..b6244a1 100644
--- a/sbb-connector-demo/webContent/layouts/frame-10.xhtml
+++ b/sbb-connector-demo/webContent/layouts/frame-10.xhtml
@@ -32,7 +32,7 @@ and refence it below in the head part.
   <link rel="shortcut icon" href="#{resource['ivy-branding:favicon']}" />
   <h:outputScript name="js/layout.js" library="#{ivyFreyaTheme.library}" />
   <h:outputStylesheet name="#{ivyFreyaTheme.layout}" library="#{ivyFreyaTheme.library}" />
-  <h:outputStylesheet name="primeflex-2.min.css" library="primeflex" />
+  <h:outputStylesheet name="primeflex-3.min.css" library="primeflex" />
   <h:outputStylesheet name="custom.css" library="ivy-branding" />
   <!-- Optional Style or Script files: 
   <h:outputStylesheet name="layouts/styles/style.css" /> 
diff --git a/sbb-connector-test/.settings/ch.ivyteam.ivy.designer.prefs b/sbb-connector-test/.settings/ch.ivyteam.ivy.designer.prefs
index 84908d1..126bf41 100644
--- a/sbb-connector-test/.settings/ch.ivyteam.ivy.designer.prefs
+++ b/sbb-connector-test/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,5 +1,5 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.sbb.test
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:useProjectSettings=true
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
 ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
-eclipse.preferences.version=1
\ No newline at end of file
+eclipse.preferences.version=1
diff --git a/sbb-connector-webtest/.settings/ch.ivyteam.ivy.designer.prefs b/sbb-connector-webtest/.settings/ch.ivyteam.ivy.designer.prefs
index 49b12b0..2fd3520 100644
--- a/sbb-connector-webtest/.settings/ch.ivyteam.ivy.designer.prefs
+++ b/sbb-connector-webtest/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,5 +1,5 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.sbb.webtest
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:useProjectSettings=true
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
 ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
-eclipse.preferences.version=1
\ No newline at end of file
+eclipse.preferences.version=1
diff --git a/sbb-connector/.settings/ch.ivyteam.ivy.designer.prefs b/sbb-connector/.settings/ch.ivyteam.ivy.designer.prefs
index f0af8d5..107d704 100644
--- a/sbb-connector/.settings/ch.ivyteam.ivy.designer.prefs
+++ b/sbb-connector/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,5 +1,5 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.sbb
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:useProjectSettings=true
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
 ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
-eclipse.preferences.version=1
\ No newline at end of file
+eclipse.preferences.version=1