From: Roland Häder <roland@mxchange.org>
Date: Sun, 27 Aug 2017 13:02:11 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4695f402b927fc57e81339257f4862c127d73f62;p=pizzaservice-war.git

Please cherry-pick:
- rewrote templates (ui:include with unsafe ui:param) to custom JSF tags (
  type-safe parameter, including required parameter)
- also the as type set interfaces are being considered by NetBeans auto-complete
  and matching elements are sorted up and marked bold, very nice!
- remove no longer needed i18n strings ("targetController not set" + "mode")

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 81dcf3f2..3fe64e04 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -289,7 +289,6 @@ ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME=Land:
 ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE=Editieren oder l\u00f6schen der L\u00e4nderdaten
 TABLE_SUMMARY_ADMIN_LIST_COUNTRIES=Listet alle bereits angelegten L\u00e4nderdaten auf.
 COUNTRY_GERMANY=Deutschland
-ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET=Fehler: Der Parameter 'targetController' ist nicht gesetzt.
 ADMIN_MENU_MOBILE_PROVIDER_TITLE=Handyanbieter
 LINK_ADMIN_LIST_MOBILE_PROVIDER_TITLE=Hinzuf\u00fcgen, auflisten, \u00e4ndern und l\u00f6schen von Handyanbietern.
 PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST=Handyanbieter verwalten
@@ -411,7 +410,6 @@ ADMIN_LINK_EDIT_CONTACT_TITLE=Hier k\u00f6nnen Sie die Kontaktdaten editieren.
 BUTTON_ADMIN_EDIT_USER=Benutzerdaten \u00e4ndern
 ADMIN_EDIT_USER_TITLE=Benutzerdaten editieren
 ADMIN_DATA_PASSWORD_EDIT_NOTICE=Wenn Sie das Passwort \u00e4ndern wollen, m\u00fcssen Sie es zweimal eingeben, anderfalls beide leer lassen.
-ERROR_PARAMETER_MODE_NOT_SET=Fehler: Parameter 'mode' nicht gesetzt.
 ADMIN_EDIT_CONTACT_TITLE=Kontaktdaten editieren (Id-Nummer: {0})
 BUTTON_ADMIN_EDIT_CONTACT=Kontaktdaten \u00e4ndern
 PAGE_TITLE_ADMIN_LIST_CONTACT=Kotaktdaten auflisten
@@ -865,3 +863,4 @@ ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_COMPANY_FOUNDER_TITLE=Daten des Unternehmens
 #@TODO Please fix German umlauts!
 ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_COMPANY_FOUNDER_TITLE=Weisst diesem Firmeneintrag einen Unternehmensgruender zu.
 ADMIN_BUSINESS_BASIC_DATA_CREATED=Eintrag erstellt
+ADMIN_USER_NAME_IS_REQUIRED=Bitte vergeben Sie einen Benutzernamen. Dieser muss unique sein.
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 27a590aa..d56216bb 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -272,7 +272,6 @@ ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME=Country:
 ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE=Edit or delete country
 TABLE_SUMMARY_ADMIN_LIST_COUNTRIES=List of all already added countries.
 COUNTRY_GERMANY=Germany
-ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET=Error: The parameter 'targetController' is not set.
 ADMIN_MENU_MOBILE_PROVIDER_TITLE=Mobile providers
 LINK_ADMIN_LIST_MOBILE_PROVIDER=List mobile provider
 LINK_ADMIN_LIST_MOBILE_PROVIDER_TITLE=Add, list, edit and delete mobile providers.
@@ -391,7 +390,6 @@ ADMIN_LINK_EDIT_CONTACT_TITLE=Here you can edit contact data.
 BUTTON_ADMIN_EDIT_USER=Change user data
 ADMIN_EDIT_USER_TITLE=Edit user data
 ADMIN_DATA_PASSWORD_EDIT_NOTICE=If you want to change the password, enter it twice, otherwise leave both empty.
-ERROR_PARAMETER_MODE_NOT_SET=Error: Parameter 'mode' is not set.
 ADMIN_EDIT_CONTACT_TITLE=Edit contact data (id number: {0})
 BUTTON_ADMIN_EDIT_CONTACT=Change contact data
 PAGE_TITLE_ADMIN_LIST_CONTACT=List contact entries
@@ -838,3 +836,4 @@ ADMIN_BUSINESS_BASIC_DATA_COMPANY_FOUNDER=Founder
 ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_COMPANY_FOUNDER_TITLE=Show data of company founder.
 ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_COMPANY_FOUNDER_TITLE=Assigns a company founder to this company entry.
 ADMIN_BUSINESS_BASIC_DATA_CREATED=Entry created
+ADMIN_USER_NAME_IS_REQUIRED=Please enter a user name. This must be unique.
diff --git a/web/WEB-INF/resources/tags/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/resources/tags/admin/contact/admin_form_contact_data.tpl
deleted file mode 100644
index 964049c0..00000000
--- a/web/WEB-INF/resources/tags/admin/contact/admin_form_contact_data.tpl
+++ /dev/null
@@ -1,249 +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">
-
-	<h:panelGroup styleClass="para" layout="block">
-		<fieldset class="fieldset" id="personal_data">
-			<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">
-					<h:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{adminContactController.firstName}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="firstName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="title" value="#{msg.ADMIN_PERSONAL_DATA_TITLE}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="title" size="5" maxlength="255" value="#{adminContactController.academicTitle}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="title" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="familyName" value="#{msg.ADMIN_PERSONAL_DATA_FAMILY_NAME}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{adminContactController.familyName}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="familyName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="street" value="#{msg.ADMIN_PERSONAL_DATA_STREET}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{adminContactController.street}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="street" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="houseNumber" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h: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" />
-					</h:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="houseNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{adminContactController.houseNumberExtension}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="houseNumberExtension" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="zipCode" value="#{msg.ADMIN_PERSONAL_DATA_ZIP_CODE}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h: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" />
-					</h:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="zipCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="city" value="#{msg.ADMIN_PERSONAL_DATA_CITY}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="city" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="country" value="#{msg.ADMIN_PERSONAL_DATA_COUNTRY_CODE}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select" id="country" value="#{adminContactController.contactCountry}">
-						<f:converter converterId="CountryConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
-					</h:selectOneMenu>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="country" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="landLineCountryCode" value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select divider-right" id="landLineCountryCode" value="#{adminContactController.landLineCountry}">
-						<f:converter converterId="CountryConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-					</h:selectOneMenu>
-
-					<h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminContactController.landLineAreaCode}">
-						<f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
-					</h:inputText>
-
-					<h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminContactController.landLineNumber}">
-						<f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
-					</h:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="faxCountryCode" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select divider-right" id="faxCountryCode" value="#{adminContactController.faxCountry}">
-						<f:converter converterId="CountryConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-					</h:selectOneMenu>
-
-					<h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
-						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
-					</h:inputText>
-
-					<h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminContactController.faxNumber}">
-						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
-					</h: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">
-					<h:outputLabel for="emailAddress" value="#{msg.ADMIN_PERSONAL_DATA_EMAIL_ADDRESS}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="emailAddress" size="10" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
-						<f:validator validatorId="EmailAddressValidator" />
-						<f:attribute name="allowEmptyValue" value="#{allowEmptyRequiredData}" rendered="#{not empty allowEmptyRequiredData}" />
-					</h:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="emailAddress" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="contactBirthday" value="#{msg.ADMIN_PERSONAL_DATA_BIRTHDAY}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="contactBirthday" value="#{adminContactController.birthday}" size="10" converterMessage="#{msg.INVALID_BIRTHDAY}">
-						<f:convertDateTime pattern="#{msg.BIRTHDAY_PATTERN}" />
-					</h:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="contactBirthday" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="contactComment" value="#{msg.ADMIN_PERSONAL_DATA_COMMENT}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h: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/contact/admin_form_contact_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl
new file mode 100644
index 00000000..964049c0
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl
@@ -0,0 +1,249 @@
+<?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">
+
+	<h:panelGroup styleClass="para" layout="block">
+		<fieldset class="fieldset" id="personal_data">
+			<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">
+					<h:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{adminContactController.firstName}" />
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="firstName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="title" value="#{msg.ADMIN_PERSONAL_DATA_TITLE}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:inputText styleClass="input" id="title" size="5" maxlength="255" value="#{adminContactController.academicTitle}" />
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="title" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="familyName" value="#{msg.ADMIN_PERSONAL_DATA_FAMILY_NAME}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{adminContactController.familyName}" />
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="familyName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="street" value="#{msg.ADMIN_PERSONAL_DATA_STREET}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{adminContactController.street}" />
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="street" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="houseNumber" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h: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" />
+					</h:inputText>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="houseNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{adminContactController.houseNumberExtension}" />
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="houseNumberExtension" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="zipCode" value="#{msg.ADMIN_PERSONAL_DATA_ZIP_CODE}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h: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" />
+					</h:inputText>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="zipCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="city" value="#{msg.ADMIN_PERSONAL_DATA_CITY}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="city" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="country" value="#{msg.ADMIN_PERSONAL_DATA_COUNTRY_CODE}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:selectOneMenu styleClass="select" id="country" value="#{adminContactController.contactCountry}">
+						<f:converter converterId="CountryConverter" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
+					</h:selectOneMenu>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="country" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="landLineCountryCode" value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:selectOneMenu styleClass="select divider-right" id="landLineCountryCode" value="#{adminContactController.landLineCountry}">
+						<f:converter converterId="CountryConverter" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
+					</h:selectOneMenu>
+
+					<h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminContactController.landLineAreaCode}">
+						<f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
+					</h:inputText>
+
+					<h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminContactController.landLineNumber}">
+						<f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
+					</h:inputText>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="faxCountryCode" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:selectOneMenu styleClass="select divider-right" id="faxCountryCode" value="#{adminContactController.faxCountry}">
+						<f:converter converterId="CountryConverter" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
+					</h:selectOneMenu>
+
+					<h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
+						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
+					</h:inputText>
+
+					<h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminContactController.faxNumber}">
+						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
+					</h: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">
+					<h:outputLabel for="emailAddress" value="#{msg.ADMIN_PERSONAL_DATA_EMAIL_ADDRESS}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:inputText styleClass="input" id="emailAddress" size="10" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+						<f:validator validatorId="EmailAddressValidator" />
+						<f:attribute name="allowEmptyValue" value="#{allowEmptyRequiredData}" rendered="#{not empty allowEmptyRequiredData}" />
+					</h:inputText>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="emailAddress" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="contactBirthday" value="#{msg.ADMIN_PERSONAL_DATA_BIRTHDAY}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:inputText styleClass="input" id="contactBirthday" value="#{adminContactController.birthday}" size="10" converterMessage="#{msg.INVALID_BIRTHDAY}">
+						<f:convertDateTime pattern="#{msg.BIRTHDAY_PATTERN}" />
+					</h:inputText>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="contactBirthday" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="contactComment" value="#{msg.ADMIN_PERSONAL_DATA_COMMENT}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h: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/user/admin_form_user_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
new file mode 100644
index 00000000..b9573ae6
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
@@ -0,0 +1,79 @@
+<?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">
+
+	<h:panelGroup styleClass="para" layout="block" rendered="#{not empty mode}">
+		<fieldset class="fieldset" id="login_data">
+			<legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">
+				<h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}" />
+			</legend>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" requiredMessage="#{msg.ADMIN_USER_NAME_IS_REQUIRED}" />
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="userName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="userPassword" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="userPassword" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="userPasswordRepeat" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="userPasswordRepeat" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block" rendered="#{featureController.isFeatureEnabled('user_must_change_password')}">
+				<div class="table-left-medium">
+					<h:outputLabel for="userMustChangePassword" value="#{msg.ADMIN_USER_MUST_CHANGE_PASSWORD}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:selectBooleanCheckbox styleClass="checkbox" 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>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl b/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl
new file mode 100644
index 00000000..c9bb240e
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl
@@ -0,0 +1,45 @@
+<?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:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
+
+	<ui:fragment rendered="#{not empty beanHelper.faxNumber}">
+		<ul class="navbar-mini">
+			<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
+				<li class="navlink-mini">
+					<h:link outcome="admin_show_fax" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
+						<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
+					</h:link>
+				</li>
+			</ui:fragment>
+
+			<li class="navlink-mini">
+				<h:link outcome="admin_edit_fax" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
+					<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
+				</h:link>
+			</li>
+
+			<ui:fragment rendered="#{not empty beanHelper.contact}">
+				<li class="navlink-mini">
+					<h:link outcome="admin_unlink_contact_fax">
+						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+						<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
+						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+					</h:link>
+				</li>
+			</ui:fragment>
+
+			<li class="navlink-mini">
+				<h:link outcome="admin_delete_fax">
+					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
+					<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
+				</h:link>
+			</li>
+		</ul>
+	</ui:fragment>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl b/web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl
new file mode 100644
index 00000000..ec0c7db3
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl
@@ -0,0 +1,45 @@
+<?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:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
+
+	<ui:fragment rendered="#{not empty beanHelper.landLineNumber}">
+		<ul class="navbar-mini">
+			<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
+				<li class="navlink-mini">
+					<h:link outcome="admin_show_landline" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
+						<f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
+					</h:link>
+				</li>
+			</ui:fragment>
+
+			<li class="navlink-mini">
+				<h:link outcome="admin_edit_landline" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
+					<f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
+				</h:link>
+			</li>
+
+			<ui:fragment rendered="#{not empty beanHelper.contact}">
+				<li class="navlink-mini">
+					<h:link outcome="admin_unlink_contact_landline">
+						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+						<f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
+						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+					</h:link>
+				</li>
+			</ui:fragment>
+
+			<li class="navlink-mini">
+				<h:link outcome="admin_delete_landline">
+					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
+					<f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
+				</h:link>
+			</li>
+		</ul>
+	</ui:fragment>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl b/web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl
new file mode 100644
index 00000000..fa27d6ee
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl
@@ -0,0 +1,43 @@
+<?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">
+
+	<ui:fragment rendered="#{not empty beanHelper.mobileNumber}">
+		<ul class="navbar-mini">
+			<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
+				<li class="navlink-mini">
+					<h:link outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
+						<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
+					</h:link>
+				</li>
+			</ui:fragment>
+
+			<li class="navlink-mini">
+				<h:link outcome="admin_edit_mobile" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
+					<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
+				</h:link>
+			</li>
+
+			<ui:fragment rendered="#{not empty beanHelper.contact}">
+				<li class="navlink-mini">
+					<h:link outcome="admin_unlink_contact_mobile">
+						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+						<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
+						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+					</h:link>
+				</li>
+			</ui:fragment>
+
+			<li class="navlink-mini">
+				<h:link outcome="admin_delete_mobile">
+					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
+					<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
+				</h:link>
+			</li>
+		</ul>
+	</ui:fragment>
+</ui:composition>
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
new file mode 100644
index 00000000..622573d2
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
@@ -0,0 +1,54 @@
+<?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="fax_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered}">
+		<f:facet name="header">
+			<h:outputText value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_DATA}" />
+		</f:facet>
+
+		<h:column>
+			<h:panelGroup>
+				<h:outputLabel for="faxNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+
+				<h:outputText id="faxNumberId" styleClass="table-data-field" value="#{faxNumber.phoneId}" />
+
+				<h:message for="faxNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
+		</h:column>
+
+		<h:column>
+			<h: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:column>
+			<h:outputLabel for="faxCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+
+			<h:outputText id="faxCreated" styleClass="table-data-field" value="#{faxNumber.phoneEntryCreated.time}">
+				<f:convertDateTime for="contactCreated" type="both" />
+			</h:outputText>
+		</h:column>
+
+		<h:column>
+			<h:outputLabel for="faxUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+
+			<h:outputText id="faxUpdated" styleClass="table-data-field" value="#{faxNumber.phoneEntryUpdated.time}">
+				<f:convertDateTime for="contactUpdated" type="both" />
+			</h:outputText>
+		</h:column>
+
+		<h:column rendered="#{empty showAdminLinks or showAdminLinks}">
+			<h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
+
+			<div class="table-data-field">
+				<widgets:outputAdminFaxLinks faxNumber="#{faxNumber}" isShowPage="#{isShowPage}" />
+			</div>
+		</h:column>
+	</h: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
new file mode 100644
index 00000000..8017577e
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
@@ -0,0 +1,56 @@
+<?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:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" />
+
+	<h:panelGrid id="landline_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered}">
+		<f:facet name="header">
+			<h:outputText value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_DATA}" />
+		</f:facet>
+
+		<h:column>
+			<h:panelGroup>
+				<h:outputLabel for="landLineNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+
+				<h:outputText id="landLineNumberId" styleClass="table-data-field" value="#{landLineNumber.phoneId}" />
+
+				<h:message for="landLineNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
+		</h:column>
+
+		<h:column>
+			<h: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:column>
+			<h:outputLabel for="landLineCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+
+			<h:outputText id="landLineCreated" styleClass="table-data-field" value="#{landLineNumber.phoneEntryCreated.time}">
+				<f:convertDateTime for="contactCreated" type="both" />
+			</h:outputText>
+		</h:column>
+
+		<h:column>
+			<h:outputLabel for="landLineUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+
+			<h:outputText id="landLineUpdated" styleClass="table-data-field" value="#{landLineNumber.phoneEntryUpdated.time}">
+				<f:convertDateTime for="contactUpdated" type="both" />
+			</h:outputText>
+		</h:column>
+
+		<h:column rendered="#{empty showAdminLinks or showAdminLinks}">
+			<h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
+
+			<div class="table-data-field">
+				<widgets:outputAdminLandLineLinks landLineNumber="#{landLineNumber}" isShowPage="#{isShowPage}" />
+			</div>
+		</h:column>
+	</h: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
new file mode 100644
index 00000000..d936316a
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
@@ -0,0 +1,63 @@
+<?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="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered}">
+		<f:facet name="header">
+			<h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_DATA}" />
+		</f:facet>
+
+		<h:column>
+			<h:panelGroup>
+				<h:outputLabel for="mobileNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+
+				<h:outputText id="mobileNumberId" styleClass="table-data-field" value="#{mobileNumber.phoneId}" />
+
+				<h:message for="mobileNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
+		</h:column>
+
+		<h:column>
+			<h:outputLabel for="mobileProvider" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
+
+			<h: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}" />
+			</h:link>
+		</h:column>
+
+		<h:column>
+			<h: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:column>
+			<h:outputLabel for="mobileCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+
+			<h:outputText id="mobileCreated" styleClass="table-data-field" value="#{mobileNumber.phoneEntryCreated.time}">
+				<f:convertDateTime for="contactCreated" type="both" />
+			</h:outputText>
+		</h:column>
+
+		<h:column>
+			<h:outputLabel for="mobileUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+
+			<h:outputText id="mobileUpdated" styleClass="table-data-field" value="#{mobileNumber.phoneEntryUpdated.time}">
+				<f:convertDateTime for="contactUpdated" type="both" />
+			</h:outputText>
+		</h:column>
+
+		<h:column rendered="#{empty showAdminLinks or showAdminLinks}">
+			<h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
+
+			<div class="table-data-field">
+				<widgets:outputAdminMobileLinks mobileNumber="#{mobileNumber}" isShowPage="#{isShowPage}" />
+			</div>
+		</h:column>
+	</h:panelGrid>
+</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
new file mode 100644
index 00000000..bc181b04
--- /dev/null
+++ b/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl
@@ -0,0 +1,17 @@
+<?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:outputMessageBox message="#{msg.ERROR_PARAMETER_USER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty user}" />
+
+	<widgets:outputMessageBox message="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" boxStyleClass="message-mini" messageStyleClass="notice" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
+
+	<h: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}" />
+	</h:link>
+</ui:composition>
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
new file mode 100644
index 00000000..2a7575f2
--- /dev/null
+++ b/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl
@@ -0,0 +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:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<ui:fragment rendered="#{empty rendered or rendered}">
+		<h:panelGroup styleClass="table-row" layout="block">
+			<div class="table-left-medium">
+				<h:outputLabel for="faxNumber" value="#{labelMessage}" />
+			</div>
+
+			<div class="table-right-medium">
+				<h:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{targetController.faxCountry}">
+					<f:converter converterId="CountryConverter" />
+					<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+					<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
+				</h:selectOneMenu>
+
+				<h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
+					<f:validator validatorId="PhoneNumberValidator" />
+				</h:inputText>
+
+				<h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{targetController.faxNumber}">
+					<f:validator validatorId="PhoneNumberValidator" />
+				</h:inputText>
+			</div>
+		</h:panelGroup>
+
+		<h:panelGroup styleClass="error_container" layout="block">
+			<h:message for="faxAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+		</h:panelGroup>
+
+		<h:panelGroup styleClass="error_container" layout="block">
+			<h:message for="faxNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+		</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
new file mode 100644
index 00000000..624ef2d9
--- /dev/null
+++ b/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl
@@ -0,0 +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:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<ui:fragment rendered="#{empty rendered or rendered}">
+		<h:panelGroup styleClass="table-row" layout="block">
+			<div class="table-left-medium">
+				<h:outputLabel for="landLineNumber" value="#{labelMessage}" />
+			</div>
+
+			<div class="table-right-medium">
+				<h:selectOneMenu styleClass="select divider-right" id="countryPhoneCode" value="#{targetController.landLineCountry}">
+					<f:converter converterId="CountryConverter" />
+					<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+					<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
+				</h:selectOneMenu>
+
+				<h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.landLineAreaCode}">
+					<f:validator validatorId="PhoneNumberValidator" />
+				</h:inputText>
+
+				<h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{targetController.landLineNumber}">
+					<f:validator validatorId="PhoneNumberValidator" />
+				</h:inputText>
+			</div>
+		</h:panelGroup>
+
+		<h:panelGroup styleClass="error_container" layout="block">
+			<h:message for="landLineAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+		</h:panelGroup>
+
+		<h:panelGroup styleClass="error_container" layout="block">
+			<h:message for="landLineNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+		</h:panelGroup>
+	</ui:fragment>
+</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
index f4cbe83a..3d6fc071 100644
--- 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
@@ -6,11 +6,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
-
-	<widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty labelMessage}" />
-
-	<ui:fragment rendered="#{not empty targetController and not empty labelMessage and (empty rendered or rendered)}">
+	<ui:fragment rendered="#{empty rendered or rendered}">
 		<h:panelGroup styleClass="table-row" layout="block">
 			<div class="table-left-medium">
 				<h:outputLabel for="mobileNumber" value="#{labelMessage}" />
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
index ce8b5e88..025265be 100644
--- 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
@@ -6,9 +6,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
-
-	<ui:fragment rendered="#{not empty targetController and (empty rendered or rendered)}">
+	<ui:fragment rendered="#{empty rendered or rendered}">
 		<h:panelGroup styleClass="table-row" layout="block">
 			<div class="table-left-medium">
 				<h:outputLabel for="userPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
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
index 086ad4fe..b51146ab 100644
--- 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
@@ -6,11 +6,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
-
-	<widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty labelMessage}" />
-
-	<ui:fragment rendered="#{not empty targetController and not empty labelMessage and (empty rendered or rendered)}">
+	<ui:fragment rendered="#{empty rendered or rendered}">
 		<h:panelGroup styleClass="table-row" layout="block">
 			<div class="table-left-medium">
 				<h:outputLabel for="profileMode" value="#{labelMessage}" />
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
index bad5b479..80250d12 100644
--- a/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
@@ -12,7 +12,5 @@
 		<ui:include src="/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl" />
 	</ui:fragment>
 
-	<ui:fragment rendered="#{not empty beanHelper.contact.contactFaxNumber and not empty beanHelper.contact}">
-		<ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.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_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
deleted file mode 100644
index bba847e1..00000000
--- a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
+++ /dev/null
@@ -1,58 +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:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
-
-	<h:panelGrid id="fax_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{not empty beanHelper.faxNumber}">
-		<f:facet name="header">
-			<h:outputText value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_DATA}" />
-		</f:facet>
-
-		<h:column>
-			<h:panelGroup>
-				<h:outputLabel for="faxNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
-
-				<h:outputText id="faxNumberId" styleClass="table-data-field" value="#{beanHelper.faxNumber.phoneId}" />
-
-				<h:message for="faxNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-		</h:column>
-
-		<h:column>
-			<h:outputLabel for="faxNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_FAX_NUMBER_COMPLETE}" />
-
-			<h:outputText id="faxNumber" styleClass="table-data-field" value="#{beanHelper.faxNumber.phoneCountry.countryAbroadDialPrefix}#{beanHelper.faxNumber.phoneCountry.countryPhoneCode} (#{beanHelper.faxNumber.phoneAreaCode}) #{beanHelper.faxNumber.phoneNumber}" />
-		</h:column>
-
-		<h:column>
-			<h:outputLabel for="faxCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
-
-			<h:outputText id="faxCreated" styleClass="table-data-field" value="#{beanHelper.faxNumber.phoneEntryCreated.time}">
-				<f:convertDateTime for="contactCreated" type="both" />
-			</h:outputText>
-		</h:column>
-
-		<h:column>
-			<h:outputLabel for="faxUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
-
-			<h:outputText id="faxUpdated" styleClass="table-data-field" value="#{beanHelper.faxNumber.phoneEntryUpdated.time}">
-				<f:convertDateTime for="contactUpdated" type="both" />
-			</h:outputText>
-		</h:column>
-
-		<h:column rendered="#{empty showAdminLinks or showAdminLinks}">
-			<h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
-
-			<div class="table-data-field">
-				<ui:include src="/WEB-INF/templates/admin/fax/admin_fax_links.tpl">
-					<ui:param name="isShowPage" value="#{isShowPage}" />
-				</ui:include>
-			</div>
-		</h:column>
-	</h:panelGrid>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
deleted file mode 100644
index c9bb240e..00000000
--- a/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
+++ /dev/null
@@ -1,45 +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:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
-
-	<ui:fragment rendered="#{not empty beanHelper.faxNumber}">
-		<ul class="navbar-mini">
-			<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
-				<li class="navlink-mini">
-					<h:link outcome="admin_show_fax" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
-						<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
-					</h:link>
-				</li>
-			</ui:fragment>
-
-			<li class="navlink-mini">
-				<h:link outcome="admin_edit_fax" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
-					<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
-				</h:link>
-			</li>
-
-			<ui:fragment rendered="#{not empty beanHelper.contact}">
-				<li class="navlink-mini">
-					<h:link outcome="admin_unlink_contact_fax">
-						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
-						<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
-						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-					</h:link>
-				</li>
-			</ui:fragment>
-
-			<li class="navlink-mini">
-				<h:link outcome="admin_delete_fax">
-					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
-					<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
-				</h:link>
-			</li>
-		</ul>
-	</ui:fragment>
-</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
index 6ab382d1..48ee76d4 100644
--- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
@@ -36,25 +36,7 @@
 				<h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_FAX_DATA}" />
 			</div>
 
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="faxNumber" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<ui:include src="/WEB-INF/templates/input_fields/fax_input_fields.tpl">
-						<ui:param name="targetController" value="#{adminContactPhoneController}" />
-					</ui:include>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
+			<widgets:outputFaxInputTableRow targetController="#{adminContactPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
 
 			<div class="table-footer">
 				<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
diff --git a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
index 35b66744..78e7d6e5 100644
--- a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
@@ -24,25 +24,7 @@
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="faxNumber" value="#{msg.ADMIN_EDIT_FAX_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<ui:include src="/WEB-INF/templates/input_fields/fax_input_fields.tpl">
-						<ui:param name="targetController" value="#{adminPhoneController}" />
-					</ui:include>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
+			<widgets:outputFaxInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_EDIT_FAX_NUMBER}" />
 		</fieldset>
 	</h:panelGroup>
 </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
index 22d08e9e..30b289b5 100644
--- 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
@@ -36,25 +36,7 @@
 				<h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_LAND_LINE_DATA}" />
 			</div>
 
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="landLineNumber" value="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<ui:include src="/WEB-INF/templates/input_fields/landline_input_fields.tpl">
-						<ui:param name="targetController" value="#{adminPhoneController}" />
-					</ui:include>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
+			<widgets:outputLandLineInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
 
 			<div class="table-footer">
 				<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
index bb9afb03..6c9a55a4 100644
--- a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
@@ -24,25 +24,7 @@
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="landLineNumber" value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<ui:include src="/WEB-INF/templates/input_fields/landline_input_fields.tpl">
-						<ui:param name="targetController" value="#{adminPhoneController}" />
-					</ui:include>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
+			<widgets:outputLandLineInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER}" />
 		</fieldset>
 	</h:panelGroup>
 </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
index 460f4f53..bac827a8 100644
--- a/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
@@ -12,7 +12,5 @@
 		<ui:include src="/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl" />
 	</ui:fragment>
 
-	<ui:fragment rendered="#{not empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}">
-		<ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.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/landline/admin_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
deleted file mode 100644
index 7fe00866..00000000
--- a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
+++ /dev/null
@@ -1,58 +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:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
-
-	<h:panelGrid id="landline_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{not empty beanHelper.landLineNumber}">
-		<f:facet name="header">
-			<h:outputText value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_DATA}" />
-		</f:facet>
-
-		<h:column>
-			<h:panelGroup>
-				<h:outputLabel for="landLineNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
-
-				<h:outputText id="landLineNumberId" styleClass="table-data-field" value="#{beanHelper.landLineNumber.phoneId}" />
-
-				<h:message for="landLineNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-		</h:column>
-
-		<h:column>
-			<h:outputLabel for="landLineNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE}" />
-
-			<h:outputText id="landLineNumber" styleClass="table-data-field" value="#{beanHelper.landLineNumber.phoneCountry.countryAbroadDialPrefix}#{beanHelper.landLineNumber.phoneCountry.countryPhoneCode} (#{beanHelper.landLineNumber.phoneAreaCode}) #{beanHelper.landLineNumber.phoneNumber}" />
-		</h:column>
-
-		<h:column>
-			<h:outputLabel for="landLineCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
-
-			<h:outputText id="landLineCreated" styleClass="table-data-field" value="#{beanHelper.landLineNumber.phoneEntryCreated.time}">
-				<f:convertDateTime for="contactCreated" type="both" />
-			</h:outputText>
-		</h:column>
-
-		<h:column>
-			<h:outputLabel for="landLineUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
-
-			<h:outputText id="landLineUpdated" styleClass="table-data-field" value="#{beanHelper.landLineNumber.phoneEntryUpdated.time}">
-				<f:convertDateTime for="contactUpdated" type="both" />
-			</h:outputText>
-		</h:column>
-
-		<h:column rendered="#{empty showAdminLinks or showAdminLinks}">
-			<h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
-
-			<div class="table-data-field">
-				<ui:include src="/WEB-INF/templates/admin/landline/admin_landline_links.tpl">
-					<ui:param name="isShowPage" value="#{isShowPage}" />
-				</ui:include>
-			</div>
-		</h:column>
-	</h:panelGrid>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
deleted file mode 100644
index ec0c7db3..00000000
--- a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
+++ /dev/null
@@ -1,45 +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:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
-
-	<ui:fragment rendered="#{not empty beanHelper.landLineNumber}">
-		<ul class="navbar-mini">
-			<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
-				<li class="navlink-mini">
-					<h:link outcome="admin_show_landline" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
-						<f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
-					</h:link>
-				</li>
-			</ui:fragment>
-
-			<li class="navlink-mini">
-				<h:link outcome="admin_edit_landline" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
-					<f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
-				</h:link>
-			</li>
-
-			<ui:fragment rendered="#{not empty beanHelper.contact}">
-				<li class="navlink-mini">
-					<h:link outcome="admin_unlink_contact_landline">
-						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
-						<f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
-						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-					</h:link>
-				</li>
-			</ui:fragment>
-
-			<li class="navlink-mini">
-				<h:link outcome="admin_delete_landline">
-					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
-					<f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
-				</h:link>
-			</li>
-		</ul>
-	</ui:fragment>
-</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
index 8328e23f..abe6b12d 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
@@ -6,13 +6,11 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}"
+	<widgets:outputMessageBox 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>
 
-	<ui:fragment rendered="#{not empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}">
-		<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.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/admin_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
deleted file mode 100644
index cee89993..00000000
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
+++ /dev/null
@@ -1,67 +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:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
-
-	<h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{not empty beanHelper.mobileNumber}">
-		<f:facet name="header">
-			<h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_DATA}" />
-		</f:facet>
-
-		<h:column>
-			<h:panelGroup>
-				<h:outputLabel for="mobileNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
-
-				<h:outputText id="mobileNumberId" styleClass="table-data-field" value="#{beanHelper.mobileNumber.phoneId}" />
-
-				<h:message for="mobileNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-		</h:column>
-
-		<h:column>
-			<h:outputLabel for="mobileProvider" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
-
-			<h:link id="mobileProvider" outcome="admin_show_mobile_provider">
-				<h:outputText styleClass="table-data-field" value="#{beanHelper.mobileNumber.mobileProvider.providerName}" />
-				<f:param name="providerId" value="#{beanHelper.mobileNumber.mobileProvider.providerId}" />
-			</h:link>
-		</h:column>
-
-		<h:column>
-			<h:outputLabel for="mobileNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
-
-			<h:outputText id="mobileNumber" styleClass="table-data-field" value="#{beanHelper.mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{beanHelper.mobileNumber.mobileProvider.providerDialPrefix}-#{beanHelper.mobileNumber.phoneNumber}" />
-		</h:column>
-
-		<h:column>
-			<h:outputLabel for="mobileCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
-
-			<h:outputText id="mobileCreated" styleClass="table-data-field" value="#{beanHelper.mobileNumber.phoneEntryCreated.time}">
-				<f:convertDateTime for="contactCreated" type="both" />
-			</h:outputText>
-		</h:column>
-
-		<h:column>
-			<h:outputLabel for="mobileUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
-
-			<h:outputText id="mobileUpdated" styleClass="table-data-field" value="#{beanHelper.mobileNumber.phoneEntryUpdated.time}">
-				<f:convertDateTime for="contactUpdated" type="both" />
-			</h:outputText>
-		</h:column>
-
-		<h:column rendered="#{empty showAdminLinks or showAdminLinks}">
-			<h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
-
-			<div class="table-data-field">
-				<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl">
-					<ui:param name="isShowPage" value="#{isShowPage}" />
-				</ui:include>
-			</div>
-		</h:column>
-	</h:panelGrid>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
deleted file mode 100644
index 08d3b88d..00000000
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
+++ /dev/null
@@ -1,45 +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:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
-
-	<ui:fragment rendered="#{not empty beanHelper.mobileNumber}">
-		<ul class="navbar-mini">
-			<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
-				<li class="navlink-mini">
-					<h:link outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
-						<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
-					</h:link>
-				</li>
-			</ui:fragment>
-
-			<li class="navlink-mini">
-				<h:link outcome="admin_edit_mobile" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
-					<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
-				</h:link>
-			</li>
-
-			<ui:fragment rendered="#{not empty beanHelper.contact}">
-				<li class="navlink-mini">
-					<h:link outcome="admin_unlink_contact_mobile">
-						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
-						<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
-						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-					</h:link>
-				</li>
-			</ui:fragment>
-
-			<li class="navlink-mini">
-				<h:link outcome="admin_delete_mobile">
-					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
-					<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
-				</h:link>
-			</li>
-		</ul>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
deleted file mode 100644
index d81fba61..00000000
--- a/web/WEB-INF/templates/admin/user/admin_form_user_data.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://xmlns.jcp.org/jsf/core"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_MODE_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty mode}" />
-
-	<h:panelGroup styleClass="para" layout="block" rendered="#{not empty mode}">
-		<fieldset class="fieldset" id="login_data">
-			<legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">
-				<h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}" />
-			</legend>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="userPassword" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="userPasswordRepeat" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block" rendered="#{featureController.isFeatureEnabled('user_must_change_password')}">
-				<div class="table-left-medium">
-					<h:outputLabel for="userMustChangePassword" value="#{msg.ADMIN_USER_MUST_CHANGE_PASSWORD}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:selectBooleanCheckbox styleClass="checkbox" 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>
-</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
index 53c67426..724f72ac 100644
--- 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
@@ -6,13 +6,11 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">
-		<ui:param name="mode" value="add" />
-	</ui:include>
+	<widgets:outputAdminUserDataFormFields mode="add" />
 
 	<div class="para notice">
 		<h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
 	</div>
 
-	<widgets:outputAdminContactDataFormFields />
+	<widgets:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
 </ui:composition>
diff --git a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
deleted file mode 100644
index 94b2cfdd..00000000
--- a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
+++ /dev/null
@@ -1,26 +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:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
-
-	<ui:fragment rendered="#{not empty targetController}">
-		<h:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{targetController.faxCountry}">
-			<f:converter converterId="CountryConverter" />
-			<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-			<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-		</h:selectOneMenu>
-
-		<h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
-			<f:validator validatorId="PhoneNumberValidator" />
-		</h:inputText>
-
-		<h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{targetController.phoneNumber}">
-			<f:validator validatorId="PhoneNumberValidator" />
-		</h:inputText>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
deleted file mode 100644
index 8de46d3e..00000000
--- a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
+++ /dev/null
@@ -1,26 +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:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
-
-	<ui:fragment rendered="#{not empty targetController}">
-		<h:selectOneMenu styleClass="select divider-right" id="countryPhoneCode" value="#{targetController.landLineCountry}">
-			<f:converter converterId="CountryConverter" />
-			<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-			<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-		</h:selectOneMenu>
-
-		<h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.landLineAreaCode}">
-			<f:validator validatorId="PhoneNumberValidator" />
-		</h:inputText>
-
-		<h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{targetController.phoneNumber}">
-			<f:validator validatorId="PhoneNumberValidator" />
-		</h:inputText>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/templates/user/user_profile_link.tpl b/web/WEB-INF/templates/user/user_profile_link.tpl
deleted file mode 100644
index 6eff0a40..00000000
--- a/web/WEB-INF/templates/user/user_profile_link.tpl
+++ /dev/null
@@ -1,17 +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:outputMessageBox message="#{msg.ERROR_PARAMETER_USER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty user}" />
-
-	<h:outputText styleClass="notice" value="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
-
-	<h: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}" />
-	</h:link>
-</ui:composition>
diff --git a/web/WEB-INF/widgets.jsf.taglib.xml b/web/WEB-INF/widgets.jsf.taglib.xml
index e0d1ac34..66d02b6b 100644
--- a/web/WEB-INF/widgets.jsf.taglib.xml
+++ b/web/WEB-INF/widgets.jsf.taglib.xml
@@ -111,8 +111,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 			<name>labelMessage</name>
 			<description>A localized message for the rendered label tag. You should use EL code here to add a label message from your bundle.</description>
 			<required>true</required>
-			<!-- @TODO Find an interface for BaseFacesBean and set it here instead -->
-			<type>org.mxchange.jcoreee.bean.faces.BaseFacesBean</type>
+			<type>java.lang.String</type>
 		</attribute>
 		<attribute>
 			<name>rendered</name>
@@ -131,18 +130,238 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	<tag>
 		<tag-name>outputAdminContactDataFormFields</tag-name>
 		<description>This tag renders a fieldset for administrative purposes of contact data.</description>
-		<source>resources/tags/admin/contact/admin_form_contact_data.tpl</source>
+		<source>resources/tags/admin/form_data/contact/admin_form_contact_data.tpl</source>
 		<attribute>
 			<name>allowEmptyRequiredData</name>
 			<description>Whether allow the personal title to be left empty. This might be the case when you create a user and want to select a contact from a selection box. EL code resolving to a boolean may be allowed here.</description>
 			<required>false</required>
 			<type>java.lang.Boolean</type>
 		</attribute>
+	</tag>
+	<tag>
+		<tag-name>outputAdminUserDataFormFields</tag-name>
+		<description>This tag renders a fieldset for administrative purposes of user data.</description>
+		<source>resources/tags/admin/form_data/user/admin_form_user_data.tpl</source>
+		<attribute>
+			<name>mode</name>
+			<description>Mode of the form, must be one of "add" or "edit".</description>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
+	</tag>
+	<tag>
+		<tag-name>outputUserProfileLink</tag-name>
+		<description>This tag renders a h:link JSF tag for a user profile.</description>
+		<source>resources/tags/profile/user/user_profile_link.tpl</source>
+		<attribute>
+			<name>user</name>
+			<description>An instance of a User class.</description>
+			<required>true</required>
+			<type>org.mxchange.jusercore.model.user.User</type>
+		</attribute>
+	</tag>
+	<tag>
+		<tag-name>outputAdminFaxPanelGrid</tag-name>
+		<description>This tag renders a full h:panelGrid for administrative purposes for fax data.</description>
+		<source>resources/tags/admin/panel_grids/fax/admin_fax_data.tpl</source>
+		<attribute>
+			<name>isShowPage</name>
+			<description>Whether this tag is used to show mobile data (default true).</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+		<attribute>
+			<name>faxNumber</name>
+			<description>The fax instance that provides the data for this tag.</description>
+			<required>true</required>
+			<type>org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber</type>
+		</attribute>
+		<attribute>
+			<name>rendered</name>
+			<description>Whether this tag is being rendered by JSF engine.</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+		<attribute>
+			<name>showAdminLinks</name>
+			<description>Whether to show administrative links to other pages (default: true).</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<tag-name>outputAdminLandLinePanelGrid</tag-name>
+		<description>This tag renders a full h:panelGrid for administrative purposes for land-line data.</description>
+		<source>resources/tags/admin/panel_grids/landline/admin_landline_data.tpl</source>
+		<attribute>
+			<name>isShowPage</name>
+			<description>Whether this tag is used to show mobile data (default true).</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+		<attribute>
+			<name>landLineNumber</name>
+			<description>The fax instance that provides the data for this tag.</description>
+			<required>true</required>
+			<type>org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber</type>
+		</attribute>
+		<attribute>
+			<name>rendered</name>
+			<description>Whether this tag is being rendered by JSF engine.</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+		<attribute>
+			<name>showAdminLinks</name>
+			<description>Whether to show administrative links to other pages (default: true).</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<tag-name>outputAdminMobilePanelGrid</tag-name>
+		<description>This tag renders a full h:panelGrid for administrative purposes for mobile data.</description>
+		<source>resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl</source>
+		<attribute>
+			<name>isShowPage</name>
+			<description>Whether this tag is used to show mobile data (default true).</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+		<attribute>
+			<name>mobileNumber</name>
+			<description>The mobile instance that provides the data for this tag.</description>
+			<required>true</required>
+			<type>org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber</type>
+		</attribute>
+		<attribute>
+			<name>rendered</name>
+			<description>Whether this tag is being rendered by JSF engine.</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+		<attribute>
+			<name>showAdminLinks</name>
+			<description>Whether to show administrative links to other pages (default: true).</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<tag-name>outputFaxInputTableRow</tag-name>
+		<description>This tag renders a h:panelGroup with input fields for fax numbers.</description>
+		<source>resources/tags/table_rows/fax_input_table_row.tpl</source>
+		<attribute>
+			<name>targetController</name>
+			<description>A target backing bean (EL code resolving into it) extending at least BaseFacesBean where to set the data in.</description>
+			<required>true</required>
+			<!-- @TODO Find an interface for BaseFacesBean and set it here instead -->
+			<type>org.mxchange.jcoreee.bean.faces.BaseFacesBean</type>
+		</attribute>
+		<attribute>
+			<name>labelMessage</name>
+			<description>A localized message for the rendered label tag. You should use EL code here to add a label message from your bundle.</description>
+			<required>true</required>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
-			<name>formMode</name>
-			<description>Mode of the form, can be one of "add" or "edit", defaulting to "add".</description>
+			<name>rendered</name>
+			<description>Whether this tag is being rendered by JSF engine.</description>
 			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<tag-name>outputLandLineInputTableRow</tag-name>
+		<description>This tag renders a h:panelGroup with input fields for land-line numbers.</description>
+		<source>resources/tags/table_rows/landline_input_table_row.tpl</source>
+		<attribute>
+			<name>targetController</name>
+			<description>A target backing bean (EL code resolving into it) extending at least BaseFacesBean where to set the data in.</description>
+			<required>true</required>
+			<!-- @TODO Find an interface for BaseFacesBean and set it here instead -->
+			<type>org.mxchange.jcoreee.bean.faces.BaseFacesBean</type>
+		</attribute>
+		<attribute>
+			<name>labelMessage</name>
+			<description>A localized message for the rendered label tag. You should use EL code here to add a label message from your bundle.</description>
+			<required>true</required>
 			<type>java.lang.String</type>
 		</attribute>
+		<attribute>
+			<name>rendered</name>
+			<description>Whether this tag is being rendered by JSF engine.</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<tag-name>outputAdminFaxLinks</tag-name>
+		<description>This tag renders a full h:panelGroup for administrative links for fax data.</description>
+		<source>resources/tags/admin/links/fax/admin_fax_data.tpl</source>
+		<attribute>
+			<name>isShowPage</name>
+			<description>Whether this tag is used to show mobile data (default true).</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+		<attribute>
+			<name>faxNumber</name>
+			<description>The fax instance that provides the data for this tag.</description>
+			<required>true</required>
+			<type>org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber</type>
+		</attribute>
+		<attribute>
+			<name>rendered</name>
+			<description>Whether this tag is being rendered by JSF engine.</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<tag-name>outputAdminLandLineLinks</tag-name>
+		<description>This tag renders a full h:panelGroup for administrative links for land-line data.</description>
+		<source>resources/tags/admin/panel_grids/landline/admin_landline_data.tpl</source>
+		<attribute>
+			<name>isShowPage</name>
+			<description>Whether this tag is used to show mobile data (default true).</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+		<attribute>
+			<name>landLineNumber</name>
+			<description>The fax instance that provides the data for this tag.</description>
+			<required>true</required>
+			<type>org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber</type>
+		</attribute>
+		<attribute>
+			<name>rendered</name>
+			<description>Whether this tag is being rendered by JSF engine.</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<tag-name>outputAdminMobileLinks</tag-name>
+		<description>This tag renders a full h:panelGroup for administrative links for mobile data.</description>
+		<source>resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl</source>
+		<attribute>
+			<name>isShowPage</name>
+			<description>Whether this tag is used to show mobile data (default true).</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+		<attribute>
+			<name>mobileNumber</name>
+			<description>The mobile instance that provides the data for this tag.</description>
+			<required>true</required>
+			<type>org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber</type>
+		</attribute>
+		<attribute>
+			<name>rendered</name>
+			<description>Whether this tag is being rendered by JSF engine.</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
 	</tag>
 </facelet-taglib>
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index c762a9dd..384ad7a7 100644
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -36,7 +36,7 @@
 					<h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE}" />
 				</div>
 
-				<widgets:outputAdminContactDataFormFields formMode="edit" />
+				<widgets:outputAdminContactDataFormFields />
 
 				<div class="table-footer">
 					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index 0644b20a..857c1df3 100644
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -81,7 +81,7 @@
 					<h:outputText value="#{msg.ADMIN_ADD_CONTACT_MINIMUM_DATA}" />
 				</div>
 
-				<widgets:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
+				<widgets:outputAdminContactDataFormFields />
 
 				<div class="table-footer">
 					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index 4bc0c6dd..fa547e08 100644
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -41,10 +41,7 @@
 				</div>
 
 				<div class="para">
-					<ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
-						<ui:param name="isShowPage" value="#{false}" />
-						<ui:param name="showAdminLinks" value="#{false}" />
-					</ui:include>
+					<widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" isShowPage="false" showAdminLinks="false" />
 				</div>
 
 				<div class="table-footer">
diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index fb5e086b..56fb32cf 100644
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -22,6 +22,10 @@
 	</ui:define>
 
 	<ui:define name="content">
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
+
+		<widgets:outputMessageBox 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:panelGroup styleClass="table" layout="block">
 				<div class="table-header">
@@ -39,10 +43,7 @@
 				</div>
 
 				<div class="para">
-					<ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl">
-						<ui:param name="isShowPage" value="#{false}" />
-						<ui:param name="showAdminLinks" value="#{false}" />
-					</ui:include>
+					<widgets:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" isShowPage="false" showAdminLinks="false" />
 				</div>
 
 				<div class="table-footer">
@@ -51,10 +52,6 @@
 			</h:panelGroup>
 		</h:form>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
-
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
 		<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}" />
diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index c6ac5964..141c49f9 100644
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -39,10 +39,7 @@
 				</div>
 
 				<div class="para">
-					<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
-						<ui:param name="isShowPage" value="#{false}" />
-						<ui:param name="showAdminLinks" value="#{false}" />
-					</ui:include>
+					<widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" isShowPage="false" showAdminLinks="false" />
 				</div>
 
 				<div class="table-footer">
diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index a1d048db..00fa4ff5 100644
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -29,10 +29,7 @@
 				</div>
 
 				<div class="para">
-					<ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
-						<ui:param name="isShowPage" value="#{false}" />
-						<ui:param name="showAdminLinks" value="#{false}" />
-					</ui:include>
+					<widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" isShowPage="false" showAdminLinks="false" />
 				</div>
 
 				<div class="para">
diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index 80e06a10..a50aaa6d 100644
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -1,6 +1,7 @@
 <?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">
@@ -21,9 +22,7 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
-			<ui:param name="isShowPage" value="true" />
-		</ui:include>
+		<widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" isShowPage="true" />
 
 		<h:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allCurrentFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table-header-column" styleClass="table table-medium">
 			<f:facet name="header">
diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index 3ea49916..faf3f12b 100644
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.xhtml
@@ -29,10 +29,7 @@
 				</div>
 
 				<div class="para">
-					<ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl">
-						<ui:param name="isShowPage" value="#{false}" />
-						<ui:param name="showAdminLinks" value="#{false}" />
-					</ui:include>
+					<widgets:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" isShowPage="false" showAdminLinks="false" />
 				</div>
 
 				<div class="para">
diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml
index 8bcc57bc..203da052 100644
--- a/web/admin/landline/admin_landline_show.xhtml
+++ b/web/admin/landline/admin_landline_show.xhtml
@@ -1,6 +1,7 @@
 <?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">
@@ -21,9 +22,7 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl">
-			<ui:param name="isShowPage" value="true" />
-		</ui:include>
+		<widgets:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" />
 
 		<h:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allCurrentLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table-header-column" styleClass="table table-medium">
 			<f:facet name="header">
diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index 6dca40b0..35eb312f 100644
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -29,10 +29,7 @@
 				</div>
 
 				<div class="para">
-					<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
-						<ui:param name="isShowPage" value="#{false}" />
-						<ui:param name="showAdminLinks" value="#{false}" />
-					</ui:include>
+					<widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" isShowPage="false" showAdminLinks="false" />
 				</div>
 
 				<div class="para">
diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index d654570c..9f3d72b3 100644
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -1,6 +1,7 @@
 <?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">
@@ -21,9 +22,7 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
-			<ui:param name="isShowPage" value="true" />
-		</ui:include>
+		<widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" isShowPage="true" />
 
 		<h:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allCurrentMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table-header-column" styleClass="table table-medium">
 			<f:facet name="header">
diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index e8397123..a9975b55 100644
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -34,9 +34,7 @@
 					<h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
 				</div>
 
-				<ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">
-					<ui:param name="mode" value="edit" />
-				</ui:include>
+				<widgets:outputAdminUserDataFormFields mode="edit" />
 
 				<div class="table-footer">
 					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml
index 0332d854..f6b71d86 100644
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -26,9 +26,7 @@
 						<h:outputText value="#{msg.USER_NAME}" />
 					</f:facet>
 
-					<ui:include src="/WEB-INF/templates/user/user_profile_link.tpl">
-						<ui:param name="user" value="#{user}" />
-					</ui:include>
+					<widgets:outputUserProfileLink user="#{user}" />
 				</h:column>
 
 				<h:column>