diff --git a/admin-ui/Dockerfile b/admin-ui/Dockerfile
index bc5b339f..2b490de7 100644
--- a/admin-ui/Dockerfile
+++ b/admin-ui/Dockerfile
@@ -18,17 +18,10 @@ ENV entity_spec_path=${base_path}/assets/entity-spec
 
 ENV master_template_path=${base_path}/templates
 
-
 # can be passed during Docker build as build time environment for github branch to pickup configuration from.
 ARG container_user=mosip
-
-# can be passed during Docker build as build time environment for github branch to pickup configuration from.
 ARG container_user_group=mosip
-
-# can be passed during Docker build as build time environment for github branch to pickup configuration from.
 ARG container_user_uid=1001
-
-# can be passed during Docker build as build time environment for github branch to pickup configuration from.
 ARG container_user_gid=1001
 
 # can be passed during Docker build as build time environment for artifactory URL
@@ -37,14 +30,6 @@ ARG artifactory_url
 # environment variable to pass artifactory url, at docker runtime
 ENV artifactory_url_env=${artifactory_url}
 
-# install packages and create user
-RUN apt-get -y update \
-&& apt-get install -y unzip wget zip npm \
-&& groupadd -g ${container_user_gid} ${container_user_group} \
-&& useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user} \
-&& mkdir -p /var/run/nginx /var/tmp/nginx \
-&& chown -R ${container_user}:${container_user} /usr/share/nginx /var/run/nginx /var/tmp/nginx
-
 # set working directory for the user
 WORKDIR /home/${container_user}
 
@@ -54,24 +39,23 @@ ADD ./default.conf /etc/nginx/conf.d/
 
 ADD ./download.conf /etc/nginx/include/download.conf
 
-RUN cd /home/${container_user}
-
 ADD dist ${base_path}
 
 # install the needed packages including wget and a unzip library 
 #RUN apt-get update -y && apt-get install -y wget && apt-get install -y unzip
 
-# change permissions of file inside working dir
-RUN chown -R ${container_user}:${container_user} ${base_path}/assets/i18n
-RUN chown -R ${container_user}:${container_user} ${base_path}/assets/entity-spec
-RUN mkdir -p ${master_template_path} && chown -R ${container_user}:${container_user} ${master_template_path}
-
-
 ADD configure_start.sh configure_start.sh
 
-RUN chmod +x configure_start.sh
-
-RUN chown -R ${container_user}:${container_user} /home/${container_user}
+## install packages, create user and change permissions of file inside working dir
+RUN apt-get -y update \
+&& apt-get install -y unzip wget zip npm \
+&& groupadd -g ${container_user_gid} ${container_user_group} \
+&& useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user} \
+&& mkdir -p /var/run/nginx /var/tmp/nginx \
+&& chown -R ${container_user}:${container_user} /home/${container_user} /usr/share/nginx /var/run/nginx /var/tmp/nginx ${base_path}/assets/i18n ${base_path}/assets/entity-spec \
+&& mkdir -p ${master_template_path} && chown -R ${container_user}:${container_user} ${master_template_path} \
+&& chmod +x configure_start.sh \
+&& cd /home/${container_user} 
 
 # select container user for all tasks
 USER ${container_user_uid}:${container_user_gid}
@@ -82,21 +66,6 @@ ENTRYPOINT [ "./configure_start.sh" ]
 
 #get the admin i18n bundle zip from artifactory
 CMD echo "starting nginx" ; \
-#    wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/i18n/admin-i18n-bundle.zip -O "${i18n_path}"/admin-i18n-bundle.zip ; \
-#    echo "Downloading entity spec bundle" ; \
-#    wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/i18n/admin-entity-spec-bundle.zip -O "${entity_spec_path}"/admin-entity-spec-bundle.zip ; \
-#    echo "Downloading templates bundle" ; \
-#    wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/master-templates/master-templates.zip -O "${master_template_path}"/master-templates.zip ; \
-#    cd ${entity_spec_path} ; \
-#    #zip -FF admin-entity-spec-bundle.zip --out admin-entity-spec-bundle_fixed.zip ; \
-#    unzip -o admin-entity-spec-bundle.zip ; \
-#    cd ${i18n_path} ; \
-#    #zip -FF admin-i18n-bundle.zip --out admin-i18n-bundle_fixed.zip ; \
-#    unzip -o admin-i18n-bundle.zip ; \
-#    cd ${master_template_path} ; \
-#    #zip -FF master-templates.zip --out master-templates_fixed.zip ; \
-#    unzip -o master-templates.zip ; \
     nginx ; \
     sleep infinity
-
 	
diff --git a/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html b/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html
index e3da7828..d71e37b1 100644
--- a/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html
+++ b/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html
@@ -264,7 +264,7 @@
                         matSuffix
                         [for]="picker"
                       ></mat-datepicker-toggle>
-                      <mat-datepicker  [disabled]="!isEditable && id" #picker></mat-datepicker>
+                      <mat-datepicker (opened)="changeCalendarLang(primaryLangCode)" [disabled]="!isEditable && id" #picker></mat-datepicker>
                     </mat-form-field>
 
                     <div *ngIf="field.showInSingleView === 'true' && field.inputType === 'dropdown' && field.name === 'locationCode'">
@@ -420,7 +420,7 @@
 
                 </div>
             </div>
-            <mat-divider [vertical]="true" [inset]="true"></mat-divider>
+            <mat-divider [vertical]="true" [inset]="true" *ngIf="showSecondaryForm"></mat-divider>
               <div *ngIf="showSecondaryForm" class="secondary-form" [dir]="secondaryLang==='ara' ? 'rtl' : 'ltr'">
                 <mat-form-field style="padding-bottom: 10px;">
                 <mat-label><strong>{{ "center.selectLanguage" | translate }}</strong></mat-label>
@@ -626,7 +626,7 @@
                         [for]="picker1"
                         [disabled]="!isEditable && id"
                       ></mat-datepicker-toggle>
-                      <mat-datepicker #picker1></mat-datepicker>
+                      <mat-datepicker (opened)="changeCalendarLang(secondaryLang)" #picker1></mat-datepicker>
                     </mat-form-field>
 
                     <div *ngIf="field.showInSingleView === 'true' && field.inputType === 'dropdown' && field.name === 'locationCode'">
@@ -806,7 +806,7 @@
               </mat-select>
             </mat-form-field>
           </div>
-        <mat-divider [vertical]="true" [inset]="true"></mat-divider>
+        <mat-divider [vertical]="true" [inset]="true" *ngIf="showSecondaryForm"></mat-divider>
           <div *ngIf="showSecondaryForm" class="secondary-form">
             <strong class="title">{{ secondaryLangDisplay }}</strong>
             <span
diff --git a/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.ts b/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.ts
index 63a7041f..8ad7f2b3 100644
--- a/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.ts
+++ b/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.ts
@@ -113,7 +113,6 @@ export class MaterDataCommonBodyComponent implements OnInit {
     this.url = this.router.url.split('/')[3];
     this.fieldsCount = 0;
     this.primaryLangCode = this.headerService.getUserPreferredLanguage();
-    this.dateAdapter.setLocale(defaultJson.keyboardMapping[this.primaryLangCode]);
     if(this.primaryLang === "ara"){
       this.isPrimaryLangRTL = true;
     }
@@ -299,6 +298,10 @@ export class MaterDataCommonBodyComponent implements OnInit {
     
   }
 
+  changeCalendarLang(lang:string){
+    this.dateAdapter.setLocale(defaultJson.keyboardMapping[lang]);
+  }
+
   @HostListener('document:keydown.escape', ['$event']) onKeydownHandler(event: KeyboardEvent) {
     if (this.keyboardService.isOpened) {
       this.keyboardService.dismiss();
diff --git a/admin-ui/src/app/features/resources/center/create/create.component.html b/admin-ui/src/app/features/resources/center/create/create.component.html
index 75336ddf..f57ce5eb 100644
--- a/admin-ui/src/app/features/resources/center/create/create.component.html
+++ b/admin-ui/src/app/features/resources/center/create/create.component.html
@@ -511,7 +511,7 @@ <h3>{{ "center.operational-details" | translate }}</h3>
               </ng-container>
             </div>
           </div>
-          <mat-divider [vertical]="true" [inset]="true"></mat-divider>
+          <!-- <mat-divider [vertical]="true" [inset]="true"></mat-divider> -->
         </mat-card-content>
         <mat-card-actions class="action-buttons">
           <button id="createButton" mat-raised-button (click)="submit()">
diff --git a/admin-ui/src/app/features/resources/center/edit/edit.component.html b/admin-ui/src/app/features/resources/center/edit/edit.component.html
index 26431c31..ee1c0b87 100644
--- a/admin-ui/src/app/features/resources/center/edit/edit.component.html
+++ b/admin-ui/src/app/features/resources/center/edit/edit.component.html
@@ -684,7 +684,7 @@ <h3>{{ "center.operational-details" | translate }}</h3>
               </ng-container>
             </div>
           </div>
-          <mat-divider [vertical]="true" [inset]="true"></mat-divider>
+          <!-- <mat-divider [vertical]="true" [inset]="true"></mat-divider> -->
         </mat-card-content>
         <mat-card-actions class="action-buttons">
           <button [disabled]="!commonForm.dirty" id="createButton" mat-raised-button (click)="submitCommonPanel()">
diff --git a/admin-ui/src/app/features/resources/users/create/create.component.html b/admin-ui/src/app/features/resources/users/create/create.component.html
index 098823c9..936f2f0c 100644
--- a/admin-ui/src/app/features/resources/users/create/create.component.html
+++ b/admin-ui/src/app/features/resources/users/create/create.component.html
@@ -42,7 +42,7 @@ <h3></h3>
             </mat-form-field>
 
           </div>
-          <mat-divider [vertical]="true" [inset]="true"></mat-divider>
+          <!-- <mat-divider [vertical]="true" [inset]="true"></mat-divider> -->
 
         </mat-card-content>
         <mat-card-actions class="action-buttons">
diff --git a/admin-ui/src/app/shared/table/table.component.html b/admin-ui/src/app/shared/table/table.component.html
index d288451c..8896f327 100644
--- a/admin-ui/src/app/shared/table/table.component.html
+++ b/admin-ui/src/app/shared/table/table.component.html
@@ -1,6 +1,6 @@
 <div class="container">
   <table class="mat-table">
-    <caption>Table Data</caption>
+    <caption></caption>
     <tr class="mat-row sticky-header">
       <th *ngIf="showRadioButton" id="tableData"></th>
       <th
diff --git a/uitest-admin/Dockerfile b/uitest-admin/Dockerfile
index 458f9801..511baca2 100644
--- a/uitest-admin/Dockerfile
+++ b/uitest-admin/Dockerfile
@@ -28,10 +28,10 @@ ARG KUBECTL_VERSION=1.22.9
 # install packages and create user
 RUN groupadd -g ${container_user_gid} ${container_user_group} \
     && useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/bash -m ${container_user} -d ${work_dir} \
-    && chown -R ${container_user}:${container_user} /home/${container_user}/  \
+    && chown -R ${container_user}:${container_user} /home/${container_user} \
     && curl -LO "https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl" \
     && chmod +x kubectl \
-    && mv kubectl /usr/local/bin/
+    && mv kubectl /usr/local/bin/ 
 
 # Switch to the specified user for the subsequent commands
 USER ${container_user_uid}:${container_user_gid}