diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/master-detail-demo/.settings/ch.ivyteam.ivy.designer.prefs b/master-detail-demo/.settings/ch.ivyteam.ivy.designer.prefs
index aacc1c3..dfcd648 100644
--- a/master-detail-demo/.settings/ch.ivyteam.ivy.designer.prefs
+++ b/master-detail-demo/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,5 +1,4 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.demo
-ch.ivyteam.ivy.project.preferences\:PORTAL_VERSION=10
 ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
 ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
 eclipse.preferences.version=1
diff --git a/master-detail-demo/.settings/org.eclipse.core.resources.prefs b/master-detail-demo/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/master-detail-demo/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/master-detail-demo/pom.xml b/master-detail-demo/pom.xml
index bd709cc..7df17e0 100644
--- a/master-detail-demo/pom.xml
+++ b/master-detail-demo/pom.xml
@@ -7,6 +7,7 @@
   <packaging>iar</packaging>
   <properties>
     <project.build.plugin.version>12.0.0</project.build.plugin.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <pluginRepositories>
     <pluginRepository>
diff --git a/master-detail-demo/src_hd/com/axonivy/demo/masterdetail/ProductList/ProductDetail.xhtml b/master-detail-demo/src_hd/com/axonivy/demo/masterdetail/ProductList/ProductDetail.xhtml
index 8b1c21b..6b703e5 100644
--- a/master-detail-demo/src_hd/com/axonivy/demo/masterdetail/ProductList/ProductDetail.xhtml
+++ b/master-detail-demo/src_hd/com/axonivy/demo/masterdetail/ProductList/ProductDetail.xhtml
@@ -109,9 +109,9 @@
 					<div class="ui-g">
 						<div class="ui-g-12">
 							<p:commandButton id="saveProduct" value="#{ivy.cms.co('/Dialogs/com/axonivy/demo/masterdetail/ui/ProductList/save')}" 
-									styleClass="buttonMargin" icon="fa fa-check" actionListener="#{logic.save}" action="ProductList" style="float:right" />	
+									styleClass="buttonMargin" icon="fa fa-check" actionListener="#{logic.save}" style="float:right" />	
 							<p:commandButton value="#{ivy.cms.co('/Dialogs/com/axonivy/demo/masterdetail/ui/ProductList/cancel')}" 
-									icon="fa fa-times" style="float:right" action="ProductList" />
+									icon="fa fa-times" style="float:right" />
 						</div>
 					</div>
 				</h:form>
diff --git a/master-detail-demo/src_hd/com/axonivy/demo/masterdetail/ProductList/ProductList.xhtml b/master-detail-demo/src_hd/com/axonivy/demo/masterdetail/ProductList/ProductList.xhtml
index 7cab2c3..768b3cb 100644
--- a/master-detail-demo/src_hd/com/axonivy/demo/masterdetail/ProductList/ProductList.xhtml
+++ b/master-detail-demo/src_hd/com/axonivy/demo/masterdetail/ProductList/ProductList.xhtml
@@ -210,24 +210,34 @@
 						</f:facet>
 						<p:outputLabel value="#{product.onSale == true ? ivy.cms.co('/Dialogs/com/axonivy/demo/masterdetail/ui/ProductList/yes') : (product.onSale == false ? ivy.cms.co('/Dialogs/com/axonivy/demo/masterdetail/ui/ProductList/no') : '')}" />
 					</p:column>
-					
+
 					<p:column id="actionsColumn" resizable="false"
 						headerText="#{ivy.cms.co('/Dialogs/com/axonivy/demo/masterdetail/ui/ProductList/actions')}"
 						styleClass="zoneColumnCaseTable" selectRow="false">
 
-					    <p:tooltip for="editThroughProcess" value="#{ivy.cms.co('/Dialogs/com/axonivy/demo/masterdetail/ui/ProductList/tooltipEditThroughProcess')}" position="right"/>
-						<p:commandLink id="editThroughProcess" global="false" action="#{logic.onEditThroughProcessClicked(product.id)}" >								    
+						<p:tooltip for="editThroughProcess"
+							value="#{ivy.cms.co('/Dialogs/com/axonivy/demo/masterdetail/ui/ProductList/tooltipEditThroughProcess')}"
+							position="right" />
+						<p:commandLink id="editThroughProcess" global="false"
+							action="#{logic.onEditThroughProcessClicked(product.id)}">
 							<h:outputText styleClass="fa fa-pencil" />
 						</p:commandLink>
 
-					    <p:tooltip for="editByLink" value="#{ivy.cms.co('/Dialogs/com/axonivy/demo/masterdetail/ui/ProductList/tooltipEditByLink')}" position="right"/>
-						<p:commandLink id="editByLink" global="false" action="#{logic.onEditByLinkClicked(product.id)}" >								    
+						<p:tooltip for="editByLink"
+							value="#{ivy.cms.co('/Dialogs/com/axonivy/demo/masterdetail/ui/ProductList/tooltipEditByLink')}"
+							position="right" />
+						<p:commandLink id="editByLink" global="false"
+							action="#{logic.onEditByLinkClicked(product.id)}">
 							<h:outputText styleClass="fa fa-link" />
 						</p:commandLink>
 
-						<p:tooltip for="editWithViews" value="#{ivy.cms.co('/Dialogs/com/axonivy/demo/masterdetail/ui/ProductList/tooltipEditWithViews')}" position="right"/>
-						<p:commandLink id="editWithViews" global="false" action="ProductDetail" actionListener="#{logic.onEditByViewsClicked(product)}">							
-							<h:outputText styleClass="fa fa-eye"  />				
+						<p:tooltip for="editWithViews"
+							value="#{ivy.cms.co('/Dialogs/com/axonivy/demo/masterdetail/ui/ProductList/tooltipEditWithViews')}"
+							position="right" />
+						<p:commandLink id="editWithViews" global="false"
+							action="ProductDetail"
+							actionListener="#{logic.onEditByViewsClicked(product)}">
+							<h:outputText styleClass="fa fa-eye" />
 						</p:commandLink>
 
 					</p:column>
@@ -242,7 +252,7 @@
 					<div class="ui-g-6">
 						<p:commandButton value="Close Product List" icon="fa fa-times" style="float:right" actionListener="#{logic.close}"/>
 					</div>
-				</div>				
+				</div>
 			</h:form>
 
 	
@@ -343,19 +353,21 @@
 					</div>
 				</h:form>
 			</p:dialog>
-			
-			
+
 			<p:confirmDialog id="deleteProductsDialog"
-			    message="#{ivy.cms.co('/Dialogs/com/axonivy/demo/masterdetail/ui/ProductList/deletionMessage')}"
-			    header="#{ivy.cms.co('/Dialogs/com/axonivy/demo/masterdetail/ui/ProductList/deletionHeader')}"
-			    widgetVar="deleteProductsDialog" appendTo="@(body)" severity="alert" responsive="true">
-			    <p:commandButton value="#{ivy.cms.co('/Labels/no')}" styleClass="buttonMargin"
-			      onclick="PF('deleteProductsDialog').hide();" type="button" />
-			    <p:commandButton id="confirmDODelete" value="#{ivy.cms.co('/Labels/yes')}"
-			      actionListener="#{logic.deleteSelected}"
-			      oncomplete="PF('deleteProductsDialog').hide();PF('productTable').filter();" 
-			      update="#{p:resolveFirstComponentWithId('productTable', view).clientId}" />
-			  </p:confirmDialog>
+				message="#{ivy.cms.co('/Dialogs/com/axonivy/demo/masterdetail/ui/ProductList/deletionMessage')}"
+				header="#{ivy.cms.co('/Dialogs/com/axonivy/demo/masterdetail/ui/ProductList/deletionHeader')}"
+				widgetVar="deleteProductsDialog" appendTo="@(body)" severity="alert"
+				responsive="true">
+				<p:commandButton value="#{ivy.cms.co('/Labels/no')}"
+					styleClass="buttonMargin"
+					onclick="PF('deleteProductsDialog').hide();" type="button" />
+				<p:commandButton id="confirmDODelete"
+					value="#{ivy.cms.co('/Labels/yes')}"
+					actionListener="#{logic.deleteSelected}"
+					oncomplete="PF('deleteProductsDialog').hide();PF('productTable').filter();"
+					update="#{p:resolveFirstComponentWithId('productTable', view).clientId}" />
+			</p:confirmDialog>
 		</ui:define>
 	</ui:composition>
 </h:body>
diff --git a/master-detail-test/.settings/ch.ivyteam.ivy.designer.prefs b/master-detail-test/.settings/ch.ivyteam.ivy.designer.prefs
index ec40a56..7777826 100644
--- a/master-detail-test/.settings/ch.ivyteam.ivy.designer.prefs
+++ b/master-detail-test/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,5 +1,4 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.demo.masterdetail.test
-ch.ivyteam.ivy.project.preferences\:PORTAL_VERSION=10
 ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
 ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
 eclipse.preferences.version=1
diff --git a/master-detail-test/.settings/org.eclipse.core.resources.prefs b/master-detail-test/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/master-detail-test/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/master-detail-test/pom.xml b/master-detail-test/pom.xml
index 0b3496b..108bafd 100644
--- a/master-detail-test/pom.xml
+++ b/master-detail-test/pom.xml
@@ -8,6 +8,7 @@
   <properties>
     <project.build.plugin.version>12.0.0</project.build.plugin.version>
     <tester.version>12.0.1</tester.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <pluginRepositories>
     <pluginRepository>