From: Roland Häder <roland@mxchange.org>
Date: Thu, 24 Nov 2022 00:58:33 +0000 (+0100)
Subject: Don't cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2e1ea56294a7e2b628d364371cdf56160428a116;p=addressbook-war.git

Don't cherry-pick:
- upgraded templates/views/faces-config.xml and web.xml to latest changes from
  JFinancials
---

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 700a3a1b..10970fa6 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -11,7 +11,7 @@
 	</application>
 	<!--
 	<lifecycle>
-		<phase-listener>org.mxchange.addressbook.debug.AddressbookDebugLifeCycleListener</phase-listener>
+		<phase-listener>org.mxchange.jfinancials.debug.FinancialsDebugLifeCycleListener</phase-listener>
 	</lifecycle>
 	//-->
 	<navigation-rule>
@@ -85,15 +85,15 @@
 			<to-view-id>/user/user_profile.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_list_fax</from-outcome>
+			<from-outcome>admin_list_faxes</from-outcome>
 			<to-view-id>/admin/fax/admin_fax_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_list_landline</from-outcome>
+			<from-outcome>admin_list_landlines</from-outcome>
 			<to-view-id>/admin/landline/admin_landline_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_list_mobile</from-outcome>
+			<from-outcome>admin_list_mobiles</from-outcome>
 			<to-view-id>/admin/mobile/admin_mobile_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
@@ -101,11 +101,11 @@
 			<to-view-id>/admin/country/admin_country_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_list_contact</from-outcome>
+			<from-outcome>admin_list_contacts</from-outcome>
 			<to-view-id>/admin/contact/admin_contact_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_export_contact</from-outcome>
+			<from-outcome>admin_export_contacts</from-outcome>
 			<to-view-id>/admin/contact/admin_contact_export.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
@@ -133,11 +133,11 @@
 			<to-view-id>/admin/business/employee/admin_employee_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_list_user</from-outcome>
+			<from-outcome>admin_list_users</from-outcome>
 			<to-view-id>/admin/user/admin_user_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_list_mobile_provider</from-outcome>
+			<from-outcome>admin_list_mobile_providers</from-outcome>
 			<to-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
@@ -149,11 +149,11 @@
 			<to-view-id>/admin/country/admin_country_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_list_contact</from-outcome>
+			<from-outcome>admin_list_contacts</from-outcome>
 			<to-view-id>/admin/contact/admin_contact_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_list_mobile_provider</from-outcome>
+			<from-outcome>admin_list_mobile_providers</from-outcome>
 			<to-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
@@ -292,7 +292,7 @@
 			<to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_list_user</from-outcome>
+			<from-outcome>admin_list_users</from-outcome>
 			<to-view-id>/admin/user/admin_user_list.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
@@ -525,7 +525,7 @@
 			<to-view-id>/admin/fax_provider/admin_fax_provider_show.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_list_fax</from-outcome>
+			<from-outcome>admin_list_faxes</from-outcome>
 			<to-view-id>/admin/fax/admin_fax_list.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
@@ -536,7 +536,7 @@
 			<to-view-id>/admin/landline_provider/admin_landline_provider_show.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_list_landline</from-outcome>
+			<from-outcome>admin_list_landlines</from-outcome>
 			<to-view-id>/admin/landline/admin_landline_list.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
@@ -554,7 +554,7 @@
 			<to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_list_mobile</from-outcome>
+			<from-outcome>admin_list_mobiles</from-outcome>
 			<to-view-id>/admin/mobile/admin_mobile_list.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
@@ -705,7 +705,7 @@
 	<navigation-rule>
 		<from-view-id>/admin/contact/admin_contact_edit.xhtml</from-view-id>
 		<navigation-case>
-			<from-outcome>admin_list_contact</from-outcome>
+			<from-outcome>admin_list_contacts</from-outcome>
 			<to-view-id>/admin/contact/admin_contact_list.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
@@ -954,5 +954,5 @@
 			org.mxchange.jcoreee.exceptions.CustomExceptionHandlerFactory
 		</exception-handler-factory>
 	</factory>
-	//-->
+	-->
 </faces-config>
diff --git a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
index d60ab1a2..3c1f6139 100644
--- a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
+++ b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
@@ -5,7 +5,8 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<p:column>
 		<p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
@@ -14,18 +15,18 @@
 	</p:column>
 
 	<p:column>
-		<p:outputLabel for="contactCreated" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_CREATED}" />
+		<p:outputLabel for="contactEntryCreated" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_CREATED}" />
 
-		<h:outputText id="contactCreated" styleClass="table-data-field" value="#{beanHelper.contact.contactCreated.time}">
-			<f:convertDateTime for="contactCreated" type="both" />
+		<h:outputText id="contactEntryCreated" styleClass="table-data-field" value="#{beanHelper.contact.contactEntryCreated}">
+			<f:convertDateTime type="both" />
 		</h:outputText>
 	</p:column>
 
 	<p:column>
-		<p:outputLabel for="contactUpdated" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_UPDATED}" />
+		<p:outputLabel for="contactEntryUpdated" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_UPDATED}" />
 
-		<h:outputText id="contactUpdated" styleClass="table-data-field" value="#{beanHelper.contact.contactUpdated.time}">
-			<f:convertDateTime for="contactUpdated" type="both" />
+		<h:outputText id="contactEntryUpdated" styleClass="table-data-field" value="#{beanHelper.contact.contactEntryUpdated}">
+			<f:convertDateTime type="both" />
 		</h:outputText>
 	</p:column>
 
@@ -78,13 +79,13 @@
 	</p:column>
 
 	<p:column>
-		<p:outputLabel for="contactCountry" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_COUNTRY_CODE}" />
+		<p:outputLabel for="contactCountry" styleClass="table-data-label" value="#{msg.DATA_COUNTRY_CODE}" />
 
 		<h:outputText id="contactCountry" styleClass="table-data-field" value="#{beanHelper.contact.contactCountry.countryCode}" />
 	</p:column>
 
 	<p:column>
-		<p:outputLabel for="contactZipCode" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
+		<p:outputLabel for="contactZipCode" styleClass="table-data-label" value="#{msg.DATA_ZIP_CODE}" />
 
 		<h:outputText id="contactZipCode" styleClass="table-data-field" value="#{beanHelper.contact.contactZipCode}" />
 	</p:column>
@@ -98,16 +99,20 @@
 	<p:column>
 		<p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-		<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
+		<p:link
+			id="contactEmailAddress"
+			styleClass="table-data-field"
+			href="mailto:#{beanHelper.contact.contactEmailAddress}"
+			>
 			<h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
-		</h:outputLink>
+		</p:link>
 	</p:column>
 
 	<p:column>
 		<p:outputLabel for="contactBirthday" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
 
-		<h:outputText id="contactBirthday" styleClass="table-data-field" value="#{beanHelper.contact.contactBirthday.time}">
-			<f:convertDateTime for="contactBirthday" type="date" />
+		<h:outputText id="contactBirthday" styleClass="table-data-field" value="#{beanHelper.contact.contactBirthday}">
+			<f:convertDateTime type="date" dateStyle="medium" />
 		</h:outputText>
 	</p:column>
 
diff --git a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl
index 72ad507f..82000810 100644
--- a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl
+++ b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl
@@ -2,10 +2,10 @@
 <!-- @TODO maybe later add phone numbers as "main" numbers? //-->
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<p:column>
 		<p:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
@@ -34,8 +34,12 @@
 	<p:column>
 		<p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-		<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
+		<p:link
+			id="contactEmailAddress"
+			styleClass="table-data-field"
+			href="mailto:#{beanHelper.contact.contactEmailAddress}"
+			>
 			<h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
-		</h:outputLink>
+		</p:link>
 	</p:column>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/dropdown/user/admin_user_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/user/admin_user_links.tpl
new file mode 100644
index 00000000..6e272b26
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/dropdown/user/admin_user_links.tpl
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
+		<p:menuitem outcome="admin_show_user" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+			<f:param name="userId" value="#{user.userId}" />
+		</p:menuitem>
+
+		<p:menuitem outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
+			<f:param name="userId" value="#{user.userId}" />
+		</p:menuitem>
+
+		<p:menuitem outcome="admin_resend_user_confirm_link" value="#{msg.ADMIN_LINK_RESEND_CONFIRMATION_SHORT}" title="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE}" rendered="#{user.userAccountStatus == 'UNCONFIRMED'}">
+			<f:param name="userId" value="#{user.userId}" />
+		</p:menuitem>
+
+		<p:menuitem outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_SHORT}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'LOCKED'}">
+			<f:param name="userId" value="#{user.userId}" />
+		</p:menuitem>
+
+		<p:menuitem outcome="admin_lock_user">
+			<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_LOCK_SHORT}" title="#{msg.ADMIN_LINK_LOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'CONFIRMED'}" />
+			<f:param name="userId" value="#{user.userId}" />
+		</p:menuitem>
+
+		<p:menuitem outcome="admin_delete_user">
+			<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}" />
+			<f:param name="userId" value="#{user.userId}" />
+		</p:menuitem>
+	</p:menuButton>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl
deleted file mode 100644
index 91554a84..00000000
--- a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered}">
-		<fieldset class="fieldset">
-			<legend title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}">
-				<h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}" />
-			</legend>
-
-			<widgets:outputPersonalTitleTableRow targetController="#{adminContactController}" allowEmptyRequiredData="#{allowEmptyRequiredData}" />
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{adminContactController.firstName}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="firstName" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="title" value="#{msg.ADMIN_PERSONAL_DATA_TITLE}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="title" size="5" maxlength="255" value="#{adminContactController.academicTitle}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="title" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="familyName" value="#{msg.ADMIN_PERSONAL_DATA_FAMILY_NAME}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{adminContactController.familyName}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="familyName" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="street" value="#{msg.ADMIN_DATA_STREET_NAME}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{adminContactController.street}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="street" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="houseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{adminContactController.houseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
-						<f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="houseNumber" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_DATA_HOUSE_NUMBER_EXTENSION}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{adminContactController.houseNumberExtension}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="houseNumberExtension" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="zipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{adminContactController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
-						<f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="zipCode" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="city" value="#{msg.ADMIN_DATA_CITY}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="city" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="country" value="#{msg.ADMIN_SELECT_COUNTRY}" />
-				</div>
-
-				<div class="table-right-medium">
-					<widgets:outputCountrySelector id="country" value="#{adminContactController.contactCountry}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="country" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="landLineCountryCode" value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<widgets:outputCountrySelector id="landLineCountryCode" styleClass="select divider-right" value="#{adminContactController.landLineCountry}" />
-
-					<p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminContactController.landLineAreaCode}">
-						<f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
-					</p:inputText>
-
-					<p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminContactController.landLineNumber}">
-						<f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="faxCountryCode" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<widgets:outputCountrySelector id="faxCountryCode" styleClass="select divider-right" value="#{adminContactController.faxCountry}" />
-
-					<p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
-						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
-					</p:inputText>
-
-					<p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminContactController.faxNumber}">
-						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<widgets:outputMobileNumberTableRow targetController="#{adminContactController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="emailAddress" value="#{msg.DATA_EMAIL_ADDRESS}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
-						<f:validator for="emailAddress" validatorId="EmailAddressValidator" />
-						<f:attribute name="allowEmptyValue" value="#{allowEmptyRequiredData}" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="emailAddress" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="contactBirthday" value="#{msg.ADMIN_PERSONAL_DATA_BIRTHDAY}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:calendar id="contactBirthday" value="#{contactController.birthday}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="contactBirthday" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="contactComment" value="#{msg.ADMIN_PERSONAL_DATA_COMMENT}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputTextarea id="contactComment" styleClass="input" value="#{adminContactController.comment}" rows="7" cols="25" />
-				</div>
-			</h:panelGroup>
-		</fieldset>
-	</h:panelGroup>
-
-	<h:panelGroup styleClass="para notice" layout="block">
-		<ul>
-			<li>
-				<h:outputText value="#{msg.ADMIN_CONTACT_DATA_EMAIL_ADDRESS_NOTICE}" />
-			</li>
-		</ul>
-	</h:panelGroup>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl
index 8a8d2c01..c091322d 100644
--- a/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl
@@ -1,29 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
 
-	<h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
-		<fieldset class="fieldset">
-			<legend title="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND_TITLE}">
-				<h:outputText value="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND}" />
-			</legend>
+	<p:fieldset
+		legend="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND}"
+		title="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND_TITLE}"
+		rendered="#{empty rendered or rendered == true}"
+		>
+		<p:panelGrid
+			layout="grid"
+			columns="2"
+			>
+			<p:outputLabel value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
+			<h:outputText value="#{adminPhoneController.phoneId}" />
 
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="faxNumberId" value="#{msg.ADMIN_ID_NUMBER}" />
-				</div>
+			<p:outputLabel for="faxNumber" value="#{msg.ADMIN_EDIT_FAX_NUMBER}" />
+			<p:panelGrid
+				layout="grid"
+				columns="3"
+				>
+				<core:outputCountrySelector id="landLineCountry" styleClass="select" value="#{adminPhoneController.phoneCountry}" />
 
-				<div class="table-right-medium">
-					<h:outputText id="faxNumberId" value="#{faxNumber.phoneId}" />
-				</div>
-			</h:panelGroup>
+				<p:inputText size="5" maxlength="10" value="#{adminPhoneController.phoneAreaCode}">
+					<f:validator validatorId="PhoneNumberValidator" />
+				</p:inputText>
 
-			<widgets:outputFaxInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_EDIT_FAX_NUMBER}" />
-		</fieldset>
-	</h:panelGroup>
+				<p:inputText size="10" maxlength="20" value="#{adminPhoneController.landLineNumber}">
+					<f:validator validatorId="PhoneNumberValidator" />
+				</p:inputText>
+			</p:panelGrid>
+		</p:panelGrid>
+	</p:fieldset>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl
index 2453119c..7c46612a 100644
--- a/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl
@@ -1,29 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
 
-	<h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
-		<fieldset class="fieldset">
-			<legend title="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND_TITLE}">
-				<h:outputText value="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND}" />
-			</legend>
+	<p:fieldset
+		legend="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND}"
+		title="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND_TITLE}"
+		rendered="#{empty rendered or rendered == true}"
+		>
+		<p:panelGrid
+			layout="grid"
+			columns="2"
+			>
+			<p:outputLabel value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
+			<h:outputText value="#{adminPhoneController.phoneId}" />
 
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="landLineNumberId" value="#{msg.ADMIN_ID_NUMBER}" />
-				</div>
+			<p:outputLabel for="landLineNumber" value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER}" />
+			<p:panelGrid
+				layout="grid"
+				columns="3"
+				>
+				<core:outputCountrySelector id="landLineCountry" styleClass="select" value="#{adminPhoneController.phoneCountry}" />
 
-				<div class="table-right-medium">
-					<h:outputText id="landLineNumberId" value="#{landLineNumber.phoneId}" />
-				</div>
-			</h:panelGroup>
+				<p:inputText size="5" maxlength="10" value="#{adminPhoneController.phoneAreaCode}">
+					<f:validator validatorId="PhoneNumberValidator" />
+				</p:inputText>
 
-			<widgets:outputLandLineInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER}" />
-		</fieldset>
-	</h:panelGroup>
+				<p:inputText size="10" maxlength="20" value="#{adminPhoneController.landLineNumber}">
+					<f:validator validatorId="PhoneNumberValidator" />
+				</p:inputText>
+			</p:panelGrid>
+		</p:panelGrid>
+	</p:fieldset>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_edit_form_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_edit_form_mobile_data.tpl
new file mode 100644
index 00000000..def45ad0
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_edit_form_mobile_data.tpl
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
+		<fieldset class="fieldset">
+			<legend title="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND_TITLE}">
+				<h:outputText value="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND}" />
+			</legend>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="mobileNumberId" value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:outputText id="mobileNumberId" value="#{mobileNumber.mobileId}" />
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<p:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
+
+				<p:selectOneMenu
+					id="mobileProvider"
+					value="#{adminPhoneController.mobileProvider}"
+					filter="true"
+					filterMatchMode="contains"
+					required="true"
+					requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}"
+					>
+					<f:converter converterId="MobileProviderConverter" />
+
+					<f:selectItem
+						itemValue="#{null}"
+						itemLabel="#{msg.NONE_SELECTED}"
+						/>
+
+					<f:selectItems
+						value="#{mobileProviderListController.allMobileProviders}"
+						var="mobileProvider"
+						itemValue="#{mobileProvider}"
+						itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})"
+						/>
+				</p:selectOneMenu>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="mobileProvider" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<p:outputLabel for="mobileNumber" value="#{msg.ADMIN_EDIT_MOBILE_NUMBER}" />
+
+				<p:inputText
+					id="mobileNumber"
+					size="20"
+					maxlength="20"
+					value="#{adminPhoneController.phoneNumber}"
+					required="true"
+					requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}"
+					>
+					<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
+				</p:inputText>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="mobileNumber" />
+			</h:panelGroup>
+		</fieldset>
+	</h:panelGroup>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
deleted file mode 100644
index 6589d2cb..00000000
--- a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
-		<fieldset class="fieldset">
-			<legend title="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND_TITLE}">
-				<h:outputText value="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND}" />
-			</legend>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="mobileNumberId" value="#{msg.ADMIN_ID_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:outputText id="mobileNumberId" value="#{mobileNumber.phoneId}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:selectOneMenu
-						id="mobileProvider"
-						value="#{adminPhoneController.mobileProvider}"
-						filter="true"
-						filterMatchMode="contains"
-						required="true"
-						requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}"
-						>
-						<f:converter converterId="MobileProviderConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
-					</p:selectOneMenu>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="mobileProvider" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="mobileNumber" value="#{msg.ADMIN_EDIT_MOBILE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}">
-						<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="mobileNumber" />
-			</h:panelGroup>
-		</fieldset>
-	</h:panelGroup>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
index de66672f..4028b2fb 100644
--- a/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
@@ -1,80 +1,66 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
-	<h:panelGroup styleClass="para" layout="block" rendered="#{not empty mode}">
-		<fieldset class="fieldset">
-			<legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">
-				<h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}" />
-			</legend>
+	<p:fieldset
+		legend="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}"
+		title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}"
+		rendered="#{not empty mode}"
+		>
+		<p:panelGrid
+			columns="2"
+			columnClasses="ui-grid-col-4,ui-grid-col-8"
+			styleClass="ui-noborder"
+			>
+			<p:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
+			<p:inputText id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" requiredMessage="#{msg.ADMIN_USER_NAME_IS_REQUIRED}" />
 
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
-				</div>
+			<p:outputLabel for="userPassword" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD}" />
+			<p:inputText type="password" id="userPassword" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
 
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" requiredMessage="#{msg.ADMIN_USER_NAME_IS_REQUIRED}" />
-				</div>
-			</h:panelGroup>
+			<p:outputLabel for="userPasswordRepeat" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT}" />
+			<p:inputText type="password" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
 
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="userName" />
-			</h:panelGroup>
+			<p:outputLabel for="userMustChangePassword" value="#{msg.ADMIN_USER_MUST_CHANGE_PASSWORD}" />
+			<p:selectBooleanCheckbox id="userMustChangePassword" value="#{adminUserController.userMustChangePassword}" />
 
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="userPassword" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD}" />
-				</div>
+			<p:outputLabel for="userProfileMode" value="#{msg.ADMIN_SELECT_USER_PROFILE_MODE}" />
+			<p:selectOneMenu
+				id="userProfileMode"
+				value="#{adminUserController.userProfileMode}"
+				filter="true"
+				filterMatchMode="contains"
+				>
 
-				<div class="table-right-medium">
-					<p:inputText type="secret" styleClass="input" id="userPassword" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
-				</div>
-			</h:panelGroup>
+				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
 
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="userPassword" />
-			</h:panelGroup>
+				<f:selectItems
+					value="#{dataController.profileModes}"
+					var="profileMode"
+					itemValue="#{profileMode}"
+					itemLabel="#{msg[profileMode.messageKey]}"
+					/>
+			</p:selectOneMenu>
+		</p:panelGrid>
+	</p:fieldset>
 
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="userPasswordRepeat" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT}" />
-				</div>
+	<p:fieldset
+		legend="#{msg.ADMIN_USER_DATA_NOTICES_LEGEND}"
+		rendered="#{not empty mode}"
+		>
+		<ul>
+			<li><h:outputText value="#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}" /></li>
 
-				<div class="table-right-medium">
-					<p:inputText type="secret" styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="userPasswordRepeat" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block" rendered="#{featureController.isFeatureEnabled('user_must_change_password')}">
-				<div class="table-left-medium">
-					<p:outputLabel for="userMustChangePassword" value="#{msg.ADMIN_USER_MUST_CHANGE_PASSWORD}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:selectBooleanCheckbox id="userMustChangePassword" value="#{adminUserController.userMustChangePassword}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="para notice" layout="block">
-				<ul>
-					<li><h:outputText value="#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}" /></li>
-
-					<li>
-						<h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />
-						<h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_ADD_NOTICE}" rendered="#{mode == 'add'}" />
-					</li>
-				</ul>
-			</h:panelGroup>
-		</fieldset>
-	</h:panelGroup>
+			<li>
+				<h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />
+				<h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_ADD_NOTICE}" rendered="#{mode == 'add'}" />
+			</li>
+		</ul>
+	</p:fieldset>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl
deleted file mode 100644
index b0612aaf..00000000
--- a/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<ui:fragment rendered="#{empty rendered or rendered}">
-		<ul class="navbar-mini">
-			<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-				<li class="navlink-mini">
-					<p:link outcome="admin_show_basic_data" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE}">
-						<f:param name="basicDataId" value="#{basicData.basicDataId}" />
-					</p:link>
-				</li>
-			</ui:fragment>
-
-			<li class="navlink-mini">
-				<p:link outcome="admin_edit_basic_data" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE}">
-					<f:param name="basicDataId" value="#{basicData.basicDataId}" />
-				</p:link>
-			</li>
-
-			<li class="navlink-mini">
-				<p:link outcome="admin_delete_basic_data">
-					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE}" />
-					<f:param name="basicDataId" value="#{basicData.basicDataId}" />
-				</p:link>
-			</li>
-		</ul>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl
deleted file mode 100644
index 5b281c78..00000000
--- a/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<ui:fragment rendered="#{empty rendered or rendered}">
-		<ul class="navbar-mini">
-			<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-				<li class="navlink-mini">
-					<p:link outcome="admin_show_branch_office" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE}">
-						<f:param name="branchId" value="#{branchOffice.branchId}" />
-					</p:link>
-				</li>
-			</ui:fragment>
-
-			<li class="navlink-mini">
-				<p:link outcome="admin_edit_branch_office" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE}">
-					<f:param name="branchId" value="#{branchOffice.branchId}" />
-				</p:link>
-			</li>
-
-			<li class="navlink-mini">
-				<p:link outcome="admin_delete_branch_office">
-					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE}" />
-					<f:param name="branchId" value="#{branchOffice.branchId}" />
-				</p:link>
-			</li>
-		</ul>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl
deleted file mode 100644
index 8a0e79c4..00000000
--- a/web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<ui:fragment rendered="#{empty rendered or rendered}">
-		<ul class="navbar-mini">
-			<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-				<li class="navlink-mini">
-					<p:link outcome="admin_show_contact" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}">
-						<f:param name="contactId" value="#{contact.contactId}" />
-					</p:link>
-				</li>
-			</ui:fragment>
-
-			<li class="navlink-mini">
-				<p:link outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
-					<f:param name="contactId" value="#{contact.contactId}" />
-				</p:link>
-			</li>
-
-			<li class="navlink-mini">
-				<p:link outcome="admin_delete_contact">
-					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_CONTACT_TITLE}" />
-					<f:param name="contactId" value="#{contact.contactId}" />
-				</p:link>
-			</li>
-		</ul>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/country/admin_country_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/country/admin_country_links.tpl
deleted file mode 100644
index 14459291..00000000
--- a/web/WEB-INF/resources/tags/admin/links/mini/country/admin_country_links.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<ui:fragment rendered="#{empty rendered or rendered}">
-		<ul class="navbar-mini">
-			<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-				<li class="navlink-mini">
-					<p:link outcome="admin_show_country" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_COUNTRY_TITLE}">
-						<f:param name="countryId" value="#{country.countryId}" />
-					</p:link>
-				</li>
-			</ui:fragment>
-
-			<li class="navlink-mini">
-				<p:link outcome="admin_edit_country" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_COUNTRY_TITLE}">
-					<f:param name="countryId" value="#{country.countryId}" />
-				</p:link>
-			</li>
-
-			<li class="navlink-mini">
-				<p:link outcome="admin_delete_country">
-					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_COUNTRY_TITLE}" />
-					<f:param name="countryId" value="#{country.countryId}" />
-				</p:link>
-			</li>
-		</ul>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl
deleted file mode 100644
index ad55a476..00000000
--- a/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<ui:fragment rendered="#{empty rendered or rendered}">
-		<ul class="navbar-mini">
-			<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-				<li class="navlink-mini">
-					<p:link outcome="admin_show_fax" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}">
-						<f:param name="phoneId" value="#{faxNumber.phoneId}" />
-					</p:link>
-				</li>
-			</ui:fragment>
-
-			<li class="navlink-mini">
-				<p:link outcome="admin_edit_fax" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_FAX_NUMBER_TITLE}">
-					<f:param name="phoneId" value="#{faxNumber.phoneId}" />
-				</p:link>
-			</li>
-
-			<ui:fragment rendered="#{not empty contact}">
-				<li class="navlink-mini">
-					<p:link outcome="admin_unlink_contact_fax">
-						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE}" />
-						<f:param name="phoneId" value="#{faxNumber.phoneId}" />
-						<f:param name="contactId" value="#{contact.contactId}" />
-					</p:link>
-				</li>
-			</ui:fragment>
-
-			<li class="navlink-mini">
-				<p:link outcome="admin_delete_fax">
-					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_FAX_NUMBER_TITLE}" />
-					<f:param name="phoneId" value="#{faxNumber.phoneId}" />
-				</p:link>
-			</li>
-		</ul>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl
deleted file mode 100644
index e6f2ae06..00000000
--- a/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<ui:fragment rendered="#{empty rendered or rendered}">
-		<ul class="navbar-mini">
-			<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-				<li class="navlink-mini">
-					<p:link outcome="admin_show_landline" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE}">
-						<f:param name="phoneId" value="#{landLineNumber.phoneId}" />
-					</p:link>
-				</li>
-			</ui:fragment>
-
-			<li class="navlink-mini">
-				<p:link outcome="admin_edit_landline" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_LANDLINE_NUMBER_TITLE}">
-					<f:param name="phoneId" value="#{landLineNumber.phoneId}" />
-				</p:link>
-			</li>
-
-			<ui:fragment rendered="#{not empty contact}">
-				<li class="navlink-mini">
-					<p:link outcome="admin_unlink_contact_landline">
-						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LANDLINE_NUMBER_CONTACT_TITLE}" />
-						<f:param name="phoneId" value="#{landLineNumber.phoneId}" />
-						<f:param name="contactId" value="#{contact.contactId}" />
-					</p:link>
-				</li>
-			</ui:fragment>
-
-			<li class="navlink-mini">
-				<p:link outcome="admin_delete_landline">
-					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_LANDLINE_NUMBER_TITLE}" />
-					<f:param name="phoneId" value="#{landLineNumber.phoneId}" />
-				</p:link>
-			</li>
-		</ul>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl
deleted file mode 100644
index 1c5255e3..00000000
--- a/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<ui:fragment rendered="#{empty rendered or rendered}">
-		<ul class="navbar-mini">
-			<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-				<li class="navlink-mini">
-					<p:link outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}">
-						<f:param name="phoneId" value="#{mobileNumber.phoneId}" />
-					</p:link>
-				</li>
-			</ui:fragment>
-
-			<li class="navlink-mini">
-				<p:link outcome="admin_edit_mobile" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_MOBILE_NUMBER_TITLE}">
-					<f:param name="phoneId" value="#{mobileNumber.phoneId}" />
-				</p:link>
-			</li>
-
-			<ui:fragment rendered="#{not empty contact}">
-				<li class="navlink-mini">
-					<p:link outcome="admin_unlink_contact_mobile">
-						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE}" />
-						<f:param name="phoneId" value="#{mobileNumber.phoneId}" />
-						<f:param name="contactId" value="#{contact.contactId}" />
-					</p:link>
-				</li>
-			</ui:fragment>
-
-			<li class="navlink-mini">
-				<p:link outcome="admin_delete_mobile">
-					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_MOBILE_NUMBER_TITLE}" />
-					<f:param name="phoneId" value="#{mobileNumber.phoneId}" />
-				</p:link>
-			</li>
-		</ul>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl
deleted file mode 100644
index 92760013..00000000
--- a/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<ui:fragment rendered="#{empty rendered or rendered}">
-		<ul class="navbar-mini">
-			<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-				<li class="navlink-mini">
-					<p:link 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:link>
-				</li>
-			</ui:fragment>
-
-			<li class="navlink-mini">
-				<p:link 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:link>
-			</li>
-
-			<li class="navlink-mini">
-				<p:link 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:link>
-			</li>
-		</ul>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl
deleted file mode 100644
index 10f5d659..00000000
--- a/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<ui:fragment rendered="#{empty rendered or rendered}">
-		<ul class="navbar-mini">
-			<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-				<li class="navlink-mini">
-					<p:link outcome="admin_show_user" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}">
-						<f:param name="userId" value="#{user.userId}" />
-					</p:link>
-				</li>
-			</ui:fragment>
-
-			<li class="navlink-mini">
-				<p:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
-					<f:param name="userId" value="#{user.userId}" />
-				</p:link>
-			</li>
-
-			<li class="navlink-mini">
-				<p:link outcome="admin_resend_user_confirm_link" value="#{msg.ADMIN_LINK_RESEND_CONFIRMATION_SHORT}" title="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE}" rendered="#{user.userAccountStatus == 'UNCONFIRMED'}">
-					<f:param name="userId" value="#{user.userId}" />
-				</p:link>
-
-				<p:link outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_SHORT}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'LOCKED'}">
-					<f:param name="userId" value="#{user.userId}" />
-				</p:link>
-
-				<p:link outcome="admin_lock_user">
-					<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_LOCK_SHORT}" title="#{msg.ADMIN_LINK_LOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'CONFIRMED'}" />
-					<f:param name="userId" value="#{user.userId}" />
-				</p:link>
-			</li>
-
-			<li class="navlink-mini">
-				<p:link outcome="admin_delete_user">
-					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}" />
-					<f:param name="userId" value="#{user.userId}" />
-				</p:link>
-			</li>
-		</ul>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl b/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl
index 89bc08e0..d4b2725a 100644
--- a/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl
@@ -4,7 +4,8 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<h:panelGroup styleClass="table" layout="block">
 		<h:panelGroup styleClass="table-header" layout="block" rendered="#{not empty renderHeader and renderHeader}">
@@ -15,43 +16,69 @@
 			<ul>
 				<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
 					<li>
-						<p:link outcome="admin_show_user" value="#{msg.ADMIN_LINK_SHOW_USER}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}">
+						<p:link
+							outcome="admin_show_user"
+							value="#{msg.ADMIN_LINK_SHOW_USER}"
+							title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+							>
 							<f:param name="userId" value="#{user.userId}" />
 						</p:link>
 					</li>
 				</ui:fragment>
 
 				<li>
-					<p:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_USER}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
+					<p:link
+						outcome="admin_edit_user"
+						value="#{msg.ADMIN_LINK_EDIT_USER}"
+						title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}"
+						>
 						<f:param name="userId" value="#{user.userId}" />
 					</p:link>
 				</li>
 
 				<ui:fragment rendered="#{not empty renderContactLinks and renderContactLinks}">
 					<li>
-						<p:link outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_CONTACT}" title="#{msg.ADMIN_LINK_EDIT_CONTACT_TITLE}">
+						<p:link
+							outcome="admin_edit_contact"
+							value="#{msg.ADMIN_LINK_EDIT_CONTACT}"
+							title="#{msg.ADMIN_LINK_EDIT_CONTACT_TITLE}"
+							>
 							<f:param name="contactId" value="#{user.userContact.contactId}" />
 						</p:link>
 					</li>
 				</ui:fragment>
 
 				<li>
-					<p:link outcome="admin_resend_user_confirm_link" value="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK}" title="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE}" rendered="#{user.userAccountStatus == 'UNCONFIRMED'}">
+					<p:link
+						outcome="admin_resend_user_confirm_link"
+						value="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK}"
+						title="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE}"
+						rendered="#{user.userAccountStatus == 'UNCONFIRMED'}"
+						>
 						<f:param name="userId" value="#{user.userId}" />
 					</p:link>
 
-					<p:link outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_USER}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'LOCKED'}">
+					<p:link
+						outcome="admin_unlock_user"
+						value="#{msg.ADMIN_LINK_UNLOCK_USER}"
+						title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}"
+						rendered="#{user.userAccountStatus == 'LOCKED'}"
+						>
 						<f:param name="userId" value="#{user.userId}" />
 					</p:link>
 
-					<p:link outcome="admin_lock_user">
+					<p:link
+						outcome="admin_lock_user"
+						>
 						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_LOCK_USER}" title="#{msg.ADMIN_LINK_LOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'CONFIRMED'}" />
 						<f:param name="userId" value="#{user.userId}" />
 					</p:link>
 				</li>
 
 				<li>
-					<p:link outcome="admin_delete_user">
+					<p:link
+						outcome="admin_delete_user"
+						>
 						<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_USER}" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}" />
 						<f:param name="userId" value="#{user.userId}" />
 					</p:link>
@@ -59,14 +86,22 @@
 
 				<ui:fragment rendered="#{not empty renderContactLinks and renderContactLinks}">
 					<li>
-						<p:link outcome="admin_show_contact" value="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA}" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}">
+						<p:link
+							outcome="admin_show_contact"
+							value="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA}"
+							title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}"
+							>
 							<f:param name="contactId" value="#{user.userContact.contactId}" />
 						</p:link>
 					</li>
 				</ui:fragment>
 
 				<li>
-					<p:link outcome="admin_show_user_activity_log" value="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG}" title="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG_TITLE}">
+					<p:link
+						outcome="admin_show_user_activity_log"
+						value="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG}"
+						title="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG_TITLE}"
+						>
 						<f:param name="userId" value="#{user.userId}" />
 					</p:link>
 				</li>
diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
index a76a3480..d9d74ea0 100644
--- a/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
@@ -1,56 +1,103 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:links="http://mxchange.org/jsf/core/links"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
-	<h:panelGrid id="fax_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA}" tableStyleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered == true}">
+	<!--
+	@TODO: summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA}"
+	-->
+	<p:panelGrid
+		columns="2"
+		rendered="#{empty rendered or rendered == true}"
+		>
 		<f:facet name="header">
-			<h:outputText value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_DATA}" />
+			<h:outputText value="#{msg.ADMIN_SHOW_FAX_NUMBER_DATA_HEADER}" />
 		</f:facet>
 
-		<h:column>
+		<p:column>
 			<h:panelGroup>
-				<p:outputLabel for="faxNumberId" styleClass="table-data-label" value="#{msg.ADMIN_ID_NUMBER}" />
+				<p:outputLabel for="faxNumberId" styleClass="table-data-label" value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
 
 				<h:outputText id="faxNumberId" styleClass="table-data-field" value="#{faxNumber.phoneId}" />
 
 				<p:message for="faxNumberId" />
 			</h:panelGroup>
-		</h:column>
+		</p:column>
 
-		<h:column>
+		<p:column>
 			<p:outputLabel for="faxNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_FAX_NUMBER_COMPLETE}" />
 
-			<h:outputText id="faxNumber" styleClass="table-data-field" value="#{faxNumber.phoneCountry.countryAbroadDialPrefix}#{faxNumber.phoneCountry.countryPhoneCode} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
-		</h:column>
+			<h:outputText id="faxNumber" styleClass="table-data-field" value="#{beanHelper.renderPhoneNumber(faxNumber)}" />
+		</p:column>
 
-		<h:column>
-			<p:outputLabel for="faxCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+		<p:column>
+			<p:outputLabel for="faxCreated" styleClass="table-data-label" value="#{msg.ENTRY_CREATED_HEADER}" />
 
-			<h:outputText id="faxCreated" styleClass="table-data-field" value="#{faxNumber.phoneEntryCreated.time}">
-				<f:convertDateTime for="contactCreated" type="both" />
+			<h:outputText id="faxCreated" styleClass="table-data-field" value="#{faxNumber.phoneEntryCreated}">
+				<f:convertDateTime type="both" />
 			</h:outputText>
-		</h:column>
+		</p:column>
 
-		<h:column>
-			<p:outputLabel for="faxUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+		<p:column>
+			<p:outputLabel for="faxUpdated" styleClass="table-data-label" value="#{msg.ENTRY_UPDATED_HEADER}" />
 
-			<h:outputText id="faxUpdated" styleClass="table-data-field" value="#{faxNumber.phoneEntryUpdated.time}">
-				<f:convertDateTime for="contactUpdated" type="both" />
+			<h:outputText id="faxUpdated" styleClass="table-data-field" value="#{faxNumber.phoneEntryUpdated}">
+				<f:convertDateTime type="both" />
 			</h:outputText>
-		</h:column>
+		</p:column>
 
-		<h:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
+		<p:column
+			rendered="#{empty showAdminDropdownMenu or showAdminDropdownMenu == true}"
+			>
 			<p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
-			<div class="table-data-field">
-				<links:outputFaxNumberAdminMiniLinks faxNumber="#{faxNumber}" contact="#{contact}" renderShowLink="#{renderShowLink}" />
-			</div>
-		</h:column>
-	</h:panelGrid>
+			<h:panelGroup styleClass="table-data-field" layout="block">
+				<p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
+					<p:menuitem
+						outcome="admin_show_fax"
+						value="#{msg.ADMIN_LINK_SHOW_SHORT}"
+						title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}"
+						>
+						<f:param name="faxId" value="#{faxNumber.phoneId}" />
+					</p:menuitem>
+
+					<p:menuitem
+						outcome="admin_edit_fax"
+						value="#{msg.ADMIN_LINK_EDIT_SHORT}"
+						title="#{msg.ADMIN_LINK_EDIT_FAX_NUMBER_TITLE}"
+						>
+						<f:param name="faxId" value="#{faxNumber.phoneId}" />
+					</p:menuitem>
+
+					<p:menuitem
+						outcome="admin_unlink_contact_fax"
+						rendered="#{not empty contact}"
+						>
+						<h:outputText
+							styleClass="link-warning"
+							value="#{msg.ADMIN_LINK_UNLINK_SHORT}"
+							title="#{msg.ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE}"
+							/>
+						<f:param name="faxId" value="#{faxNumber.phoneId}" />
+						<f:param name="contactId" value="#{contact.contactId}" />
+					</p:menuitem>
+
+					<p:menuitem
+						outcome="admin_delete_fax"
+						>
+						<h:outputText
+							styleClass="link-danger"
+							value="#{msg.ADMIN_LINK_DELETE_SHORT}"
+							title="#{msg.ADMIN_LINK_DELETE_FAX_NUMBER_TITLE}"
+							/>
+						<f:param name="faxId" value="#{faxNumber.phoneId}" />
+					</p:menuitem>
+				</p:menuButton>
+			</h:panelGroup>
+		</p:column>
+	</p:panelGrid>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
index ee7662df..9ad30767 100644
--- a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
@@ -1,56 +1,106 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:links="http://mxchange.org/jsf/core/links"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
-	<h:panelGrid id="landline_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}" tableStyleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered == true}">
+	<!--
+	@TODO: summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}"
+	-->
+	<p:panelGrid
+		columns="2"
+		rendered="#{empty rendered or rendered == true}"
+		>
 		<f:facet name="header">
-			<h:outputText value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_DATA}" />
+			<h:outputText value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_DATA_HEADER}" />
 		</f:facet>
 
-		<h:column>
+		<p:column>
 			<h:panelGroup>
-				<p:outputLabel for="landLineNumberId" styleClass="table-data-label" value="#{msg.ADMIN_ID_NUMBER}" />
+				<p:outputLabel for="landLineNumberId" styleClass="table-data-label" value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
 
 				<h:outputText id="landLineNumberId" styleClass="table-data-field" value="#{landLineNumber.phoneId}" />
 
 				<p:message for="landLineNumberId" />
 			</h:panelGroup>
-		</h:column>
+		</p:column>
 
-		<h:column>
+		<p:column>
 			<p:outputLabel for="landLineNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE}" />
 
-			<h:outputText id="landLineNumber" styleClass="table-data-field" value="#{landLineNumber.phoneCountry.countryAbroadDialPrefix}#{landLineNumber.phoneCountry.countryPhoneCode} (#{landLineNumber.phoneAreaCode}) #{landLineNumber.phoneNumber}" />
-		</h:column>
+			<h:outputText id="landLineNumber" styleClass="table-data-field" value="#{beanHelper.renderPhoneNumber(landLineNumber)}" />
+		</p:column>
 
-		<h:column>
-			<p:outputLabel for="landLineCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+		<p:column>
+			<p:outputLabel for="landLineCreated" styleClass="table-data-label" value="#{msg.ENTRY_CREATED_HEADER}" />
 
-			<h:outputText id="landLineCreated" styleClass="table-data-field" value="#{landLineNumber.phoneEntryCreated.time}">
-				<f:convertDateTime for="contactCreated" type="both" />
+			<h:outputText id="landLineCreated" styleClass="table-data-field" value="#{landLineNumber.phoneEntryCreated}">
+				<f:convertDateTime type="both" />
 			</h:outputText>
-		</h:column>
+		</p:column>
 
-		<h:column>
-			<p:outputLabel for="landLineUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+		<p:column>
+			<p:outputLabel for="landLineUpdated" styleClass="table-data-label" value="#{msg.ENTRY_UPDATED_HEADER}" />
 
-			<h:outputText id="landLineUpdated" styleClass="table-data-field" value="#{landLineNumber.phoneEntryUpdated.time}">
-				<f:convertDateTime for="contactUpdated" type="both" />
+			<h:outputText id="landLineUpdated" styleClass="table-data-field" value="#{landLineNumber.phoneEntryUpdated}">
+				<f:convertDateTime type="both" />
 			</h:outputText>
-		</h:column>
+		</p:column>
 
-		<h:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
+		<p:column
+			rendered="#{empty showAdminDropdownMenu or showAdminDropdownMenu == true}"
+			>
 			<p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
-			<div class="table-data-field">
-				<links:outputLandLineNumberAdminMiniLinks landLineNumber="#{landLineNumber}" contact="#{contact}" renderShowLink="#{renderShowLink}" />
-			</div>
-		</h:column>
-	</h:panelGrid>
+			<h:panelGroup styleClass="table-data-field" layout="block">
+				<p:menuButton
+					value="#{msg.OPTIONS}"
+					rendered="#{empty rendered or rendered}"
+					>
+					<p:menuitem
+						outcome="admin_show_landline"
+						value="#{msg.ADMIN_LINK_SHOW_SHORT}"
+						title="#{msg.ADMIN_LINK_SHOW_LAND_LINE_NUMBER_TITLE}"
+						>
+						<f:param name="landLineId" value="#{landLineNumber.phoneId}" />
+					</p:menuitem>
+
+					<p:menuitem
+						outcome="admin_edit_landline"
+						value="#{msg.ADMIN_LINK_EDIT_SHORT}"
+						title="#{msg.ADMIN_LINK_EDIT_LAND_LINE_NUMBER_TITLE}"
+						>
+						<f:param name="landLineId" value="#{landLineNumber.phoneId}" />
+					</p:menuitem>
+
+					<p:menuitem
+						outcome="admin_unlink_contact_landline"
+						rendered="#{not empty contact}"
+						>
+						<h:outputText
+							styleClass="link-warning"
+							value="#{msg.ADMIN_LINK_UNLINK_SHORT}"
+							title="#{msg.ADMIN_LINK_UNLINK_LAND_LINE_NUMBER_CONTACT_TITLE}"
+							/>
+						<f:param name="landLineId" value="#{landLineNumber.phoneId}" />
+						<f:param name="contactId" value="#{contact.contactId}" />
+					</p:menuitem>
+
+					<p:menuitem
+						outcome="admin_delete_landline"
+						>
+						<h:outputText
+							styleClass="link-danger"
+							value="#{msg.ADMIN_LINK_DELETE_SHORT}"
+							title="#{msg.ADMIN_LINK_DELETE_LAND_LINE_NUMBER_TITLE}"
+							/>
+						<f:param name="landLineId" value="#{landLineNumber.phoneId}" />
+					</p:menuitem>
+				</p:menuButton>
+			</h:panelGroup>
+		</p:column>
+	</p:panelGrid>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
index e62548ce..3ce553e2 100644
--- a/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
@@ -1,65 +1,90 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:links="http://mxchange.org/jsf/core/links"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
-	<h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA}" tableStyleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered == true}">
+	<!--
+	@TODO: summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA}"
+	-->
+	<p:panelGrid
+		columns="2"
+		rendered="#{empty rendered or rendered == true}"
+		>
 		<f:facet name="header">
-			<h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_DATA}" />
+			<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_DATA_HEADER}" />
 		</f:facet>
 
-		<h:column>
-			<h:panelGroup>
-				<p:outputLabel for="mobileNumberId" styleClass="table-data-label" value="#{msg.ADMIN_ID_NUMBER}" />
+		<p:column>
+			<p:outputLabel for="mobileNumberId" styleClass="table-data-label" value="#{msg.ADMIN_LABEL_ID_NUMBER}" />
 
-				<h:outputText id="mobileNumberId" styleClass="table-data-field" value="#{mobileNumber.phoneId}" />
+			<h:outputText id="mobileNumberId" styleClass="table-data-field" value="#{mobileNumber.mobileId}" />
+		</p:column>
 
-				<p:message for="mobileNumberId" />
-			</h:panelGroup>
-		</h:column>
-
-		<h:column>
+		<p:column>
 			<p:outputLabel for="mobileProvider" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
 
-			<p:link id="mobileProvider" outcome="admin_show_mobile_provider">
+			<p:link
+				id="mobileProvider"
+				outcome="admin_show_mobile_provider"
+				>
 				<h:outputText styleClass="table-data-field" value="#{mobileNumber.mobileProvider.providerName}" />
 				<f:param name="providerId" value="#{mobileNumber.mobileProvider.providerId}" />
 			</p:link>
-		</h:column>
+		</p:column>
 
-		<h:column>
+		<p:column>
 			<p:outputLabel for="mobileNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
 
-			<h:outputText id="mobileNumber" styleClass="table-data-field" value="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileNumber.mobileProvider.providerDialPrefix}-#{mobileNumber.phoneNumber}" />
-		</h:column>
+			<h:outputText id="mobileNumber" styleClass="table-data-field" value="#{beanHelper.renderMobileNumber(mobileNumber)}" />
+		</p:column>
 
-		<h:column>
-			<p:outputLabel for="mobileCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+		<p:column>
+			<p:outputLabel for="mobileCreated" styleClass="table-data-label" value="#{msg.ENTRY_CREATED_HEADER}" />
 
-			<h:outputText id="mobileCreated" styleClass="table-data-field" value="#{mobileNumber.phoneEntryCreated.time}">
-				<f:convertDateTime for="contactCreated" type="both" />
+			<h:outputText id="mobileCreated" styleClass="table-data-field" value="#{mobileNumber.phoneEntryCreated}">
+				<f:convertDateTime type="both" />
 			</h:outputText>
-		</h:column>
+		</p:column>
 
-		<h:column>
-			<p:outputLabel for="mobileUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+		<p:column>
+			<p:outputLabel for="mobileUpdated" styleClass="table-data-label" value="#{msg.ENTRY_UPDATED_HEADER}" />
 
-			<h:outputText id="mobileUpdated" styleClass="table-data-field" value="#{mobileNumber.phoneEntryUpdated.time}">
-				<f:convertDateTime for="contactUpdated" type="both" />
+			<h:outputText id="mobileUpdated" styleClass="table-data-field" value="#{mobileNumber.phoneEntryUpdated}">
+				<f:convertDateTime type="both" />
 			</h:outputText>
-		</h:column>
+		</p:column>
 
-		<h:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
+		<p:column
+			rendered="#{empty showAdminDropdownMenu or showAdminDropdownMenu == true}"
+			>
 			<p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
-			<div class="table-data-field">
-				<links:outputMobileNumberAdminMiniLinks mobileNumber="#{mobileNumber}" contact="#{contact}" renderShowLink="#{renderShowLink}" />
-			</div>
-		</h:column>
-	</h:panelGrid>
+			<h:panelGroup styleClass="table-data-field" layout="block">
+				<p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
+					<p:menuitem outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+						<f:param name="mobileId" value="#{mobileNumber.mobileId}" />
+					</p:menuitem>
+
+					<p:menuitem outcome="admin_edit_mobile" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_MOBILE_NUMBER_TITLE}">
+						<f:param name="mobileId" value="#{mobileNumber.mobileId}" />
+					</p:menuitem>
+
+					<p:menuitem outcome="admin_unlink_contact_mobile" rendered="#{not empty contact}">
+						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE}" />
+						<f:param name="mobileId" value="#{mobileNumber.mobileId}" />
+						<f:param name="contactId" value="#{contact.contactId}" />
+					</p:menuitem>
+
+					<p:menuitem outcome="admin_delete_mobile">
+						<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_MOBILE_NUMBER_TITLE}" />
+						<f:param name="mobileId" value="#{mobileNumber.mobileId}" />
+					</p:menuitem>
+				</p:menuButton>
+			</h:panelGroup>
+		</p:column>
+	</p:panelGrid>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl b/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl
index 72031227..cedefd2e 100644
--- a/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl
+++ b/web/WEB-INF/resources/tags/country/form_data/form_country_selector.tpl
@@ -2,9 +2,9 @@
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<p:selectOneMenu
 		id="#{id}"
@@ -17,7 +17,18 @@
 		requiredMessage="#{requiredMessage}"
 		>
 		<f:converter converterId="CountryConverter" />
-		<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" rendered="#{empty allowNull or allowNull}" />
-		<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
+
+		<f:selectItem
+			itemValue="#{null}"
+			itemLabel="#{msg.NONE_SELECTED}"
+			rendered="#{empty allowNull or allowNull}"
+			/>
+
+		<f:selectItems
+			value="#{countryListController.allCountries}"
+			var="country"
+			itemValue="#{country}"
+			itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})"
+			/>
 	</p:selectOneMenu>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/input/panel_grid/fax_input_panel_grid.tpl b/web/WEB-INF/resources/tags/input/panel_grid/fax_input_panel_grid.tpl
new file mode 100644
index 00000000..b0c6c6ac
--- /dev/null
+++ b/web/WEB-INF/resources/tags/input/panel_grid/fax_input_panel_grid.tpl
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<p:panelGrid
+		layout="grid"
+		columns="3"
+		styleClass="ui-noborder"
+		rendered="#{empty rendered or rendered == true}"
+		>
+		<core:outputCountrySelector id="faxCountry" styleClass="select" value="#{targetController.faxCountry}" />
+
+		<p:inputText
+			id="faxAreaCode"
+			size="5"
+			maxlength="10"
+			value="#{targetController.faxAreaCode}"
+			required="#{required}"
+			requiredMessage="#{msg.ADMIN_FAX_AREA_CODE_REQUIRED}"
+			>
+			<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
+		</p:inputText>
+
+		<p:inputText
+			id="faxNumber"
+			maxlength="20"
+			value="#{targetController.faxNumber}"
+			required="#{required}"
+			requiredMessage="#{msg.ADMIN_FAX_NUMBER_REQUIRED}"
+			>
+			<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
+		</p:inputText>
+	</p:panelGrid>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl b/web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl
new file mode 100644
index 00000000..82120ec8
--- /dev/null
+++ b/web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<p:panelGrid
+		layout="grid"
+		columns="3"
+		styleClass="ui-noborder"
+		rendered="#{empty rendered or rendered == true}"
+		>
+		<core:outputCountrySelector id="landLineCountry" styleClass="select" value="#{targetController.landLineCountry}" />
+
+		<p:inputText
+			id="landLineAreaCode"
+			size="5"
+			maxlength="10"
+			value="#{targetController.landLineAreaCode}"
+			required="#{required}"
+			requiredMessage="#{msg.ADMIN_LAND_LINE_AREA_CODE_REQUIRED}"
+			>
+			<f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
+		</p:inputText>
+
+		<p:inputText
+			id="landLineNumber"
+			maxlength="20"
+			value="#{targetController.landLineNumber}"
+			required="#{required}"
+			requiredMessage="#{msg.ADMIN_LAND_LINE_NUMBER_REQUIRED}"
+			>
+			<f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
+		</p:inputText>
+	</p:panelGrid>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl b/web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl
new file mode 100644
index 00000000..7d131fa6
--- /dev/null
+++ b/web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<p:panelGrid
+		layout="grid"
+		columns="2"
+		rendered="#{empty rendered or rendered == true}"
+		>
+		<p:selectOneMenu
+			id="mobileProvider"
+			value="#{targetController.mobileProvider}"
+			filter="true"
+			filterMatchMode="contains"
+			>
+
+			<f:converter converterId="MobileProviderConverter" />
+
+			<f:selectItem
+				itemValue="#{null}"
+				itemLabel="#{msg.NONE_SELECTED}"
+				/>
+
+			<f:selectItems
+				value="#{mobileProviderListController.allMobileProviders}"
+				var="mobileProvider"
+				itemValue="#{mobileProvider}"
+				itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})"
+				/>
+		</p:selectOneMenu>
+
+		<p:inputText
+			id="mobileNumber"
+			maxlength="20"
+			value="#{targetController.mobileNumber}"
+			required="#{required}"
+			requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}"
+			>
+			<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
+		</p:inputText>
+	</p:panelGrid>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/input/selection_box/personal_title_selection_box.tpl b/web/WEB-INF/resources/tags/input/selection_box/personal_title_selection_box.tpl
new file mode 100644
index 00000000..5185f534
--- /dev/null
+++ b/web/WEB-INF/resources/tags/input/selection_box/personal_title_selection_box.tpl
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<p:selectOneRadio
+		id="personalTitle"
+		value="#{targetController.personalTitle}"
+		required="true"
+		requiredMessage="#{msg.FIELD_PERSONAL_TITLE_REQUIRED}"
+		>
+
+		<f:selectItems
+			value="#{dataController.personalTitles}"
+			var="personalTitle"
+			itemValue="#{personalTitle}"
+			itemLabel="#{msg[personalTitle.messageKey]}"
+			/>
+	</p:selectOneRadio>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/messages/message_box.tpl b/web/WEB-INF/resources/tags/messages/message_box.tpl
index 0450cf5c..e70f82be 100644
--- a/web/WEB-INF/resources/tags/messages/message_box.tpl
+++ b/web/WEB-INF/resources/tags/messages/message_box.tpl
@@ -5,7 +5,7 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-	<h:panelGroup id="#{id}" styleClass="message-container #{boxStyleClass}" layout="block" rendered="#{empty rendered or rendered == true}">
+	<h:panelGroup id="#{panelGroupId}" styleClass="message-container #{boxStyleClass}" layout="block" rendered="#{empty rendered or rendered == true}">
 		<div class="message-header">
 			<h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
 		</div>
diff --git a/web/WEB-INF/resources/tags/opening_times/opening_times_data_table.tpl b/web/WEB-INF/resources/tags/opening_times/opening_times_data_table.tpl
new file mode 100644
index 00000000..03b2b65a
--- /dev/null
+++ b/web/WEB-INF/resources/tags/opening_times/opening_times_data_table.tpl
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui"
+	>
+	<p:dataTable
+		id="#{id}"
+		var="openingTime"
+		value="#{value}"
+		rows="#{rows}"
+		reflow="true"
+		summary="#{summary}"
+		emptyMessage="#{emptyMessage}"
+		widgetVar="#{widgetWar}"
+		rendered="#{empty rendered or rendered}"
+		>
+
+		<f:facet name="header">
+			<h:outputText value="#{headerMessage}" />
+		</f:facet>
+
+		<p:column
+			headerText="#{msg.ADMIN_START_WEEK_DAY}"
+			>
+			<h:outputText value="#{openingTime.openingStartDay.toString()}" />
+		</p:column>
+
+		<p:column
+			headerText="#{msg.ADMIN_END_WEEK_DAY}"
+			>
+			<h:outputText value="#{openingTime.openingEndDay.toString()}" />
+		</p:column>
+
+		<p:column
+			headerText="#{msg.ADMIN_START_TIME}"
+			>
+			<h:outputText value="#{openingTime.openingStartTime}">
+				<f:convertDateTime type="time" timeStyle="short" />
+			</h:outputText>
+		</p:column>
+
+		<p:column
+			headerText="#{msg.ADMIN_END_TIME}"
+			>
+			<h:outputText value="#{openingTime.openingEndTime}">
+				<f:convertDateTime type="time" timeStyle="short" />
+			</h:outputText>
+		</p:column>
+	</p:dataTable>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl b/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl
index 38a6f1bb..1e2e62d4 100644
--- a/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl
+++ b/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl
@@ -1,15 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
-	<widgets:outputMessageBox id="nonpublic-user-profile" message="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" boxStyleClass="message-mini" messageStyleClass="notice" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
+	<core:outputMessageBox
+		panelGroupId="nonPublicUserProfile"
+		message="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}"
+		boxStyleClass="message-mini"
+		messageStyleClass="notice"
+		rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}"
+		/>
 
-	<p:link outcome="user_profile" title="#{msg.LINK_USER_PROFILE_TITLE}" rendered="#{not empty user and profileController.isProfileLinkVisibleByUser(user)}">
+	<p:link
+		outcome="user_profile"
+		title="#{msg.LINK_USER_PROFILE_TITLE}"
+		rendered="#{not empty user and profileController.isProfileLinkVisibleByUser(user)}"
+		>
 		<h:outputText value="#{user.userName}" />
 		<f:param name="userId" value="#{user.userId}" />
 	</p:link>
diff --git a/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl
deleted file mode 100644
index 16c868df..00000000
--- a/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<ui:fragment rendered="#{empty rendered or rendered == true}">
-		<h:panelGroup styleClass="table-row" layout="block">
-			<div class="table-left-medium">
-				<p:outputLabel for="faxNumber" value="#{labelMessage}" />
-			</div>
-
-			<div class="table-right-medium">
-				<widgets:outputCountrySelector id="faxCountry" styleClass="select divider-right" value="#{targetController.faxCountry}" />
-
-				<p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
-					<f:validator validatorId="PhoneNumberValidator" />
-				</p:inputText>
-
-				<p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{targetController.faxNumber}">
-					<f:validator validatorId="PhoneNumberValidator" />
-				</p:inputText>
-			</div>
-		</h:panelGroup>
-
-		<h:panelGroup styleClass="error-container" layout="block">
-			<p:message for="faxAreaCode" />
-		</h:panelGroup>
-
-		<h:panelGroup styleClass="error-container" layout="block">
-			<p:message for="faxNumber" />
-		</h:panelGroup>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl
index df8d6e65..8656827b 100644
--- a/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl
+++ b/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl
@@ -1,37 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
-	<ui:fragment rendered="#{empty rendered or rendered == true}">
-		<h:panelGroup styleClass="table-row" layout="block">
-			<div class="table-left-medium">
-				<p:outputLabel for="landLineNumber" value="#{labelMessage}" />
-			</div>
+	<p:row rendered="#{empty rendered or rendered == true}">
+		<p:outputLabel for="landLineNumber" value="#{labelMessage}" />
 
-			<div class="table-right-medium">
-				<widgets:outputCountrySelector id="landLineCountry" styleClass="select divider-right" value="#{targetController.landLineCountry}" />
+		<p:column>
+			<core:outputCountrySelector id="landLineCountry" styleClass="select" value="#{targetController.landLineCountry}" />
+			<p:inputText id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.landLineAreaCode}">
+				<f:validator validatorId="PhoneNumberValidator" />
+			</p:inputText>
+			<p:inputText id="landLineNumber" size="10" maxlength="20" value="#{targetController.landLineNumber}">
+				<f:validator validatorId="PhoneNumberValidator" />
+			</p:inputText>
+		</p:column>
 
-				<p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.landLineAreaCode}">
-					<f:validator validatorId="PhoneNumberValidator" />
-				</p:inputText>
-
-				<p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{targetController.landLineNumber}">
-					<f:validator validatorId="PhoneNumberValidator" />
-				</p:inputText>
-			</div>
-		</h:panelGroup>
-
-		<h:panelGroup styleClass="error-container" layout="block">
+		<p:column>
 			<p:message for="landLineAreaCode" />
-		</h:panelGroup>
-
-		<h:panelGroup styleClass="error-container" layout="block">
 			<p:message for="landLineNumber" />
-		</h:panelGroup>
-	</ui:fragment>
+		</p:column>
+	</p:row>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl
deleted file mode 100644
index f289866d..00000000
--- a/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<ui:fragment rendered="#{empty rendered or rendered == true}">
-		<h:panelGroup styleClass="table-row" layout="block">
-			<div class="table-left-medium">
-				<p:outputLabel for="mobileNumber" value="#{labelMessage}" />
-			</div>
-
-			<div class="table-right-medium">
-				<p:selectOneMenu
-					id="mobileProvider"
-					value="#{targetController.mobileProvider}"
-					filter="true"
-					filterMatchMode="contains"
-					>
-					<f:converter converterId="MobileProviderConverter" />
-					<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-					<f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
-				</p:selectOneMenu>
-
-				<p:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
-					<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-				</p:inputText>
-			</div>
-		</h:panelGroup>
-
-		<h:panelGroup styleClass="error-container" layout="block">
-			<p:message for="mobileNumber" />
-		</h:panelGroup>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl
deleted file mode 100644
index 1e0bbf59..00000000
--- a/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<ui:fragment rendered="#{empty rendered or rendered == true}">
-		<h:panelGroup styleClass="table-row" layout="block">
-			<div class="table-left-medium">
-				<p:outputLabel for="userPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
-			</div>
-
-			<div class="table-right-medium">
-				<p:selectOneMenu
-					id="userPersonalTitle"
-					value="#{targetController.personalTitle}"
-					filter="true"
-					filterMatchMode="contains"
-					required="#{(empty allowEmptyRequiredData or not allowEmptyRequiredData) and featureController.isFeatureEnabled(targetController.controllerType.concat('_personal_title'))}"
-					requiredMessage="#{msg.FIELD_PERSONAL_TITLE_REQUIRED}">
-					<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
-					<f:selectItems value="#{genderController.selectableGenders}" var="personalTitle" itemValue="#{personalTitle}" itemLabel="#{msg[personalTitle.messageKey]}" />
-				</p:selectOneMenu>
-			</div>
-		</h:panelGroup>
-
-		<h:panelGroup styleClass="error-container" layout="block">
-			<p:message for="userPersonalTitle" />
-		</h:panelGroup>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl
deleted file mode 100644
index d4872e66..00000000
--- a/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<ui:fragment rendered="#{empty rendered or rendered == true}">
-		<h:panelGroup styleClass="table-row" layout="block">
-			<div class="table-left-medium">
-				<p:outputLabel for="profileMode" value="#{labelMessage}" />
-			</div>
-
-			<div class="table-right-medium">
-				<p:selectOneMenu
-					id="profileMode"
-					value="#{targetController.userProfileMode}"
-					filter="true"
-					filterMatchMode="contains"
-					>
-					<f:selectItems value="#{profileModeController.allProfileModes()}" var="mode" itemValue="#{mode}" itemLabel="#{msg[mode.messageKey]}" />
-				</p:selectOneMenu>
-			</div>
-		</h:panelGroup>
-
-		<h:panelGroup styleClass="error-container" layout="block">
-			<p:message for="personalTitle" />
-		</h:panelGroup>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/templates.dist/admin_page.xhtml b/web/WEB-INF/templates.dist/admin_page.xhtml
index e42352cd..709a670e 100644
--- a/web/WEB-INF/templates.dist/admin_page.xhtml
+++ b/web/WEB-INF/templates.dist/admin_page.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_FOO}" />
 	</ui:define>
 
diff --git a/web/WEB-INF/templates.dist/guest_login_page.xhtml b/web/WEB-INF/templates.dist/guest_login_page.xhtml
index 6bbae12b..e14db199 100644
--- a/web/WEB-INF/templates.dist/guest_login_page.xhtml
+++ b/web/WEB-INF/templates.dist/guest_login_page.xhtml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_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/#{userLoginController.baseTemplatePathName}_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="guest_title">
+	<ui:define name="document_guest_title">
+		<h:outputText value="#{msg.PAGE_TITLE_INDEX_FOO}" />
+	</ui:define>
+
+	<ui:define name="document_login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_INDEX_FOO}" />
 	</ui:define>
 
diff --git a/web/WEB-INF/templates.dist/guest_page.xhtml b/web/WEB-INF/templates.dist/guest_page.xhtml
index 5844811c..30d9b698 100644
--- a/web/WEB-INF/templates.dist/guest_page.xhtml
+++ b/web/WEB-INF/templates.dist/guest_page.xhtml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_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/guest/guest_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="guest_title">
+	<ui:define name="document_guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_INDEX_FOO}" />
 	</ui:define>
 
diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml
index c21917a5..786273a0 100644
--- a/web/WEB-INF/templates.dist/login_page.xhtml
+++ b/web/WEB-INF/templates.dist/login_page.xhtml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_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/login/user/user_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="login_title">
+	<ui:define name="document_login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_LOGIN_FOO}" />
 	</ui:define>
 
-	<ui:define name="content_header">
+	<ui:define name="login_content_header">
 		<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_FOO}" />
 	</ui:define>
 
diff --git a/web/WEB-INF/templates/admin/admin_base.tpl b/web/WEB-INF/templates/admin/admin_base.tpl
deleted file mode 100644
index 2aedc46a..00000000
--- a/web/WEB-INF/templates/admin/admin_base.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-TODO: Add something here that should be displayed on all admin pages
-//-->
-<ui:composition
-	template="/WEB-INF/templates/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="title">
-		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_AREA} - " />
-		<ui:insert name="admin_title">
-			<h:outputText value="Default admin title" />
-		</ui:insert>
-	</ui:define>
-
-	<ui:define name="menu">
-		<ui:include src="/WEB-INF/templates/admin/admin_menu.tpl" />
-	</ui:define>
-
-	<ui:define name="footer">
-		<ui:include src="/WEB-INF/templates/admin/admin_footer.tpl" />
-	</ui:define>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/admin_footer.tpl b/web/WEB-INF/templates/admin/admin_footer.tpl
deleted file mode 100644
index ff9b5c83..00000000
--- a/web/WEB-INF/templates/admin/admin_footer.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui"
-	xmlns:pm="http://primefaces.org/mobile">
-
-	<pm:footer id="footer" fixed="true" tapToggle="false">
-		<ul class="navbar-horizontal">
-			<li><p:link outcome="index" value="#{msg.LINK_ADMIN_FOOTER_TO_WEBPAGE}" /></li>
-		</ul>
-	</pm:footer>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl
deleted file mode 100644
index 212e3615..00000000
--- a/web/WEB-INF/templates/admin/admin_menu.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui"
-	xmlns:pm="http://primefaces.org/mobile">
-
-	<div id="menu" data-role="panel" class="menu_outer" data-position="left" data-display="overlay" data-theme="a">
-		<h:form>
-			<p:menu>
-				<p:submenu label="#{msg.ADMIN_MENU_MAIN_TITLE}">
-					<p:menuitem title="#{msg.LINK_ADMIN_INDEX_TITLE}" outcome="admin_index" value="#{msg.LINK_ADMIN_INDEX}" />
-				</p:submenu>
-
-				<p:submenu label="#{msg.ADMIN_MENU_USER_TITLE}">
-					<p:menuitem title="#{msg.LINK_ADMIN_LIST_USER_TITLE}" outcome="admin_list_user" value="#{msg.LINK_ADMIN_LIST_USER}" />
-					<p:menuitem title="#{msg.LINK_ADMIN_EXPORT_USER_TITLE}" outcome="admin_export_user" value="#{msg.LINK_ADMIN_EXPORT_USER}" />
-				</p:submenu>
-
-				<p:submenu label="#{msg.ADMIN_MENU_CONTACT_TITLE}">
-					<p:menuitem title="#{msg.LINK_ADMIN_LIST_CONTACT_TITLE}" outcome="admin_list_contact" value="#{msg.LINK_ADMIN_LIST_CONTACT}" />
-					<p:menuitem title="#{msg.LINK_ADMIN_EXPORT_CONTACT_TITLE}" outcome="admin_export_contact" value="#{msg.LINK_ADMIN_EXPORT_CONTACT}" />
-				</p:submenu>
-
-				<p:submenu label="#{msg.ADMIN_MENU_BUSINESS_CONTACTS_TITLE}" rendered="#{featureController.isFeatureEnabled('basic_company_data')}">
-					<p:menuitem title="#{msg.LINK_ADMIN_LIST_BASIC_COMPANY_DATA_TITLE}" outcome="admin_list_basic_company_data" value="#{msg.LINK_ADMIN_LIST_BASIC_COMPANY_DATA}" />
-					<p:menuitem title="#{msg.LINK_ADMIN_LIST_BRANCH_OFFICES_TITLE}" outcome="admin_list_branch_offices" value="#{msg.LINK_ADMIN_LIST_BRANCH_OFFICES}" />
-				</p:submenu>
-
-				<p:submenu label="#{msg.ADMIN_MENU_PHONE_NUMBERS_TITLE}">
-					<p:menuitem title="#{msg.LINK_ADMIN_LIST_LAND_LINE_PHONE_NUMBERS_TITLE}" outcome="admin_list_landline" value="#{msg.LINK_ADMIN_LIST_LAND_LINE_PHONE_NUMBERS}" />
-					<p:menuitem title="#{msg.LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS_TITLE}" outcome="admin_list_mobile" value="#{msg.LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS}" />
-					<p:menuitem title="#{msg.LINK_ADMIN_LIST_FAX_PHONE_NUMBERS_TITLE}" outcome="admin_list_fax" value="#{msg.LINK_ADMIN_LIST_FAX_PHONE_NUMBERS}" />
-				</p:submenu>
-
-				<p:submenu label="#{msg.ADMIN_MENU_COUNTRY_TITLE}">
-					<p:menuitem title="#{msg.LINK_ADMIN_LIST_COUNTRIES_TITLE}" outcome="admin_list_countries" value="#{msg.LINK_ADMIN_LIST_COUNTRIES}" />
-				</p:submenu>
-
-				<p:submenu label="#{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}">
-					<p:menuitem title="#{msg.LINK_ADMIN_LIST_MOBILE_PROVIDER_TITLE}" outcome="admin_list_mobile_provider" value="#{msg.LINK_ADMIN_LIST_MOBILE_PROVIDER}" />
-				</p:submenu>
-
-				<p:submenu label="#{msg.ADMIN_MENU_LOGOUT_TITLE}">
-					<p:menuitem title="#{msg.LINK_ADMIN_LOGOUT_TITLE}" outcome="admin_logout" value="#{msg.LINK_ADMIN_LOGOUT}" />
-					<p:menuitem title="#{msg.LINK_ADMIN_TO_WEBPAGE_TITLE}" outcome="index" value="#{msg.LINK_ADMIN_TO_WEBPAGE}" />
-				</p:submenu>
-			</p:menu>
-		</h:form>
-	</div>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl b/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl
deleted file mode 100644
index a890f910..00000000
--- a/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<h:panelGroup styleClass="para" layout="block">
-		<fieldset class="fieldset">
-			<legend title="#{msg.ADMIN_BASIC_COMPANY_DATA_LEGEND_TITLE}">
-				<h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_LEGEND}" />
-			</legend>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="companyName" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="companyName" size="30" maxlength="200" required="true" requiredMessage="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME_REQUIRED}" value="#{adminCompanyDataController.companyName}">
-						<f:validator validatorId="CompanyNameValidator" />
-						<f:attribute name="checkExisting" value="false" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="companyName" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="companyEmailAddress" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_EMAIL_ADDRESS}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="companyEmailAddress" size="20" maxlength="255" value="#{adminCompanyDataController.companyEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
-						<f:validator validatorId="EmailAddressValidator" />
-						<f:attribute name="allowEmptyValue" value="true" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="companyEmailAddress" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="companyLogo" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_LOGO}" />
-				</div>
-
-				<div class="table-right-medium">
-					<widgets:outputMessageBox id="companyLogo" message="#{msg.ADMIN_FEATURE_UNFINISHED_WARNING}" boxStyleClass="message-full" messageStyleClass="alert-warning" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="companyLogo" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="companyTaxNumber" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_TAX_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="companyTaxNumber" size="30" maxlength="200" value="#{adminCompanyDataController.companyTaxNumber}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="companyTaxNumber" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="companyWebsiteUrl" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_WEBSITE_URL}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="companyWebsiteUrl" size="30" maxlength="200" value="#{adminCompanyDataController.companyWebsiteUrl}" validatorMessage="#{msg.URL_NOT_MATCHING_REGULAR_EXPRESSION}">
-						<f:validator validatorId="UrlValidator" />
-						<f:attribute name="allowEmptyValue" value="true" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="companyWebsiteUrl" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="companyUserOwner" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_USER_OWNER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:selectOneMenu
-						id="companyUserOwner"
-						value="#{adminCompanyDataController.companyUserOwner}"
-						filter="true"
-						filterMatchMode="contains"
-						>
-						<f:converter converterId="UserConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{userController.allUsers()}" var="companyUserOwner" itemValue="#{companyUserOwner}" itemLabel="#{companyUserOwner.userContact.contactFirstName} #{companyUserOwner.userContact.contactFamilyName} (#{companyUserOwner.userName})" />
-					</p:selectOneMenu>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="companyUserOwner" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="companyContactEmployee" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_CONTACT_EMPLOYEE}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:selectOneMenu
-						id="companyContactEmployee"
-						value="#{adminCompanyDataController.companyContactEmployee}"
-						filter="true"
-						filterMatchMode="contains"
-						>
-						<f:converter converterId="EmployeeConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{companyEmployeeController.allEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
-					</p:selectOneMenu>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="companyContactEmployee" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="companyFounder" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_FOUNDER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:selectOneMenu
-						id="companyFounder"
-						value="#{adminCompanyDataController.companyFounder}"
-						filter="true"
-						filterMatchMode="contains"
-						>
-						<f:converter converterId="EmployeeConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{companyEmployeeController.allEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
-					</p:selectOneMenu>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="companyFounder" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="companyHeadQuarters" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_HEADQUARTERS}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:selectOneMenu
-						id="companyHeadQuarters"
-						value="#{adminCompanyDataController.companyHeadQuarters}"
-						filter="true"
-						filterMatchMode="contains"
-						>
-						<f:converter converterId="CompanyHeadquartersConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{companyHeadquartersController.allCompanyHeadquarters()}" var="companyHeadQuarters" itemValue="#{companyHeadQuarters}" itemLabel="#{companyHeadQuarters.foo}" />
-					</p:selectOneMenu>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="companyHeadQuarters" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="landLineCountry" value="#{msg.ADMIN_BASIC_COMPANY_DATA_PHONE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<widgets:outputCountrySelector id="landLineCountry" styleClass="select divider-right" value="#{adminCompanyDataController.landLineCountry}" />
-
-					<p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminCompanyDataController.landLineAreaCode}">
-						<f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
-					</p:inputText>
-
-					<p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminCompanyDataController.landLineNumber}">
-						<f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="landLineCountry" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="landLineAreaCode" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="landLineNumber" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="faxCountry" value="#{msg.ADMIN_BASIC_COMPANY_DATA_FAX_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<widgets:outputCountrySelector id="faxCountry" styleClass="select divider-right" value="#{adminCompanyDataController.faxCountry}" />
-
-					<p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminCompanyDataController.faxAreaCode}">
-						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
-					</p:inputText>
-
-					<p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminCompanyDataController.faxNumber}">
-						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="faxCountry" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="faxAreaCode" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="faxNumber" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="companyComments" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_COMMENTS}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputTextarea
-						styleClass="input"
-						id="companyComments"
-						rows="7"
-						cols="25"
-						value="#{adminCompanyDataController.companyComments}"
-						/>
-				</div>
-			</h:panelGroup>
-		</fieldset>
-	</h:panelGroup>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl
deleted file mode 100644
index aa94202b..00000000
--- a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<h:panelGroup styleClass="para" layout="block">
-		<fieldset class="fieldset">
-			<legend title="#{msg.ADMIN_BRANCH_OFFICE_LEGEND_TITLE}">
-				<h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_LEGEND}" />
-			</legend>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchCompany" value="#{msg.ADMIN_SELECT_BRANCH_OFFICE_COMPANY}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:selectOneMenu
-						id="branchCompany"
-						value="#{adminBranchOfficeController.branchCompany}"
-						filter="true"
-						filterMatchMode="contains"
-						required="true"
-						requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_COMPANY_REQUIRED}"
-						>
-						<f:converter converterId="BasicCompanyDataConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
-						<f:selectItems value="#{basicDataController.allCompanyBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
-					</p:selectOneMenu>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchCompany" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchContactEmployee" value="#{msg.ADMIN_SELECT_BRANCH_OFFICE_CONTACT_EMPLOYEE}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:selectOneMenu
-						id="branchContactEmployee"
-						value="#{adminBranchOfficeController.branchContactEmployee}"
-						filter="true"
-						filterMatchMode="contains"
-						>
-						<f:converter converterId="EmployeeConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{companyEmployeeController.allEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
-					</p:selectOneMenu>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchContactEmployee" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchUserOwner" value="#{msg.ADMIN_SELECT_BRANCH_OFFICE_USER_OWNER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:selectOneMenu
-						id="branchUserOwner"
-						value="#{adminBranchOfficeController.branchUserOwner}"
-						filter="true"
-						filterMatchMode="contains"
-						>
-						<f:converter converterId="UserConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{userController.allUsers()}" var="branchUserOwner" itemValue="#{branchUserOwner}" itemLabel="#{branchUserOwner.userContact.contactFirstName} #{branchUserOwner.userContact.contactFamilyName} (#{branchUserOwner.userName})" />
-					</p:selectOneMenu>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchUserOwner" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchEmailAddress" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="branchEmailAddress" size="20" maxlength="255" value="#{adminBranchOfficeController.branchEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
-						<f:validator validatorId="EmailAddressValidator" />
-						<f:attribute name="allowEmptyValue" value="true" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchEmailAddress" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="landLineCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_PHONE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<widgets:outputCountrySelector id="landLineCountry" styleClass="select divider-right" value="#{adminBranchOfficeController.landLineCountry}" />
-
-					<p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.landLineAreaCode}">
-						<f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
-					</p:inputText>
-
-					<p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminBranchOfficeController.landLineNumber}">
-						<f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="landLineCountry" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="landLineAreaCode" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="landLineNumber" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="faxCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_FAX_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<widgets:outputCountrySelector id="faxCountry" styleClass="select divider-right" value="#{adminBranchOfficeController.faxCountry}" />
-
-					<p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.faxAreaCode}">
-						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
-					</p:inputText>
-
-					<p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminBranchOfficeController.faxNumber}">
-						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="faxCountry" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="faxAreaCode" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="faxNumber" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchNumber" value="#{project.ADMIN_ENTER_BRANCH_OFFICE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="branchNumber" size="2" maxlength="10" value="#{adminBranchOfficeController.branchNumber}" />
-				</div>
-			</h:panelGroup>
-		</fieldset>
-
-		<fieldset class="fieldset" id="admin_branch_office_address">
-			<legend title="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND_TITLE}">
-				<h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND}" />
-			</legend>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchStreet" value="#{msg.ADMIN_DATA_STREET_NAME}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="branchStreet" size="20" maxlength="255" value="#{adminBranchOfficeController.branchStreet}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchStreet" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchHouseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="branchHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED}">
-						<f:validateLongRange for="branchHouseNumber" minimum="1" maximum="500" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchHouseNumber" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchStore" value="#{msg.ADMIN_ENTER_DATA_STORE}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="branchStore" size="3" maxlength="5" value="#{adminBranchOfficeController.branchStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
-						<f:validateLongRange for="branchStore" minimum="-5" maximum="200" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchStore" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchSuiteNumber" value="#{msg.ADMIN_ENTER_DATA_SUITE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="branchSuiteNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
-						<f:validateLongRange for="branchSuiteNumber" minimum="1" maximum="500" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchSuiteNumber" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchZipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="branchZipCode" size="5" maxlength="6" value="#{adminBranchOfficeController.branchZipCode}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED}">
-						<f:validateLongRange for="branchZipCode" minimum="1" maximum="99999" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchZipCode" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchCity" value="#{msg.ADMIN_DATA_CITY}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="branchCity" size="20" maxlength="255" value="#{adminBranchOfficeController.branchCity}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_CITY_REQUIRED}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchCity" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="branchCountry" value="#{msg.ADMIN_SELECT_COUNTRY}" />
-				</div>
-
-				<div class="table-right-medium">
-					<widgets:outputCountrySelector id="branchCountry" value="#{adminBranchOfficeController.branchCountry}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="branchCountry" />
-			</h:panelGroup>
-		</fieldset>
-	</h:panelGroup>
-</ui:composition>
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
deleted file mode 100644
index 45efc8a7..00000000
--- a/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_office_data.tpl
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:core="http://mxchange.org/jsf/core/widgets"
-	xmlns:validator="http://mxchange.org/jsf/core/validators"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui"
-	>
-
-	<p:fieldset
-		legend="#{msg.ADMIN_BRANCH_OFFICE_DATA_LEGEND}"
-		title="#{msg.ADMIN_BRANCH_OFFICE_DATA_LEGEND_TITLE}"
-		>
-		<p:panelGrid
-			layout="grid"
-			columns="2"
-			columnClasses="ui-grid-col-4,ui-grid-col-8"
-			styleClass="ui-noborder"
-			>
-			<p:outputLabel for="branchCompany" value="#{msg.ADMIN_ASSIGN_BASIC_DATA_BRANCH_OFFICE}" />
-			<p:selectOneMenu
-				id="branchCompany"
-				value="#{adminBranchOfficeActionController.branchCompany}"
-				filter="true"
-				filterMatchMode="contains"
-				required="true"
-				requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_REQUIRED}"
-				>
-
-				<f:converter converterId="BasicCompanyDataConverter" />
-
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-
-				<f:selectItems
-					value="#{basicDataListController.allBasicData}"
-					var="basicData"
-					itemValue="#{basicData}"
-					itemLabel="#{beanHelper.renderBasicData(basicData, true, false)}"
-					/>
-			</p:selectOneMenu>
-
-			<p:outputLabel for="branchContactEmployee" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_CONTACT_EMPLOYEE}" />
-			<p:selectOneMenu
-				id="branchContactEmployee"
-				value="#{adminBranchOfficeActionController.branchContactEmployee}"
-				filter="true"
-				filterMatchMode="contains"
-				>
-
-				<f:converter converterId="ContactConverter" />
-
-				<f:selectItem
-					itemValue="#{null}"
-					itemLabel="#{msg.NONE_SELECTED}"
-					/>
-
-				<f:selectItems
-					value="#{contactListController.allContacts}"
-					var="contact"
-					itemValue="#{contact}"
-					itemLabel="#{beanHelper.renderContact(contact)}"
-					/>
-			</p:selectOneMenu>
-
-			<p:outputLabel for="branchOwnerEmployee" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_OWNER}" />
-			<p:selectOneMenu
-				id="branchOwnerEmployee"
-				value="#{adminBranchOfficeActionController.branchOwnerEmployee}"
-				filter="true"
-				filterMatchMode="contains"
-				>
-
-				<f:converter converterId="ContactConverter" />
-
-				<f:selectItem
-					itemValue="#{null}"
-					itemLabel="#{msg.NONE_SELECTED}"
-					/>
-
-				<f:selectItems
-					value="#{contactListController.allContacts}"
-					var="contact"
-					itemValue="#{contact}"
-					itemLabel="#{beanHelper.renderContact(contact)}"
-					/>
-			</p:selectOneMenu>
-
-			<p:outputLabel for="branchUserOwner" value="#{msg.ADMIN_ASSIGN_BRANCH_OFFICE_USER_OWNER}" />
-			<p:selectOneMenu
-				id="branchUserOwner"
-				value="#{adminBranchOfficeActionController.branchUserOwner}"
-				filter="true"
-				filterMatchMode="contains"
-				>
-
-				<f:converter converterId="UserConverter" />
-
-				<f:selectItem
-					itemValue="#{null}"
-					itemLabel="#{msg.NONE_SELECTED}"
-					/>
-
-				<f:selectItems
-					value="#{userListController.allUsers}"
-					var="branchUserOwner"
-					itemValue="#{branchUserOwner}"
-					itemLabel="#{beanHelper.renderContact(branchUserOwner.userContact)} (#{branchUserOwner.userName})"
-					/>
-			</p:selectOneMenu>
-
-			<p:outputLabel for="branchEmailAddress" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS}" />
-			<p:inputText
-				id="branchEmailAddress"
-				size="40"
-				maxlength="255"
-				value="#{adminBranchOfficeActionController.branchEmailAddress}"
-				validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}"
-				>
-				<validator:branchOfficeEmailAddressValidator />
-			</p:inputText>
-
-			<p:outputLabel for="landLineCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_LAND_LINE_NUMBER}" />
-			<core:inputLandLineNumberPanelGrid targetController="#{adminBranchOfficeActionController}" />
-
-			<p:outputLabel for="faxCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_FAX_NUMBER}" />
-			<core:inputFaxNumberPanelGrid targetController="#{adminBranchOfficeActionController}" />
-
-			<p:outputLabel for="branchNumber" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_NUMBER}" />
-			<p:inputText
-				id="branchNumber"
-				size="5"
-				maxlength="10"
-				value="#{adminBranchOfficeActionController.branchNumber}"
-				/>
-		</p:panelGrid>
-	</p:fieldset>
-
-	<p:fieldset
-		legend="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND}"
-		title="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND_TITLE}"
-		>
-		<p:panelGrid
-			layout="grid"
-			columns="2"
-			columnClasses="ui-grid-col-4,ui-grid-col-8"
-			styleClass="ui-noborder"
-			>
-			<p:outputLabel for="branchStreet" value="#{msg.ADMIN_DATA_STREET_NAME}" />
-			<p:inputText id="branchStreet" size="20" maxlength="255" value="#{adminBranchOfficeActionController.branchStreet}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED}" />
-
-			<p:outputLabel for="branchHouseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
-			<p:inputText id="branchHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeActionController.branchHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED}">
-				<f:validateLongRange minimum="1" maximum="500" />
-			</p:inputText>
-
-			<p:outputLabel for="branchLastHouseNumber" value="#{msg.ADMIN_DATA_LAST_HOUSE_NUMBER}" />
-			<p:inputText id="branchLastHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeActionController.branchLastHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
-				<f:validateLongRange minimum="1" maximum="500" />
-			</p:inputText>
-
-			<p:outputLabel for="branchHouseNumberExtension" value="#{msg.ADMIN_DATA_HOUSE_NUMBER_EXTENSION}" />
-			<p:inputText id="branchHouseNumberExtension" size="1" maxlength="255" value="#{adminBranchOfficeActionController.branchHouseNumberExtension}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" />
-
-			<p:outputLabel for="branchStore" value="#{msg.ADMIN_ENTER_DATA_STORE}" />
-			<p:inputText id="branchStore" size="3" maxlength="5" value="#{adminBranchOfficeActionController.branchStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
-				<f:validateLongRange minimum="-5" maximum="200" />
-			</p:inputText>
-
-			<p:outputLabel for="branchSuiteNumber" value="#{msg.ADMIN_ENTER_DATA_SUITE_NUMBER}" />
-			<p:inputText id="branchSuiteNumber" size="3" maxlength="5" value="#{adminBranchOfficeActionController.branchSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
-				<f:validateLongRange minimum="1" maximum="500" />
-			</p:inputText>
-
-			<p:outputLabel for="branchZipCode" value="#{msg.DATA_ZIP_CODE}" />
-			<p:inputText id="branchZipCode" size="5" maxlength="6" value="#{adminBranchOfficeActionController.branchZipCode}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED}">
-				<f:validateLongRange minimum="1" maximum="99999" />
-			</p:inputText>
-
-			<p:outputLabel for="branchCity" value="#{msg.ADMIN_DATA_CITY}" />
-			<p:inputText id="branchCity" size="20" maxlength="255" value="#{adminBranchOfficeActionController.branchCity}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_CITY_REQUIRED}" />
-
-			<p:outputLabel for="branchCountry" value="#{msg.ADMIN_SELECT_COUNTRY}" />
-			<core:outputCountrySelector id="branchCountry" value="#{adminBranchOfficeActionController.branchCountry}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_COUNTRY_REQUIRED}" />
-		</p:panelGrid>
-	</p:fieldset>
-</ui:composition>
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
deleted file mode 100644
index 4af4b866..00000000
--- a/web/WEB-INF/templates/admin/business/branch_office/admin_form_branch_opening_time.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-@TODO: title="#{msg.ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND_TITLE}"
--->
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui"
-	>
-
-	<p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND}">
-		<p:panelGrid
-			layout="grid"
-			columns="4"
-			columnClasses="ui-grid-col-4,ui-grid-col-8"
-			styleClass="ui-noborder">
-			<p:outputLabel for="openingStartDay" value="#{msg.ADMIN_START_WEEK_DAY}" />
-			<p:outputLabel for="openingEndDay" value="#{msg.ADMIN_END_WEEK_DAY}" />
-			<p:outputLabel for="openingStartTime" value="#{msg.ADMIN_START_TIME}" />
-			<p:outputLabel for="openingEndTime" value="#{msg.ADMIN_END_TIME}" />
-
-			<p:selectOneMenu
-				id="openingStartDay"
-				value="#{adminBranchOfficeActionController.openingStartDay}"
-				filter="true"
-				filterMatchMode="contains"
-				required="true"
-				requiredMessage="#{msg.ADMIN_START_WEEK_DAY_REQUIRED}"
-				>
-
-				<f:converter converterId="DayOfTheWeekConverter" />
-
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-
-				<f:selectItems
-					value="#{dataController.dayOfTheWeek}"
-					var="dayOfWeek"
-					itemValue="#{dayOfWeek}"
-					itemLabel="#{dayOfWeek.toString()}"
-					/>
-			</p:selectOneMenu>
-
-			<p:selectOneMenu
-				id="openingEndDay"
-				value="#{adminBranchOfficeActionController.openingEndDay}"
-				filter="true"
-				filterMatchMode="contains"
-				required="true"
-				requiredMessage="#{msg.ADMIN_END_WEEK_DAY_REQUIRED}"
-				>
-
-				<f:converter converterId="DayOfTheWeekConverter" />
-
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-
-				<f:selectItems
-					value="#{dataController.dayOfTheWeek}"
-					var="dayOfWeek"
-					itemValue="#{dayOfWeek}"
-					itemLabel="#{dayOfWeek.toString()}"
-					/>
-			</p:selectOneMenu>
-
-			<p:calendar
-				id="openingStartTime"
-				value="#{adminBranchOfficeActionController.openingStartTime}"
-				pattern="HH:mm"
-				timeOnly="true"
-				stepMinute="5"
-				navigator="true"
-				required="true"
-				requiredMessage="#{msg.ADMIN_START_TIME_REQUIRED}"
-				/>
-
-			<p:calendar
-				id="openingEndTime"
-				value="#{adminBranchOfficeActionController.openingEndTime}"
-				pattern="HH:mm"
-				timeOnly="true"
-				stepMinute="5"
-				navigator="true"
-				required="true"
-				requiredMessage="#{msg.ADMIN_END_TIME_REQUIRED}"
-				/>
-		</p:panelGrid>
-	</p:fieldset>
-</ui:composition>
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
deleted file mode 100644
index af7eb067..00000000
--- a/web/WEB-INF/templates/admin/business/department/admin_form_department_data.tpl
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-@TODO: title="#{msg.ADMIN_DEPARTMENT_LEGEND_TITLE}"
--->
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui"
-	>
-
-	<p:fieldset legend="#{msg.ADMIN_DEPARTMENT_LEGEND}">
-		<p:panelGrid
-			layout="grid"
-			columns="2"
-			columnClasses="ui-grid-col-4,ui-grid-col-8"
-			styleClass="ui-noborder"
-			>
-			<p:outputLabel for="departmentI18nKey" value="#{msg.ADMIN_ENTER_DEPARTMENT_I18N_KEY}" />
-			<p:inputText
-				id="departmentI18nKey"
-				maxlength="255"
-				value="#{adminDepartmentActionController.departmentI18nKey}"
-				required="true"
-				requiredMessage="#{msg.ADMIN_DEPARTMENT_I18N_KEY_REQUIRED}"
-				/>
-
-			<p:outputLabel for="departmentCompany" value="#{msg.ADMIN_ASSIGN_DEPARTMENT_COMPANY}" />
-			<p:selectOneMenu
-				id="departmentCompany"
-				value="#{adminDepartmentActionController.departmentCompany}"
-				filter="true"
-				filterMatchMode="contains"
-				required="true"
-				requiredMessage="#{msg.ADMIN_DEPARTMENT_COMPANY_REQUIRED}"
-				>
-
-				<f:converter converterId="BasicCompanyDataConverter" />
-
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-
-				<f:selectItems
-					value="#{basicDataListController.allBasicData}"
-					var="basicData"
-					itemValue="#{basicData}"
-					itemLabel="#{beanHelper.renderBasicData(basicData, true, false)}"
-					/>
-			</p:selectOneMenu>
-
-			<p:outputLabel for="departmentBranchOffice" value="#{msg.ADMIN_ASSIGN_DEPARTMENT_BRANCH_OFFICE}" />
-			<p:selectOneMenu
-				id="departmentBranchOffice"
-				value="#{adminDepartmentActionController.departmentBranchOffice}"
-				filter="true"
-				filterMatchMode="contains"
-				>
-
-				<f:converter converterId="BranchOfficeConverter" />
-
-				<f:selectItem
-					itemValue="#{null}"
-					itemLabel="#{msg.NONE_SELECTED}"
-					/>
-
-				<f:selectItems
-					value="#{branchOfficeListController.allBranchOffices}"
-					var="branchOffice"
-					itemValue="#{branchOffice}"
-					itemLabel="#{beanHelper.renderBranchOffice(branchOffice, false)}"
-					/>
-			</p:selectOneMenu>
-
-			<p:outputLabel for="departmentHeadquarter" value="#{msg.ADMIN_ASSIGN_DEPARTMENT_HEADQUARTER}" />
-			<p:selectOneMenu
-				id="departmentHeadquarter"
-				value="#{adminDepartmentActionController.departmentHeadquarter}"
-				filter="true"
-				filterMatchMode="contains"
-				>
-
-				<f:converter converterId="HeadquarterConverter" />
-
-				<f:selectItem
-					itemValue="#{null}"
-					itemLabel="#{msg.NONE_SELECTED}"
-					/>
-
-				<f:selectItems
-					value="#{headquarterListController.allHeadquarters}"
-					var="headquarter"
-					itemValue="#{headquarter}"
-					itemLabel="#{beanHelper.renderHeadquarter(headquarter)}"
-					/>
-			</p:selectOneMenu>
-
-			<p:outputLabel for="departmentLead" value="#{msg.ADMIN_ASSIGN_DEPARTMENT_LEAD_EMPLOYEE}" />
-			<p:selectOneMenu
-				id="departmentLead"
-				value="#{adminDepartmentActionController.departmentLead}"
-				filter="true"
-				filterMatchMode="contains"
-				>
-
-				<f:converter converterId="ContactConverter" />
-
-				<f:selectItem
-					itemValue="#{null}"
-					itemLabel="#{msg.NONE_SELECTED}"
-					/>
-
-				<f:selectItems
-					value="#{contactListController.allContacts}"
-					var="contact"
-					itemValue="#{contact}"
-					itemLabel="#{beanHelper.renderContact(contact)}"
-					/>
-			</p:selectOneMenu>
-
-			<p:outputLabel for="departmentUserOwner" value="#{msg.ADMIN_ASSIGN_DEPARTMENT_USER_OWNER}" />
-			<p:selectOneMenu
-				id="departmentUserOwner"
-				value="#{adminDepartmentActionController.departmentUserOwner}"
-				filter="true"
-				filterMatchMode="contains"
-				>
-
-				<f:converter converterId="UserConverter" />
-
-				<f:selectItem
-					itemValue="#{null}"
-					itemLabel="#{msg.NONE_SELECTED}"
-					/>
-
-				<f:selectItems
-					value="#{userListController.allUsers}"
-					var="departmentUserOwner"
-					itemValue="#{departmentUserOwner}"
-					itemLabel="#{beanHelper.renderContact(departmentUserOwner.userContact)} (#{departmentUserOwner.userName})"
-					/>
-			</p:selectOneMenu>
-		</p:panelGrid>
-	</p:fieldset>
-</ui:composition>
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
deleted file mode 100644
index 21644cf7..00000000
--- a/web/WEB-INF/templates/admin/business/employee/admin_form_employee_data.tpl
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:core="http://mxchange.org/jsf/core/widgets"
-	xmlns:validator="http://mxchange.org/jsf/core/validators"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui"
-	>
-
-	<p:fieldset
-		legend="#{msg.ADMIN_EMPLOYEE_GENERAL_LEGEND}"
-		title="#{msg.ADMIN_EMPLOYEE_GENERAL_LEGEND_TITLE}"
-		>
-		<p:panelGrid
-			layout="grid"
-			columns="2"
-			columnClasses="ui-grid-col-4,ui-grid-col-8"
-			styleClass="ui-noborder"
-			>
-			<p:outputLabel for="employeeBasicData" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_COMPANY}" />
-			<p:selectOneMenu
-				id="employeeBasicData"
-				value="#{adminEmployeeController.employeeBasicData}"
-				filter="true"
-				filterMatchMode="contains"
-				required="true"
-				requiredMessage="#{msg.ADMIN_EMPLOYEE_COMPANY_REQUIRED}"
-				>
-
-				<f:converter converterId="BasicCompanyDataConverter" />
-
-				<f:selectItem
-					itemValue="#{null}"
-					itemLabel="#{msg.PLEASE_SELECT}"
-					noSelectionOption="true"
-					itemDisabled="true"
-					/>
-
-				<f:selectItems
-					value="#{basicDataListController.allBasicData}"
-					var="basicData"
-					itemValue="#{basicData}"
-					itemLabel="#{beanHelper.renderBasicData(basicData, true, false)}"
-					/>
-			</p:selectOneMenu>
-
-			<p:outputLabel for="employeeBranchOffice" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_BRANCH_OFFICE}" />
-			<p:selectOneMenu
-				id="employeeBranchOffice"
-				value="#{adminEmployeeController.employeeBranchOffice}"
-				filter="true"
-				filterMatchMode="contains"
-				>
-
-				<f:converter converterId="BranchOfficeConverter" />
-
-				<f:selectItem
-					itemValue="#{null}"
-					itemLabel="#{msg.NONE_SELECTED}"
-					/>
-
-				<f:selectItems
-					value="#{branchOfficeListController.allBranchOffices}"
-					var="branchOffice"
-					itemValue="#{branchOffice}"
-					itemLabel="#{beanHelper.renderBranchOffice(branchOffice, false)}"
-					/>
-			</p:selectOneMenu>
-
-			<p:outputLabel for="employeePersonalData" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_PERSONAL_DATA}" />
-			<p:selectOneMenu
-				id="employeePersonalData"
-				value="#{adminEmployeeController.employeePersonalData}"
-				filter="true"
-				filterMatchMode="contains"
-				>
-
-				<f:converter converterId="ContactConverter" />
-
-				<f:selectItem
-					itemValue="#{null}"
-					itemLabel="#{msg.NONE_SELECTED}"
-					/>
-
-				<f:selectItems
-					value="#{contactListController.allContacts}"
-					var="contact"
-					itemValue="#{contact}"
-					itemLabel="#{beanHelper.renderContact(contact)}"
-					/>
-			</p:selectOneMenu>
-
-			<p:outputLabel for="employeeUserOwner" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_USER_OWNER}" />
-			<p:selectOneMenu
-				id="employeeUserOwner"
-				value="#{adminEmployeeController.employeeUserOwner}"
-				filter="true"
-				filterMatchMode="contains"
-				>
-
-				<f:converter converterId="UserConverter" />
-
-				<f:selectItem
-					itemValue="#{null}"
-					itemLabel="#{msg.NONE_SELECTED}"
-					/>
-
-				<f:selectItems
-					value="#{userListController.allUsers}"
-					var="employeeUserOwner"
-					itemValue="#{employeeUserOwner}"
-					itemLabel="#{beanHelper.renderContact(employeeUserOwner.userContact)} (#{employeeUserOwner.userName})"
-					/>
-			</p:selectOneMenu>
-
-			<p:outputLabel for="employeeEmailAddress" value="#{msg.ADMIN_ENTER_EMPLOYEE_EMAIL_ADDRESS}" />
-			<p:inputText
-				id="employeeEmailAddress"
-				size="40"
-				maxlength="255"
-				value="#{adminEmployeeController.employeeEmailAddress}"
-				validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}"
-				>
-				<validator:employeeEmailAddressValidator />
-			</p:inputText>
-
-			<p:outputLabel for="employeeStaffNumber" value="#{msg.ADMIN_ENTER_EMPLOYEE_STAFF_NUMBER}" />
-			<p:inputText id="employeeStaffNumber" size="2" maxlength="10" value="#{adminEmployeeController.employeeNumber}" />
-		</p:panelGrid>
-	</p:fieldset>
-
-	<p:fieldset
-		legend="#{msg.ADMIN_EMPLOYEE_OTHER_LEGEND}"
-		title="#{msg.ADMIN_EMPLOYEE_OTHER_LEGEND_TITLE}"
-		>
-		<p:panelGrid
-			layout="grid"
-			columns="2"
-			columnClasses="ui-grid-col-4,ui-grid-col-8"
-			styleClass="ui-noborder"
-			>
-			<p:outputLabel for="employeePhoneExtension" value="#{msg.ADMIN_ENTER_PHONE_EXTENSION}" />
-			<p:inputText id="employeePhoneExtension" size="2" maxlength="10" value="#{adminEmployeeController.employeePhoneExtension}" />
-
-			<p:outputLabel for="employeeDepartment" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_DEPARTMENT}" />
-			<p:selectOneMenu
-				id="employeeDepartment"
-				value="#{adminEmployeeController.employeeDepartment}"
-				filter="true"
-				filterMatchMode="contains"
-				>
-
-				<f:converter converterId="DepartmentConverter" />
-
-				<f:selectItem
-					itemValue="#{null}"
-					itemLabel="#{msg.NONE_SELECTED}"
-					/>
-
-				<f:selectItems
-					value="#{departmentListController.allDepartments}"
-					var="department"
-					itemValue="#{department}"
-					itemLabel="#{beanHelper.renderDepartment(department, false)}"
-					/>
-			</p:selectOneMenu>
-
-			<p:outputLabel for="employeeHeadquarter" value="#{msg.ADMIN_ASSIGN_EMPLOYEE_HEADQUARTER}" />
-			<p:selectOneMenu
-				id="employeeHeadquarter"
-				value="#{adminEmployeeController.employeeHeadquarter}"
-				filter="true"
-				filterMatchMode="contains"
-				>
-
-				<f:converter converterId="HeadquarterConverter" />
-
-				<f:selectItem
-					itemValue="#{null}"
-					itemLabel="#{msg.NONE_SELECTED}"
-					/>
-
-				<f:selectItems
-					value="#{headquarterListController.allHeadquarters}"
-					var="headquarter"
-					itemValue="#{headquarter}"
-					itemLabel="#{beanHelper.renderHeadquarter(headquarter)}"
-					/>
-			</p:selectOneMenu>
-
-			<p:outputLabel for="mobileNumber" value="#{msg.ADMIN_ENTER_EMPLOYEE_MOBILE_NUMBER}" />
-			<core:inputMobileNumberPanelGrid targetController="#{adminEmployeeController}" />
-		</p:panelGrid>
-	</p:fieldset>
-</ui:composition>
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
deleted file mode 100644
index 61ddb0b1..00000000
--- a/web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_data.tpl
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-@TODO: title="#{msg.ADMIN_HEADQUARTER_LEGEND_TITLE}"
--->
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:core="http://mxchange.org/jsf/core/widgets"
-	xmlns:validator="http://mxchange.org/jsf/core/validators"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui"
-	>
-
-	<p:fieldset legend="#{msg.ADMIN_HEADQUARTER_LEGEND}">
-		<p:panelGrid
-			layout="grid"
-			columns="2"
-			columnClasses="ui-grid-col-4,ui-grid-col-8"
-			styleClass="ui-noborder"
-			>
-			<p:outputLabel for="headquarterCompanyName" value="#{msg.ADMIN_HEADQUARTER_COMPANY_NAME}" />
-			<p:inputText
-				id="headquarterCompanyName"
-				value="#{adminHeadquarterActionController.headquarterCompanyName}"
-				size="30"
-				maxlength="200"
-				required="true"
-				requiredMessage="#{msg.ADMIN_HEADQUARTER_COMPANY_NAME_REQUIRED}"
-				>
-				<f:validator validatorId="HeadquarterCompanyNameValidator" />
-				<f:attribute name="checkExisting" value="false" />
-			</p:inputText>
-
-			<p:outputLabel for="headquarterContactEmployee" value="#{msg.ADMIN_ASSIGN_HEADQUARTER_CONTACT_EMPLOYEE}" />
-			<p:selectOneMenu
-				id="headquarterContactEmployee"
-				value="#{adminHeadquarterActionController.headquarterContactEmployee}"
-				filter="true"
-				filterMatchMode="contains"
-				>
-
-				<f:converter converterId="ContactConverter" />
-
-				<f:selectItem
-					itemValue="#{null}"
-					itemLabel="#{msg.NONE_SELECTED}"
-					/>
-
-				<f:selectItems
-					value="#{contactListController.allContacts}"
-					var="contact"
-					itemValue="#{contact}"
-					itemLabel="#{beanHelper.renderContact(contact)}"
-					/>
-			</p:selectOneMenu>
-
-			<p:outputLabel for="headquarterUserOwner" value="#{msg.ADMIN_ASSIGN_HEADQUARTER_USER_OWNER}" />
-			<p:selectOneMenu
-				id="headquarterUserOwner"
-				value="#{adminHeadquarterActionController.headquarterUserOwner}"
-				filter="true"
-				filterMatchMode="contains"
-				>
-
-				<f:converter converterId="UserConverter" />
-
-				<f:selectItem
-					itemValue="#{null}"
-					itemLabel="#{msg.NONE_SELECTED}"
-					/>
-
-				<f:selectItems
-					value="#{userListController.allUsers}"
-					var="headquarterUserOwner"
-					itemValue="#{headquarterUserOwner}"
-					itemLabel="#{beanHelper.renderContact(headquarterUserOwner.userContact)} (#{headquarterUserOwner.userName})"
-					/>
-			</p:selectOneMenu>
-
-			<p:outputLabel for="headquarterEmailAddress" value="#{msg.ADMIN_ENTER_HEADQUARTER_EMAIL_ADDRESS}" />
-			<p:inputText
-				id="headquarterEmailAddress"
-				size="40"
-				maxlength="255"
-				value="#{adminHeadquarterActionController.headquarterEmailAddress}"
-				validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}"
-				>
-				<validator:headquarterEmailAddressValidator />
-			</p:inputText>
-
-			<p:outputLabel for="landLineCountry" value="#{msg.ADMIN_ENTER_HEADQUARTER_LAND_LINE_NUMBER}" />
-			<core:inputLandLineNumberPanelGrid targetController="#{adminHeadquarterActionController}" />
-
-			<p:outputLabel for="faxCountry" value="#{msg.ADMIN_ENTER_HEADQUARTER_FAX_NUMBER}" />
-			<core:inputFaxNumberPanelGrid targetController="#{adminHeadquarterActionController}" />
-		</p:panelGrid>
-	</p:fieldset>
-
-	<p:fieldset legend="#{msg.ADMIN_HEADQUARTER_ADDRESS_LEGEND}">
-		<p:panelGrid
-			layout="grid"
-			columns="2"
-			columnClasses="ui-grid-col-4,ui-grid-col-8"
-			styleClass="ui-noborder"
-			>
-			<p:outputLabel for="headquarterStreet" value="#{msg.ADMIN_DATA_STREET_NAME}" />
-			<p:inputText id="headquarterStreet" size="20" maxlength="255" value="#{adminHeadquarterActionController.headquarterStreet}" required="true" requiredMessage="#{msg.ADMIN_HEADQUARTER_STREET_NAME_REQUIRED}" />
-
-			<p:outputLabel for="headquarterHouseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
-			<p:inputText id="headquarterHouseNumber" size="3" maxlength="5" value="#{adminHeadquarterActionController.headquarterHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_HEADQUARTER_HOUSE_NUMBER_REQUIRED}">
-				<f:validateLongRange minimum="1" maximum="500" />
-			</p:inputText>
-
-			<p:outputLabel for="headquarterHouseNumberExtension" value="#{msg.ADMIN_DATA_HOUSE_NUMBER_EXTENSION}" />
-			<p:inputText id="headquarterHouseNumberExtension" size="1" maxlength="255" value="#{adminHeadquarterActionController.headquarterHouseNumberExtension}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" />
-
-			<p:outputLabel for="headquarterLastHouseNumber" value="#{msg.ADMIN_DATA_LAST_HOUSE_NUMBER}" />
-			<p:inputText id="headquarterLastHouseNumber" size="3" maxlength="5" value="#{adminHeadquarterActionController.headquarterLastHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
-				<f:validateLongRange minimum="1" maximum="500" />
-			</p:inputText>
-
-			<p:outputLabel for="headquarterStore" value="#{msg.ADMIN_ENTER_DATA_STORE}" />
-			<p:inputText id="headquarterStore" size="3" maxlength="5" value="#{adminHeadquarterActionController.headquarterStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
-				<f:validateLongRange minimum="-5" maximum="200" />
-			</p:inputText>
-
-			<p:outputLabel for="headquarterSuiteNumber" value="#{msg.ADMIN_ENTER_DATA_SUITE_NUMBER}" />
-			<p:inputText id="headquarterSuiteNumber" size="3" maxlength="5" value="#{adminHeadquarterActionController.headquarterSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
-				<f:validateLongRange minimum="1" maximum="500" />
-			</p:inputText>
-
-			<p:outputLabel for="headquarterZipCode" value="#{msg.DATA_ZIP_CODE}" />
-			<p:inputText id="headquarterZipCode" size="5" maxlength="6" value="#{adminHeadquarterActionController.headquarterZipCode}" required="true" requiredMessage="#{msg.ADMIN_HEADQUARTER_ZIP_CODE_REQUIRED}">
-				<f:validateLongRange minimum="1" maximum="99999" />
-			</p:inputText>
-
-			<p:outputLabel for="headquarterCity" value="#{msg.ADMIN_DATA_CITY}" />
-			<p:inputText id="headquarterCity" size="20" maxlength="255" value="#{adminHeadquarterActionController.headquarterCity}" required="true" requiredMessage="#{msg.ADMIN_HEADQUARTER_CITY_REQUIRED}" />
-
-			<p:outputLabel for="headquarterCountry" value="#{msg.ADMIN_SELECT_COUNTRY}" />
-			<core:outputCountrySelector id="headquarterCountry" value="#{adminHeadquarterActionController.headquarterCountry}" required="true" requiredMessage="#{msg.ADMIN_HEADQUARTER_COUNTRY_REQUIRED}" />
-		</p:panelGrid>
-	</p:fieldset>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_opening_time.tpl b/web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_opening_time.tpl
deleted file mode 100644
index 4256ad25..00000000
--- a/web/WEB-INF/templates/admin/business/headquarter/admin_form_headquarter_opening_time.tpl
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-@TODO: title="#{msg.ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND_TITLE}"
--->
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui"
-	>
-
-	<p:fieldset legend="#{msg.ADMIN_BRANCH_OFFICE_OPENING_TIME_LEGEND}">
-		<p:panelGrid
-			layout="grid"
-			columns="4"
-			columnClasses="ui-grid-col-4,ui-grid-col-8"
-			styleClass="ui-noborder"
-			>
-			<p:outputLabel for="openingStartDay" value="#{msg.ADMIN_START_WEEK_DAY}" />
-			<p:outputLabel for="openingEndDay" value="#{msg.ADMIN_END_WEEK_DAY}" />
-			<p:outputLabel for="openingStartTime" value="#{msg.ADMIN_START_TIME}" />
-			<p:outputLabel for="openingEndTime" value="#{msg.ADMIN_END_TIME}" />
-
-			<p:selectOneMenu
-				id="openingStartDay"
-				value="#{adminHeadquarterActionController.openingStartDay}"
-				filter="true"
-				filterMatchMode="contains"
-				required="true"
-				requiredMessage="#{msg.ADMIN_START_WEEK_DAY_REQUIRED}"
-				>
-
-				<f:converter converterId="DayOfTheWeekConverter" />
-
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-
-				<f:selectItems
-					value="#{dataController.dayOfTheWeek}"
-					var="dayOfWeek"
-					itemValue="#{dayOfWeek}"
-					itemLabel="#{dayOfWeek.toString()}"
-					/>
-			</p:selectOneMenu>
-
-			<p:selectOneMenu
-				id="openingEndDay"
-				value="#{adminHeadquarterActionController.openingEndDay}"
-				filter="true"
-				filterMatchMode="contains"
-				required="true"
-				requiredMessage="#{msg.ADMIN_END_WEEK_DAY_REQUIRED}"
-				>
-
-				<f:converter converterId="DayOfTheWeekConverter" />
-
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-
-				<f:selectItems
-					value="#{dataController.dayOfTheWeek}"
-					var="dayOfWeek"
-					itemValue="#{dayOfWeek}"
-					itemLabel="#{dayOfWeek.toString()}"
-					/>
-			</p:selectOneMenu>
-
-			<p:calendar
-				id="openingStartTime"
-				value="#{adminHeadquarterActionController.openingStartTime}"
-				pattern="HH:mm"
-				timeOnly="true"
-				stepMinute="5"
-				navigator="true"
-				required="true"
-				requiredMessage="#{msg.ADMIN_START_TIME_REQUIRED}"
-				/>
-
-			<p:calendar
-				id="openingEndTime"
-				value="#{adminHeadquarterActionController.openingEndTime}"
-				pattern="HH:mm"
-				timeOnly="true"
-				stepMinute="5"
-				navigator="true"
-				required="true"
-				requiredMessage="#{msg.ADMIN_END_TIME_REQUIRED}"
-				/>
-		</p:panelGrid>
-	</p:fieldset>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/business/opening_time/admin_form_opening_time.tpl b/web/WEB-INF/templates/admin/business/opening_time/admin_form_opening_time.tpl
deleted file mode 100644
index 767ee3e0..00000000
--- a/web/WEB-INF/templates/admin/business/opening_time/admin_form_opening_time.tpl
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-@TODO: title="#{msg.ADMIN_OPENING_TIME_LEGEND_TITLE}"
--->
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui"
-	>
-
-	<p:fieldset legend="#{msg.ADMIN_OPENING_TIME_LEGEND}">
-		<p:panelGrid
-			layout="grid"
-			columns="4"
-			columnClasses="ui-grid-col-4,ui-grid-col-8"
-			styleClass="ui-noborder"
-			>
-			<p:outputLabel for="openingStartDay" value="#{msg.ADMIN_START_WEEK_DAY}" />
-			<p:outputLabel for="openingEndDay" value="#{msg.ADMIN_END_WEEK_DAY}" />
-			<p:outputLabel for="openingStartTime" value="#{msg.ADMIN_START_TIME}" />
-			<p:outputLabel for="openingEndTime" value="#{msg.ADMIN_END_TIME}" />
-
-			<p:selectOneMenu
-				id="openingStartDay"
-				value="#{adminOpeningTimeController.openingStartDay}"
-				filter="true"
-				filterMatchMode="contains"
-				required="true"
-				requiredMessage="#{msg.ADMIN_START_WEEK_DAY_REQUIRED}"
-				>
-
-				<f:converter converterId="DayOfTheWeekConverter" />
-
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-
-				<f:selectItems
-					value="#{dataController.dayOfTheWeek}"
-					var="dayOfWeek"
-					itemValue="#{dayOfWeek}"
-					itemLabel="#{dayOfWeek.toString()}"
-					/>
-			</p:selectOneMenu>
-
-			<p:selectOneMenu
-				id="openingEndDay"
-				value="#{adminOpeningTimeController.openingEndDay}"
-				filter="true"
-				filterMatchMode="contains"
-				required="true"
-				requiredMessage="#{msg.ADMIN_END_WEEK_DAY_REQUIRED}"
-				>
-
-				<f:converter converterId="DayOfTheWeekConverter" />
-
-				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-
-				<f:selectItems
-					value="#{dataController.dayOfTheWeek}"
-					var="dayOfWeek"
-					itemValue="#{dayOfWeek}"
-					itemLabel="#{dayOfWeek.toString()}"
-					/>
-			</p:selectOneMenu>
-
-			<p:calendar
-				id="openingStartTime"
-				value="#{adminOpeningTimeController.openingStartTime}"
-				pattern="HH:mm"
-				timeOnly="true"
-				stepMinute="5"
-				navigator="true"
-				required="true"
-				requiredMessage="#{msg.ADMIN_START_TIME_REQUIRED}"
-				/>
-
-			<p:calendar
-				id="openingEndTime"
-				value="#{adminOpeningTimeController.openingEndTime}"
-				pattern="HH:mm"
-				timeOnly="true"
-				stepMinute="5"
-				navigator="true"
-				required="true"
-				requiredMessage="#{msg.ADMIN_END_TIME_REQUIRED}"
-				/>
-		</p:panelGrid>
-	</p:fieldset>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl
deleted file mode 100644
index c8c9f099..00000000
--- a/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA_MINI}" headerClass="table-header-column" styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.contact}">
-		<f:facet name="header">
-			<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT}">
-				<f:param value="#{beanHelper.contact.contactId}" />
-			</h:outputFormat>
-		</f:facet>
-
-		<h:column>
-			<p:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
-
-			<h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
-		</h:column>
-
-		<h:column>
-			<p:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
-
-			<h:outputText id="contactFirstName" styleClass="table-data-field" value="#{beanHelper.contact.contactFirstName}" />
-		</h:column>
-
-		<h:column>
-			<p:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
-
-			<h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{beanHelper.contact.contactFamilyName}" />
-		</h:column>
-	</h:panelGrid>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl
deleted file mode 100644
index 7b1b357e..00000000
--- a/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA}" headerClass="table-header-column" styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.contact}">
-		<f:facet name="header">
-			<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT}">
-				<f:param value="#{beanHelper.contact.contactId}" />
-			</h:outputFormat>
-		</f:facet>
-
-		<widgets:outputContactDataGridColumns />
-	</h:panelGrid>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
deleted file mode 100644
index 6d6a02fa..00000000
--- a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<h:panelGroup styleClass="para notice" layout="block">
-		<h:outputText value="#{msg.ADMIN_COUNTRY_DATA_MINIMUM_NOTICE}" />
-	</h:panelGroup>
-
-	<h:panelGroup styleClass="para" layout="block">
-		<fieldset class="fieldset">
-			<legend title="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND_TITLE}">
-				<h:outputText value="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND}" />
-			</legend>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="countryAbroadDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_ABROAD_DIAL_PREFIX}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED}">
-						<f:validator validatorId="AbroadDialValidator" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="countryAbroadDialPrefix" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="countryCode" value="#{msg.ADMIN_ENTER_COUNTRY_CODE}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true">
-						<f:validateRegex for="countryCode" pattern="[A-Z]{2}" />
-					</p:inputText>
-
-					<h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_CODE_EXAMPLE}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="countryCode" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="countryI18nKey" value="#{msg.ADMIN_ENTER_COUNTRY_I18N_KEY}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="countryI18nKey" size="20" maxlength="100" value="#{adminCountryController.countryI18nKey}" required="true">
-						<f:validateRegex for="countryI18nKey" pattern="[A-Z_]{2,}" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="countryI18nKey" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="countryIsLocalPrefixRequired" value="#{msg.ADMIN_SELECT_COUNTRY_IS_EXTERNAL_DIAL_PREFIX_REQUIRED}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:selectOneListbox required="true" id="countryIsLocalPrefixRequired" value="#{adminCountryController.countryIsLocalPrefixRequired}" size="1">
-						<f:selectItem itemValue="true" itemLabel="#{msg.CHOICE_YES}" />
-						<f:selectItem itemValue="false" itemLabel="#{msg.CHOICE_NO}" />
-					</h:selectOneListbox>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="countryIsLocalPrefixRequired" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="countryExternalDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED}">
-						<f:validateLongRange for="countryExternalDialPrefix" minimum="0" maximum="99" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="countryAbroadDialPrefix" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="countryPhoneCode" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_PHONE_CODE_REQUIRED}">
-						<f:validateLongRange minimum="0" maximum="999" />
-					</p:inputText>
-
-					<h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="countryPhoneCode" />
-			</h:panelGroup>
-		</fieldset>
-	</h:panelGroup>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
deleted file mode 100644
index 2492f9da..00000000
--- a/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<widgets:outputMessageBox id="error-helper-contact-fax" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
-	<ui:fragment rendered="#{empty beanHelper.contact.contactFaxNumber and not empty beanHelper.contact}">
-		<ui:include src="/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl" />
-	</ui:fragment>
-
-	<widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.contact.contactFaxNumber}" rendered="#{not empty beanHelper.contact.contactFaxNumber and not empty beanHelper.contact}" />
-</ui:composition>
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
deleted file mode 100644
index e8bfe048..00000000
--- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<widgets:outputMessageBox id="error-helper-contact-add-fax" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
-	<h:form id="form_add_contact_fax" rendered="#{not empty beanHelper.contact}">
-		<h:panelGroup styleClass="table table-medium" layout="block">
-			<div class="table-header">
-				<h:outputText value="#{msg.ADMIN_ADD_CONTACT_FAX_NUMBER_FORM_TITLE}" />
-			</div>
-
-			<div class="para">
-				<ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
-			</div>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="faxNumber" value="#{msg.ADMIN_SELECT_FAX_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:selectOneMenu styleClass="select divider-right" id=" " 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}" />
-					</p:selectOneMenu>
-				</div>
-			</h:panelGroup>
-
-			<div class="para">
-				<h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_FAX_DATA}" />
-			</div>
-
-			<widgets:outputFaxInputTableRow targetController="#{adminContactPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
-
-			<div class="table-footer">
-				<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-
-				<p:commandButton styleClass="submit" id="submit_add_link_contact_fax" type="submit" action="#{adminContactPhoneController.doLinkMainFaxNumber()}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER}" />
-			</div>
-		</h:panelGroup>
-	</h:form>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
deleted file mode 100644
index d2357275..00000000
--- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<widgets:outputMessageBox id="error-helper-contact-add-landline" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
-	<h:form id="form_add_contact_landline" rendered="#{not empty beanHelper.contact}">
-		<h:panelGroup styleClass="table table-medium" layout="block">
-			<div class="table-header">
-				<h:outputText value="#{msg.ADMIN_ADD_CONTACT_LAND_LINE_NUMBER_FORM_TITLE}" />
-			</div>
-
-			<div class="para">
-				<ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
-			</div>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="landLineNumber" value="#{msg.ADMIN_SELECT_LAND_LINE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:selectOneMenu styleClass="select divider-right" id="landLineNumber" value="#{adminPhoneController.landLineNumber}">
-						<f:converter converterId="LandLineNumberConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{adminPhoneController.allNonLinkedLandLineNumbers()}" var="landlineNumber" itemValue="#{landlineNumber}" itemLabel="#{landlineNumber.phoneCountry.countryExternalDialPrefix} (#{landlineNumber.phoneAreaCode}) #{landlineNumber.phoneNumber}" />
-					</p:selectOneMenu>
-				</div>
-			</h:panelGroup>
-
-			<div class="para">
-				<h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_LAND_LINE_DATA}" />
-			</div>
-
-			<widgets:outputLandLineInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
-
-			<div class="table-footer">
-				<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-
-				<p:commandButton styleClass="submit" id="submit_add_link_contact_landline" type="submit" action="#{adminContactPhoneController.doLinkAddLandLineNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER}">
-					<f:param name="contactId" value="#{param.contactId}" />
-				</p:commandButton>
-			</div>
-		</h:panelGroup>
-	</h:form>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
deleted file mode 100644
index 4b0d7b40..00000000
--- a/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
-	<ui:fragment rendered="#{empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}">
-		<ui:include src="/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl" />
-	</ui:fragment>
-
-	<widgets:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.contact.contactLandLineNumber}" rendered="#{not empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}" />
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
deleted file mode 100644
index 0659db91..00000000
--- a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
-	<h:form id="form_add_contact_mobile" rendered="#{not empty beanHelper.contact}">
-		<h:panelGroup styleClass="table table-medium" layout="block">
-			<div class="table-header">
-				<h:outputText value="#{msg.ADMIN_ADD_CONTACT_MOBILE_NUMBER_FORM_TITLE}" />
-			</div>
-
-			<div class="para">
-				<ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
-			</div>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="mobileNumber" value="#{msg.ADMIN_SELECT_MOBILE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:selectOneMenu styleClass="select divider-right" id="mobileNumber" value="#{adminPhoneController.mobileNumber}">
-						<f:converter converterId="MobileNumberConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{adminPhoneController.allNonLinkedMobileNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix} (#{mobileNumber.mobileProvider.providerDialPrefix}) #{mobileNumber.phoneNumber}" />
-					</p:selectOneMenu>
-				</div>
-			</h:panelGroup>
-
-			<div class="para">
-				<h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_MOBILE_DATA}" />
-			</div>
-
-			<widgets:outputMobileNumberTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
-
-			<div class="table-footer">
-				<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-
-				<p:commandButton styleClass="submit" id="submit_add_link_contact_mobile" type="submit" action="#{adminContactPhoneController.doLinkAddMobileNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER}">
-					<f:param name="contactId" value="#{param.contactId}" />
-				</p:commandButton>
-			</div>
-		</h:panelGroup>
-	</h:form>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_contact_mobile.tpl
deleted file mode 100644
index ef10a651..00000000
--- a/web/WEB-INF/templates/admin/mobile/admin_form_contact_mobile.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<h:outputText styleClass="alert-danger" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
-
-	<h:form id="form_add_contact_mobile">
-	</h:form>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
deleted file mode 100644
index 14306965..00000000
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
-	<ui:fragment rendered="#{empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}">
-		<ui:include src="/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl" />
-	</ui:fragment>
-
-	<widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.contact.contactMobileNumber}" rendered="#{not empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}" />
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
deleted file mode 100644
index 194d90fc..00000000
--- a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<h:panelGroup styleClass="para notice" layout="block">
-		<h:outputText value="#{msg.ADMIN_MOBILE_PROVIDER_MINIMUM_NOTICE}" />
-	</h:panelGroup>
-
-	<h:panelGroup styleClass="para" layout="block">
-		<fieldset class="fieldset">
-			<legend title="#{msg.ADMIN_MOBILE_PROVIDER_LEGEND_TITLE}">
-				<h:outputText value="#{msg.ADMIN_MOBILE_PROVIDER_LEGEND}" />
-			</legend>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="providerDialPrefix" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_DIAL_PREFIX}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true">
-						<f:validateLongRange for="providerDialPrefix" minimum="0" maximum="9999" />
-					</p:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:message for="providerDialPrefix" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="providerMailPattern" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="providerMailPattern" size="10" maxlength="30" value="#{adminMobileProviderController.providerMailPattern}" />
-
-					<h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="providerName" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_NAME}" />
-				</div>
-
-				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="providerName" size="20" maxlength="100" value="#{adminMobileProviderController.providerName}" required="true" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<p:outputLabel for="providerCountry" value="#{msg.ADMIN_SELECT_MOBILE_PROVIDER_COUNTRY}" />
-				</div>
-
-				<div class="table-right-medium">
-					<widgets:outputCountrySelector id="providerCountry" value="#{adminMobileProviderController.providerCountry}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_COUNTRY_REQUIRED}" allowNone="false" />
-				</div>
-			</h:panelGroup>
-		</fieldset>
-	</h:panelGroup>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
deleted file mode 100644
index 724f72ac..00000000
--- a/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<widgets:outputAdminUserDataFormFields mode="add" />
-
-	<div class="para notice">
-		<h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
-	</div>
-
-	<widgets:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
deleted file mode 100644
index 7f5d92f5..00000000
--- a/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}" headerClass="table-header-column" styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.user}">
-		<f:facet name="header">
-			<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
-				<f:param value="#{beanHelper.user.userName}" />
-				<f:param value="#{beanHelper.user.userId}" />
-			</h:outputFormat>
-		</f:facet>
-
-		<h:column>
-			<p:outputLabel for="userId" styleClass="table-data-label" value="#{msg.ADMIN_USER_ID}" />
-
-			<h:outputText id="userId" styleClass="table-data-field" value="#{beanHelper.user.userId}" />
-		</h:column>
-
-		<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-			<h:column>
-				<p:outputLabel for="userName" styleClass="table-data-label" value="#{msg.ADMIN_USER_NAME}" />
-
-				<h:outputText id="userName" styleClass="table-data-field" value="#{beanHelper.user.userName}" />
-			</h:column>
-		</ui:fragment>
-
-		<h:column>
-			<p:outputLabel for="userCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
-
-			<h:outputText id="userCreated" styleClass="table-data-field" value="#{beanHelper.user.userCreated.time}">
-				<f:convertDateTime for="userCreated" type="both" />
-			</h:outputText>
-		</h:column>
-
-		<h:column>
-			<p:outputLabel for="userUpdated" styleClass="table-data-label" value="#{msg.ADMIN_USER_UPDATED}" />
-
-			<h:outputText id="userUpdated" styleClass="table-data-field" value="#{beanHelper.user.userUpdated.time}">
-				<f:convertDateTime for="userUpdated" type="both" />
-			</h:outputText>
-		</h:column>
-
-		<h:column>
-			<p:outputLabel for="userAccountStatus" styleClass="table-data-label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
-
-			<h:outputText id="userAccountStatus" styleClass="table-data-field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
-		</h:column>
-
-		<h:column>
-			<p:outputLabel for="userProfileMode" styleClass="table-data-label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
-
-			<h:outputText id="userProfileMode" styleClass="table-data-field" value="#{msg[beanHelper.user.userProfileMode.messageKey]}" />
-		</h:column>
-
-		<h:column>
-			<p:outputLabel for="userLastLocked" styleClass="table-data-label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
-
-			<h:outputText id="userLastLocked" styleClass="table-data-field" value="#{beanHelper.user.userLastLocked.time}">
-				<f:convertDateTime for="userLastLocked" type="both" />
-			</h:outputText>
-		</h:column>
-
-		<h:column>
-			<p:outputLabel for="userLastLockedReason" styleClass="table-data-label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
-
-			<h:outputText id="userLastLockedReason" styleClass="table-data-field" value="#{beanHelper.user.userLastLockedReason}" />
-		</h:column>
-
-		<widgets:outputContactDataGridColumns />
-	</h:panelGrid>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
deleted file mode 100644
index ef3e1c95..00000000
--- a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
-
-	<h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}" headerClass="table-header-column" styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.user}">
-		<f:facet name="header">
-			<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
-				<f:param value="#{beanHelper.user.userName}" />
-				<f:param value="#{beanHelper.user.userId}" />
-			</h:outputFormat>
-		</f:facet>
-
-		<h:column>
-			<p:outputLabel for="userId" styleClass="table-data-label" value="#{msg.ADMIN_USER_ID}" />
-
-			<h:panelGroup styleClass="table-data-field" layout="block">
-				<p:link id="userId" 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>
-			</h:panelGroup>
-		</h:column>
-
-		<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-			<h:column>
-				<p:outputLabel for="userName" styleClass="table-data-label" value="#{msg.ADMIN_USER_NAME}" />
-
-				<h:outputText id="userName" styleClass="table-data-field" value="#{beanHelper.user.userName}" />
-			</h:column>
-		</ui:fragment>
-
-		<h:column>
-			<p:outputLabel for="userCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
-
-			<h:outputText id="userCreated" styleClass="table-data-field" value="#{beanHelper.user.userCreated.time}">
-				<f:convertDateTime for="userCreated" type="both" />
-			</h:outputText>
-		</h:column>
-
-		<h:column>
-			<p:outputLabel for="userAccountStatus" styleClass="table-data-label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
-
-			<h:outputText id="userAccountStatus" styleClass="table-data-field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
-		</h:column>
-
-		<widgets:outputContactDataGridColumns />
-	</h:panelGrid>
-</ui:composition>
diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
deleted file mode 100644
index c5342cca..00000000
--- a/web/WEB-INF/templates/base.tpl
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:f="http://java.sun.com/jsf/core"
-				xmlns:h="http://java.sun.com/jsf/html"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:p="http://primefaces.org/ui"
-				xmlns:pm="http://primefaces.org/mobile">
-
-	<h:doctype rootElement="html" public="-//W3C//DTD XHTML 1.0 Transitional//EN" system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-
-	<html lang="#{localizationController.locale.language}" xml:lang="#{localizationController.locale.language}" xmlns="http://www.w3.org/1999/xhtml">
-		<f:view locale="#{localizationController.locale}" contentType="text/html" />
-
-		<h:head>
-			<f:facet name="first">
-				<ui:insert name="metadata" />
-
-				<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-				<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-				<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0"/>
-				<meta name="apple-mobile-web-app-capable" content="yes" />
-			</f:facet>
-
-			<f:loadBundle var="msg" basename="org.mxchange.localization.bundle" />
-			<f:loadBundle var="project" basename="org.mxchange.localization.project" />
-
-			<h:outputStylesheet name="/css/default.css" />
-			<h:outputStylesheet name="/css/layout.css" />
-
-			<title>
-				<h:outputText value="#{initParam['project_title']}" />
-				<h:outputText value=" - " />
-				<ui:insert name="title">
-					<h:outputText value="Default title" />
-				</ui:insert>
-			</title>
-		</h:head>
-
-		<h:body>
-			<pm:header>
-				<div id="page-header">
-					<h1>
-						<h:outputText value="#{initParam['project_title']} - " />
-
-						<ui:insert name="title">
-							<h:outputText value="Default title" />
-						</ui:insert>
-					</h1>
-				</div>
-			</pm:header>
-
-			<h:panelGroup id="menu-content-wrapper" layout="block">
-				<div id="left-menu-container">
-					<ui:insert name="menu">
-						<h:outputText value="Default menu" />
-					</ui:insert>
-
-					<ui:include src="/WEB-INF/templates/widgets/locale_change_widget.tpl" />
-				</div>
-
-				<h:panelGroup id="content_outer" class="content-container" layout="block">
-					<div id="content-header">
-						<ui:insert name="content_header">
-							<h:outputText value="Default content header" />
-						</ui:insert>
-					</div>
-
-					<div id="content">
-						<ui:insert name="content">
-							<h:outputText value="Default content" />
-						</ui:insert>
-					</div>
-				</h:panelGroup>
-			</h:panelGroup>
-
-			<h:panelGroup id="page-footer" layout="block">
-				<ui:insert name="footer">
-					<h:outputText value="Default footer" />
-				</ui:insert>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error-container" layout="block">
-				<p:growl autoUpdate="true" showDetail="true" sticky="true" />
-
-				<p:ajaxExceptionHandler type="javax.faces.application.ViewExpiredException"
-										update="exceptionDialog"
-										onexception="PF('exceptionDialog').show();" />
-
-				<p:dialog id="exceptionDialog" closable="true" closeOnEscape="true" header="Exception '#{pfExceptionHandler.type}' occured!" widgetVar="exceptionDialog"
-						  height="500px">
-					<div class="para">
-						<h:outputText value="#{msg.EXCEPTION_MESSAGE}:" />
-						<h:outputText value="#{pfExceptionHandler.message}" />
-					</div>
-
-					<div class="para">
-						<h:outputText value="#{msg.EXCEPTION_STACK_TRACE}:" />
-						<h:outputText value="#{pfExceptionHandler.formattedStackTrace}" escape="false" />
-					</div>
-
-					<div class="para">
-						<p:button onclick="window.location.href = document.location.href;"
-								  value="#{msg.RELOAD_PAGE}"
-								  rendered="#{pfExceptionHandler.type == 'javax.faces.application.ViewExpiredException'}" />
-					</div>
-				</p:dialog>
-			</h:panelGroup>
-		</h:body>
-	</html>
-</ui:composition>
diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index b945d350..05aab6b4 100644
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<h:panelGroup styleClass="para notice" layout="block">
 		<h:outputText value="#{msg.PERSONAL_DATA_MINIMUM_NOTICE}" />
@@ -17,7 +18,7 @@
 				<h:outputText value="#{msg.PERSONAL_DATA_LEGEND}" />
 			</legend>
 
-			<widgets:outputPersonalTitleTableRow targetController="#{contactController}" />
+			<core:outputPersonalTitleSelectionBox targetController="#{contactController}" />
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
@@ -25,7 +26,7 @@
 				</div>
 
 				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FIRST_NAME_REQUIRED}">
+					<p:inputText id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FIRST_NAME_REQUIRED}">
 						<f:validator validatorId="NameValidator" />
 					</p:inputText>
 				</div>
@@ -41,7 +42,7 @@
 				</div>
 
 				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FAMILY_NAME_REQUIRED}">
+					<p:inputText id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FAMILY_NAME_REQUIRED}">
 						<f:validator for="familyName" validatorId="NameValidator" />
 					</p:inputText>
 				</div>
@@ -57,7 +58,7 @@
 				</div>
 
 				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{contactController.street}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_STREET_REQUIRED}">
+					<p:inputText id="street" size="20" maxlength="255" value="#{contactController.street}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_STREET_REQUIRED}">
 						<f:validator validatorId="NameValidator" />
 					</p:inputText>
 				</div>
@@ -73,8 +74,8 @@
 				</div>
 
 				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_HOUSE_NUMBER_REQUIRED}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
-						<f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
+					<p:inputText id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_HOUSE_NUMBER_REQUIRED}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
+						<f:validateLongRange minimum="1" maximum="500" />
 					</p:inputText>
 				</div>
 			</h:panelGroup>
@@ -89,7 +90,7 @@
 				</div>
 
 				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{contactController.houseNumberExtension}" />
+					<p:inputText id="houseNumberExtension" size="2" maxlength="2" value="#{contactController.houseNumberExtension}" />
 				</div>
 			</h:panelGroup>
 
@@ -103,7 +104,7 @@
 				</div>
 
 				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{contactController.zipCode}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_ZIP_CODE_REQUIRED}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
+					<p:inputText id="zipCode" size="5" maxlength="6" value="#{contactController.zipCode}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_ZIP_CODE_REQUIRED}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
 						<f:validateLongRange minimum="1" maximum="99999" />
 					</p:inputText>
 				</div>
@@ -119,7 +120,7 @@
 				</div>
 
 				<div class="table-right-medium">
-					<p:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{contactController.city}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_CITY_REQUIRED}">
+					<p:inputText id="city" size="10" maxlength="255" value="#{contactController.city}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_CITY_REQUIRED}">
 						<f:validator validatorId="NameValidator" />
 					</p:inputText>
 				</div>
@@ -135,7 +136,14 @@
 				</div>
 
 				<div class="table-right-medium">
-					<p:calendar id="birthday" value="#{contactController.birthday}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_BIRTHDAY_REQUIRED}" />
+					<p:calendar
+						id="birthday"
+						value="#{contactController.birthday}"
+						pattern="#{msg.DATE_PATTERN}"
+						navigator="true"
+						required="true"
+						requiredMessage="#{msg.GUEST_CONTACT_DATA_BIRTHDAY_REQUIRED}"
+						/>
 				</div>
 			</h:panelGroup>
 
@@ -145,11 +153,11 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<p:outputLabel for="country" value="#{msg.PERSONAL_DATA_COUNTRY_CODE}" />
+					<p:outputLabel for="country" value="#{msg.DATA_COUNTRY_CODE}" />
 				</div>
 
 				<div class="table-right-medium">
-					<widgets:outputCountrySelector id="country" value="#{contactController.country}" />
+					<core:outputCountrySelector id="country" value="#{contactController.country}" />
 				</div>
 			</h:panelGroup>
 
@@ -163,13 +171,13 @@
 				</div>
 
 				<div class="table-right-medium">
-					<widgets:outputCountrySelector styleClass="select divider-right" id="landLineCountry" value="#{contactController.landLineCountry}" />
+					<core:outputCountrySelector styleClass="select" id="landLineCountry" value="#{contactController.landLineCountry}" />
 
-					<p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{contactController.landLineAreaCode}">
+					<p:inputText id="landLineAreaCode" size="5" maxlength="10" value="#{contactController.landLineAreaCode}">
 						<f:validator validatorId="PhoneNumberValidator" />
 					</p:inputText>
 
-					<p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{contactController.landLineNumber}">
+					<p:inputText id="landLineNumber" size="10" maxlength="20" value="#{contactController.landLineNumber}">
 						<f:validator validatorId="PhoneNumberValidator" />
 					</p:inputText>
 				</div>
@@ -189,13 +197,13 @@
 				</div>
 
 				<div class="table-right-medium">
-					<widgets:outputCountrySelector styleClass="select divider-right" id="faxCountry" value="#{contactController.faxCountry}" />
+					<core:outputCountrySelector styleClass="select" id="faxCountry" value="#{contactController.faxCountry}" />
 
-					<p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
+					<p:inputText id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
 						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
 					</p:inputText>
 
-					<p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{contactController.faxNumber}">
+					<p:inputText id="faxNumber" size="10" maxlength="20" value="#{contactController.faxNumber}">
 						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
 					</p:inputText>
 				</div>
@@ -209,17 +217,37 @@
 				<p:message for="faxNumber" />
 			</h:panelGroup>
 
-			<widgets:outputMobileNumberTableRow targetController="#{contactController}" labelMessage="#{msg.PERSONAL_DATA_MOBILE_NUMBER}" />
+			<p:outputLabel for="mobileNumber" value="#{msg.PERSONAL_DATA_MOBILE_NUMBER}" />
+			<core:inputMobileNumberPanelGrid targetController="#{contactController}" />
 		</fieldset>
 	</h:panelGroup>
 
-	<h:panelGroup styleClass="para" layout="block" rendered="#{userController.isPublicUserProfileEnabled()}">
+	<h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('public_user_profile')}">
 		<fieldset class="fieldset">
 			<legend title="#{msg.USER_PROFILE_LEGEND_TITLE}">
 				<h:outputText value="#{msg.USER_PROFILE_LEGEND}" />
 			</legend>
 
-			<widgets:outputProfileModeTableRow targetController="#{userController}" labelMessage="#{msg.USER_PROFILE_MODE}" />
+			<h:panelGroup styleClass="table-row" layout="block">
+				<p:outputLabel for="profileMode" value="#{msg.USER_PROFILE_MODE}" />
+
+				<p:selectOneMenu
+					id="profileMode"
+					value="#{targetController.userProfileMode}"
+					filter="true"
+					filterMatchMode="contains"
+					>
+
+					<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
+
+					<f:selectItems
+						value="#{dataController.profileModes}"
+						var="profileMode"
+						itemValue="#{profileMode}"
+						itemLabel="#{msg[profileMode.messageKey]}"
+						/>
+				</p:selectOneMenu>
+			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="para notice">
diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl
index 16077409..93d35583 100644
--- a/web/WEB-INF/templates/guest/guest_base.tpl
+++ b/web/WEB-INF/templates/guest/guest_base.tpl
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
-	template="/WEB-INF/templates/base.tpl"
+	template="/WEB-INF/templates/master.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="title">
-		<ui:insert name="guest_title">
+	<ui:define name="document_title">
+		<ui:insert name="document_guest_title">
 			<h:outputText value="Default guest title" />
 		</ui:insert>
 	</ui:define>
diff --git a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
index da53f249..f463d497 100644
--- a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
+++ b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
@@ -2,9 +2,11 @@
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:validator="http://mxchange.org/jsf/core/validators"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<h:panelGroup styleClass="table-row" layout="block">
 		<div class="table-left-medium">
@@ -12,8 +14,8 @@
 		</div>
 
 		<div class="table-right-medium">
-			<p:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{contactController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
-				<f:validator validatorId="EmailAddressValidator" />
+			<p:inputText id="emailAddress" size="20" maxlength="255" value="#{contactController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+				<validator:emailAddressValidator />
 			</p:inputText>
 		</div>
 	</h:panelGroup>
@@ -28,7 +30,7 @@
 		</div>
 
 		<div class="table-right-medium">
-			<p:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
+			<p:inputText id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
 		</div>
 	</h:panelGroup>
 
diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl
index 5c3306cb..079611b6 100644
--- a/web/WEB-INF/templates/guest/guest_footer.tpl
+++ b/web/WEB-INF/templates/guest/guest_footer.tpl
@@ -4,35 +4,56 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<div class="footer">
 		<ul class="navbar-horizontal">
 			<li class="navlink-horizontal">
-				<p:link outcome="index" title="#{msg.LINK_GUEST_HOME_TITLE}" value="#{msg.LINK_GUEST_HOME}" />
+				<p:link
+					outcome="index"
+					value="#{msg.GUEST_LINK_HOME}"
+					title="#{msg.GUEST_LINK_HOME_TITLE}"
+					/>
 			</li>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
 				<li class="navlink-horizontal">
-					<p:link outcome="user_resend_link" title="#{msg.LINK_GUEST_RESEND_LINK_TITLE}" value="#{msg.LINK_GUEST_RESEND_LINK}" />
+					<p:link
+						outcome="user_resend_link"
+						value="#{msg.GUEST_LINK_RESEND_LINK}"
+						title="#{msg.GUEST_LINK_RESEND_LINK_TITLE}"
+						/>
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('imprint')}">
 				<li class="navlink-horizontal">
-					<p:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" />
+					<p:link
+						outcome="imprint"
+						value="#{msg.GUEST_LINK_IMPRINT}"
+						title="#{msg.GUEST_LINK_IMPRINT_TITLE}"
+						/>
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('terms')}">
 				<li class="navlink-horizontal">
-					<p:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" />
+					<p:link
+						outcome="terms"
+						value="#{msg.GUEST_LINK_TERMS}"
+						title="#{msg.GUEST_LINK_TERMS_TITLE}"
+						/>
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('privacy')}">
 				<li class="navlink-horizontal">
-					<p:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" />
+					<p:link
+						outcome="privacy"
+						value="#{msg.GUEST_LINK_PRIVACY}"
+						title="#{msg.GUEST_LINK_PRIVACY_TITLE}"
+						/>
 				</li>
 			</ui:fragment>
 
diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl
index 90a009b4..61136ff4 100644
--- a/web/WEB-INF/templates/guest/guest_menu.tpl
+++ b/web/WEB-INF/templates/guest/guest_menu.tpl
@@ -4,7 +4,8 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<div class="menu_outer">
 		<h:panelGroup styleClass="menu" layout="block">
@@ -14,7 +15,11 @@
 
 			<ul>
 				<li>
-					<p:link title="#{msg.LINK_GUEST_HOME_TITLE}" outcome="index" value="#{msg.LINK_GUEST_HOME}" />
+					<p:link
+						outcome="index"
+						value="#{msg.GUEST_LINK_HOME}"
+						title="#{msg.GUEST_LINK_HOME_TITLE}"
+						/>
 				</li>
 			</ul>
 
@@ -25,25 +30,41 @@
 			<ul>
 				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 					<li>
-						<p:link title="#{msg.LINK_GUEST_LOGIN_TITLE}" outcome="user_login" value="#{msg.LINK_GUEST_LOGIN}" />
+						<p:link
+							outcome="user_login"
+							value="#{msg.GUEST_LINK_LOGIN}"
+							title="#{msg.GUEST_LOGIN_LINK_TITLE}"
+							/>
 					</li>
 				</ui:fragment>
 
 				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration')}">
 					<li>
-						<p:link title="#{msg.LINK_GUEST_REGISTER_TITLE}" outcome="user_register" value="#{msg.LINK_GUEST_REGISTER}" />
+						<p:link
+							outcome="user_register"
+							value="#{msg.GUEST_LINK_REGISTER}"
+							title="#{msg.GUEST_LINK_REGISTER_TITLE}"
+							/>
 					</li>
 				</ui:fragment>
 
 				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
 					<li>
-						<p:link title="#{msg.LINK_GUEST_PASSWORD_TITLE}" outcome="user_lost_password" value="#{msg.LINK_GUEST_PASSWORD}" />
+						<p:link
+							outcome="user_lost_password"
+							value="#{msg.GUEST_LINK_PASSWORD}"
+							title="#{msg.GUEST_LINK_PASSWORD_TITLE}"
+							/>
 					</li>
 				</ui:fragment>
 
 				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
 					<li>
-						<p:link title="#{msg.LINK_GUEST_RESEND_LINK_TITLE}" outcome="user_resend_link" value="#{msg.LINK_GUEST_RESEND_LINK}" />
+						<p:link
+							outcome="user_resend_link"
+							value="#{msg.GUEST_LINK_RESEND_LINK}"
+							title="#{msg.GUEST_LINK_RESEND_LINK_TITLE}"
+							/>
 					</li>
 				</ui:fragment>
 			</ul>
diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
index 80e67acd..f57ca4a7 100644
--- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
+++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
@@ -4,7 +4,8 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<h:panelGroup styleClass="para" layout="block">
 		<fieldset class="fieldset">
@@ -23,7 +24,11 @@
 					<!-- @TODO Find something better //-->
 					<h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_1}" />
 					<h:outputText value="&#160;" />
-					<p:link outcome="privacy" target="_blank" value="#{msg.LINK_GUEST_PRIVACY_STATEMENTS}" />
+					<p:link
+						outcome="privacy"
+						target="_blank"
+						value="#{msg.GUEST_LINK_PRIVACY_STATEMENTS}"
+						/>
 					<h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2}" />
 				</div>
 			</h:panelGroup>
@@ -43,7 +48,11 @@
 					<!-- @TODO Find something better //-->
 					<h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_1}" />
 					<h:outputText value="&#160;" />
-					<p:link outcome="terms" target="_blank" value="#{msg.LINK_GUEST_TERMS_CONDITIONS}" />
+					<p:link
+						outcome="terms"
+						target="_blank"
+						value="#{msg.GUEST_LINK_TERMS_CONDITIONS}"
+						/>
 					<h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2}" />
 				</div>
 			</h:panelGroup>
diff --git a/web/WEB-INF/templates/guest/user/guest_login_form.tpl b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
index 185c785a..ce1f7f28 100644
--- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -4,10 +4,11 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<h:panelGroup id="user_login_content" layout="block" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-		<h:form id="form_user_login">
+		<h:form>
 			<h:panelGroup styleClass="table" layout="block">
 				<div class="table-header">
 					<h:outputText value="#{msg.GUEST_ENTER_USER_LOGIN_DATA_TITLE}" />
@@ -24,7 +25,7 @@
 						</div>
 
 						<div class="table-right">
-							<p:inputText styleClass="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
+							<p:inputText id="userName" value="#{userLoginController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
 						</div>
 					</h:panelGroup>
 
@@ -38,7 +39,7 @@
 						</div>
 
 						<div class="table-right">
-							<p:inputText type="secret" styleClass="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
+							<p:inputText type="secret" id="userPassword" value="#{userLoginController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
 						</div>
 					</h:panelGroup>
 
@@ -47,10 +48,18 @@
 					</h:panelGroup>
 				</fieldset>
 
-				<div class="table-footer">
-					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<p:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
-				</div>
+				<p:panelGrid columns="2" layout="grid">
+					<p:commandButton
+						type="reset"
+						value="#{msg.BUTTON_RESET_FORM}"
+						/>
+
+					<p:commandButton
+						type="submit"
+						action="#{userLoginController.doUserLogin()}"
+						value="#{msg.BUTTON_USER_LOGIN}"
+						/>
+				</p:panelGrid>
 			</h:panelGroup>
 		</h:form>
 
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
index eaa13ad3..23c7b37e 100644
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
@@ -4,10 +4,11 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
-	<h:form id="form_register_page1" rendered="#{featureController.isFeatureEnabled('user_registration')}">
-		<h:panelGroup styleClass="table table-medium" layout="block">
+	<h:form rendered="#{featureController.isFeatureEnabled('user_registration')}">
+		<h:panelGroup layout="block">
 			<div class="table-header">
 				<h:outputText value="#{msg.GUEST_REGISTRATION_PAGE1_TITLE}" />
 			</div>
@@ -25,7 +26,14 @@
 							</div>
 
 							<div class="table-right-medium">
-								<p:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
+								<p:inputText
+									id="userName"
+									size="20"
+									maxlength="255"
+									value="#{userRegistrationController.userName}"
+									required="true"
+									requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}"
+									/>
 							</div>
 						</h:panelGroup>
 
@@ -45,7 +53,7 @@
 							</div>
 
 							<div class="table-right-medium">
-								<p:inputText type="secret" styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_NOT_ENTERED}" />
+								<p:inputText type="secret" id="userPassword" size="10" maxlength="255" value="#{userRegistrationController.userPassword}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_NOT_ENTERED}" />
 							</div>
 						</h:panelGroup>
 
@@ -59,7 +67,7 @@
 							</div>
 
 							<div class="table-right-medium">
-								<p:inputText type="secret" styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED}" />
+								<p:inputText type="secret" id="userPasswordRepeat" size="10" maxlength="255" value="#{userRegistrationController.userPasswordRepeat}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED}" />
 							</div>
 						</h:panelGroup>
 
@@ -84,10 +92,18 @@
 
 			<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.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_continue_register_page1" value="#{msg.BUTTON_CONTINUE_REGISTER_PAGE2}" action="#{userRegistrationController.doRegisterMultiPage1()}" />
-			</div>
+			<p:panelGrid columns="2" layout="grid">
+				<p:commandButton
+					type="reset"
+					value="#{msg.BUTTON_RESET_FORM}"
+					/>
+
+				<p:commandButton
+					type="submit"
+					value="#{msg.BUTTON_CONTINUE_REGISTER_PAGE2}"
+					action="#{userRegistrationController.doRegisterMultiPage1()}"
+					/>
+			</p:panelGrid>
 		</h:panelGroup>
 	</h:form>
 </ui:composition>
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
index 547442b8..5bdccf1b 100644
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
@@ -4,20 +4,31 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
-	<h:form id="form_register_page2" rendered="#{featureController.isFeatureEnabled('user_registration')}">
-		<h:panelGroup styleClass="table table-medium" layout="block">
+	<h:form rendered="#{featureController.isFeatureEnabled('user_registration')}">
+		<h:panelGroup layout="block">
 			<div class="table-header">
 				<h:outputText value="#{msg.GUEST_REGISTRATION_PAGE2_TITLE}" />
 			</div>
 
-			<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
+			<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl">
+				<ui:param name="targetController" value="#{userRegistrationController}" />
+			</ui:include>
 
-			<div class="table-footer">
-				<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-				<p:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{userRegistrationController.doFinishRegistration()}" />
-			</div>
+			<p:panelGrid columns="2" layout="grid">
+				<p:commandButton
+					type="reset"
+					value="#{msg.BUTTON_RESET_FORM}"
+					/>
+
+				<p:commandButton
+					type="submit"
+					value="#{msg.BUTTON_FINISH_REGISTRATION}"
+					action="#{userRegistrationController.doFinishRegistration()}"
+					/>
+			</p:panelGrid>
 		</h:panelGroup>
 	</h:form>
 </ui:composition>
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
index 312208e1..98cec771 100644
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
@@ -4,15 +4,18 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
-	<h:form id="form_register_single" rendered="#{featureController.isFeatureEnabled('user_registration')}">
-		<h:panelGroup styleClass="table table-medium" layout="block">
+	<h:form rendered="#{featureController.isFeatureEnabled('user_registration')}">
+		<h:panelGroup layout="block">
 			<div class="table-header">
 				<h:outputText value="#{msg.GUEST_REGISTRATION_TITLE}" />
 			</div>
 
-			<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
+			<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl">
+				<ui:param name="targetController" value="#{userRegistrationController}" />
+			</ui:include>
 
 			<div class="para">
 				<fieldset class="fieldset">
@@ -27,7 +30,14 @@
 							</div>
 
 							<div class="table-right">
-								<p:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
+								<p:inputText
+									id="userName"
+									size="20"
+									maxlength="255"
+									value="#{userRegistrationController.userName}"
+									required="true"
+									requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}"
+									/>
 							</div>
 						</h:panelGroup>
 
@@ -47,7 +57,7 @@
 							</div>
 
 							<div class="table-right">
-								<p:inputText type="secret" styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" />
+								<p:inputText type="secret" id="userPassword" size="10" maxlength="255" value="#{userRegistrationController.userPassword}" />
 							</div>
 						</h:panelGroup>
 
@@ -61,7 +71,7 @@
 							</div>
 
 							<div class="table-right">
-								<p:inputText type="secret" styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" />
+								<p:inputText type="secret" id="userPasswordRepeat" size="10" maxlength="255" value="#{userRegistrationController.userPasswordRepeat}" />
 							</div>
 						</h:panelGroup>
 
@@ -88,10 +98,18 @@
 
 			<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.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_finish_registration_single" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{userRegistrationController.doFinishRegistration()}" />
-			</div>
+			<p:panelGrid columns="2" layout="grid">
+				<p:commandButton
+					type="reset"
+					value="#{msg.BUTTON_RESET_FORM}"
+					/>
+
+				<p:commandButton
+					type="submit"
+					value="#{msg.BUTTON_FINISH_REGISTRATION}"
+					action="#{userRegistrationController.doFinishRegistration()}"
+					/>
+			</p:panelGrid>
 		</h:panelGroup>
 	</h:form>
 </ui:composition>
diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index 510d485e..faab2b41 100644
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -1,21 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
-	template="/WEB-INF/templates/base.tpl"
+	template="/WEB-INF/templates/master.tpl"
 	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 	xmlns:h="http://xmlns.jcp.org/jsf/html">
 
-	<ui:define name="title">
+	<ui:define name="document_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_AREA} - " />
 
-		<ui:insert name="login_title">
+		<ui:insert name="document_login_title">
 			<h:outputText value="Default login title" />
 		</ui:insert>
 	</ui:define>
 
 	<ui:define name="menu">
-		<widgets:outputMessageBox id="error-guest-forbidden" message="#{msg.USER_NOT_LOGGED_IN}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{not userLoginController.isUserLoggedIn()}" />
+		<core:outputMessageBox
+			panelGroupId="errorGuestForbidden"
+			message="#{msg.USER_NOT_LOGGED_IN}"
+			boxStyleClass="message-full"
+			messageStyleClass="alert-danger"
+			rendered="#{not userLoginController.isUserLoggedIn()}"
+			/>
 
 		<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
 			<ui:include src="/WEB-INF/templates/login/user/user_menu.tpl" />
diff --git a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
index 1ba2c6ea..069004db 100644
--- a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
+++ b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
@@ -2,10 +2,11 @@
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:validator="http://mxchange.org/jsf/core/validators"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
-
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<h:panelGroup styleClass="table-row" layout="block">
 		<div class="table-left">
@@ -14,7 +15,7 @@
 
 		<div class="table-right">
 			<p:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{userEmailChangeController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
-				<f:validator validatorId="EmailAddressValidator" />
+				<validator:emailAddressValidator />
 			</p:inputText>
 		</div>
 	</h:panelGroup>
diff --git a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
index 4d923ccc..81ad613f 100644
--- a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
+++ b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
@@ -4,7 +4,8 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<h:panelGroup styleClass="para" layout="block">
 		<fieldset class="fieldset">
@@ -18,8 +19,8 @@
 				</div>
 
 				<div class="table-right">
-					<p:inputText type="secret" styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.userCurrentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
-						<!-- <f:validator for="currentPassword" validatorId="AddressbookUserPasswordValidator" /> //-->
+					<p:inputText type="secret" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.userCurrentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
+						<!-- <f:validator for="currentPassword" validatorId="FinancialsUserPasswordValidator" /> //-->
 					</p:inputText>
 				</div>
 			</h:panelGroup>
diff --git a/web/WEB-INF/templates/login/user/user_footer.tpl b/web/WEB-INF/templates/login/user/user_footer.tpl
index 652bae5b..0ae95d58 100644
--- a/web/WEB-INF/templates/login/user/user_footer.tpl
+++ b/web/WEB-INF/templates/login/user/user_footer.tpl
@@ -4,29 +4,46 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<div class="footer">
 		<ul class="navbar-horizontal">
 			<li class="navlink-horizontal">
-				<p:link outcome="login_index" title="#{msg.LINK_LOGIN_HOME_TITLE}" value="#{msg.LINK_LOGIN_HOME}" />
+				<p:link
+					outcome="login_index"
+					value="#{msg.LOGIN_LINK_HOME}"
+					title="#{msg.LOGIN_LINK_HOME_TITLE}"
+					/>
 			</li>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('imprint')}">
 				<li class="navlink-horizontal">
-					<p:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" />
+					<p:link
+						outcome="imprint"
+						value="#{msg.GUEST_LINK_IMPRINT}"
+						title="#{msg.GUEST_LINK_IMPRINT_TITLE}"
+						/>
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('terms')}">
 				<li class="navlink-horizontal">
-					<p:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" />
+					<p:link
+						outcome="terms"
+						value="#{msg.GUEST_LINK_TERMS}"
+						title="#{msg.GUEST_LINK_TERMS_TITLE}"
+						/>
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('privacy')}">
 				<li class="navlink-horizontal">
-					<p:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" />
+					<p:link
+						outcome="privacy"
+						value="#{msg.GUEST_LINK_PRIVACY}"
+						title="#{msg.GUEST_LINK_PRIVACY_TITLE}"
+						/>
 				</li>
 			</ui:fragment>
 
diff --git a/web/WEB-INF/templates/login/user/user_menu.tpl b/web/WEB-INF/templates/login/user/user_menu.tpl
index b29e1adb..43e4cb62 100644
--- a/web/WEB-INF/templates/login/user/user_menu.tpl
+++ b/web/WEB-INF/templates/login/user/user_menu.tpl
@@ -4,7 +4,8 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<div class="menu_outer">
 		<h:panelGroup styleClass="menu" layout="block">
@@ -14,16 +15,28 @@
 
 			<ul>
 				<li>
-					<p:link title="#{msg.LINK_LOGIN_HOME_TITLE}" outcome="user_index" value="#{msg.LINK_LOGIN_HOME}" />
+					<p:link
+						outcome="user_index"
+						value="#{msg.LOGIN_LINK_HOME}"
+						title="#{msg.LOGIN_LINK_HOME_TITLE}"
+						/>
 				</li>
 
 				<li>
-					<p:link title="#{msg.LINK_USER_LIST_TITLE}" outcome="user_list" value="#{msg.LINK_USER_LIST}" />
+					<p:link
+						outcome="user_list"
+						value="#{msg.LINK_USER_LIST}"
+						title="#{msg.LINK_USER_LIST_TITLE}"
+						/>
 				</li>
 
 				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_list')}">
 					<li>
-						<p:link title="#{msg.LINK_USER_LIST_TITLE}" outcome="user_list" value="#{msg.LINK_USER_LIST}" />
+						<p:link
+							outcome="user_list"
+							value="#{msg.LINK_USER_LIST}"
+							title="#{msg.LINK_USER_LIST_TITLE}"
+							/>
 					</li>
 				</ui:fragment>
 			</ul>
@@ -36,19 +49,31 @@
 				<ul>
 					<ui:fragment rendered="#{featureController.isFeatureEnabled('change_user_personal_data')}">
 						<li>
-							<p:link title="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_change_personal_data" value="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA}" />
+							<p:link
+								outcome="login_change_personal_data"
+								value="#{msg.LOGIN_LINK_CHANGE_PERSONAL_DATA}"
+								title="#{msg.LOGIN_LINK_CHANGE_PERSONAL_DATA_TITLE}"
+								/>
 						</li>
 					</ui:fragment>
 
 					<ui:fragment rendered="#{featureController.isFeatureEnabled('user_change_email_address')}">
 						<li>
-							<p:link title="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_change_email_address" value="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
+							<p:link
+								outcome="login_change_email_address"
+								value="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS}"
+								title="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS_TITLE}"
+								/>
 						</li>
 					</ui:fragment>
 
 					<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword() or featureController.isFeatureEnabled('change_user_password')}">
 						<li>
-							<p:link title="#{msg.LINK_LOGIN_CHANGE_PASSWORD_TITLE}" outcome="user_change_password" value="#{msg.LINK_LOGIN_CHANGE_PASSWORD}" />
+							<p:link
+								outcome="user_change_password"
+								value="#{msg.LOGIN_LINK_CHANGE_PASSWORD}"
+								title="#{msg.LOGIN_LINK_CHANGE_PASSWORD_TITLE}"
+								/>
 						</li>
 					</ui:fragment>
 				</ul>
@@ -60,7 +85,11 @@
 
 			<ul>
 				<li>
-					<p:link title="#{msg.LINK_LOGIN_ALL_APPLICATIONS_TITLE}" outcome="user_all_applications" value="#{msg.LINK_LOGIN_ALL_APPLICATIONS}" />
+					<p:link
+						outcome="user_all_applications"
+						value="#{msg.LOGIN_LINK_ALL_APPLICATIONS}"
+						title="#{msg.LOGIN_LINK_ALL_APPLICATIONS_TITLE}"
+						/>
 				</li>
 			</ul>
 
@@ -70,11 +99,19 @@
 
 			<ul>
 				<li>
-					<p:link title="#{msg.LINK_GUEST_HOME_TITLE}" outcome="index" value="#{msg.LINK_GUEST_HOME}" />
+					<p:link
+						outcome="index"
+						value="#{msg.GUEST_LINK_HOME}"
+						title="#{msg.GUEST_LINK_HOME_TITLE}"
+						/>
 				</li>
 
 				<li>
-					<p:link title="#{msg.LINK_CLOSE_SESSION_TITLE}" outcome="logout" value="#{msg.LINK_CLOSE_SESSION}" />
+					<p:link
+						outcome="logout"
+						value="#{msg.LINK_CLOSE_SESSION}"
+						title="#{msg.LINK_CLOSE_SESSION_TITLE}"
+						/>
 				</li>
 			</ul>
 		</h:panelGroup>
diff --git a/web/WEB-INF/templates/master.tpl b/web/WEB-INF/templates/master.tpl
new file mode 100644
index 00000000..9575f146
--- /dev/null
+++ b/web/WEB-INF/templates/master.tpl
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui"
+	>
+	<h:doctype
+		rootElement="html"
+		public="-//W3C//DTD XHTML 1.0 Transitional//EN"
+		system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
+		/>
+
+	<html
+		lang="#{localizationController.locale.language}"
+		xml:lang="#{localizationController.locale.language}"
+		xmlns="http://www.w3.org/1999/xhtml"
+		>
+		<ui:insert name="metadata" />
+
+		<f:view locale="#{localizationController.locale}" />
+
+		<h:head>
+			<f:facet name="first">
+				<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+				<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+				<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0"/>
+				<meta name="apple-mobile-web-app-capable" content="yes" />
+			</f:facet>
+
+			<f:loadBundle var="msg" basename="org.mxchange.localization.generic" />
+			<f:loadBundle var="product" basename="org.mxchange.localization.product" />
+			<f:loadBundle var="project" basename="org.mxchange.localization.project" />
+			<f:loadBundle var="local" basename="org.mxchange.localization.local" />
+
+			<h:outputStylesheet name="/css/custom.css" />
+
+			<title>
+				<h:outputText value="#{initParam['project_title']} - " />
+
+				<ui:insert name="document_title">
+					<h:outputText value="Default document title" />
+				</ui:insert>
+			</title>
+		</h:head>
+
+		<h:body>
+			<h:panelGroup styleClass="ui-fluid" layout="block">
+				<h:panelGroup styleClass="page-header" layout="block">
+					<p:outputPanel styleClass="ui-g">
+						<p:outputPanel styleClass="ui-g-12 ui-md-9 ui-g-nopad">
+							<h1>
+								<h:outputText value="#{initParam['project_title']} - " />
+
+								<ui:insert name="content_header">
+									<h:outputText value="Default header title" />
+								</ui:insert>
+							</h1>
+						</p:outputPanel>
+
+						<p:outputPanel styleClass="ui-g-12 ui-md-3">
+							<ui:include src="/WEB-INF/templates/widgets/locale_change_widget.tpl" />
+						</p:outputPanel>
+					</p:outputPanel>
+				</h:panelGroup>
+
+				<h:panelGroup styleClass="page-content-gap" layout="block">
+				</h:panelGroup>
+
+				<h:panelGroup styleClass="ui-g" layout="block">
+					<h:panelGroup styleClass="ui-g-12 ui-md-12" layout="block">
+						<ui:insert name="menu">
+							<h:outputText value="Default menu" />
+						</ui:insert>
+					</h:panelGroup>
+
+					<h:panelGroup styleClass="ui-g-12 ui-md-12 ui-g-nopad" layout="block">
+						<h:panelGroup styleClass="ui-g-12">
+							<ui:insert name="content">
+								<h:outputText value="Default content" />
+							</ui:insert>
+						</h:panelGroup>
+					</h:panelGroup>
+
+					<h:panelGroup styleClass="ui-g-12 page-footer" layout="block">
+						<ui:insert name="footer">
+							<h:outputText value="Default footer" />
+						</ui:insert>
+					</h:panelGroup>
+				</h:panelGroup>
+
+				<h:panelGroup styleClass="error-container" layout="block">
+					<p:growl showDetail="true" sticky="true">
+						<p:autoUpdate />
+					</p:growl>
+
+					<p:ajaxExceptionHandler
+						type="java.lang.Throwable"
+						update="exceptionDialog"
+						onexception="PF('master:exception-dialog-form:exceptionDialog').show();"
+						/>
+
+					<h:form id="exception-dialog-form">
+						<p:dialog
+							id="exceptionDialog"
+							closable="true"
+							closeOnEscape="true"
+							header="Exception '#{pfExceptionHandler.type}' occured!"
+							widgetVar="exceptionDialog"
+							height="500px">
+							<div class="para">
+								<h:outputText value="#{msg.EXCEPTION_MESSAGE}:" />
+								<h:outputText value="#{pfExceptionHandler.message}" />
+							</div>
+
+							<div class="para">
+								<h:outputText value="#{msg.EXCEPTION_STACK_TRACE}:" />
+								<h:outputText value="#{pfExceptionHandler.formattedStackTrace}" escape="false" />
+							</div>
+
+							<div class="para">
+								<p:button onclick="window.location.href = document.location.href;"
+										  value="#{msg.RELOAD_PAGE}"
+										  rendered="#{pfExceptionHandler.type == 'javax.faces.application.ViewExpiredException'}" />
+							</div>
+						</p:dialog>
+					</h:form>
+				</h:panelGroup>
+			</h:panelGroup>
+		</h:body>
+	</html>
+</ui:composition>
diff --git a/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl b/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl
new file mode 100644
index 00000000..71a17eb4
--- /dev/null
+++ b/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<fieldset class="fieldset">
+		<legend title="#{project.LOGIN_RECEIPT_BASIC_LEGEND_TITLE}">
+			<h:outputText value="#{project.LOGIN_RECEIPT_BASIC_LEGEND}" />
+		</legend>
+
+		<p:panelGrid
+			layout="grid"
+			columns="2"
+			columnClasses="ui-grid-col-4,ui-grid-col-8"
+			>
+			<p:outputLabel for="branchOffice" value="#{project.LOGIN_SELECT_BRANCH_OFFICE}" />
+			<p:selectOneMenu
+				id="branchOffice"
+				value="#{receiptController.receiptBranchOffice}"
+				filter="true"
+				filterMatchMode="contains"
+				required="true"
+				requiredMessage="#{msg.LOGIN_BRANCH_OFFICE_REQUIRED}"
+				>
+
+				<f:converter converterId="BranchOfficeConverter" />
+
+				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
+
+				<f:selectItems
+					value="#{branchOfficeListController.allBranchOffices}"
+					var="branchOffice"
+					itemValue="#{branchOffice}"
+					itemLabel="#{beanHelper.renderBranchOffice(branchOffice, false)}"
+					/>
+			</p:selectOneMenu>
+			<p:message for="branchOffice" />
+
+			<p:outputLabel for="receiptIssued" value="#{project.ENTER_RECEIPT_ISSUE_DATE}" />
+			<p:calendar
+				id="receiptIssued"
+				value="#{receiptController.receiptIssued}"
+				required="true"
+				requiredMessage="#{project.LOGIN_RECEIPT_ISSUE_DATE_REQUIRED}"
+				pattern="#{msg.DATE_PATTERN}"
+				navigator="true"
+				maskAutoClear="true"
+				title="#{project.LOGIN_RECEIPT_DATE_OF_ISSUE_TITLE}"
+				/>
+			<p:message for="receiptIssued" />
+
+			<p:outputLabel for="receiptPaymentType" value="#{project.LOGIN_SELECT_PAYMENT_TYPE}" />
+			<p:selectOneMenu
+				id="receiptPaymentType"
+				value="#{receiptController.receiptPaymentType}"
+				filter="true"
+				filterMatchMode="contains"
+				required="true"
+				requiredMessage="#{msg.FIELD_PAYMENT_TYPE_REQUIRED}"
+				>
+
+				<f:converter converterId="PaymentTypeConverter" />
+
+				<f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
+
+				<f:selectItems
+					value="#{dataController.paymentTypes}"
+					var="receiptPaymentType"
+					itemValue="#{paymentType}"
+					itemLabel="#{msg[paymentType.messageKey]}"
+					/>
+			</p:selectOneMenu>
+			<p:message for="receiptPaymentType" />
+
+			<p:outputLabel for="receiptSellerEmployee" value="#{msg.LOGIN_SELECT_SELLER_EMPLOYEE}" />
+			<p:selectOneMenu
+				id="receiptSellerEmployee"
+				value="#{receiptController.receiptSellerEmployee}"
+				filter="true"
+				filterMatchMode="contains"
+				>
+
+				<f:converter converterId="EmployeeConverter" />
+
+				<f:selectItem
+					itemValue="#{null}"
+					itemLabel="#{msg.NONE_SELECTED}"
+					/>
+
+				<f:selectItems
+					value="#{employeeListController.allEmployees}"
+					var="companyHeadquarter"
+					itemValue="#{companyEmployee}"
+					itemLabel="#{beanHelper.renderEmployee(companyEmployee, false)}"
+					/>
+			</p:selectOneMenu>
+			<p:message for="receiptSellerEmployee" />
+		</p:panelGrid>
+	</fieldset>
+
+	<fieldset class="fieldset">
+		<legend title="#{project.LOGIN_RECEIPT_OTHER_LEGEND_TITLE}">
+			<h:outputText value="#{project.LOGIN_RECEIPT_OTHER_LEGEND}" />
+		</legend>
+
+		<p:panelGrid
+			layout="grid"
+			columns="2"
+			columnClasses="ui-grid-col-4,ui-grid-col-8"
+			>
+			<p:outputLabel for="receiptNumber" value="#{project.RECEIPT_NUMBER_HEADER}" />
+			<p:inputText
+				id="receiptNumber"
+				size="20"
+				maxlength="20"
+				value="#{receiptController.receiptNumber}"
+				validatorMessage="#{project.ENTERED_RECEIPT_NUMBER_INVALID}"
+				/>
+
+			<p:outputLabel for="receiptRegisterNumber" value="#{project.RECEIPT_REGISTER_NUMBER}" />
+			<p:inputText
+				id="receiptRegisterNumber"
+				size="3"
+				maxlength="10"
+				value="#{receiptController.receiptRegisterNumber}"
+				validatorMessage="#{project.ENTERED_RECEIPT_REGISTER_NUMBER_INVALID}"
+				>
+				<f:validateLongRange minimum="1" maximum="999" />
+			</p:inputText>
+
+			<p:outputLabel for="receiptBarCodeNumber" value="#{project.RECEIPT_BARCODE_NUMBER}" />
+			<p:inputText id="receiptBarCodeNumber" size="24" maxlength="24" value="#{receiptController.receiptBarCodeNumber}" />
+		</p:panelGrid>
+	</fieldset>
+</ui:composition>
diff --git a/web/WEB-INF/templates/widgets/locale_change_widget.tpl b/web/WEB-INF/templates/widgets/locale_change_widget.tpl
index e883f74d..f9ca568d 100644
--- a/web/WEB-INF/templates/widgets/locale_change_widget.tpl
+++ b/web/WEB-INF/templates/widgets/locale_change_widget.tpl
@@ -4,18 +4,37 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui"
+	>
 
 	<h:form>
-		<h:panelGroup layout="block" styleClass="locale_selection_container">
-			<h:panelGroup layout="block">
-				<p:selectOneMenu value="#{localizationController.localeCode}" onchange="submit()">
-					<f:selectItem itemLabel="#{msg.SELECT_LANGUAGE}" noSelectionOption="true" itemDisabled="true" />
-					<f:selectItems value="#{localizationController.supportedLocales}" var="locale" itemValue="#{locale}" itemLabel="#{msg[locale.toString().toUpperCase()]}" />
+		<p:outputPanel styleClass="ui-g">
+			<p:outputPanel styleClass="ui-g-12 ui-md-6">
+				<p:selectOneMenu value="#{localizationController.localeCode}">
+					<f:selectItem
+						itemLabel="#{msg.SELECT_LANGUAGE}"
+						noSelectionOption="true"
+						itemDisabled="true"
+						/>
+
+					<f:selectItems
+						value="#{localizationController.supportedLocales}"
+						var="locale"
+						itemValue="#{locale}"
+						itemLabel="#{msg[locale.toString().toUpperCase()]}"
+						/>
 				</p:selectOneMenu>
-			</h:panelGroup>
+			</p:outputPanel>
 
-			<p:commandButton styleClass="submit" type="submit" actionListener="#{localizationController.doChangeLocale()}" value="#{msg.BUTTON_CHANGE_LOCALE}" title="#{msg.BUTTON_CHANGE_LOCALE_TITLE}" />
-		</h:panelGroup>
+			<p:outputPanel styleClass="ui-g-12 ui-md-6">
+				<p:commandButton
+					type="submit"
+					actionListener="#{localizationController.doChangeLocale()}"
+					value="#{msg.BUTTON_CHANGE_LOCALE}"
+					title="#{msg.BUTTON_CHANGE_LOCALE_TITLE}"
+					update="@all"
+					/>
+			</p:outputPanel>
+		</p:outputPanel>
 	</h:form>
 </ui:composition>
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 67fc9994..e9f63a1f 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -1,219 +1,244 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
-    <description>An online address book application to share private and business memebers between all members. It is also possible that the user's profile can be made visible to outside.</description>
-    <display-name>Addressbook Application v1.0</display-name>
-    <context-param>
-        <description>Name of this project.</description>
-        <param-name>project_title</param-name>
-        <param-value>Addressbook</param-value>
-    </context-param>
-    <context-param>
-        <description>Primefaces theme</description>
-        <param-name>primefaces.THEME</param-name>
-        <param-value>bootstrap</param-value>
-    </context-param>
-    <context-param>
-        <description>Refresh perioid</description>
-        <param-name>javax.faces.FACELETS_REFRESH_PERIOD</param-name>
-        <param-value>-1</param-value>
-    </context-param>
-    <context-param>
-        <description>State saving method</description>
-        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>client</param-value>
-    </context-param>
-    <context-param>
-        <description>Development mode for WELD, keep disabled unless really needed. Currently it messes up the website.</description>
-        <param-name>org.jboss.weld.development</param-name>
-        <param-value>false</param-value>
-    </context-param>
-    <context-param>
-        <description>Generic custom JSF tags library</description>
-        <param-name>javax.faces.FACELETS_LIBRARIES</param-name>
-        <param-value>/WEB-INF/widgets.jsf.taglib.xml;/WEB-INF/links.jsf.taglib.xml</param-value>
-    </context-param>
-    <context-param>
-        <description>Project stage</description>
-        <param-name>javax.faces.PROJECT_STAGE</param-name>
-        <param-value>Development</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether the date converter's default timezone is system's timezone.</description>
-        <param-name>javax.faces.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>All empty strings should be converted to null.</description>
-        <param-name>javax.faces.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether the multi-page registration page or a single registration page is active</description>
-        <param-name>is_feature_user_register_multiple_page_enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether a user name is required for this application.</description>
-        <param-name>is_feature_user_login_require_user_name_enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether "resend confirmation link" is enabled.</description>
-        <param-name>is_feature_user_resend_confirmation_link_enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether registration page is enabled.</description>
-        <param-name>is_feature_user_registration_enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether the guest menu is enabled/shown to the user.</description>
-        <param-name>is_feature_guest_menu_enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether recovery of user passwords is enabled.</description>
-        <param-name>is_feature_user_password_recovery_enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether the personal title is required for using the general contact controller.</description>
-        <param-name>is_feature_general_personal_title_enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether personal title is required for administrative contact controller.</description>
-        <param-name>is_feature_admin_personal_title_enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether users are allowed to edit their user data.</description>
-        <param-name>is_feature_user_edit_data_enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether the user list is accessible and visible.</description>
-        <param-name>is_feature_user_list_enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether imprint page is enabled.</description>
-        <param-name>is_feature_imprint_enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether terms page is enabled.</description>
-        <param-name>is_feature_terms_enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether privacy page is enabled.</description>
-        <param-name>is_feature_privacy_enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Feature: Users must change password after login (with current password). Administrators can enforce this.</description>
-        <param-name>is_feature_user_must_change_password_enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether users are allowed to change their login password.</description>
-        <param-name>is_feature_change_user_password_enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether users can change their email address.</description>
-        <param-name>is_feature_user_must_change_email_address_enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether user registration page is in index or own page.</description>
-        <param-name>is_feature_user_registration_in_index_enabled</param-name>
-        <param-value>false</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether user can leave both passwords empty on registration.</description>
-        <param-name>is_feature_allow_user_registration_empty_password_enabled</param-name>
-        <param-value>false</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether business contacts are used in this project.</description>
-        <param-name>is_feature_basic_company_data_enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Maximum passwords that must be different.</description>
-        <param-name>max_user_password_history</param-name>
-        <param-value>5</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether debugging of registration form is enabled.</description>
-        <param-name>is_debug_register_enabled</param-name>
-        <param-value>false</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether the public user profile is enabled. If this option is enabled, the setting "is_user_login_require_user_name" must also be enabled as it is mandadory.</description>
-        <param-name>is_public_profile_enabled</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Whether user names are required for completing registration.</description>
-        <param-name>is_user_login_require_user_name</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Minimum password score (default 50 may be to low)</description>
-        <param-name>min_user_password_score</param-name>
-        <param-value>50</param-value>
-    </context-param>
-    <servlet>
-        <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>pdf</servlet-name>
-        <servlet-class>org.mxchange.pizzaapplication.servlet.receipt.PizzaPdfReceiptServlet</servlet-class>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>Faces Servlet</servlet-name>
-        <url-pattern>/faces/*</url-pattern>
-    </servlet-mapping>
-    <mime-mapping>
-        <extension>tpl</extension>
-        <mime-type>text/plain</mime-type>
-    </mime-mapping>
-    <servlet-mapping>
-        <servlet-name>pdf</servlet-name>
-        <url-pattern>/customer/recipt.pdf</url-pattern>
-    </servlet-mapping>
-    <session-config>
-        <session-timeout>
-            30
-        </session-timeout>
-    </session-config>
-    <welcome-file-list>
-        <welcome-file>faces/index.xhtml</welcome-file>
-    </welcome-file-list>
-    <security-constraint>
-        <display-name>AdminConstraint</display-name>
-        <web-resource-collection>
-            <web-resource-name>admin</web-resource-name>
-            <description>Administrative Area</description>
-            <url-pattern>/faces/admin/*</url-pattern>
-        </web-resource-collection>
-        <auth-constraint>
-            <description>Administrative Area Login</description>
-            <role-name>admin</role-name>
-        </auth-constraint>
-    </security-constraint>
-    <login-config>
-        <auth-method>BASIC</auth-method>
-        <realm-name>file</realm-name>
-    </login-config>
-    <security-role>
-        <description>Administrative role</description>
-        <role-name>admin</role-name>
-    </security-role>
+	<description>An online address book application to share private and business memebers between all members. It is also possible that the user's profile can be made visible to outside.</description>
+	<display-name>Addressbook Application v1.0</display-name>
+	<context-param>
+		<description>Name of this project.</description>
+		<param-name>project_title</param-name>
+		<param-value>Addressbook</param-value>
+	</context-param>
+	<context-param>
+		<description>PrimeFaces theme</description>
+		<param-name>primefaces.THEME</param-name>
+		<param-value>bootstrap</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether PrimeFaces should collect all scripts and bundle it automatically.</description>
+		<param-name>primefaces.COLLECT_SCRIPTS</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Refresh period of facelets.</description>
+		<param-name>javax.faces.FACELETS_REFRESH_PERIOD</param-name>
+		<param-value>-1</param-value>
+	</context-param>
+	<context-param>
+		<description>Development mode for WELD, keep disabled unless really needed. Currently it messes up the website.</description>
+		<param-name>org.jboss.weld.development</param-name>
+		<param-value>false</param-value>
+	</context-param>
+	<context-param>
+		<description>Generic custom JSF tags library</description>
+		<param-name>javax.faces.FACELETS_LIBRARIES</param-name>
+		<param-value>/WEB-INF/widgets.jsf.taglib.xml;/WEB-INF/validators.jsf.taglib.xml;/WEB-INF/links.jsf.taglib.xml;/WEB-INF/project-links.jsf.taglib.xml;;/WEB-INF/product.jsf.taglib.xml</param-value>
+	</context-param>
+	<context-param>
+		<description>Project stage</description>
+		<param-name>javax.faces.PROJECT_STAGE</param-name>
+		<param-value>Development</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether the date converter's default timezone is system's timezone.</description>
+		<param-name>javax.faces.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>All empty strings should be converted to null.</description>
+		<param-name>javax.faces.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Bar-code type for products</description>
+		<param-name>product_barcode_type</param-name>
+		<param-value>ean13</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether the multi-page registration page or a single registration page is active</description>
+		<param-name>is_feature_user_register_multiple_page_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether a user name is required for this application.</description>
+		<param-name>is_feature_user_login_require_user_name_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether "resend confirmation link" is enabled.</description>
+		<param-name>is_feature_user_resend_confirmation_link_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether registration page is enabled.</description>
+		<param-name>is_feature_user_registration_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether the guest menu is enabled/shown to the user.</description>
+		<param-name>is_feature_guest_menu_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether the guest's index content is shown</description>
+		<param-name>is_feature_guest_index_content_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether recovery of user passwords is enabled.</description>
+		<param-name>is_feature_user_password_recovery_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether the personal title is required for using the general contact controller.</description>
+		<param-name>is_feature_general_personal_title_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether personal title is required for administrative contact controller.</description>
+		<param-name>is_feature_admin_personal_title_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether users are allowed to edit their user data.</description>
+		<param-name>is_feature_user_edit_data_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether the user list is accessible and visible.</description>
+		<param-name>is_feature_user_list_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether imprint page is enabled.</description>
+		<param-name>is_feature_imprint_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether terms page is enabled.</description>
+		<param-name>is_feature_terms_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether privacy page is enabled.</description>
+		<param-name>is_feature_privacy_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Feature: Users must change password after login (with current password). Administrators can enforce this.</description>
+		<param-name>is_feature_user_must_change_password_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether users are allowed to change their login password.</description>
+		<param-name>is_feature_change_user_password_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether users can change their email address.</description>
+		<param-name>is_feature_user_must_change_email_address_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether user registration page is in index or own page.</description>
+		<param-name>is_feature_user_registration_in_index_enabled</param-name>
+		<param-value>false</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether user can leave both passwords empty on registration. Then a random password will be created.</description>
+		<param-name>is_feature_allow_user_registration_empty_password_enabled</param-name>
+		<param-value>false</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether business contacts are used in this project.</description>
+		<param-name>is_feature_basic_data_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether company employees are used in this project. Maybe used in conjuction with business contacts only.</description>
+		<param-name>is_feature_company_employee_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether the public user profile is enabled. If this option is enabled, the setting "is_feature_user_login_require_username_enabled" must also be enabled as it is mandadory.</description>
+		<param-name>is_feature_public_user_profile_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether user names are required for completing registration.</description>
+		<param-name>is_feature_user_login_require_username_enabled</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<description>Maximum passwords that must be different.</description>
+		<param-name>max_user_password_history</param-name>
+		<param-value>5</param-value>
+	</context-param>
+	<context-param>
+		<description>Whether debugging of registration form is enabled.</description>
+		<param-name>is_debug_register_enabled</param-name>
+		<param-value>false</param-value>
+	</context-param>
+	<context-param>
+		<description>Minimum password score (default 50 may be to low)</description>
+		<param-name>min_user_password_score</param-name>
+		<param-value>50</param-value>
+	</context-param>
+	<context-param>
+		<description>Type of receipt barcode (see p:barcode)</description>
+		<param-name>receipt_barcode_type</param-name>
+		<param-value>codabar</param-value>
+	</context-param>
+	<context-param>
+		<description>Ignore menu items with only comments in it.</description>
+		<param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
+		<param-value>true</param-value>
+	</context-param>
+	<servlet>
+		<servlet-name>Faces Servlet</servlet-name>
+		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet>
+		<servlet-name>pdf</servlet-name>
+		<servlet-class>org.mxchange.pizzaapplication.servlet.receipt.PizzaPdfReceiptServlet</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>Faces Servlet</servlet-name>
+		<url-pattern>/faces/*</url-pattern>
+	</servlet-mapping>
+	<mime-mapping>
+		<extension>tpl</extension>
+		<mime-type>text/plain</mime-type>
+	</mime-mapping>
+	<servlet-mapping>
+		<servlet-name>pdf</servlet-name>
+		<url-pattern>/customer/recipt.pdf</url-pattern>
+	</servlet-mapping>
+	<session-config>
+		<session-timeout>
+			30
+		</session-timeout>
+	</session-config>
+	<welcome-file-list>
+		<welcome-file>faces/index.xhtml</welcome-file>
+	</welcome-file-list>
+	<security-constraint>
+		<display-name>AdminConstraint</display-name>
+		<web-resource-collection>
+			<web-resource-name>admin</web-resource-name>
+			<description>Administrative Area</description>
+			<url-pattern>/faces/admin/*</url-pattern>
+		</web-resource-collection>
+		<auth-constraint>
+			<description>Administrative Area Login</description>
+			<role-name>admin</role-name>
+		</auth-constraint>
+	</security-constraint>
+	<login-config>
+		<auth-method>BASIC</auth-method>
+		<realm-name>file</realm-name>
+	</login-config>
+	<security-role>
+		<description>Administrative role</description>
+		<role-name>admin</role-name>
+	</security-role>
 </web-app>
diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml
index 7393774d..6fd0bf4f 100644
--- a/web/admin/admin_logout.xhtml
+++ b/web/admin/admin_logout.xhtml
@@ -1,12 +1,14 @@
 <?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"
-				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="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOGOUT}" />
 	</ui:define>
 
@@ -15,7 +17,7 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:form id="form_admin_logout">
+		<h:form>
 			<h:panelGroup styleClass="table" layout="block">
 				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_LOGOUT_TITLE}" />
@@ -25,9 +27,13 @@
 					<h:outputText value="#{msg.ADMIN_LOGOUT_NOTICE}" />
 				</h:panelGroup>
 
-				<div class="table-footer">
-					<p:commandButton styleClass="submit" type="submit" action="#{userLoginController.doAdminLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
-				</div>
+				<p:panelGrid columns="2" layout="grid">
+					<p:commandButton
+						type="submit"
+						action="#{userLoginController.doAdminLogout()}"
+						value="#{msg.BUTTON_USER_LOGOUT}"
+						/>
+				</p:panelGrid>
 			</h:panelGroup>
 		</h:form>
 	</ui:define>
diff --git a/web/admin/basic_company_data/admin_basic_company_data_list.xhtml b/web/admin/basic_company_data/admin_basic_company_data_list.xhtml
deleted file mode 100644
index 82ea659d..00000000
--- a/web/admin/basic_company_data/admin_basic_company_data_list.xhtml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?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">
-		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_BASIC_COMPANY_DATA}" />
-	</ui:define>
-
-	<ui:define name="content_header">
-		<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_BASIC_COMPANY_DATA}" />
-	</ui:define>
-
-	<ui:define name="content">
-		<p:dataTable id="table_list_basic_company_data" var="basicData" value="#{basicDataController.allCompanyBasicData()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BASIC_COMPANY_DATA}" emptyMessage="#{msg.ADMIN_BASIC_COMPANY_DATA_LIST_EMPTY}">
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_ID}" />
-				</f:facet>
-
-				<p:link outcome="admin_show_basic_data" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE}" value="#{basicData.basicDataId}">
-					<f:param name="basicDataId" value="#{basicData.basicDataId}" />
-				</p:link>
-			</p:column>
-
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_ASSIGNED_USER}" />
-				</f:facet>
-
-				<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_OWNER_USER_TITLE}" value="#{basicData.companyUserOwner.userId}" rendered="#{not empty basicData.companyUserOwner}">
-					<f:param name="userId" value="#{basicData.companyUserOwner.userId}" />
-				</p:link>
-
-				<p:link outcome="admin_assign_basic_company_data_owner" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty basicData.companyUserOwner}">
-					<f:param name="basicDataId" value="#{basicData.basicDataId}" />
-				</p:link>
-			</p:column>
-
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" />
-				</f:facet>
-
-				<h:outputLink value="#{basicData.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty basicData.companyWebsiteUrl}">
-					<h:outputText value="#{basicData.companyName}" />
-				</h:outputLink>
-
-				<h:outputText value="#{basicData.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty basicData.companyWebsiteUrl}" />
-			</p:column>
-
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_CONTACT_PERSON}" />
-				</f:facet>
-
-				<p:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE}" value="#{basicData.companyContactEmployee.employeeId}" rendered="#{not empty basicData.companyContactEmployee}">
-					<f:param name="employeeId" value="#{basicData.companyContactEmployee.employeeId}" />
-				</p:link>
-
-				<p:link outcome="admin_assign_basic_company_data_employee" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON}" rendered="#{empty basicData.companyContactEmployee}">
-					<f:param name="basicDataId" value="#{basicData.basicDataId}" />
-				</p:link>
-			</p:column>
-
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_FOUNDER}" />
-				</f:facet>
-
-				<p:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE}" value="#{basicData.companyFounder.employeeId}" rendered="#{not empty basicData.companyFounder}">
-					<f:param name="employeeId" value="#{basicData.companyFounder.employeeId}" />
-				</p:link>
-
-				<p:link outcome="admin_assign_basic_company_data_contact" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty basicData.companyFounder}">
-					<f:param name="basicDataId" value="#{basicData.basicDataId}" />
-				</p:link>
-			</p:column>
-
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_CREATED}" />
-				</f:facet>
-
-				<h:outputText id="companyCreated" value="#{basicData.companyCreated.time}">
-					<f:convertDateTime for="companyCreated" type="both" timeStyle="short" dateStyle="short" />
-				</h:outputText>
-			</p:column>
-
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
-				</f:facet>
-
-				<links:outputBasicDataAdminMiniLinks basicData="#{basicData}" />
-			</p:column>
-		</p:dataTable>
-
-		<h:form id="form_admin_add_basic_company_data">
-			<h:panelGroup styleClass="table table-medium" layout="block">
-				<div class="table-header">
-					<h:outputText value="#{msg.ADMIN_ADD_BASIC_COMPANY_DATA_TITLE}" />
-				</div>
-
-				<div class="para">
-					<h:outputText value="#{msg.ADMIN_ADD_BASIC_COMPANY_DATA_MINIMUM_DATA}" />
-				</div>
-
-				<ui:include src="/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.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_basic_company_data" value="#{msg.BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON}" action="#{adminCompanyDataController.addBusinessBasicData()}" />
-				</div>
-			</h:panelGroup>
-		</h:form>
-	</ui:define>
-</ui:composition>
diff --git a/web/admin/branch_offices/admin_branch_offices_list.xhtml b/web/admin/branch_offices/admin_branch_offices_list.xhtml
deleted file mode 100644
index 86982f0e..00000000
--- a/web/admin/branch_offices/admin_branch_offices_list.xhtml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?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">
-		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_BRANCH_OFFICES}" />
-	</ui:define>
-
-	<ui:define name="content_header">
-		<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_BRANCH_OFFICES}" />
-	</ui:define>
-
-	<ui:define name="content">
-		<h:form id="form-list-branch-offices">
-			<p:dataTable
-				id="table-list-branch-offices"
-				var="branchOffice"
-				value="#{branchOfficeController.allBranchOffices()}"
-				tableStyleClass="table table-full"
-				paginator="true"
-				paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
-				widgetVar="branchOfficeTable"
-				filteredValue="#{branchOfficeController.filteredBranchOffices}"
-				rows="10"
-				reflow="true"
-				resizableColumns="true"
-				rowsPerPageTemplate="5,10,20,50,100"
-				sortMode="multiple"
-				summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BRANCH_OFFICES}"
-				emptyMessage="#{msg.ADMIN_BRANCH_OFFICES_LIST_EMPTY}"
-				>
-
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_LIST_BRANCH_OFFICES_HEADER}" />
-					<p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-					<p:columnToggler datasource="table-list-branch-offices" trigger="toggler" />
-				</f:facet>
-
-				<p:column headerText="#{msg.ADMIN_ID_NUMBER}" sortBy="#{branchOffice.branchId}" filterBy="#{branchOffice.branchId}">
-					<p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{branchOffice.branchId}">
-						<f:param name="branchId" value="#{branchOffice.branchId}" />
-					</p:link>
-				</p:column>
-
-				<p:column headerText="#{msg.ADMIN_ASSIGNED_USER}" sortBy="#{branchOffice.branchUserOwner.userName}" filterBy="#{branchOffice.branchUserOwner}" filterMatchMode="in">
-					<f:facet name="filter">
-						<p:selectCheckboxMenu filter="true" filterMatchMode="contains" label="#{msg.LABEL_USERS}" onchange="PF('branchOfficeTable').filter()" updateLabel="true" title="#{msg.FILTER_BY_MULTIPLE_USER_TITLE}">
-							<f:converter converterId="UserConverter" />
-							<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-							<f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
-						</p:selectCheckboxMenu>
-					</f:facet>
-
-					<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{branchOffice.branchUserOwner.userId}" rendered="#{not empty branchOffice.branchUserOwner}">
-						<f:param name="userId" value="#{branchOffice.branchUserOwner.userId}" />
-					</p:link>
-
-					<p:link outcome="admin_assign_branch_office_owner" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchUserOwner}">
-						<f:param name="branchId" value="#{branchOffice.branchId}" />
-					</p:link>
-				</p:column>
-
-				<p:column headerText="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" sortBy="#{branchOffice.branchCompany.companyName}" filterBy="#{branchOffice.branchCompany}" filterMatchMode="in">
-					<f:facet name="filter">
-						<p:selectCheckboxMenu filter="true" filterMatchMode="contains" label="#{msg.LABEL_COMPANIES}" onchange="PF('branchOfficeTable').filter()" updateLabel="true" title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}">
-							<f:converter converterId="BasicCompanyDataConverter" />
-							<f:selectItems value="#{basicDataController.allCompanyBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
-						</p:selectCheckboxMenu>
-					</f:facet>
-
-					<h:outputLink value="#{branchOffice.branchCompany.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty branchOffice.branchCompany.companyWebsiteUrl}">
-						<h:outputText value="#{branchOffice.branchCompany.companyName}" />
-					</h:outputLink>
-
-					<h:outputText value="#{branchOffice.branchCompany.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty branchOffice.branchCompany.companyWebsiteUrl}" />
-				</p:column>
-
-				<p:column headerText="#{msg.DATA_EMAIL_ADDRESS}" sortBy="#{branchOffice.branchEmailAddress}" filterBy="#{branchOffice.branchEmailAddress}" filterMatchMode="contains">
-					<h:outputLink value="mailto:#{branchOffice.branchEmailAddress}" rendered="#{not empty branchOffice.branchEmailAddress}" />
-
-					<h:outputText value="#{msg.NO_EMAIL_ADDRESS_ENTERED}" rendered="#{empty branchOffice.branchEmailAddress}" />
-				</p:column>
-
-				<p:column headerText="#{msg.DATA_ADDRESS}" sortBy="#{branchOffice.branchCity}" filterBy="#{branchOffice.branchCity}" filterMatchMode="contains">
-					<h:outputText value="#{branchOffice.branchZipCode} #{branchOffice.branchCity}" title="#{branchOffice.branchStreet} #{branchOffice.branchHouseNumber} (#{msg.DATA_STORE} #{branchOffice.branchStore}, #{msg.DATA_SUITE_NUMBER} #{branchOffice.branchSuiteNumber})" />
-				</p:column>
-
-				<p:column headerText="#{msg.ADMIN_CONTACT_PERSON}" sortBy="#{branchOffice.branchContactEmployee.employeePersonalData.contactFamilyName}" filterBy="#{branchOffice.branchContactEmployee}" filterMatchMode="in">
-					<f:facet name="filter">
-						<p:selectCheckboxMenu filter="true" filterMatchMode="contains" label="#{msg.LABEL_COMPANY_EMPLOYEES}" onchange="PF('branchOfficeTable').filter()" updateLabel="true" title="#{msg.FILTER_BY_MULTIPLE_COMPANY_EMPLOYEES_TITLE}">
-							<f:converter converterId="EmployeeConverter" />
-							<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-							<f:selectItems value="#{companyEmployeeController.allEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{employee.employeePersonalData.contactFirstName} #{employee.employeePersonalData.contactFamilyName}" />
-						</p:selectCheckboxMenu>
-					</f:facet>
-
-					<p:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICES_CONTACT_PERSON_TITLE}" value="#{branchOffice.branchContactEmployee.employeeId}" rendered="#{not empty branchOffice.branchContactEmployee}">
-						<f:param name="employeeId" value="#{branchOffice.branchContactEmployee.employeeId}" />
-					</p:link>
-
-					<p:link outcome="admin_assign_branch_office_employee" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchContactEmployee}">
-						<f:param name="branchId" value="#{branchOffice.branchId}" />
-					</p:link>
-				</p:column>
-
-				<p:column headerText="#{msg.ADMIN_LIST_ENTRY_CREATED}" sortBy="#{branchOffice.branchCreated}">
-					<h:outputText id="branchCreated" value="#{branchOffice.branchCreated.time}">
-						<f:convertDateTime for="branchCreated" type="both" timeStyle="short" dateStyle="short" />
-					</h:outputText>
-				</p:column>
-
-				<p:column headerText="#{msg.ADMIN_ACTION_LINKS}" sortable="false">
-					<links:outputBranchOfficeAdminMiniLinks branchOffice="#{branchOffice}" />
-				</p:column>
-			</p:dataTable>
-		</h:form>
-
-		<h:form id="form_admin_add_branch_office">
-			<h:panelGroup styleClass="table table-medium" layout="block">
-				<div class="table-header">
-					<h:outputText value="#{msg.ADMIN_ADD_BRANCH_OFFICE_TITLE}" />
-				</div>
-
-				<div class="para">
-					<h:outputText value="#{msg.ADMIN_ADD_BRANCH_OFFICE_MINIMUM_DATA}" />
-				</div>
-
-				<ui:include src="/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.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_branch_office" value="#{msg.BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON}" action="#{adminBranchOfficeController.addBranchOffice()}" />
-				</div>
-			</h:panelGroup>
-		</h:form>
-	</ui:define>
-</ui:composition>
diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index fef9073c..ed461dee 100644
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_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: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="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-			<f:viewAction onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
+			<f:viewParam
+				name="contactId"
+				value="#{adminContactController.contact}"
+				converter="ContactConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+				/>
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT}" />
 	</ui:define>
 
@@ -23,9 +31,9 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+		<h:form rendered="#{not empty beanHelper.contact}">
+			<h:inputHidden value="#{adminContactController.contactId}" />
 
-		<h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
 			<h:panelGroup styleClass="table" layout="block">
 				<div class="table-header">
 					<h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_TITLE}">
@@ -39,11 +47,12 @@
 
 				<ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
 
-				<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_contact" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
-				</div>
-			</h:panelGroup>
+				<p:commandButton
+					type="submit"
+					value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}"
+					action="#{adminContactController.deleteContactData()}"
+					/>
+				</p:panelGrid>
 		</h:form>
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index 1ed811d4..0dc8a1a3 100644
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_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="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+			<f:viewParam
+				name="contactId"
+				value="#{beanHelper.contact}"
+				converter="ContactConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+				/>
 			<f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT}" />
 	</ui:define>
 
@@ -23,10 +32,10 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+		<h:form rendered="#{not empty beanHelper.contact}">
+			<h:inputHidden value="#{adminContactController.contactId}" />
 
-		<h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
-			<h:panelGroup styleClass="table table-medium" layout="block">
+			<h:panelGroup layout="block">
 				<div class="table-header">
 					<h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_TITLE}">
 						<f:param value="#{beanHelper.contact.contactId}" />
@@ -37,12 +46,20 @@
 					<h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE}" />
 				</div>
 
-				<widgets:outputAdminContactDataFormFields />
+				<ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.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_edit_contact" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
-				</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_CONTACT}"
+						action="#{adminContactController.editContactData()}"
+						/>
+				</p:panelGrid>
 			</h:panelGroup>
 		</h:form>
 	</ui:define>
diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index e534c5a7..bb35042b 100644
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_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_CONTACT}" />
 	</ui:define>
 
@@ -16,14 +18,28 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:form id="form_export_contacts" rendered="#{not contactController.allContacts().isEmpty()}">
-			<p:dataTable id="table_export_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table table-full" paginator="true" rows="10" emptyMessage="#{msg.ADMIN_CONTACT_LIST_EMPTY}" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}">
-				<p:column exportable="false">
+		<h:form rendered="#{not contactListController.allContacts.isEmpty()}">
+			<p:dataTable
+				id="table_export_contacts"
+				var="contact"
+				value="#{contactListController.allContacts}"
+				paginator="true"
+				rows="10"
+				emptyMessage="#{msg.ADMIN_EMPTY_LIST_CONTACT}"
+				summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}"
+				>
+				<p:column
+					exportable="false"
+					>
 					<f:facet name="header">
 						<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ID}" />
 					</f:facet>
 
-					<p:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
+					<p:link
+						outcome="admin_show_contact"
+						value="#{contact.contactId}"
+						title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}"
+						>
 						<f:param name="contactId" value="#{contact.contactId}" />
 					</p:link>
 				</p:column>
@@ -114,7 +130,7 @@
 					</f:facet>
 
 					<h:outputText id="contactBirthday" value="#{contact.contactBirthday}">
-						<f:convertDateTime for="contactBirthday" type="date" dateStyle="medium" />
+						<f:convertDateTime type="date" dateStyle="medium" />
 					</h:outputText>
 				</p:column>
 
@@ -128,7 +144,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(contact.contactLandLineNumber)}" />
@@ -147,13 +163,33 @@
 						<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CREATED}" />
 					</f:facet>
 
-					<h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
-						<f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
+					<h:outputText value="#{contact.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="#{contact.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_CONTACTS_TITLE}" />
 				</div>
@@ -162,11 +198,20 @@
 					<h:outputText value="#{msg.ADMIN_EXPORT_CONTACTS_TIMEOUT_WARNING}" />
 				</div>
 
-				<div class="table-footer">
-					<p:commandButton styleClass="submit" type="submit" id="button_export_contacts_xls" value="#{msg.BUTTON_ADMIN_EXPORT_CONTACTS_XLS}">
-						<p:dataExporter type="xls" target="table_export_contacts" fileName="all_contacts" />
+				<p:panelGrid columns="2" layout="grid">
+					<p:commandButton
+						ajax="false"
+						type="submit"
+						value="#{msg.BUTTON_ADMIN_EXPORT_CONTACTS_XLS}"
+						>
+
+						<p:dataExporter
+							type="xls"
+							target="table_export_contacts"
+							fileName="all_contacts"
+							/>
 					</p:commandButton>
-				</div>
+				</p:panelGrid>
 			</h:panelGroup>
 		</h:form>
 	</ui:define>
diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index 405d97d5..decc2a8a 100644
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_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_CONTACT}" />
 	</ui:define>
 
@@ -17,79 +19,223 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<p:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" emptyMessage="#{msg.ADMIN_CONTACT_LIST_EMPTY}">
-			<p:column>
+		<h:form id="form-list-contacts">
+			<p:dataTable
+				id="contactList"
+				var="contact"
+				value="#{contactListController.allContacts}"
+				paginator="true"
+				paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+				filteredValue="#{contactListController.filteredContacts}"
+				rows="10"
+				rowKey="#{contact.contactId}"
+				reflow="true"
+				resizableColumns="true"
+				rowsPerPageTemplate="5,10,20,50,100"
+				sortMode="multiple"
+				summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}"
+				emptyMessage="#{msg.ADMIN_EMPTY_LIST_CONTACT}"
+				widgetVar="contactList"
+				selectionMode="single"
+				selection="#{contactListController.selectedContact}"
+				skipChildren="true"
+				>
+
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_CONTACT_ID}" />
-				</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_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
-					<f:param name="contactId" value="#{contact.contactId}" />
-				</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>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
-				</f:facet>
+							<p:inputText
+								id="globalFilter"
+								onkeyup="PF('contactList').filter()"
+								placeholder="#{msg.ENTER_KEYWORD}"
+								/>
+						</p:panelGrid>
 
-				<h:outputText value="#{msg[contact.contactPersonalTitle.messageKey]}" />
-			</p:column>
+						<p:outputPanel>
+							<p:spacer height="4" />
 
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+							<p:commandButton
+								id="toggler"
+								type="button"
+								value="#{msg.SELECT_SHOWN_COLUMNS}"
+								styleClass="column-selector"
+								/>
+
+							<p:columnToggler datasource="contactList" trigger="toggler" />
+						</p:outputPanel>
+					</p:panelGrid>
 				</f:facet>
 
-				<h:outputText value="#{contact.contactFirstName}" />
-			</p:column>
+				<p:ajax
+					event="rowSelect"
+					update="form-list-contacts:contact-details"
+					oncomplete="PF('contactDialog').show()"
+					/>
 
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
-				</f:facet>
+				<p:column
+					headerText="#{msg.ID_HEADER}"
+					sortBy="#{contact.contactId}"
+					filterable="false"
+					>
+					<p:link
+						outcome="admin_show_contact"
+						value="#{contact.contactId}"
+						title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}"
+						>
+						<f:param name="contactId" value="#{contact.contactId}" />
+					</p:link>
+				</p:column>
 
-				<h:outputText value="#{contact.contactFamilyName}" />
-			</p:column>
+				<p:column
+					headerText="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}"
+					sortBy="#{contact.contactPersonalTitle}"
+					filterBy="#{contact.contactPersonalTitle}"
+					filterMatchMode="exact"
+					>
+					<f:facet name="filter">
+						<p:selectOneMenu onchange="PF('contactList').filter()">
+							<f:converter converterId="PersonalTitleConverter" />
+							<f:selectItem itemLabel="#{msg.CHOICE_ALL}" itemValue="#{null}" />
+							<f:selectItems
+								value="#{dataController.personalTitles}"
+								var="personalTitle"
+								itemValue="#{personalTitle}"
+								itemLabel="#{msg[personalTitle.messageKey]}"
+								/>
+						</p:selectOneMenu>
+					</f:facet>
+					<h:outputText value="#{msg[contact.contactPersonalTitle.messageKey]}" />
+				</p:column>
 
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_CONTACT_USAGE}" />
-				</f:facet>
+				<p:column
+					headerText="#{msg.ADMIN_CONTACT_FIRST_NAME}"
+					sortBy="#{contact.contactFirstName}"
+					filterBy="#{contact.contactFirstName}"
+					filterMatchMode="contains"
+					>
+					<h:outputText value="#{contact.contactFirstName}" />
+				</p:column>
 
-				<h:outputText value="#{msg[beanHelper.getContactUsageMessageKey(contact)]}" />
-			</p:column>
+				<p:column
+					headerText="#{msg.ADMIN_CONTACT_FAMILY_NAME}"
+					sortBy="#{contact.contactFamilyName}"
+					filterBy="#{contact.contactFamilyName}"
+					filterMatchMode="contains"
+					>
+					<h:outputText value="#{contact.contactFamilyName}" />
+				</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="#{contact.contactEntryCreated}"
+					filterBy="#{contact.contactEntryCreated}"
+					filterMatchMode="contains"
+					>
+					<h:outputText value="#{contact.contactEntryCreated}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
 
-				<h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
-					<f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
-				</h:outputText>
-			</p:column>
+				<p:column
+					headerText="#{msg.ENTRY_UPDATED_HEADER}"
+					sortBy="#{contact.contactEntryUpdated}"
+					filterBy="#{contact.contactEntryUpdated}"
+					filterMatchMode="contains"
+					>
+					<h:outputText value="#{contact.contactEntryUpdated}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
 
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
-				</f:facet>
+				<p:column
+					headerText="#{msg.ADMIN_CONTACT_USAGE}"
+					sortable="false"
+					filterable="false"
+					>
+					<h:outputText value="#{msg[beanHelper.getContactUsageMessageKey(contact)]}" />
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+					sortable="false"
+					filterable="false"
+					>
+					<p:menuButton value="#{msg.OPTIONS}">
+						<p:menuitem outcome="admin_show_contact" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+							<f:param name="contactId" value="#{contact.contactId}" />
+						</p:menuitem>
+
+						<p:menuitem outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
+							<f:param name="contactId" value="#{contact.contactId}" />
+						</p:menuitem>
 
-				<links:outputContactAdminMiniLinks contact="#{contact}" />
-			</p:column>
-		</p:dataTable>
+						<p:menuitem outcome="admin_delete_contact">
+							<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_CONTACT_TITLE}" />
+							<f:param name="contactId" value="#{contact.contactId}" />
+						</p:menuitem>
+					</p:menuButton>
+				</p:column>
+			</p:dataTable>
 
-		<h:form id="form_admin_add_contact">
-			<h:panelGroup styleClass="table table-medium" layout="block">
-				<div class="table-header">
+			<p:dialog
+				dynamic="true"
+				modal="true"
+				resizable="false"
+				header="#{msg.ADMIN_SINGLE_CONTACT_DETAILS_HEADER}"
+				hideEffect="fade"
+				showEffect="fade"
+				widgetVar="contactDialog"
+				position="top"
+				responsive="true"
+				closeOnEscape="true"
+				>
+				<p:outputPanel id="contact-details">
+					<p:panelGrid columns="2" rendered="#{not empty contactListController.selectedContact}">
+						<f:facet name="header">
+							<h:outputFormat value="#{msg.ADMIN_CONTACT_DETAILS_HEADER}">
+								<f:param value="#{msg[contactListController.selectedContact.contactPersonalTitle.messageKey]}" />
+								<f:param value="#{contactListController.selectedContact.contactFirstName}" />
+								<f:param value="#{contactListController.selectedContact.contactFamilyName}" />
+								<f:param value="#{contactListController.selectedContact.contactId}" />
+							</h:outputFormat>
+						</f:facet>
+
+						<p:outputLabel value="#{msg.ID_HEADER}" title="#{msg.CONTACT_ID_NUMBER_TITLE}" />
+						<h:outputText value="#{contactListController.selectedContact.contactId}" />
+					</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_ADD_CONTACT_TITLE}" />
-				</div>
+				</f:facet>
 
-				<div class="para">
-					<h:outputText value="#{msg.ADMIN_ADD_CONTACT_MINIMUM_DATA}" />
-				</div>
+				<h:outputText value="#{msg.ADMIN_ADD_CONTACT_MINIMUM_DATA}" />
 
-				<widgets:outputAdminContactDataFormFields />
+				<ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
 
 				<f:facet name="footer">
 					<p:panelGrid columns="2" layout="grid">
diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
index 6e0efd04..c7e2215b 100644
--- a/web/admin/contact/admin_contact_show.xhtml
+++ b/web/admin/contact/admin_contact_show.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: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: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="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-			<f:viewAction onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
+			<f:viewParam
+				name="contactId"
+				value="#{beanHelper.contact}"
+				converter="ContactConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+				/>
+			<f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT}" />
 	</ui:define>
 
@@ -23,7 +32,12 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+		<core:outputMessageBox
+			panelGroupId="errorHandlerShowContact"
+			message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}"
+			messageStyleClass="alert-danger"
+			rendered="#{empty beanHelper.contact}"
+			/>
 
 		<ui:fragment rendered="#{not empty beanHelper.contact}">
 			<h:panelGroup styleClass="para" layout="block">
@@ -31,7 +45,24 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="para" layout="block">
-				<links:outputContactAdminMiniLinks contact="#{beanHelper.contact}" renderShowLink="false" />
+				<p:menuButton value="#{msg.OPTIONS}">
+					<p:menuitem
+						outcome="admin_edit_contact"
+						value="#{msg.ADMIN_LINK_EDIT_SHORT}"
+						title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}"
+						>
+						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+					</p:menuitem>
+
+					<p:menuitem outcome="admin_delete_contact">
+						<h:outputText
+							styleClass="link-danger"
+							value="#{msg.ADMIN_LINK_DELETE_SHORT}"
+							title="#{msg.ADMIN_LINK_DELETE_CONTACT_TITLE}"
+							/>
+						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+					</p:menuitem>
+				</p:menuButton>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="para" layout="block">
diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index b661ed8c..3d26ed8d 100644
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -1,20 +1,38 @@
 <?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="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-			<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+			<f:viewParam
+				name="faxId"
+				value="#{beanHelper.faxNumber}"
+				converter="FaxNumberConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+				/>
+			<f:viewParam
+				name="contactId"
+				value="#{beanHelper.contact}"
+				converter="ContactConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+				/>
+			<f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
+			<f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}" />
 	</ui:define>
 
@@ -23,11 +41,12 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-handler-fax-number" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
+		<h:form
+			rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber == beanHelper.faxNumber}"
+			>
+			<h:inputHidden value="#{adminContactPhoneController.contact}" />
+			<h:inputHidden value="#{adminContactPhoneController.phoneId}" />
 
-		<widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
-		<h:form id="form_unlink_contact_fax" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber == beanHelper.faxNumber}">
 			<h:panelGroup styleClass="table" layout="block">
 				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_FAX_NUMBER_TITLE}" />
@@ -38,22 +57,39 @@
 				</div>
 
 				<div class="para">
-					<p:link outcome="admin_show_contact" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
+					<p:link
+						outcome="admin_show_contact"
+						value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}"
+						title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}"
+						>
 						<f:param name="contactId" value="#{adminContactPhoneController.contact.contactId}" />
 					</p:link>
 				</div>
 
 				<div class="para">
-					<widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminMiniLinks="false" />
+					<core:outputAdminFaxPanelGrid
+						faxNumber="#{beanHelper.faxNumber}"
+						contact="#{beanHelper.contact}"
+						renderShowLink="false"
+						showAdminDropdownMenu="false"
+						/>
 				</div>
 
-				<div class="table-footer">
-					<p:commandButton styleClass="button-warning" type="submit" id="button_unlink_fax" value="#{msg.BUTTON_ADMIN_UNLINK_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkFaxContactData()}" />
-				</div>
+				<p:panelGrid columns="2" layout="grid">
+					<p:commandButton
+						type="submit"
+						value="#{msg.BUTTON_ADMIN_UNLINK_FAX_NUMBER}"
+						action="#{adminContactPhoneController.unlinkFaxContactData()}"
+						/>
+				</p:panelGrid>
 			</h:panelGroup>
 		</h:form>
 
-		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber != beanHelper.faxNumber}">
+		<h:outputFormat
+			styleClass="alert-danger"
+			value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}"
+			rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber != beanHelper.faxNumber}"
+			>
 			<f:param value="#{adminContactPhoneController.phoneId}" />
 			<f:param value="#{adminContactPhoneController.contact.contactId}" />
 		</h:outputFormat>
diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index 9848232e..d1d29d3e 100644
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -1,20 +1,36 @@
 <?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="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-			<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+			<f:viewParam
+				name="landLineId"
+				value="#{beanHelper.landLineNumber}"
+				converter="LandLineNumberConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+				/>
+			<f:viewParam
+				name="contactId"
+				value="#{beanHelper.contact}"
+				converter="ContactConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+				/>
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}" />
 	</ui:define>
 
@@ -23,11 +39,7 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-handler-landline-number" message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
-
-		<widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
-		<h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber == beanHelper.landLineNumber}">
+		<h:form rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber == beanHelper.landLineNumber}">
 			<h:panelGroup styleClass="table" layout="block">
 				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER_TITLE}" />
@@ -38,22 +50,39 @@
 				</div>
 
 				<div class="para">
-					<p:link outcome="admin_show_contact" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
+					<p:link
+						outcome="admin_show_contact"
+						value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}"
+						title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}"
+						>
 						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
 					</p:link>
 				</div>
 
 				<div class="para">
-					<widgets:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminMiniLinks="false" />
+					<core:outputAdminLandLinePanelGrid
+						landLineNumber="#{beanHelper.landLineNumber}"
+						contact="#{beanHelper.contact}"
+						renderShowLink="false"
+						showAdminDropdownMenu="false"
+						/>
 				</div>
 
-				<div class="table-footer">
-					<p:commandButton styleClass="button-warning" type="submit" id="button_unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkLandLineContactData()}" />
-				</div>
+				<p:panelGrid columns="2" layout="grid">
+					<p:commandButton
+						type="submit"
+						value="#{msg.BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER}"
+						action="#{adminContactPhoneController.unlinkLandLineContactData()}"
+						/>
+				</p:panelGrid>
 			</h:panelGroup>
 		</h:form>
 
-		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber != beanHelper.landLineNumber}">
+		<h:outputFormat
+			styleClass="alert-danger"
+			value="#{msg.ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}"
+			rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber != beanHelper.landLineNumber}"
+			>
 			<f:param value="#{beanHelper.landLineNumber.phoneId}" />
 			<f:param value="#{beanHelper.contact.contactId}" />
 		</h:outputFormat>
diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index a06815a0..2bde48f8 100644
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -1,20 +1,36 @@
 <?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="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-			<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+			<f:viewParam
+				name="mobileId"
+				value="#{beanHelper.mobileNumber}"
+				converter="MobileNumberConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+				/>
+			<f:viewParam
+				name="contactId"
+				value="#{beanHelper.contact}"
+				converter="ContactConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+				/>
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
 	</ui:define>
 
@@ -23,11 +39,7 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-handler-mobile-number" message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
-
-		<widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
-		<h:form id="form_unlink_contact_mobile" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.mobileNumber}">
+		<h:form rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.mobileNumber}">
 			<h:panelGroup styleClass="table" layout="block">
 				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_MOBILE_NUMBER_TITLE}" />
@@ -38,23 +50,38 @@
 				</div>
 
 				<div class="para">
-					<p:link outcome="admin_show_contact" title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
+					<p:link
+						outcome="admin_show_contact"
+						value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}"
+						title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}"
+						>
 						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
 					</p:link>
 				</div>
 
 				<div class="para">
-					<widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminMiniLinks="false" />
+					<core:outputAdminMobilePanelGrid
+						mobileNumber="#{beanHelper.mobileNumber}"
+						contact="#{beanHelper.contact}"
+						renderShowLink="false"
+						showAdminDropdownMenu="false"
+						/>
 				</div>
 
-				<div class="table-footer">
-					<p:commandButton styleClass="button-warning" type="submit" id="button_unlink_mobile" value="#{msg.BUTTON_ADMIN_UNLINK_MOBILE_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
-				</div>
+				<p:commandButton
+					type="submit"
+					value="#{msg.BUTTON_ADMIN_UNLINK_MOBILE_NUMBER}"
+					action="#{adminContactMobileController.unlinkMobileContactData()}"
+					/>
 			</h:panelGroup>
 		</h:form>
 
-		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}">
-			<f:param value="#{beanHelper.mobileNumber.phoneId}" />
+		<h:outputFormat
+			styleClass="alert-danger"
+			value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}"
+			rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}"
+			>
+			<f:param value="#{beanHelper.mobileNumber.mobileId}" />
 			<f:param value="#{beanHelper.contact.contactId}" />
 		</h:outputFormat>
 	</ui:define>
diff --git a/web/admin/country/admin_country_delete.xhtml b/web/admin/country/admin_country_delete.xhtml
index d4acc07a..a700c290 100644
--- a/web/admin/country/admin_country_delete.xhtml
+++ b/web/admin/country/admin_country_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_DELETE_COUNTRY}" />
 	</ui:define>
 
diff --git a/web/admin/country/admin_country_edit.xhtml b/web/admin/country/admin_country_edit.xhtml
index e1977eca..051b7ce2 100644
--- a/web/admin/country/admin_country_edit.xhtml
+++ b/web/admin/country/admin_country_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_EDIT_COUNTRY}" />
 	</ui:define>
 
diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
index 2de78e11..9cb7b3b9 100644
--- a/web/admin/country/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -1,13 +1,14 @@
 <?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: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_COUNTRY}" />
 	</ui:define>
 
@@ -16,62 +17,257 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<p:dataTable id="table_list_countries" var="country" value="#{countryController.allCountries()}" tableStyleClass="table table-medium" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" emptyMessage="#{msg.ADMIN_COUNTRY_LIST_EMPTY}">
-			<p:column>
+		<h:form id="form-list-countries">
+			<p:dataTable
+				id="countryList"
+				var="country"
+				value="#{countryListController.allCountries}"
+				paginator="true"
+				paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+				filteredValue="#{countryListController.filteredCountries}"
+				rows="10"
+				rowKey="#{country.countryId}"
+				reflow="true"
+				resizableColumns="true"
+				rowsPerPageTemplate="5,10,20,50,100"
+				sortMode="multiple"
+				summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRY}"
+				emptyMessage="#{msg.ADMIN_EMPTY_LIST_COUNTRY}"
+				widgetVar="countryList"
+				selectionMode="single"
+				selection="#{countryListController.selectedCountry}"
+				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_country" title="#{msg.ADMIN_LINK_SHOW_COUNTRY_TITLE}" value="#{country.countryId}">
-					<f:param name="countryId" value="#{country.countryId}" />
-				</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>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE}" />
-				</f:facet>
+							<p:inputText
+								id="globalFilter"
+								onkeyup="PF('countryList').filter()"
+								placeholder="#{msg.ENTER_KEYWORD}"
+								/>
+						</p:panelGrid>
 
-				<h:outputText value="#{country.countryCode}" />
-			</p:column>
+						<p:outputPanel>
+							<p:spacer height="4" />
 
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
+							<p:commandButton
+								id="toggler"
+								type="button"
+								value="#{msg.SELECT_SHOWN_COLUMNS}"
+								styleClass="column-selector"
+								/>
+
+							<p:columnToggler datasource="countryList" trigger="toggler" />
+						</p:outputPanel>
+					</p:panelGrid>
 				</f:facet>
 
-				<h:outputText value="#{country.countryExternalDialPrefix}" />
-			</p:column>
+				<p:ajax
+					event="rowSelect"
+					update="form-list-countries:country-details"
+					oncomplete="PF('countryDialog').show()"
+					/>
 
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME}" />
-				</f:facet>
+				<p:column
+					headerText="#{msg.ID_HEADER}"
+					sortBy="#{country.countryId}"
+					filterable="false"
+					>
+					<p:link
+						outcome="admin_show_country"
+						value="#{country.countryId}"
+						title="#{msg.ADMIN_LINK_SHOW_COUNTRY_TITLE}"
+						>
+						<f:param name="countryId" value="#{country.countryId}" />
+					</p:link>
+				</p:column>
 
-				<h:outputText value="#{msg[country.countryI18nKey]}" />
-			</p:column>
+				<p:column
+					headerText="#{msg.DATA_COUNTRY_CODE}"
+					sortBy="#{country.countryCode}"
+					filterBy="#{country.countryCode}"
+					filterMatchMode="contains"
+					>
 
-			<p:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
-				</f:facet>
+					<h:outputText value="#{country.countryCode}" />
+				</p:column>
+
+				<p:column
+					headerText="#{msg.DATA_COUNTRY_NAME}"
+					sortBy="#{msg[country.countryI18nKey]}"
+					filterBy="#{msg[country.countryI18nKey]}"
+					filterMatchMode="contains"
+					>
+
+					<h:outputText value="#{msg[country.countryI18nKey]}" />
+				</p:column>
+
+				<p:column
+					headerText="#{msg.DATA_COUNTRY_EXTERNAL_DIAL_PREFIX}"
+					sortBy="#{country.countryExternalDialPrefix}"
+					filterBy="#{country.countryExternalDialPrefix}"
+					filterMatchMode="contains"
+					>
+
+					<h:outputText value="#{country.countryExternalDialPrefix}" />
+				</p:column>
+
+				<p:column
+					headerText="#{msg.DATA_COUNTRY_ABROAD_DIAL_PREFIX}"
+					sortBy="#{country.countryAbroadDialPrefix}"
+					filterBy="#{country.countryAbroadDialPrefix}"
+					filterMatchMode="contains"
+					>
 
-				<links:outputCountryAdminMiniLinks country="#{country}" />
-			</p:column>
-		</p:dataTable>
+					<h:outputText value="#{country.countryAbroadDialPrefix}" />
+				</p:column>
 
-		<h:form id="form_add_country">
-			<h:panelGroup styleClass="table table-medium" layout="block">
+				<p:column
+					headerText="#{msg.DATA_IS_REQUIRED}"
+					sortBy="#{country.countryIsLocalPrefixRequired}"
+					filterBy="#{country.countryIsLocalPrefixRequired}"
+					filterMatchMode="contains"
+					>
+
+					<h:outputText value="#{country.countryIsLocalPrefixRequired ? msg.CHOICE_YES : msg.CHOICE_NO}" />
+				</p:column>
+
+				<p:column
+					headerText="#{msg.DATA_COUNTRY_PHONE_CODE}"
+					sortBy="#{country.countryPhoneCode}"
+					filterBy="#{country.countryPhoneCode}"
+					filterMatchMode="contains"
+					>
+
+					<h:outputText value="#{country.countryPhoneCode}" />
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ENTRY_CREATED_HEADER}"
+					sortBy="#{country.countryEntryCreated}"
+					filterBy="#{country.countryEntryCreated}"
+					filterMatchMode="contains"
+					>
+
+					<h:outputText value="#{country.countryEntryCreated}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ENTRY_UPDATED_HEADER}"
+					sortBy="#{country.countryEntryUpdated}"
+					filterBy="#{country.countryEntryUpdated}"
+					filterMatchMode="contains"
+					>
+
+					<h:outputText value="#{country.countryEntryUpdated}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+					filterable="false"
+					sortable="false"
+					>
+					<p:menuButton value="#{msg.OPTIONS}">
+						<p:menuitem
+							outcome="admin_show_country"
+							value="#{msg.ADMIN_LINK_SHOW_SHORT}"
+							title="#{msg.ADMIN_LINK_SHOW_COUNTRY_TITLE}"
+							>
+							<f:param name="countryId" value="#{country.countryId}" />
+						</p:menuitem>
+
+						<p:menuitem
+							outcome="admin_edit_country"
+							value="#{msg.ADMIN_LINK_EDIT_SHORT}"
+							title="#{msg.ADMIN_LINK_EDIT_COUNTRY_TITLE}"
+							>
+							<f:param name="countryId" value="#{country.countryId}" />
+						</p:menuitem>
+
+						<p:menuitem outcome="admin_delete_country">
+							<h:outputText
+								styleClass="link-danger"
+								value="#{msg.ADMIN_LINK_DELETE_SHORT}"
+								title="#{msg.ADMIN_LINK_DELETE_COUNTRY_TITLE}"
+								/>
+							<f:param name="countryId" value="#{country.countryId}" />
+						</p:menuitem>
+					</p:menuButton>
+				</p:column>
+			</p:dataTable>
+
+			<p:dialog
+				dynamic="true"
+				modal="true"
+				resizable="false"
+				header="#{msg.ADMIN_SINGLE_COUNTRY_DETAILS_HEADER}"
+				hideEffect="fade"
+				showEffect="fade"
+				widgetVar="countryDialog"
+				position="top"
+				responsive="true"
+				closeOnEscape="true"
+				>
+				<p:outputPanel id="country-details">
+					<p:panelGrid columns="2" rendered="#{not empty countryListController.selectedCountry}">
+						<f:facet name="header">
+							<h:outputFormat value="#{msg.ADMIN_COUNTRY_DETAILS_HEADER}">
+								<f:param value="#{msg[countryListController.selectedCountry.countryI18nKey]}" />
+								<f:param value="#{countryListController.selectedCountry.countryId}" />
+							</h:outputFormat>
+						</f:facet>
+
+						<p:outputLabel value="#{msg.ID_HEADER}" title="#{msg.COUNTRY_ID_NUMBER_TITLE}" />
+						<h:outputText value="#{countryListController.selectedCountry.countryId}" />
+					</p:panelGrid>
+				</p:outputPanel>
+			</p:dialog>
+		</h:form>
+
+		<h:form>
+			<h:panelGroup layout="block">
 				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_ADD_COUNTRY_TITLE}" />
 				</div>
 
 				<ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.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_country" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
-				</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_COUNTRY}"
+						action="#{adminCountryController.addCountry()}"
+						update="form-list-countries:countryList"
+						/>
+				</p:panelGrid>
 			</h:panelGroup>
 
 			<div class="para notice">
diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index bc93bad2..2c98a7d1 100644
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.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="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-			<f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
+			<f:viewParam
+				name="faxId"
+				value="#{beanHelper.faxNumber}"
+				converter="FaxNumberConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+				/>
+			<f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_FAX}" />
 	</ui:define>
 
@@ -23,25 +32,31 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-handler-fax-number" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
+		<h:form rendered="#{not empty beanHelper.faxNumber}">
+			<h:inputHidden value="#{adminPhoneController.phoneId}" />
 
-		<h:form id="form_delete_fax" rendered="#{not empty beanHelper.faxNumber}">
 			<h:panelGroup styleClass="table" layout="block">
 				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_DELETE_FAX_TITLE}" />
 				</div>
 
 				<div class="para">
-					<widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" renderShowLink="false" showAdminMiniLinks="false" />
+					<core:outputAdminFaxPanelGrid
+						faxNumber="#{beanHelper.faxNumber}"
+						renderShowLink="false"
+						showAdminDropdownMenu="false"
+						/>
 				</div>
 
 				<div class="para">
 					<h:outputText value="#{msg.ADMIN_DELETE_FAX_DATA_NOTICE}" />
 				</div>
 
-				<div class="table-footer">
-					<p:commandButton styleClass="button-danger" type="submit" id="button_delete_fax" value="#{msg.BUTTON_ADMIN_DELETE_FAX}" action="#{adminPhoneController.deleteFaxData()}" />
-				</div>
+				<p:commandButton
+					type="submit"
+					value="#{msg.BUTTON_ADMIN_DELETE_FAX}"
+					action="#{adminPhoneController.deleteFaxData()}"
+					/>
 			</h:panelGroup>
 		</h:form>
 	</ui:define>
diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index 0b677bae..6dec4e53 100644
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_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="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+			<f:viewParam
+				name="faxId"
+				value="#{beanHelper.faxNumber}"
+				converter="FaxNumberConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+				/>
 			<f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_FAX_NUMBER}" />
 	</ui:define>
 
@@ -23,22 +32,30 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-handler-fax-number" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
+		<h:form rendered="#{not empty beanHelper.faxNumber}">
+			<h:inputHidden value="#{adminPhoneController.phoneId}" />
 
-		<h:form id="form_edit_fax" rendered="#{not empty beanHelper.faxNumber}">
-			<h:panelGroup styleClass="table table-medium" layout="block">
+			<h:panelGroup layout="block">
 				<div class="table-header">
 					<h:outputFormat value="#{msg.ADMIN_EDIT_FAX_NUMBER_TITLE}">
 						<f:param value="#{beanHelper.faxNumber.phoneId}" />
 					</h:outputFormat>
 				</div>
 
-				<widgets:outputAdminFaxDataFormFields faxNumber="#{beanHelper.faxNumber}" />
+				<core:outputAdminFaxDataFormFields faxNumber="#{beanHelper.faxNumber}" />
 
-				<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_fax" value="#{msg.BUTTON_ADMIN_EDIT_FAX_NUMBER}" action="#{adminPhoneController.doChangeFaxNumber()}" />
-				</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_FAX_NUMBER}"
+						action="#{adminPhoneController.doChangeFaxNumber()}"
+						/>
+				</p:panelGrid>
 			</h:panelGroup>
 		</h:form>
 	</ui:define>
diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml
index 325e20c3..4ab4c338 100644
--- a/web/admin/fax/admin_fax_list.xhtml
+++ b/web/admin/fax/admin_fax_list.xhtml
@@ -1,13 +1,14 @@
 <?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: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_CONTACT_FAX_NUMBER}" />
 	</ui:define>
 
@@ -16,41 +17,53 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<p:dataTable id="table_list_fax" var="faxNumber" value="#{phoneController.allFaxNumbers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_FAXS}" emptyMessage="#{msg.ADMIN_FAX_NUMBER_LIST_EMPTY}">
+		<p:dataTable
+			id="faxList"
+			var="faxNumber"
+			value="#{phoneListController.allFaxNumbers}"
+			paginator="true"
+			rows="10"
+			summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_FAXS}"
+			emptyMessage="#{msg.ADMIN_EMPTY_LIST_FAX_NUMBER}"
+			>
 			<p:column>
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
+					<h:outputText value="#{msg.ID_HEADER}" />
 				</f:facet>
 
-				<p:link outcome="admin_show_fax" value="#{faxNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}">
-					<f:param name="phoneId" value="#{faxNumber.phoneId}" />
+				<p:link
+					outcome="admin_show_fax"
+					value="#{faxNumber.phoneId}"
+					title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}"
+					>
+					<f:param name="faxId" value="#{faxNumber.phoneId}" />
 				</p:link>
 			</p:column>
 
 			<p:column>
 				<f:facet name="header">
-					<p:outputLabel for="faxNumber" value="#{msg.ADMIN_SHOW_PHONE_NUMBER}" />
+					<p:outputLabel for="faxNumber" value="#{msg.ADMIN_SHOW_FAX_NUMBER}" />
 				</f:facet>
 
-				<h:outputText id="faxNumber" value="#{faxNumber.phoneCountry.countryAbroadDialPrefix}#{faxNumber.phoneCountry.countryPhoneCode} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
+				<h:outputText id="faxNumber" value="#{beanHelper.renderPhoneNumber(faxNumber)}" />
 			</p:column>
 
 			<p:column>
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+					<h:outputText value="#{msg.ENTRY_CREATED_HEADER}" />
 				</f:facet>
 
-				<h:outputText value="#{faxNumber.phoneEntryCreated.time}">
+				<h:outputText value="#{faxNumber.phoneEntryCreated}">
 					<f:convertDateTime type="both" />
 				</h:outputText>
 			</p:column>
 
 			<p:column>
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+					<h:outputText value="#{msg.ENTRY_UPDATED_HEADER}" />
 				</f:facet>
 
-				<h:outputText value="#{faxNumber.phoneEntryUpdated.time}">
+				<h:outputText value="#{faxNumber.phoneEntryUpdated}">
 					<f:convertDateTime type="both" />
 				</h:outputText>
 			</p:column>
diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index 70570c4e..5720b523 100644
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.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="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-			<f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
+			<f:viewParam
+				name="faxId"
+				value="#{beanHelper.faxNumber}"
+				converter="FaxNumberConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+				/>
+			<f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_FAX_NUMBER}" />
 	</ui:define>
 
@@ -23,11 +32,16 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" />
-
-		<p:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allCurrentFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-medium">
+		<core:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" />
+
+		<p:dataTable
+			id="contact_fax_link"
+			var="contact"
+			value="#{contactPhoneController.allCurrentFaxNumberContacts()}"
+			summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}"
+			>
 			<f:facet name="header">
-				<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_LINKS}">
+				<h:outputFormat value="#{msg.ADMIN_SHOW_FAX_NUMBER_LINKS_HEADER}">
 					<f:param value="#{beanHelper.faxNumber.phoneId}" />
 				</h:outputFormat>
 			</f:facet>
@@ -35,7 +49,12 @@
 			<p:column>
 				<p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-				<p:link id="contactId" styleClass="table-data-field" outcome="admin_show_contact" value="#{contact.contactId}">
+				<p:link
+					id="contactId"
+					styleClass="table-data-field"
+					outcome="admin_show_contact"
+					value="#{contact.contactId}"
+					>
 					<f:param name="contactId" value="#{contact.contactId}" />
 				</p:link>
 			</p:column>
@@ -67,9 +86,13 @@
 			<p:column>
 				<p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-				<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
+				<p:link
+					id="contactEmailAddress"
+					styleClass="table-data-field"
+					href="mailto:#{contact.contactEmailAddress}"
+					>
 					<h:outputText value="#{contact.contactEmailAddress}" />
-				</h:outputLink>
+				</p:link>
 			</p:column>
 
 			<p:column>
@@ -78,9 +101,11 @@
 				<div class="table-data-field">
 					<ul class="navbar-mini">
 						<li class="navlink-mini">
-							<p:link outcome="admin_unlink_contact_fax">
+							<p:link
+								outcome="admin_unlink_contact_fax"
+								>
 								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE}" />
-								<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
+								<f:param name="faxId" value="#{beanHelper.faxNumber.phoneId}" />
 								<f:param name="contactId" value="#{contact.contactId}" />
 							</p:link>
 						</li>
diff --git a/web/admin/financial/receipt/admin_receipt_edit.xhtml b/web/admin/financial/receipt/admin_receipt_edit.xhtml
new file mode 100644
index 00000000..6b2ce982
--- /dev/null
+++ b/web/admin/financial/receipt/admin_receipt_edit.xhtml
@@ -0,0 +1,87 @@
+<?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"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<ui:define name="metadata">
+		<f:metadata>
+			<f:viewParam
+				name="receiptId"
+				value="#{adminReceiptActionController.currentReceipt}"
+				converter="ReceiptConverter"
+				required="true"
+				requiredMessage="#{project.ERROR_PARAMETER_RECEIPT_ID_NOT_SET}"
+				converterMessage="#{project.PARAMETER_RECEIPT_ID_INVALID}"
+				/>
+
+			<f:viewAction
+				action="#{adminReceiptActionController.copyAllReceiptProperties()}"
+				/>
+		</f:metadata>
+	</ui:define>
+
+	<ui:define name="document_admin_title">
+		<h:outputText value="#{project.PAGE_TITLE_ADMIN_FINANCIALS_EDIT_RECEIPT}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{project.CONTENT_TITLE_ADMIN_FINANCIALS_EDIT_RECEIPT}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<h:form
+			id="form-edit-receipt"
+			rendered="#{not empty adminReceiptActionController.currentReceipt}"
+			>
+			<h:inputHidden value="#{adminReceiptActionController.receiptId}" />
+
+			<p:panelGrid
+				columns="1"
+				layout="grid"
+				>
+				<f:facet name="header">
+					<h:outputFormat
+						value="#{project.ADMIN_EDIT_RECEIPT_NUMBER_TITLE}"
+						rendered="#{not empty adminReceiptActionController.receiptNumber}"
+						>
+						<f:param value="#{adminReceiptActionController.receiptNumber}" />
+						<f:param value="#{adminReceiptActionController.receiptId}" />
+					</h:outputFormat>
+
+					<h:outputFormat
+						value="#{project.ADMIN_EDIT_RECEIPT_TITLE}"
+						rendered="#{empty adminReceiptActionController.receiptNumber}"
+						>
+						<f:param value="#{adminReceiptActionController.receiptId}" />
+					</h:outputFormat>
+				</f:facet>
+
+				<h:panelGroup styleClass="para" layout="block">
+					<h:outputText value="#{project.ADMIN_EDIT_RECEIPT_MINIMUM_DATA}" />
+				</h:panelGroup>
+
+				<ui:include src="/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl" />
+
+				<f:facet name="footer">
+					<p:panelGrid columns="2" layout="grid">
+						<p:commandButton
+							type="reset"
+							value="#{msg.BUTTON_RESET_FORM}"
+							/>
+
+						<p:commandButton
+							type="submit"
+							value="#{project.BUTTON_ADMIN_EDIT_RECEIPT}"
+							action="#{adminReceiptActionController.updateReceipt()}"
+							/>
+					</p:panelGrid>
+				</f:facet>
+			</p:panelGrid>
+		</h:form>
+	</ui:define>
+</ui:composition>
diff --git a/web/admin/financial/receipt/admin_receipt_list.xhtml b/web/admin/financial/receipt/admin_receipt_list.xhtml
new file mode 100644
index 00000000..89afa08a
--- /dev/null
+++ b/web/admin/financial/receipt/admin_receipt_list.xhtml
@@ -0,0 +1,531 @@
+<?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:core="http://mxchange.org/jsf/core/widgets"
+	xmlns:pl="http://mxchange.org/jsf/jfinancials/links"
+	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="#{project.PAGE_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{project.CONTENT_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<h:form id="form-list-financial-receipts">
+			<p:dataTable
+				id="receiptList"
+				var="receipt"
+				value="#{receiptListController.allReceipts}"
+				paginator="true"
+				paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+				filteredValue="#{receiptListController.filteredReceipts}"
+				rows="10"
+				rowKey="#{receipt.receiptId}"
+				reflow="true"
+				resizableColumns="true"
+				rowsPerPageTemplate="5,10,20,50,100"
+				sortMode="multiple"
+				summary="#{project.TABLE_SUMMARY_ADMIN_LIST_RECEIPTS}"
+				emptyMessage="#{project.ADMIN_EMPTY_LIST_RECEIPT}"
+				widgetVar="receiptList"
+				selectionMode="single"
+				selection="#{receiptListController.selectedReceipt}"
+				skipChildren="true"
+				>
+
+				<f:facet name="header">
+					<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('receiptList').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="receiptList" trigger="toggler" />
+						</p:outputPanel>
+					</p:panelGrid>
+				</f:facet>
+
+				<p:ajax
+					event="rowSelect"
+					update="form-list-financial-receipts:receipt-details"
+					oncomplete="PF('receiptDialog').show()"
+					/>
+
+				<p:column
+					headerText="#{msg.ID_HEADER}"
+					sortBy="#{receipt.receiptId}"
+					filterBy="#{receipt.receiptId}"
+					>
+					<p:link
+						outcome="admin_show_receipt"
+						value="#{receipt.receiptId}"
+						title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}"
+						>
+						<f:param name="receiptId" value="#{receipt.receiptId}" />
+					</p:link>
+				</p:column>
+
+				<p:column
+					headerText="#{project.RECEIPT_NUMBER_HEADER}"
+					sortBy="#{receipt.receiptNumber}"
+					filterBy="#{receipt.receiptNumber}"
+					>
+					<h:outputText value="#{receipt.receiptNumber}" rendered="#{not empty receipt.receiptNumber}" />
+					<h:outputText value="-" rendered="#{empty receipt.receiptNumber}" />
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ADMIN_BRANCH_OFFICE_HEADER}"
+					sortBy="#{receipt.receiptBranchOffice}"
+					filterBy="#{receipt.receiptBranchOffice}"
+					filterMatchMode="in"
+					>
+					<f:facet name="filter">
+						<p:selectCheckboxMenu
+							filter="true"
+							filterMatchMode="contains"
+							label="#{msg.LABEL_BRANCH_OFFICES}"
+							onchange="PF('receiptList').filter()"
+							updateLabel="true"
+							title="#{msg.FILTER_BY_MULTIPLE_BRANCH_OFFICES_TITLE}"
+							>
+							<f:converter converterId="BranchOfficeConverter" />
+
+							<f:selectItems
+								value="#{branchOfficeListController.allBranchOffices}"
+								var="branchOffice"
+								itemValue="#{branchOffice}"
+								itemLabel="#{beanHelper.renderBranchOffice(branchOffice, false)}"
+								/>
+						</p:selectCheckboxMenu>
+					</f:facet>
+
+					<p:link
+						outcome="admin_show_branch_office"
+						value="#{beanHelper.renderBranchOffice(receipt.receiptBranchOffice, false)}"
+						title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}"
+						>
+						<f:param name="branchId" value="#{receipt.receiptBranchOffice.branchId}" />
+					</p:link>
+				</p:column>
+
+				<p:column
+					headerText="#{project.ADMIN_SELLER_HEADER}"
+					sortBy="#{receipt.receiptSellerEmployee}"
+					filterBy="#{receipt.receiptSellerEmployee}"
+					filterMatchMode="in"
+					>
+					<f:facet name="filter">
+						<p:selectCheckboxMenu
+							filter="true"
+							filterMatchMode="contains"
+							label="#{project.LABEL_RECEIPT_SELLERS}"
+							onchange="PF('receiptList').filter()"
+							updateLabel="true"
+							title="#{project.FILTER_BY_MULTIPLE_RECEIPT_SELLERS_TITLE}"
+							>
+
+							<f:converter converterId="EmployeeConverter" />
+
+							<f:selectItem
+								itemValue="#{null}"
+								itemLabel="#{msg.NONE_SELECTED}"
+								/>
+
+							<f:selectItems
+								value="#{employeeListController.allEmployees}"
+								var="employee"
+								itemValue="#{employee}"
+								itemLabel="#{beanHelper.renderEmployee(employee, false)}"
+								/>
+						</p:selectCheckboxMenu>
+					</f:facet>
+
+					<p:link
+						outcome="admin_show_employee"
+						value="#{beanHelper.renderEmployee(receipt.receiptSellerEmployee, false)}"
+						title="#{project.ADMIN_LINK_SHOW_RECEIPT_SELLER_EMPLOYEE_TITLE}"
+						rendered="#{not empty receipt.receiptSellerEmployee}"
+						>
+						<f:param name="userId" value="#{receipt.receiptSellerEmployee.employeeId}" />
+					</p:link>
+
+					<p:link
+						outcome="admin_assign_receipt_seller"
+						value="#{msg.ADMIN_LINK_ASSIGN}"
+						title="#{project.ADMIN_LINK_ASSIGN_RECEIPT_SELLER_EMPLOYEE_TITLE}"
+						rendered="#{empty receipt.receiptSellerEmployee}"
+						>
+						<f:param name="receiptId" value="#{receipt.receiptId}" />
+					</p:link>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ADMIN_USER_HEADER}"
+					sortBy="#{receipt.receiptUser}"
+					filterBy="#{receipt.receiptUser}"
+					filterMatchMode="in"
+					>
+					<f:facet name="filter">
+						<p:selectCheckboxMenu
+							filter="true"
+							filterMatchMode="contains"
+							label="#{msg.LABEL_USERS}"
+							onchange="PF('receiptList').filter()"
+							updateLabel="true"
+							title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
+							>
+
+							<f:converter converterId="UserConverter" />
+
+							<f:selectItem
+								itemValue="#{null}"
+								itemLabel="#{msg.NONE_SELECTED}"
+								/>
+
+							<f:selectItems
+								value="#{userListController.allUsers}"
+								var="user"
+								itemValue="#{user}"
+								itemLabel="#{beanHelper.renderUser(user)}"
+								/>
+						</p:selectCheckboxMenu>
+					</f:facet>
+
+					<p:link
+						outcome="admin_show_user"
+						value="#{beanHelper.renderUser(receipt.receiptUser)}"
+						title="#{project.ADMIN_LINK_SHOW_RECEIPT_OWNER_USER_TITLE}"
+						rendered="#{not empty receipt.receiptUser}"
+						>
+						<f:param name="userId" value="#{receipt.receiptUser.userId}" />
+					</p:link>
+
+					<p:link
+						outcome="admin_assign_receipt_user"
+						value="#{msg.ADMIN_LINK_ASSIGN}"
+						title="#{project.ADMIN_LINK_ASSIGN_RECEIPT_OWNER_USER_TITLE}"
+						rendered="#{empty receipt.receiptUser}"
+						>
+						<f:param name="receiptId" value="#{receipt.receiptId}" />
+					</p:link>
+				</p:column>
+
+				<p:column
+					headerText="#{project.ADMIN_RECEIPT_RESUMPTION_OF}"
+					sortBy="#{receipt.receiptResumptionOf}"
+					filterBy="#{receipt.receiptResumptionOf}"
+					filterMatchMode="in"
+					>
+					<f:facet name="filter">
+						<p:selectCheckboxMenu
+							filter="true"
+							filterMatchMode="contains"
+							label="#{project.LABEL_RECEIPTS}"
+							onchange="PF('receiptList').filter()"
+							updateLabel="true"
+							title="#{project.FILTER_BY_MULTIPLE_RECEIPTS_TITLE}"
+							>
+							<f:converter converterId="ReceiptConverter" />
+
+							<f:selectItems
+								value="#{receiptListController.allReceipts}"
+								var="receiptResumptionOf"
+								itemValue="#{receiptResumptionOf}"
+								itemLabel="#{receiptBeanHelper.renderReceipt(receiptResumptionOf, false)}"
+								/>
+						</p:selectCheckboxMenu>
+					</f:facet>
+
+					<p:link
+						outcome="admin_show_receipt"
+						value="#{receiptBeanHelper.renderReceipt(receipt.receiptResumptionOf, false)}"
+						title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}"
+						>
+						<f:param name="receiptId" value="#{receipt.receiptResumptionOf.receiptId}" />
+					</p:link>
+
+					<p:link
+						outcome="admin_assign_receipt_resumption"
+						value="#{msg.ADMIN_LINK_ASSIGN}"
+						title="#{project.ADMIN_LINK_ASSIGN_RECEIPT_RESUNPTION_OF_TITLE}"
+						rendered="#{empty receipt.receiptResumptionOf}"
+						>
+						<f:param name="receiptId" value="#{receipt.receiptId}" />
+					</p:link>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ADMIN_DATE_OF_ISSUE}"
+					sortBy="#{receipt.receiptIssued}"
+					filterBy="#{receipt.receiptIssued}"
+					>
+					<h:outputText id="receiptIssued" value="#{receipt.receiptIssued}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ADMIN_PAYMENT_TYPE}"
+					sortBy="#{receipt.receiptPaymentType}"
+					filterBy="#{receipt.receiptPaymentType}"
+					filterMatchMode="in"
+					>
+					<f:facet name="filter">
+						<p:selectCheckboxMenu
+							filter="true"
+							filterMatchMode="contains"
+							label="#{msg.LABEL_PAYMENT_TYPES}"
+							updateLabel="true"
+							onchange="PF('receiptList').filter()"
+							>
+							<f:converter converterId="PaymentTypeConverter" />
+
+							<f:selectItems
+								value="#{dataController.paymentTypes}"
+								var="paymentType"
+								itemValue="#{paymentType}"
+								itemLabel="#{msg[paymentType.messageKey]}"
+								/>
+						</p:selectCheckboxMenu>
+					</f:facet>
+
+					<h:outputText value="#{msg[receipt.receiptPaymentType.messageKey]}" />
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ENTRY_CREATED_HEADER}"
+					sortBy="#{receipt.receiptEntryCreated}"
+					filterable="false"
+					>
+					<h:outputText value="#{receipt.receiptEntryCreated}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ENTRY_UPDATED_HEADER}"
+					sortBy="#{receipt.receiptEntryUpdated}"
+					filterable="false"
+					>
+					<h:outputText value="#{receipt.receiptEntryUpdated}">
+						<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_receipt"
+							value="#{msg.ADMIN_LINK_SHOW_SHORT}"
+							title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}"
+							>
+							<f:param name="receiptId" value="#{receipt.receiptId}" />
+						</p:menuitem>
+
+						<p:menuitem
+							outcome="admin_edit_receipt"
+							value="#{msg.ADMIN_LINK_EDIT_SHORT}"
+							title="#{project.ADMIN_LINK_EDIT_RECEIPT_TITLE}"
+							>
+							<f:param name="receiptId" value="#{receipt.receiptId}" />
+						</p:menuitem>
+
+						<p:menuitem outcome="admin_delete_receipt">
+							<h:outputText
+								styleClass="link-danger"
+								value="#{msg.ADMIN_LINK_DELETE_SHORT}"
+								title="#{project.ADMIN_LINK_DELETE_RECEIPT_TITLE}"
+								/>
+							<f:param name="receiptId" value="#{receipt.receiptId}" />
+						</p:menuitem>
+					</p:menuButton>
+				</p:column>
+			</p:dataTable>
+
+			<p:dialog
+				dynamic="true"
+				modal="true"
+				resizable="false"
+				header="#{project.ADMIN_SINGLE_RECEIPT_DETAILS_HEADER}"
+				hideEffect="fade"
+				showEffect="fade"
+				widgetVar="receiptDialog"
+				position="top"
+				responsive="true"
+				closeOnEscape="true"
+				>
+				<p:outputPanel id="receipt-details">
+					<p:panelGrid columns="2" rendered="#{not empty receiptListController.selectedReceipt}">
+						<f:facet name="header">
+							<h:outputFormat value="#{project.ADMIN_RECEIPT_DETAILS_HEADER}">
+								<f:param value="#{receiptListController.selectedReceipt.receiptId}" />
+							</h:outputFormat>
+						</f:facet>
+
+						<p:outputLabel value="#{msg.ID_HEADER}" title="#{project.RECEIPT_ID_NUMBER_TITLE}" />
+						<h:outputText value="#{receiptListController.selectedReceipt.receiptId}" />
+
+						<p:outputLabel value="#{project.RECEIPT_NUMBER_HEADER}" title="#{project.RECEIPT_NUMBER_HEADER_TITLE}" />
+						<h:outputText value="#{receiptListController.selectedReceipt.receiptNumber}" />
+
+						<p:outputLabel value="#{project.RECEIPT_ISSUED}" title="#{project.RECEIPT_ISSUED_TITLE}" />
+						<h:outputText value="#{receiptListController.selectedReceipt.receiptIssued}">
+							<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+						</h:outputText>
+
+						<p:outputLabel value="#{msg.BRANCH_OFFICE}" title="#{project.ASSIGNED_RECEIPT_BRANCH_OFFICE_TITLE}" />
+						<p:link
+							outcome="admin_show_branch_office"
+							value="#{beanHelper.renderBranchOffice(receiptListController.selectedReceipt.receiptBranchOffice, true)}"
+							title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}"
+							>
+							<f:param name="branchId" value="#{receiptListController.selectedReceipt.receiptBranchOffice.branchId}" />
+						</p:link>
+
+						<p:outputLabel value="#{project.SELLER_HEADER}" title="#{project.ASSIGNED_RECEIPT_SELLER_TITLE}" />
+						<p:link
+							outcome="admin_show_employee"
+							value="#{beanHelper.renderEmployee(receiptListController.selectedReceipt.receiptSellerEmployee, true)}"
+							title="#{project.ADMIN_LINK_SHOW_RECEIPT_SELLER_EMPLOYEE_TITLE}"
+							rendered="#{not empty receiptListController.selectedReceipt.receiptSellerEmployee}"
+							>
+							<f:param name="userId" value="#{receiptListController.selectedReceipt.receiptSellerEmployee.employeeId}" />
+						</p:link>
+						<h:outputText value="#{project.NO_SELLER_ASSIGNED_TO_RECEIPT}" rendered="#{empty receiptListController.selectedReceipt.receiptSellerEmployee}" />
+
+						<p:outputLabel value="#{msg.USER_HEADER}" title="#{project.ASSIGNED_RECEIPT_USER_TITLE}" />
+						<p:link
+							outcome="admin_show_user"
+							value="#{beanHelper.renderUser(receiptListController.selectedReceipt.receiptUser)}"
+							title="#{project.ADMIN_LINK_SHOW_RECEIPT_USER_EMPLOYEE_TITLE}"
+							rendered="#{not empty receiptListController.selectedReceipt.receiptUser}"
+							>
+							<f:param name="userId" value="#{receiptListController.selectedReceipt.receiptUser.userId}" />
+						</p:link>
+						<h:outputText value="#{project.NO_USER_ASSIGNED_TO_RECEIPT}" rendered="#{empty receiptListController.selectedReceipt.receiptUser}" />
+
+						<p:outputLabel value="#{project.RECEIPT_RESUMPTION_OF_HEADER}" title="#{project.ASSIGNED_RECEIPT_RESUMPTION_OF_TITLE}" />
+						<p:link
+							outcome="admin_show_receipt"
+							value="#{receiptBeanHelper.renderReceipt(receiptListController.selectedReceipt.receiptResumptionOf, true)}"
+							title="#{project.ADMIN_LINK_SHOW_RECEIPT_RESUMPTION_OF_TITLE}"
+							rendered="#{not empty receiptListController.selectedReceipt.receiptResumptionOf}"
+							>
+							<f:param name="receiptId" value="#{receiptListController.selectedReceipt.receiptResumptionOf.receiptId}" />
+						</p:link>
+						<h:outputText value="#{project.NO_RESUMED_RECEIPT_ASSIGNED_TO_RECEIPT}" rendered="#{empty receiptListController.selectedReceipt.receiptResumptionOf}" />
+
+						<p:outputLabel value="#{project.RECEIPT_REGISTER_NUMBER_HEADER}" title="#{project.RECEIPT_REGISTER_NUMBER_TITLE}" />
+						<h:outputText value="#{receiptListController.selectedReceipt.receiptRegisterNumber}" />
+
+						<p:outputLabel value="#{project.BARCODE_HEADER}" title="#{project.RECEIPT_BARCODE_TITLE}" />
+						<h:outputText value="#{project.RECEIPT_NO_BARCODE_ASSIGNED}" rendered="#{empty receiptListController.selectedReceipt.receiptBarCodeNumber}" />
+						<p:barcode
+							width="100%"
+							type="#{initParam['receipt_barcode_type']}"
+							value="#{receiptListController.selectedReceipt.receiptBarCodeNumber}"
+							rendered="#{not empty receiptListController.selectedReceipt.receiptBarCodeNumber}"
+							/>
+
+						<p:outputLabel value="#{project.QRCODE_HEADER}" title="#{project.RECEIPT_QRCODE_TITLE}" />
+						<h:outputText value="#{project.RECEIPT_NO_QRCODE_ASSIGNED}" rendered="#{empty receiptListController.selectedReceipt.receiptQrCode}" />
+						<p:barcode
+							width="100%"
+							type="qr"
+							value="#{receiptListController.selectedReceipt.receiptQrCode}"
+							rendered="#{not empty receiptListController.selectedReceipt.receiptQrCode}"
+							/>
+
+						<p:outputLabel value="#{project.RECEIPT_SEQUENCE_NUMBER_HEADER}" title="#{project.RECEIPT_SEQUENCE_NUMBER_TITLE}" />
+						<h:outputText value="#{receiptListController.selectedReceipt.receiptSequenceNumber}" />
+
+						<p:outputLabel value="#{msg.PAYMENT_TYPE}" title="#{project.RECEIPT_PAYMENT_TYPE_TITLE}" />
+						<h:outputText value="#{msg[receiptListController.selectedReceipt.receiptPaymentType.messageKey]}" />
+
+						<p:outputLabel value="#{msg.ENTRY_CREATED_HEADER}" title="#{project.RECEIPT_ENTRY_CREATED_TITLE}" />
+						<h:outputText value="#{receiptListController.selectedReceipt.receiptEntryCreated}">
+							<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+						</h:outputText>
+
+						<p:outputLabel value="#{msg.ENTRY_UPDATED_HEADER}" title="#{project.RECEIPT_ENTRY_UPDATED_TITLE}" />
+						<h:outputText value="#{receiptListController.selectedReceipt.receiptEntryUpdated}">
+							<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+						</h:outputText>
+					</p:panelGrid>
+				</p:outputPanel>
+			</p:dialog>
+		</h:form>
+
+		<h:form>
+			<p:panelGrid
+				layout="grid"
+				columns="1"
+				>
+				<h:panelGroup styleClass="table-header" layout="block">
+					<h4>
+						<h:outputText value="#{project.ADMIN_ADD_RECEIPT_TITLE}" />
+					</h4>
+				</h:panelGroup>
+
+				<ui:include src="/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl" />
+
+				<p:panelGrid columns="2" layout="grid">
+					<p:commandButton
+						styleClass="reset"
+						type="reset"
+						value="#{msg.BUTTON_RESET_FORM}"
+						/>
+
+					<p:commandButton
+						type="submit"
+						value="#{project.BUTTON_ADMIN_ADD_RECEIPT}"
+						action="#{adminReceiptActionController.addReceipt()}"
+						update="form-list-financial-receipts:receiptList"
+						/>
+				</p:panelGrid>
+			</p:panelGrid>
+		</h:form>
+	</ui:define>
+</ui:composition>
diff --git a/web/admin/financial/receipt_item/admin_receipt_item_edit.xhtml b/web/admin/financial/receipt_item/admin_receipt_item_edit.xhtml
new file mode 100644
index 00000000..ab1855df
--- /dev/null
+++ b/web/admin/financial/receipt_item/admin_receipt_item_edit.xhtml
@@ -0,0 +1,87 @@
+<?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"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<ui:define name="metadata">
+		<f:metadata>
+			<f:viewParam
+				name="receiptItemId"
+				value="#{adminReceiptItemActionController.currentReceiptItem}"
+				converter="ReceiptItemConverter"
+				required="true"
+				requiredMessage="#{project.ERROR_PARAMETER_RECEIPT_ITEM_ID_NOT_SET}"
+				converterMessage="#{project.PARAMETER_RECEIPT_ITEM_ID_INVALID}"
+				/>
+
+			<f:viewAction
+				action="#{adminReceiptItemActionController.copyAllReceiptItemProperties()}"
+				/>
+		</f:metadata>
+	</ui:define>
+
+	<ui:define name="document_admin_title">
+		<h:outputText value="#{project.PAGE_TITLE_ADMIN_FINANCIALS_EDIT_RECEIPT_ITEM}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{project.CONTENT_TITLE_ADMIN_FINANCIALS_EDIT_RECEIPT_ITEM}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<h:form
+			id="form-edit-receipt-item"
+			rendered="#{not empty adminReceiptItemActionController.currentReceiptItem}"
+			>
+			<h:inputHidden value="#{adminReceiptItemActionController.itemId}" />
+
+			<p:panelGrid
+				columns="1"
+				layout="grid"
+				>
+				<f:facet name="header">
+					<h:outputFormat
+						value="#{project.ADMIN_EDIT_RECEIPT_ITEM_NUMBER_TITLE}"
+						rendered="#{not empty adminReceiptItemActionController.itemReceipt.receiptNumber}"
+						>
+						<f:param value="#{adminReceiptItemActionController.itemReceipt.receiptNumber}" />
+						<f:param value="#{adminReceiptItemActionController.itemId}" />
+					</h:outputFormat>
+
+					<h:outputFormat
+						value="#{project.ADMIN_EDIT_RECEIPT_ITEM_TITLE}"
+						rendered="#{empty adminReceiptItemActionController.itemReceipt.receiptNumber}"
+						>
+						<f:param value="#{adminReceiptItemActionController.itemId}" />
+					</h:outputFormat>
+				</f:facet>
+
+				<h:panelGroup styleClass="para" layout="block">
+					<h:outputText value="#{project.ADMIN_EDIT_RECEIPT_ITEM_MINIMUM_DATA}" />
+				</h:panelGroup>
+
+				<ui:include src="/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl" />
+
+				<f:facet name="footer">
+					<p:panelGrid columns="2" layout="grid">
+						<p:commandButton
+							type="reset"
+							value="#{msg.BUTTON_RESET_FORM}"
+							/>
+
+						<p:commandButton
+							type="submit"
+							value="#{project.BUTTON_ADMIN_EDIT_RECEIPT_ITEM}"
+							action="#{adminReceiptItemActionController.updateReceiptItem()}"
+							/>
+					</p:panelGrid>
+				</f:facet>
+			</p:panelGrid>
+		</h:form>
+	</ui:define>
+</ui:composition>
diff --git a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
new file mode 100644
index 00000000..c986c129
--- /dev/null
+++ b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
@@ -0,0 +1,497 @@
+<?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"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<ui:define name="document_admin_title">
+		<h:outputText value="#{project.PAGE_TITLE_ADMIN_FINANCIALS_RECEIPT_ITEM_LIST}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{project.CONTENT_TITLE_ADMIN_FINANCIALS_RECEIPT_ITEM_LIST}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<h:form id="form-list-financial-receipt-items">
+			<p:dataTable
+				id="receiptItemList"
+				var="receiptItem"
+				value="#{receiptItemListController.allReceiptItems}"
+				paginator="true"
+				paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+				filteredValue="#{receiptItemListController.filteredReceiptItems}"
+				rows="10"
+				rowKey="#{receiptItem.itemId}"
+				reflow="true"
+				resizableColumns="true"
+				rowsPerPageTemplate="5,10,20,50,100"
+				sortMode="multiple"
+				summary="#{project.TABLE_SUMMARY_ADMIN_LIST_RECEIPT_ITEMS}"
+				emptyMessage="#{project.ADMIN_EMPTY_LIST_RECEIPT_ITEM}"
+				widgetVar="receiptItemList"
+				selectionMode="single"
+				selection="#{receiptItemListController.selectedReceiptItem}"
+				skipChildren="true"
+				>
+
+				<f:facet name="header">
+					<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('receiptItemList').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="receiptItemList" trigger="toggler" />
+						</p:outputPanel>
+					</p:panelGrid>
+				</f:facet>
+
+				<p:ajax
+					event="rowSelect"
+					update="form-list-financial-receipt-items:receipt-item-details"
+					oncomplete="PF('receiptItemDialog').show()"
+					/>
+
+				<p:column
+					headerText="#{msg.ID_HEADER}"
+					sortBy="#{receiptItem.itemId}"
+					filterBy="#{receiptItem.itemId}"
+					>
+					<p:link
+						outcome="admin_show_receipt_item"
+						value="#{receiptItem.itemId}"
+						title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_TITLE}"
+						>
+						<f:param name="receiptItemId" value="#{receiptItem.itemId}" />
+					</p:link>
+				</p:column>
+
+				<p:column
+					headerText="#{product.BRAND_NAME_HEADER}"
+					sortBy="#{receiptItem.itemBrandName}"
+					filterBy="#{receiptItem.itemBrandName}"
+					>
+					<h:outputText value="#{receiptItem.itemBrandName}" />
+				</p:column>
+
+				<p:column
+					headerText="#{project.RECIPIENT_ITEM_COUPON_NUMBER_HEADER}"
+					sortBy="#{receiptItem.itemCouponNumber}"
+					filterBy="#{receiptItem.itemCouponNumber}"
+					>
+					<h:outputText value="#{receiptItem.itemCouponNumber}" />
+				</p:column>
+
+				<p:column
+					headerText="#{project.GROSS_PRICE_HEADER}"
+					sortBy="#{receiptItem.itemGrossPrice}"
+					filterBy="#{receiptItem.itemGrossPrice}"
+					filterFunction="#{productListController.filterByPrice}"
+					>
+					<h:outputText value="#{receiptItem.itemGrossPrice}" />
+				</p:column>
+
+				<p:column
+					headerText="#{project.NET_PRICE_HEADER}"
+					sortBy="#{receiptItem.itemNetPrice}"
+					filterBy="#{receiptItem.itemNetPrice}"
+					filterFunction="#{productListController.filterByPrice}"
+					>
+					<h:outputText value="#{receiptItem.itemNetPrice}">
+						<!-- @TODO Hard-coded EUR again -->
+						<f:convertNumber type="currency" currencyCode="EUR" />
+					</h:outputText>
+				</p:column>
+
+				<p:column
+					headerText="#{project.TAX_RATE_HEADER}"
+					sortBy="#{receiptItem.itemTaxRate}"
+					filterBy="#{receiptItem.itemTaxRate}"
+					>
+					<h:outputText value="#{receiptItem.itemTaxRate}">
+						<!-- @TODO No real percentage number, 7.0 means 7.0%, not 700% -->
+						<f:convertNumber type="number" />
+					</h:outputText>
+				</p:column>
+
+				<p:column
+					headerText="#{project.IS_DISCOUNT_HEADER}"
+					sortBy="#{receiptItem.itemIsDiscount}"
+					filterBy="#{receiptItem.itemIsDiscount}"
+					filterMatchMode="exact"
+					>
+					<f:facet name="filter">
+						<p:selectOneMenu onchange="PF('receiptItemList').filter()">
+							<f:converter converterId="javax.faces.Boolean" />
+							<f:selectItem itemLabel="#{msg.CHOICE_ALL}" itemValue="#{null}" />
+							<f:selectItem itemLabel="#{msg.CHOICE_YES}" itemValue="true" />
+							<f:selectItem itemLabel="#{msg.CHOICE_NO}" itemValue="false" />
+						</p:selectOneMenu>
+					</f:facet>
+
+					<h:outputText value="#{receiptItem.itemIsDiscount ? msg.CHOICE_YES : msg.CHOICE_NO}" />
+				</p:column>
+
+				<p:column
+					headerText="#{project.IS_REFUND_HEADER}"
+					sortBy="#{receiptItem.itemIsRefund}"
+					filterBy="#{receiptItem.itemIsRefund}"
+					filterMatchMode="exact"
+					>
+					<f:facet name="filter">
+						<p:selectOneMenu onchange="PF('receiptItemList').filter()">
+							<f:converter converterId="javax.faces.Boolean" />
+							<f:selectItem itemLabel="#{msg.CHOICE_ALL}" itemValue="#{null}" />
+							<f:selectItem itemLabel="#{msg.CHOICE_YES}" itemValue="true" />
+							<f:selectItem itemLabel="#{msg.CHOICE_NO}" itemValue="false" />
+						</p:selectOneMenu>
+					</f:facet>
+
+					<h:outputText value="#{receiptItem.itemIsRefund ? msg.CHOICE_YES : msg.CHOICE_NO}" />
+				</p:column>
+
+				<p:column
+					headerText="#{project.RECEIPT_ITEM_NUMBER_HEADER}"
+					sortBy="#{receiptItem.itemNumber}"
+					filterBy="#{receiptItem.itemNumber}"
+					>
+					<h:outputText value="#{receiptItem.itemNumber}" />
+				</p:column>
+
+				<p:column
+					headerText="#{project.ADMIN_RECEIPT_HEADER}"
+					sortBy="#{receiptItem.itemReceipt}"
+					filterBy="#{receiptItem.itemReceipt}"
+					filterMatchMode="in"
+					>
+					<f:facet name="filter">
+						<p:selectCheckboxMenu
+							filter="true"
+							filterMatchMode="contains"
+							label="#{project.LABEL_RECEIPTS}"
+							onchange="PF('receiptItemList').filter()"
+							updateLabel="true"
+							title="#{project.FILTER_BY_MULTIPLE_RECEIPTS_TITLE}"
+							>
+							<f:converter converterId="ReceiptConverter" />
+
+							<f:selectItems
+								value="#{receiptListController.allReceipts}"
+								var="receipt"
+								itemValue="#{receipt}"
+								itemLabel="#{receiptBeanHelper.renderReceipt(receipt, false)}"
+								/>
+						</p:selectCheckboxMenu>
+					</f:facet>
+
+					<p:link
+						outcome="admin_show_receipt"
+						value="#{receiptBeanHelper.renderReceipt(receiptItem.itemReceipt, false)}"
+						title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}"
+						>
+						<f:param name="receiptId" value="#{receiptItem.itemReceipt.receiptId}" />
+					</p:link>
+				</p:column>
+
+				<p:column
+					headerText="#{product.ADMIN_PRODUCT_HEADER}"
+					sortBy="#{receiptItem.itemProduct}"
+					filterBy="#{receiptItem.itemProduct}"
+					filterMatchMode="in"
+					>
+					<f:facet name="filter">
+						<p:selectCheckboxMenu
+							filter="true"
+							filterMatchMode="contains"
+							label="#{product.LABEL_PRODUCTS}"
+							onchange="PF('receiptItemList').filter()"
+							updateLabel="true"
+							title="#{product.FILTER_BY_MULTIPLE_GENERIC_PRODUCTS_TITLE}"
+							>
+							<f:converter converterId="GenericProductConverter" />
+
+							<f:selectItems
+								value="#{productListController.allProducts}"
+								var="genericProduct"
+								itemValue="#{genericProduct}"
+								itemLabel="#{productBeanHelper.renderGenericProduct(genericProduct)}"
+								/>
+						</p:selectCheckboxMenu>
+					</f:facet>
+
+					<p:link
+						outcome="admin_show_generic_product"
+						value="#{productBeanHelper.renderGenericProduct(receiptItem.itemProduct)}"
+						title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_PRODUCT_TITLE}"
+						>
+						<f:param name="productId" value="#{receiptItem.itemProduct.productId}" />
+					</p:link>
+				</p:column>
+
+				<p:column
+					headerText="#{project.RECEIPT_ITEM_PRODUCT_QUANTITY_HEADER}"
+					sortBy="#{receiptItem.itemProductQuantity}"
+					filterBy="#{receiptItem.itemProductQuantity}"
+					>
+					<h:outputText value="#{receiptItem.itemProductQuantity}" />
+				</p:column>
+
+				<p:column
+					headerText="#{product.ADMIN_PRODUCT_MANUFACTURER_HEADER}"
+					sortBy="#{receiptItem.itemManufacturer.companyName}"
+					filterBy="#{receiptItem.itemManufacturer}"
+					filterMatchMode="in"
+					>
+					<f:facet name="filter">
+						<p:selectCheckboxMenu
+							filter="true"
+							filterMatchMode="contains"
+							label="#{msg.LABEL_COMPANIES}"
+							onchange="PF('receiptItemList').filter()"
+							updateLabel="true"
+							title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
+							>
+							<f:converter converterId="BasicCompanyDataConverter" />
+
+							<f:selectItems
+								value="#{basicDataListController.allBasicData}"
+								var="basicData"
+								itemValue="#{basicData}"
+								itemLabel="#{beanHelper.renderBasicData(basicData, true, false)}"
+								/>
+						</p:selectCheckboxMenu>
+					</f:facet>
+
+					<p:link
+						outcome="admin_show_basic_data"
+						value="#{beanHelper.renderBasicData(receiptItem.itemManufacturer, true, false)}"
+						title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
+						rendered="#{not empty receiptItem.itemManufacturer}"
+						>
+						<f:param name="basicDataId" value="#{receiptItem.itemManufacturer.basicDataId}" />
+					</p:link>
+
+					<h:outputText
+						value="#{msg.ADMIN_NOT_ASSIGNED}"
+						title="#{project.ADMIN_NO_RECEIPT_ITEM_MANUFACTURER_ASSIGNED_TITLE}"
+						rendered="#{empty receiptItem.itemManufacturer}"
+						/>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ENTRY_CREATED_HEADER}"
+					sortBy="#{receiptItem.itemEntryCreated}"
+					filterable="false"
+					>
+					<h:outputText value="#{receiptItem.itemEntryCreated}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ENTRY_UPDATED_HEADER}"
+					sortBy="#{receiptItem.itemEntryUpdated}"
+					filterable="false"
+					>
+					<h:outputText value="#{receiptItem.itemEntryUpdated}">
+						<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_receipt_item"
+							value="#{msg.ADMIN_LINK_SHOW_SHORT}"
+							title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_TITLE}"
+							>
+							<f:param name="receiptItemId" value="#{receiptItem.itemId}" />
+						</p:menuitem>
+
+						<p:menuitem
+							outcome="admin_edit_receipt_item"
+							value="#{msg.ADMIN_LINK_EDIT_SHORT}"
+							title="#{project.ADMIN_LINK_EDIT_RECEIPT_ITEM_TITLE}"
+							>
+							<f:param name="receiptItemId" value="#{receiptItem.itemId}" />
+						</p:menuitem>
+
+						<p:menuitem outcome="admin_delete_receipt_item">
+							<h:outputText
+								styleClass="link-danger"
+								value="#{msg.ADMIN_LINK_DELETE_SHORT}"
+								title="#{project.ADMIN_LINK_DELETE_RECEIPT_ITEM_TITLE}"
+								/>
+							<f:param name="receiptId" value="#{receiptItem.itemId}" />
+						</p:menuitem>
+					</p:menuButton>
+				</p:column>
+			</p:dataTable>
+
+			<p:dialog
+				dynamic="true"
+				modal="true"
+				resizable="false"
+				header="#{project.ADMIN_SINGLE_RECEIPT_ITEM_DETAILS_HEADER}"
+				hideEffect="fade"
+				showEffect="fade"
+				widgetVar="receiptItemDialog"
+				position="top"
+				responsive="true"
+				closeOnEscape="true"
+				>
+				<p:outputPanel id="receipt-item-details">
+					<p:panelGrid columns="2" rendered="#{not empty receiptItemListController.selectedReceiptItem}">
+						<f:facet name="header">
+							<h:outputFormat value="#{project.ADMIN_RECEIPT_ITEM_DETAILS_HEADER}">
+								<f:param value="#{receiptItemListController.selectedReceiptItem.itemId}" />
+							</h:outputFormat>
+						</f:facet>
+
+						<p:outputLabel value="#{msg.ID_HEADER}" title="#{project.RECEIPT_ITEM_ID_NUMBER_TITLE}" />
+						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemId}" />
+
+						<p:outputLabel value="#{project.RECEIPT_ITEM_NUMBER_HEADER}" title="#{project.RECEIPT_ITEM_NUMBER_TITLE}" />
+						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemNumber}" />
+
+						<p:outputLabel value="#{project.RECEIPT_ITEM_PRODUCT_QUANTITY_HEADER}" title="#{project.RECEIPT_ITEM_PRODUCT_QUANTITY_TITLE}" />
+						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemProductQuantity}" />
+
+						<p:outputLabel value="#{project.BRAND_NAME_HEADER}" title="#{project.RECEIPT_ITEM_BRAND_NAME_TITLE}" />
+						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemBrandName}" />
+
+						<p:outputLabel value="#{product.GENERIC_PRODUCT_I18N_KEY_HEADER}" title="#{product.GENERIC_PRODUCT_I18N_KEY_TITLE}" />
+						<p:link
+							outcome="admin_show_generic_product"
+							value="#{productBeanHelper.renderGenericProduct(receiptItemListController.selectedReceiptItem.itemProduct)}"
+							title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_PRODUCT_TITLE}"
+							>
+							<f:param name="productId" value="#{receiptItemListController.selectedReceiptItem.itemProduct.productId}" />
+						</p:link>
+
+						<p:outputLabel value="#{msg.ADMIN_MANUFACTURER_HEADER}" title="#{project.ADMIN_ASSIGNED_RECEIPT_ITEM_MANUFACTURER_TITLE}" />
+						<p:link
+							outcome="admin_show_basic_data"
+							title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
+							rendered="#{not empty receiptItemListController.selectedReceiptItem.itemManufacturer}"
+							>
+							<h:outputText value="#{beanHelper.renderBasicData(receiptItemListController.selectedReceiptItem.itemManufacturer, false, true)}" />
+						</p:link>
+						<h:outputText value="#{project.RECEIPT_ITEM_HAS_NO_MANUFACTURER_ASSIGNED}" rendered="#{empty receiptItemListController.selectedReceiptItem.itemManufacturer}" />
+
+						<p:outputLabel value="#{project.GROSS_PRICE_HEADER}" title="#{project.RECEIPT_ITEM_GROSS_PRICE_TITLE}" />
+						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemGrossPrice}">
+							<!-- @TODO Hard-coded EUR again -->
+							<f:convertNumber type="currency" currencyCode="EUR" />
+						</h:outputText>
+
+						<p:outputLabel value="#{project.NET_PRICE_HEADER}" title="#{project.RECEIPT_ITEM_NET_PRICE_TITLE}" />
+						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemNetPrice}">
+							<!-- @TODO Hard-coded EUR again -->
+							<f:convertNumber type="currency" currencyCode="EUR" />
+						</h:outputText>
+
+						<p:outputLabel value="#{project.TAX_RATE_HEADER}" title="#{project.RECEIPT_ITEM_TAX_RATE_TITLE}" />
+						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemTaxRate}">
+							<!-- @TODO No real percentage number, 7.0 means 7.0%, not 700% -->
+							<f:convertNumber type="number" />
+						</h:outputText>
+
+						<p:outputLabel value="#{project.IS_DISCOUNT_HEADER}" title="#{project.RECEIPT_ITEM_IS_DISCOUNT_TITLE}" />
+						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemIsDiscount ? msg.CHOICE_YES : msg.CHOICE_NO}" />
+
+						<p:outputLabel value="#{project.IS_REFUND_HEADER}" title="#{project.RECEIPT_ITEM_IS_REFUND_TITLE}" />
+						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemIsRefund ? msg.CHOICE_YES : msg.CHOICE_NO}" />
+
+						<p:outputLabel value="#{project.ASSIGNED_RECEIPT_HEADER}" title="#{project.RECEIPT_ITEM_ASSIGNED_RECEIPT_TITLE}" />
+						<p:link
+							outcome="admin_show_receipt"
+							value="#{receiptBeanHelper.renderReceipt(receiptItemListController.selectedReceiptItem.itemReceipt, true)}"
+							title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}"
+							>
+							<f:param name="receiptId" value="#{receiptItemListController.selectedReceiptItem.itemReceipt.receiptId}" />
+						</p:link>
+
+						<p:outputLabel value="#{msg.ENTRY_CREATED_HEADER}" title="#{project.RECEIPT_ITEM_CREATED_TITLE}" />
+						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemEntryCreated}">
+							<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+						</h:outputText>
+
+						<p:outputLabel value="#{msg.ENTRY_UPDATED_HEADER}" title="#{project.RECEIPT_ITEM_UPDATED_TITLE}" />
+						<h:outputText value="#{receiptItemListController.selectedReceiptItem.itemEntryUpdated}">
+							<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+						</h:outputText>
+					</p:panelGrid>
+				</p:outputPanel>
+			</p:dialog>
+		</h:form>
+
+		<h:form>
+			<p:panelGrid
+				columns="1"
+				layout="grid"
+				>
+				<h:panelGroup styleClass="table-header" layout="block">
+					<h4>
+						<h:outputText value="#{project.ADMIN_ADD_RECEIPT_ITEM_TITLE}" />
+					</h4>
+				</h:panelGroup>
+
+				<ui:include src="/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl" />
+
+				<p:panelGrid columns="2" layout="grid">
+					<p:commandButton
+						styleClass="reset"
+						type="reset"
+						value="#{msg.BUTTON_RESET_FORM}"
+						/>
+
+					<p:commandButton
+						type="submit"
+						value="#{project.BUTTON_ADMIN_ADD_RECEIPT_TEM}"
+						action="#{adminReceiptItemActionController.addReceiptItem()}"
+						update="form-list-financial-receipt-items:receiptItemList"
+						/>
+				</p:panelGrid>
+			</p:panelGrid>
+		</h:form>
+	</ui:define>
+</ui:composition>
diff --git a/web/admin/generic_product/admin_generic_product_delete.xhtml b/web/admin/generic_product/admin_generic_product_delete.xhtml
new file mode 100644
index 00000000..a19da9e2
--- /dev/null
+++ b/web/admin/generic_product/admin_generic_product_delete.xhtml
@@ -0,0 +1,39 @@
+<?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"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<ui:define name="metadata">
+		<f:metadata>
+			<f:viewParam
+				name="productId"
+				value="#{adminGenericProductActionController.currentProduct}"
+				converter="GenericProductConverter"
+				required="true"
+				requiredMessage="#{product.ERROR_PARAMETER_PRODUCT_ID_NOT_SET}"
+				converterMessage="#{product.PARAMETER_PRODUCT_ID_INVALID}"
+				/>
+
+			<f:viewAction
+				action="#{adminGenericProductActionController.copyAllProductProperties()}"
+				/>
+		</f:metadata>
+	</ui:define>
+
+	<ui:define name="document_admin_title">
+		<h:outputText value="#{product.PAGE_TITLE_ADMIN_GENERIC_PRODUCT_DELETE}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{product.CONTENT_TITLE_ADMIN_GENERIC_PRODUCT_DELETE}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<!-- @TODO Here goes your content. //-->
+	</ui:define>
+</ui:composition>
diff --git a/web/admin/generic_product/admin_generic_product_edit.xhtml b/web/admin/generic_product/admin_generic_product_edit.xhtml
new file mode 100644
index 00000000..90a562c2
--- /dev/null
+++ b/web/admin/generic_product/admin_generic_product_edit.xhtml
@@ -0,0 +1,81 @@
+<?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"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<ui:define name="metadata">
+		<f:metadata>
+			<f:viewParam
+				name="productId"
+				value="#{adminGenericProductActionController.currentProduct}"
+				converter="GenericProductConverter"
+				required="true"
+				requiredMessage="#{product.ERROR_PARAMETER_PRODUCT_ID_NOT_SET}"
+				converterMessage="#{product.PARAMETER_PRODUCT_ID_INVALID}"
+				/>
+
+			<f:viewAction
+				action="#{adminGenericProductActionController.copyAllProductProperties()}"
+				/>
+		</f:metadata>
+	</ui:define>
+
+	<ui:define name="document_admin_title">
+		<h:outputText value="#{product.PAGE_TITLE_ADMIN_GENERIC_PRODUCT_EDIT}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{product.CONTENT_TITLE_ADMIN_GENERIC_PRODUCT_EDIT}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<h:form
+			id="admin-form-edit-generic-product"
+			rendered="#{not empty adminGenericProductActionController.currentProduct}"
+			>
+			<h:inputHidden value="#{adminGenericProductActionController.productId}" />
+
+			<p:panelGrid
+				columns="1"
+				layout="grid"
+				>
+				<f:facet name="header">
+					<h:outputFormat
+						value="#{product.ADMIN_EDIT_GENERIC_PRODUCT_TITLE}"
+						title="#{local[adminGenericProductActionController.productI18nKey]}"
+						>
+						<f:param value="#{adminGenericProductActionController.productId}" />
+					</h:outputFormat>
+				</f:facet>
+
+				<h:panelGroup styleClass="para" layout="block">
+					<h:outputText value="#{product.ADMIN_EDIT_GENERIC_PRODUCT_MINIMUM_DATA}" />
+				</h:panelGroup>
+
+				<ui:include src="/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl">
+					<ui:param name="bypassDuplicateI18nKey" value="true" />
+				</ui:include>
+
+				<f:facet name="footer">
+					<p:panelGrid columns="2" layout="grid">
+						<p:commandButton
+							type="reset"
+							value="#{msg.BUTTON_RESET_FORM}"
+							/>
+
+						<p:commandButton
+							type="submit"
+							value="#{product.BUTTON_ADMIN_EDIT_GENERIC_PRODUCT}"
+							action="#{adminGenericProductActionController.updateProduct()}"
+							/>
+					</p:panelGrid>
+				</f:facet>
+			</p:panelGrid>
+		</h:form>
+	</ui:define>
+</ui:composition>
diff --git a/web/admin/generic_product/admin_generic_product_list.xhtml b/web/admin/generic_product/admin_generic_product_list.xhtml
new file mode 100644
index 00000000..b974c56e
--- /dev/null
+++ b/web/admin/generic_product/admin_generic_product_list.xhtml
@@ -0,0 +1,457 @@
+<?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"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<ui:define name="document_admin_title">
+		<h:outputText value="#{product.PAGE_TITLE_ADMIN_LIST_GENERIC_PRODUCT}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{product.CONTENT_TITLE_ADMIN_LIST_GENERIC_PRODUCT}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<h:form id="form-list-products">
+			<p:dataTable
+				id="productList"
+				var="genericProduct"
+				value="#{productListController.allProducts}"
+				paginator="true"
+				paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+				filteredValue="#{productListController.filteredProducts}"
+				rows="10"
+				rowKey="#{genericProduct.productId}"
+				reflow="true"
+				resizableColumns="true"
+				rowsPerPageTemplate="5,10,20,50,100"
+				sortMode="multiple"
+				summary="#{product.TABLE_SUMMARY_ADMIN_LIST_GENERIC_PRODUCTS}"
+				emptyMessage="#{product.ADMIN_EMPTY_LIST_GENERIC_PRODUCTS}"
+				widgetVar="productList"
+				selectionMode="single"
+				selection="#{productListController.selectedProduct}"
+				skipChildren="true"
+				>
+
+				<f:facet name="header">
+					<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('productList').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="productList" trigger="toggler" />
+						</p:outputPanel>
+					</p:panelGrid>
+				</f:facet>
+
+				<p:ajax
+					event="rowSelect"
+					update="form-list-products:product-details"
+					oncomplete="PF('productDialog').show()"
+					/>
+
+				<p:column
+					headerText="#{msg.ID_HEADER}"
+					sortBy="#{genericProduct.productId}"
+					filterable="false"
+					>
+					<p:link
+						outcome="admin_show_generic_product"
+						title="#{product.ADMIN_LINK_SHOW_GENERIC_PRODUCT_TITLE}"
+						value="#{genericProduct.productId}"
+						>
+						<f:param name="productId" value="#{genericProduct.productId}" />
+					</p:link>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ADMIN_I18N_KEY_HEADER}"
+					sortBy="#{local[genericProduct.productI18nKey]}"
+					filterBy="#{local[genericProduct.productI18nKey]}"
+					filterMatchMode="contains"
+					>
+					<h:outputText value="#{local[genericProduct.productI18nKey]}" title="#{genericProduct.productI18nKey}" />
+				</p:column>
+
+				<p:column
+					headerText="#{product.ADMIN_PRODUCT_NUMBER_HEADER}"
+					sortBy="#{genericProduct.productNumber}"
+					filterBy="#{genericProduct.productNumber}"
+					filterMatchMode="contains"
+					>
+					<h:outputText value="#{genericProduct.productNumber}" rendered="#{not empty genericProduct.productNumber}" />
+					<h:outputText value="-" rendered="#{empty genericProduct.productNumber}" />
+				</p:column>
+
+				<p:column
+					headerText="#{product.ADMIN_PRODUCT_FSC_NUMBER_HEADER}"
+					sortBy="#{genericProduct.productFscNumber}"
+					filterBy="#{genericProduct.productFscNumber}"
+					filterMatchMode="contains"
+					>
+					<h:outputText value="#{genericProduct.productFscNumber}" rendered="#{not empty genericProduct.productFscNumber}" />
+					<h:outputText value="-" rendered="#{empty genericProduct.productFscNumber}" />
+				</p:column>
+
+				<p:column
+					headerText="#{product.ADMIN_PRODUCT_BARCODE_HEADER}"
+					sortBy="#{genericProduct.productBarCodeNumber}"
+					filterBy="#{genericProduct.productBarCodeNumber}"
+					filterMatchMode="contains"
+					>
+					<h:outputText value="#{genericProduct.productBarCodeNumber}" rendered="#{not empty genericProduct.productBarCodeNumber}" />
+					<h:outputText value="-" rendered="#{empty genericProduct.productBarCodeNumber}" />
+				</p:column>
+
+				<p:column
+					headerText="#{product.ADMIN_PRODUCT_CATEGORY_HEADER}"
+					sortBy="#{genericProduct.productCategory}"
+					filterBy="#{genericProduct.productCategory}"
+					filterMatchMode="in"
+					>
+					<f:facet name="filter">
+						<p:selectCheckboxMenu
+							filter="true"
+							filterMatchMode="contains"
+							label="#{product.LABEL_PRODUCT_CATEGORIES}"
+							onchange="PF('productList').filter()"
+							updateLabel="true"
+							title="#{product.FILTER_BY_MULTIPLE_PRODUCT_CATEGORIES_TITLE}"
+							>
+							<f:converter converterId="ProductCategoryConverter" />
+
+							<f:selectItems
+								value="#{productCategoryListController.allProductCategories}"
+								var="category"
+								itemValue="#{category}"
+								itemLabel="#{productBeanHelper.renderProductCategory(category)}"
+								/>
+						</p:selectCheckboxMenu>
+					</f:facet>
+
+					<p:link
+						outcome="admin_show_product_category"
+						title="#{product.ADMIN_LINK_SHOW_GENERIC_PRODUCT_CATEGORY_TITLE}"
+						value="#{local[genericProduct.productCategory.categoryI18nKey]}"
+						>
+						<f:param name="categoryId" value="#{genericProduct.productCategory.categoryId}" />
+					</p:link>
+				</p:column>
+
+				<p:column
+					headerText="#{product.GROSS_PRICE_HEADER}"
+					sortBy="#{genericProduct.productGrossPrice}"
+					filterBy="#{genericProduct.productGrossPrice}"
+					filterFunction="#{productListController.filterByPrice}"
+					>
+					<h:outputText value="#{genericProduct.productGrossPrice}">
+						<!-- @TODO Hard-coded EUR again -->
+						<f:convertNumber type="currency" currencyCode="EUR" />
+					</h:outputText>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.AVAILABLE_HEADER}"
+					sortBy="#{genericProduct.productAvailability}"
+					filterBy="#{genericProduct.productAvailability}"
+					filterMatchMode="exact"
+					>
+					<f:facet name="filter">
+						<p:selectOneMenu onchange="PF('productList').filter()">
+							<f:converter converterId="javax.faces.Boolean" />
+							<f:selectItem itemLabel="#{msg.CHOICE_ALL}" itemValue="#{null}" />
+							<f:selectItem itemLabel="#{msg.CHOICE_YES}" itemValue="true" />
+							<f:selectItem itemLabel="#{msg.CHOICE_NO}" itemValue="false" />
+						</p:selectOneMenu>
+					</f:facet>
+
+					<h:outputText value="#{genericProduct.productAvailability ? msg.CHOICE_YES : msg.CHOICE_NO}" />
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ADMIN_MANUFACTURER_HEADER}"
+					sortBy="#{genericProduct.productManufacturer}"
+					filterBy="#{genericProduct.productManufacturer}"
+					filterMatchMode="in"
+					>
+					<f:facet name="filter">
+						<p:selectCheckboxMenu
+							filter="true"
+							filterMatchMode="contains"
+							label="#{msg.LABEL_COMPANIES}"
+							onchange="PF('productList').filter()"
+							updateLabel="true"
+							title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
+							>
+							<f:converter converterId="BasicCompanyDataConverter" />
+
+							<f:selectItems
+								value="#{basicDataListController.allBasicData}"
+								var="basicData"
+								itemValue="#{basicData}"
+								itemLabel="#{beanHelper.renderBasicData(basicData, true, false)}"
+								/>
+						</p:selectCheckboxMenu>
+					</f:facet>
+
+					<p:link
+						outcome="admin_show_basic_data"
+						value="#{beanHelper.renderBasicData(genericProduct.productManufacturer, true, false)}"
+						title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
+						rendered="#{not empty genericProduct.productManufacturer}"
+						>
+						<f:param name="basicDataId" value="#{genericProduct.productManufacturer.basicDataId}" />
+					</p:link>
+
+					<h:outputText
+						value="#{msg.ADMIN_NOT_ASSIGNED}"
+						title="#{product.ADMIN_NO_PRODUCT_MANUFACTURER_ASSIGNED_TITLE}"
+						rendered="#{empty genericProduct.productManufacturer}"
+						/>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ENTRY_CREATED_HEADER}"
+					sortBy="#{genericProduct.productEntryCreated}"
+					filterable="false"
+					>
+					<h:outputText value="#{genericProduct.productEntryCreated}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ENTRY_UPDATED_HEADER}"
+					sortBy="#{genericProduct.productEntryUpdated}"
+					filterable="false"
+					>
+					<h:outputText value="#{genericProduct.productEntryUpdated}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+					sortable="false"
+					filterable="false"
+					>
+					<p:menuButton value="#{msg.OPTIONS}">
+						<p:menuitem
+							outcome="admin_show_generic_product"
+							value="#{msg.ADMIN_LINK_SHOW_SHORT}"
+							title="#{product.ADMIN_LINK_SHOW_GENERIC_PRODUCT_TITLE}"
+							>
+							<f:param name="productId" value="#{genericProduct.productId}" />
+						</p:menuitem>
+
+						<p:menuitem
+							outcome="admin_edit_generic_product"
+							value="#{msg.ADMIN_LINK_EDIT_SHORT}"
+							title="#{product.ADMIN_LINK_EDIT_GENERIC_PRODUCT_TITLE}"
+							>
+							<f:param name="productId" value="#{genericProduct.productId}" />
+						</p:menuitem>
+
+						<p:menuitem outcome="admin_delete_generic_product">
+							<h:outputText
+								styleClass="link-danger"
+								value="#{msg.ADMIN_LINK_DELETE_SHORT}"
+								title="#{product.ADMIN_LINK_DELETE_GENERIC_PRODUCT_TITLE}"
+								/>
+							<f:param name="productId" value="#{genericProduct.productId}" />
+						</p:menuitem>
+					</p:menuButton>
+				</p:column>
+			</p:dataTable>
+
+			<p:dialog
+				dynamic="true"
+				modal="true"
+				resizable="false"
+				header="#{product.ADMIN_SINGLE_PRODUCT_DETAILS_HEADER}"
+				hideEffect="fade"
+				showEffect="fade"
+				widgetVar="productDialog"
+				position="top"
+				responsive="true"
+				closeOnEscape="true"
+				>
+				<p:outputPanel id="product-details">
+					<p:panelGrid columns="2" rendered="#{not empty productListController.selectedProduct}">
+						<f:facet name="header">
+							<h:outputFormat value="#{product.ADMIN_PRODUCT_DETAILS_HEADER}">
+								<f:param value="#{local[productListController.selectedProduct.productI18nKey]}" />
+								<f:param value="#{productListController.selectedProduct.productId}" />
+							</h:outputFormat>
+						</f:facet>
+
+						<p:outputLabel value="#{msg.ID_HEADER}" title="#{product.PRODUCT_ID_NUMBER_TITLE}" />
+						<h:outputText value="#{productListController.selectedProduct.productId}" />
+
+						<p:outputLabel value="#{msg.ADMIN_I18N_KEY_HEADER}" title="#{product.PRODUCT_I18N_KEY_TITLE}" />
+						<h:outputText value="#{productListController.selectedProduct.productI18nKey}" title="#{local[productListController.selectedProduct.productI18nKey]}" />
+
+						<p:outputLabel value="#{product.PRODUCT_NUMBER_HEADER}" title="#{product.PRODUCT_NUMBER_TITLE}" />
+						<h:outputText value="#{productListController.selectedProduct.productNumber}" rendered="#{not empty productListController.selectedProduct.productNumber}" />
+						<h:outputText value="#{product.ADMIN_NO_PRODUCT_NUMBER_ASSIGNED}" rendered="#{empty productListController.selectedProduct.productNumber}" />
+
+						<p:outputLabel value="#{project.BARCODE_HEADER}" title="#{product.PRODUCT_BARCODE_NUMBER_TITLE}" />
+						<h:outputText value="#{product.PRODUCT_NO_BARCODE_NUMBER_ASSIGNED}" rendered="#{empty productListController.selectedProduct.productBarCodeNumber}" />
+						<p:barcode
+							width="100%"
+							type="#{initParam['product_barcode_type']}"
+							value="#{productListController.selectedProduct.productBarCodeNumber}"
+							rendered="#{not empty productListController.selectedProduct.productBarCodeNumber}"
+							/>
+
+						<p:outputLabel value="#{product.ADMIN_PRODUCT_FSC_NUMBER_HEADER}" title="#{product.PRODUCT_FSC_NUMBER_TITLE}" />
+						<h:outputText value="#{productListController.selectedProduct.productFscNumber}" rendered="#{not empty productListController.selectedProduct.productFscNumber}" />
+						<h:outputText value="#{product.ADMIN_NO_PRODUCT_FSC_NUMBER_ASSIGNED}" rendered="#{empty productListController.selectedProduct.productFscNumber}" />
+
+						<p:outputLabel value="#{msg.AVAILABLE_HEADER}" title="#{product.PRODUCT_AVAILABILITY_TITLE}" />
+						<h:outputText value="#{productListController.selectedProduct.productAvailability ? msg.CHOICE_YES : msg.CHOICE_NO}" />
+
+						<p:outputLabel value="#{product.AGE_GROUP_HEADER}" title="#{product.PRODUCT_AGE_GROUP_TITLE}" />
+						<h:outputText value="#{project[productListController.selectedProduct.productAgeGroup.messageKey]}" title="#{productListController.selectedProduct.productAgeGroup.messageKey}" rendered="#{not empty productListController.selectedProduct.productAgeGroup.messageKey}" />
+						<h:outputText value="#{product.PRODUCT_HAS_NO_AGE_GROUP}" rendered="#{empty productListController.selectedProduct.productAgeGroup.messageKey}" />
+
+						<p:outputLabel value="#{product.CURRENCY_CODE_HEADER}" title="#{product.PRODUCT_CURRENCY_CODE_TITLE}" />
+						<h:outputText value="#{productListController.selectedProduct.productCurrencyCode}" />
+
+						<p:outputLabel value="#{product.GROSS_PRICE_HEADER}" title="#{product.PRODUCT_GROSS_PRICE_TITLE}" />
+						<h:outputText value="#{productListController.selectedProduct.productGrossPrice}">
+							<!-- @TODO Hard-coded EUR again -->
+							<f:convertNumber type="currency" currencyCode="EUR" />
+						</h:outputText>
+
+						<p:outputLabel value="#{product.NET_PRICE_HEADER}" title="#{product.PRODUCT_NET_PRICE_TITLE}" />
+						<h:outputText value="#{productListController.selectedProduct.productNetPrice}">
+							<!-- @TODO Hard-coded EUR again -->
+							<f:convertNumber type="currency" currencyCode="EUR" />
+						</h:outputText>
+
+						<p:outputLabel value="#{product.TAX_RATE_HEADER}" title="#{product.PRODUCT_TAX_RATE_TITLE}" />
+						<h:outputText value="#{productListController.selectedProduct.productTaxRate}">
+							<!-- @TODO No real percentage number, 7.0 means 7.0%, not 700% -->
+							<f:convertNumber type="number" />
+						</h:outputText>
+
+						<p:outputLabel value="#{product.PRODUCT_SIZE_HEADER}" title="#{product.PRODUCT_SIZE_TITLE}" />
+						<h:outputText value="#{productListController.selectedProduct.productSize}" />
+
+						<p:outputLabel value="#{product.PRODUCT_UNIT_AMOUNT_HEADER}" title="#{product.PRODUCT_UNIT_AMOUNT_TITLE}" />
+						<h:outputText value="#{productListController.selectedProduct.productUnitAmount}">
+							<f:convertNumber type="number" />
+						</h:outputText>
+
+						<p:outputLabel value="#{product.PRODUCT_UNIT_I18N_KEY_HEADER}" title="#{product.PRODUCT_UNIT_I18N_KEY_TITLE}" />
+						<h:outputText value="#{productListController.selectedProduct.productUnitI18nKey}" title="#{local[productListController.selectedProduct.productUnitI18nKey]}" />
+
+						<p:outputLabel value="#{product.ADMIN_ASSIGNED_PRODUCT_CATEGORY_LABEL}" title="#{product.ADMIN_ASSIGNED_PRODUCT_CATEGORY_TITLE}" />
+						<p:link
+							outcome="admin_show_product_category"
+							value="#{local[productListController.selectedProduct.productCategory.categoryI18nKey]}"
+							title="#{product.ADMIN_LINK_SHOW_GENERIC_PRODUCT_CATEGORY_TITLE}"
+							>
+							<f:param name="categoryId" value="#{productListController.selectedProduct.productCategory.categoryId}" />
+						</p:link>
+
+						<p:outputLabel value="#{msg.ADMIN_ASSIGNED_MANUFACTURER_LABEL}" title="#{product.ADMIN_ASSIGNED_PRODUCT_MANUFACTURER_TITLE}" />
+						<p:link
+							outcome="admin_show_basic_data"
+							title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
+							rendered="#{not empty productListController.selectedProduct.productManufacturer}"
+							>
+							<h:outputFormat value="#{msg.BASIC_DATA_LINK_MASK}">
+								<f:param value="#{productListController.selectedProduct.productManufacturer.companyName}" />
+								<f:param value="#{productListController.selectedProduct.productManufacturer.basicDataId}" />
+							</h:outputFormat>
+							<f:param name="basicDataId" value="#{productListController.selectedProduct.productManufacturer.basicDataId}" />
+						</p:link>
+						<h:outputText value="#{product.PRODUCT_HAS_NO_MANUFACTURER_ASSIGNED}" rendered="#{empty productListController.selectedProduct.productManufacturer}" />
+
+						<p:outputLabel value="#{msg.ENTRY_CREATED_HEADER}" title="#{product.ADMIN_PRODUCT_ENTRY_CREATED_TITLE}" />
+						<h:outputText value="#{productListController.selectedProduct.productEntryCreated}">
+							<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+						</h:outputText>
+
+						<p:outputLabel value="#{msg.ENTRY_UPDATED_HEADER}" title="#{product.ADMIN_PRODUCT_ENTRY_UPDATED_TITLE}" />
+						<h:outputText value="#{productListController.selectedProduct.productEntryUpdated}">
+							<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+						</h:outputText>
+					</p:panelGrid>
+				</p:outputPanel>
+			</p:dialog>
+		</h:form>
+
+		<h:form>
+			<p:panelGrid
+				columns="1"
+				layout="grid"
+				>
+				<f:facet name="header">
+					<h:outputText value="#{product.ADMIN_ADD_GENERIC_PRODUCT_TITLE}" />
+				</f:facet>
+
+				<h:panelGroup styleClass="para" layout="block">
+					<h:outputText value="#{product.ADMIN_ADD_GENERIC_PRODUCT_MINIMUM_DATA}" />
+				</h:panelGroup>
+
+				<ui:include src="/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl" />
+
+				<f:facet name="footer">
+					<p:panelGrid columns="2" layout="grid">
+						<p:commandButton
+							type="reset"
+							value="#{msg.BUTTON_RESET_FORM}"
+							/>
+
+						<p:commandButton
+							type="submit"
+							value="#{product.BUTTON_ADMIN_ADD_GENERIC_PRODUCT}"
+							action="#{adminGenericProductActionController.addProduct()}"
+							update="form-list-products:productList"
+							/>
+					</p:panelGrid>
+				</f:facet>
+			</p:panelGrid>
+		</h:form>
+	</ui:define>
+</ui:composition>
diff --git a/web/admin/generic_product/admin_generic_product_show.xhtml b/web/admin/generic_product/admin_generic_product_show.xhtml
new file mode 100644
index 00000000..e0e8fc30
--- /dev/null
+++ b/web/admin/generic_product/admin_generic_product_show.xhtml
@@ -0,0 +1,39 @@
+<?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"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<ui:define name="metadata">
+		<f:metadata>
+			<f:viewParam
+				name="productId"
+				value="#{adminGenericProductActionController.currentProduct}"
+				converter="GenericProductConverter"
+				required="true"
+				requiredMessage="#{product.ERROR_PARAMETER_PRODUCT_ID_NOT_SET}"
+				converterMessage="#{product.PARAMETER_PRODUCT_ID_INVALID}"
+				/>
+
+			<f:viewAction
+				action="#{adminGenericProductActionController.copyAllProductProperties()}"
+				/>
+		</f:metadata>
+	</ui:define>
+
+	<ui:define name="document_admin_title">
+		<h:outputText value="#{product.PAGE_TITLE_ADMIN_SHOW_GENERIC_PRODUCT}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{product.CONTENT_TITLE_ADMIN_SHOW_GENERIC_PRODUCT}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<!-- @TODO Here goes your content. //-->
+	</ui:define>
+</ui:composition>
diff --git a/web/admin/index.xhtml b/web/admin/index.xhtml
index 55ae8066..be454f8c 100644
--- a/web/admin/index.xhtml
+++ b/web/admin/index.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_WELCOME}" />
 	</ui:define>
 
diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index 32b8a8b5..37d4d2b1 100644
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.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="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+			<f:viewParam
+				name="landLineId"
+				value="#{beanHelper.landLineNumber}"
+				converter="LandLineNumberConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+				/>
 			<f:viewAction action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_LAND_LINE}" />
 	</ui:define>
 
@@ -23,25 +32,29 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-handler-landline-number" message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
-
-		<h:form id="form_delete_landline" rendered="#{not empty beanHelper.landLineNumber}">
+		<h:form rendered="#{not empty beanHelper.landLineNumber}">
 			<h:panelGroup styleClass="table" layout="block">
 				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_DELETE_LAND_LINE_TITLE}" />
 				</div>
 
 				<div class="para">
-					<widgets:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" renderShowLink="false" showAdminMiniLinks="false" />
+					<core:outputAdminLandLinePanelGrid
+						landLineNumber="#{beanHelper.landLineNumber}"
+						renderShowLink="false"
+						showAdminDropdownMenu="false"
+						/>
 				</div>
 
 				<div class="para">
 					<h:outputText value="#{msg.ADMIN_DELETE_LAND_LINE_DATA_NOTICE}" />
 				</div>
 
-				<div class="table-footer">
-					<p:commandButton styleClass="button-danger" type="submit" id="button_delete_landline" value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}" action="#{adminPhoneController.deleteLandLineData()}" />
-				</div>
+				<p:commandButton
+					type="submit"
+					value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}"
+					action="#{adminPhoneController.deleteLandLineData()}"
+					/>
 			</h:panelGroup>
 		</h:form>
 	</ui:define>
diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml
index 2032670e..d2b7dd85 100644
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_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="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+			<f:viewParam
+				name="landLineId"
+				value="#{beanHelper.landLineNumber}"
+				converter="LandLineNumberConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+				/>
 			<f:viewAction action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}" />
 	</ui:define>
 
@@ -23,22 +32,28 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-handler-landline-number" message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
-
-		<h:form id="form_edit_landline" rendered="#{not empty beanHelper.landLineNumber}">
-			<h:panelGroup styleClass="table table-medium" layout="block">
+		<h:form rendered="#{not empty beanHelper.landLineNumber}">
+			<h:panelGroup layout="block">
 				<div class="table-header">
 					<h:outputFormat value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER_TITLE}">
 						<f:param value="#{beanHelper.landLineNumber.phoneId}" />
 					</h:outputFormat>
 				</div>
 
-				<widgets:outputAdminLandLineDataFormFields landLineNumber="#{beanHelper.landLineNumber}" />
+				<core:outputAdminLandLineDataFormFields landLineNumber="#{beanHelper.landLineNumber}" />
 
-				<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_landline" value="#{msg.BUTTON_ADMIN_EDIT_LAND_LINE_NUMBER}" action="#{adminPhoneController.doChangeLandLineNumber()}" />
-				</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_LAND_LINE_NUMBER}"
+						action="#{adminPhoneController.doChangeLandLineNumber()}"
+						/>
+				</p:panelGrid>
 			</h:panelGroup>
 		</h:form>
 	</ui:define>
diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml
index c93a80a0..18d06c54 100644
--- a/web/admin/landline/admin_landline_list.xhtml
+++ b/web/admin/landline/admin_landline_list.xhtml
@@ -1,13 +1,14 @@
 <?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: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_CONTACT_LAND_LINE_NUMBER}" />
 	</ui:define>
 
@@ -16,41 +17,53 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<p:dataTable id="table_list_landline" var="landLineNumber" value="#{phoneController.allLandLineNumbers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}" emptyMessage="#{msg.ADMIN_LANDLINE_NUMBER_LIST_EMPTY}">
+		<p:dataTable
+			id="table_list_landline"
+			var="landLineNumber"
+			value="#{phoneListController.allLandLineNumbers}"
+			paginator="true"
+			rows="10"
+			summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}"
+			emptyMessage="#{msg.ADMIN_EMPTY_LIST_LAND_LINE_NUMBER}"
+			>
 			<p:column>
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
+					<h:outputText value="#{msg.ID_HEADER}" />
 				</f:facet>
 
-				<p:link outcome="admin_show_landline" value="#{landLineNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE}">
-					<f:param name="phoneId" value="#{landLineNumber.phoneId}" />
+				<p:link
+					outcome="admin_show_landline"
+					value="#{landLineNumber.phoneId}"
+					title="#{msg.ADMIN_LINK_SHOW_LAND_LINE_NUMBER_TITLE}"
+					>
+					<f:param name="landLineId" value="#{landLineNumber.phoneId}" />
 				</p:link>
 			</p:column>
 
 			<p:column>
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_NUMBER}" />
+					<h:outputText value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER}" />
 				</f:facet>
 
-				<h:outputText value="#{landLineNumber.phoneCountry.countryAbroadDialPrefix}#{landLineNumber.phoneCountry.countryPhoneCode} (#{landLineNumber.phoneAreaCode}) #{landLineNumber.phoneNumber}" />
+				<h:outputText value="#{beanHelper.renderPhoneNumber(landLineNumber)}" />
 			</p:column>
 
 			<p:column>
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+					<h:outputText value="#{msg.ENTRY_CREATED_HEADER}" />
 				</f:facet>
 
-				<h:outputText value="#{landLineNumber.phoneEntryCreated.time}">
+				<h:outputText value="#{landLineNumber.phoneEntryCreated}">
 					<f:convertDateTime type="both" />
 				</h:outputText>
 			</p:column>
 
 			<p:column>
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+					<h:outputText value="#{msg.ENTRY_UPDATED_HEADER}" />
 				</f:facet>
 
-				<h:outputText value="#{landLineNumber.phoneEntryUpdated.time}">
+				<h:outputText value="#{landLineNumber.phoneEntryUpdated}">
 					<f:convertDateTime type="both" />
 				</h:outputText>
 			</p:column>
diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml
index 7fc7f091..8db777ab 100644
--- a/web/admin/landline/admin_landline_show.xhtml
+++ b/web/admin/landline/admin_landline_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: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="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-			<f:viewAction onPostback="true" action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
+			<f:viewParam
+				name="landLineId"
+				value="#{beanHelper.landLineNumber}"
+				converter="LandLineNumberConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+				/>
+			<f:viewAction action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_LAND_LINE_NUMBER}" />
 	</ui:define>
 
@@ -23,11 +31,16 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" />
-
-		<p:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allCurrentLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-medium">
+		<core:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" />
+
+		<p:dataTable
+			id="contact_landline_link"
+			var="contact"
+			value="#{contactPhoneController.allCurrentLandLineNumberContacts()}"
+			summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}"
+			>
 			<f:facet name="header">
-				<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_LINKS}">
+				<h:outputFormat value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_LINKS_HEADER}">
 					<f:param value="#{beanHelper.landLineNumber.phoneId}" />
 				</h:outputFormat>
 			</f:facet>
@@ -35,7 +48,10 @@
 			<p:column>
 				<p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-				<p:link id="contactId" outcome="admin_show_contact">
+				<p:link
+					id="contactId"
+					outcome="admin_show_contact"
+					>
 					<h:outputText styleClass="table-data-field" value="#{contact.contactId}" />
 					<f:param name="contactId" value="#{contact.contactId}" />
 				</p:link>
@@ -68,9 +84,13 @@
 			<p:column>
 				<p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-				<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
+				<p:link
+					id="contactEmailAddress"
+					styleClass="table-data-field"
+					href="mailto:#{contact.contactEmailAddress}"
+					>
 					<h:outputText value="#{contact.contactEmailAddress}" />
-				</h:outputLink>
+				</p:link>
 			</p:column>
 
 			<p:column>
@@ -79,9 +99,11 @@
 				<div class="table-data-field">
 					<ul class="navbar-mini">
 						<li class="navlink-mini">
-							<p:link outcome="admin_unlink_contact_landline">
-								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LANDLINE_NUMBER_CONTACT_TITLE}" />
-								<f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
+							<p:link
+								outcome="admin_unlink_contact_landline"
+								>
+								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LAND_LINE_NUMBER_CONTACT_TITLE}" />
+								<f:param name="landLineId" value="#{beanHelper.landLineNumber.phoneId}" />
 								<f:param name="contactId" value="#{contact.contactId}" />
 							</p:link>
 						</li>
diff --git a/web/admin/mobile/admin_contact_mobile_list.xhtml b/web/admin/mobile/admin_contact_mobile_list.xhtml
index 5d02a85d..d99b94d7 100644
--- a/web/admin/mobile/admin_contact_mobile_list.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_list.xhtml
@@ -1,12 +1,14 @@
 <?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"
-				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="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
 	</ui:define>
 
@@ -15,7 +17,15 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<p:dataTable id="table_list_mobiles" var="mobile" value="#{phoneController.allMobileNumbers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_NUMBERS}" emptyMessage="#{msg.ADMIN_CONTACT_MOBILE_LIST_EMPTY}">
+		<p:dataTable
+			id="table_list_mobiles"
+			var="mobile"
+			value="#{phoneListController.allMobileNumbers}"
+			paginator="true"
+			rows="10"
+			summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_NUMBERS}"
+			emptyMessage="#{msg.ADMIN_EMPTY_LIST_CONTACT_MOBILE}"
+			>
 			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
index fbf12d95..43f4982b 100644
--- a/web/admin/mobile/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
@@ -1,18 +1,34 @@
 <?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"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
 
 	<ui:define name="metadata">
 		<f:metadata>
-			<f:viewParam name="phoneId" value="#{adminPhoneController.mobileNumber}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-			<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+			<f:viewParam
+				name="mobileId"
+				value="#{adminMobileController.mobileNumber}"
+				converter="CellphoneConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+				/>
+			<f:viewParam
+				name="contactId"
+				value="#{beanHelper.contact}"
+				converter="ContactConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+				/>
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
 	</ui:define>
 
diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index 958b5fac..7b97a449 100644
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.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="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+			<f:viewParam
+				name="mobileId"
+				value="#{beanHelper.mobileNumber}"
+				converter="MobileNumberConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+				/>
 			<f:viewAction action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_MOBILE_NUMBER}" />
 	</ui:define>
 
@@ -23,25 +32,36 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-handler-mobile-number" message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
+		<core:outputMessageBox
+			panelGroupId="errorHandlerDeleteMobile"
+			message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}"
+			messageStyleClass="alert-danger"
+			rendered="#{empty beanHelper.mobileNumber}"
+			/>
 
-		<h:form id="form_delete_mobile" rendered="#{not empty beanHelper.mobileNumber}">
+		<h:form rendered="#{not empty beanHelper.mobileNumber}">
 			<h:panelGroup styleClass="table" layout="block">
 				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_DELETE_MOBILE_TITLE}" />
 				</div>
 
 				<div class="para">
-					<widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" renderShowLink="false" showAdminMiniLinks="false" />
+					<core:outputAdminMobilePanelGrid
+						mobileNumber="#{beanHelper.mobileNumber}"
+						renderShowLink="false"
+						showAdminDropdownMenu="false"
+						/>
 				</div>
 
 				<div class="para">
 					<h:outputText value="#{msg.ADMIN_DELETE_MOBILE_DATA_NOTICE}" />
 				</div>
 
-				<div class="table-footer">
-					<p:commandButton styleClass="button-danger" type="submit" id="button_delete_mobile" value="#{msg.BUTTON_ADMIN_DELETE_MOBILE_NUMBER}" action="#{adminPhoneController.deleteMobileData()}" />
-				</div>
+				<p:commandButton
+					type="submit"
+					value="#{msg.BUTTON_ADMIN_DELETE_MOBILE_NUMBER}"
+					action="#{adminMobileController.deleteMobileData()}"
+					/>
 			</h:panelGroup>
 		</h:form>
 	</ui:define>
diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index fbf2f156..2cd6db14 100644
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_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="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+			<f:viewParam
+				name="mobileId"
+				value="#{beanHelper.mobileNumber}"
+				converter="MobileNumberConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+				/>
 			<f:viewAction action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_MOBILE_NUMBER}" />
 	</ui:define>
 
@@ -23,22 +32,28 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-handler-mobile-number" message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
-
-		<h:form id="form_edit_mobile" rendered="#{not empty beanHelper.mobileNumber}">
-			<h:panelGroup styleClass="table table-medium" layout="block">
+		<h:form rendered="#{not empty beanHelper.mobileNumber}">
+			<h:panelGroup layout="block">
 				<div class="table-header">
 					<h:outputFormat value="#{msg.ADMIN_EDIT_MOBILE_NUMBER_TITLE}">
-						<f:param value="#{beanHelper.mobileNumber.phoneId}" />
+						<f:param value="#{beanHelper.mobileNumber.mobileId}" />
 					</h:outputFormat>
 				</div>
 
-				<widgets:outputAdminMobileDataFormFields mobileNumber="#{beanHelper.mobileNumber}" />
+				<core:outputAdminMobileDataFormFields mobileNumber="#{beanHelper.mobileNumber}" />
 
-				<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_mobile" value="#{msg.BUTTON_ADMIN_EDIT_MOBILE_NUMBER}" action="#{adminPhoneController.doUpdateMobileNumber()}" />
-				</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_MOBILE_NUMBER}"
+						action="#{adminMobileController.doUpdateMobileNumber()}"
+						/>
+				</p:panelGrid>
 			</h:panelGroup>
 		</h:form>
 	</ui:define>
diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml
index 26d03a54..1ab86f42 100644
--- a/web/admin/mobile/admin_mobile_list.xhtml
+++ b/web/admin/mobile/admin_mobile_list.xhtml
@@ -1,13 +1,14 @@
 <?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="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
 	</ui:define>
 
@@ -16,14 +17,26 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<p:dataTable id="table-list-mobile-provider" var="mobileNumber" value="#{phoneController.allMobileNumbers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}" emptyMessage="#{msg.ADMIN_MOBILE_NUMBER_LIST_EMPTY}">
+		<p:dataTable
+			id="mobileNumberList"
+			var="mobileNumber"
+			value="#{mobileListController.allMobileNumbers}"
+			paginator="true"
+			rows="10"
+			summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}"
+			emptyMessage="#{msg.ADMIN_EMPTY_LIST_MOBILE_NUMBER}"
+			>
 			<p:column>
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
+					<h:outputText value="#{msg.ID_HEADER}" />
 				</f:facet>
 
-				<p:link outcome="admin_show_mobile" value="#{mobileNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}">
-					<f:param name="phoneId" value="#{mobileNumber.phoneId}" />
+				<p:link
+					outcome="admin_show_mobile"
+					value="#{mobileNumber.mobileId}"
+					title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}"
+					>
+					<f:param name="mobileId" value="#{mobileNumber.mobileId}" />
 				</p:link>
 			</p:column>
 
@@ -32,7 +45,11 @@
 					<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
 				</f:facet>
 
-				<p:link outcome="admin_show_mobile_provider" value="#{mobileNumber.mobileProvider.providerName}">
+				<p:link
+					outcome="admin_show_mobile_provider"
+					value="#{mobileNumber.mobileProvider.providerName}"
+					title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}"
+					>
 					<f:param name="providerId" value="#{mobileNumber.mobileProvider.providerId}" />
 				</p:link>
 			</p:column>
@@ -42,25 +59,25 @@
 					<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
 				</f:facet>
 
-				<h:outputText value="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileNumber.mobileProvider.providerDialPrefix}-#{mobileNumber.phoneNumber}" />
+				<h:outputText value="#{beanHelper.renderMobileNumber(mobileNumber)}" />
 			</p:column>
 
 			<p:column>
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+					<h:outputText value="#{msg.ENTRY_CREATED_HEADER}" />
 				</f:facet>
 
-				<h:outputText value="#{mobileNumber.phoneEntryCreated.time}">
+				<h:outputText value="#{mobileNumber.mobileEntryCreated}">
 					<f:convertDateTime type="both" />
 				</h:outputText>
 			</p:column>
 
 			<p:column>
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+					<h:outputText value="#{msg.ENTRY_UPDATED_HEADER}" />
 				</f:facet>
 
-				<h:outputText value="#{mobileNumber.phoneEntryUpdated.time}">
+				<h:outputText value="#{mobileNumber.mobileEntryUpdated}">
 					<f:convertDateTime type="both" />
 				</h:outputText>
 			</p:column>
diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index 45f1e55c..fcffc2dc 100644
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.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="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+			<f:viewParam
+				name="mobileId"
+				value="#{beanHelper.mobileNumber}"
+				converter="MobileNumberConverter"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+				converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+				/>
 			<f:viewAction action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="admin_title">
+	<ui:define name="document_admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_NUMBER}" />
 	</ui:define>
 
@@ -23,19 +32,29 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" />
-
-		<p:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allCurrentMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-medium">
+		<core:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" />
+
+		<p:dataTable
+			id="contact_mobile_link"
+			var="contact"
+			value="#{contactMobileController.allCurrentMobileNumberContacts()}"
+			summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}"
+			>
 			<f:facet name="header">
-				<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_LINKS}">
-					<f:param value="#{beanHelper.mobileNumber.phoneId}" />
+				<h:outputFormat value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_LINKS_HEADER}">
+					<f:param value="#{beanHelper.mobileNumber.mobileId}" />
 				</h:outputFormat>
 			</f:facet>
 
 			<p:column>
 				<p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-				<p:link id="contactId" styleClass="table-data-field" outcome="admin_show_contact" value="#{contact.contactId}">
+				<p:link
+					id="contactId"
+					styleClass="table-data-field"
+					outcome="admin_show_contact"
+					value="#{contact.contactId}"
+					>
 					<f:param name="contactId" value="#{contact.contactId}" />
 				</p:link>
 			</p:column>
@@ -67,25 +86,31 @@
 			<p:column>
 				<p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-				<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
+				<p:link
+					id="contactEmailAddress"
+					styleClass="table-data-field"
+					href="mailto:#{contact.contactEmailAddress}"
+					>
 					<h:outputText value="#{contact.contactEmailAddress}" />
-				</h:outputLink>
+				</p:link>
 			</p:column>
 
 			<p:column>
 				<p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_UNLINK_DATA}" />
 
-				<div class="table-data-field">
+				<p:outputPanel styleClass="table-data-field">
 					<ul class="navbar-mini">
 						<li class="navlink-mini">
-							<p:link outcome="admin_unlink_contact_mobile">
+							<p:link
+								outcome="admin_unlink_contact_mobile"
+								>
 								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE}" />
-								<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
+								<f:param name="mobileId" value="#{beanHelper.mobileNumber.mobileId}" />
 								<f:param name="contactId" value="#{contact.contactId}" />
 							</p:link>
 						</li>
 					</ul>
-				</div>
+				</p:outputPanel>
 			</p:column>
 		</p:dataTable>
 	</ui:define>
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 fc4a0a06..dd3b0b16 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,80 +18,236 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:form id="form-list-mobile-provider">
+		<h:form id="form-list-mobile-providers">
 			<p:dataTable
-				id="table-list-mobile-provider"
+				id="mobileProviderList"
 				var="mobileProvider"
-				value="#{mobileProviderController.allMobileProviders()}"
-				tableStyleClass="table table-medium"
+				value="#{mobileProviderListController.allMobileProviders}"
 				paginator="true"
 				paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
-				widgetVar="mobileProviderTable"
-				filteredValue="#{mobileProviderController.filteredMobileProviders}"
+				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_MOBILE_PROVIDER_LIST_EMPTY}"
+				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_LIST_MOBILE_PROVIDERS_HEADER}" />
-					<p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-					<p:columnToggler datasource="table-list-mobile-provider" trigger="toggler" />
+					<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('mobileProviderList').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="mobileProviderList" trigger="toggler" />
+						</p:outputPanel>
+					</p:panelGrid>
 				</f:facet>
 
-				<p:column headerText="#{msg.ADMIN_ID_NUMBER}" sortBy="#{mobileProvider.providerId}" filterBy="#{mobileProvider.providerId}">
-					<p:link outcome="admin_show_mobile_provider" title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}" value="#{mobileProvider.providerId}">
+				<p:ajax
+					event="rowSelect"
+					update="form-list-mobile-providers:mobile-provider-details"
+					oncomplete="PF('mobileProviderDialog').show()"
+					/>
+
+				<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>
 
-				<p:column headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}" sortBy="#{mobileProvider.providerName}" filterBy="#{mobileProvider.providerName}" filterMatchMode="contains">
+				<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 headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}" sortBy="#{mobileProvider.providerDialPrefix}" filterBy="#{mobileProvider.providerDialPrefix}" filterMatchMode="contains">
+				<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>
 
-				<p:column headerText="#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}" sortBy="#{mobileProvider.providerCountry.countryPhoneCode}" filterBy="#{mobileProvider.providerCountry}" filterMatchMode="in">
+				<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" label="#{msg.LABEL_COUNTRIES}" onchange="PF('mobileProviderTable').filter()" updateLabel="true" title="#{msg.FILTER_BY_MULTIPLE_COUNTRY_TITLE}">
+						<p:selectCheckboxMenu
+							filter="true"
+							filterMatchMode="contains"
+							label="#{msg.LABEL_COUNTRIES}"
+							onchange="PF('mobileProviderList').filter()"
+							updateLabel="true"
+							title="#{msg.FILTER_BY_MULTIPLE_COUNTRY_TITLE}"
+							>
 							<f:converter converterId="CountryConverter" />
-							<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{msg[country.countryI18nKey]}" />
+							<f:selectItems
+								value="#{countryListController.allCountries}"
+								var="country"
+								itemValue="#{country}"
+								itemLabel="#{msg[country.countryI18nKey]}"
+								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
 					<h:outputText value="#{msg[mobileProvider.providerCountry.countryI18nKey]}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_LIST_ENTRY_CREATED}" sortBy="#{mobileProvider.providerEntryCreated}">
-					<h:outputText id="providerEntryCreated" value="#{mobileProvider.providerEntryCreated.time}">
-						<f:convertDateTime for="providerEntryCreated" type="both" timeStyle="short" dateStyle="short" />
+				<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.ADMIN_ACTION_LINKS}" sortable="false">
-					<links:outputMobileProviderAdminMiniLinks mobileProvider="#{mobileProvider}" />
+				<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>
+
+						<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>
+
+			<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 id="form_add_mobile_provider">
-			<h:panelGroup styleClass="table table-medium" layout="block">
+		<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/product_category/admin_product_category_edit.xhtml b/web/admin/product_category/admin_product_category_edit.xhtml
new file mode 100644
index 00000000..ceeaa0db
--- /dev/null
+++ b/web/admin/product_category/admin_product_category_edit.xhtml
@@ -0,0 +1,81 @@
+<?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"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<ui:define name="metadata">
+		<f:metadata>
+			<f:viewParam
+				name="categoryId"
+				value="#{adminProductCategoryActionController.currentCategory}"
+				converter="ProductCategoryConverter"
+				required="true"
+				requiredMessage="#{product.ERROR_PARAMETER_CATEGORY_ID_NOT_SET}"
+				converterMessage="#{product.PARAMETER_CATEGORY_ID_INVALID}"
+				/>
+
+			<f:viewAction
+				action="#{adminProductCategoryActionController.copyAllCategoryProperties()}"
+				/>
+		</f:metadata>
+	</ui:define>
+
+	<ui:define name="document_admin_title">
+		<h:outputText value="#{product.PAGE_TITLE_ADMIN_PRODUCT_CATEGORY_EDIT}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{product.CONTENT_TITLE_ADMIN_PRODUCT_CATEGORY_EDIT}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<h:form
+			id="admin-form-edit-generic-product"
+			rendered="#{not empty adminProductCategoryActionController.currentCategory}"
+			>
+			<h:inputHidden value="#{adminProductCategoryActionController.categoryId}" />
+
+			<p:panelGrid
+				columns="1"
+				layout="grid"
+				>
+				<f:facet name="header">
+					<h:outputFormat
+						value="#{product.ADMIN_EDIT_PRODUCT_CATEGORY_TITLE}"
+						title="#{local[adminProductCategoryActionController.categoryI18nKey]}"
+						>
+						<f:param value="#{adminProductCategoryActionController.categoryId}" />
+					</h:outputFormat>
+				</f:facet>
+
+				<h:panelGroup styleClass="para" layout="block">
+					<h:outputText value="#{product.ADMIN_EDIT_PRODUCT_CATEGORY_MINIMUM_DATA}" />
+				</h:panelGroup>
+
+				<ui:include src="/WEB-INF/templates/admin/product_category/admin_form_product_category_data.tpl">
+					<ui:param name="bypassDuplicateI18nKey" value="true" />
+				</ui:include>
+
+				<f:facet name="footer">
+					<p:panelGrid columns="2" layout="grid">
+						<p:commandButton
+							type="reset"
+							value="#{msg.BUTTON_RESET_FORM}"
+							/>
+
+						<p:commandButton
+							type="submit"
+							value="#{product.BUTTON_ADMIN_EDIT_PRODUCT_CATEGORY}"
+							action="#{adminProductCategoryActionController.updateProductCategory()}"
+							/>
+					</p:panelGrid>
+				</f:facet>
+			</p:panelGrid>
+		</h:form>
+	</ui:define>
+</ui:composition>
diff --git a/web/admin/product_category/admin_product_category_list.xhtml b/web/admin/product_category/admin_product_category_list.xhtml
new file mode 100644
index 00000000..45905926
--- /dev/null
+++ b/web/admin/product_category/admin_product_category_list.xhtml
@@ -0,0 +1,317 @@
+<?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"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<ui:define name="document_admin_title">
+		<h:outputText value="#{product.PAGE_TITLE_ADMIN_LIST_PRODUCT_CATEGORY}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{product.CONTENT_TITLE_ADMIN_LIST_PRODUCT_CATEGORY}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<h:form id="form-list-categories">
+			<p:dataTable
+				id="categoryList"
+				var="category"
+				value="#{productCategoryListController.allProductCategories}"
+				paginator="true"
+				paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+				filteredValue="#{productCategoryListController.filteredProductCategories}"
+				rows="10"
+				rowKey="#{category.categoryId}"
+				reflow="true"
+				resizableColumns="true"
+				rowsPerPageTemplate="5,10,20,50,100"
+				sortMode="multiple"
+				summary="#{product.TABLE_SUMMARY_ADMIN_LIST_PRODUCT_CATEGORIES}"
+				emptyMessage="#{product.ADMIN_EMPTY_LIST_PRODUCT_CATEGORIES}"
+				widgetVar="categoryList"
+				selectionMode="single"
+				selection="#{productCategoryListController.selectedCategory}"
+				skipChildren="true"
+				>
+
+				<f:facet name="header">
+					<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('departmentList').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="categoryList" trigger="toggler" />
+						</p:outputPanel>
+					</p:panelGrid>
+				</f:facet>
+
+				<p:ajax
+					event="rowSelect"
+					update="form-list-categories:category-details"
+					oncomplete="PF('categoryDialog').show()"
+					/>
+
+				<p:column
+					headerText="#{msg.ID_HEADER}"
+					sortBy="#{category.categoryId}"
+					filterable="false"
+					>
+					<p:link
+						outcome="admin_show_product_category"
+						title="#{product.ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE}"
+						value="#{category.categoryId}"
+						>
+						<f:param name="categoryId" value="#{category.categoryId}" />
+					</p:link>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ADMIN_I18N_KEY_HEADER}"
+					sortBy="#{local[category.categoryI18nKey]}"
+					filterBy="#{local[category.categoryI18nKey]}"
+					filterMatchMode="contains"
+					>
+					<h:outputText value="#{local[category.categoryI18nKey]}" title="#{category.categoryI18nKey}" />
+				</p:column>
+
+				<p:column
+					headerText="#{product.ADMIN_PARENT_PRODUCT_CATEGORY_HEADER}"
+					sortBy="#{category.parentCategory}"
+					filterBy="#{category.parentCategory}"
+					filterMatchMode="in"
+					>
+					<f:facet name="filter">
+						<p:selectCheckboxMenu
+							filter="true"
+							filterMatchMode="contains"
+							label="#{product.LABEL_PRODUCT_CATEGORIES}"
+							onchange="PF('categoryList').filter()"
+							updateLabel="true"
+							title="#{product.FILTER_BY_MULTIPLE_PRODUCT_CATEGORIES_TITLE}"
+							>
+							<f:converter converterId="ProductCategoryConverter" />
+
+							<f:selectItems
+								value="#{productCategoryListController.allProductCategories}"
+								var="category"
+								itemValue="#{category}"
+								itemLabel="#{productBeanHelper.renderProductCategory(category)}"
+								/>
+						</p:selectCheckboxMenu>
+					</f:facet>
+
+					<p:link
+						outcome="admin_show_product_category"
+						value="#{local[category.parentCategory.categoryI18nKey]}"
+						title="#{product.ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE}"
+						rendered="#{not empty category.parentCategory}"
+						>
+						<f:param name="categoryId" value="#{category.parentCategory.categoryId}" />
+					</p:link>
+
+					<p:link
+						outcome="admin_assign_parent_category"
+						value="#{msg.ADMIN_NOT_ASSIGNED}"
+						title="#{product.ADMIN_LINK_ASSIGN_PARENT_CATEGORY_TITLE}"
+						rendered="#{empty category.parentCategory}"
+						>
+						<f:param name="categoryId" value="#{category.categoryId}" />
+					</p:link>
+				</p:column>
+
+				<p:column
+					headerText="#{product.SHOWN_IN_STATISTICS_HEADER}"
+					sortBy="#{category.categoryShownInStatistics}"
+					filterBy="#{category.categoryShownInStatistics}"
+					filterMatchMode="exact"
+					>
+					<f:facet name="filter">
+						<p:selectOneMenu onchange="PF('categoryList').filter()">
+							<f:converter converterId="javax.faces.Boolean" />
+							<f:selectItem itemLabel="#{msg.CHOICE_ALL}" itemValue="#{null}" />
+							<f:selectItem itemLabel="#{msg.CHOICE_YES}" itemValue="true" />
+							<f:selectItem itemLabel="#{msg.CHOICE_NO}" itemValue="false" />
+						</p:selectOneMenu>
+					</f:facet>
+
+					<h:outputText value="#{category.categoryShownInStatistics ? msg.CHOICE_YES : msg.CHOICE_NO}" />
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ENTRY_CREATED_HEADER}"
+					sortBy="#{category.categoryEntryCreated}"
+					filterable="false"
+					>
+					<h:outputText value="#{category.categoryEntryCreated}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ENTRY_UPDATED_HEADER}"
+					sortBy="#{category.categoryEntryUpdated}"
+					filterable="false"
+					>
+					<h:outputText value="#{category.categoryEntryUpdated}">
+						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</p:column>
+
+				<p:column
+					headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+					sortable="false"
+					filterable="false"
+					>
+					<p:menuButton value="#{msg.OPTIONS}">
+						<p:menuitem
+							outcome="admin_show_product_category"
+							value="#{msg.ADMIN_LINK_SHOW_SHORT}"
+							title="#{product.ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE}"
+							>
+							<f:param name="categoryId" value="#{category.categoryId}" />
+						</p:menuitem>
+
+						<p:menuitem
+							outcome="admin_edit_product_category"
+							value="#{msg.ADMIN_LINK_EDIT_SHORT}"
+							title="#{product.ADMIN_LINK_EDIT_PRODUCT_CATEGORY_TITLE}"
+							>
+							<f:param name="categoryId" value="#{category.categoryId}" />
+						</p:menuitem>
+
+						<p:menuitem outcome="admin_delete_product_category">
+							<h:outputText
+								styleClass="link-danger"
+								value="#{msg.ADMIN_LINK_DELETE_SHORT}"
+								title="#{product.ADMIN_LINK_DELETE_PRODUCT_CATEGORY_TITLE}"
+								/>
+							<f:param name="categoryId" value="#{category.categoryId}" />
+						</p:menuitem>
+					</p:menuButton>
+				</p:column>
+			</p:dataTable>
+
+			<p:dialog
+				dynamic="true"
+				modal="true"
+				resizable="false"
+				header="#{product.ADMIN_SINGLE_CATEGORY_DETAILS_HEADER}"
+				hideEffect="fade"
+				showEffect="fade"
+				widgetVar="categoryDialog"
+				position="top"
+				responsive="true"
+				>
+				<p:outputPanel id="category-details">
+					<p:panelGrid columns="2" rendered="#{not empty productCategoryListController.selectedCategory}">
+						<f:facet name="header">
+							<h:outputFormat value="#{product.ADMIN_CATEGORY_DETAILS_HEADER}">
+								<f:param value="#{local[productCategoryListController.selectedCategory.categoryI18nKey]}" />
+								<f:param value="#{productCategoryListController.selectedCategory.categoryId}" />
+							</h:outputFormat>
+						</f:facet>
+
+						<p:outputLabel value="#{msg.ID_HEADER}" title="#{product.CATEGORY_ID_NUMBER_TITLE}" />
+						<h:outputText value="#{productCategoryListController.selectedCategory.categoryId}" />
+
+						<p:outputLabel value="#{msg.ADMIN_I18N_KEY_HEADER}" title="#{product.CATEGORY_I18N_KEY_TITLE}" />
+						<h:outputText value="#{productCategoryListController.selectedCategory.categoryI18nKey}" title="#{local[productCategoryListController.selectedCategory.categoryI18nKey]}" />
+
+						<p:outputLabel value="#{product.CATEGORY_IN_STATISTICS_HEADER}" title="#{product.CATEGORY_SHOW_IN_STATISTICS_TITLE}" />
+						<h:outputText value="#{productCategoryListController.selectedCategory.categoryShownInStatistics ? msg.CHOICE_YES : msg.CHOICE_NO}" />
+
+						<p:outputLabel value="#{product.CATEGORY_PARENT_HEADER}" title="#{product.CATEGORY_PARENT_TITLE}" />
+						<p:link
+							outcome="admin_show_product_category"
+							value="#{local[productCategoryListController.selectedCategory.parentCategory.categoryI18nKey]}"
+							title="#{product.ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE}"
+							rendered="#{not empty productCategoryListController.selectedCategory.parentCategory}"
+							>
+							<f:param name="categoryId" value="#{productCategoryListController.selectedCategory.parentCategory.categoryId}" />
+						</p:link>
+						<h:outputText value="#{product.CATEGORY_HAS_NO_PARENT}" rendered="#{empty productCategoryListController.selectedCategory.parentCategory}" />
+
+						<p:outputLabel value="#{msg.ENTRY_CREATED_HEADER}" title="#{product.ADMIN_CATEGORY_ENTRY_CREATED_TITLE}" />
+						<h:outputText value="#{productCategoryListController.selectedCategory.categoryEntryCreated}">
+							<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+						</h:outputText>
+
+						<p:outputLabel value="#{msg.ENTRY_UPDATED_HEADER}" title="#{product.ADMIN_CATEGORY_ENTRY_UPDATED_TITLE}" />
+						<h:outputText value="#{productCategoryListController.selectedCategory.categoryEntryUpdated}">
+							<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+						</h:outputText>
+					</p:panelGrid>
+				</p:outputPanel>
+			</p:dialog>
+		</h:form>
+
+		<h:form>
+			<p:panelGrid
+				columns="1"
+				layout="grid"
+				>
+				<f:facet name="header">
+					<h:outputText value="#{product.ADMIN_ADD_PRODUCT_CATEGORY_TITLE}" />
+				</f:facet>
+
+				<h:panelGroup styleClass="para" layout="block">
+					<h:outputText value="#{product.ADMIN_ADD_PRODUCT_CATEGORY_MINIMUM_DATA}" />
+				</h:panelGroup>
+
+				<ui:include src="/WEB-INF/templates/admin/product_category/admin_form_product_category_data.tpl" />
+
+				<f:facet name="footer">
+					<p:panelGrid columns="2" layout="grid">
+						<p:commandButton
+							type="reset"
+							value="#{msg.BUTTON_RESET_FORM}"
+							/>
+
+						<p:commandButton
+							type="submit"
+							value="#{product.BUTTON_ADMIN_ADD_PRODUCT_CATEGORY}"
+							action="#{adminProductCategoryActionController.addProductCategory()}"
+							update="form-list-categories:categoryList"
+							/>
+					</p:panelGrid>
+				</f:facet>
+			</p:panelGrid>
+		</h:form>
+	</ui:define>
+</ui:composition>
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 9d4f909f..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: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 a47b8986..b807d457 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,133 +19,352 @@
 	</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"
+							value="#{adminUserController.contact}"
+							filter="true"
+							filterMatchMode="contains"
+							>
+							<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">
-						<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}"
-									filter="true"
-									filterMatchMode="contains"
-									>
-									<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>
diff --git a/web/exception.xhtml b/web/exception.xhtml
index bdd0c230..7afe77fe 100644
--- a/web/exception.xhtml
+++ b/web/exception.xhtml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_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/#{userLoginController.baseTemplatePathName}_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="guest_title">
+	<ui:define name="document_guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_EXCEPTION_THROWN}" />
 	</ui:define>
 
diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml
index 2582c349..54b4490b 100644
--- a/web/guest/user/user_confirm_account.xhtml
+++ b/web/guest/user/user_confirm_account.xhtml
@@ -1,19 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_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">
+<ui:composition
+	template="/WEB-INF/templates/guest/guest_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"
+	>
 
 	<ui:define name="metadata">
 		<f:metadata>
-			<f:viewParam name="confirmKey" value="#{userConfirmationLinkController.confirmationKey}" />
-			<f:viewAction onPostback="true" action="#{userConfirmationLinkController.maybeConfirmUserAccount()}" />
+			<f:viewParam
+				name="confirmKey"
+				value="#{userConfirmationLinkController.confirmationKey}"
+				required="true"
+				requiredMessage="#{msg.ERROR_PARAMETER_CONFIRM_KEY_IS_NOT_SET}"
+				/>
+			<f:viewAction action="#{userConfirmationLinkController.maybeConfirmUserAccount()}" />
 		</f:metadata>
 	</ui:define>
 
-	<ui:define name="guest_title">
+	<ui:define name="document_guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT}" />
 	</ui:define>
 
@@ -37,9 +44,12 @@
 				</h:panelGroup>
 			</h:panelGroup>
 
-			<widgets:outputMessageBox id="error-helper-user" message="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
+			<core:outputMessageBox
+				panelGroupId="errorHandlerConfirmUser"
+				message="#{msg.GUEST_CONFIRMATION_LINK_INVALID}"
+				messageStyleClass="alert-danger"
+				rendered="#{empty beanHelper.user}"
+				/>
 		</ui:fragment>
-
-		<widgets:outputMessageBox id="error-confirmation-key" message="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty userConfirmationLinkController.confirmationKey}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml
index 2848da62..349a5a1c 100644
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_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="login_title">
+<ui:composition
+	template="/WEB-INF/templates/guest/guest_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_guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LIST}" />
 	</ui:define>
 
@@ -17,14 +19,29 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-user-list-disabled" message="#{msg.ERROR_USER_LIST_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_list')}" />
+		<core:outputMessageBox
+			panelGroupId="errorUserListDisabled"
+			message="#{msg.ERROR_USER_LIST_DISABLED}"
+			messageStyleClass="alert-danger"
+			rendered="#{not featureController.isFeatureEnabled('user_list')}"
+			/>
 
-		<h:panelGroup styleClass="table table-full" layout="block" rendered="#{featureController.isFeatureEnabled('user_list')}">
+		<h:panelGroup
+			layout="block"
+			rendered="#{featureController.isFeatureEnabled('user_list')}"
+			>
 			<div class="table-header">
 				<h:outputText value="#{msg.TABLE_HEADER_USER_LIST}" />
 			</div>
 
-			<p:dataTable id="userList" var="user" value="#{userController.allUsers()}" tableStyleClass="table" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.allUsers().size() lt 0}">
+			<p:dataTable
+				id="userList"
+				var="user"
+				value="#{userListController.allUsers}"
+				paginator="true"
+				rows="10"
+				summary="#{msg.TABLE_SUMMARY_USER_LIST}"
+				>
 				<ui:fragment rendered="#{profileController.isProfileLinkVisibleByUser(user)}">
 					<p:column>
 						<f:facet name="header">
@@ -39,7 +56,7 @@
 							<h:outputText value="#{msg.USER_CREATED}" />
 						</f:facet>
 
-						<h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
+						<h:outputFormat value="#{user.userEntryCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
 					</p:column>
 				</ui:fragment>
 			</p:dataTable>
diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml
index dd47190d..21bf444e 100644
--- a/web/guest/user/user_login.xhtml
+++ b/web/guest/user/user_login.xhtml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_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="guest_title">
+<ui:composition
+	template="/WEB-INF/templates/guest/guest_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:p="http://primefaces.org/ui"
+	>
+
+	<ui:define name="document_guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN}" />
 	</ui:define>
 
@@ -16,7 +17,12 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-user-login-disabled" message="#{msg.ERROR_GUEST_USER_LOGIN_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}" />
+		<core:outputMessageBox
+			panelGroupId="errorUserLoginDisabled"
+			message="#{msg.ERROR_GUEST_USER_LOGIN_DISABLED}"
+			messageStyleClass="alert-danger"
+			rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}"
+			/>
 
 		<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 			<h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('user_registration')}">
@@ -24,7 +30,11 @@
 
 				<h:outputText value="&#160;" />
 
-				<p:link id="user_register" outcome="user_register" title="#{msg.LINK_GUEST_USER_NO_ACCOUNT_TITLE}" value="#{msg.LINK_GUEST_USER_NO_ACCOUNT_YET}" />
+				<p:link
+					outcome="user_register"
+					value="#{msg.GUEST_LINK_USER_NO_ACCOUNT_YET}"
+					title="#{msg.GUEST_LINK_USER_NO_ACCOUNT_TITLE}"
+					/>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="para" layout="block">
@@ -32,7 +42,11 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
-				<p:link id="user_lost_password" outcome="user_lost_password" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.LINK_GUEST_LOGIN_LOST_PASSWORD}" />
+				<p:link
+					outcome="user_lost_password"
+					value="#{msg.GUEST_LINK_USER_LOST_PASSWORD}"
+					title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}"
+					/>
 			</h:panelGroup>
 		</ui:fragment>
 	</ui:define>
diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml
index a181a29a..a9bb356a 100644
--- a/web/guest/user/user_lost_password.xhtml
+++ b/web/guest/user/user_lost_password.xhtml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_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/guest/guest_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="guest_title">
+	<ui:define name="document_guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LOST_PASSWORD}" />
 	</ui:define>
 
@@ -16,11 +18,16 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-user-recovery-disabled" message="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}" />
+		<core:outputMessageBox
+			panelGroupId="errorUserRecoveryDisabled"
+			message="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DISABLED}"
+			messageStyleClass="alert-danger"
+			rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}"
+			/>
 
 		<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
 			<div id="user_lost_password_content">
-				<h:form id="form_lost_password">
+				<h:form>
 					<h:panelGroup styleClass="table" layout="block">
 						<div class="table-header">
 							<h:outputText value="#{msg.GUEST_LOST_PASSWORD_TITLE}" />
@@ -37,7 +44,7 @@
 								</div>
 
 								<div class="table-right">
-									<p:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
+									<p:inputText id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
 								</div>
 							</h:panelGroup>
 
@@ -51,15 +58,23 @@
 								</div>
 
 								<div class="table-right">
-									<p:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
+									<p:inputText id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
 								</div>
 							</h:panelGroup>
 						</fieldset>
 
-						<div class="table-footer">
-							<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-							<p:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
-						</div>
+						<p:panelGrid columns="2" layout="grid">
+							<p:commandButton
+								type="reset"
+								value="#{msg.BUTTON_RESET_FORM}"
+								/>
+
+							<p:commandButton
+								type="submit"
+								value="#{msg.BUTTON_CONTINUE_STEP_2}"
+								action="#{passwordRecoveryController.doLostPasswordStep2()}"
+								/>
+						</p:panelGrid>
 					</h:panelGroup>
 				</h:form>
 			</div>
diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
index d490c8ed..84243482 100644
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -1,23 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_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">
+<ui:composition
+	template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_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="login_title">
+	<ui:define name="document_login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_USER_PROFILE}" />
 	</ui:define>
 
-	<ui:define name="guest_title">
+	<ui:define name="document_guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_INDEX_USER_PROFILE}" />
 	</ui:define>
 
@@ -26,22 +36,34 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-user-profile-disabled" message="#{msg.ERROR_GUEST_USER_PROFILE_DISABLED}" messageStyleClass="alert-danger" rendered="#{not userController.isPublicUserProfileEnabled()}" />
-
-		<widgets:outputMessageBox id="error-user-id-empty" message="#{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}" rendered="#{userController.isUserIdEmpty()}" />
-
-		<ui:fragment rendered="#{userController.isPublicUserProfileEnabled()}">
-			<widgets:outputMessageBox id="error-user-profile-hidden" message="#{msg.ERROR_PROFILE_NOT_VISIBLE}" messageStyleClass="alert-danger" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
-
-			<ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
-				<div align="center">
-					<h:panelGrid styleClass="table" headerClass="table-header" footerClass="table-footer">
-						<f:facet name="header">
-							<h:outputText value="#{msg.PUBLIC_USER_PROFILE}" />
-						</f:facet>
-						<!-- @TODO Unfinished -->
-					</h:panelGrid>
-				</div>
+		<core:outputMessageBox
+			panelGroupId="errorUserProfileDisabled"
+			message="#{msg.ERROR_GUEST_USER_PROFILE_DISABLED}"
+			messageStyleClass="alert-danger"
+			rendered="#{not featureController.isFeatureEnabled("public_user_profile")}"
+			/>
+
+		<core:outputMessageBox
+			panelGroupId="errorUserIdEmpty"
+			message="#{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}"
+			rendered="#{userLoginController.isUserIdEmpty()}"
+			/>
+
+		<ui:fragment rendered="#{featureController.isFeatureEnabled("public_user_profile")}">
+			<core:outputMessageBox
+				panelGroupId="errorUserProfileHidden"
+				message="#{msg.ERROR_PROFILE_NOT_VISIBLE}"
+				messageStyleClass="alert-danger"
+				rendered="#{not profileController.isProfileLinkVisibleById(userLoginController.userId)}"
+				/>
+
+			<ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userLoginController.userId)}">
+				<p:panelGrid>
+					<f:facet name="header">
+						<h:outputText value="#{msg.PUBLIC_USER_PROFILE}" />
+					</f:facet>
+					<!-- @TODO Unfinished -->
+				</p:panelGrid>
 			</ui:fragment>
 		</ui:fragment>
 	</ui:define>
diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml
index 7364c6ab..aba81919 100644
--- a/web/guest/user/user_register.xhtml
+++ b/web/guest/user/user_register.xhtml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_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/guest/guest_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:p="http://primefaces.org/ui"
+	>
 
-	<ui:define name="guest_title">
+	<ui:define name="document_guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER}" />
 	</ui:define>
 
@@ -16,15 +17,28 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-user-registration-disabled" message="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_registration')}" />
+		<core:outputMessageBox
+			panelGroupId="errorUserRegistrationDisabled"
+			message="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}"
+			messageStyleClass="alert-danger"
+			rendered="#{not featureController.isFeatureEnabled('user_registration')}"
+			/>
 
-		<widgets:outputMessageBox id="error-user-registration-index" message="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" messageStyleClass="alert-danger" rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}" />
+		<core:outputMessageBox
+			panelGroupId="errorUserRegistrationIndex"
+			message="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}"
+			messageStyleClass="alert-danger"
+			rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}"
+			/>
 
 		<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration_in_index') and featureController.isFeatureEnabled('user_registration')}">
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 				<h:panelGroup styleClass="para" layout="block">
 					<h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1} " />
-					<p:link outcome="user_login" value="#{msg.CLICK_HERE}" />
+					<p:link
+						outcome="user_login"
+						value="#{msg.CLICK_HERE}"
+						/>
 					<h:outputText value=" #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
 				</h:panelGroup>
 			</ui:fragment>
diff --git a/web/guest/user/user_register_done.xhtml b/web/guest/user/user_register_done.xhtml
index c34301d4..849730b4 100644
--- a/web/guest/user/user_register_done.xhtml
+++ b/web/guest/user/user_register_done.xhtml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_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/guest/guest_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:p="http://primefaces.org/ui"
+	>
 
-	<ui:define name="guest_title">
+	<ui:define name="document_guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_DONE}" />
 	</ui:define>
 
 	<ui:define name="content_header">
-		<widgets:outputMessageBox id="user-registration-completed" message="#{msg.CONTENT_TITLE_USER_REGISTER_DONE}" />
+		<core:outputMessageBox
+			panelGroupId="user-registration-completed"
+			message="#{msg.CONTENT_TITLE_USER_REGISTER_DONE}"
+			/>
 	</ui:define>
 
 	<ui:define name="content">
@@ -21,7 +25,12 @@
 		</h:panelGroup>
 
 		<h:panelGroup layout="block" styleClass="registration_form">
-			<p:link id="resend_link" styleClass="resend_link" value="#{msg.LINK_GUEST_RESEND_CONFIRMATION_LINK}" outcome="user_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
+			<p:link
+				outcome="user_resend_link"
+				value="#{msg.GUEST_LINK_RESEND_CONFIRMATION_LINK}"
+				rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}"
+				styleClass="resend_link"
+				/>
 		</h:panelGroup>
 	</ui:define>
 </ui:composition>
diff --git a/web/guest/user/user_register_page2.xhtml b/web/guest/user/user_register_page2.xhtml
index f8bf7a6b..5b7ee595 100644
--- a/web/guest/user/user_register_page2.xhtml
+++ b/web/guest/user/user_register_page2.xhtml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_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/guest/guest_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:p="http://primefaces.org/ui"
+	>
 
-	<ui:define name="guest_title">
+	<ui:define name="document_guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_PAGE2}" />
 	</ui:define>
 
@@ -16,13 +17,21 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-user-registration-multi-disabled" message="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}" />
+		<core:outputMessageBox
+			panelGroupId="errorUserRegistrationMultiDisabled"
+			message="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_DISABLED}"
+			messageStyleClass="alert-danger"
+			rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}"
+			/>
 
 		<ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 				<h:panelGroup styleClass="para" layout="block">
 					<h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}" />
-					<p:link outcome="user_login" value="#{msg.CLICK_HERE}" />
+					<p:link
+						outcome="user_login"
+						value="#{msg.CLICK_HERE}"
+						/>
 					<h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
 				</h:panelGroup>
 			</ui:fragment>
diff --git a/web/guest/user/user_resend_done.xhtml b/web/guest/user/user_resend_done.xhtml
index a0f18d0f..2796c0b2 100644
--- a/web/guest/user/user_resend_done.xhtml
+++ b/web/guest/user/user_resend_done.xhtml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_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">
+<ui:composition
+	template="/WEB-INF/templates/guest/guest_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"
+	>
 
-	<ui:define name="guest_title">
+	<ui:define name="document_guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_RESEND_DONE}" />
 	</ui:define>
 
@@ -15,6 +16,9 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="guest-user-resend-link-completed" message="#{msg.GUEST_USER_RESEND_LINK_COMPLETED}" />
+		<core:outputMessageBox
+			panelGroupId="guest-user-resend-link-completed"
+			message="#{msg.GUEST_USER_RESEND_LINK_COMPLETED}"
+			/>
 	</ui:define>
 </ui:composition>
diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml
index 08dfc7e5..f29ae1b7 100644
--- a/web/guest/user/user_resend_link.xhtml
+++ b/web/guest/user/user_resend_link.xhtml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_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="guest_title">
+<ui:composition
+	template="/WEB-INF/templates/guest/guest_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
+	xmlns:validator="http://mxchange.org/jsf/core/validators"
+	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_guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_INDEX_RESEND_LINK}" />
 	</ui:define>
 
@@ -16,9 +19,14 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-user-resend-link-disabled" message="#{msg.ERROR_GUEST_USER_RESEND_LINK_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
+		<core:outputMessageBox
+			panelGroupId="errorUserResendLinkDisabled"
+			message="#{msg.ERROR_GUEST_USER_RESEND_LINK_DISABLED}"
+			messageStyleClass="alert-danger"
+			rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}"
+			/>
 
-		<h:form id="form_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
+		<h:form rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
 			<h:panelGroup styleClass="table" layout="block">
 				<div class="table-header">
 					<h:outputText value="#{msg.GUEST_RESEND_LINK_TITLE}" />
@@ -35,8 +43,15 @@
 						</div>
 
 						<div class="table-right">
-							<p:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{userResendConfirmationController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
-								<f:validator validatorId="EmailAddressValidator" />
+							<p:inputText
+								id="emailAddress"
+								size="20"
+								maxlength="255"
+								value="#{userResendConfirmationController.emailAddress}"
+								required="true"
+								requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}"
+								>
+								<validator:emailAddressValidator />
 							</p:inputText>
 						</div>
 					</h:panelGroup>
@@ -50,10 +65,18 @@
 					<h:outputText value="#{msg.GUEST_RESEND_CONFIRMATION_LINK_NOTICE}" />
 				</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_resend_link" value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}" action="#{userResendConfirmationController.doResendLink()}" />
-				</div>
+				<p:panelGrid columns="2" layout="grid">
+					<p:commandButton
+						type="reset"
+						value="#{msg.BUTTON_RESET_FORM}"
+						/>
+
+					<p:commandButton
+						type="submit"
+						value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}"
+						action="#{userResendConfirmationController.doResendLink()}"
+						/>
+				</p:panelGrid>
 			</h:panelGroup>
 		</h:form>
 	</ui:define>
diff --git a/web/imprint.xhtml b/web/imprint.xhtml
index 20310140..8170d16b 100644
--- a/web/imprint.xhtml
+++ b/web/imprint.xhtml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_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/#{userLoginController.baseTemplatePathName}_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="guest_title">
+	<ui:define name="document_guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_INDEX_IMPRINT}" />
 	</ui:define>
 
diff --git a/web/index.xhtml b/web/index.xhtml
index 130236ee..a2025f04 100644
--- a/web/index.xhtml
+++ b/web/index.xhtml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_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/guest/guest_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="guest_title">
+	<ui:define name="document_guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_INDEX_WELCOME}" />
 	</ui:define>
 
@@ -26,7 +27,7 @@
 			</h:panelGroup>
 		</ui:fragment>
 
-		<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration_in_index')}">
+		<ui:fragment rendered="#{featureController.isFeatureEnabled('guest_index_content')}">
 			<ui:include src="/WEB-INF/templates/guest/guest_index.tpl" />
 		</ui:fragment>
 	</ui:define>
diff --git a/web/privacy.xhtml b/web/privacy.xhtml
index d0430b03..7c6fb773 100644
--- a/web/privacy.xhtml
+++ b/web/privacy.xhtml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_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/#{userLoginController.baseTemplatePathName}_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="guest_title">
+	<ui:define name="document_guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_INDEX_PRIVACY}" />
 	</ui:define>
 
diff --git a/web/resources/css/default.css b/web/resources/css/default.css
deleted file mode 100644
index 42fb9258..00000000
--- a/web/resources/css/default.css
+++ /dev/null
@@ -1,25 +0,0 @@
-body {
-	background-color: white;
-	font-size: 12px;
-	font-family: sans-serif;
-	color: black;
-	margin: 0px;
-}
-
-h1 {
-	border-bottom: 1px solid #AFAFAF;
-	font-size:  16px;
-	font-weight: bold;
-	margin: 0px;
-	padding: 0px;
-}
-
-a:link, a:visited {
-	color: #045491;
-	text-decoration: none;
-}
-
-a:link:hover, a:visited:hover {
-	color: #045491;
-	text-decoration : underline;
-}
diff --git a/web/resources/css/layout.css b/web/resources/css/layout.css
index 72ceb5ec..3f53589a 100644
--- a/web/resources/css/layout.css
+++ b/web/resources/css/layout.css
@@ -1,41 +1,32 @@
-/**
-div, table {
-	border: 1px solid #ff0000;
+body {
+	font-size: 0.9em !important;
+	font-family: sans-serif !important;
+	margin: 0px;
 }
-/**/
 
-#page-header {
-	border-bottom: 1px solid grey;
-	background-color: steelblue;
-	color: white;
-	padding: 5px;
-	margin: 0px 0px 10px 0px;
+.page-header > h1 {
+	margin: 2px;
 }
 
-#page-footer {
-	background-color: lightblue;
-	padding: 5px;
-	margin: 10px 0px 0px 0px;
-	overflow: auto;
+a:link, a:visited {
+	color: #045491;
+	text-decoration: none;
 }
 
-#left-menu-container {
-	float: left;
-	background-color: khaki;
-	padding: 5px;
-	width: 170px;
+a:link:hover, a:visited:hover {
+	color: #045491;
+	text-decoration : underline;
 }
 
-.center_content {
-	position: relative;
-	background-color: #dddddd;
+.page-header {
+	background-color: steelblue;
+	color: white;
 	padding: 5px;
 }
 
-.content-container {
-	padding-right: 5px;
-	padding-bottom: 5px;
-	margin-left: 190px;
+.page-content-gap {
+	height: 0.35em;
+	background-image: linear-gradient(steelblue, white);
 }
 
 .page-footer {
@@ -55,28 +46,6 @@ div, table {
 	text-decoration : underline;
 }
 
-table, .table, .table-medium {
-	margin: 0px;
-	padding: 0px;
-}
-
-.table {
-	width: 500px;
-}
-
-.table-footer {
-	margin: 2px;
-}
-
-.table-medium {
-	width: 650px;
-}
-
-.table-full {
-	margin: 0 auto;
-	width: 100%;
-}
-
 .table-row {
 	width: 100%;
 	min-height: 20px;
@@ -84,85 +53,10 @@ table, .table, .table-medium {
 	overflow: auto;
 }
 
-.table-left {
-	width: 250px;
-	min-height: 20px;
-	float: left;
-}
-
-.table-right {
-	width: 200px;
-	min-height: 20px;
-	float: right;
-}
-
-.table-left25 {
-	width: 20px;
-	min-height: 20px;
-	float: left;
-}
-
-.table-right75 {
-	width: 430px;
-	min-height: 20px;
-	float: right;
-}
-
-.table-left-medium {
-	width: 300px;
-	min-height: 20px;
-	float: left;
-}
-
-.table-right-medium {
-	width: 300px;
-	min-height: 20px;
-	float: right;
-}
-
-.table-left25-medium {
-	width: 150px;
-	min-height: 20px;
-	float: left;
-}
-
-.table-right75-medium {
-	width: 490px;
-	min-height: 20px;
-	float: right;
-}
-
 .para {
 	padding: 5px;
 }
 
-ul.navbar-horizontal, ul.navbar-mini {
-	display: block;
-	text-align: center;
-	list-style: none;
-	margin: 0px;
-	padding: 0px;
-}
-
-ul.navbar-horizontal li.navlink-horizontal, ul.navbar-mini li.navlink-mini {
-	display: block;
-	float: left;
-}
-
-ul.navbar-horizontal li.navlink-horizontal {
-	width: 100px;
-}
-
-ul.navbar-mini li.navlink-mini {
-	padding: 1px;
-}
-
-ul.navbar-horizontal li.footer-copyright {
-	float: right;
-	width: 300px;
-	margin-right: 10px;
-}
-
 .table-header {
 	text-align: center;
 	font-weight: bold;
@@ -283,23 +177,10 @@ ul.navbar-horizontal li.footer-copyright {
 	color: #aa0000;
 }
 
-.divider-right {
-	margin-right: 2px;
-}
-
 #content-header {
 	border: 1px solid grey;
 }
 
-#content-header, .input, .submit, .reset, .button-danger, .button-warning, .fieldset {
-	border-top-right-radius: 8px;
-	border-bottom-left-radius: 8px;
-}
-
-.fieldset {
-	padding: 5px;
-}
-
 #menu-content-wrapper {
 	overflow: auto;
 }
@@ -343,3 +224,12 @@ ul.navbar-horizontal li.footer-copyright {
 .column-selector {
 	float: right;
 }
+
+.ui-noborder {
+	border: initial;
+}
+
+.ui-transparent-widget > div {
+	background-color: transparent;
+	background-image: initial;
+}
diff --git a/web/terms.xhtml b/web/terms.xhtml
index 7263f4ae..ad264bc8 100644
--- a/web/terms.xhtml
+++ b/web/terms.xhtml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_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/#{userLoginController.baseTemplatePathName}_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="guest_title">
+	<ui:define name="document_guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_INDEX_TERMS}" />
 	</ui:define>
 
diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
index 0ce16dad..0c6f662b 100644
--- a/web/user/login_contact_data_saved.xhtml
+++ b/web/user/login_contact_data_saved.xhtml
@@ -1,27 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_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/login/user/user_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:p="http://primefaces.org/ui"
+	>
 
-	<ui:define name="login_title">
+	<ui:define name="document_login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
 	</ui:define>
 
-	<ui:define name="content_header">
+	<ui:define name="login_content_header">
 		<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="login-user-data-saved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
+		<core:outputMessageBox
+			panelGroupId="loginUserDataSaved"
+			message="#{msg.LOGIN_MESSAGE_DATA_SAVED}"
+			rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}"
+			/>
 
-		<widgets:outputMessageBox id="error-user-edit-data-disabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
+		<core:outputMessageBox
+			panelGroupId="errorUserEditDataDisabled"
+			message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}"
+			messageStyleClass="alert-danger"
+			rendered="#{not featureController.isFeatureEnabled('edit_user_data')}"
+			/>
 
 		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-			<p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+			<p:link
+				outcome="user_change_password"
+				value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+				/>
 		</ui:fragment>
 
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml
index 7af8f136..91afff19 100644
--- a/web/user/login_data_saved.xhtml
+++ b/web/user/login_data_saved.xhtml
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_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">
+<ui:composition
+	template="/WEB-INF/templates/login/user/user_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"
+	>
 
-	<ui:define name="login_title">
+	<ui:define name="document_login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_DATA_SAVED}" />
 	</ui:define>
 
-	<ui:define name="content_header">
+	<ui:define name="login_content_header">
 		<h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_DATA_SAVED}" />
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="login-user-data-saved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn()}" />
+		<core:outputMessageBox
+			panelGroupId="loginUserDataSaved"
+			message="#{msg.LOGIN_MESSAGE_DATA_SAVED}"
+			rendered="#{userLoginController.isUserLoggedIn()}"
+			/>
 
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
 			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml
index 8e99559d..1686bedd 100644
--- a/web/user/login_edit_user_data.xhtml
+++ b/web/user/login_edit_user_data.xhtml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_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="login_title">
+<ui:composition
+	template="/WEB-INF/templates/login/user/user_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="document_login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}" />
 	</ui:define>
 
-	<ui:define name="content_header">
+	<ui:define name="login_content_header">
 		<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA}" />
 	</ui:define>
 
@@ -28,18 +30,30 @@
 				<ul>
 					<ui:fragment rendered="#{not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password')}">
 						<li>
-							<p:link title="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_user_change_personal_data" value="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA}" />
+							<p:link
+								outcome="login_user_change_personal_data"
+								value="#{msg.LOGIN_LINK_USER_CHANGE_PERSONAL_DATA}"
+								title="#{msg.LOGIN_LINK_USER_CHANGE_PERSONAL_DATA_TITLE}"
+								/>
 						</li>
 					</ui:fragment>
 
 					<ui:fragment rendered="#{not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password')}">
 						<li>
-							<p:link title="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_user_change_email_address" value="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
+							<p:link
+								outcome="login_user_change_email_address"
+								value="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS}"
+								title="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS_TITLE}"
+								/>
 						</li>
 					</ui:fragment>
 
 					<li>
-						<p:link title="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD_TITLE}" outcome="login_user_change_password" value="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD}" />
+						<p:link
+							outcome="login_user_change_password"
+							value="#{msg.LOGIN_LINK_USER_CHANGE_PASSWORD}"
+							title="#{msg.LOGIN_LINK_USER_CHANGE_PASSWORD_TITLE}"
+							/>
 					</li>
 				</ul>
 			</h:panelGroup>
diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml
index 63f89090..76e5055e 100644
--- a/web/user/login_index.xhtml
+++ b/web/user/login_index.xhtml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_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:composition
+	template="/WEB-INF/templates/login/user/user_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:p="http://primefaces.org/ui"
+	>
 
-	<ui:define name="login_title">
+	<ui:define name="document_login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_HOME}" />
 	</ui:define>
 
-	<ui:define name="content_header">
+	<ui:define name="login_content_header">
 		<h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_HOME}" />
 	</ui:define>
 
@@ -19,9 +20,11 @@
 			<!-- @TODO Here goes your content. //-->
 		</ui:fragment>
 
-		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-			<p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-		</ui:fragment>
+		<p:link
+			outcome="user_change_password"
+			value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+			rendered="#{userLoginController.ifUserMustChangePassword()}"
+			/>
 
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
 			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
diff --git a/web/user/login_logout.xhtml b/web/user/login_logout.xhtml
index d0eee5cb..80e839bc 100644
--- a/web/user/login_logout.xhtml
+++ b/web/user/login_logout.xhtml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_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:composition
+	template="/WEB-INF/templates/login/user/user_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:p="http://primefaces.org/ui"
+	>
 
-	<ui:define name="login_title">
+	<ui:define name="document_login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_LOGOUT}" />
 	</ui:define>
 
-	<ui:define name="content_header">
+	<ui:define name="login_content_header">
 		<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_LOGOUT}" />
 	</ui:define>
 
 	<ui:define name="content">
-		<h:form id="form_user_logout" rendered="#{userLoginController.isUserLoggedIn()}">
+		<h:form rendered="#{userLoginController.isUserLoggedIn()}">
 			<h:panelGroup styleClass="table" layout="block">
 				<div class="table-header">
 					<h:outputText value="#{msg.LOGIN_USER_LOGOUT_TITLE}" />
@@ -25,9 +26,11 @@
 					<h:outputText value="#{msg.LOGIN_USER_LOGOUT_NOTICE}" />
 				</h:panelGroup>
 
-				<div class="table-footer">
-					<p:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
-				</div>
+				<p:commandButton
+					type="submit"
+					value="#{msg.BUTTON_USER_LOGOUT}"
+					action="#{userLoginController.doUserLogout()}"
+					/>
 			</h:panelGroup>
 		</h:form>
 
diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml
index 672c8218..78d70dd5 100644
--- a/web/user/login_user_change_email_address.xhtml
+++ b/web/user/login_user_change_email_address.xhtml
@@ -1,29 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_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="login_title">
+<ui:composition
+	template="/WEB-INF/templates/login/user/user_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:p="http://primefaces.org/ui"
+	>
+
+	<ui:define name="document_login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
 	</ui:define>
 
-	<ui:define name="content_header">
+	<ui:define name="login_content_header">
 		<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-user-change-email-disabled" message="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}" />
+		<core:outputMessageBox
+			panelGroupId="errorUserChangeEmailDisabled"
+			message="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}"
+			messageStyleClass="alert-danger"
+			rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}"
+			/>
 
-		<h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('user_change_email_address')}">
+		<h:panelGroup
+			styleClass="table"
+			layout="block"
+			rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('user_change_email_address')}"
+			>
 			<div class="table-header">
 				<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
 			</div>
 
-			<h:form id="form_user_change_email_address">
+			<h:form>
 				<fieldset class="fieldset">
 					<legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">
 						<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_LEGEND}" />
@@ -46,10 +56,18 @@
 
 				<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
-				<div class="table-footer">
-					<p:commandButton class="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<p:commandButton class="submit" type="submit" id="button_change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userEmailChangeController.doUserChangeEmailAddress()}" />
-				</div>
+				<p:panelGrid columns="2" layout="grid">
+					<p:commandButton
+						type="reset"
+						value="#{msg.BUTTON_RESET_FORM}"
+						/>
+
+					<p:commandButton
+						type="submit"
+						value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}"
+						action="#{userEmailChangeController.doUserChangeEmailAddress()}"
+						/>
+				</p:panelGrid>
 			</h:form>
 		</h:panelGroup>
 
diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml
index cbac07e5..f18f7277 100644
--- a/web/user/login_user_change_password.xhtml
+++ b/web/user/login_user_change_password.xhtml
@@ -1,31 +1,41 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_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="login_title">
+<ui:composition
+	template="/WEB-INF/templates/login/user/user_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:p="http://primefaces.org/ui"
+	>
+
+	<ui:define name="document_login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PASSWORD}" />
 	</ui:define>
 
-	<ui:define name="content_header">
+	<ui:define name="login_content_header">
 		<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PASSWORD}" />
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="login-user-must-change-password" message="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}" />
-
-		<widgets:outputMessageBox id="error-user-edit-data-disabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
+		<core:outputMessageBox
+			panelGroupId="loginUserMustChangePassword"
+			message="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}"
+			rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}"
+			/>
+
+		<core:outputMessageBox
+			panelGroupId="errorUserEditDataDisabled"
+			message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}"
+			messageStyleClass="alert-danger"
+			rendered="#{not featureController.isFeatureEnabled('change_user_password')}"
+			/>
 
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
 			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
 		</ui:fragment>
 
 		<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-			<h:form id="form_user_change_password">
+			<h:form>
 				<h:panelGroup styleClass="table" layout="block" rendered="#{featureController.isFeatureEnabled('change_user_password')}">
 					<div class="table-header">
 						<h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_TITLE}" />
@@ -42,7 +52,7 @@
 							</div>
 
 							<div class="table-right">
-								<p:inputText type="secret" styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userPasswordController.userPassword}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REQUIRED}" />
+								<p:inputText type="secret" id="userPassword" size="10" maxlength="255" value="#{userPasswordController.userPassword}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REQUIRED}" />
 							</div>
 						</h:panelGroup>
 
@@ -56,7 +66,7 @@
 							</div>
 
 							<div class="table-right">
-								<p:inputText type="secret" styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userPasswordController.userPasswordRepeat}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REPEAT_REQUIRED}" />
+								<p:inputText type="secret" id="userPasswordRepeat" size="10" maxlength="255" value="#{userPasswordController.userPasswordRepeat}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REPEAT_REQUIRED}" />
 							</div>
 						</h:panelGroup>
 
@@ -70,10 +80,18 @@
 
 					<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.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_change_password" value="#{msg.BUTTON_USER_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
-					</div>
+					<p:panelGrid columns="2" layout="grid">
+						<p:commandButton
+							type="reset"
+							value="#{msg.BUTTON_RESET_FORM}"
+							/>
+
+						<p:commandButton
+							type="submit"
+							value="#{msg.BUTTON_USER_CHANGE_PASSWORD}"
+							action="#{userPasswordController.doChangePassword()}"
+							/>
+					</p:panelGrid>
 				</h:panelGroup>
 			</h:form>
 		</ui:fragment>
diff --git a/web/user/login_user_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml
index b5c1a72e..445cf895 100644
--- a/web/user/login_user_change_personal_data.xhtml
+++ b/web/user/login_user_change_personal_data.xhtml
@@ -1,47 +1,67 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_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="login_title">
+<ui:composition
+	template="/WEB-INF/templates/login/user/user_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:p="http://primefaces.org/ui"
+	>
+
+	<ui:define name="document_login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PERSONAL_DATA}" />
 	</ui:define>
 
-	<ui:define name="content_header">
+	<ui:define name="login_content_header">
 		<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA}" />
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="error-user-edit-data-disabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
+		<core:outputMessageBox
+			panelGroupId="errorUserEditDataDisabled"
+			message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}"
+			messageStyleClass="alert-danger"
+			rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}"
+			/>
 
-		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-			<p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-		</ui:fragment>
+		<p:link
+			outcome="user_change_password"
+			value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+			rendered="#{userLoginController.ifUserMustChangePassword()}"
+			/>
 
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
 			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
 		</ui:fragment>
 
-		<h:panelGroup styleClass="table table-medium" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+		<h:panelGroup
+			layout="block"
+			rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}"
+			>
 			<div class="table-header">
 				<h:outputText value="#{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}" />
 			</div>
 
-			<h:form id="form_login_change_personal">
-				<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
+			<h:form>
+				<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl">
+					<ui:param name="targetController" value="#{userLoginController}" />
+				</ui:include>
 
 				<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
 
 				<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.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_change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
-				</div>
+				<p:panelGrid columns="2" layout="grid">
+					<p:commandButton
+						type="reset"
+						value="#{msg.BUTTON_RESET_FORM}"
+						/>
+
+					<p:commandButton
+						value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}"
+						action="#{userActionController.doChangePersonalData()}"
+						/>
+				</p:panelGrid>
 			</h:form>
 		</h:panelGroup>
 	</ui:define>
diff --git a/web/user/login_user_contact_data_saved.xhtml b/web/user/login_user_contact_data_saved.xhtml
index ab88c830..95e19e52 100644
--- a/web/user/login_user_contact_data_saved.xhtml
+++ b/web/user/login_user_contact_data_saved.xhtml
@@ -1,26 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_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/login/user/user_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:p="http://primefaces.org/ui"
+	>
 
-	<ui:define name="login_title">
+	<ui:define name="document_login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CONTACT_DATA_SAVED}" />
 	</ui:define>
 
-	<ui:define name="content_header">
+	<ui:define name="login_content_header">
 		<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="login-user-data-saved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
+		<core:outputMessageBox
+			panelGroupId="loginUserDataSaved"
+			message="#{msg.LOGIN_MESSAGE_DATA_SAVED}"
+			rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}"
+			/>
 
-		<widgets:outputMessageBox id="error-user-edit-data-disabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
+		<core:outputMessageBox
+			panelGroupId="errorUserEditDataDisabled"
+			message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}"
+			messageStyleClass="alert-danger"
+			rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}"
+			/>
 
-		<p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" rendered="#{userLoginController.ifUserMustChangePassword()}" />
+		<p:link
+			outcome="user_change_password"
+			value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+			rendered="#{userLoginController.ifUserMustChangePassword()}"
+			/>
 
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
 			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml
index 531068f4..dd461a19 100644
--- a/web/user/login_user_data_saved.xhtml
+++ b/web/user/login_user_data_saved.xhtml
@@ -1,26 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_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/login/user/user_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:p="http://primefaces.org/ui"
+	>
 
-	<ui:define name="login_title">
+	<ui:define name="document_login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}" />
 	</ui:define>
 
-	<ui:define name="content_header">
+	<ui:define name="login_content_header">
 		<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED}" />
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox id="login-user-data-saved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
+		<core:outputMessageBox
+			panelGroupId="loginUserDataSaved"
+			message="#{msg.LOGIN_MESSAGE_DATA_SAVED}"
+			rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}"
+			/>
 
-		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-			<p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-		</ui:fragment>
+		<p:link
+			outcome="user_change_password"
+			value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+			rendered="#{userLoginController.ifUserMustChangePassword()}"
+			/>
 
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
 			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />