From 1bc1b6d2577a75d6768a4f3a874a2ffb01163af8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 13 May 2023 13:12:19 +0200
Subject: [PATCH] Please cherry-pick: - added i18n string for Switzerland -
 added dynamic="true" when a very long list is expected

---
 .../localization/bundle_de_DE.properties      |   8 +-
 .../localization/bundle_en_US.properties      |   8 +-
 .../admin_form_branch_office_data.tpl         |   4 +
 .../admin_form_branch_opening_time.tpl        |   7 +-
 .../department/admin_form_department_data.tpl |   5 +
 .../employee/admin_form_employee_data.tpl     |   6 +
 .../admin_form_headquarter_data.tpl           |   2 +
 .../admin/fax/admin_form_add_contact_fax.tpl  |   5 +-
 .../basic_data/admin_basic_data_list.xhtml    |   9 +-
 .../admin_branch_office_list.xhtml            |   3 +
 .../department/admin_department_list.xhtml    |   4 +
 .../employee/admin_employee_list.xhtml        |   3 +
 .../headquarter/admin_headquarter_list.xhtml  |   2 +
 .../admin_mobile_provider_delete.xhtml        |  13 +-
 .../admin_mobile_provider_edit.xhtml          |  13 +-
 .../admin_mobile_provider_list.xhtml          | 277 ++++++++---
 .../admin_mobile_provider_show.xhtml          |  13 +-
 web/admin/user/admin_user_activity_log.xhtml  |  54 ++-
 web/admin/user/admin_user_delete.xhtml        |  45 +-
 web/admin/user/admin_user_edit.xhtml          |  53 ++-
 web/admin/user/admin_user_export.xhtml        |  87 +++-
 web/admin/user/admin_user_list.xhtml          | 431 +++++++++++++-----
 web/admin/user/admin_user_lock.xhtml          |  48 +-
 .../admin_user_resend_confirmation_link.xhtml |  61 ++-
 web/admin/user/admin_user_show.xhtml          |  76 +--
 web/admin/user/admin_user_unlock.xhtml        |  77 ++--
 26 files changed, 955 insertions(+), 359 deletions(-)

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 75ccced2..6e77d5e1 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -131,7 +131,13 @@ COUNTRY_ITALIA=Italien
 COUNTRY_LUXEMBOURG=Luxemburg
 COUNTRY_NETHERLANDS=Niederlande
 COUNTRY_PHILIPPINES=Philippinen
-NONE_SELECTED=k.A.
+COUNTRY_POLAND=Polen
+COUNTRY_SWEDEN=Schweden
+COUNTRY_SWITZERLAND=Schweiz
+COUNTRY_TURKEY=T\u00fcrkei
+COUNTRY_THAILAND=Thailand
+COUNTRY_UNITED_STATES_OF_AMERICA=U.S.A.
+NONE_SELECTED=Nichts ausgew\u00e4hlt
 ENTERED_HOUSE_NUMBER_INVALID=Die eingegebene Hausnummer ist ung\u00fcltig.
 ENTERED_ZIP_CODE_INVALID=Die eingegebene Postleitzahl ist ung\u00fcltig.
 TABLE_HEADER_USER_LIST=Alle Benutzer auflisten
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 946c35ce..12af1a70 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -132,7 +132,13 @@ COUNTRY_ITALIA=Italia
 COUNTRY_LUXEMBOURG=Luxembourg
 COUNTRY_NETHERLANDS=Netherlands
 COUNTRY_PHILIPPINES=Philippines
-NONE_SELECTED=Empty
+COUNTRY_POLAND=Poland
+COUNTRY_SWEDEN=Sweden
+COUNTRY_SWITZERLAND=Switzerland
+COUNTRY_THAILAND=Thailand
+COUNTRY_TURKEY=Turkey
+COUNTRY_UNITED_STATES_OF_AMERICA=U.S.A.
+NONE_SELECTED=None selected
 ENTERED_HOUSE_NUMBER_INVALID=The entered house number is invalid.
 ENTERED_ZIP_CODE_INVALID=The entered ZIP code is invalid.
 TABLE_HEADER_USER_LIST=List all users
diff --git a/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_office_data.tpl b/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_office_data.tpl
index 45efc8a7..6f2d5d2c 100644
--- a/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_office_data.tpl
+++ b/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_office_data.tpl
@@ -24,6 +24,7 @@
 				value="#{adminBranchOfficeActionController.branchCompany}"
 				filter="true"
 				filterMatchMode="contains"
+				dynamic="true"
 				required="true"
 				requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_REQUIRED}"
 				>
@@ -46,6 +47,7 @@
 				value="#{adminBranchOfficeActionController.branchContactEmployee}"
 				filter="true"
 				filterMatchMode="contains"
+				dynamic="true"
 				>
 
 				<f:converter converterId="ContactConverter" />
@@ -69,6 +71,7 @@
 				value="#{adminBranchOfficeActionController.branchOwnerEmployee}"
 				filter="true"
 				filterMatchMode="contains"
+				dynamic="true"
 				>
 
 				<f:converter converterId="ContactConverter" />
@@ -92,6 +95,7 @@
 				value="#{adminBranchOfficeActionController.branchUserOwner}"
 				filter="true"
 				filterMatchMode="contains"
+				dynamic="true"
 				>
 
 				<f:converter converterId="UserConverter" />
diff --git a/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_opening_time.tpl b/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_opening_time.tpl
index 4af4b866..eed88037 100644
--- a/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_opening_time.tpl
+++ b/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_opening_time.tpl
@@ -52,7 +52,12 @@
 
 				<f:converter converterId="DayOfTheWeekConverter" />
 
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
+				<f:selectItem
+					itemValue="#{null}"
+					itemLabel="#{msg.PLEASE_SELECT}"
+					noSelectionOption="true"
+					itemDisabled="true"
+					/>
 
 				<f:selectItems
 					value="#{dataController.dayOfTheWeek}"
diff --git a/web/WEB-INF/templates/admin/business/department/admin_form_department_data.tpl b/web/WEB-INF/templates/admin/business/department/admin_form_department_data.tpl
index af7eb067..42ecb867 100644
--- a/web/WEB-INF/templates/admin/business/department/admin_form_department_data.tpl
+++ b/web/WEB-INF/templates/admin/business/department/admin_form_department_data.tpl
@@ -31,6 +31,7 @@
 				value="#{adminDepartmentActionController.departmentCompany}"
 				filter="true"
 				filterMatchMode="contains"
+				dynamic="true"
 				required="true"
 				requiredMessage="#{msg.ADMIN_DEPARTMENT_COMPANY_REQUIRED}"
 				>
@@ -53,6 +54,7 @@
 				value="#{adminDepartmentActionController.departmentBranchOffice}"
 				filter="true"
 				filterMatchMode="contains"
+				dynamic="true"
 				>
 
 				<f:converter converterId="BranchOfficeConverter" />
@@ -76,6 +78,7 @@
 				value="#{adminDepartmentActionController.departmentHeadquarter}"
 				filter="true"
 				filterMatchMode="contains"
+				dynamic="true"
 				>
 
 				<f:converter converterId="HeadquarterConverter" />
@@ -99,6 +102,7 @@
 				value="#{adminDepartmentActionController.departmentLead}"
 				filter="true"
 				filterMatchMode="contains"
+				dynamic="true"
 				>
 
 				<f:converter converterId="ContactConverter" />
@@ -122,6 +126,7 @@
 				value="#{adminDepartmentActionController.departmentUserOwner}"
 				filter="true"
 				filterMatchMode="contains"
+				dynamic="true"
 				>
 
 				<f:converter converterId="UserConverter" />
diff --git a/web/WEB-INF/templates/admin/business/employee/admin_form_employee_data.tpl b/web/WEB-INF/templates/admin/business/employee/admin_form_employee_data.tpl
index 21644cf7..8ebf92ef 100644
--- a/web/WEB-INF/templates/admin/business/employee/admin_form_employee_data.tpl
+++ b/web/WEB-INF/templates/admin/business/employee/admin_form_employee_data.tpl
@@ -24,6 +24,7 @@
 				value="#{adminEmployeeController.employeeBasicData}"
 				filter="true"
 				filterMatchMode="contains"
+				dynamic="true"
 				required="true"
 				requiredMessage="#{msg.ADMIN_EMPLOYEE_COMPANY_REQUIRED}"
 				>
@@ -51,6 +52,7 @@
 				value="#{adminEmployeeController.employeeBranchOffice}"
 				filter="true"
 				filterMatchMode="contains"
+				dynamic="true"
 				>
 
 				<f:converter converterId="BranchOfficeConverter" />
@@ -74,6 +76,7 @@
 				value="#{adminEmployeeController.employeePersonalData}"
 				filter="true"
 				filterMatchMode="contains"
+				dynamic="true"
 				>
 
 				<f:converter converterId="ContactConverter" />
@@ -97,6 +100,7 @@
 				value="#{adminEmployeeController.employeeUserOwner}"
 				filter="true"
 				filterMatchMode="contains"
+				dynamic="true"
 				>
 
 				<f:converter converterId="UserConverter" />
@@ -149,6 +153,7 @@
 				value="#{adminEmployeeController.employeeDepartment}"
 				filter="true"
 				filterMatchMode="contains"
+				dynamic="true"
 				>
 
 				<f:converter converterId="DepartmentConverter" />
@@ -172,6 +177,7 @@
 				value="#{adminEmployeeController.employeeHeadquarter}"
 				filter="true"
 				filterMatchMode="contains"
+				dynamic="true"
 				>
 
 				<f:converter converterId="HeadquarterConverter" />
diff --git a/web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_data.tpl b/web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_data.tpl
index 61ddb0b1..97923887 100644
--- a/web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_data.tpl
+++ b/web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_data.tpl
@@ -37,6 +37,7 @@
 				value="#{adminHeadquarterActionController.headquarterContactEmployee}"
 				filter="true"
 				filterMatchMode="contains"
+				dynamic="true"
 				>
 
 				<f:converter converterId="ContactConverter" />
@@ -60,6 +61,7 @@
 				value="#{adminHeadquarterActionController.headquarterUserOwner}"
 				filter="true"
 				filterMatchMode="contains"
+				dynamic="true"
 				>
 
 				<f:converter converterId="UserConverter" />
diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
index e8bfe048..6ad0222f 100644
--- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
@@ -25,7 +25,10 @@
 				</div>
 
 				<div class="table-right-medium">
-					<p:selectOneMenu styleClass="select divider-right" id=" " value="#{adminPhoneController.faxNumber}">
+					<p:selectOneMenu
+						id="faxNumber"
+						value="#{adminPhoneController.faxNumber}"
+						>
 						<f:converter converterId="FaxNumberConverter" />
 						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{adminPhoneController.allNonLinkedFaxNumbers()}" var="faxNumber" itemValue="#{faxNumber}" itemLabel="#{faxNumber.phoneCountry.countryExternalDialPrefix} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
diff --git a/web/admin/business/basic_data/admin_basic_data_list.xhtml b/web/admin/business/basic_data/admin_basic_data_list.xhtml
index 441db7d3..3373ea2d 100644
--- a/web/admin/business/basic_data/admin_basic_data_list.xhtml
+++ b/web/admin/business/basic_data/admin_basic_data_list.xhtml
@@ -147,6 +147,7 @@
 						<p:selectCheckboxMenu
 							filter="true"
 							filterMatchMode="contains"
+							dynamic="true"
 							label="#{msg.LABEL_EMPLOYEES}"
 							onchange="PF('basicDataList').filter()"
 							updateLabel="true"
@@ -192,6 +193,7 @@
 						<p:selectCheckboxMenu
 							filter="true"
 							filterMatchMode="contains"
+							dynamic="true"
 							label="#{msg.LABEL_EMPLOYEES}"
 							onchange="PF('basicDataList').filter()"
 							updateLabel="true"
@@ -237,6 +239,7 @@
 						<p:selectCheckboxMenu
 							filter="true"
 							filterMatchMode="contains"
+							dynamic="true"
 							label="#{msg.LABEL_USERS}"
 							onchange="PF('basicDataList').filter()"
 							updateLabel="true"
@@ -492,9 +495,9 @@
 							<p:outputLabel for="companyUserOwner" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_USER_OWNER}" />
 							<p:selectOneMenu
 								id="companyUserOwner"
-								value="#{adminBasicCompanyDataController.companyUserOwner}"
 								filter="true"
 								filterMatchMode="contains"
+								value="#{adminBasicCompanyDataController.companyUserOwner}"
 								>
 
 								<f:converter converterId="UserConverter" />
@@ -515,9 +518,9 @@
 							<p:outputLabel for="companyContactEmployee" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_CONTACT_EMPLOYEE}" />
 							<p:selectOneMenu
 								id="companyContactEmployee"
-								value="#{adminBasicCompanyDataController.companyContactEmployee}"
 								filter="true"
 								filterMatchMode="contains"
+								value="#{adminBasicCompanyDataController.companyContactEmployee}"
 								>
 
 								<f:converter converterId="EmployeeConverter" />
@@ -538,9 +541,9 @@
 							<p:outputLabel for="companyFounder" value="#{msg.ADMIN_SELECT_BASIC_DATA_COMPANY_FOUNDER}" />
 							<p:selectOneMenu
 								id="companyFounder"
-								value="#{adminBasicCompanyDataController.companyFounder}"
 								filter="true"
 								filterMatchMode="contains"
+								value="#{adminBasicCompanyDataController.companyFounder}"
 								>
 
 								<f:converter converterId="EmployeeConverter" />
diff --git a/web/admin/business/branch_office/admin_branch_office_list.xhtml b/web/admin/business/branch_office/admin_branch_office_list.xhtml
index c28d1e6c..2cea9750 100644
--- a/web/admin/business/branch_office/admin_branch_office_list.xhtml
+++ b/web/admin/business/branch_office/admin_branch_office_list.xhtml
@@ -122,6 +122,7 @@
 						<p:selectCheckboxMenu
 							filter="true"
 							filterMatchMode="contains"
+							dynamic="true"
 							label="#{msg.LABEL_COMPANIES}"
 							onchange="PF('branchOfficeList').filter()"
 							updateLabel="true"
@@ -157,6 +158,7 @@
 						<p:selectCheckboxMenu
 							filter="true"
 							filterMatchMode="contains"
+							dynamic="true"
 							label="#{msg.LABEL_USERS}"
 							onchange="PF('branchOfficeList').filter()"
 							updateLabel="true"
@@ -228,6 +230,7 @@
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
+							dynamic="true"
 							filterMatchMode="contains"
 							label="#{msg.LABEL_EMPLOYEES}"
 							onchange="PF('branchOfficeList').filter()"
diff --git a/web/admin/business/department/admin_department_list.xhtml b/web/admin/business/department/admin_department_list.xhtml
index 036da9cc..52aff8a4 100644
--- a/web/admin/business/department/admin_department_list.xhtml
+++ b/web/admin/business/department/admin_department_list.xhtml
@@ -120,6 +120,7 @@
 						<p:selectCheckboxMenu
 							filter="true"
 							filterMatchMode="contains"
+							dynamic="true"
 							label="#{msg.LABEL_COMPANIES}"
 							onchange="PF('departmentList').filter()"
 							updateLabel="true"
@@ -155,6 +156,7 @@
 						<p:selectCheckboxMenu
 							filter="true"
 							filterMatchMode="contains"
+							dynamic="true"
 							label="#{msg.LABEL_BRANCH_OFFICES}"
 							onchange="PF('departmentList').filter()"
 							updateLabel="true"
@@ -200,6 +202,7 @@
 						<p:selectCheckboxMenu
 							filter="true"
 							filterMatchMode="contains"
+							dynamic="true"
 							label="#{msg.LABEL_EMPLOYEES}"
 							onchange="PF('departmentList').filter()"
 							updateLabel="true"
@@ -245,6 +248,7 @@
 						<p:selectCheckboxMenu
 							filter="true"
 							filterMatchMode="contains"
+							dynamic="true"
 							label="#{msg.LABEL_USERS}"
 							onchange="PF('departmentList').filter()"
 							updateLabel="true"
diff --git a/web/admin/business/employee/admin_employee_list.xhtml b/web/admin/business/employee/admin_employee_list.xhtml
index c6e460c5..63d223bd 100644
--- a/web/admin/business/employee/admin_employee_list.xhtml
+++ b/web/admin/business/employee/admin_employee_list.xhtml
@@ -121,6 +121,7 @@
 						<p:selectCheckboxMenu
 							filter="true"
 							filterMatchMode="contains"
+							dynamic="true"
 							label="#{msg.LABEL_BRANCH_OFFICES}"
 							onchange="PF('employeeList').filter()"
 							updateLabel="true"
@@ -166,6 +167,7 @@
 						<p:selectCheckboxMenu
 							filter="true"
 							filterMatchMode="contains"
+							dynamic="true"
 							label="#{msg.LABEL_USERS}"
 							onchange="PF('employeeList').filter()"
 							updateLabel="true" title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
@@ -210,6 +212,7 @@
 						<p:selectCheckboxMenu
 							filter="true"
 							filterMatchMode="contains"
+							dynamic="true"
 							label="#{msg.LABEL_COMPANIES}"
 							onchange="PF('employeeList').filter()"
 							updateLabel="true"
diff --git a/web/admin/business/headquarter/admin_headquarter_list.xhtml b/web/admin/business/headquarter/admin_headquarter_list.xhtml
index 9bc2aa46..41d2b242 100644
--- a/web/admin/business/headquarter/admin_headquarter_list.xhtml
+++ b/web/admin/business/headquarter/admin_headquarter_list.xhtml
@@ -111,6 +111,7 @@
 						<p:selectCheckboxMenu
 							filter="true"
 							filterMatchMode="contains"
+							dynamic="true"
 							label="#{msg.LABEL_USERS}"
 							onchange="PF('headquarterList').filter()"
 							updateLabel="true"
@@ -180,6 +181,7 @@
 						<p:selectCheckboxMenu
 							filter="true"
 							filterMatchMode="contains"
+							dynamic="true"
 							label="#{msg.LABEL_EMPLOYEES}"
 							onchange="PF('headquarterList').filter()"
 							updateLabel="true"
diff --git a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
index 9758398b..7fba4ce1 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+	template="/WEB-INF/templates/admin/admin_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}" />
 	</ui:define>
 
diff --git a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
index 0ccf4124..c50a139b 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+	template="/WEB-INF/templates/admin/admin_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}" />
 	</ui:define>
 
diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index 1062279f..bb348e45 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:links="http://mxchange.org/jsf/core/links"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core"
-				xmlns:p="http://primefaces.org/ui">
-
-	<ui:define name="admin_title">
+<ui:composition
+	template="/WEB-INF/templates/admin/admin_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:links="http://mxchange.org/jsf/core/links"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST}" />
 	</ui:define>
 
@@ -16,72 +18,237 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<p:dataTable id="table_list_mobile" var="mobileProvider" value="#{mobileProviderController.allMobileProviders()}" tableStyleClass="table table-medium" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" emptyMessage="#{msg.ADMIN_MOBILE_PROVIDER_LIST_EMPTY}">
-			<p:column sortBy="#{mobileProvider.providerId}">
+		<h:form id="form-list-mobile-providers">
+			<p:dataTable
+				id="mobileProviderList"
+				var="mobileProvider"
+				value="#{mobileProviderListController.allMobileProviders}"
+				paginator="true"
+				paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+				filteredValue="#{mobileProviderListController.filteredMobileProviders}"
+				rows="10"
+				rowKey="#{mobileProvider.providerId}"
+				reflow="true"
+				resizableColumns="true"
+				rowsPerPageTemplate="5,10,20,50,100"
+				sortMode="multiple"
+				summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}"
+				emptyMessage="#{msg.ADMIN_EMPTY_LIST_MOBILE_PROVIDERS}"
+				widgetVar="mobileProviderList"
+				selectionMode="single"
+				selection="#{mobileProviderListController.selectedMobileProvider}"
+				skipChildren="true"
+				>
+
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
-				</f:facet>
+					<p:panelGrid
+						columns="3"
+						layout="grid"
+						columnClasses="ui-grid-col-4,ui-grid-col-6,ui-grid-col-2"
+						>
+						<p:spacer />
 
-				<p:link outcome="admin_show_mobile_provider" title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}" value="#{mobileProvider.providerId}">
-					<f:param name="providerId" value="#{mobileProvider.providerId}" />
-				</p:link>
-			</p:column>
+						<p:panelGrid
+							columns="2"
+							columnClasses="ui-grid-4,ui-grid-8"
+							layout="grid"
+							styleClass="ui-noborder"
+							>
+							<p:outputLabel
+								for="globalFilter"
+								value="#{msg.SEARCH_ALL_FIELDS}"
+								style="float: right"
+								/>
 
-			<p:column sortBy="#{mobileProvider.providerName}" priority="3">
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}" />
-				</f:facet>
+							<p:inputText
+								id="globalFilter"
+								onkeyup="PF('mobileProviderList').filter()"
+								placeholder="#{msg.ENTER_KEYWORD}"
+								/>
+						</p:panelGrid>
 
-				<h:outputText value="#{mobileProvider.providerName}" />
-			</p:column>
+						<p:outputPanel>
+							<p:spacer height="4" />
 
-			<p:column sortBy="#{mobileProvider.providerDialPrefix}" priority="2">
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}" />
+							<p:commandButton
+								id="toggler"
+								type="button"
+								value="#{msg.SELECT_SHOWN_COLUMNS}"
+								styleClass="column-selector"
+								/>
+
+							<p:columnToggler datasource="mobileProviderList" trigger="toggler" />
+						</p:outputPanel>
+					</p:panelGrid>
 				</f:facet>
 
-				<h:outputText value="#{mobileProvider.providerDialPrefix}" />
-			</p:column>
+				<p:ajax
+					event="rowSelect"
+					update="form-list-mobile-providers:mobile-provider-details"
+					oncomplete="PF('mobileProviderDialog').show()"
+					/>
 
-			<p:column sortBy="#{mobileProvider.providerCountry.countryPhoneCode}" priority="4">
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}" />
-				</f:facet>
+				<p:column
+					headerText="#{msg.ID_HEADER}"
+					sortBy="#{mobileProvider.providerId}"
+					filterBy="#{mobileProvider.providerId}"
+					>
+					<p:link
+						outcome="admin_show_mobile_provider"
+						value="#{mobileProvider.providerId}"
+						title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}"
+						>
+						<f:param name="providerId" value="#{mobileProvider.providerId}" />
+					</p:link>
+				</p:column>
 
-				<h:outputText value="#{msg[mobileProvider.providerCountry.countryI18nKey]}" />
-			</p:column>
+				<p:column
+					headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}"
+					sortBy="#{mobileProvider.providerName}"
+					filterBy="#{mobileProvider.providerName}"
+					filterMatchMode="contains"
+					>
+					<h:outputText value="#{mobileProvider.providerName}" />
+				</p:column>
 
-			<p:column sortBy="#{mobileProvider.providerEntryCreated}" priority="5">
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_LIST_ENTRY_CREATED}" />
-				</f:facet>
+				<p:column
+					headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}"
+					sortBy="#{mobileProvider.providerDialPrefix}"
+					filterBy="#{mobileProvider.providerDialPrefix}"
+					filterMatchMode="contains"
+					>
+					<h:outputText value="#{mobileProvider.providerDialPrefix}" />
+				</p:column>
 
-				<h:outputText id="providerEntryCreated" value="#{mobileProvider.providerEntryCreated.time}" title="#{msg.ADMIN_MOBILE_PROVIDER_ENTRY_CREATED_TITLE}">
-					<f:convertDateTime for="providerEntryCreated" type="both" timeStyle="short" dateStyle="short" />
-				</h:outputText>
-			</p:column>
+				<p:column
+					headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}"
+					sortBy="#{mobileProvider.providerCountry.countryPhoneCode}"
+					filterBy="#{mobileProvider.providerCountry}"
+					filterMatchMode="in"
+					>
+					<f:facet name="filter">
+						<p:selectCheckboxMenu
+							filter="true"
+							filterMatchMode="contains"
+							dynamic="true"
+							label="#{msg.LABEL_COUNTRIES}"
+							onchange="PF('mobileProviderList').filter()"
+							updateLabel="true"
+							title="#{msg.FILTER_BY_MULTIPLE_COUNTRY_TITLE}"
+							>
+							<f:converter converterId="CountryConverter" />
+							<f:selectItems
+								value="#{countryListController.allCountries}"
+								var="country"
+								itemValue="#{country}"
+								itemLabel="#{msg[country.countryI18nKey]}"
+								/>
+						</p:selectCheckboxMenu>
+					</f:facet>
 
-			<p:column sortable="false" priority="6">
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
-				</f:facet>
+					<h:outputText value="#{msg[mobileProvider.providerCountry.countryI18nKey]}" />
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ENTRY_CREATED_HEADER}"
+					sortBy="#{mobileProvider.providerEntryCreated}"
+					>
+					<h:outputText value="#{mobileProvider.providerEntryCreated}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ENTRY_UPDATED_HEADER}"
+					sortBy="#{mobileProvider.providerEntryUpdated}"
+					>
+					<h:outputText value="#{mobileProvider.providerEntryUpdated}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+					sortable="false"
+					>
+					<p:menuButton value="#{msg.OPTIONS}">
+						<p:menuitem
+							outcome="admin_show_mobile_provider"
+							value="#{msg.ADMIN_LINK_SHOW_SHORT}"
+							title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}"
+							>
+							<f:param name="providerId" value="#{mobileProvider.providerId}" />
+						</p:menuitem>
+
+						<p:menuitem
+							outcome="admin_edit_mobile_provider"
+							value="#{msg.ADMIN_LINK_EDIT_SHORT}"
+							title="#{msg.ADMIN_LINK_EDIT_MOBILE_PROVIDER_TITLE}"
+							>
+							<f:param name="providerId" value="#{mobileProvider.providerId}" />
+						</p:menuitem>
 
-				<links:outputMobileProviderAdminMiniLinks mobileProvider="#{mobileProvider}" />
-			</p:column>
-		</p:dataTable>
+						<p:menuitem outcome="admin_delete_mobile_provider">
+							<h:outputText
+								styleClass="link-danger"
+								value="#{msg.ADMIN_LINK_DELETE_SHORT}"
+								title="#{msg.ADMIN_LINK_DELETE_MOBILE_PROVIDER_TITLE}"
+								/>
+							<f:param name="providerId" value="#{mobileProvider.providerId}" />
+						</p:menuitem>
+					</p:menuButton>
+				</p:column>
+			</p:dataTable>
 
-		<h:form id="form_add_mobile_provider">
-			<h:panelGroup styleClass="table table-medium" layout="block">
+			<p:dialog
+				dynamic="true"
+				modal="true"
+				resizable="false"
+				header="#{msg.ADMIN_SINGLE_MOBILE_PROVIDER_DETAILS_HEADER}"
+				hideEffect="fade"
+				showEffect="fade"
+				widgetVar="mobileProviderDialog"
+				position="top"
+				responsive="true"
+				closeOnEscape="true"
+				>
+				<p:outputPanel id="mobile-provider-details">
+					<p:panelGrid columns="2" rendered="#{not empty mobileProviderListController.selectedMobileProvider}">
+						<f:facet name="header">
+							<h:outputFormat value="#{msg.ADMIN_MOBILE_PROVIDER_DETAILS_HEADER}">
+								<f:param value="#{mobileProviderListController.selectedMobileProvider.providerName}" />
+								<f:param value="#{mobileProviderListController.selectedMobileProvider.providerId}" />
+							</h:outputFormat>
+						</f:facet>
+
+						<p:outputLabel value="#{msg.ID_HEADER}" title="#{msg.MOBILE_PROVIDER_ID_NUMBER_TITLE}" />
+						<h:outputText value="#{mobileProviderListController.selectedMobileProvider.providerId}" />
+					</p:panelGrid>
+				</p:outputPanel>
+			</p:dialog>
+		</h:form>
+
+		<h:form>
+			<h:panelGroup layout="block">
 				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}" />
 				</div>
 
 				<ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl" />
 
-				<div class="table-footer">
-					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<p:commandButton styleClass="submit" type="submit" id="button_add_mobile_provider" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
-				</div>
+				<p:panelGrid columns="2" layout="grid">
+					<p:commandButton
+						type="reset"
+						value="#{msg.BUTTON_RESET_FORM}"
+						/>
+
+					<p:commandButton
+						type="submit"
+						value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}"
+						action="#{adminMobileProviderController.addMobileProvider()}"
+						update="form-list-mobile-providers:mobileProviderList"
+						/>
+				</p:panelGrid>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="para notice" layout="block">
diff --git a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml
index c4733e30..8a3bdecd 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+	template="/WEB-INF/templates/admin/admin_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}" />
 	</ui:define>
 
diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index 877ab542..e0ec4c6d 100644
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core"
-				xmlns:p="http://primefaces.org/ui">
+<ui:composition
+	template="/WEB-INF/templates/admin/admin_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<ui:define name="metadata">
 		<f:metadata>
-			<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-			<f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+			<f:viewParam
+				name="userId"
+				value="#{beanHelper.user}"
+				converter="UserConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+				/>
+			<f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_USER_ACTIVITY_LOG}" />
 	</ui:define>
 
@@ -23,15 +31,25 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
-		<p:dataTable id="table_user_activity_log" var="userActivity" value="#{userActivityController.fetchCurrentUsersActivityLog()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}" rendered="#{not empty beanHelper.user}">
+		<p:dataTable
+			id="table_user_activity_log"
+			var="userActivity"
+			value="#{userActivityController.fetchCurrentUsersActivityLog()}"
+			paginator="true"
+			rows="10"
+			summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}"
+			rendered="#{not empty beanHelper.user}"
+			>
 			<p:column>
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
+					<h:outputText value="#{msg.DATA_USER_ID}" />
 				</f:facet>
 
-				<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{userActivity.activityUser.userId}">
+				<p:link
+					outcome="admin_show_user"
+					value="#{userActivity.activityUser.userId}"
+					title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+					>
 					<f:param name="userId" value="#{userActivity.activityUser.userId}" />
 				</p:link>
 			</p:column>
@@ -39,7 +57,7 @@
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 				<p:column>
 					<f:facet name="header">
-						<h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
+						<h:outputText value="#{msg.DATA_USER_NAME}" />
 					</f:facet>
 
 					<h:outputText value="#{userActivity.activityUserName}" />
@@ -99,8 +117,8 @@
 					<h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVITY_LOG_TIMESTAMP}" />
 				</f:facet>
 
-				<h:outputText id="userCreated" value="#{userActivity.activityTimestamp.time}">
-					<f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
+				<h:outputText value="#{userActivity.activityTimestamp}">
+					<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
 				</h:outputText>
 			</p:column>
 		</p:dataTable>
diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index 1438a2a9..83a97f28 100644
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core"
-				xmlns:p="http://primefaces.org/ui">
+<ui:composition
+	template="/WEB-INF/templates/admin/admin_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<ui:define name="metadata">
 		<f:metadata>
-			<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-			<f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+			<f:viewParam
+				name="userId"
+				value="#{beanHelper.user}"
+				converter="UserConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+				/>
+			<f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_USER}" />
 	</ui:define>
 
@@ -23,10 +31,8 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
-		<h:form id="form_admin_delete_user" rendered="#{not empty beanHelper.user}">
-			<h:panelGroup styleClass="table table-medium" layout="block">
+		<h:form rendered="#{not empty beanHelper.user}">
+			<h:panelGroup layout="block">
 				<div class="table-header">
 					<h:outputFormat value="#{msg.ADMIN_DELETE_USER_TITLE}">
 						<f:param value="#{beanHelper.user.userName}" />
@@ -46,14 +52,15 @@
 					</div>
 
 					<div class="table-right75-medium">
-						<p:inputTextarea id="userDeleteReason" styleClass="input" value="#{adminUserController.userDeleteReason}" rows="8" cols="45" />
+						<p:inputTextarea id="userDeleteReason" value="#{adminUserController.userDeleteReason}" rows="8" cols="45" />
 					</div>
 				</h:panelGroup>
 
-				<div class="table-footer">
-					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<p:commandButton styleClass="button-danger" type="submit" id="button_delete_user" value="#{msg.BUTTON_ADMIN_DELETE_USER}" action="#{adminUserController.deleteUserData()}" />
-				</div>
+				<p:commandButton
+					type="submit"
+					value="#{msg.BUTTON_ADMIN_DELETE_USER}"
+					action="#{adminUserController.deleteUserData()}"
+					/>
 			</h:panelGroup>
 		</h:form>
 	</ui:define>
diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 79cf4df3..eeb97a36 100644
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core"
-				xmlns:p="http://primefaces.org/ui">
+<ui:composition
+	template="/WEB-INF/templates/admin/admin_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<ui:define name="metadata">
 		<f:metadata>
-			<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-			<f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+			<f:viewParam
+				name="userId"
+				value="#{beanHelper.user}"
+				converter="UserConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+				/>
+			<f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_USER}" />
 	</ui:define>
 
@@ -23,10 +32,8 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
-		<h:form id="form_edit_user" rendered="#{not empty beanHelper.user}">
-			<h:panelGroup styleClass="table table-medium" layout="block">
+		<h:form rendered="#{not empty beanHelper.user}">
+			<h:panelGroup layout="block">
 				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_EDIT_USER_TITLE}" />
 				</div>
@@ -35,12 +42,20 @@
 					<h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
 				</div>
 
-				<widgets:outputAdminUserDataFormFields mode="edit" />
+				<core:outputAdminUserDataFormFields mode="edit" />
 
-				<div class="table-footer">
-					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<p:commandButton styleClass="submit" type="submit" id="button_edit_user" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
-				</div>
+				<p:panelGrid columns="2" layout="grid">
+					<p:commandButton
+						type="reset"
+						value="#{msg.BUTTON_RESET_FORM}"
+						/>
+
+					<p:commandButton
+						type="submit"
+						value="#{msg.BUTTON_ADMIN_EDIT_USER}"
+						action="#{adminUserController.editUserData()}"
+						/>
+				</p:panelGrid>
 			</h:panelGroup>
 		</h:form>
 	</ui:define>
diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index 0921f74a..60ede6cf 100644
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core"
-				xmlns:p="http://primefaces.org/ui">
-
-	<ui:define name="admin_title">
+<ui:composition
+	template="/WEB-INF/templates/admin/admin_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_USER}" />
 	</ui:define>
 
@@ -16,16 +18,26 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="admin-user-list-empty" message="#{msg.ADMIN_USER_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{userController.allUsers().isEmpty()}" />
-
-		<h:form id="form_export_users" rendered="#{not userController.allUsers().isEmpty()}">
-			<p:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}">
+		<h:form id="form-export-users">
+			<p:dataTable
+				id="table-export-users"
+				var="user"
+				value="#{userListController.allUsers}"
+				paginator="true"
+				rows="10"
+				summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}"
+				emptyMessage="#{msg.ADMIN_EMPTY_LIST_USER}"
+				>
 				<p:column exportable="false">
 					<f:facet name="header">
 						<h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
 					</f:facet>
 
-					<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
+					<p:link
+						outcome="admin_show_user"
+						value="#{user.userId}"
+						title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+						>
 						<f:param name="userId" value="#{user.userId}" />
 					</p:link>
 				</p:column>
@@ -134,7 +146,7 @@
 					</f:facet>
 
 					<h:outputText id="contactBirthday" value="#{user.userContact.contactBirthday}">
-						<f:convertDateTime for="contactBirthday" type="date" dateStyle="medium" />
+						<f:convertDateTime type="date" dateStyle="medium" />
 					</h:outputText>
 				</p:column>
 
@@ -148,7 +160,7 @@
 
 				<p:column>
 					<f:facet name="header">
-						<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER}" />
+						<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LAND_LINE_NUMBER}" />
 					</f:facet>
 
 					<h:outputText value="#{adminContactController.generatePhoneNumber(user.userContact.contactLandLineNumber)}" />
@@ -167,13 +179,33 @@
 						<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CREATED}" />
 					</f:facet>
 
-					<h:outputText id="contactCreated" value="#{user.userContact.contactCreated.time}">
-						<f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
+					<h:outputText value="#{user.userContact.contactEntryCreated}">
+						<f:convertDateTime
+							type="both"
+							timeStyle="short"
+							dateStyle="short"
+							locale="#{localizationController.locale}"
+							/>
+					</h:outputText>
+				</p:column>
+
+				<p:column>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_UPDATED}" />
+					</f:facet>
+
+					<h:outputText value="#{user.userContact.contactEntryUpdated}">
+						<f:convertDateTime
+							type="both"
+							timeStyle="short"
+							dateStyle="short"
+							locale="#{localizationController.locale}"
+							/>
 					</h:outputText>
 				</p:column>
 			</p:dataTable>
 
-			<h:panelGroup styleClass="table table-medium" layout="block">
+			<h:panelGroup layout="block">
 				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_EXPORT_USERS_TITLE}" />
 				</div>
@@ -182,11 +214,18 @@
 					<h:outputText value="#{msg.ADMIN_EXPORT_USERS_TIMEOUT_WARNING}" />
 				</div>
 
-				<div class="table-footer">
-					<p:commandButton styleClass="submit" type="submit" id="button_export_users_xls" value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}">
-						<p:dataExporter type="xls" target="table_export_users" fileName="all_users" />
-					</p:commandButton>
-				</div>
+				<p:commandButton
+					ajax="false"
+					type="submit"
+					value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}"
+					>
+
+					<p:dataExporter
+						type="xls"
+						target="table-export-users"
+						fileName="all_users"
+						/>
+				</p:commandButton>
 			</h:panelGroup>
 		</h:form>
 	</ui:define>
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index be6bf16e..e6e3a9a4 100644
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-				xmlns:links="http://mxchange.org/jsf/core/links"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core"
-				xmlns:p="http://primefaces.org/ui">
-
-	<ui:define name="admin_title">
+<ui:composition
+	template="/WEB-INF/templates/admin/admin_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
+	xmlns:links="http://mxchange.org/jsf/core/links"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_USER}" />
 	</ui:define>
 
@@ -17,128 +19,353 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<p:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" emptyMessage="#{msg.ADMIN_USER_LIST_EMPTY}">
-			<p:column>
+		<h:form id="form-list-users">
+			<p:dataTable
+				id="userList"
+				var="user"
+				value="#{userListController.allUsers}"
+				paginator="true"
+				paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+				filteredValue="#{userListController.filteredUsers}"
+				rows="10"
+				rowKey="#{user.userId}"
+				reflow="true"
+				resizableColumns="true"
+				rowsPerPageTemplate="5,10,20,50,100"
+				sortMode="multiple"
+				summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}"
+				emptyMessage="#{msg.ADMIN_EMPTY_LIST_USER}"
+				widgetVar="userList"
+				selectionMode="single"
+				selection="#{userListController.selectedUser}"
+				skipChildren="true"
+				>
+
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_USER_ID}" />
+					<p:panelGrid
+						columns="3"
+						layout="grid"
+						columnClasses="ui-grid-col-4,ui-grid-col-6,ui-grid-col-2"
+						>
+						<p:spacer />
+
+						<p:panelGrid
+							columns="2"
+							columnClasses="ui-grid-4,ui-grid-8"
+							layout="grid"
+							styleClass="ui-noborder"
+							>
+							<p:outputLabel
+								for="globalFilter"
+								value="#{msg.SEARCH_ALL_FIELDS}"
+								style="float: right"
+								/>
+
+							<p:inputText
+								id="globalFilter"
+								onkeyup="PF('userList').filter()"
+								placeholder="#{msg.ENTER_KEYWORD}"
+								/>
+						</p:panelGrid>
+
+						<p:outputPanel>
+							<p:spacer height="4" />
+
+							<p:commandButton
+								id="toggler"
+								type="button"
+								value="#{msg.SELECT_SHOWN_COLUMNS}"
+								styleClass="column-selector"
+								/>
+
+							<p:columnToggler datasource="userList" trigger="toggler" />
+						</p:outputPanel>
+					</p:panelGrid>
 				</f:facet>
 
-				<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
-					<f:param name="userId" value="#{user.userId}" />
-				</p:link>
-			</p:column>
+				<p:ajax
+					event="rowSelect"
+					update="form-list-users:user-details"
+					oncomplete="PF('userDialog').show()"
+					/>
 
-			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-				<p:column>
-					<f:facet name="header">
-						<h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
-					</f:facet>
+				<p:column
+					headerText="#{msg.DATA_USER_ID}"
+					sortBy="#{user.userId}"
+					filterable="false"
+					>
+					<p:link
+						outcome="admin_show_user"
+						value="#{user.userId}"
+						title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+						>
+						<f:param name="userId" value="#{user.userId}" />
+					</p:link>
+				</p:column>
 
+				<p:column
+					headerText="#{msg.DATA_USER_NAME}"
+					sortBy="#{user.userName}"
+					filterBy="#{user.userName}"
+					filterMatchMode="contains"
+					rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}"
+					>
 					<h:outputText value="#{user.userName}" />
 				</p:column>
-			</ui:fragment>
 
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
-				</f:facet>
+				<p:column
+					headerText="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}"
+					sortBy="#{user.userContact.contactPersonalTitle}"
+					filterBy="#{user.userContact.contactPersonalTitle}"
+					filterMatchMode="exact"
+					>
+					<f:facet name="filter">
+						<p:selectOneMenu
+							filter="true"
+							filterMatchMode="contains"
+							label="#{msg.LABEL_PERSONAL_TITLES}"
+							onchange="PF('userList').filter()"
+							title="#{msg.FILTER_BY_SINGLE_PERSONAL_TITLE}"
+							>
+							<f:converter converterId="PersonalTitleConverter" />
+							<f:selectItems
+								value="#{dataController.personalTitles}"
+								var="personalTitle"
+								itemValue="#{personalTitle}"
+								itemLabel="#{msg[personalTitle.messageKey]}"
+								/>
+						</p:selectOneMenu>
+					</f:facet>
 
-				<h:outputText value="#{msg[user.userContact.contactPersonalTitle.messageKey]}" />
-			</p:column>
+					<h:outputText value="#{msg[user.userContact.contactPersonalTitle.messageKey]}" />
+				</p:column>
 
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
-				</f:facet>
+				<p:column
+					headerText="#{msg.ADMIN_CONTACT_FIRST_NAME}"
+					sortBy="#{user.userContact.contactFirstName}"
+					filterBy="#{user.userContact.contactFirstName}"
+					filterMatchMode="contains"
+					>
+					<h:outputText value="#{user.userContact.contactFirstName}" />
+				</p:column>
 
-				<h:outputText value="#{user.userContact.contactFirstName}" />
-			</p:column>
+				<p:column
+					headerText="#{msg.ADMIN_CONTACT_FAMILY_NAME}"
+					sortBy="#{user.userContact.contactFamilyName}"
+					filterBy="#{user.userContact.contactFamilyName}"
+					filterMatchMode="contains"
+					>
+					<h:outputText value="#{user.userContact.contactFamilyName}" />
+				</p:column>
 
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
-				</f:facet>
+				<p:column
+					headerText="#{msg.ADMIN_USER_ACCOUNT_STATUS}"
+					sortBy="#{user.userAccountStatus}"
+					filterBy="#{user.userAccountStatus}"
+					filterMatchMode="exact"
+					>
+					<f:facet name="filter">
+						<p:selectOneMenu
+							filter="true"
+							filterMatchMode="contains"
+							label="#{msg.LABEL_ACCOUNT_STATUS}"
+							onchange="PF('userList').filter()"
+							title="#{msg.FILTER_BY_SINGLE_ACCOUNT_STATUS_TITLE}"
+							>
+							<f:converter converterId="UserAccountStatusConverter" />
+							<f:selectItems
+								value="#{dataController.userAccountStatuses}"
+								var="accountStatus"
+								itemValue="#{accountStatus}"
+								itemLabel="#{msg[accountStatus.messageKey]}"
+								/>
+						</p:selectOneMenu>
+					</f:facet>
 
-				<h:outputText value="#{user.userContact.contactFamilyName}" />
-			</p:column>
+					<h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
+				</p:column>
 
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
-				</f:facet>
+				<p:column
+					headerText="#{msg.ADMIN_USER_PROFILE_MODE}"
+					sortBy="#{user.userProfileMode}"
+					filterBy="#{user.userProfileMode}"
+					filterMatchMode="exact"
+					>
+					<f:facet name="filter">
+						<p:selectOneMenu
+							filter="true"
+							filterMatchMode="contains"
+							label="#{msg.LABEL_PROFILE_MODE}"
+							onchange="PF('userList').filter()"
+							title="#{msg.FILTER_BY_SINGLE_PROFILE_MODE_TITLE}"
+							>
+							<f:converter converterId="ProfileModeConverter" />
+							<f:selectItems
+								value="#{dataController.profileModes}"
+								var="profileMode"
+								itemValue="#{profileMode}"
+								itemLabel="#{msg[profileMode.messageKey]}"
+								/>
+						</p:selectOneMenu>
+					</f:facet>
 
-				<h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
-			</p:column>
+					<h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
+				</p:column>
 
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_USER_PROFILE_MODE}" />
-				</f:facet>
+				<p:column
+					headerText="#{msg.DATA_USER_LAST_LOCKED_REASON}"
+					sortBy="#{user.userLastLockedReason}"
+					filterBy="#{user.userLastLockedReason}"
+					filterMatchMode="contains"
+					>
+					<h:outputText value="#{user.userLastLockedReason}" />
+				</p:column>
+
+				<p:column
+					headerText="#{msg.DATA_USER_LAST_LOCKED}"
+					sortBy="#{user.userLastLocked}"
+					filterable="false"
+					>
+					<h:outputText value="#{user.userLastLocked}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
 
-				<h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
-			</p:column>
+				<p:column
+					headerText="#{msg.CHANGE}"
+					sortBy="#{user.userMustChangePassword}"
+					filterable="false"
+					>
+					<h:outputText value="#{user.userMustChangePassword ? msg.CHOICE_YES : msg.CHOICE_NO}" />
+				</p:column>
 
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_LIST_ENTRY_CREATED}" />
-				</f:facet>
+				<p:column
+					headerText="#{msg.ENTRY_CREATED_HEADER}"
+					sortBy="#{user.userEntryCreated}"
+					filterable="false"
+					>
+					<h:outputText value="#{user.userEntryCreated}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
 
-				<h:outputText id="userCreated" value="#{user.userCreated.time}">
-					<f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
-				</h:outputText>
-			</p:column>
+				<p:column
+					headerText="#{msg.ENTRY_UPDATED_HEADER}"
+					sortBy="#{user.userEntryUpdated}"
+					filterable="false"
+					>
+					<h:outputText value="#{user.userEntryUpdated}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
 
-			<p:column>
+				<p:column
+					headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+					sortable="false"
+					filterable="false"
+					>
+					<links:outputUserAdminDropdownMenu user="#{user}" />
+				</p:column>
+			</p:dataTable>
+
+			<p:dialog
+				dynamic="true"
+				modal="true"
+				resizable="false"
+				header="#{msg.ADMIN_SINGLE_USER_DETAILS_HEADER}"
+				hideEffect="fade"
+				showEffect="fade"
+				widgetVar="userDialog"
+				position="top"
+				responsive="true"
+				closeOnEscape="true"
+				>
+				<p:outputPanel id="user-details">
+					<p:panelGrid columns="2" rendered="#{not empty userListController.selectedUser}">
+						<f:facet name="header">
+							<h:outputFormat value="#{msg.ADMIN_USER_DETAILS_HEADER}">
+								<f:param value="#{userListController.selectedUser.userName}" />
+								<f:param value="#{userListController.selectedUser.userId}" />
+							</h:outputFormat>
+						</f:facet>
+
+						<p:outputLabel value="#{msg.ID_HEADER}" title="#{msg.USER_ID_NUMBER_TITLE}" />
+						<h:outputText value="#{userListController.selectedUser.userId}" />
+					</p:panelGrid>
+				</p:outputPanel>
+			</p:dialog>
+		</h:form>
+
+		<h:form>
+			<p:panelGrid
+				columns="1"
+				layout="grid"
+				>
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
+					<h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
 				</f:facet>
 
-				<links:outputUserAdminMiniLinks user="#{user}" />
-			</p:column>
-		</p:dataTable>
+				<p:fieldset
+					legend="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}"
+					title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}"
+					>
+					<p:panelGrid
+						columns="2"
+						columnClasses="ui-grid-col-3,ui-grid-col-9"
+						styleClass="ui-noborder"
+						layout="grid"
+						>
+						<p:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
+						<p:selectOneMenu
+							id="userContact"
+							filter="true"
+							filterMatchMode="contains"
+							value="#{adminUserController.contact}"
+							title="#{msg.FILTER_BY_SINGLE_CONTACT_TITLE}"
+							>
+							<f:converter converterId="ContactConverter" />
 
-		<h:panelGroup styleClass="table table-medium" layout="block">
-			<h:form id="form_admin_add_user">
-				<div class="table-header">
-					<h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
-				</div>
-
-				<!-- Whether select contact data .. //-->
-				<h:panelGroup id="admin_user_personal_data_option_1" styleClass="para" layout="block">
-					<fieldset class="fieldset" id="user_contact">
-						<legend title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}">
-							<h:outputText value="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}" />
-						</legend>
-
-						<h:panelGroup styleClass="table-row" layout="block">
-							<div class="table-left-medium">
-								<p:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
-							</div>
-
-							<div class="table-right-medium">
-								<p:selectOneMenu id="userContact" value="#{adminUserController.contact}" converter="ContactConverter">
-									<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-									<f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactPersonalTitle.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
-								</p:selectOneMenu>
-							</div>
-						</h:panelGroup>
-					</fieldset>
-				</h:panelGroup>
+							<f:selectItems
+								value="#{contactListController.allContacts}"
+								var="contact"
+								itemValue="#{contact}"
+								itemLabel="#{beanHelper.renderContact(contact)}"
+								/>
+						</p:selectOneMenu>
+					</p:panelGrid>
+				</p:fieldset>
 
-				<h:panelGroup styleClass="para" layout="block">
+				<h:panelGroup layout="block">
 					<h:outputText value="#{msg.ADMIN_ADD_OR_ENTER_CONTACT_DATA}" />
 				</h:panelGroup>
 
 				<!-- ... or enter it directly together it creating user account //-->
-				<h:panelGroup id="admin_user_personal_data_option_2" layout="block">
-					<ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
+				<h:panelGroup layout="block">
+					<core:outputAdminUserDataFormFields mode="add" />
+
+					<h:panelGroup styleClass="para notice">
+						<h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
+					</h:panelGroup>
+
+					<ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
 				</h:panelGroup>
 
-				<div class="table-footer">
-					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<p:commandButton styleClass="submit" type="submit" id="button_add_user" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
-				</div>
-			</h:form>
-		</h:panelGroup>
+				<f:facet name="footer">
+					<p:panelGrid columns="2" layout="grid">
+						<p:commandButton
+							type="reset"
+							value="#{msg.BUTTON_RESET_FORM}"
+							/>
+
+						<p:commandButton
+							type="submit"
+							value="#{msg.BUTTON_ADMIN_ADD_USER}"
+							action="#{adminUserController.addUser()}"
+							update="form-list-users:userList"
+							/>
+					</p:panelGrid>
+				</f:facet>
+			</p:panelGrid>
+		</h:form>
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index 03bfc251..a0f535f3 100644
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core"
-				xmlns:p="http://primefaces.org/ui">
+<ui:composition
+	template="/WEB-INF/templates/admin/admin_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<ui:define name="metadata">
 		<f:metadata>
-			<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-			<f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+			<f:viewParam
+				name="userId"
+				value="#{beanHelper.user}"
+				converter="UserConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+				/>
+			<f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOCK_USER}" />
 	</ui:define>
 
@@ -23,10 +31,8 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
-		<h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
-			<h:panelGroup styleClass="table table-medium" layout="block">
+		<h:form rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+			<h:panelGroup layout="block">
 				<div class="table-header">
 					<h:outputFormat value="#{msg.ADMIN_LOCK_USER_TITLE}">
 						<f:param value="#{beanHelper.user.userName}" />
@@ -70,7 +76,7 @@
 					</div>
 
 					<div class="table-right-medium">
-						<p:inputTextarea styleClass="input" id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" />
+						<p:inputTextarea id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" />
 					</div>
 				</h:panelGroup>
 
@@ -91,12 +97,20 @@
 			</h:panelGroup>
 		</h:form>
 
-		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+		<h:outputFormat
+			styleClass="alert-danger"
+			value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED}"
+			rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}"
+			>
 			<f:param value="#{beanHelper.user.userName}" />
 			<f:param value="#{beanHelper.user.userId}" />
 		</h:outputFormat>
 
-		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
+		<h:outputFormat
+			styleClass="alert-danger"
+			value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_LOCKED}"
+			rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}"
+			>
 			<f:param value="#{beanHelper.user.userName}" />
 			<f:param value="#{beanHelper.user.userId}" />
 		</h:outputFormat>
diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml
index 5afc35d2..fb6ba37e 100644
--- a/web/admin/user/admin_user_resend_confirmation_link.xhtml
+++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core"
-				xmlns:p="http://primefaces.org/ui">
+<ui:composition
+	template="/WEB-INF/templates/admin/admin_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<ui:define name="metadata">
 		<f:metadata>
-			<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-			<f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+			<f:viewParam
+				name="userId"
+				value="#{beanHelper.user}"
+				converter="UserConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+				/>
+			<f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_RESEND_USER_CONFIRMATION_LINK}" />
 	</ui:define>
 
@@ -23,10 +31,8 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
-		<h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
-			<h:panelGroup styleClass="table table-medium" layout="block">
+		<h:form rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+			<h:panelGroup layout="block">
 				<div class="table-header">
 					<h:outputFormat value="#{msg.ADMIN_RESEND_USER_CONFIRMATION_LINK_TITLE}">
 						<f:param value="#{beanHelper.user.userName}" />
@@ -42,20 +48,35 @@
 					<h:outputText styleClass="notice" value="#{msg.ADMIN_RESEND_USER_CONFIRMATION_LINK_NOTICE}" />
 				</h:panelGroup>
 
-				<div class="table-footer">
-					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<p:panelGrid columns="2" layout="grid">
+					<p:commandButton
+						type="reset"
+						value="#{msg.BUTTON_RESET_FORM}"
+						/>
 
-					<p:commandButton styleClass="submit" type="submit" action="#{adminUserController.resendConfirmationLink()}" value="#{msg.BUTTON_ADMIN_RESEND_USER_CONFIRMATION_LINK_ACCOUNT}" />
-				</div>
+					<p:commandButton
+						type="submit"
+						action="#{adminUserController.resendConfirmationLink()}"
+						value="#{msg.BUTTON_ADMIN_RESEND_USER_CONFIRMATION_LINK_ACCOUNT}"
+						/>
+				</p:panelGrid>
 			</h:panelGroup>
 		</h:form>
 
-		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+		<h:outputFormat
+			styleClass="alert-danger"
+			value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_UNLOCKED}"
+			rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}"
+			>
 			<f:param value="#{beanHelper.user.userName}" />
 			<f:param value="#{beanHelper.user.userId}" />
 		</h:outputFormat>
 
-		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
+		<h:outputFormat
+			styleClass="alert-danger"
+			value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_LOCKED}"
+			rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}"
+			>
 			<f:param value="#{beanHelper.user.userName}" />
 			<f:param value="#{beanHelper.user.userId}" />
 		</h:outputFormat>
diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 89f0b91b..51ac50a4 100644
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-				xmlns:links="http://mxchange.org/jsf/core/links"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+	template="/WEB-INF/templates/admin/admin_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:links="http://mxchange.org/jsf/core/links"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
 
 	<ui:define name="metadata">
 		<f:metadata>
-			<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-			<f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+			<f:viewParam
+				name="userId"
+				value="#{beanHelper.user}"
+				converter="UserConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+				/>
+			<f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_USER}" />
 	</ui:define>
 
@@ -23,29 +31,29 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
-		<ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data.tpl" />
-
-		<h:panelGroup styleClass="para" layout="block">
-			<links:outputUserAdminLinks
-				user="#{beanHelper.user}"
-				renderShowLink="false"
-				renderContactLinks="true"
-				renderHeader="true"
-				/>
-		</h:panelGroup>
-
-		<h:panelGroup styleClass="para" layout="block">
-			<ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
-		</h:panelGroup>
-
-		<h:panelGroup styleClass="para" layout="block">
-			<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
-		</h:panelGroup>
-
-		<h:panelGroup styleClass="para" layout="block">
-			<ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
-		</h:panelGroup>
+		<ui:fragment rendered="#{not empty beanHelper.user}">
+			<ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data.tpl" />
+
+			<h:panelGroup styleClass="para" layout="block">
+				<links:outputUserAdminLinks
+					user="#{beanHelper.user}"
+					renderShowLink="false"
+					renderContactLinks="true"
+					renderHeader="true"
+					/>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="para" layout="block">
+				<ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="para" layout="block">
+				<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="para" layout="block">
+				<ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
+			</h:panelGroup>
+		</ui:fragment>
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 517db8c3..40111a65 100644
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core"
-				xmlns:p="http://primefaces.org/ui">
+<ui:composition
+	template="/WEB-INF/templates/admin/admin_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<ui:define name="metadata">
 		<f:metadata>
-			<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-			<f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+			<f:viewParam
+				name="userId"
+				value="#{beanHelper.user}"
+				converter="UserConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+				/>
+			<f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLOCK_USER}" />
 	</ui:define>
 
@@ -23,10 +31,8 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
-		<h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'LOCKED'}">
-			<h:panelGroup styleClass="table table-medium" layout="block">
+		<h:form rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'LOCKED'}">
+			<h:panelGroup layout="block">
 				<div class="table-header">
 					<h:outputFormat value="#{msg.ADMIN_UNLOCK_USER_TITLE}">
 						<f:param value="#{beanHelper.user.userName}" />
@@ -40,7 +46,11 @@
 					</div>
 
 					<div class="table-data-field">
-						<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
+						<p:link
+							outcome="admin_show_user"
+							title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+							value="#{beanHelper.user.userId}"
+							>
 							<f:param name="userId" value="#{beanHelper.user.userId}" />
 						</p:link>
 					</div>
@@ -78,19 +88,19 @@
 
 				<h:panelGroup styleClass="para" layout="block">
 					<div class="table-data-label">
-						<p:outputLabel for="userLastLocked" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
+						<p:outputLabel for="userLastLocked" value="#{msg.DATA_USER_LAST_LOCKED}" />
 					</div>
 
 					<div class="table-data-field">
-						<h:outputText id="userLastLocked" value="#{beanHelper.user.userLastLocked.time}">
-							<f:convertDateTime for="userLastLocked" type="both" />
+						<h:outputText id="userLastLocked" value="#{beanHelper.user.userLastLocked}">
+							<f:convertDateTime type="both" />
 						</h:outputText>
 					</div>
 				</h:panelGroup>
 
 				<h:panelGroup styleClass="para" layout="block">
 					<div class="table-data-label">
-						<p:outputLabel for="userLockReason" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
+						<p:outputLabel for="userLockReason" value="#{msg.DATA_USER_LAST_LOCKED_REASON}" />
 					</div>
 
 					<div class="table-data-field">
@@ -98,20 +108,35 @@
 					</div>
 				</h:panelGroup>
 
-				<div class="table-footer">
-					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-
-					<p:commandButton styleClass="submit" type="submit" action="#{adminUserController.unlockUserAccount()}" value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}" />
-				</div>
+				<p:panelGrid columns="2" layout="grid">
+					<p:commandButton
+						type="reset"
+						value="#{msg.BUTTON_RESET_FORM}"
+						/>
+
+					<p:commandButton
+						type="submit"
+						action="#{adminUserController.unlockUserAccount()}"
+						value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}"
+						/>
+				</p:panelGrid>
 			</h:panelGroup>
 		</h:form>
 
-		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+		<h:outputFormat
+			styleClass="alert-danger"
+			value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED}"
+			rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}"
+			>
 			<f:param value="#{beanHelper.user.userName}" />
 			<f:param value="#{beanHelper.user.userId}" />
 		</h:outputFormat>
 
-		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+		<h:outputFormat
+			styleClass="alert-danger"
+			value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNLOCKED}"
+			rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}"
+			>
 			<f:param value="#{beanHelper.user.userName}" />
 			<f:param value="#{beanHelper.user.userId}" />
 		</h:outputFormat>
-- 
2.39.5