From 9d1c5a32c5fb5f8075dd25fd62a71d83baea1e85 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 13 Sep 2017 23:31:24 +0200
Subject: [PATCH] WIP - Please cherry-pick: - started proting to PrimeFaces 6.0
 - PF theme "bootstrap" is now the theme - mobile provider list in admin area
 should be now ported - removed many own CSS as it conflicted with jQuery UI,
 still tons of to go - added more i18n strings for empty lists - replaced all
 h:commandButton -> p:commandButton - replaced all h:link -> p:link - admin
 menu is now rewritten in PF (still looking a little messy) - replaced
 h:dataTable -> p:dataTable and also h:column -> p:column (belongs   together)
 - widgets:outputMessageBox is no longer needed as p:dataTable has
 "emptyMessage"   attribute for this - if you have p:dataExporter, also use
 p:commandButton - added missing admin_country_links.tpl (custom JSF tag) -
 replaced h:message[s] -> p:message[p] - finally found a way of getting rid of
 project name in base.tpl, thanks to the   people at stackoverflow -
 widgets:outputMessageBox now accepts common "id", was required for "for"  
 attribute - f:view seem to be self-closing? - added f:facet and more meta
 tags for upcoming responsive - used a bit pm (PF mobile) - now will use
 p:growl instead of main h:messages in base.tpl - also added AJAX exception
 handler and p:dialog (does it work?) - everthing else I oversaw/forgot
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 ...inancialsMobileProviderWebRequestBean.java |  54 ++++--
 .../FinancialsMobileProviderConverter.java    |   2 +-
 .../localization/bundle_de_DE.properties      |  31 +++-
 .../localization/bundle_en_US.properties      |  20 ++-
 web/WEB-INF/faces-config.xml                  |  12 ++
 web/WEB-INF/links.jsf.taglib.xml              |   2 +-
 .../columns/admin_contact_data_columns.tpl    | 105 ++++++------
 .../admin_contact_data_columns_mini.tpl       |  33 ++--
 .../contact/admin_form_contact_data.tpl       | 133 ++++++++-------
 .../form_data/fax/admin_form_fax_data.tpl     |   5 +-
 .../landline/admin_form_landline_data.tpl     |   5 +-
 .../mobile/admin_form_mobile_data.tpl         |  25 +--
 .../form_data/user/admin_form_user_data.tpl   |  31 ++--
 .../basic_data/admin_basic_data_links.tpl     |  15 +-
 .../admin_branch_office_links.tpl             |  15 +-
 .../mini/contact/admin_contact_links.tpl      |  15 +-
 .../mini/country/admin_country_links.tpl      |  34 ++++
 .../admin/links/mini/fax/admin_fax_links.tpl  |  19 ++-
 .../mini/landline/admin_landline_links.tpl    |  19 ++-
 .../links/mini/mobile/admin_mobile_links.tpl  |  19 ++-
 .../admin_mobile_provider_links.tpl           |  17 +-
 .../links/mini/user/admin_user_links.tpl      |  27 +--
 .../admin/links/user/admin_user_links.tpl     |  39 ++---
 .../admin/panel_grids/fax/admin_fax_data.tpl  |  17 +-
 .../landline/admin_landline_data.tpl          |  17 +-
 .../panel_grids/mobile/admin_mobile_data.tpl  |  23 +--
 .../resources/tags/messages/message_box.tpl   |   2 +-
 .../tags/profile/user/user_profile_link.tpl   |   7 +-
 .../tags/table_rows/fax_input_table_row.tpl   |  25 +--
 .../table_rows/landline_input_table_row.tpl   |  25 +--
 .../table_rows/mobile_selection_table_row.tpl |  17 +-
 .../user_personal_title_table_row.tpl         |  13 +-
 .../user_profile_mode_table_row.tpl           |  13 +-
 web/WEB-INF/templates/admin/admin_footer.tpl  |  11 +-
 web/WEB-INF/templates/admin/admin_menu.tpl    | 122 +++++--------
 .../admin_form_basic_company_data.tpl         | 145 ++++++++--------
 .../admin_form_branch_offices_data.tpl        | 161 +++++++++---------
 .../admin/contact/admin_contact_data_mini.tpl |  11 +-
 .../admin/contact/admin_show_contact_data.tpl |   2 +-
 .../admin/country/admin_form_country_data.tpl |  61 +++----
 .../admin/fax/admin_form_add_contact_fax.tpl  |  13 +-
 .../admin_form_add_contact_landline.tpl       |  15 +-
 .../mobile/admin_form_add_contact_mobile.tpl  |  15 +-
 .../admin_form_mobile_provider.tpl            |  27 +--
 .../admin/user/admin_show_user_data.tpl       |  21 +--
 .../admin/user/admin_show_user_data_mini.tpl  |  17 +-
 web/WEB-INF/templates/base.tpl                | 143 ++++++++++------
 .../templates/contact/form_contact_data.tpl   | 132 +++++++-------
 .../guest_email_address_repeat_fields.tpl     |  20 +--
 web/WEB-INF/templates/guest/guest_footer.tpl  |  13 +-
 web/WEB-INF/templates/guest/guest_menu.tpl    |  13 +-
 .../templates/guest/guest_privacy_terms.tpl   |  23 +--
 .../templates/guest/user/guest_login_form.tpl |  25 +--
 .../register/guest_form_register_page1.tpl    |  31 ++--
 .../register/guest_form_register_page2.tpl    |   7 +-
 .../register/guest_form_register_single.tpl   |  31 ++--
 ...ser_change_email_address_repeat_fields.tpl |  21 +--
 .../user/user_enter_current_password.tpl      |  13 +-
 .../templates/login/user/user_footer.tpl      |  11 +-
 .../templates/login/user/user_menu.tpl        |  21 +--
 web/WEB-INF/templates/user/userid_error.tpl   |   5 +-
 .../widgets/locale_change_widget.tpl          |   9 +-
 web/WEB-INF/web.xml                           |  20 +++
 web/WEB-INF/widgets.jsf.taglib.xml            |   6 +
 web/admin/admin_logout.xhtml                  |   5 +-
 .../admin_basic_company_data_list.xhtml       |  69 ++++----
 .../admin_branch_offices_list.xhtml           |  65 ++++---
 web/admin/contact/admin_contact_delete.xhtml  |   7 +-
 web/admin/contact/admin_contact_edit.xhtml    |   7 +-
 web/admin/contact/admin_contact_export.xhtml  |  12 +-
 web/admin/contact/admin_contact_list.xhtml    |  45 +++--
 .../unlink/admin_contact_fax_unlink.xhtml     |   9 +-
 .../admin_contact_landline_unlink.xhtml       |   9 +-
 .../unlink/admin_contact_mobile_unlink.xhtml  |   9 +-
 web/admin/country/admin_country_list.xhtml    |  35 ++--
 web/admin/fax/admin_fax_delete.xhtml          |   5 +-
 web/admin/fax/admin_fax_edit.xhtml            |   7 +-
 web/admin/fax/admin_fax_list.xhtml            |  31 ++--
 web/admin/fax/admin_fax_show.xhtml            |  57 ++++---
 .../landline/admin_landline_delete.xhtml      |   5 +-
 web/admin/landline/admin_landline_edit.xhtml  |   7 +-
 web/admin/landline/admin_landline_list.xhtml  |  29 ++--
 web/admin/landline/admin_landline_show.xhtml  |  57 ++++---
 .../mobile/admin_contact_mobile_list.xhtml    |  11 +-
 web/admin/mobile/admin_mobile_delete.xhtml    |   5 +-
 web/admin/mobile/admin_mobile_edit.xhtml      |   7 +-
 web/admin/mobile/admin_mobile_list.xhtml      |  37 ++--
 web/admin/mobile/admin_mobile_show.xhtml      |  57 ++++---
 .../admin_mobile_provider_list.xhtml          |  39 ++---
 web/admin/user/admin_user_activity_log.xhtml  |  47 ++---
 web/admin/user/admin_user_delete.xhtml        |  11 +-
 web/admin/user/admin_user_edit.xhtml          |   7 +-
 web/admin/user/admin_user_export.xhtml        |  14 +-
 web/admin/user/admin_user_list.xhtml          |  57 ++++---
 web/admin/user/admin_user_lock.xhtml          |  17 +-
 .../admin_user_resend_confirmation_link.xhtml |   7 +-
 web/admin/user/admin_user_unlock.xhtml        |  21 +--
 web/guest/user/user_list.xhtml                |  17 +-
 web/guest/user/user_login.xhtml               |   7 +-
 web/guest/user/user_lost_password.xhtml       |  15 +-
 web/guest/user/user_register.xhtml            |   5 +-
 web/guest/user/user_register_done.xhtml       |   5 +-
 web/guest/user/user_register_page2.xhtml      |   5 +-
 web/guest/user/user_resend_link.xhtml         |  17 +-
 web/resources/css/default.css                 |   5 -
 web/resources/css/layout.css                  |  47 +----
 .../login_financials_add_income.xhtml         |  25 +--
 .../login_financials_add_receipt.xhtml        |  26 +--
 .../login_financials_overview.xhtml           |  15 +-
 web/user/login_contact_data_saved.xhtml       |   5 +-
 web/user/login_edit_user_data.xhtml           |   9 +-
 web/user/login_index.xhtml                    |   5 +-
 web/user/login_logout.xhtml                   |   5 +-
 .../login_user_change_email_address.xhtml     |   7 +-
 web/user/login_user_change_password.xhtml     |  23 +--
 .../login_user_change_personal_data.xhtml     |   9 +-
 web/user/login_user_contact_data_saved.xhtml  |   5 +-
 web/user/login_user_data_saved.xhtml          |   5 +-
 118 files changed, 1623 insertions(+), 1447 deletions(-)
 create mode 100644 web/WEB-INF/resources/tags/admin/links/mini/country/admin_country_links.tpl

diff --git a/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java
index 14f86ea0..3b04521d 100644
--- a/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java
@@ -18,6 +18,7 @@ package org.mxchange.jfinancials.beans.mobileprovider;
 
 import fish.payara.cdi.jsr107.impl.NamedCache;
 import java.text.MessageFormat;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -47,10 +48,15 @@ public class FinancialsMobileProviderWebRequestBean extends BaseFinancialsContro
 	 */
 	private static final long serialVersionUID = 15_869_423_671_950_276L;
 
+	/**
+	 * A list of all mobile providers
+	 */
+	private final List<MobileProvider> allMobileProviders;
+
 	/**
 	 * Remote EJB for mobile providers (regular)
 	 */
-	@EJB (lookup = "java:global/jfinancials-ejb/mobileprovider!org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote")
+	@EJB (lookup = "java:global/jfinancials-ejb/mobileProvider!org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote")
 	private MobileProviderSingletonBeanRemote mobileProviderBean;
 
 	/**
@@ -66,6 +72,9 @@ public class FinancialsMobileProviderWebRequestBean extends BaseFinancialsContro
 	public FinancialsMobileProviderWebRequestBean () {
 		// Call super constructor
 		super();
+
+		// Init list
+		this.allMobileProviders = new LinkedList<>();
 	}
 
 	/**
@@ -92,28 +101,14 @@ public class FinancialsMobileProviderWebRequestBean extends BaseFinancialsContro
 
 		// Add it to the list
 		this.mobileProviderCache.put(event.getAddedMobileProvider().getProviderId(), event.getAddedMobileProvider());
+		this.allMobileProviders.add(event.getAddedMobileProvider());
 	}
 
 	@Override
 	@SuppressWarnings ("ReturnOfCollectionOrArrayField")
 	public List<MobileProvider> allMobileProviders () {
-		// Init list
-		final List<MobileProvider> list = new LinkedList<>();
-
-		// Get iterator
-		final Iterator<Cache.Entry<Long, MobileProvider>> iterator = this.mobileProviderCache.iterator();
-
-		// Loop over all
-		while (iterator.hasNext()) {
-			// Get next entry
-			final Cache.Entry<Long, MobileProvider> next = iterator.next();
-
-			// Add value to list
-			list.add(next.getValue());
-		}
-
 		// Return it
-		return list;
+		return this.allMobileProviders;
 	}
 
 	/**
@@ -135,6 +130,29 @@ public class FinancialsMobileProviderWebRequestBean extends BaseFinancialsContro
 				this.mobileProviderCache.put(next.getProviderId(), next);
 			}
 		}
-	}
 
+		// Is the list empty, but filled cache?
+		if (this.allMobileProviders.isEmpty() && this.mobileProviderCache.iterator().hasNext()) {
+			// Get iterator
+			final Iterator<Cache.Entry<Long, MobileProvider>> iterator = this.mobileProviderCache.iterator();
+
+			// Build up list
+			while (iterator.hasNext()) {
+				// GEt next element
+				final Cache.Entry<Long, MobileProvider> next = iterator.next();
+
+				// Add to list
+				this.allMobileProviders.add(next.getValue());
+			}
+
+			// Sort list
+			this.allMobileProviders.sort(new Comparator<MobileProvider>() {
+				@Override
+				public int compare (final MobileProvider o1, final MobileProvider o2) {
+					return o1.getProviderId() > o2.getProviderId() ? 1 : o1.getProviderId() < o2.getProviderId() ? -1 : 0;
+				}
+			}
+			);
+		}
+	}
 }
diff --git a/src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java b/src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java
index 7c291e65..01a758c4 100644
--- a/src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java
@@ -52,7 +52,7 @@ public class FinancialsMobileProviderConverter implements Converter<MobileProvid
 				final Context initial = new InitialContext();
 
 				// Lookup EJB
-				MOBILE_PROVIDER_BEAN = (MobileProviderSingletonBeanRemote) initial.lookup("java:global/jfinancials-ejb/mobileprovider!org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote");
+				MOBILE_PROVIDER_BEAN = (MobileProviderSingletonBeanRemote) initial.lookup("java:global/jfinancials-ejb/mobileProvider!org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote");
 			} catch (final NamingException ex) {
 				// Throw it again
 				throw new ConverterException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup EJB", ex.getMessage()), ex);
diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 3fbc8c46..ebfd164c 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -521,8 +521,10 @@ ADMIN_EXPORT_USERS_TIMEOUT_WARNING=Bei sehr gro\u00dfen Datenmengen kann es even
 BUTTON_ADMIN_EXPORT_USERS_XLS=Benutzerdaten als Excel-Datei
 LINK_ADMIN_EXPORT_CONTACT=Daten exportieren
 LINK_ADMIN_EXPORT_CONTACT_TITLE=Kontaktdaten exportieren
-ADMIN_CONTACT_LIST_EMPTY=Keine Kontaktdaten in Datenbank gefunden.
-ADMIN_USER_LIST_EMPTY=Keine Benutzerdaten in Datenbank gefunden.
+#@TODO Please fix German umlauts!
+ADMIN_CONTACT_LIST_EMPTY=Keine Kontaktdaten in Datenbank gefunden. Oder Ihre Suche ergab keine Uebereinstimmungen.
+#@TODO Please fix German umlauts!
+ADMIN_USER_LIST_EMPTY=Keine Benutzerdaten in Datenbank gefunden. Oder Ihre Suche ergab keine Uebereinstimmungen.
 ADMIN_PERSONAL_DATA_COMMENT=Kommentar: (optional)
 PAGE_TITLE_USER_RESEND_DONE=Neuen Best\u00e4tigungslink verschickt
 CONTENT_TITLE_USER_RESEND_DONE=Neuen Best\u00e4tigungslink verschickt:
@@ -806,7 +808,7 @@ PAGE_TITLE_ADMIN_LIST_BASIC_COMPANY_DATA=Stammdaten auflisten
 #@TODO Please fix German umlauts!
 CONTENT_TITLE_ADMIN_LIST_BASIC_COMPANY_DATA=Auflisten von Stammdaten
 #@TODO Please fix German umlauts!
-ADMIN_BASIC_COMPANY_DATA_LIST_EMPTY=Es befinden sich keine Stammdaten in der Datenbank.
+ADMIN_BASIC_COMPANY_DATA_LIST_EMPTY=Es befinden sich keine Stammdaten in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen.
 #@TODO Please fix German umlauts!
 TABLE_SUMMARY_ADMIN_LIST_BASIC_COMPANY_DATA=Tabelle listet Stammdaten auf.
 ADMIN_BASIC_COMPANY_DATA_ID=Id-Nummer:
@@ -882,7 +884,8 @@ ADMIN_BRANCH_OFFICE_LEGEND_TITLE=Geben Sie hier die Grunddaten der Filiale ein.
 ADMIN_SELECT_BRANCH_OFFICE_COMPANY=Filiale einem Unternehmen zuweisen:
 PAGE_TITLE_ADMIN_LIST_BRANCH_OFFICES=Filialen auflisten
 CONTENT_TITLE_ADMIN_LIST_BRANCH_OFFICES=Auflisten von Filialen:
-ADMIN_BRANCH_OFFICES_LIST_EMPTY=Es wurden noch keine Filialen angelegt.
+#@TODO Please fix German umlauts!
+ADMIN_BRANCH_OFFICES_LIST_EMPTY=Es wurden keine Filialen in der Datenbank gefunden. Oder Ihre Suche ergab keine Uebereinstimmungen.
 #@TODO Please fix German umlauts!
 ADMIN_ADD_BRANCH_OFFICE_TITLE=Filiale hinzufuegen
 #@TODO Please fix German umlauts!
@@ -936,3 +939,23 @@ ADMIN_ACTION_LINKS=Aktionen:
 ADMIN_LINK_RESEND_CONFIRMATION_SHORT=Erneut
 ADMIN_LINK_UNLOCK_SHORT=Entsperren
 ADMIN_LINK_LOCK_SHORT=Sperren
+#@TODO Please fix German umlauts!
+ADMIN_MOBILE_PROVIDER_LIST_EMPTY=Es befinden sich keine Mobilfunkanbieter in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen.
+ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE=Details des Mobilfunkanbieters anzeigen.
+ADMIN_LINK_EDIT_MOBILE_PROVIDER_TITLE=Edieren des Mobilfunkanbieters.
+#@TODO Please fix German umlauts!
+ADMIN_LINK_DELETE_MOBILE_PROVIDER_TITLE=Loescht den Mobilfunkanbieter.
+ADMIN_LINK_SHOW_COUNTRY_TITLE=Details des Landes anzeigen.
+ADMIN_LINK_EDIT_COUNTRY_TITLE=Editieren des Landes.
+#@TODO Please fix German umlauts!
+ADMIN_LINK_DELETE_COUNTRY_TITLE=Loeschen des Landes.
+#@TODO Please fix German umlauts!
+ADMIN_COUNTRY_LIST_EMPTY=Es befinden sich keine Laender in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen.
+#@TODO Please fix German umlauts!
+ADMIN_FAX_NUMBER_LIST_EMPTY=Es befinden sich keine Faxnummern in der Datenbank oder Ihre Suche ergab keine Uebereinstimmungen.
+#@TODO Please fix German umlauts!
+ADMIN_LANDLINE_NUMBER_LIST_EMPTY=Es befinden sich keine Festnetznummern in der Datenbank oder Ihre Suche ergab keine Uebereinstimmungen.
+#@TODO Please fix German umlauts!
+ADMIN_MOBILE_NUMBER_LIST_EMPTY=Es befinden sich keine Mobilfunknummern in der Datenbank oder Ihre Suche ergab keine Uebereinstimmungen.
+#@TODO Please fix German umlauts!
+ADMIN_CONTACT_MOBILE_LIST_EMPTY=Es befinden sich keine Mobilfunknummern von Kontakten in der Datenbank oder Ihre Suche ergab keine Uebereinstimmungen.
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 44cea70b..a1ed6c75 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -685,8 +685,8 @@ CONTENT_TITLE_ADMIN_DELETE_LAND_LINE_NUMBER=Delete land-line number:
 ADMIN_DELETE_LAND_LINE_NUMBER_TITLE=Dou you really want to delete following land-line number?
 ADMIN_DELETE_LAND_LINE_NUMBER_DATA_NOTICE=If you delete the land-line number, it won't be available anymore for anything. Please consider carefully if you really want this.
 BUTTON_ADMIN_DELETE_LAND_LINE_NUMBER=Delete land-line number
-ADMIN_CONTACT_LIST_EMPTY=No contact data found in database.
-ADMIN_USER_LIST_EMPTY=No user data found in database.
+ADMIN_CONTACT_LIST_EMPTY=No contact data found in database. Or your search criteria doesn't match anything.
+ADMIN_USER_LIST_EMPTY=No user data found in database. Or your search criteria doesn't match anything.
 ADMIN_PERSONAL_DATA_COMMENT=Comment: (optional)
 ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK=Send new confirmation key
 ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE=Sends out a new confirmation link to the user's assigned email address.
@@ -785,7 +785,7 @@ LINK_ADMIN_LIST_BASIC_COMPANY_DATA=List basic company data
 LINK_ADMIN_LIST_BASIC_COMPANY_DATA_TITLE=Lists basic company data
 PAGE_TITLE_ADMIN_LIST_BASIC_COMPANY_DATA=List basic company data
 CONTENT_TITLE_ADMIN_LIST_BASIC_COMPANY_DATA=Lists basic company data
-ADMIN_BASIC_COMPANY_DATA_LIST_EMPTY=There are currently no basic company data in database.
+ADMIN_BASIC_COMPANY_DATA_LIST_EMPTY=There are currently no basic company data in database. Or your search criteria doesn't match anything.
 TABLE_SUMMARY_ADMIN_LIST_BASIC_COMPANY_DATA=This table lists basic company data.
 ADMIN_BASIC_COMPANY_DATA_ID=Id Number:
 ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE=Show details of this business contact.
@@ -843,7 +843,7 @@ ADMIN_BRANCH_OFFICE_LEGEND_TITLE=Enter branch office basic data here.
 ADMIN_SELECT_BRANCH_OFFICE_COMPANY=Assign branch office to company:
 PAGE_TITLE_ADMIN_LIST_BRANCH_OFFICES=List branch offices
 CONTENT_TITLE_ADMIN_LIST_BRANCH_OFFICES=List branch offices:
-ADMIN_BRANCH_OFFICES_LIST_EMPTY=There are no branch offices added.
+ADMIN_BRANCH_OFFICES_LIST_EMPTY=There are no branch offices found in database. Or your search criteria doesn't match anything.
 ADMIN_ADD_BRANCH_OFFICE_TITLE=Add branch office
 #Bitte waehlen Sie mindestens das zugehoerige Unternehmen und das Land aus und geben Sie Strasse, Hausnummer, Postleitzahl und Stadt ein.
 ADMIN_ADD_BRANCH_OFFICE_MINIMUM_DATA=Please at least choose assigned company, country and enter at least street name, house number, ZIP code and city.
@@ -887,3 +887,15 @@ ADMIN_ACTION_LINKS=Actions:
 ADMIN_LINK_RESEND_CONFIRMATION_SHORT=Resend
 ADMIN_LINK_UNLOCK_SHORT=Unlock
 ADMIN_LINK_LOCK_SHORT=Lock
+ADMIN_MOBILE_PROVIDER_LIST_EMPTY=There are no mobile providers in database. Or your search criteria doesn't match anything.
+ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE=Shows details of mobile provider.
+ADMIN_LINK_EDIT_MOBILE_PROVIDER_TITLE=Edit of mobile provider.
+ADMIN_LINK_DELETE_MOBILE_PROVIDER_TITLE=Deletes mobile provider.
+ADMIN_LINK_SHOW_COUNTRY_TITLE=Show details of country.
+ADMIN_LINK_EDIT_COUNTRY_TITLE=Edit of country.
+ADMIN_LINK_DELETE_COUNTRY_TITLE=Deletes country.
+ADMIN_COUNTRY_LIST_EMPTY=There are no countries in database. Or your search criteria doesn't match anything.
+ADMIN_FAX_NUMBER_LIST_EMPTY=There are no fax numbers in database. Or your search criteria doesn't match anything.
+ADMIN_LANDLINE_NUMBER_LIST_EMPTY=There are no land-line numbers in database. Or your search criteria doesn't match anything.
+ADMIN_MOBILE_NUMBER_LIST_EMPTY=There are no mobile numbers in database. Or your search criteria doesn't match anything.
+ADMIN_CONTACT_MOBILE_LIST_EMPTY=There are no mobile numbers of contacts in database. Or your search criteria doesn't match anything.
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index b3d31407..bb48f082 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -234,6 +234,10 @@
 	</navigation-rule>
 	<navigation-rule>
 		<from-view-id>/admin/country/admin_country_list.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>admin_show_country</from-outcome>
+			<to-view-id>/admin/country/admin_country_show.xhtml</to-view-id>
+		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_edit_country</from-outcome>
 			<to-view-id>/admin/country/admin_country_edit.xhtml</to-view-id>
@@ -755,6 +759,14 @@
 			<from-outcome>admin_show_branch_office</from-outcome>
 			<to-view-id>/admin/branch_offices/admin_branch_office_show.xhtml</to-view-id>
 		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_edit_branch_office</from-outcome>
+			<to-view-id>/admin/branch_offices/admin_branch_office_edit.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_delete_branch_office</from-outcome>
+			<to-view-id>/admin/branch_offices/admin_branch_office_delete.xhtml</to-view-id>
+		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_show_user</from-outcome>
 			<to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
diff --git a/web/WEB-INF/links.jsf.taglib.xml b/web/WEB-INF/links.jsf.taglib.xml
index 09f59252..af8b7edd 100644
--- a/web/WEB-INF/links.jsf.taglib.xml
+++ b/web/WEB-INF/links.jsf.taglib.xml
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	<namespace>http://mxchange.org/jsf/core/links</namespace>
 	<tag>
 		<tag-name>outputUserProfileLink</tag-name>
-		<description>This tag renders a h:link JSF tag for a user profile.</description>
+		<description>This tag renders a p:link JSF tag for a user profile.</description>
 		<source>resources/tags/profile/user/user_profile_link.tpl</source>
 		<attribute>
 			<name>user</name>
diff --git a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
index df52be7b..d60ab1a2 100644
--- a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
+++ b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
@@ -4,115 +4,116 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
-	<h:column>
-		<h:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
+	<p:column>
+		<p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
 		<h:outputText id="contactId" styleClass="table-data-field" value="#{beanHelper.contact.contactId}" />
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="contactCreated" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_CREATED}" />
+	<p:column>
+		<p:outputLabel for="contactCreated" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_CREATED}" />
 
 		<h:outputText id="contactCreated" styleClass="table-data-field" value="#{beanHelper.contact.contactCreated.time}">
 			<f:convertDateTime for="contactCreated" type="both" />
 		</h:outputText>
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="contactUpdated" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_UPDATED}" />
+	<p:column>
+		<p:outputLabel for="contactUpdated" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_UPDATED}" />
 
 		<h:outputText id="contactUpdated" styleClass="table-data-field" value="#{beanHelper.contact.contactUpdated.time}">
 			<f:convertDateTime for="contactUpdated" type="both" />
 		</h:outputText>
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="isOwnContact" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
+	<p:column>
+		<p:outputLabel for="isOwnContact" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
 
 		<h:outputText id="isOwnContact" styleClass="table-data-field" value="#{beanHelper.contact.isOwnContact()}" />
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+	<p:column>
+		<p:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
 		<h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
+	<p:column>
+		<p:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
 		<h:outputText id="contactTitle" styleClass="table-data-field" value="#{beanHelper.contact.contactTitle}" />
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+	<p:column>
+		<p:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
 		<h:outputText id="contactFirstName" styleClass="table-data-field" value="#{beanHelper.contact.contactFirstName}" />
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+	<p:column>
+		<p:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
 		<h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{beanHelper.contact.contactFamilyName}" />
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="contactStreet" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_STREET}" />
+	<p:column>
+		<p:outputLabel for="contactStreet" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_STREET}" />
 
 		<h:outputText id="contactStreet" styleClass="table-data-field" value="#{beanHelper.contact.contactStreet}" />
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="contactHouseNumber" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
+	<p:column>
+		<p:outputLabel for="contactHouseNumber" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
 
 		<h:outputText id="contactHouseNumber" styleClass="table-data-field" value="#{beanHelper.contact.contactHouseNumber}" />
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="contactHouseNumberExtension" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
+	<p:column>
+		<p:outputLabel for="contactHouseNumberExtension" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
 
 		<h:outputText id="contactHouseNumberExtension" styleClass="table-data-field" value="#{beanHelper.contact.contactHouseNumberExtension}" />
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="contactCountry" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_COUNTRY_CODE}" />
+	<p:column>
+		<p:outputLabel for="contactCountry" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_COUNTRY_CODE}" />
 
 		<h:outputText id="contactCountry" styleClass="table-data-field" value="#{beanHelper.contact.contactCountry.countryCode}" />
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="contactZipCode" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
+	<p:column>
+		<p:outputLabel for="contactZipCode" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
 
 		<h:outputText id="contactZipCode" styleClass="table-data-field" value="#{beanHelper.contact.contactZipCode}" />
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="contactCity" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_CITY}" />
+	<p:column>
+		<p:outputLabel for="contactCity" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_CITY}" />
 
 		<h:outputText id="contactCity" styleClass="table-data-field" value="#{beanHelper.contact.contactCity}" />
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
+	<p:column>
+		<p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
 		<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
 			<h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
 		</h:outputLink>
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="contactBirthday" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
+	<p:column>
+		<p:outputLabel for="contactBirthday" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
 
 		<h:outputText id="contactBirthday" styleClass="table-data-field" value="#{beanHelper.contact.contactBirthday.time}">
 			<f:convertDateTime for="contactBirthday" type="date" />
 		</h:outputText>
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="contactComment" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_COMMENT}" />
+	<p:column>
+		<p:outputLabel for="contactComment" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_COMMENT}" />
 
 		<h:outputText id="contactComment" styleClass="table-data-field" value="#{beanHelper.contact.contactComment}" />
-	</h:column>
+	</p:column>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl
index 3650b42c..72ad507f 100644
--- a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl
+++ b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl
@@ -4,37 +4,38 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
-	<h:column>
-		<h:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+	<p:column>
+		<p:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
 		<h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
+	<p:column>
+		<p:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
 		<h:outputText id="contactTitle" styleClass="table-data-field" value="#{beanHelper.contact.contactTitle}" />
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+	<p:column>
+		<p:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
 		<h:outputText id="contactFirstName" styleClass="table-data-field" value="#{beanHelper.contact.contactFirstName}" />
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+	<p:column>
+		<p:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
 		<h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{beanHelper.contact.contactFamilyName}" />
-	</h:column>
+	</p:column>
 
-	<h:column>
-		<h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
+	<p:column>
+		<p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
 		<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
 			<h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
 		</h:outputLink>
-	</h:column>
+	</p:column>
 </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
index 3d71415c..88ea9ee1 100644
--- 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
@@ -4,7 +4,8 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered}">
 		<fieldset class="fieldset" id="personal_data">
@@ -16,179 +17,179 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
+					<p: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}" />
+					<p: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 styleClass="error-container" layout="block">
+				<p:message for="firstName" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="title" value="#{msg.ADMIN_PERSONAL_DATA_TITLE}" />
+					<p: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}" />
+					<p: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 styleClass="error-container" layout="block">
+				<p:message for="title" />
 			</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}" />
+					<p: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}" />
+					<p: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 styleClass="error-container" layout="block">
+				<p:message for="familyName" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="street" value="#{msg.ADMIN_DATA_STREET_NAME}" />
+					<p:outputLabel for="street" value="#{msg.ADMIN_DATA_STREET_NAME}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{adminContactController.street}" />
+					<p: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 styleClass="error-container" layout="block">
+				<p:message for="street" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="houseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
+					<p:outputLabel for="houseNumber" value="#{msg.ADMIN_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}">
+					<p:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{adminContactController.houseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
 						<f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
-					</h:inputText>
+					</p: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 styleClass="error-container" layout="block">
+				<p:message for="houseNumber" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_DATA_HOUSE_NUMBER_EXTENSION}" />
+					<p:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_DATA_HOUSE_NUMBER_EXTENSION}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{adminContactController.houseNumberExtension}" />
+					<p: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 styleClass="error-container" layout="block">
+				<p:message for="houseNumberExtension" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="zipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
+					<p:outputLabel for="zipCode" value="#{msg.ADMIN_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}">
+					<p:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{adminContactController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
 						<f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
-					</h:inputText>
+					</p: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 styleClass="error-container" layout="block">
+				<p:message for="zipCode" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="city" value="#{msg.ADMIN_DATA_CITY}" />
+					<p:outputLabel for="city" value="#{msg.ADMIN_DATA_CITY}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
+					<p: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 styleClass="error-container" layout="block">
+				<p:message for="city" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="country" value="#{msg.ADMIN_SELECT_COUNTRY}" />
+					<p:outputLabel for="country" value="#{msg.ADMIN_SELECT_COUNTRY}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select" id="country" value="#{adminContactController.contactCountry}">
+					<p:selectOneMenu 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>
+					</p: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 styleClass="error-container" layout="block">
+				<p:message for="country" />
 			</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}" />
+					<p: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}">
+					<p: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>
+					</p:selectOneMenu>
 
-					<h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminContactController.landLineAreaCode}">
+					<p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminContactController.landLineAreaCode}">
 						<f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					</p:inputText>
 
-					<h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminContactController.landLineNumber}">
+					<p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminContactController.landLineNumber}">
 						<f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					</p: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}" />
+					<p: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}">
+					<p: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>
+					</p:selectOneMenu>
 
-					<h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
+					<p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
 						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					</p:inputText>
 
-					<h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminContactController.faxNumber}">
+					<p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminContactController.faxNumber}">
 						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
@@ -196,44 +197,44 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="emailAddress" value="#{msg.DATA_EMAIL_ADDRESS}" />
+					<p:outputLabel for="emailAddress" value="#{msg.DATA_EMAIL_ADDRESS}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+					<p:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
 						<f:validator for="emailAddress" validatorId="EmailAddressValidator" />
 						<f:attribute name="allowEmptyValue" value="#{allowEmptyRequiredData}" />
-					</h:inputText>
+					</p: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 styleClass="error-container" layout="block">
+				<p:message for="emailAddress" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="contactBirthday" value="#{msg.ADMIN_PERSONAL_DATA_BIRTHDAY}" />
+					<p: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}">
+					<p:inputText styleClass="input" id="contactBirthday" value="#{adminContactController.birthday}" size="10" converterMessage="#{msg.INVALID_BIRTHDAY}">
 						<f:convertDateTime pattern="#{msg.BIRTHDAY_PATTERN}" />
-					</h:inputText>
+					</p: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 styleClass="error-container" layout="block">
+				<p:message for="contactBirthday" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="contactComment" value="#{msg.ADMIN_PERSONAL_DATA_COMMENT}" />
+					<p: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" />
+					<p:inputTextarea id="contactComment" styleClass="input" value="#{adminContactController.comment}" rows="7" cols="25" />
 				</div>
 			</h:panelGroup>
 		</fieldset>
diff --git a/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl
index 15c56904..781eb0d9 100644
--- a/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl
@@ -4,7 +4,8 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
 		<fieldset class="fieldset" id="fax_data">
@@ -14,7 +15,7 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="faxNumberId" value="#{msg.ADMIN_ID_NUMBER}" />
+					<p:outputLabel for="faxNumberId" value="#{msg.ADMIN_ID_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
diff --git a/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl
index 6608556a..62d64ef0 100644
--- a/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl
@@ -4,7 +4,8 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
 		<fieldset class="fieldset" id="landline_data">
@@ -14,7 +15,7 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="landLineNumberId" value="#{msg.ADMIN_ID_NUMBER}" />
+					<p:outputLabel for="landLineNumberId" value="#{msg.ADMIN_ID_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
diff --git a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
index d3f679b3..101bd595 100644
--- a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
@@ -4,7 +4,8 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
 		<fieldset class="fieldset" id="mobile_data">
@@ -14,7 +15,7 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="mobileNumberId" value="#{msg.ADMIN_ID_NUMBER}" />
+					<p:outputLabel for="mobileNumberId" value="#{msg.ADMIN_ID_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
@@ -24,36 +25,36 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
+					<p:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select" id="mobileProvider" value="#{adminPhoneController.mobileProvider}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}">
+					<p:selectOneMenu id="mobileProvider" value="#{adminPhoneController.mobileProvider}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}">
 						<f:converter converterId="MobileProviderConverter" />
 						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
-					</h:selectOneMenu>
+					</p:selectOneMenu>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="mobileProvider" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="mobileProvider" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="mobileNumber" value="#{msg.ADMIN_EDIT_MOBILE_NUMBER}" />
+					<p:outputLabel for="mobileNumber" value="#{msg.ADMIN_EDIT_MOBILE_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}">
+					<p:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}">
 						<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="mobileNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="mobileNumber" />
 			</h:panelGroup>
 		</fieldset>
 	</h:panelGroup>
diff --git a/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
index b9573ae6..c06c52ae 100644
--- a/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/user/admin_form_user_data.tpl
@@ -4,7 +4,8 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:panelGroup styleClass="para" layout="block" rendered="#{not empty mode}">
 		<fieldset class="fieldset" id="login_data">
@@ -14,53 +15,53 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
+					<p: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}" />
+					<p:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" requiredMessage="#{msg.ADMIN_USER_NAME_IS_REQUIRED}" />
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="userName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="userName" />
 			</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}" />
+					<p: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}" />
+					<p:inputText type="secret" 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 styleClass="error-container" layout="block">
+				<p:message for="userPassword" />
 			</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}" />
+					<p: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}" />
+					<p:inputText type="secret" styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="userPasswordRepeat" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="userPasswordRepeat" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block" rendered="#{featureController.isFeatureEnabled('user_must_change_password')}">
 				<div class="table-left-medium">
-					<h:outputLabel for="userMustChangePassword" value="#{msg.ADMIN_USER_MUST_CHANGE_PASSWORD}" />
+					<p: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}" />
+					<p:selectBooleanCheckbox id="userMustChangePassword" value="#{adminUserController.userMustChangePassword}" />
 				</div>
 			</h:panelGroup>
 
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl
index 10c6b8c6..b0612aaf 100644
--- a/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl
@@ -3,29 +3,30 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<ui:fragment rendered="#{empty rendered or rendered}">
 		<ul class="navbar-mini">
 			<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
 				<li class="navlink-mini">
-					<h:link outcome="admin_show_basic_data" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE}">
+					<p:link outcome="admin_show_basic_data" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE}">
 						<f:param name="basicDataId" value="#{basicData.basicDataId}" />
-					</h:link>
+					</p:link>
 				</li>
 			</ui:fragment>
 
 			<li class="navlink-mini">
-				<h:link outcome="admin_edit_basic_data" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE}">
+				<p:link outcome="admin_edit_basic_data" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE}">
 					<f:param name="basicDataId" value="#{basicData.basicDataId}" />
-				</h:link>
+				</p:link>
 			</li>
 
 			<li class="navlink-mini">
-				<h:link outcome="admin_delete_basic_data">
+				<p:link outcome="admin_delete_basic_data">
 					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE}" />
 					<f:param name="basicDataId" value="#{basicData.basicDataId}" />
-				</h:link>
+				</p:link>
 			</li>
 		</ul>
 	</ui:fragment>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl
index cc4f8dd1..5b281c78 100644
--- a/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl
@@ -3,29 +3,30 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<ui:fragment rendered="#{empty rendered or rendered}">
 		<ul class="navbar-mini">
 			<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
 				<li class="navlink-mini">
-					<h:link outcome="admin_show_branch_office" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE}">
+					<p:link outcome="admin_show_branch_office" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE}">
 						<f:param name="branchId" value="#{branchOffice.branchId}" />
-					</h:link>
+					</p:link>
 				</li>
 			</ui:fragment>
 
 			<li class="navlink-mini">
-				<h:link outcome="admin_edit_branch_office" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE}">
+				<p:link outcome="admin_edit_branch_office" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE}">
 					<f:param name="branchId" value="#{branchOffice.branchId}" />
-				</h:link>
+				</p:link>
 			</li>
 
 			<li class="navlink-mini">
-				<h:link outcome="admin_delete_branch_office">
+				<p:link outcome="admin_delete_branch_office">
 					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE}" />
 					<f:param name="branchId" value="#{branchOffice.branchId}" />
-				</h:link>
+				</p:link>
 			</li>
 		</ul>
 	</ui:fragment>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl
index ebc13a33..8a0e79c4 100644
--- a/web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl
@@ -3,29 +3,30 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<ui:fragment rendered="#{empty rendered or rendered}">
 		<ul class="navbar-mini">
 			<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
 				<li class="navlink-mini">
-					<h:link outcome="admin_show_contact" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}">
+					<p:link outcome="admin_show_contact" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}">
 						<f:param name="contactId" value="#{contact.contactId}" />
-					</h:link>
+					</p:link>
 				</li>
 			</ui:fragment>
 
 			<li class="navlink-mini">
-				<h:link outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
+				<p:link outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
 					<f:param name="contactId" value="#{contact.contactId}" />
-				</h:link>
+				</p:link>
 			</li>
 
 			<li class="navlink-mini">
-				<h:link outcome="admin_delete_contact">
+				<p:link outcome="admin_delete_contact">
 					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_CONTACT_TITLE}" />
 					<f:param name="contactId" value="#{contact.contactId}" />
-				</h:link>
+				</p:link>
 			</li>
 		</ul>
 	</ui:fragment>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/country/admin_country_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/country/admin_country_links.tpl
new file mode 100644
index 00000000..14459291
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/links/mini/country/admin_country_links.tpl
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
+
+	<ui:fragment rendered="#{empty rendered or rendered}">
+		<ul class="navbar-mini">
+			<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
+				<li class="navlink-mini">
+					<p:link outcome="admin_show_country" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_COUNTRY_TITLE}">
+						<f:param name="countryId" value="#{country.countryId}" />
+					</p:link>
+				</li>
+			</ui:fragment>
+
+			<li class="navlink-mini">
+				<p:link outcome="admin_edit_country" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_COUNTRY_TITLE}">
+					<f:param name="countryId" value="#{country.countryId}" />
+				</p:link>
+			</li>
+
+			<li class="navlink-mini">
+				<p:link outcome="admin_delete_country">
+					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_COUNTRY_TITLE}" />
+					<f:param name="countryId" value="#{country.countryId}" />
+				</p:link>
+			</li>
+		</ul>
+	</ui:fragment>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl
index 4f86c3f0..ad55a476 100644
--- a/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl
@@ -4,39 +4,40 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<ui:fragment rendered="#{empty rendered or rendered}">
 		<ul class="navbar-mini">
 			<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
 				<li class="navlink-mini">
-					<h:link outcome="admin_show_fax" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}">
+					<p:link outcome="admin_show_fax" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}">
 						<f:param name="phoneId" value="#{faxNumber.phoneId}" />
-					</h:link>
+					</p: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_FAX_NUMBER_TITLE}">
+				<p:link outcome="admin_edit_fax" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_FAX_NUMBER_TITLE}">
 					<f:param name="phoneId" value="#{faxNumber.phoneId}" />
-				</h:link>
+				</p:link>
 			</li>
 
 			<ui:fragment rendered="#{not empty contact}">
 				<li class="navlink-mini">
-					<h:link outcome="admin_unlink_contact_fax">
+					<p:link outcome="admin_unlink_contact_fax">
 						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE}" />
 						<f:param name="phoneId" value="#{faxNumber.phoneId}" />
 						<f:param name="contactId" value="#{contact.contactId}" />
-					</h:link>
+					</p:link>
 				</li>
 			</ui:fragment>
 
 			<li class="navlink-mini">
-				<h:link outcome="admin_delete_fax">
+				<p:link outcome="admin_delete_fax">
 					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_FAX_NUMBER_TITLE}" />
 					<f:param name="phoneId" value="#{faxNumber.phoneId}" />
-				</h:link>
+				</p:link>
 			</li>
 		</ul>
 	</ui:fragment>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl
index f4d81b41..e6f2ae06 100644
--- a/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl
@@ -4,39 +4,40 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<ui:fragment rendered="#{empty rendered or rendered}">
 		<ul class="navbar-mini">
 			<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
 				<li class="navlink-mini">
-					<h:link outcome="admin_show_landline" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE}">
+					<p:link outcome="admin_show_landline" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE}">
 						<f:param name="phoneId" value="#{landLineNumber.phoneId}" />
-					</h:link>
+					</p: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_LANDLINE_NUMBER_TITLE}">
+				<p:link outcome="admin_edit_landline" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_LANDLINE_NUMBER_TITLE}">
 					<f:param name="phoneId" value="#{landLineNumber.phoneId}" />
-				</h:link>
+				</p:link>
 			</li>
 
 			<ui:fragment rendered="#{not empty contact}">
 				<li class="navlink-mini">
-					<h:link outcome="admin_unlink_contact_landline">
+					<p:link outcome="admin_unlink_contact_landline">
 						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LANDLINE_NUMBER_CONTACT_TITLE}" />
 						<f:param name="phoneId" value="#{landLineNumber.phoneId}" />
 						<f:param name="contactId" value="#{contact.contactId}" />
-					</h:link>
+					</p:link>
 				</li>
 			</ui:fragment>
 
 			<li class="navlink-mini">
-				<h:link outcome="admin_delete_landline">
+				<p:link outcome="admin_delete_landline">
 					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_LANDLINE_NUMBER_TITLE}" />
 					<f:param name="phoneId" value="#{landLineNumber.phoneId}" />
-				</h:link>
+				</p:link>
 			</li>
 		</ul>
 	</ui:fragment>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl
index 4f48f285..1c5255e3 100644
--- a/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl
@@ -4,39 +4,40 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<ui:fragment rendered="#{empty rendered or rendered}">
 		<ul class="navbar-mini">
 			<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
 				<li class="navlink-mini">
-					<h:link outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}">
+					<p:link outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}">
 						<f:param name="phoneId" value="#{mobileNumber.phoneId}" />
-					</h:link>
+					</p: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_MOBILE_NUMBER_TITLE}">
+				<p:link outcome="admin_edit_mobile" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_MOBILE_NUMBER_TITLE}">
 					<f:param name="phoneId" value="#{mobileNumber.phoneId}" />
-				</h:link>
+				</p:link>
 			</li>
 
 			<ui:fragment rendered="#{not empty contact}">
 				<li class="navlink-mini">
-					<h:link outcome="admin_unlink_contact_mobile">
+					<p:link outcome="admin_unlink_contact_mobile">
 						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE}" />
 						<f:param name="phoneId" value="#{mobileNumber.phoneId}" />
 						<f:param name="contactId" value="#{contact.contactId}" />
-					</h:link>
+					</p:link>
 				</li>
 			</ui:fragment>
 
 			<li class="navlink-mini">
-				<h:link outcome="admin_delete_mobile">
+				<p:link outcome="admin_delete_mobile">
 					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_MOBILE_NUMBER_TITLE}" />
 					<f:param name="phoneId" value="#{mobileNumber.phoneId}" />
-				</h:link>
+				</p:link>
 			</li>
 		</ul>
 	</ui:fragment>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl
index 99ceb4a0..92760013 100644
--- a/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl
@@ -4,29 +4,30 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<ui:fragment rendered="#{empty rendered or rendered}">
 		<ul class="navbar-mini">
 			<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
 				<li class="navlink-mini">
-					<h:link outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}">
+					<p:link outcome="admin_show_mobile_provider" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}">
 						<f:param name="providerId" value="#{mobileProvider.providerId}" />
-					</h:link>
+					</p: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_MOBILE_NUMBER_TITLE}">
+				<p:link outcome="admin_edit_mobile_provider" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_MOBILE_PROVIDER_TITLE}">
 					<f:param name="providerId" value="#{mobileProvider.providerId}" />
-				</h:link>
+				</p:link>
 			</li>
 
 			<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_MOBILE_NUMBER_TITLE}" />
+				<p:link outcome="admin_delete_mobile_provider">
+					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_MOBILE_PROVIDER_TITLE}" />
 					<f:param name="providerId" value="#{mobileProvider.providerId}" />
-				</h:link>
+				</p:link>
 			</li>
 		</ul>
 	</ui:fragment>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl
index 8eb1851f..10f5d659 100644
--- a/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl
@@ -3,44 +3,45 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<ui:fragment rendered="#{empty rendered or rendered}">
 		<ul class="navbar-mini">
 			<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
 				<li class="navlink-mini">
-					<h:link outcome="admin_show_user" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}">
+					<p:link outcome="admin_show_user" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}">
 						<f:param name="userId" value="#{user.userId}" />
-					</h:link>
+					</p:link>
 				</li>
 			</ui:fragment>
 
 			<li class="navlink-mini">
-				<h:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
+				<p:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
 					<f:param name="userId" value="#{user.userId}" />
-				</h:link>
+				</p:link>
 			</li>
 
 			<li class="navlink-mini">
-				<h:link outcome="admin_resend_user_confirm_link" value="#{msg.ADMIN_LINK_RESEND_CONFIRMATION_SHORT}" title="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE}" rendered="#{user.userAccountStatus == 'UNCONFIRMED'}">
+				<p:link outcome="admin_resend_user_confirm_link" value="#{msg.ADMIN_LINK_RESEND_CONFIRMATION_SHORT}" title="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE}" rendered="#{user.userAccountStatus == 'UNCONFIRMED'}">
 					<f:param name="userId" value="#{user.userId}" />
-				</h:link>
+				</p:link>
 
-				<h:link outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_SHORT}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'LOCKED'}">
+				<p:link outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_SHORT}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'LOCKED'}">
 					<f:param name="userId" value="#{user.userId}" />
-				</h:link>
+				</p:link>
 
-				<h:link outcome="admin_lock_user">
+				<p:link outcome="admin_lock_user">
 					<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_LOCK_SHORT}" title="#{msg.ADMIN_LINK_LOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'CONFIRMED'}" />
 					<f:param name="userId" value="#{user.userId}" />
-				</h:link>
+				</p:link>
 			</li>
 
 			<li class="navlink-mini">
-				<h:link outcome="admin_delete_user">
+				<p:link outcome="admin_delete_user">
 					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}" />
 					<f:param name="userId" value="#{user.userId}" />
-				</h:link>
+				</p:link>
 			</li>
 		</ul>
 	</ui:fragment>
diff --git a/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl b/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl
index 4f23f1ba..89bc08e0 100644
--- a/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/user/admin_user_links.tpl
@@ -3,7 +3,8 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:panelGroup styleClass="table" layout="block">
 		<h:panelGroup styleClass="table-header" layout="block" rendered="#{not empty renderHeader and renderHeader}">
@@ -14,60 +15,60 @@
 			<ul>
 				<ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
 					<li>
-						<h:link outcome="admin_show_user" value="#{msg.ADMIN_LINK_SHOW_USER}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}">
+						<p:link outcome="admin_show_user" value="#{msg.ADMIN_LINK_SHOW_USER}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}">
 							<f:param name="userId" value="#{user.userId}" />
-						</h:link>
+						</p:link>
 					</li>
 				</ui:fragment>
 
 				<li>
-					<h:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_USER}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
+					<p:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_USER}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
 						<f:param name="userId" value="#{user.userId}" />
-					</h:link>
+					</p:link>
 				</li>
 
 				<ui:fragment rendered="#{not empty renderContactLinks and renderContactLinks}">
 					<li>
-						<h:link outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_CONTACT}" title="#{msg.ADMIN_LINK_EDIT_CONTACT_TITLE}">
+						<p:link outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_CONTACT}" title="#{msg.ADMIN_LINK_EDIT_CONTACT_TITLE}">
 							<f:param name="contactId" value="#{user.userContact.contactId}" />
-						</h:link>
+						</p:link>
 					</li>
 				</ui:fragment>
 
 				<li>
-					<h:link outcome="admin_resend_user_confirm_link" value="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK}" title="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE}" rendered="#{user.userAccountStatus == 'UNCONFIRMED'}">
+					<p:link outcome="admin_resend_user_confirm_link" value="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK}" title="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE}" rendered="#{user.userAccountStatus == 'UNCONFIRMED'}">
 						<f:param name="userId" value="#{user.userId}" />
-					</h:link>
+					</p:link>
 
-					<h:link outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_USER}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'LOCKED'}">
+					<p:link outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_USER}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'LOCKED'}">
 						<f:param name="userId" value="#{user.userId}" />
-					</h:link>
+					</p:link>
 
-					<h:link outcome="admin_lock_user">
+					<p:link outcome="admin_lock_user">
 						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_LOCK_USER}" title="#{msg.ADMIN_LINK_LOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'CONFIRMED'}" />
 						<f:param name="userId" value="#{user.userId}" />
-					</h:link>
+					</p:link>
 				</li>
 
 				<li>
-					<h:link outcome="admin_delete_user">
+					<p:link outcome="admin_delete_user">
 						<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_USER}" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}" />
 						<f:param name="userId" value="#{user.userId}" />
-					</h:link>
+					</p:link>
 				</li>
 
 				<ui:fragment rendered="#{not empty renderContactLinks and renderContactLinks}">
 					<li>
-						<h:link outcome="admin_show_contact" value="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA}" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}">
+						<p:link outcome="admin_show_contact" value="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA}" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}">
 							<f:param name="contactId" value="#{user.userContact.contactId}" />
-						</h:link>
+						</p:link>
 					</li>
 				</ui:fragment>
 
 				<li>
-					<h:link outcome="admin_show_user_activity_log" value="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG}" title="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG_TITLE}">
+					<p:link outcome="admin_show_user_activity_log" value="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG}" title="#{msg.ADMIN_LINK_SHOW_USER_ACTIVITY_LOG_TITLE}">
 						<f:param name="userId" value="#{user.userId}" />
-					</h:link>
+					</p:link>
 				</li>
 			</ul>
 		</h:panelGroup>
diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
index 197917c6..a76a3480 100644
--- a/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
@@ -5,31 +5,32 @@
 	xmlns:links="http://mxchange.org/jsf/core/links"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
-	<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 == true}">
+	<h:panelGrid id="fax_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA}" tableStyleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered == true}">
 		<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_ID_NUMBER}" />
+				<p:outputLabel for="faxNumberId" styleClass="table-data-label" value="#{msg.ADMIN_ID_NUMBER}" />
 
 				<h:outputText id="faxNumberId" styleClass="table-data-field" value="#{faxNumber.phoneId}" />
 
-				<h:message for="faxNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+				<p:message for="faxNumberId" />
 			</h:panelGroup>
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="faxNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_FAX_NUMBER_COMPLETE}" />
+			<p:outputLabel for="faxNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_FAX_NUMBER_COMPLETE}" />
 
 			<h:outputText id="faxNumber" styleClass="table-data-field" value="#{faxNumber.phoneCountry.countryAbroadDialPrefix}#{faxNumber.phoneCountry.countryPhoneCode} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="faxCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+			<p: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" />
@@ -37,7 +38,7 @@
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="faxUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+			<p: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" />
@@ -45,7 +46,7 @@
 		</h:column>
 
 		<h:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
-			<h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
+			<p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
 			<div class="table-data-field">
 				<links:outputFaxNumberAdminMiniLinks faxNumber="#{faxNumber}" contact="#{contact}" renderShowLink="#{renderShowLink}" />
diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
index e7a75daa..ee7662df 100644
--- a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
@@ -5,31 +5,32 @@
 	xmlns:links="http://mxchange.org/jsf/core/links"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
-	<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 == true}">
+	<h:panelGrid id="landline_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}" tableStyleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered == true}">
 		<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_ID_NUMBER}" />
+				<p:outputLabel for="landLineNumberId" styleClass="table-data-label" value="#{msg.ADMIN_ID_NUMBER}" />
 
 				<h:outputText id="landLineNumberId" styleClass="table-data-field" value="#{landLineNumber.phoneId}" />
 
-				<h:message for="landLineNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+				<p:message for="landLineNumberId" />
 			</h:panelGroup>
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="landLineNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE}" />
+			<p:outputLabel for="landLineNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE}" />
 
 			<h:outputText id="landLineNumber" styleClass="table-data-field" value="#{landLineNumber.phoneCountry.countryAbroadDialPrefix}#{landLineNumber.phoneCountry.countryPhoneCode} (#{landLineNumber.phoneAreaCode}) #{landLineNumber.phoneNumber}" />
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="landLineCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+			<p: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" />
@@ -37,7 +38,7 @@
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="landLineUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+			<p: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" />
@@ -45,7 +46,7 @@
 		</h:column>
 
 		<h:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
-			<h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
+			<p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
 			<div class="table-data-field">
 				<links:outputLandLineNumberAdminMiniLinks landLineNumber="#{landLineNumber}" contact="#{contact}" renderShowLink="#{renderShowLink}" />
diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
index 616f8917..e62548ce 100644
--- a/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
@@ -5,40 +5,41 @@
 	xmlns:links="http://mxchange.org/jsf/core/links"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
-	<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 == true}">
+	<h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA}" tableStyleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered == true}">
 		<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_ID_NUMBER}" />
+				<p:outputLabel for="mobileNumberId" styleClass="table-data-label" value="#{msg.ADMIN_ID_NUMBER}" />
 
 				<h:outputText id="mobileNumberId" styleClass="table-data-field" value="#{mobileNumber.phoneId}" />
 
-				<h:message for="mobileNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+				<p:message for="mobileNumberId" />
 			</h:panelGroup>
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="mobileProvider" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
+			<p:outputLabel for="mobileProvider" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
 
-			<h:link id="mobileProvider" outcome="admin_show_mobile_provider">
+			<p:link id="mobileProvider" outcome="admin_show_mobile_provider">
 				<h:outputText styleClass="table-data-field" value="#{mobileNumber.mobileProvider.providerName}" />
 				<f:param name="providerId" value="#{mobileNumber.mobileProvider.providerId}" />
-			</h:link>
+			</p:link>
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="mobileNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
+			<p:outputLabel for="mobileNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
 
 			<h:outputText id="mobileNumber" styleClass="table-data-field" value="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileNumber.mobileProvider.providerDialPrefix}-#{mobileNumber.phoneNumber}" />
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="mobileCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+			<p: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" />
@@ -46,7 +47,7 @@
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="mobileUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+			<p: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" />
@@ -54,7 +55,7 @@
 		</h:column>
 
 		<h:column rendered="#{empty showAdminMiniLinks or showAdminMiniLinks == true}">
-			<h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
+			<p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
 			<div class="table-data-field">
 				<links:outputMobileNumberAdminMiniLinks mobileNumber="#{mobileNumber}" contact="#{contact}" renderShowLink="#{renderShowLink}" />
diff --git a/web/WEB-INF/resources/tags/messages/message_box.tpl b/web/WEB-INF/resources/tags/messages/message_box.tpl
index a68d361f..7d04f135 100644
--- a/web/WEB-INF/resources/tags/messages/message_box.tpl
+++ b/web/WEB-INF/resources/tags/messages/message_box.tpl
@@ -5,7 +5,7 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-	<h:panelGroup styleClass="message-container #{boxStyleClass}" layout="block" rendered="#{empty rendered or rendered == true}">
+	<h:panelGroup id="#{empty id ? 'message' : id}" styleClass="message-container #{boxStyleClass}" layout="block" rendered="#{empty rendered or rendered == true}">
 		<div class="message-header">
 			<h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
 		</div>
diff --git a/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl b/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl
index 5c114779..90283cea 100644
--- a/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl
+++ b/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl
@@ -4,12 +4,13 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<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)}">
+	<p:link outcome="user_profile" title="#{msg.LINK_USER_PROFILE_TITLE}" rendered="#{not empty user and profileController.isProfileLinkVisibleByUser(user)}">
 		<h:outputText value="#{user.userName}" />
 		<f:param name="userId" value="#{user.userId}" />
-	</h:link>
+	</p: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
index a6543fec..f63bbd6e 100644
--- 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
@@ -4,37 +4,38 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<ui:fragment rendered="#{empty rendered or rendered == true}">
 		<h:panelGroup styleClass="table-row" layout="block">
 			<div class="table-left-medium">
-				<h:outputLabel for="faxNumber" value="#{labelMessage}" />
+				<p:outputLabel for="faxNumber" value="#{labelMessage}" />
 			</div>
 
 			<div class="table-right-medium">
-				<h:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{targetController.faxCountry}">
+				<p: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>
+				</p:selectOneMenu>
 
-				<h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
+				<p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
 					<f:validator validatorId="PhoneNumberValidator" />
-				</h:inputText>
+				</p:inputText>
 
-				<h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{targetController.faxNumber}">
+				<p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{targetController.faxNumber}">
 					<f:validator validatorId="PhoneNumberValidator" />
-				</h:inputText>
+				</p: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 styleClass="error-container" layout="block">
+			<p:message for="faxAreaCode" />
 		</h:panelGroup>
 
-		<h:panelGroup styleClass="error_container" layout="block">
-			<h:message for="faxNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+		<h:panelGroup styleClass="error-container" layout="block">
+			<p:message for="faxNumber" />
 		</h:panelGroup>
 	</ui:fragment>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl
index f16751bb..e1891b82 100644
--- a/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl
+++ b/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl
@@ -4,37 +4,38 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<ui:fragment rendered="#{empty rendered or rendered == true}">
 		<h:panelGroup styleClass="table-row" layout="block">
 			<div class="table-left-medium">
-				<h:outputLabel for="landLineNumber" value="#{labelMessage}" />
+				<p:outputLabel for="landLineNumber" value="#{labelMessage}" />
 			</div>
 
 			<div class="table-right-medium">
-				<h:selectOneMenu styleClass="select divider-right" id="countryPhoneCode" value="#{targetController.landLineCountry}">
+				<p: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>
+				</p:selectOneMenu>
 
-				<h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.landLineAreaCode}">
+				<p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.landLineAreaCode}">
 					<f:validator validatorId="PhoneNumberValidator" />
-				</h:inputText>
+				</p:inputText>
 
-				<h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{targetController.landLineNumber}">
+				<p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{targetController.landLineNumber}">
 					<f:validator validatorId="PhoneNumberValidator" />
-				</h:inputText>
+				</p: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 styleClass="error-container" layout="block">
+			<p:message for="landLineAreaCode" />
 		</h:panelGroup>
 
-		<h:panelGroup styleClass="error_container" layout="block">
-			<h:message for="landLineNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+		<h:panelGroup styleClass="error-container" layout="block">
+			<p:message for="landLineNumber" />
 		</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 9e981a08..a9445346 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
@@ -4,29 +4,30 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<ui:fragment rendered="#{empty rendered or rendered == true}">
 		<h:panelGroup styleClass="table-row" layout="block">
 			<div class="table-left-medium">
-				<h:outputLabel for="mobileNumber" value="#{labelMessage}" />
+				<p:outputLabel for="mobileNumber" value="#{labelMessage}" />
 			</div>
 
 			<div class="table-right-medium">
-				<h:selectOneMenu styleClass="select" id="mobileProvider" value="#{targetController.mobileProvider}">
+				<p:selectOneMenu id="mobileProvider" value="#{targetController.mobileProvider}">
 					<f:converter converterId="MobileProviderConverter" />
 					<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 					<f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
-				</h:selectOneMenu>
+				</p:selectOneMenu>
 
-				<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
+				<p:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
 					<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-				</h:inputText>
+				</p:inputText>
 			</div>
 		</h:panelGroup>
 
-		<h:panelGroup styleClass="error_container" layout="block">
-			<h:message for="mobileNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+		<h:panelGroup styleClass="error-container" layout="block">
+			<p:message for="mobileNumber" />
 		</h:panelGroup>
 	</ui:fragment>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl
index 387a7235..9bb9ea5b 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
@@ -4,24 +4,25 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<ui:fragment rendered="#{empty rendered or rendered == true}">
 		<h:panelGroup styleClass="table-row" layout="block">
 			<div class="table-left-medium">
-				<h:outputLabel for="userPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
+				<p:outputLabel for="userPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
 			</div>
 
 			<div class="table-right-medium">
-				<h:selectOneMenu styleClass="select" id="userPersonalTitle" value="#{targetController.personalTitle}" required="#{(empty allowEmptyRequiredData or not allowEmptyRequiredData) and featureController.isFeatureEnabled(targetController.controllerType.concat('_personal_title'))}" requiredMessage="#{msg.FIELD_PERSONAL_TITLE_REQUIRED}">
+				<p:selectOneMenu id="userPersonalTitle" value="#{targetController.personalTitle}" required="#{(empty allowEmptyRequiredData or not allowEmptyRequiredData) and featureController.isFeatureEnabled(targetController.controllerType.concat('_personal_title'))}" requiredMessage="#{msg.FIELD_PERSONAL_TITLE_REQUIRED}">
 					<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
 					<f:selectItems value="#{genderController.selectableGenders}" var="personalTitle" itemValue="#{personalTitle}" itemLabel="#{msg[personalTitle.messageKey]}" />
-				</h:selectOneMenu>
+				</p:selectOneMenu>
 			</div>
 		</h:panelGroup>
 
-		<h:panelGroup styleClass="error_container" layout="block">
-			<h:message for="userPersonalTitle" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+		<h:panelGroup styleClass="error-container" layout="block">
+			<p:message for="userPersonalTitle" />
 		</h:panelGroup>
 	</ui:fragment>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl
index 96d53b29..d1409ce1 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
@@ -4,23 +4,24 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<ui:fragment rendered="#{empty rendered or rendered == true}">
 		<h:panelGroup styleClass="table-row" layout="block">
 			<div class="table-left-medium">
-				<h:outputLabel for="profileMode" value="#{labelMessage}" />
+				<p:outputLabel for="profileMode" value="#{labelMessage}" />
 			</div>
 
 			<div class="table-right-medium">
-				<h:selectOneMenu styleClass="select" id="profileMode" value="#{targetController.userProfileMode}">
+				<p:selectOneMenu id="profileMode" value="#{targetController.userProfileMode}">
 					<f:selectItems value="#{profileModeController.allProfileModes}" var="mode" itemValue="#{mode}" itemLabel="#{msg[mode.messageKey]}" />
-				</h:selectOneMenu>
+				</p:selectOneMenu>
 			</div>
 		</h:panelGroup>
 
-		<h:panelGroup styleClass="error_container" layout="block">
-			<h:message for="personalTitle" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+		<h:panelGroup styleClass="error-container" layout="block">
+			<p:message for="personalTitle" />
 		</h:panelGroup>
 	</ui:fragment>
 </ui:composition>
diff --git a/web/WEB-INF/templates/admin/admin_footer.tpl b/web/WEB-INF/templates/admin/admin_footer.tpl
index eeeb4add..ff9b5c83 100644
--- a/web/WEB-INF/templates/admin/admin_footer.tpl
+++ b/web/WEB-INF/templates/admin/admin_footer.tpl
@@ -1,12 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui"
+	xmlns:pm="http://primefaces.org/mobile">
 
-	<div class="footer">
+	<pm:footer id="footer" fixed="true" tapToggle="false">
 		<ul class="navbar-horizontal">
-			<li><h:link outcome="index" value="#{msg.LINK_ADMIN_FOOTER_TO_WEBPAGE}" /></li>
+			<li><p:link outcome="index" value="#{msg.LINK_ADMIN_FOOTER_TO_WEBPAGE}" /></li>
 		</ul>
-	</div>
+	</pm:footer>
 </ui:composition>
diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl
index e980a377..212e3615 100644
--- a/web/WEB-INF/templates/admin/admin_menu.tpl
+++ b/web/WEB-INF/templates/admin/admin_menu.tpl
@@ -3,81 +3,51 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<div class="menu_outer">
-		<h:panelGroup styleClass="menu" layout="block">
-			<div class="menu-header">
-				<h:outputText value="#{msg.ADMIN_MENU_MAIN_TITLE}" />
-			</div>
-
-			<ul>
-				<li><h:link title="#{msg.LINK_ADMIN_INDEX_TITLE}" outcome="admin_index" value="#{msg.LINK_ADMIN_INDEX}" /></li>
-			</ul>
-
-			<div class="menu-header">
-				<h:outputText value="#{msg.ADMIN_MENU_USER_TITLE}" />
-			</div>
-
-			<ul>
-				<li><h:link title="#{msg.LINK_ADMIN_LIST_USER_TITLE}" outcome="admin_list_user" value="#{msg.LINK_ADMIN_LIST_USER}" /></li>
-				<li><h:link title="#{msg.LINK_ADMIN_EXPORT_USER_TITLE}" outcome="admin_export_user" value="#{msg.LINK_ADMIN_EXPORT_USER}" /></li>
-			</ul>
-
-			<div class="menu-header">
-				<h:outputText value="#{msg.ADMIN_MENU_CONTACT_TITLE}" />
-			</div>
-
-			<ul>
-				<li><h:link title="#{msg.LINK_ADMIN_LIST_CONTACT_TITLE}" outcome="admin_list_contact" value="#{msg.LINK_ADMIN_LIST_CONTACT}" /></li>
-				<li><h:link title="#{msg.LINK_ADMIN_EXPORT_CONTACT_TITLE}" outcome="admin_export_contact" value="#{msg.LINK_ADMIN_EXPORT_CONTACT}" /></li>
-			</ul>
-
-			<ui:fragment rendered="#{featureController.isFeatureEnabled('basic_company_data')}">
-				<div class="menu-header">
-					<h:outputText value="#{msg.ADMIN_MENU_BUSINESS_CONTACTS_TITLE}" />
-				</div>
-
-				<ul>
-					<li><h:link title="#{msg.LINK_ADMIN_LIST_BASIC_COMPANY_DATA_TITLE}" outcome="admin_list_basic_company_data" value="#{msg.LINK_ADMIN_LIST_BASIC_COMPANY_DATA}" /></li>
-					<li><h:link title="#{msg.LINK_ADMIN_LIST_BRANCH_OFFICES_TITLE}" outcome="admin_list_branch_offices" value="#{msg.LINK_ADMIN_LIST_BRANCH_OFFICES}" /></li>
-				</ul>
-			</ui:fragment>
-
-			<div class="menu-header">
-				<h:outputText value="#{msg.ADMIN_MENU_PHONE_NUMBERS_TITLE}" />
-			</div>
-
-			<ul>
-				<li><h:link title="#{msg.LINK_ADMIN_LIST_LAND_LINE_PHONE_NUMBERS_TITLE}" outcome="admin_list_landline" value="#{msg.LINK_ADMIN_LIST_LAND_LINE_PHONE_NUMBERS}" /></li>
-				<li><h:link title="#{msg.LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS_TITLE}" outcome="admin_list_mobile" value="#{msg.LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS}" /></li>
-				<li><h:link title="#{msg.LINK_ADMIN_LIST_FAX_PHONE_NUMBERS_TITLE}" outcome="admin_list_fax" value="#{msg.LINK_ADMIN_LIST_FAX_PHONE_NUMBERS}" /></li>
-			</ul>
-
-			<div class="menu-header">
-				<h:outputText value="#{msg.ADMIN_MENU_COUNTRY_TITLE}" />
-			</div>
-
-			<ul>
-				<li><h:link title="#{msg.LINK_ADMIN_LIST_COUNTRIES_TITLE}" outcome="admin_list_countries" value="#{msg.LINK_ADMIN_LIST_COUNTRIES}" /></li>
-			</ul>
-
-			<div class="menu-header">
-				<h:outputText value="#{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}" />
-			</div>
-
-			<ul>
-				<li><h:link title="#{msg.LINK_ADMIN_LIST_MOBILE_PROVIDER_TITLE}" outcome="admin_list_mobile_provider" value="#{msg.LINK_ADMIN_LIST_MOBILE_PROVIDER}" /></li>
-			</ul>
-
-			<div class="menu-header">
-				<h:outputText value="#{msg.ADMIN_MENU_LOGOUT_TITLE}" />
-			</div>
-
-			<ul>
-				<li><h:link title="#{msg.LINK_ADMIN_LOGOUT_TITLE}" outcome="admin_logout" value="#{msg.LINK_ADMIN_LOGOUT}" /></li>
-				<li><h:link title="#{msg.LINK_ADMIN_TO_WEBPAGE_TITLE}" outcome="index" value="#{msg.LINK_ADMIN_TO_WEBPAGE}" /></li>
-			</ul>
-		</h:panelGroup>
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui"
+	xmlns:pm="http://primefaces.org/mobile">
+
+	<div id="menu" data-role="panel" class="menu_outer" data-position="left" data-display="overlay" data-theme="a">
+		<h:form>
+			<p:menu>
+				<p:submenu label="#{msg.ADMIN_MENU_MAIN_TITLE}">
+					<p:menuitem title="#{msg.LINK_ADMIN_INDEX_TITLE}" outcome="admin_index" value="#{msg.LINK_ADMIN_INDEX}" />
+				</p:submenu>
+
+				<p:submenu label="#{msg.ADMIN_MENU_USER_TITLE}">
+					<p:menuitem title="#{msg.LINK_ADMIN_LIST_USER_TITLE}" outcome="admin_list_user" value="#{msg.LINK_ADMIN_LIST_USER}" />
+					<p:menuitem title="#{msg.LINK_ADMIN_EXPORT_USER_TITLE}" outcome="admin_export_user" value="#{msg.LINK_ADMIN_EXPORT_USER}" />
+				</p:submenu>
+
+				<p:submenu label="#{msg.ADMIN_MENU_CONTACT_TITLE}">
+					<p:menuitem title="#{msg.LINK_ADMIN_LIST_CONTACT_TITLE}" outcome="admin_list_contact" value="#{msg.LINK_ADMIN_LIST_CONTACT}" />
+					<p:menuitem title="#{msg.LINK_ADMIN_EXPORT_CONTACT_TITLE}" outcome="admin_export_contact" value="#{msg.LINK_ADMIN_EXPORT_CONTACT}" />
+				</p:submenu>
+
+				<p:submenu label="#{msg.ADMIN_MENU_BUSINESS_CONTACTS_TITLE}" rendered="#{featureController.isFeatureEnabled('basic_company_data')}">
+					<p:menuitem title="#{msg.LINK_ADMIN_LIST_BASIC_COMPANY_DATA_TITLE}" outcome="admin_list_basic_company_data" value="#{msg.LINK_ADMIN_LIST_BASIC_COMPANY_DATA}" />
+					<p:menuitem title="#{msg.LINK_ADMIN_LIST_BRANCH_OFFICES_TITLE}" outcome="admin_list_branch_offices" value="#{msg.LINK_ADMIN_LIST_BRANCH_OFFICES}" />
+				</p:submenu>
+
+				<p:submenu label="#{msg.ADMIN_MENU_PHONE_NUMBERS_TITLE}">
+					<p:menuitem title="#{msg.LINK_ADMIN_LIST_LAND_LINE_PHONE_NUMBERS_TITLE}" outcome="admin_list_landline" value="#{msg.LINK_ADMIN_LIST_LAND_LINE_PHONE_NUMBERS}" />
+					<p:menuitem title="#{msg.LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS_TITLE}" outcome="admin_list_mobile" value="#{msg.LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS}" />
+					<p:menuitem title="#{msg.LINK_ADMIN_LIST_FAX_PHONE_NUMBERS_TITLE}" outcome="admin_list_fax" value="#{msg.LINK_ADMIN_LIST_FAX_PHONE_NUMBERS}" />
+				</p:submenu>
+
+				<p:submenu label="#{msg.ADMIN_MENU_COUNTRY_TITLE}">
+					<p:menuitem title="#{msg.LINK_ADMIN_LIST_COUNTRIES_TITLE}" outcome="admin_list_countries" value="#{msg.LINK_ADMIN_LIST_COUNTRIES}" />
+				</p:submenu>
+
+				<p:submenu label="#{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}">
+					<p:menuitem title="#{msg.LINK_ADMIN_LIST_MOBILE_PROVIDER_TITLE}" outcome="admin_list_mobile_provider" value="#{msg.LINK_ADMIN_LIST_MOBILE_PROVIDER}" />
+				</p:submenu>
+
+				<p:submenu label="#{msg.ADMIN_MENU_LOGOUT_TITLE}">
+					<p:menuitem title="#{msg.LINK_ADMIN_LOGOUT_TITLE}" outcome="admin_logout" value="#{msg.LINK_ADMIN_LOGOUT}" />
+					<p:menuitem title="#{msg.LINK_ADMIN_TO_WEBPAGE_TITLE}" outcome="index" value="#{msg.LINK_ADMIN_TO_WEBPAGE}" />
+				</p:submenu>
+			</p:menu>
+		</h:form>
 	</div>
 </ui:composition>
diff --git a/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl b/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl
index 165101ab..3c71f186 100644
--- a/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl
+++ b/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl
@@ -4,7 +4,8 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:panelGroup styleClass="para" layout="block">
 		<fieldset class="fieldset" id="basic_company_data">
@@ -14,230 +15,230 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="companyName" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" />
+					<p:outputLabel for="companyName" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="companyName" size="30" maxlength="200" required="true" requiredMessage="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME_REQUIRED}" value="#{adminCompanyDataController.companyName}">
+					<p:inputText styleClass="input" id="companyName" size="30" maxlength="200" required="true" requiredMessage="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME_REQUIRED}" value="#{adminCompanyDataController.companyName}">
 						<f:validator validatorId="CompanyNameValidator" />
 						<f:attribute name="checkExisting" value="false" />
-					</h:inputText>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="companyName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="companyName" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="companyEmailAddress" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_EMAIL_ADDRESS}" />
+					<p:outputLabel for="companyEmailAddress" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_EMAIL_ADDRESS}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="companyEmailAddress" size="20" maxlength="255" value="#{adminCompanyDataController.companyEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+					<p:inputText styleClass="input" id="companyEmailAddress" size="20" maxlength="255" value="#{adminCompanyDataController.companyEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
 						<f:validator validatorId="EmailAddressValidator" />
 						<f:attribute name="allowEmptyValue" value="true" />
-					</h:inputText>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="companyEmailAddress" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="companyEmailAddress" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="companyLogo" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_LOGO}" />
+					<p:outputLabel for="companyLogo" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_LOGO}" />
 				</div>
 
 				<div class="table-right-medium">
-					<widgets:outputMessageBox message="#{msg.ADMIN_FEATURE_UNFINISHED_WARNING}" boxStyleClass="message-full" messageStyleClass="alert-warning" />
+					<widgets:outputMessageBox id="companyLogo" message="#{msg.ADMIN_FEATURE_UNFINISHED_WARNING}" boxStyleClass="message-full" messageStyleClass="alert-warning" />
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="companyLogo" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="companyLogo" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="companyTaxNumber" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_TAX_NUMBER}" />
+					<p:outputLabel for="companyTaxNumber" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_TAX_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="companyTaxNumber" size="30" maxlength="200" value="#{adminCompanyDataController.companyTaxNumber}" />
+					<p:inputText styleClass="input" id="companyTaxNumber" size="30" maxlength="200" value="#{adminCompanyDataController.companyTaxNumber}" />
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="companyTaxNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="companyTaxNumber" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="companyWebsiteUrl" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_WEBSITE_URL}" />
+					<p:outputLabel for="companyWebsiteUrl" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_WEBSITE_URL}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="companyWebsiteUrl" size="30" maxlength="200" value="#{adminCompanyDataController.companyWebsiteUrl}" validatorMessage="#{msg.URL_NOT_MATCHING_REGULAR_EXPRESSION}">
+					<p:inputText styleClass="input" id="companyWebsiteUrl" size="30" maxlength="200" value="#{adminCompanyDataController.companyWebsiteUrl}" validatorMessage="#{msg.URL_NOT_MATCHING_REGULAR_EXPRESSION}">
 						<f:validator validatorId="UrlValidator" />
 						<f:attribute name="allowEmptyValue" value="true" />
-					</h:inputText>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="companyWebsiteUrl" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="companyWebsiteUrl" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="companyUserOwner" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_USER_OWNER}" />
+					<p:outputLabel for="companyUserOwner" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_USER_OWNER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select" id="companyUserOwner" value="#{adminCompanyDataController.companyUserOwner}">
+					<p:selectOneMenu id="companyUserOwner" value="#{adminCompanyDataController.companyUserOwner}">
 						<f:converter converterId="UserConverter" />
 						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{userController.allUsers()}" var="companyUserOwner" itemValue="#{companyUserOwner}" itemLabel="#{companyUserOwner.userContact.contactFirstName} #{companyUserOwner.userContact.contactFamilyName} (#{companyUserOwner.userName})" />
-					</h:selectOneMenu>
+					</p:selectOneMenu>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="companyUserOwner" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="companyUserOwner" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="companyContactEmployee" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_CONTACT_EMPLOYEE}" />
+					<p:outputLabel for="companyContactEmployee" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_CONTACT_EMPLOYEE}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select" id="companyContactEmployee" value="#{adminCompanyDataController.companyContactEmployee}">
+					<p:selectOneMenu id="companyContactEmployee" value="#{adminCompanyDataController.companyContactEmployee}">
 						<f:converter converterId="CompanyEmployeeConverter" />
 						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
-					</h:selectOneMenu>
+					</p:selectOneMenu>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="companyContactEmployee" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="companyContactEmployee" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="companyFounder" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_FOUNDER}" />
+					<p:outputLabel for="companyFounder" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_FOUNDER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select" id="companyFounder" value="#{adminCompanyDataController.companyFounder}">
+					<p:selectOneMenu id="companyFounder" value="#{adminCompanyDataController.companyFounder}">
 						<f:converter converterId="CompanyEmployeeConverter" />
 						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
-					</h:selectOneMenu>
+					</p:selectOneMenu>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="companyFounder" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="companyFounder" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="companyHeadQuarters" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_HEADQUARTERS}" />
+					<p:outputLabel for="companyHeadQuarters" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_HEADQUARTERS}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select" id="companyHeadQuarters" value="#{adminCompanyDataController.companyHeadQuarters}">
+					<p:selectOneMenu id="companyHeadQuarters" value="#{adminCompanyDataController.companyHeadQuarters}">
 						<f:converter converterId="CompanyHeadquartersConverter" />
 						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{companyHeadquartersController.allCompanyHeadquarters()}" var="companyHeadQuarters" itemValue="#{companyHeadQuarters}" itemLabel="#{companyHeadQuarters.foo}" />
-					</h:selectOneMenu>
+					</p:selectOneMenu>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="companyHeadQuarters" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="companyHeadQuarters" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="landLineCountry" value="#{msg.ADMIN_BASIC_COMPANY_DATA_PHONE_NUMBER}" />
+					<p:outputLabel for="landLineCountry" value="#{msg.ADMIN_BASIC_COMPANY_DATA_PHONE_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select divider-right" id="landLineCountry" value="#{adminCompanyDataController.landLineCountry}">
+					<p:selectOneMenu styleClass="select divider-right" id="landLineCountry" value="#{adminCompanyDataController.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>
+					</p:selectOneMenu>
 
-					<h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminCompanyDataController.landLineAreaCode}">
+					<p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminCompanyDataController.landLineAreaCode}">
 						<f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					</p:inputText>
 
-					<h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminCompanyDataController.landLineNumber}">
+					<p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminCompanyDataController.landLineNumber}">
 						<f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineCountry" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="landLineCountry" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineAreaCode" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="landLineAreaCode" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineNumber" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="landLineNumber" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="faxCountry" value="#{msg.ADMIN_BASIC_COMPANY_DATA_FAX_NUMBER}" />
+					<p:outputLabel for="faxCountry" value="#{msg.ADMIN_BASIC_COMPANY_DATA_FAX_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{adminCompanyDataController.faxCountry}">
+					<p:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{adminCompanyDataController.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>
+					</p:selectOneMenu>
 
-					<h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminCompanyDataController.faxAreaCode}">
+					<p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminCompanyDataController.faxAreaCode}">
 						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					</p:inputText>
 
-					<h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminCompanyDataController.faxNumber}">
+					<p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminCompanyDataController.faxNumber}">
 						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxCountry" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="faxCountry" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxAreaCode" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="faxAreaCode" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxNumber" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="faxNumber" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="companyComments" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_COMMENTS}" />
+					<p:outputLabel for="companyComments" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_COMMENTS}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputTextarea styleClass="input" id="companyComments" rows="7" cols="25" value="#{adminCompanyDataController.companyComments}" />
+					<p:inputTextarea styleClass="input" id="companyComments" rows="7" cols="25" value="#{adminCompanyDataController.companyComments}" />
 				</div>
 			</h:panelGroup>
 		</fieldset>
diff --git a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl
index 8eaab292..48dd6e59 100644
--- a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl
+++ b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl
@@ -4,7 +4,8 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:panelGroup styleClass="para" layout="block">
 		<fieldset class="fieldset" id="admin_branch_office_basic">
@@ -14,141 +15,141 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="branchCompany" value="#{msg.ADMIN_SELECT_BRANCH_OFFICE_COMPANY}" />
+					<p:outputLabel for="branchCompany" value="#{msg.ADMIN_SELECT_BRANCH_OFFICE_COMPANY}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select" id="branchCompany" value="#{adminBranchOfficeController.branchCompany}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_COMPANY_REQUIRED}">
+					<p:selectOneMenu id="branchCompany" value="#{adminBranchOfficeController.branchCompany}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_COMPANY_REQUIRED}">
 						<f:converter converterId="BasicCompanyDataConverter" />
 						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
 						<f:selectItems value="#{basicDataController.allCompanyBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
-					</h:selectOneMenu>
+					</p:selectOneMenu>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="branchCompany" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchCompany" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="branchContactEmployee" value="#{msg.ADMIN_SELECT_BRANCH_OFFICE_CONTACT_EMPLOYEE}" />
+					<p:outputLabel for="branchContactEmployee" value="#{msg.ADMIN_SELECT_BRANCH_OFFICE_CONTACT_EMPLOYEE}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select" id="branchContactEmployee" value="#{adminBranchOfficeController.branchContactEmployee}">
+					<p:selectOneMenu id="branchContactEmployee" value="#{adminBranchOfficeController.branchContactEmployee}">
 						<f:converter converterId="CompanyEmployeeConverter" />
 						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
-					</h:selectOneMenu>
+					</p:selectOneMenu>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="branchContactEmployee" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchContactEmployee" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="branchUserOwner" value="#{msg.ADMIN_SELECT_BRANCH_OFFICE_USER_OWNER}" />
+					<p:outputLabel for="branchUserOwner" value="#{msg.ADMIN_SELECT_BRANCH_OFFICE_USER_OWNER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select" id="branchUserOwner" value="#{adminBranchOfficeController.branchUserOwner}">
+					<p:selectOneMenu id="branchUserOwner" value="#{adminBranchOfficeController.branchUserOwner}">
 						<f:converter converterId="UserConverter" />
 						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{userController.allUsers()}" var="branchUserOwner" itemValue="#{branchUserOwner}" itemLabel="#{branchUserOwner.userContact.contactFirstName} #{branchUserOwner.userContact.contactFamilyName} (#{branchUserOwner.userName})" />
-					</h:selectOneMenu>
+					</p:selectOneMenu>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="branchUserOwner" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchUserOwner" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="branchEmailAddress" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS}" />
+					<p:outputLabel for="branchEmailAddress" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="branchEmailAddress" size="20" maxlength="255" value="#{adminBranchOfficeController.branchEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+					<p:inputText styleClass="input" id="branchEmailAddress" size="20" maxlength="255" value="#{adminBranchOfficeController.branchEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
 						<f:validator validatorId="EmailAddressValidator" />
 						<f:attribute name="allowEmptyValue" value="true" />
-					</h:inputText>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="branchEmailAddress" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchEmailAddress" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="landLineCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_PHONE_NUMBER}" />
+					<p:outputLabel for="landLineCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_PHONE_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select divider-right" id="landLineCountry" value="#{adminBranchOfficeController.landLineCountry}">
+					<p:selectOneMenu styleClass="select divider-right" id="landLineCountry" value="#{adminBranchOfficeController.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>
+					</p:selectOneMenu>
 
-					<h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.landLineAreaCode}">
+					<p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.landLineAreaCode}">
 						<f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					</p:inputText>
 
-					<h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminBranchOfficeController.landLineNumber}">
+					<p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminBranchOfficeController.landLineNumber}">
 						<f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineCountry" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="landLineCountry" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineAreaCode" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="landLineAreaCode" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineNumber" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="landLineNumber" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="faxCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_FAX_NUMBER}" />
+					<p:outputLabel for="faxCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_FAX_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{adminBranchOfficeController.faxCountry}">
+					<p:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{adminBranchOfficeController.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>
+					</p:selectOneMenu>
 
-					<h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.faxAreaCode}">
+					<p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.faxAreaCode}">
 						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					</p:inputText>
 
-					<h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminBranchOfficeController.faxNumber}">
+					<p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminBranchOfficeController.faxNumber}">
 						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxCountry" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="faxCountry" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxAreaCode" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="faxAreaCode" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxNumber" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="faxNumber" />
 			</h:panelGroup>
 		</fieldset>
 
@@ -159,112 +160,112 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="branchStreet" value="#{msg.ADMIN_DATA_STREET_NAME}" />
+					<p:outputLabel for="branchStreet" value="#{msg.ADMIN_DATA_STREET_NAME}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="branchStreet" size="20" maxlength="255" value="#{adminBranchOfficeController.branchStreet}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED}" />
+					<p:inputText styleClass="input" id="branchStreet" size="20" maxlength="255" value="#{adminBranchOfficeController.branchStreet}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED}" />
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="branchStreet" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchStreet" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="branchHouseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
+					<p:outputLabel for="branchHouseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="branchHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED}">
+					<p:inputText styleClass="input" id="branchHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED}">
 						<f:validateLongRange for="branchHouseNumber" minimum="1" maximum="500" />
-					</h:inputText>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="branchHouseNumber" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchHouseNumber" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="branchStore" value="#{msg.ADMIN_ENTER_DATA_STORE}" />
+					<p:outputLabel for="branchStore" value="#{msg.ADMIN_ENTER_DATA_STORE}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="branchStore" size="3" maxlength="5" value="#{adminBranchOfficeController.branchStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
+					<p:inputText styleClass="input" id="branchStore" size="3" maxlength="5" value="#{adminBranchOfficeController.branchStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
 						<f:validateLongRange for="branchStore" minimum="-5" maximum="200" />
-					</h:inputText>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="branchStore" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchStore" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="branchSuiteNumber" value="#{msg.ADMIN_ENTER_DATA_SUITE_NUMBER}" />
+					<p:outputLabel for="branchSuiteNumber" value="#{msg.ADMIN_ENTER_DATA_SUITE_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="branchSuiteNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
+					<p:inputText styleClass="input" id="branchSuiteNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
 						<f:validateLongRange for="branchSuiteNumber" minimum="1" maximum="500" />
-					</h:inputText>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="branchSuiteNumber" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchSuiteNumber" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="branchZipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
+					<p:outputLabel for="branchZipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="branchZipCode" size="5" maxlength="6" value="#{adminBranchOfficeController.branchZipCode}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED}">
+					<p:inputText styleClass="input" id="branchZipCode" size="5" maxlength="6" value="#{adminBranchOfficeController.branchZipCode}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED}">
 						<f:validateLongRange for="branchZipCode" minimum="1" maximum="99999" />
-					</h:inputText>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="branchZipCode" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchZipCode" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="branchCity" value="#{msg.ADMIN_DATA_CITY}" />
+					<p:outputLabel for="branchCity" value="#{msg.ADMIN_DATA_CITY}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="branchCity" size="20" maxlength="255" value="#{adminBranchOfficeController.branchCity}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_CITY_REQUIRED}" />
+					<p:inputText styleClass="input" id="branchCity" size="20" maxlength="255" value="#{adminBranchOfficeController.branchCity}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_CITY_REQUIRED}" />
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="branchCity" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchCity" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="branchCountry" value="#{msg.ADMIN_SELECT_COUNTRY}" />
+					<p:outputLabel for="branchCountry" value="#{msg.ADMIN_SELECT_COUNTRY}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select" id="branchCountry" value="#{adminBranchOfficeController.branchCountry}">
+					<p:selectOneMenu id="branchCountry" value="#{adminBranchOfficeController.branchCountry}">
 						<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>
+					</p:selectOneMenu>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="branchCountry" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="branchCountry" />
 			</h:panelGroup>
 		</fieldset>
 	</h:panelGroup>
diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl
index f196a195..c8c9f099 100644
--- a/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl
@@ -3,9 +3,10 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
-	<h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA_MINI}" headerClass="table-header-column" styleClass="table-full" columns="3" rendered="#{not empty beanHelper.contact}">
+	<h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA_MINI}" headerClass="table-header-column" styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.contact}">
 		<f:facet name="header">
 			<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT}">
 				<f:param value="#{beanHelper.contact.contactId}" />
@@ -13,19 +14,19 @@
 		</f:facet>
 
 		<h:column>
-			<h:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+			<p:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
 			<h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+			<p:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
 			<h:outputText id="contactFirstName" styleClass="table-data-field" value="#{beanHelper.contact.contactFirstName}" />
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+			<p:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
 			<h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{beanHelper.contact.contactFamilyName}" />
 		</h:column>
diff --git a/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl
index bfe0d957..7b1b357e 100644
--- a/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl
@@ -6,7 +6,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA}" headerClass="table-header-column" styleClass="table-full" columns="3" rendered="#{not empty beanHelper.contact}">
+	<h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA}" headerClass="table-header-column" styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.contact}">
 		<f:facet name="header">
 			<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT}">
 				<f:param value="#{beanHelper.contact.contactId}" />
diff --git a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
index d80453c9..5a0802d0 100644
--- a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
+++ b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
@@ -3,7 +3,8 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:panelGroup styleClass="para notice" layout="block">
 		<h:outputText value="#{msg.ADMIN_COUNTRY_DATA_MINIMUM_NOTICE}" />
@@ -17,103 +18,103 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="countryAbroadDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_ABROAD_DIAL_PREFIX}" />
+					<p:outputLabel for="countryAbroadDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_ABROAD_DIAL_PREFIX}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED}">
+					<p:inputText styleClass="input" id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED}">
 						<f:validator validatorId="AbroadDialValidator" />
-					</h:inputText>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="countryAbroadDialPrefix" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="countryAbroadDialPrefix" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="countryCode" value="#{msg.ADMIN_ENTER_COUNTRY_CODE}" />
+					<p:outputLabel for="countryCode" value="#{msg.ADMIN_ENTER_COUNTRY_CODE}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true">
+					<p:inputText styleClass="input" id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true">
 						<f:validateRegex for="countryCode" pattern="[A-Z]{2}" />
-					</h:inputText>
+					</p:inputText>
 
 					<h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_CODE_EXAMPLE}" />
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="countryCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="countryCode" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="countryI18nKey" value="#{msg.ADMIN_ENTER_COUNTRY_I18N_KEY}" />
+					<p:outputLabel for="countryI18nKey" value="#{msg.ADMIN_ENTER_COUNTRY_I18N_KEY}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="countryI18nKey" size="20" maxlength="100" value="#{adminCountryController.countryI18nKey}" required="true">
+					<p:inputText styleClass="input" id="countryI18nKey" size="20" maxlength="100" value="#{adminCountryController.countryI18nKey}" required="true">
 						<f:validateRegex for="countryI18nKey" pattern="[A-Z_]{2,}" />
-					</h:inputText>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="countryI18nKey" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="countryI18nKey" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="countryIsLocalPrefixRequired" value="#{msg.ADMIN_SELECT_COUNTRY_IS_EXTERNAL_DIAL_PREFIX_REQUIRED}" />
+					<p:outputLabel for="countryIsLocalPrefixRequired" value="#{msg.ADMIN_SELECT_COUNTRY_IS_EXTERNAL_DIAL_PREFIX_REQUIRED}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneListbox styleClass="select" required="true" id="countryIsLocalPrefixRequired" value="#{adminCountryController.countryIsLocalPrefixRequired}" size="1">
+					<h:selectOneListbox required="true" id="countryIsLocalPrefixRequired" value="#{adminCountryController.countryIsLocalPrefixRequired}" size="1">
 						<f:selectItem itemValue="true" itemLabel="#{msg.CHOICE_YES}" />
 						<f:selectItem itemValue="false" itemLabel="#{msg.CHOICE_NO}" />
 					</h:selectOneListbox>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="countryIsLocalPrefixRequired" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="countryIsLocalPrefixRequired" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="countryExternalDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
+					<p:outputLabel for="countryExternalDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED}">
+					<p:inputText styleClass="input" id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED}">
 						<f:validateLongRange for="countryExternalDialPrefix" minimum="0" maximum="99" />
-					</h:inputText>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="countryAbroadDialPrefix" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="countryAbroadDialPrefix" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="countryPhoneCode" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE}" />
+					<p:outputLabel for="countryPhoneCode" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_PHONE_CODE_REQUIRED}">
+					<p:inputText styleClass="input" id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_PHONE_CODE_REQUIRED}">
 						<f:validateLongRange for="countryPhoneCode" minimum="0" maximum="99" />
-					</h:inputText>
+					</p:inputText>
 
 					<h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE}" />
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="countryPhoneCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="countryPhoneCode" />
 			</h:panelGroup>
 		</fieldset>
 	</h:panelGroup>
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 48ee76d4..859622a5 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
@@ -4,7 +4,8 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
@@ -20,15 +21,15 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="faxNumber" value="#{msg.ADMIN_SELECT_FAX_NUMBER}" />
+					<p:outputLabel for="faxNumber" value="#{msg.ADMIN_SELECT_FAX_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select divider-right" id=" " value="#{adminPhoneController.faxNumber}">
+					<p:selectOneMenu styleClass="select divider-right" id=" " value="#{adminPhoneController.faxNumber}">
 						<f:converter converterId="FaxNumberConverter" />
 						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{adminPhoneController.allNonLinkedFaxNumbers()}" var="faxNumber" itemValue="#{faxNumber}" itemLabel="#{faxNumber.phoneCountry.countryExternalDialPrefix} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
-					</h:selectOneMenu>
+					</p:selectOneMenu>
 				</div>
 			</h:panelGroup>
 
@@ -39,9 +40,9 @@
 			<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}" />
+				<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
-				<h:commandButton styleClass="submit" id="submit_add_link_contact_fax" type="submit" action="#{adminContactPhoneController.doLinkMainFaxNumber()}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER}" />
+				<p:commandButton styleClass="submit" id="submit_add_link_contact_fax" type="submit" action="#{adminContactPhoneController.doLinkMainFaxNumber()}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER}" />
 			</div>
 		</h:panelGroup>
 	</h:form>
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 30b289b5..e211f8c6 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
@@ -4,7 +4,8 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
@@ -20,15 +21,15 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="landLineNumber" value="#{msg.ADMIN_SELECT_LAND_LINE_NUMBER}" />
+					<p:outputLabel for="landLineNumber" value="#{msg.ADMIN_SELECT_LAND_LINE_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select divider-right" id="landLineNumber" value="#{adminPhoneController.landLineNumber}">
+					<p:selectOneMenu styleClass="select divider-right" id="landLineNumber" value="#{adminPhoneController.landLineNumber}">
 						<f:converter converterId="LandLineNumberConverter" />
 						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{adminPhoneController.allNonLinkedLandLineNumbers()}" var="landlineNumber" itemValue="#{landlineNumber}" itemLabel="#{landlineNumber.phoneCountry.countryExternalDialPrefix} (#{landlineNumber.phoneAreaCode}) #{landlineNumber.phoneNumber}" />
-					</h:selectOneMenu>
+					</p:selectOneMenu>
 				</div>
 			</h:panelGroup>
 
@@ -39,11 +40,11 @@
 			<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}" />
+				<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
-				<h:commandButton styleClass="submit" id="submit_add_link_contact_landline" type="submit" action="#{adminContactPhoneController.doLinkAddLandLineNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER}">
+				<p:commandButton styleClass="submit" id="submit_add_link_contact_landline" type="submit" action="#{adminContactPhoneController.doLinkAddLandLineNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER}">
 					<f:param name="contactId" value="#{param.contactId}" />
-				</h:commandButton>
+				</p:commandButton>
 			</div>
 		</h:panelGroup>
 	</h:form>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
index 2f9e444a..6e72a273 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
@@ -4,7 +4,8 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
@@ -20,15 +21,15 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="mobileNumber" value="#{msg.ADMIN_SELECT_MOBILE_NUMBER}" />
+					<p:outputLabel for="mobileNumber" value="#{msg.ADMIN_SELECT_MOBILE_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select divider-right" id="mobileNumber" value="#{adminPhoneController.mobileNumber}">
+					<p:selectOneMenu styleClass="select divider-right" id="mobileNumber" value="#{adminPhoneController.mobileNumber}">
 						<f:converter converterId="MobileNumberConverter" />
 						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{adminPhoneController.allNonLinkedMobileNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix} (#{mobileNumber.mobileProvider.providerDialPrefix}) #{mobileNumber.phoneNumber}" />
-					</h:selectOneMenu>
+					</p:selectOneMenu>
 				</div>
 			</h:panelGroup>
 
@@ -39,11 +40,11 @@
 			<widgets:outputMobileNumberTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
 
 			<div class="table-footer">
-				<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
-				<h:commandButton styleClass="submit" id="submit_add_link_contact_mobile" type="submit" action="#{adminContactPhoneController.doLinkAddMobileNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER}">
+				<p:commandButton styleClass="submit" id="submit_add_link_contact_mobile" type="submit" action="#{adminContactPhoneController.doLinkAddMobileNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER}">
 					<f:param name="contactId" value="#{param.contactId}" />
-				</h:commandButton>
+				</p:commandButton>
 			</div>
 		</h:panelGroup>
 	</h:form>
diff --git a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
index bb704c3b..156b795d 100644
--- a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
+++ b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
@@ -3,7 +3,8 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:panelGroup styleClass="para notice" layout="block">
 		<h:outputText value="#{msg.ADMIN_MOBILE_PROVIDER_MINIMUM_NOTICE}" />
@@ -17,27 +18,27 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="providerDialPrefix" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_DIAL_PREFIX}" />
+					<p:outputLabel for="providerDialPrefix" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_DIAL_PREFIX}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true">
+					<p:inputText styleClass="input" id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true">
 						<f:validateLongRange for="providerDialPrefix" minimum="0" maximum="9999" />
-					</h:inputText>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="providerDialPrefix" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="providerDialPrefix" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="providerMailPattern" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN}" />
+					<p:outputLabel for="providerMailPattern" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="providerMailPattern" size="10" maxlength="30" value="#{adminMobileProviderController.providerMailPattern}" />
+					<p:inputText styleClass="input" id="providerMailPattern" size="10" maxlength="30" value="#{adminMobileProviderController.providerMailPattern}" />
 
 					<h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE}" />
 				</div>
@@ -45,24 +46,24 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="providerName" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_NAME}" />
+					<p:outputLabel for="providerName" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_NAME}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="providerName" size="20" maxlength="100" value="#{adminMobileProviderController.providerName}" required="true" />
+					<p:inputText styleClass="input" id="providerName" size="20" maxlength="100" value="#{adminMobileProviderController.providerName}" required="true" />
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="providerCountry" value="#{msg.ADMIN_SELECT_MOBILE_PROVIDER_COUNTRY}" />
+					<p:outputLabel for="providerCountry" value="#{msg.ADMIN_SELECT_MOBILE_PROVIDER_COUNTRY}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select" id="providerCountry" value="#{adminMobileProviderController.providerCountry}">
+					<p:selectOneMenu id="providerCountry" value="#{adminMobileProviderController.providerCountry}">
 						<f:converter converterId="CountryConverter" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
-					</h:selectOneMenu>
+					</p:selectOneMenu>
 				</div>
 			</h:panelGroup>
 		</fieldset>
diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
index 67a5f7c8..7f5d92f5 100644
--- a/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
@@ -4,9 +4,10 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
-	<h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}" headerClass="table-header-column" styleClass="table-full" columns="3" rendered="#{not empty beanHelper.user}">
+	<h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}" headerClass="table-header-column" styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.user}">
 		<f:facet name="header">
 			<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
 				<f:param value="#{beanHelper.user.userName}" />
@@ -15,21 +16,21 @@
 		</f:facet>
 
 		<h:column>
-			<h:outputLabel for="userId" styleClass="table-data-label" value="#{msg.ADMIN_USER_ID}" />
+			<p:outputLabel for="userId" styleClass="table-data-label" value="#{msg.ADMIN_USER_ID}" />
 
 			<h:outputText id="userId" styleClass="table-data-field" value="#{beanHelper.user.userId}" />
 		</h:column>
 
 		<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 			<h:column>
-				<h:outputLabel for="userName" styleClass="table-data-label" value="#{msg.ADMIN_USER_NAME}" />
+				<p:outputLabel for="userName" styleClass="table-data-label" value="#{msg.ADMIN_USER_NAME}" />
 
 				<h:outputText id="userName" styleClass="table-data-field" value="#{beanHelper.user.userName}" />
 			</h:column>
 		</ui:fragment>
 
 		<h:column>
-			<h:outputLabel for="userCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
+			<p:outputLabel for="userCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
 
 			<h:outputText id="userCreated" styleClass="table-data-field" value="#{beanHelper.user.userCreated.time}">
 				<f:convertDateTime for="userCreated" type="both" />
@@ -37,7 +38,7 @@
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="userUpdated" styleClass="table-data-label" value="#{msg.ADMIN_USER_UPDATED}" />
+			<p:outputLabel for="userUpdated" styleClass="table-data-label" value="#{msg.ADMIN_USER_UPDATED}" />
 
 			<h:outputText id="userUpdated" styleClass="table-data-field" value="#{beanHelper.user.userUpdated.time}">
 				<f:convertDateTime for="userUpdated" type="both" />
@@ -45,19 +46,19 @@
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="userAccountStatus" styleClass="table-data-label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
+			<p:outputLabel for="userAccountStatus" styleClass="table-data-label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
 
 			<h:outputText id="userAccountStatus" styleClass="table-data-field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="userProfileMode" styleClass="table-data-label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
+			<p:outputLabel for="userProfileMode" styleClass="table-data-label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
 
 			<h:outputText id="userProfileMode" styleClass="table-data-field" value="#{msg[beanHelper.user.userProfileMode.messageKey]}" />
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="userLastLocked" styleClass="table-data-label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
+			<p:outputLabel for="userLastLocked" styleClass="table-data-label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
 
 			<h:outputText id="userLastLocked" styleClass="table-data-field" value="#{beanHelper.user.userLastLocked.time}">
 				<f:convertDateTime for="userLastLocked" type="both" />
@@ -65,7 +66,7 @@
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="userLastLockedReason" styleClass="table-data-label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
+			<p:outputLabel for="userLastLockedReason" styleClass="table-data-label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
 
 			<h:outputText id="userLastLockedReason" styleClass="table-data-field" value="#{beanHelper.user.userLastLockedReason}" />
 		</h:column>
diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
index bf1fdef4..ef3e1c95 100644
--- a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
@@ -4,9 +4,10 @@
 	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
-	<h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}" headerClass="table-header-column" styleClass="table-full" columns="3" rendered="#{not empty beanHelper.user}">
+	<h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}" headerClass="table-header-column" styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.user}">
 		<f:facet name="header">
 			<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
 				<f:param value="#{beanHelper.user.userName}" />
@@ -15,25 +16,25 @@
 		</f:facet>
 
 		<h:column>
-			<h:outputLabel for="userId" styleClass="table-data-label" value="#{msg.ADMIN_USER_ID}" />
+			<p:outputLabel for="userId" styleClass="table-data-label" value="#{msg.ADMIN_USER_ID}" />
 
 			<h:panelGroup styleClass="table-data-field" layout="block">
-				<h:link id="userId" outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
+				<p:link id="userId" outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
 					<f:param name="userId" value="#{beanHelper.user.userId}" />
-				</h:link>
+				</p:link>
 			</h:panelGroup>
 		</h:column>
 
 		<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 			<h:column>
-				<h:outputLabel for="userName" styleClass="table-data-label" value="#{msg.ADMIN_USER_NAME}" />
+				<p:outputLabel for="userName" styleClass="table-data-label" value="#{msg.ADMIN_USER_NAME}" />
 
 				<h:outputText id="userName" styleClass="table-data-field" value="#{beanHelper.user.userName}" />
 			</h:column>
 		</ui:fragment>
 
 		<h:column>
-			<h:outputLabel for="userCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
+			<p:outputLabel for="userCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
 
 			<h:outputText id="userCreated" styleClass="table-data-field" value="#{beanHelper.user.userCreated.time}">
 				<f:convertDateTime for="userCreated" type="both" />
@@ -41,7 +42,7 @@
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="userAccountStatus" styleClass="table-data-label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
+			<p:outputLabel for="userAccountStatus" styleClass="table-data-label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
 
 			<h:outputText id="userAccountStatus" styleClass="table-data-field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
 		</h:column>
diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
index 9a371940..83ab95de 100644
--- a/web/WEB-INF/templates/base.tpl
+++ b/web/WEB-INF/templates/base.tpl
@@ -2,77 +2,108 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 				xmlns:f="http://java.sun.com/jsf/core"
 				xmlns:h="http://java.sun.com/jsf/html"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+				xmlns:p="http://primefaces.org/ui"
+				xmlns:pm="http://primefaces.org/mobile">
 
 	<h:doctype rootElement="html" public="-//W3C//DTD XHTML 1.0 Transitional//EN" system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
+
 	<html lang="#{localizationController.locale.language}" xml:lang="#{localizationController.locale.language}" xmlns="http://www.w3.org/1999/xhtml">
-		<f:view locale="#{localizationController.locale}" contentType="text/html">
-			<h:head>
+		<f:view locale="#{localizationController.locale}" contentType="text/html" />
+
+		<h:head>
+			<f:facet name="first">
 				<ui:insert name="metadata" />
 
-				<meta http-equiv="Content-Type" content="text/htmlcharset=UTF-8" />
+				<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+				<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+				<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0"/>
+				<meta name="apple-mobile-web-app-capable" content="yes" />
+			</f:facet>
 
-				<f:loadBundle var="msg" basename="org.mxchange.localization.bundle" />
+			<f:loadBundle var="msg" basename="org.mxchange.localization.bundle" />
 
-				<h:outputStylesheet name="/css/default.css" />
-				<h:outputStylesheet name="/css/layout.css" />
+			<h:outputStylesheet name="/css/default.css" />
+			<h:outputStylesheet name="/css/layout.css" />
 
-				<title>
-					<h:outputText value="JFinancials" />
-					<h:outputText value=" - " />
-					<ui:insert name="title">
-						<h:outputText value="Default title" />
-					</ui:insert>
-				</title>
-			</h:head>
-
-			<h:body>
-				<h:panelGroup id="page-header-container" layout="block">
-					<div id="page-header">
-						<h1>
-							<h:outputText value="JFinancials" />
-							<h:outputText value=" - " />
-							<ui:insert name="title">
-								<h:outputText value="Default title" />
-							</ui:insert>
-						</h1>
-					</div>
-				</h:panelGroup>
+			<title>
+				<h:outputText value="#{initParam['project_title']}" />
+				<h:outputText value=" - " />
+				<ui:insert name="title">
+					<h:outputText value="Default title" />
+				</ui:insert>
+			</title>
+		</h:head>
+
+		<h:body>
+			<pm:header>
+				<div id="page-header">
+					<h1>
+						<h:outputText value="#{initParam['project_title']} - " />
 
-				<h:panelGroup id="menu-content-wrapper" layout="block">
-					<div id="left-menu-container">
-						<ui:insert name="menu">
-							<h:outputText value="Default menu" />
+						<ui:insert name="title">
+							<h:outputText value="Default title" />
 						</ui:insert>
+					</h1>
+				</div>
+			</pm:header>
 
-						<ui:include src="/WEB-INF/templates/widgets/locale_change_widget.tpl" />
+			<h:panelGroup id="menu-content-wrapper" layout="block">
+				<div id="left-menu-container">
+					<ui:insert name="menu">
+						<h:outputText value="Default menu" />
+					</ui:insert>
+
+					<ui:include src="/WEB-INF/templates/widgets/locale_change_widget.tpl" />
+				</div>
+
+				<h:panelGroup id="content_outer" class="content-container" layout="block">
+					<div id="content-header">
+						<ui:insert name="content_header">
+							<h:outputText value="Default content header" />
+						</ui:insert>
 					</div>
 
-					<h:panelGroup id="content_outer" class="content-container" layout="block">
-						<div id="content-header">
-							<ui:insert name="content_header">
-								<h:outputText value="Default content header" />
-							</ui:insert>
-						</div>
-
-						<div id="content">
-							<ui:insert name="content">
-								<h:outputText value="Default content" />
-							</ui:insert>
-						</div>
-					</h:panelGroup>
+					<div id="content">
+						<ui:insert name="content">
+							<h:outputText value="Default content" />
+						</ui:insert>
+					</div>
 				</h:panelGroup>
+			</h:panelGroup>
 
-				<h:panelGroup id="page-footer" layout="block">
-					<ui:insert name="footer">
-						<h:outputText value="Default footer" />
-					</ui:insert>
-				</h:panelGroup>
+			<h:panelGroup id="page-footer" layout="block">
+				<ui:insert name="footer">
+					<h:outputText value="Default footer" />
+				</ui:insert>
+			</h:panelGroup>
 
-				<h:panelGroup styleClass="error_container" layout="block">
-					<h:messages showDetail="true" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-				</h:panelGroup>
-			</h:body>
-		</f:view>
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:growl autoUpdate="true" showDetail="true" sticky="true" />
+
+				<p:ajaxExceptionHandler type="javax.faces.application.ViewExpiredException"
+										update="exceptionDialog"
+										onexception="PF('exceptionDialog').show();" />
+
+				<p:dialog id="exceptionDialog" closable="true" closeOnEscape="true" header="Exception '#{pfExceptionHandler.type}' occured!" widgetVar="exceptionDialog"
+						  height="500px">
+					<div class="para">
+						<h:outputText value="#{msg.EXCEPTION_MESSAGE}:" />
+						<h:outputText value="#{pfExceptionHandler.message}" />
+					</div>
+
+					<div class="para">
+						<h:outputText value="#{msg.EXCEPTION_STACK_TRACE}:" />
+						<h:outputText value="#{pfExceptionHandler.formattedStackTrace}" escape="false" />
+					</div>
+
+					<div class="para">
+						<p:button onclick="window.location.href = document.location.href;"
+								  value="#{msg.RELOAD_PAGE}"
+								  rendered="#{pfExceptionHandler.type == 'javax.faces.application.ViewExpiredException'}" />
+					</div>
+				</p:dialog>
+			</h:panelGroup>
+		</h:body>
 	</html>
 </ui:composition>
diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index 77a406f0..12406604 100644
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -21,206 +21,206 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="firstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
+					<p:outputLabel for="firstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FIRST_NAME_REQUIRED}">
+					<p:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FIRST_NAME_REQUIRED}">
 						<f:validator validatorId="NameValidator" />
-					</h:inputText>
+					</p:inputText>
 				</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 styleClass="error-container" layout="block">
+				<p:message for="firstName" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="familyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
+					<p:outputLabel for="familyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FAMILY_NAME_REQUIRED}">
+					<p:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FAMILY_NAME_REQUIRED}">
 						<f:validator for="familyName" validatorId="NameValidator" />
-					</h:inputText>
+					</p:inputText>
 				</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 styleClass="error-container" layout="block">
+				<p:message for="familyName" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="street" value="#{msg.DATA_STREET_NAME}" />
+					<p:outputLabel for="street" value="#{msg.DATA_STREET_NAME}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{contactController.street}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_STREET_REQUIRED}">
+					<p:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{contactController.street}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_STREET_REQUIRED}">
 						<f:validator validatorId="NameValidator" />
-					</h:inputText>
+					</p:inputText>
 				</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 styleClass="error-container" layout="block">
+				<p:message for="street" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="houseNumber" value="#{msg.DATA_HOUSE_NUMBER}" />
+					<p:outputLabel for="houseNumber" value="#{msg.DATA_HOUSE_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_HOUSE_NUMBER_REQUIRED}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
+					<p:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_HOUSE_NUMBER_REQUIRED}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
 						<f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
-					</h:inputText>
+					</p: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 styleClass="error-container" layout="block">
+				<p:message for="houseNumber" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="houseNumberExtension" value="#{msg.DATA_HOUSE_NUMBER_EXTENSION}" />
+					<p:outputLabel for="houseNumberExtension" value="#{msg.DATA_HOUSE_NUMBER_EXTENSION}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{contactController.houseNumberExtension}" />
+					<p:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{contactController.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 styleClass="error-container" layout="block">
+				<p:message for="houseNumberExtension" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="zipCode" value="#{msg.DATA_ZIP_CODE}" />
+					<p:outputLabel for="zipCode" value="#{msg.DATA_ZIP_CODE}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{contactController.zipCode}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_ZIP_CODE_REQUIRED}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
+					<p:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{contactController.zipCode}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_ZIP_CODE_REQUIRED}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
 						<f:validateLongRange minimum="1" maximum="99999" />
-					</h:inputText>
+					</p: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 styleClass="error-container" layout="block">
+				<p:message for="zipCode" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="city" value="#{msg.DATA_CITY}" />
+					<p:outputLabel for="city" value="#{msg.DATA_CITY}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{contactController.city}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_CITY_REQUIRED}">
+					<p:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{contactController.city}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_CITY_REQUIRED}">
 						<f:validator validatorId="NameValidator" />
-					</h:inputText>
+					</p:inputText>
 				</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 styleClass="error-container" layout="block">
+					<p:message for="city" />
 				</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="birthday" value="#{msg.PERSONAL_DATA_BIRTHDAY}" />
+					<p:outputLabel for="birthday" value="#{msg.PERSONAL_DATA_BIRTHDAY}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="birthday" value="#{contactController.birthday}" required="true" size="10" requiredMessage="#{msg.GUEST_CONTACT_DATA_BIRTHDAY_REQUIRED}" converterMessage="#{msg.INVALID_BIRTHDAY}">
+					<p:inputText styleClass="input" id="birthday" value="#{contactController.birthday}" required="true" size="10" requiredMessage="#{msg.GUEST_CONTACT_DATA_BIRTHDAY_REQUIRED}" converterMessage="#{msg.INVALID_BIRTHDAY}">
 						<f:convertDateTime pattern="#{msg.BIRTHDAY_PATTERN}" />
-					</h:inputText>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
-				<h:panelGroup styleClass="error_container" layout="block">
-					<h:message for="birthday" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+				<h:panelGroup styleClass="error-container" layout="block">
+					<p:message for="birthday" />
 				</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="country" value="#{msg.PERSONAL_DATA_COUNTRY_CODE}" />
+					<p:outputLabel for="country" value="#{msg.PERSONAL_DATA_COUNTRY_CODE}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select" id="country" value="#{contactController.country}">
+					<p:selectOneMenu id="country" value="#{contactController.country}">
 						<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>
+					</p: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 styleClass="error-container" layout="block">
+					<p:message for="country" />
 				</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="landLineNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
+					<p:outputLabel for="landLineNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select divider-right" id="landLineCountry" value="#{contactController.landLineCountry}">
+					<p:selectOneMenu styleClass="select divider-right" id="landLineCountry" value="#{contactController.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>
+					</p:selectOneMenu>
 
-					<h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{contactController.landLineAreaCode}">
+					<p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{contactController.landLineAreaCode}">
 						<f:validator validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					</p:inputText>
 
-					<h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{contactController.landLineNumber}">
+					<p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{contactController.landLineNumber}">
 						<f:validator validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					</p: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 styleClass="error-container" layout="block">
+				<p:message for="landLineAreaCode" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="landLineNumber" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="faxNumber" value="#{msg.PERSONAL_DATA_FAX_NUMBER}" />
+					<p:outputLabel for="faxNumber" value="#{msg.PERSONAL_DATA_FAX_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{contactController.faxCountry}">
+					<p:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{contactController.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>
+					</p:selectOneMenu>
 
-					<h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
+					<p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
 						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					</p:inputText>
 
-					<h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{contactController.faxNumber}">
+					<p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{contactController.faxNumber}">
 						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					</p: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 styleClass="error-container" layout="block">
+				<p:message for="faxAreaCode" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="faxNumber" />
 			</h:panelGroup>
 
 			<widgets:outputMobileNumberTableRow targetController="#{contactController}" labelMessage="#{msg.PERSONAL_DATA_MOBILE_NUMBER}" />
diff --git a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
index b11e37df..da53f249 100644
--- a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
+++ b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
@@ -4,35 +4,35 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	>
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:panelGroup styleClass="table-row" layout="block">
 		<div class="table-left-medium">
-			<h:outputLabel for="emailAddress" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL}" />
+			<p:outputLabel for="emailAddress" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL}" />
 		</div>
 
 		<div class="table-right-medium">
-			<h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{contactController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+			<p:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{contactController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
 				<f:validator validatorId="EmailAddressValidator" />
-			</h:inputText>
+			</p:inputText>
 		</div>
 	</h:panelGroup>
 
-	<h:panelGroup styleClass="error_container" layout="block">
-		<h:message for="emailAddress" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+	<h:panelGroup styleClass="error-container" layout="block">
+		<p:message for="emailAddress" />
 	</h:panelGroup>
 
 	<h:panelGroup styleClass="table-row" layout="block">
 		<div class="table-left-medium">
-			<h:outputLabel for="emailAddressRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL_REPEAT}" />
+			<p:outputLabel for="emailAddressRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL_REPEAT}" />
 		</div>
 
 		<div class="table-right-medium">
-			<h:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
+			<p:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
 		</div>
 	</h:panelGroup>
 
-	<h:panelGroup styleClass="error_container" layout="block">
-		<h:message for="emailAddressRepeat" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+	<h:panelGroup styleClass="error-container" layout="block">
+		<p:message for="emailAddressRepeat" />
 	</h:panelGroup>
 </ui:composition>
diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl
index 93d6162a..9b65b317 100644
--- a/web/WEB-INF/templates/guest/guest_footer.tpl
+++ b/web/WEB-INF/templates/guest/guest_footer.tpl
@@ -3,35 +3,36 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<div class="footer">
 		<ul class="navbar-horizontal">
 			<li class="navlink-horizontal">
-				<h:link outcome="index" title="#{msg.LINK_GUEST_HOME_TITLE}" value="#{msg.LINK_GUEST_HOME}" />
+				<p:link outcome="index" title="#{msg.LINK_GUEST_HOME_TITLE}" value="#{msg.LINK_GUEST_HOME}" />
 			</li>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
 				<li class="navlink-horizontal">
-					<h:link outcome="user_resend_link" title="#{msg.LINK_GUEST_RESEND_LINK_TITLE}" value="#{msg.LINK_GUEST_RESEND_LINK}" />
+					<p:link outcome="user_resend_link" title="#{msg.LINK_GUEST_RESEND_LINK_TITLE}" value="#{msg.LINK_GUEST_RESEND_LINK}" />
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('imprint')}">
 				<li class="navlink-horizontal">
-					<h:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" />
+					<p:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" />
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('terms')}">
 				<li class="navlink-horizontal">
-					<h:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" />
+					<p:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" />
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('privacy')}">
 				<li class="navlink-horizontal">
-					<h:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" />
+					<p:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" />
 				</li>
 			</ui:fragment>
 
diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl
index 6410f8ff..90a009b4 100644
--- a/web/WEB-INF/templates/guest/guest_menu.tpl
+++ b/web/WEB-INF/templates/guest/guest_menu.tpl
@@ -3,7 +3,8 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<div class="menu_outer">
 		<h:panelGroup styleClass="menu" layout="block">
@@ -13,7 +14,7 @@
 
 			<ul>
 				<li>
-					<h:link title="#{msg.LINK_GUEST_HOME_TITLE}" outcome="index" value="#{msg.LINK_GUEST_HOME}" />
+					<p:link title="#{msg.LINK_GUEST_HOME_TITLE}" outcome="index" value="#{msg.LINK_GUEST_HOME}" />
 				</li>
 			</ul>
 
@@ -24,25 +25,25 @@
 			<ul>
 				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 					<li>
-						<h:link title="#{msg.LINK_GUEST_LOGIN_TITLE}" outcome="user_login" value="#{msg.LINK_GUEST_LOGIN}" />
+						<p:link title="#{msg.LINK_GUEST_LOGIN_TITLE}" outcome="user_login" value="#{msg.LINK_GUEST_LOGIN}" />
 					</li>
 				</ui:fragment>
 
 				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration')}">
 					<li>
-						<h:link title="#{msg.LINK_GUEST_REGISTER_TITLE}" outcome="user_register" value="#{msg.LINK_GUEST_REGISTER}" />
+						<p:link title="#{msg.LINK_GUEST_REGISTER_TITLE}" outcome="user_register" value="#{msg.LINK_GUEST_REGISTER}" />
 					</li>
 				</ui:fragment>
 
 				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
 					<li>
-						<h:link title="#{msg.LINK_GUEST_PASSWORD_TITLE}" outcome="user_lost_password" value="#{msg.LINK_GUEST_PASSWORD}" />
+						<p:link title="#{msg.LINK_GUEST_PASSWORD_TITLE}" outcome="user_lost_password" value="#{msg.LINK_GUEST_PASSWORD}" />
 					</li>
 				</ui:fragment>
 
 				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
 					<li>
-						<h:link title="#{msg.LINK_GUEST_RESEND_LINK_TITLE}" outcome="user_resend_link" value="#{msg.LINK_GUEST_RESEND_LINK}" />
+						<p:link title="#{msg.LINK_GUEST_RESEND_LINK_TITLE}" outcome="user_resend_link" value="#{msg.LINK_GUEST_RESEND_LINK}" />
 					</li>
 				</ui:fragment>
 			</ul>
diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
index ee73b84a..69651c92 100644
--- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
+++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
@@ -3,7 +3,8 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:panelGroup styleClass="para" layout="block">
 		<fieldset class="fieldset" id="terms_privacy">
@@ -13,42 +14,42 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left25">
-					<h:selectBooleanCheckbox styleClass="checkbox" id="privacy" required="true" requiredMessage="#{msg.PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE}">
+					<p:selectBooleanCheckbox id="privacy" required="true" requiredMessage="#{msg.PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE}">
 						<f:validator for="privacy" validatorId="PrivacyTermsCheckboxValidator" />
-					</h:selectBooleanCheckbox>
+					</p:selectBooleanCheckbox>
 				</div>
 
 				<div class="table-right75">
 					<!-- @TODO Find something better //-->
 					<h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_1}" />
 					<h:outputText value="&#160;" />
-					<h:link outcome="privacy" target="_blank" value="#{msg.LINK_GUEST_PRIVACY_STATEMENTS}" />
+					<p:link outcome="privacy" target="_blank" value="#{msg.LINK_GUEST_PRIVACY_STATEMENTS}" />
 					<h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2}" />
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="privacy" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="privacy" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left25">
-					<h:selectBooleanCheckbox styleClass="checkbox" id="terms" required="true" requiredMessage="#{msg.TERMS_NOT_ACCEPTED_MESSAGE}">
+					<p:selectBooleanCheckbox id="terms" required="true" requiredMessage="#{msg.TERMS_NOT_ACCEPTED_MESSAGE}">
 						<f:validator for="terms" validatorId="PrivacyTermsCheckboxValidator" />
-					</h:selectBooleanCheckbox>
+					</p:selectBooleanCheckbox>
 				</div>
 
 				<div class="table-right75">
 					<!-- @TODO Find something better //-->
 					<h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_1}" />
 					<h:outputText value="&#160;" />
-					<h:link outcome="terms" target="_blank" value="#{msg.LINK_GUEST_TERMS_CONDITIONS}" />
+					<p:link outcome="terms" target="_blank" value="#{msg.LINK_GUEST_TERMS_CONDITIONS}" />
 					<h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2}" />
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="terms" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="terms" />
 			</h:panelGroup>
 		</fieldset>
 	</h:panelGroup>
diff --git a/web/WEB-INF/templates/guest/user/guest_login_form.tpl b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
index 48a8a828..59511d9a 100644
--- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -3,7 +3,8 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:panelGroup id="user_login_content" layout="block" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 		<h:form id="form_user_login">
@@ -19,41 +20,41 @@
 
 					<h:panelGroup styleClass="table-row" layout="block">
 						<div class="table-left">
-							<h:outputLabel for="userName" value="#{msg.ENTER_USER_NAME}" />
+							<p:outputLabel for="userName" value="#{msg.ENTER_USER_NAME}" />
 						</div>
 
 						<div class="table-right">
-							<h:inputText styleClass="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
+							<p:inputText styleClass="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
 						</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 styleClass="error-container" layout="block">
+						<p:message for="userName" />
 					</h:panelGroup>
 
 					<h:panelGroup styleClass="table-row" layout="block">
 						<div class="table-left">
-							<h:outputLabel for="userPassword" value="#{msg.ENTER_PASSWORD}" />
+							<p:outputLabel for="userPassword" value="#{msg.ENTER_PASSWORD}" />
 						</div>
 
 						<div class="table-right">
-							<h:inputSecret styleClass="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
+							<p:inputText type="secret" styleClass="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
 						</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 styleClass="error-container" layout="block">
+						<p:message for="userPassword" />
 					</h:panelGroup>
 				</fieldset>
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
 
-		<h:panelGroup styleClass="error_container" layout="block" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}">
+		<h:panelGroup styleClass="error-container" layout="block" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}">
 			<h:outputText styleClass="alert-danger" value="#{msg.ERROR_GUEST_USER_NAME_REQUIRED_DISABLED}" />
 		</h:panelGroup>
 	</h:panelGroup>
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
index 003a8d22..cc803e85 100644
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
@@ -3,7 +3,8 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:form id="form_register_page1" rendered="#{featureController.isFeatureEnabled('user_registration')}">
 		<h:panelGroup styleClass="table table-medium" layout="block">
@@ -20,16 +21,16 @@
 					<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 						<h:panelGroup styleClass="table-row" layout="block">
 							<div class="table-left-medium">
-								<h:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
+								<p:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
 							</div>
 
 							<div class="table-right-medium">
-								<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
+								<p:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
 							</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 styleClass="error-container" layout="block">
+							<p:message for="userName" />
 						</h:panelGroup>
 					</ui:fragment>
 
@@ -40,30 +41,30 @@
 
 						<h:panelGroup styleClass="table-row" layout="block">
 							<div class="table-left-medium">
-								<h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
+								<p:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
 							</div>
 
 							<div class="table-right-medium">
-								<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_NOT_ENTERED}" />
+								<p:inputText type="secret" styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_NOT_ENTERED}" />
 							</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 styleClass="error-container" layout="block">
+							<p:message for="userPassword" />
 						</h:panelGroup>
 
 						<h:panelGroup styleClass="table-row" layout="block">
 							<div class="table-left-medium">
-								<h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
+								<p:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
 							</div>
 
 							<div class="table-right-medium">
-								<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED}" />
+								<p:inputText type="secret" styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED}" />
 							</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 styleClass="error-container" layout="block">
+							<p:message for="userPasswordRepeat" />
 						</h:panelGroup>
 
 						<div class="para notice">
@@ -84,8 +85,8 @@
 			<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
 			<div class="table-footer">
-				<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-				<h:commandButton styleClass="submit" type="submit" id="button_continue_register_page1" value="#{msg.BUTTON_CONTINUE_REGISTER_PAGE2}" action="#{userRegistrationController.doRegisterMultiPage1()}" />
+				<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<p:commandButton styleClass="submit" type="submit" id="button_continue_register_page1" value="#{msg.BUTTON_CONTINUE_REGISTER_PAGE2}" action="#{userRegistrationController.doRegisterMultiPage1()}" />
 			</div>
 		</h:panelGroup>
 	</h:form>
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
index eecb4942..547442b8 100644
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
@@ -3,7 +3,8 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:form id="form_register_page2" rendered="#{featureController.isFeatureEnabled('user_registration')}">
 		<h:panelGroup styleClass="table table-medium" layout="block">
@@ -14,8 +15,8 @@
 			<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
 
 			<div class="table-footer">
-				<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-				<h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{userRegistrationController.doFinishRegistration()}" />
+				<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<p:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{userRegistrationController.doFinishRegistration()}" />
 			</div>
 		</h:panelGroup>
 	</h:form>
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
index 832c0a41..6dff4156 100644
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
@@ -3,7 +3,8 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:form id="form_register_single" rendered="#{featureController.isFeatureEnabled('user_registration')}">
 		<h:panelGroup styleClass="table table-medium" layout="block">
@@ -22,16 +23,16 @@
 					<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 						<h:panelGroup styleClass="table-row" layout="block">
 							<div class="table-left">
-								<h:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
+								<p:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
 							</div>
 
 							<div class="table-right">
-								<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
+								<p:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
 							</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 styleClass="error-container" layout="block">
+							<p:message for="userName" />
 						</h:panelGroup>
 					</ui:fragment>
 
@@ -42,30 +43,30 @@
 
 						<h:panelGroup styleClass="table-row" layout="block">
 							<div class="table-left">
-								<h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
+								<p:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
 							</div>
 
 							<div class="table-right">
-								<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" />
+								<p:inputText type="secret" styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.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 styleClass="error-container" layout="block">
+							<p:message for="userPassword" />
 						</h:panelGroup>
 
 						<h:panelGroup styleClass="table-row" layout="block">
 							<div class="table-left">
-								<h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
+								<p:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
 							</div>
 
 							<div class="table-right">
-								<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" />
+								<p:inputText type="secret" styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.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 styleClass="error-container" layout="block">
+							<p:message for="userPasswordRepeat" />
 						</h:panelGroup>
 
 						<div class="para notice">
@@ -88,8 +89,8 @@
 			<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
 			<div class="table-footer">
-				<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-				<h:commandButton styleClass="submit" type="submit" id="button_finish_registration_single" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{userRegistrationController.doFinishRegistration()}" />
+				<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<p:commandButton styleClass="submit" type="submit" id="button_finish_registration_single" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{userRegistrationController.doFinishRegistration()}" />
 			</div>
 		</h:panelGroup>
 	</h:form>
diff --git a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
index f57c93e3..1ba2c6ea 100644
--- a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
+++ b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
@@ -4,35 +4,36 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	>
+
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:panelGroup styleClass="table-row" layout="block">
 		<div class="table-left">
-			<h:outputLabel for="emailAddress" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL}" />
+			<p:outputLabel for="emailAddress" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL}" />
 		</div>
 
 		<div class="table-right">
-			<h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{userEmailChangeController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+			<p:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{userEmailChangeController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
 				<f:validator validatorId="EmailAddressValidator" />
-			</h:inputText>
+			</p:inputText>
 		</div>
 	</h:panelGroup>
 
-	<h:panelGroup styleClass="error_container" layout="block">
-		<h:message for="emailAddress" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+	<h:panelGroup styleClass="error-container" layout="block">
+		<p:message for="emailAddress" />
 	</h:panelGroup>
 
 	<h:panelGroup styleClass="table-row" layout="block">
 		<div class="table-left">
-			<h:outputLabel for="emailAddressRepeat" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL_REPEAT}" />
+			<p:outputLabel for="emailAddressRepeat" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL_REPEAT}" />
 		</div>
 
 		<div class="table-right">
-			<h:inputText class="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{userEmailChangeController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
+			<p:inputText class="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{userEmailChangeController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
 		</div>
 	</h:panelGroup>
 
-	<h:panelGroup styleClass="error_container" layout="block">
-		<h:message for="emailAddressRepeat" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+	<h:panelGroup styleClass="error-container" layout="block">
+		<p:message for="emailAddressRepeat" />
 	</h:panelGroup>
 </ui:composition>
diff --git a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
index 1a630826..c4947264 100644
--- a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
+++ b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
@@ -3,7 +3,8 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:panelGroup styleClass="para" layout="block">
 		<fieldset class="fieldset" id="current_password">
@@ -13,18 +14,18 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left">
-					<h:outputLabel for="currentPassword" value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM}" />
+					<p:outputLabel for="currentPassword" value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM}" />
 				</div>
 
 				<div class="table-right">
-					<h:inputSecret styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.userCurrentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
+					<p:inputText type="secret" styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.userCurrentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
 						<!-- <f:validator for="currentPassword" validatorId="FinancialsUserPasswordValidator" /> //-->
-					</h:inputSecret>
+					</p:inputText>
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="currentPassword" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="currentPassword" />
 			</h:panelGroup>
 		</fieldset>
 	</h:panelGroup>
diff --git a/web/WEB-INF/templates/login/user/user_footer.tpl b/web/WEB-INF/templates/login/user/user_footer.tpl
index 60fb57dd..88814c25 100644
--- a/web/WEB-INF/templates/login/user/user_footer.tpl
+++ b/web/WEB-INF/templates/login/user/user_footer.tpl
@@ -3,29 +3,30 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<div class="footer">
 		<ul class="navbar-horizontal">
 			<li class="navlink-horizontal">
-				<h:link outcome="login_index" title="#{msg.LINK_LOGIN_HOME_TITLE}" value="#{msg.LINK_LOGIN_HOME}" />
+				<p:link outcome="login_index" title="#{msg.LINK_LOGIN_HOME_TITLE}" value="#{msg.LINK_LOGIN_HOME}" />
 			</li>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('imprint')}">
 				<li class="navlink-horizontal">
-					<h:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" />
+					<p:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" />
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('terms')}">
 				<li class="navlink-horizontal">
-					<h:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" />
+					<p:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" />
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('privacy')}">
 				<li class="navlink-horizontal">
-					<h:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" />
+					<p:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" />
 				</li>
 			</ui:fragment>
 
diff --git a/web/WEB-INF/templates/login/user/user_menu.tpl b/web/WEB-INF/templates/login/user/user_menu.tpl
index bda47989..b29e1adb 100644
--- a/web/WEB-INF/templates/login/user/user_menu.tpl
+++ b/web/WEB-INF/templates/login/user/user_menu.tpl
@@ -3,7 +3,8 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<div class="menu_outer">
 		<h:panelGroup styleClass="menu" layout="block">
@@ -13,16 +14,16 @@
 
 			<ul>
 				<li>
-					<h:link title="#{msg.LINK_LOGIN_HOME_TITLE}" outcome="user_index" value="#{msg.LINK_LOGIN_HOME}" />
+					<p:link title="#{msg.LINK_LOGIN_HOME_TITLE}" outcome="user_index" value="#{msg.LINK_LOGIN_HOME}" />
 				</li>
 
 				<li>
-					<h:link title="#{msg.LINK_USER_LIST_TITLE}" outcome="user_list" value="#{msg.LINK_USER_LIST}" />
+					<p:link title="#{msg.LINK_USER_LIST_TITLE}" outcome="user_list" value="#{msg.LINK_USER_LIST}" />
 				</li>
 
 				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_list')}">
 					<li>
-						<h:link title="#{msg.LINK_USER_LIST_TITLE}" outcome="user_list" value="#{msg.LINK_USER_LIST}" />
+						<p:link title="#{msg.LINK_USER_LIST_TITLE}" outcome="user_list" value="#{msg.LINK_USER_LIST}" />
 					</li>
 				</ui:fragment>
 			</ul>
@@ -35,19 +36,19 @@
 				<ul>
 					<ui:fragment rendered="#{featureController.isFeatureEnabled('change_user_personal_data')}">
 						<li>
-							<h:link title="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_change_personal_data" value="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA}" />
+							<p:link title="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_change_personal_data" value="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA}" />
 						</li>
 					</ui:fragment>
 
 					<ui:fragment rendered="#{featureController.isFeatureEnabled('user_change_email_address')}">
 						<li>
-							<h:link title="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_change_email_address" value="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
+							<p:link title="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_change_email_address" value="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
 						</li>
 					</ui:fragment>
 
 					<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword() or featureController.isFeatureEnabled('change_user_password')}">
 						<li>
-							<h:link title="#{msg.LINK_LOGIN_CHANGE_PASSWORD_TITLE}" outcome="user_change_password" value="#{msg.LINK_LOGIN_CHANGE_PASSWORD}" />
+							<p:link title="#{msg.LINK_LOGIN_CHANGE_PASSWORD_TITLE}" outcome="user_change_password" value="#{msg.LINK_LOGIN_CHANGE_PASSWORD}" />
 						</li>
 					</ui:fragment>
 				</ul>
@@ -59,7 +60,7 @@
 
 			<ul>
 				<li>
-					<h:link title="#{msg.LINK_LOGIN_ALL_APPLICATIONS_TITLE}" outcome="user_all_applications" value="#{msg.LINK_LOGIN_ALL_APPLICATIONS}" />
+					<p:link title="#{msg.LINK_LOGIN_ALL_APPLICATIONS_TITLE}" outcome="user_all_applications" value="#{msg.LINK_LOGIN_ALL_APPLICATIONS}" />
 				</li>
 			</ul>
 
@@ -69,11 +70,11 @@
 
 			<ul>
 				<li>
-					<h:link title="#{msg.LINK_GUEST_HOME_TITLE}" outcome="index" value="#{msg.LINK_GUEST_HOME}" />
+					<p:link title="#{msg.LINK_GUEST_HOME_TITLE}" outcome="index" value="#{msg.LINK_GUEST_HOME}" />
 				</li>
 
 				<li>
-					<h:link title="#{msg.LINK_CLOSE_SESSION_TITLE}" outcome="logout" value="#{msg.LINK_CLOSE_SESSION}" />
+					<p:link title="#{msg.LINK_CLOSE_SESSION_TITLE}" outcome="logout" value="#{msg.LINK_CLOSE_SESSION}" />
 				</li>
 			</ul>
 		</h:panelGroup>
diff --git a/web/WEB-INF/templates/user/userid_error.tpl b/web/WEB-INF/templates/user/userid_error.tpl
index 1e3c4082..9bd37bc6 100644
--- a/web/WEB-INF/templates/user/userid_error.tpl
+++ b/web/WEB-INF/templates/user/userid_error.tpl
@@ -3,7 +3,8 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:panelGroup styleClass="table" layout="block">
 		<div class="table-header">
@@ -11,7 +12,7 @@
 		</div>
 
 		<div class="para">
-			<h:messages errorClass="alert-danger" fatalClass="alert-danger" infoClass="infos" warnClass="alert-warning" showDetail="true" />
+			<p:messages autoUpdate="true" redisplay="false" showDetail="true" />
 		</div>
 	</h:panelGroup>
 </ui:composition>
diff --git a/web/WEB-INF/templates/widgets/locale_change_widget.tpl b/web/WEB-INF/templates/widgets/locale_change_widget.tpl
index c4b41bc6..e883f74d 100644
--- a/web/WEB-INF/templates/widgets/locale_change_widget.tpl
+++ b/web/WEB-INF/templates/widgets/locale_change_widget.tpl
@@ -3,18 +3,19 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui">
 
 	<h:form>
 		<h:panelGroup layout="block" styleClass="locale_selection_container">
 			<h:panelGroup layout="block">
-				<h:selectOneMenu styleClass="select" value="#{localizationController.localeCode}" onchange="submit()">
+				<p:selectOneMenu value="#{localizationController.localeCode}" onchange="submit()">
 					<f:selectItem itemLabel="#{msg.SELECT_LANGUAGE}" noSelectionOption="true" itemDisabled="true" />
 					<f:selectItems value="#{localizationController.supportedLocales}" var="locale" itemValue="#{locale}" itemLabel="#{msg[locale.toString().toUpperCase()]}" />
-				</h:selectOneMenu>
+				</p:selectOneMenu>
 			</h:panelGroup>
 
-			<h:commandButton styleClass="submit" type="submit" action="#{localizationController.doChangeLocale()}" value="#{msg.BUTTON_CHANGE_LOCALE}" title="#{msg.BUTTON_CHANGE_LOCALE_TITLE}" />
+			<p:commandButton styleClass="submit" type="submit" actionListener="#{localizationController.doChangeLocale()}" value="#{msg.BUTTON_CHANGE_LOCALE}" title="#{msg.BUTTON_CHANGE_LOCALE_TITLE}" />
 		</h:panelGroup>
 	</h:form>
 </ui:composition>
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 98120891..b05f1338 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -2,6 +2,26 @@
 <web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
     <description>An application to handle all your receipts and do some calculation with it.</description>
     <display-name>JFinancials Application v1.0</display-name>
+    <context-param>
+        <description>Name of this project.</description>
+        <param-name>project_title</param-name>
+        <param-value>JFinancials</param-value>
+    </context-param>
+    <context-param>
+        <description>Primefaces theme</description>
+        <param-name>primefaces.THEME</param-name>
+        <param-value>bootstrap</param-value>
+    </context-param>
+    <context-param>
+        <description>Refresh perioid</description>
+        <param-name>javax.faces.FACELETS_REFRESH_PERIOD</param-name>
+        <param-value>-1</param-value>
+    </context-param>
+    <context-param>
+        <description>State saving method</description>
+        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+        <param-value>client</param-value>
+    </context-param>
     <context-param>
         <description>Development mode for WELD, keep disabled unless really needed. Currently it messes up the website.</description>
         <param-name>org.jboss.weld.development</param-name>
diff --git a/web/WEB-INF/widgets.jsf.taglib.xml b/web/WEB-INF/widgets.jsf.taglib.xml
index e6704a5e..9982d9ce 100644
--- a/web/WEB-INF/widgets.jsf.taglib.xml
+++ b/web/WEB-INF/widgets.jsf.taglib.xml
@@ -30,6 +30,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 			<required>true</required>
 			<type>java.lang.String</type>
 		</attribute>
+		<attribute>
+			<name>id</name>
+			<description>Id of the JSF component.</description>
+			<required>false</required>
+			<type>java.lang.String</type>
+		</attribute>
 		<attribute>
 			<name>rendered</name>
 			<description>Whether this tag is being rendered by JSF engine.</description>
diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml
index d385e3b8..7393774d 100644
--- a/web/admin/admin_logout.xhtml
+++ b/web/admin/admin_logout.xhtml
@@ -3,7 +3,8 @@
 				xmlns="http://www.w3.org/1999/xhtml"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOGOUT}" />
@@ -25,7 +26,7 @@
 				</h:panelGroup>
 
 				<div class="table-footer">
-					<h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doAdminLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
+					<p:commandButton styleClass="submit" type="submit" action="#{userLoginController.doAdminLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/basic_company_data/admin_basic_company_data_list.xhtml b/web/admin/basic_company_data/admin_basic_company_data_list.xhtml
index 422a93d3..4c703de9 100644
--- a/web/admin/basic_company_data/admin_basic_company_data_list.xhtml
+++ b/web/admin/basic_company_data/admin_basic_company_data_list.xhtml
@@ -5,7 +5,8 @@
 				xmlns:links="http://mxchange.org/jsf/core/links"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_BASIC_COMPANY_DATA}" />
@@ -16,34 +17,32 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ADMIN_BASIC_COMPANY_DATA_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{basicDataController.allCompanyBasicData().isEmpty()}" />
-
-		<h:dataTable id="table_list_basic_company_data" var="basicData" value="#{basicDataController.allCompanyBasicData()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BASIC_COMPANY_DATA}" rendered="#{not basicDataController.allCompanyBasicData().isEmpty()}">
-			<h:column>
+		<p:dataTable id="table_list_basic_company_data" var="basicData" value="#{basicDataController.allCompanyBasicData()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BASIC_COMPANY_DATA}" emptyMessage="#{msg.ADMIN_BASIC_COMPANY_DATA_LIST_EMPTY}">
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_ID}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_basic_data" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE}" value="#{basicData.basicDataId}">
+				<p:link outcome="admin_show_basic_data" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE}" value="#{basicData.basicDataId}">
 					<f:param name="basicDataId" value="#{basicData.basicDataId}" />
-				</h:link>
-			</h:column>
+				</p:link>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_ASSIGNED_USER_ID}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_OWNER_USER_TITLE}" value="#{basicData.companyUserOwner.userId}" rendered="#{not empty basicData.companyUserOwner}">
+				<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_OWNER_USER_TITLE}" value="#{basicData.companyUserOwner.userId}" rendered="#{not empty basicData.companyUserOwner}">
 					<f:param name="userId" value="#{basicData.companyUserOwner.userId}" />
-				</h:link>
+				</p:link>
 
-				<h:link outcome="admin_assign_basic_company_data_owner" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty basicData.companyUserOwner}">
+				<p:link outcome="admin_assign_basic_company_data_owner" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty basicData.companyUserOwner}">
 					<f:param name="basicDataId" value="#{basicData.basicDataId}" />
-				</h:link>
-			</h:column>
+				</p:link>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" />
 				</f:facet>
@@ -53,37 +52,37 @@
 				</h:outputLink>
 
 				<h:outputText value="#{basicData.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty basicData.companyWebsiteUrl}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_CONTACT_PERSON}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE}" value="#{basicData.companyContactEmployee.employeeId}" rendered="#{not empty basicData.companyContactEmployee}">
+				<p:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE}" value="#{basicData.companyContactEmployee.employeeId}" rendered="#{not empty basicData.companyContactEmployee}">
 					<f:param name="employeeId" value="#{basicData.companyContactEmployee.employeeId}" />
-				</h:link>
+				</p:link>
 
-				<h:link outcome="admin_assign_basic_company_data_employee" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON}" rendered="#{empty basicData.companyContactEmployee}">
+				<p:link outcome="admin_assign_basic_company_data_employee" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON}" rendered="#{empty basicData.companyContactEmployee}">
 					<f:param name="basicDataId" value="#{basicData.basicDataId}" />
-				</h:link>
-			</h:column>
+				</p:link>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_FOUNDER}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE}" value="#{basicData.companyFounder.employeeId}" rendered="#{not empty basicData.companyFounder}">
+				<p:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE}" value="#{basicData.companyFounder.employeeId}" rendered="#{not empty basicData.companyFounder}">
 					<f:param name="employeeId" value="#{basicData.companyFounder.employeeId}" />
-				</h:link>
+				</p:link>
 
-				<h:link outcome="admin_assign_basic_company_data_contact" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty basicData.companyFounder}">
+				<p:link outcome="admin_assign_basic_company_data_contact" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty basicData.companyFounder}">
 					<f:param name="basicDataId" value="#{basicData.basicDataId}" />
-				</h:link>
-			</h:column>
+				</p:link>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_CREATED}" />
 				</f:facet>
@@ -91,16 +90,16 @@
 				<h:outputText id="companyCreated" value="#{basicData.companyCreated.time}">
 					<f:convertDateTime for="companyCreated" type="both" timeStyle="short" dateStyle="short" />
 				</h:outputText>
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
 				</f:facet>
 
 				<links:outputBasicDataAdminMiniLinks basicData="#{basicData}" />
-			</h:column>
-		</h:dataTable>
+			</p:column>
+		</p:dataTable>
 
 		<h:form id="form_admin_add_basic_company_data">
 			<h:panelGroup styleClass="table table-medium" layout="block">
@@ -115,8 +114,8 @@
 				<ui:include src="/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl" />
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="submit" type="submit" id="button_add_basic_company_data" value="#{msg.BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON}" action="#{adminCompanyDataController.addBusinessBasicData()}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="submit" type="submit" id="button_add_basic_company_data" value="#{msg.BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON}" action="#{adminCompanyDataController.addBusinessBasicData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/branch_offices/admin_branch_offices_list.xhtml b/web/admin/branch_offices/admin_branch_offices_list.xhtml
index 65fcb64b..d2848535 100644
--- a/web/admin/branch_offices/admin_branch_offices_list.xhtml
+++ b/web/admin/branch_offices/admin_branch_offices_list.xhtml
@@ -5,7 +5,8 @@
 				xmlns:links="http://mxchange.org/jsf/core/links"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_BRANCH_OFFICES}" />
@@ -16,34 +17,32 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ADMIN_BRANCH_OFFICES_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{branchOfficeController.allBranchOffices().isEmpty()}" />
-
-		<h:dataTable id="table_list_branch_offices" var="branchOffice" value="#{branchOfficeController.allBranchOffices()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BRANCH_OFFICES}" rendered="#{not branchOfficeController.allBranchOffices().isEmpty()}">
-			<h:column>
+		<p:dataTable id="table_list_branch_offices" var="branchOffice" value="#{branchOfficeController.allBranchOffices()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BRANCH_OFFICES}" emptyMessage="#{msg.ADMIN_BRANCH_OFFICES_LIST_EMPTY}">
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{branchOffice.branchId}">
+				<p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{branchOffice.branchId}">
 					<f:param name="branchId" value="#{branchOffice.branchId}" />
-				</h:link>
-			</h:column>
+				</p:link>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_ASSIGNED_USER_ID}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{branchOffice.branchUserOwner.userId}" rendered="#{not empty branchOffice.branchUserOwner}">
+				<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{branchOffice.branchUserOwner.userId}" rendered="#{not empty branchOffice.branchUserOwner}">
 					<f:param name="userId" value="#{branchOffice.branchUserOwner.userId}" />
-				</h:link>
+				</p:link>
 
-				<h:link outcome="admin_assign_branch_office_owner" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchUserOwner}">
+				<p:link outcome="admin_assign_branch_office_owner" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchUserOwner}">
 					<f:param name="branchId" value="#{branchOffice.branchId}" />
-				</h:link>
-			</h:column>
+				</p:link>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" />
 				</f:facet>
@@ -53,9 +52,9 @@
 				</h:outputLink>
 
 				<h:outputText value="#{branchOffice.branchCompany.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty branchOffice.branchCompany.companyWebsiteUrl}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.DATA_EMAIL_ADDRESS}" />
 				</f:facet>
@@ -63,31 +62,31 @@
 				<h:outputLink value="mailto:#{branchOffice.branchEmailAddress}" rendered="#{not empty branchOffice.branchEmailAddress}" />
 
 				<h:outputText value="#{msg.NO_EMAIL_ADDRESS_ENTERED}" rendered="#{empty branchOffice.branchEmailAddress}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.DATA_ADDRESS}" />
 				</f:facet>
 
 				<h:outputText value="#{branchOffice.branchZipCode} #{branchOffice.branchCity}" title="#{branchOffice.branchStreet} #{branchOffice.branchHouseNumber} (#{msg.DATA_STORE} #{branchOffice.branchStore}, #{msg.DATA_SUITE_NUMBER} #{branchOffice.branchSuiteNumber})" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_CONTACT_PERSON}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICES_CONTACT_PERSON_TITLE}" value="#{branchOffice.branchContactEmployee.employeeId}" rendered="#{not empty branchOffice.branchContactEmployee}">
+				<p:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICES_CONTACT_PERSON_TITLE}" value="#{branchOffice.branchContactEmployee.employeeId}" rendered="#{not empty branchOffice.branchContactEmployee}">
 					<f:param name="employeeId" value="#{branchOffice.branchContactEmployee.employeeId}" />
-				</h:link>
+				</p:link>
 
-				<h:link outcome="admin_assign_branch_office_employee" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchContactEmployee}">
+				<p:link outcome="admin_assign_branch_office_employee" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchContactEmployee}">
 					<f:param name="branchId" value="#{branchOffice.branchId}" />
-				</h:link>
-			</h:column>
+				</p:link>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_ENTRY_CREATED}" />
 				</f:facet>
@@ -95,16 +94,16 @@
 				<h:outputText id="branchCreated" value="#{branchOffice.branchCreated.time}">
 					<f:convertDateTime for="branchCreated" type="both" timeStyle="short" dateStyle="short" />
 				</h:outputText>
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
 				</f:facet>
 
 				<links:outputBranchOfficeAdminMiniLinks branchOffice="#{branchOffice}" />
-			</h:column>
-		</h:dataTable>
+			</p:column>
+		</p:dataTable>
 
 		<h:form id="form_admin_add_branch_office">
 			<h:panelGroup styleClass="table table-medium" layout="block">
@@ -119,8 +118,8 @@
 				<ui:include src="/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl" />
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="submit" type="submit" id="button_add_branch_office" value="#{msg.BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON}" action="#{adminBranchOfficeController.addBranchOffice()}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="submit" type="submit" id="button_add_branch_office" value="#{msg.BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON}" action="#{adminBranchOfficeController.addBranchOffice()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index edf78955..e7da3c35 100644
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -39,8 +40,8 @@
 				<ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="button-danger" type="submit" id="button_delete_contact" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="button-danger" type="submit" id="button_delete_contact" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index c431e5f4..2da7121c 100644
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -39,8 +40,8 @@
 				<widgets:outputAdminContactDataFormFields />
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="submit" type="submit" id="button_edit_contact" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="submit" type="submit" id="button_edit_contact" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index 2a5685a3..e534c5a7 100644
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -16,18 +16,16 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ADMIN_CONTACT_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{contactController.allContacts().isEmpty()}" />
-
 		<h:form id="form_export_contacts" rendered="#{not contactController.allContacts().isEmpty()}">
-			<p:dataTable id="table_export_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}">
+			<p:dataTable id="table_export_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table table-full" paginator="true" rows="10" emptyMessage="#{msg.ADMIN_CONTACT_LIST_EMPTY}" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}">
 				<p:column exportable="false">
 					<f:facet name="header">
 						<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ID}" />
 					</f:facet>
 
-					<h:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
+					<p:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
 						<f:param name="contactId" value="#{contact.contactId}" />
-					</h:link>
+					</p:link>
 				</p:column>
 
 				<p:column>
@@ -165,9 +163,9 @@
 				</div>
 
 				<div class="table-footer">
-					<h:commandButton styleClass="submit" type="submit" id="button_export_contacts_xls" value="#{msg.BUTTON_ADMIN_EXPORT_CONTACTS_XLS}">
+					<p:commandButton styleClass="submit" type="submit" id="button_export_contacts_xls" value="#{msg.BUTTON_ADMIN_EXPORT_CONTACTS_XLS}">
 						<p:dataExporter type="xls" target="table_export_contacts" fileName="all_contacts" />
-					</h:commandButton>
+					</p:commandButton>
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index 286769a3..855fdc21 100644
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -5,7 +5,8 @@
 				xmlns:links="http://mxchange.org/jsf/core/links"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT}" />
@@ -16,52 +17,50 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ADMIN_CONTACT_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{contactController.allContacts().isEmpty()}" />
-
-		<h:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" rendered="#{not contactController.allContacts().isEmpty()}">
-			<h:column>
+		<p:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" emptyMessage="#{msg.ADMIN_CONTACT_LIST_EMPTY}">
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_CONTACT_ID}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
+				<p:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
 					<f:param name="contactId" value="#{contact.contactId}" />
-				</h:link>
-			</h:column>
+				</p:link>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 				</f:facet>
 
 				<h:outputText value="#{msg[contact.contactPersonalTitle.messageKey]}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 				</f:facet>
 
 				<h:outputText value="#{contact.contactFirstName}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 				</f:facet>
 
 				<h:outputText value="#{contact.contactFamilyName}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_CONTACT_USAGE}" />
 				</f:facet>
 
 				<h:outputText value="#{msg[beanHelper.getContactUsageMessageKey(contact)]}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_ENTRY_CREATED}" />
 				</f:facet>
@@ -69,16 +68,16 @@
 				<h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
 					<f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
 				</h:outputText>
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
 				</f:facet>
 
 				<links:outputContactAdminMiniLinks contact="#{contact}" />
-			</h:column>
-		</h:dataTable>
+			</p:column>
+		</p:dataTable>
 
 		<h:form id="form_admin_add_contact">
 			<h:panelGroup styleClass="table table-medium" layout="block">
@@ -93,8 +92,8 @@
 				<widgets:outputAdminContactDataFormFields />
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="submit" type="submit" id="button_add_contact" value="#{msg.BUTTON_ADMIN_ADD_CONTACT}" action="#{adminContactController.addContact()}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="submit" type="submit" id="button_add_contact" value="#{msg.BUTTON_ADMIN_ADD_CONTACT}" action="#{adminContactController.addContact()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index ea9d0a86..20b436de 100644
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -39,9 +40,9 @@
 				</div>
 
 				<div class="para">
-					<h:link outcome="admin_show_contact" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
+					<p:link outcome="admin_show_contact" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
 						<f:param name="contactId" value="#{adminContactPhoneController.contact.contactId}" />
-					</h:link>
+					</p:link>
 				</div>
 
 				<div class="para">
@@ -49,7 +50,7 @@
 				</div>
 
 				<div class="table-footer">
-					<h:commandButton styleClass="button-warning" type="submit" id="button_unlink_fax" value="#{msg.BUTTON_ADMIN_UNLINK_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkFaxContactData()}" />
+					<p:commandButton styleClass="button-warning" type="submit" id="button_unlink_fax" value="#{msg.BUTTON_ADMIN_UNLINK_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkFaxContactData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index 2e51f891..1c7b629f 100644
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -37,9 +38,9 @@
 				</div>
 
 				<div class="para">
-					<h:link outcome="admin_show_contact" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
+					<p:link outcome="admin_show_contact" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
 						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-					</h:link>
+					</p:link>
 				</div>
 
 				<div class="para">
@@ -47,7 +48,7 @@
 				</div>
 
 				<div class="table-footer">
-					<h:commandButton styleClass="button-warning" type="submit" id="button_unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkLandLineContactData()}" />
+					<p:commandButton styleClass="button-warning" type="submit" id="button_unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkLandLineContactData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index 9e532fd6..1fe61ff9 100644
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -37,9 +38,9 @@
 				</div>
 
 				<div class="para">
-					<h:link outcome="admin_show_contact" title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
+					<p:link outcome="admin_show_contact" title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
 						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-					</h:link>
+					</p:link>
 				</div>
 
 				<div class="para">
@@ -47,7 +48,7 @@
 				</div>
 
 				<div class="table-footer">
-					<h:commandButton styleClass="button-warning" type="submit" id="button_unlink_mobile" value="#{msg.BUTTON_ADMIN_UNLINK_MOBILE_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
+					<p:commandButton styleClass="button-warning" type="submit" id="button_unlink_mobile" value="#{msg.BUTTON_ADMIN_UNLINK_MOBILE_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
index 353859b1..2de78e11 100644
--- a/web/admin/country/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -4,7 +4,8 @@
 				xmlns:links="http://mxchange.org/jsf/core/links"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY}" />
@@ -15,49 +16,49 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:dataTable id="table_list_countries" var="country" value="#{countryController.allCountries()}" styleClass="table table-medium" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" rendered="#{not countryController.allCountries().isEmpty()}">
-			<h:column>
+		<p:dataTable id="table_list_countries" var="country" value="#{countryController.allCountries()}" tableStyleClass="table table-medium" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" emptyMessage="#{msg.ADMIN_COUNTRY_LIST_EMPTY}">
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
 				</f:facet>
 
-				<h:link outcome="admin_edit_country" title="#{msg.ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE}" value="#{country.countryId}">
+				<p:link outcome="admin_show_country" title="#{msg.ADMIN_LINK_SHOW_COUNTRY_TITLE}" value="#{country.countryId}">
 					<f:param name="countryId" value="#{country.countryId}" />
-				</h:link>
-			</h:column>
+				</p:link>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE}" />
 				</f:facet>
 
 				<h:outputText value="#{country.countryCode}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
 				</f:facet>
 
 				<h:outputText value="#{country.countryExternalDialPrefix}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME}" />
 				</f:facet>
 
 				<h:outputText value="#{msg[country.countryI18nKey]}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
 				</f:facet>
 
 				<links:outputCountryAdminMiniLinks country="#{country}" />
-			</h:column>
-		</h:dataTable>
+			</p:column>
+		</p:dataTable>
 
 		<h:form id="form_add_country">
 			<h:panelGroup styleClass="table table-medium" layout="block">
@@ -68,8 +69,8 @@
 				<ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="submit" type="submit" id="button_add_country" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="submit" type="submit" id="button_add_country" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
 				</div>
 			</h:panelGroup>
 
diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index 78438eb2..76768ec8 100644
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -39,7 +40,7 @@
 				</div>
 
 				<div class="table-footer">
-					<h:commandButton styleClass="button-danger" type="submit" id="button_delete_fax" value="#{msg.BUTTON_ADMIN_DELETE_FAX}" action="#{adminPhoneController.deleteFaxData()}" />
+					<p:commandButton styleClass="button-danger" type="submit" id="button_delete_fax" value="#{msg.BUTTON_ADMIN_DELETE_FAX}" action="#{adminPhoneController.deleteFaxData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index 193de64c..9b95c3e3 100644
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_edit.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -35,8 +36,8 @@
 				<widgets:outputAdminFaxDataFormFields faxNumber="#{beanHelper.faxNumber}" />
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="submit" type="submit" id="button_edit_fax" value="#{msg.BUTTON_ADMIN_EDIT_FAX_NUMBER}" action="#{adminPhoneController.doChangeFaxNumber()}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="submit" type="submit" id="button_edit_fax" value="#{msg.BUTTON_ADMIN_EDIT_FAX_NUMBER}" action="#{adminPhoneController.doChangeFaxNumber()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml
index e4fc9ecf..325e20c3 100644
--- a/web/admin/fax/admin_fax_list.xhtml
+++ b/web/admin/fax/admin_fax_list.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_FAX_NUMBER}" />
@@ -15,26 +16,26 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:dataTable id="table_list_fax" var="faxNumber" value="#{phoneController.allFaxNumbers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_FAXS}" rendered="#{not phoneController.allFaxNumbers().isEmpty()}">
-			<h:column>
+		<p:dataTable id="table_list_fax" var="faxNumber" value="#{phoneController.allFaxNumbers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_FAXS}" emptyMessage="#{msg.ADMIN_FAX_NUMBER_LIST_EMPTY}">
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_fax" value="#{faxNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}">
+				<p:link outcome="admin_show_fax" value="#{faxNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}">
 					<f:param name="phoneId" value="#{faxNumber.phoneId}" />
-				</h:link>
-			</h:column>
+				</p:link>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
-					<h:outputLabel for="faxNumber" value="#{msg.ADMIN_SHOW_PHONE_NUMBER}" />
+					<p:outputLabel for="faxNumber" value="#{msg.ADMIN_SHOW_PHONE_NUMBER}" />
 				</f:facet>
 
 				<h:outputText id="faxNumber" value="#{faxNumber.phoneCountry.countryAbroadDialPrefix}#{faxNumber.phoneCountry.countryPhoneCode} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
 				</f:facet>
@@ -42,9 +43,9 @@
 				<h:outputText value="#{faxNumber.phoneEntryCreated.time}">
 					<f:convertDateTime type="both" />
 				</h:outputText>
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
 				</f:facet>
@@ -52,9 +53,7 @@
 				<h:outputText value="#{faxNumber.phoneEntryUpdated.time}">
 					<f:convertDateTime type="both" />
 				</h:outputText>
-			</h:column>
-		</h:dataTable>
-
-		<widgets:outputMessageBox message="#{msg.ADMIN_LIST_FAX_NUMBER_EMPTY}" messageStyleClass="alert-danger" rendered="#{phoneController.allFaxNumbers().isEmpty()}" />
+			</p:column>
+		</p:dataTable>
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index 56886416..70570c4e 100644
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -24,68 +25,68 @@
 	<ui:define name="content">
 		<widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" />
 
-		<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">
+		<p:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allCurrentFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-medium">
 			<f:facet name="header">
 				<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_LINKS}">
 					<f:param value="#{beanHelper.faxNumber.phoneId}" />
 				</h:outputFormat>
 			</f:facet>
 
-			<h:column>
-				<h:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
+			<p:column>
+				<p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-				<h:link id="contactId" styleClass="table-data-field" outcome="admin_show_contact" value="#{contact.contactId}">
+				<p:link id="contactId" styleClass="table-data-field" outcome="admin_show_contact" value="#{contact.contactId}">
 					<f:param name="contactId" value="#{contact.contactId}" />
-				</h:link>
-			</h:column>
+				</p:link>
+			</p:column>
 
-			<h:column>
-				<h:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+			<p:column>
+				<p:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
 				<h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
-				<h:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
+			<p:column>
+				<p:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
 				<h:outputText id="contactTitle" styleClass="table-data-field" value="#{contact.contactTitle}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
-				<h:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+			<p:column>
+				<p:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
 				<h:outputText id="contactFirstName" styleClass="table-data-field" value="#{contact.contactFirstName}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
-				<h:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+			<p:column>
+				<p:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
 				<h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{contact.contactFamilyName}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
-				<h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
+			<p:column>
+				<p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
 				<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
 					<h:outputText value="#{contact.contactEmailAddress}" />
 				</h:outputLink>
-			</h:column>
+			</p:column>
 
-			<h:column>
-				<h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_UNLINK_DATA}" />
+			<p:column>
+				<p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_UNLINK_DATA}" />
 
 				<div class="table-data-field">
 					<ul class="navbar-mini">
 						<li class="navlink-mini">
-							<h:link outcome="admin_unlink_contact_fax">
+							<p:link outcome="admin_unlink_contact_fax">
 								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE}" />
 								<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
 								<f:param name="contactId" value="#{contact.contactId}" />
-							</h:link>
+							</p:link>
 						</li>
 					</ul>
 				</div>
-			</h:column>
-		</h:dataTable>
+			</p:column>
+		</p:dataTable>
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index d9d2955c..bc15111e 100644
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -39,7 +40,7 @@
 				</div>
 
 				<div class="table-footer">
-					<h:commandButton styleClass="button-danger" type="submit" id="button_delete_landline" value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}" action="#{adminPhoneController.deleteLandLineData()}" />
+					<p:commandButton styleClass="button-danger" type="submit" id="button_delete_landline" value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}" action="#{adminPhoneController.deleteLandLineData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml
index ac0f2e30..b04dc9b6 100644
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_edit.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -35,8 +36,8 @@
 				<widgets:outputAdminLandLineDataFormFields landLineNumber="#{beanHelper.landLineNumber}" />
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="submit" type="submit" id="button_edit_landline" value="#{msg.BUTTON_ADMIN_EDIT_LAND_LINE_NUMBER}" action="#{adminPhoneController.doChangeLandLineNumber()}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="submit" type="submit" id="button_edit_landline" value="#{msg.BUTTON_ADMIN_EDIT_LAND_LINE_NUMBER}" action="#{adminPhoneController.doChangeLandLineNumber()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml
index 4ea5a9ba..c93a80a0 100644
--- a/web/admin/landline/admin_landline_list.xhtml
+++ b/web/admin/landline/admin_landline_list.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_LAND_LINE_NUMBER}" />
@@ -15,26 +16,26 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:dataTable id="table_list_landline" var="landLineNumber" value="#{phoneController.allLandLineNumbers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}" rendered="#{not phoneController.allLandLineNumbers().isEmpty()}">
-			<h:column>
+		<p:dataTable id="table_list_landline" var="landLineNumber" value="#{phoneController.allLandLineNumbers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}" emptyMessage="#{msg.ADMIN_LANDLINE_NUMBER_LIST_EMPTY}">
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_landline" value="#{landLineNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE}">
+				<p:link outcome="admin_show_landline" value="#{landLineNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE}">
 					<f:param name="phoneId" value="#{landLineNumber.phoneId}" />
-				</h:link>
-			</h:column>
+				</p:link>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_NUMBER}" />
 				</f:facet>
 
 				<h:outputText value="#{landLineNumber.phoneCountry.countryAbroadDialPrefix}#{landLineNumber.phoneCountry.countryPhoneCode} (#{landLineNumber.phoneAreaCode}) #{landLineNumber.phoneNumber}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
 				</f:facet>
@@ -42,9 +43,9 @@
 				<h:outputText value="#{landLineNumber.phoneEntryCreated.time}">
 					<f:convertDateTime type="both" />
 				</h:outputText>
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
 				</f:facet>
@@ -52,9 +53,7 @@
 				<h:outputText value="#{landLineNumber.phoneEntryUpdated.time}">
 					<f:convertDateTime type="both" />
 				</h:outputText>
-			</h:column>
-		</h:dataTable>
-
-		<widgets:outputMessageBox message="#{msg.ADMIN_LIST_LAND_LINE_EMPTY}" messageStyleClass="alert-danger" rendered="#{phoneController.allLandLineNumbers().isEmpty()}" />
+			</p:column>
+		</p:dataTable>
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml
index 77d693b5..7fc7f091 100644
--- a/web/admin/landline/admin_landline_show.xhtml
+++ b/web/admin/landline/admin_landline_show.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -24,69 +25,69 @@
 	<ui:define name="content">
 		<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">
+		<p:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allCurrentLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-medium">
 			<f:facet name="header">
 				<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_LINKS}">
 					<f:param value="#{beanHelper.landLineNumber.phoneId}" />
 				</h:outputFormat>
 			</f:facet>
 
-			<h:column>
-				<h:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
+			<p:column>
+				<p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-				<h:link id="contactId" outcome="admin_show_contact">
+				<p:link id="contactId" outcome="admin_show_contact">
 					<h:outputText styleClass="table-data-field" value="#{contact.contactId}" />
 					<f:param name="contactId" value="#{contact.contactId}" />
-				</h:link>
-			</h:column>
+				</p:link>
+			</p:column>
 
-			<h:column>
-				<h:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+			<p:column>
+				<p:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
 				<h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
-				<h:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
+			<p:column>
+				<p:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
 				<h:outputText id="contactTitle" styleClass="table-data-field" value="#{contact.contactTitle}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
-				<h:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+			<p:column>
+				<p:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
 				<h:outputText id="contactFirstName" styleClass="table-data-field" value="#{contact.contactFirstName}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
-				<h:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+			<p:column>
+				<p:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
 				<h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{contact.contactFamilyName}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
-				<h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
+			<p:column>
+				<p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
 				<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
 					<h:outputText value="#{contact.contactEmailAddress}" />
 				</h:outputLink>
-			</h:column>
+			</p:column>
 
-			<h:column>
-				<h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_UNLINK_DATA}" />
+			<p:column>
+				<p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_UNLINK_DATA}" />
 
 				<div class="table-data-field">
 					<ul class="navbar-mini">
 						<li class="navlink-mini">
-							<h:link outcome="admin_unlink_contact_landline">
+							<p:link outcome="admin_unlink_contact_landline">
 								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LANDLINE_NUMBER_CONTACT_TITLE}" />
 								<f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
 								<f:param name="contactId" value="#{contact.contactId}" />
-							</h:link>
+							</p:link>
 						</li>
 					</ul>
 				</div>
-			</h:column>
-		</h:dataTable>
+			</p:column>
+		</p:dataTable>
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/mobile/admin_contact_mobile_list.xhtml b/web/admin/mobile/admin_contact_mobile_list.xhtml
index 43800111..5d02a85d 100644
--- a/web/admin/mobile/admin_contact_mobile_list.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_list.xhtml
@@ -3,7 +3,8 @@
 				xmlns="http://www.w3.org/1999/xhtml"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
@@ -14,12 +15,12 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:dataTable id="table_list_mobiles" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_NUMBERS}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
-			<h:column>
+		<p:dataTable id="table_list_mobiles" var="mobile" value="#{phoneController.allMobileNumbers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_NUMBERS}" emptyMessage="#{msg.ADMIN_CONTACT_MOBILE_LIST_EMPTY}">
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
 				</f:facet>
-			</h:column>
-		</h:dataTable>
+			</p:column>
+		</p:dataTable>
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index f535c30b..7d434d2c 100644
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -39,7 +40,7 @@
 				</div>
 
 				<div class="table-footer">
-					<h:commandButton styleClass="button-danger" type="submit" id="button_delete_mobile" value="#{msg.BUTTON_ADMIN_DELETE_MOBILE_NUMBER}" action="#{adminPhoneController.deleteMobileData()}" />
+					<p:commandButton styleClass="button-danger" type="submit" id="button_delete_mobile" value="#{msg.BUTTON_ADMIN_DELETE_MOBILE_NUMBER}" action="#{adminPhoneController.deleteMobileData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index d6a41a43..f6d70472 100644
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -35,8 +36,8 @@
 				<widgets:outputAdminMobileDataFormFields mobileNumber="#{beanHelper.mobileNumber}" />
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="submit" type="submit" id="button_edit_mobile" value="#{msg.BUTTON_ADMIN_EDIT_MOBILE_NUMBER}" action="#{adminPhoneController.doUpdateMobileNumber()}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="submit" type="submit" id="button_edit_mobile" value="#{msg.BUTTON_ADMIN_EDIT_MOBILE_NUMBER}" action="#{adminPhoneController.doUpdateMobileNumber()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml
index 9dae953f..cac23e37 100644
--- a/web/admin/mobile/admin_mobile_list.xhtml
+++ b/web/admin/mobile/admin_mobile_list.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
@@ -15,36 +16,36 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:dataTable id="table_list_mobile" var="mobileNumber" value="#{phoneController.allMobileNumbers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
-			<h:column>
+		<p:dataTable id="table_list_mobile" var="mobileNumber" value="#{phoneController.allMobileNumbers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}" emptyMessage="#{msg.ADMIN_MOBILE_NUMBER_LIST_EMPTY}">
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_mobile" value="#{mobileNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}">
+				<p:link outcome="admin_show_mobile" value="#{mobileNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}">
 					<f:param name="phoneId" value="#{mobileNumber.phoneId}" />
-				</h:link>
-			</h:column>
+				</p:link>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_mobile_provider" value="#{mobileNumber.mobileProvider.providerName}">
+				<p:link outcome="admin_show_mobile_provider" value="#{mobileNumber.mobileProvider.providerName}">
 					<f:param name="providerId" value="#{mobileNumber.mobileProvider.providerId}" />
-				</h:link>
-			</h:column>
+				</p:link>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
 				</f:facet>
 
 				<h:outputText value="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileNumber.mobileProvider.providerDialPrefix}-#{mobileNumber.phoneNumber}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
 				</f:facet>
@@ -52,9 +53,9 @@
 				<h:outputText value="#{mobileNumber.phoneEntryCreated.time}">
 					<f:convertDateTime type="both" />
 				</h:outputText>
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
 				</f:facet>
@@ -62,9 +63,7 @@
 				<h:outputText value="#{mobileNumber.phoneEntryUpdated.time}">
 					<f:convertDateTime type="both" />
 				</h:outputText>
-			</h:column>
-		</h:dataTable>
-
-		<widgets:outputMessageBox message="#{msg.ADMIN_LIST_MOBILE_EMPTY}" messageStyleClass="alert-danger" rendered="#{phoneController.allMobileNumbers().isEmpty()}" />
+			</p:column>
+		</p:dataTable>
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index 78415944..7ee27039 100644
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -24,68 +25,68 @@
 	<ui:define name="content">
 		<widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" />
 
-		<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">
+		<p:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allCurrentMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-medium">
 			<f:facet name="header">
 				<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_LINKS}">
 					<f:param value="#{beanHelper.mobileNumber.phoneId}" />
 				</h:outputFormat>
 			</f:facet>
 
-			<h:column>
-				<h:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
+			<p:column>
+				<p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-				<h:link id="contactId" styleClass="table-data-field" outcome="admin_show_contact" value="#{contact.contactId}">
+				<p:link id="contactId" styleClass="table-data-field" outcome="admin_show_contact" value="#{contact.contactId}">
 					<f:param name="contactId" value="#{contact.contactId}" />
-				</h:link>
-			</h:column>
+				</p:link>
+			</p:column>
 
-			<h:column>
-				<h:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+			<p:column>
+				<p:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
 				<h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
-				<h:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
+			<p:column>
+				<p:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
 				<h:outputText id="contactTitle" styleClass="table-data-field" value="#{contact.contactTitle}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
-				<h:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+			<p:column>
+				<p:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
 				<h:outputText id="contactFirstName" styleClass="table-data-field" value="#{contact.contactFirstName}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
-				<h:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+			<p:column>
+				<p:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
 				<h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{contact.contactFamilyName}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
-				<h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
+			<p:column>
+				<p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
 				<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
 					<h:outputText value="#{contact.contactEmailAddress}" />
 				</h:outputLink>
-			</h:column>
+			</p:column>
 
-			<h:column>
-				<h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_UNLINK_DATA}" />
+			<p:column>
+				<p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_UNLINK_DATA}" />
 
 				<div class="table-data-field">
 					<ul class="navbar-mini">
 						<li class="navlink-mini">
-							<h:link outcome="admin_unlink_contact_mobile">
+							<p:link outcome="admin_unlink_contact_mobile">
 								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE}" />
 								<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
 								<f:param name="contactId" value="#{contact.contactId}" />
-							</h:link>
+							</p:link>
 						</li>
 					</ul>
 				</div>
-			</h:column>
-		</h:dataTable>
+			</p:column>
+		</p:dataTable>
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index 270a7a5c..1062279f 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -4,7 +4,8 @@
 				xmlns:links="http://mxchange.org/jsf/core/links"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST}" />
@@ -15,42 +16,42 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:dataTable id="table_list_mobile" var="mobileProvider" value="#{mobileProviderController.allMobileProviders()}" styleClass="table table-medium" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" rendered="#{not mobileProviderController.allMobileProviders().isEmpty()}">
-			<h:column>
+		<p:dataTable id="table_list_mobile" var="mobileProvider" value="#{mobileProviderController.allMobileProviders()}" tableStyleClass="table table-medium" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" emptyMessage="#{msg.ADMIN_MOBILE_PROVIDER_LIST_EMPTY}">
+			<p:column sortBy="#{mobileProvider.providerId}">
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
 				</f:facet>
 
-				<h:link outcome="admin_edit_mobile_provider" title="#{msg.ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE}" value="#{mobileProvider.providerId}">
+				<p:link outcome="admin_show_mobile_provider" title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}" value="#{mobileProvider.providerId}">
 					<f:param name="providerId" value="#{mobileProvider.providerId}" />
-				</h:link>
-			</h:column>
+				</p:link>
+			</p:column>
 
-			<h:column>
+			<p:column sortBy="#{mobileProvider.providerName}" priority="3">
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}" />
 				</f:facet>
 
 				<h:outputText value="#{mobileProvider.providerName}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column sortBy="#{mobileProvider.providerDialPrefix}" priority="2">
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}" />
 				</f:facet>
 
 				<h:outputText value="#{mobileProvider.providerDialPrefix}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column sortBy="#{mobileProvider.providerCountry.countryPhoneCode}" priority="4">
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}" />
 				</f:facet>
 
 				<h:outputText value="#{msg[mobileProvider.providerCountry.countryI18nKey]}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column sortBy="#{mobileProvider.providerEntryCreated}" priority="5">
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_ENTRY_CREATED}" />
 				</f:facet>
@@ -58,16 +59,16 @@
 				<h:outputText id="providerEntryCreated" value="#{mobileProvider.providerEntryCreated.time}" title="#{msg.ADMIN_MOBILE_PROVIDER_ENTRY_CREATED_TITLE}">
 					<f:convertDateTime for="providerEntryCreated" type="both" timeStyle="short" dateStyle="short" />
 				</h:outputText>
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column sortable="false" priority="6">
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
 				</f:facet>
 
 				<links:outputMobileProviderAdminMiniLinks mobileProvider="#{mobileProvider}" />
-			</h:column>
-		</h:dataTable>
+			</p:column>
+		</p:dataTable>
 
 		<h:form id="form_add_mobile_provider">
 			<h:panelGroup styleClass="table table-medium" layout="block">
@@ -78,8 +79,8 @@
 				<ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl" />
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="submit" type="submit" id="button_add_mobile_provider" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="submit" type="submit" id="button_add_mobile_provider" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
 				</div>
 			</h:panelGroup>
 
diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index 7d93ed7e..514583fd 100644
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -24,76 +25,76 @@
 	<ui:define name="content">
 		<widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
-		<h:dataTable id="table_user_activity_log" var="userActivity" value="#{userActivityController.fetchCurrentUsersActivityLog()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}" rendered="#{not empty beanHelper.user}">
-			<h:column>
+		<p:dataTable id="table_user_activity_log" var="userActivity" value="#{userActivityController.fetchCurrentUsersActivityLog()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}" rendered="#{not empty beanHelper.user}">
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{userActivity.activityUser.userId}">
+				<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{userActivity.activityUser.userId}">
 					<f:param name="userId" value="#{userActivity.activityUser.userId}" />
-				</h:link>
-			</h:column>
+				</p:link>
+			</p:column>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-				<h:column>
+				<p:column>
 					<f:facet name="header">
 						<h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
 					</f:facet>
 
 					<h:outputText value="#{userActivity.activityUserName}" />
-				</h:column>
+				</p:column>
 			</ui:fragment>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_SHOW_PRINCIPAL_NAME}" />
 				</f:facet>
 
 				<h:outputText value="#{userActivity.activityPrincipalName}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_USER_PERSONAL_TITLE}" />
 				</f:facet>
 
 				<h:outputText value="#{msg[userActivity.activityContactGender.messageKey]}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_USER_FIRST_NAME}" />
 				</f:facet>
 
 				<h:outputText value="#{userActivity.activityContactFirstName}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_USER_FAMILY_NAME}" />
 				</f:facet>
 
 				<h:outputText value="#{userActivity.activityContactFamilyName}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVIRY_LOG_MESSAGE}" />
 				</f:facet>
 
 				<h:outputText value="#{userActivity.activityMessage}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVIRY_LOG_TYPE}" />
 				</f:facet>
 
 				<h:outputText value="#{msg[userActivityController.expandAdminActivityType(userActivity.activityType)]}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVITY_LOG_TIMESTAMP}" />
 				</f:facet>
@@ -101,7 +102,7 @@
 				<h:outputText id="userCreated" value="#{userActivity.activityTimestamp.time}">
 					<f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
 				</h:outputText>
-			</h:column>
-		</h:dataTable>
+			</p:column>
+		</p:dataTable>
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index 4c3cb46e..6702250d 100644
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -41,17 +42,17 @@
 
 				<h:panelGroup styleClass="table-row" layout="block">
 					<div class="table-left25-medium">
-						<h:outputLabel for="userDeleteReason" value="#{msg.ADMIN_USER_DELETE_REASON}" />
+						<p:outputLabel for="userDeleteReason" value="#{msg.ADMIN_USER_DELETE_REASON}" />
 					</div>
 
 					<div class="table-right75-medium">
-						<h:inputTextarea id="userDeleteReason" styleClass="input" value="#{adminUserController.userDeleteReason}" rows="8" cols="45" />
+						<p:inputTextarea id="userDeleteReason" styleClass="input" value="#{adminUserController.userDeleteReason}" rows="8" cols="45" />
 					</div>
 				</h:panelGroup>
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="button-danger" type="submit" id="button_delete_user" value="#{msg.BUTTON_ADMIN_DELETE_USER}" action="#{adminUserController.deleteUserData()}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="button-danger" type="submit" id="button_delete_user" value="#{msg.BUTTON_ADMIN_DELETE_USER}" action="#{adminUserController.deleteUserData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 6dad39e1..252c496d 100644
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -37,8 +38,8 @@
 				<widgets:outputAdminUserDataFormFields mode="edit" />
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="submit" type="submit" id="button_edit_user" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="submit" type="submit" id="button_edit_user" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index da33a133..a1ee9778 100644
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -19,15 +19,15 @@
 		<widgets:outputMessageBox message="#{msg.ADMIN_USER_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{userController.allUsers().isEmpty()}" />
 
 		<h:form id="form_export_users" rendered="#{not userController.allUsers().isEmpty()}">
-			<p:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}">
+			<p:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}">
 				<p:column exportable="false">
 					<f:facet name="header">
 						<h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
 					</f:facet>
 
-					<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
+					<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
 						<f:param name="userId" value="#{user.userId}" />
-					</h:link>
+					</p:link>
 				</p:column>
 
 				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
@@ -151,7 +151,7 @@
 						<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER}" />
 					</f:facet>
 
-					<h:outputText value="#{adminContactController.generateLandLineNumber(user.userContact.contactLandLineNumber)}" />
+					<h:outputText value="#{adminContactController.generatePhoneNumber(user.userContact.contactLandLineNumber)}" />
 				</p:column>
 
 				<p:column>
@@ -159,7 +159,7 @@
 						<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FAX_NUMBER}" />
 					</f:facet>
 
-					<h:outputText value="#{adminContactController.generateLandLineNumber(user.userContact.contactFaxNumber)}" />
+					<h:outputText value="#{adminContactController.generatePhoneNumber(user.userContact.contactFaxNumber)}" />
 				</p:column>
 
 				<p:column>
@@ -183,9 +183,9 @@
 				</div>
 
 				<div class="table-footer">
-					<h:commandButton styleClass="submit" type="submit" id="button_export_users_xls" value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}">
+					<p:commandButton styleClass="submit" type="submit" id="button_export_users_xls" value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}">
 						<p:dataExporter type="xls" target="table_export_users" fileName="all_users" />
-					</h:commandButton>
+					</p:commandButton>
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index d3c5660c..23db1d95 100644
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -5,7 +5,8 @@
 				xmlns:links="http://mxchange.org/jsf/core/links"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="admin_title">
 		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_USER}" />
@@ -18,68 +19,68 @@
 	<ui:define name="content">
 		<widgets:outputMessageBox message="#{msg.ADMIN_USER_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{userController.allUsers().isEmpty()}" />
 
-		<h:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{not userController.allUsers().isEmpty()}">
-			<h:column>
+		<p:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{not userController.allUsers().isEmpty()}">
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_USER_ID}" />
 				</f:facet>
 
-				<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
+				<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
 					<f:param name="userId" value="#{user.userId}" />
-				</h:link>
-			</h:column>
+				</p:link>
+			</p:column>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-				<h:column>
+				<p:column>
 					<f:facet name="header">
 						<h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
 					</f:facet>
 
 					<h:outputText value="#{user.userName}" />
-				</h:column>
+				</p:column>
 			</ui:fragment>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 				</f:facet>
 
 				<h:outputText value="#{msg[user.userContact.contactPersonalTitle.messageKey]}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 				</f:facet>
 
 				<h:outputText value="#{user.userContact.contactFirstName}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 				</f:facet>
 
 				<h:outputText value="#{user.userContact.contactFamilyName}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
 				</f:facet>
 
 				<h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_USER_PROFILE_MODE}" />
 				</f:facet>
 
 				<h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_ENTRY_CREATED}" />
 				</f:facet>
@@ -87,16 +88,16 @@
 				<h:outputText id="userCreated" value="#{user.userCreated.time}">
 					<f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
 				</h:outputText>
-			</h:column>
+			</p:column>
 
-			<h:column>
+			<p:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
 				</f:facet>
 
 				<links:outputUserAdminMiniLinks user="#{user}" />
-			</h:column>
-		</h:dataTable>
+			</p:column>
+		</p:dataTable>
 
 		<h:panelGroup styleClass="table table-medium" layout="block">
 			<h:form id="form_admin_add_user">
@@ -113,14 +114,14 @@
 
 						<h:panelGroup styleClass="table-row" layout="block">
 							<div class="table-left-medium">
-								<h:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
+								<p:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
 							</div>
 
 							<div class="table-right-medium">
-								<h:selectOneMenu styleClass="select" id="userContact" value="#{adminUserController.contact}" converter="ContactConverter">
+								<p:selectOneMenu id="userContact" value="#{adminUserController.contact}" converter="ContactConverter">
 									<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 									<f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactPersonalTitle.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
-								</h:selectOneMenu>
+								</p:selectOneMenu>
 							</div>
 						</h:panelGroup>
 					</fieldset>
@@ -136,8 +137,8 @@
 				</h:panelGroup>
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="submit" type="submit" id="button_add_user" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="submit" type="submit" id="button_add_user" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
 				</div>
 			</h:form>
 		</h:panelGroup>
diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index 9c5be085..6e9d3c68 100644
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -35,7 +36,7 @@
 
 				<h:panelGroup styleClass="table-row" layout="block">
 					<div class="table-left-medium">
-						<h:outputLabel for="contactPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
+						<p:outputLabel for="contactPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
 					</div>
 
 					<div class="table-right-medium">
@@ -45,7 +46,7 @@
 
 				<h:panelGroup styleClass="table-row" layout="block">
 					<div class="table-left-medium">
-						<h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
+						<p:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
 					</div>
 
 					<div class="table-right-medium">
@@ -55,7 +56,7 @@
 
 				<h:panelGroup styleClass="table-row" layout="block">
 					<div class="table-left-medium">
-						<h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
+						<p:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
 					</div>
 
 					<div class="table-right-medium">
@@ -65,18 +66,18 @@
 
 				<h:panelGroup styleClass="table-row" layout="block">
 					<div class="table-left-medium">
-						<h:outputLabel for="userLockReason" value="#{msg.ADMIN_ENTER_USER_LOCK_REASON}" />
+						<p:outputLabel for="userLockReason" value="#{msg.ADMIN_ENTER_USER_LOCK_REASON}" />
 					</div>
 
 					<div class="table-right-medium">
-						<h:inputTextarea styleClass="input" id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" />
+						<p:inputTextarea styleClass="input" id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" />
 					</div>
 				</h:panelGroup>
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
-					<h:commandButton styleClass="submit" type="submit" action="#{adminUserController.lockUserAccount()}" value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}" />
+					<p:commandButton styleClass="submit" type="submit" action="#{adminUserController.lockUserAccount()}" value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml
index 74b2cb58..aee86a01 100644
--- a/web/admin/user/admin_user_resend_confirmation_link.xhtml
+++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -42,9 +43,9 @@
 				</h:panelGroup>
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
-					<h:commandButton styleClass="submit" type="submit" action="#{adminUserController.resendConfirmationLink()}" value="#{msg.BUTTON_ADMIN_RESEND_USER_CONFIRMATION_LINK_ACCOUNT}" />
+					<p:commandButton styleClass="submit" type="submit" action="#{adminUserController.resendConfirmationLink()}" value="#{msg.BUTTON_ADMIN_RESEND_USER_CONFIRMATION_LINK_ACCOUNT}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 7b80ca88..e72a5b89 100644
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="metadata">
 		<f:metadata>
@@ -39,15 +40,15 @@
 					</div>
 
 					<div class="table-data-field">
-						<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
+						<p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
 							<f:param name="userId" value="#{beanHelper.user.userId}" />
-						</h:link>
+						</p:link>
 					</div>
 				</h:panelGroup>
 
 				<h:panelGroup styleClass="para" layout="block">
 					<div class="table-data-label">
-						<h:outputLabel for="contactPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
+						<p:outputLabel for="contactPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
 					</div>
 
 					<div class="table-data-field">
@@ -57,7 +58,7 @@
 
 				<h:panelGroup styleClass="para" layout="block">
 					<div class="table-data-label">
-						<h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
+						<p:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
 					</div>
 
 					<div class="table-data-field">
@@ -67,7 +68,7 @@
 
 				<h:panelGroup styleClass="para" layout="block">
 					<div class="table-data-label">
-						<h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
+						<p:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
 					</div>
 
 					<div class="table-data-field">
@@ -77,7 +78,7 @@
 
 				<h:panelGroup styleClass="para" layout="block">
 					<div class="table-data-label">
-						<h:outputLabel for="userLastLocked" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
+						<p:outputLabel for="userLastLocked" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
 					</div>
 
 					<div class="table-data-field">
@@ -89,7 +90,7 @@
 
 				<h:panelGroup styleClass="para" layout="block">
 					<div class="table-data-label">
-						<h:outputLabel for="userLockReason" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
+						<p:outputLabel for="userLockReason" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
 					</div>
 
 					<div class="table-data-field">
@@ -98,9 +99,9 @@
 				</h:panelGroup>
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
-					<h:commandButton styleClass="submit" type="submit" action="#{adminUserController.unlockUserAccount()}" value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}" />
+					<p:commandButton styleClass="submit" type="submit" action="#{adminUserController.unlockUserAccount()}" value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml
index a2fc13bf..c2c81347 100644
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -5,7 +5,8 @@
 				xmlns:links="http://mxchange.org/jsf/core/links"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LIST}" />
@@ -18,30 +19,30 @@
 	<ui:define name="content">
 		<widgets:outputMessageBox message="#{msg.ERROR_USER_LIST_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_list')}" />
 
-		<h:panelGroup styleClass="table-full" layout="block" rendered="#{featureController.isFeatureEnabled('user_list')}">
+		<h:panelGroup styleClass="table table-full" layout="block" rendered="#{featureController.isFeatureEnabled('user_list')}">
 			<div class="table-header">
 				<h:outputText value="#{msg.TABLE_HEADER_USER_LIST}" />
 			</div>
 
-			<h:dataTable id="userList" var="user" value="#{userController.allUsers()}" headerClass="table-header-column25" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.allUsers().size() lt 0}">
+			<p:dataTable id="userList" var="user" value="#{userController.allUsers()}" tableStyleClass="table" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.allUsers().size() lt 0}">
 				<ui:fragment rendered="#{profileController.isProfileLinkVisibleByUser(user)}">
-					<h:column>
+					<p:column>
 						<f:facet name="header">
 							<h:outputText value="#{msg.USER_NAME}" />
 						</f:facet>
 
 						<links:outputUserProfileLink user="#{user}" />
-					</h:column>
+					</p:column>
 
-					<h:column>
+					<p:column>
 						<f:facet name="header">
 							<h:outputText value="#{msg.USER_CREATED}" />
 						</f:facet>
 
 						<h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
-					</h:column>
+					</p:column>
 				</ui:fragment>
-			</h:dataTable>
+			</p:dataTable>
 		</h:panelGroup>>
 	</ui:define>
 </ui:composition>
diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml
index b65b7cf3..3191943d 100644
--- a/web/guest/user/user_login.xhtml
+++ b/web/guest/user/user_login.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN}" />
@@ -23,7 +24,7 @@
 
 				<h:outputText value="&#160;" />
 
-				<h:link id="user_register" outcome="user_register" title="#{msg.LINK_GUEST_USER_NO_ACCOUNT_TITLE}" value="#{msg.LINK_GUEST_USER_NO_ACCOUNT_YET}" />
+				<p:link id="user_register" outcome="user_register" title="#{msg.LINK_GUEST_USER_NO_ACCOUNT_TITLE}" value="#{msg.LINK_GUEST_USER_NO_ACCOUNT_YET}" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="para" layout="block">
@@ -31,7 +32,7 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
-				<h:link id="user_lost_password" outcome="user_lost_password" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.LINK_GUEST_LOGIN_LOST_PASSWORD}" />
+				<p:link id="user_lost_password" outcome="user_lost_password" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.LINK_GUEST_LOGIN_LOST_PASSWORD}" />
 			</h:panelGroup>
 		</ui:fragment>
 	</ui:define>
diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml
index 1ece54b4..92c4fd4c 100644
--- a/web/guest/user/user_lost_password.xhtml
+++ b/web/guest/user/user_lost_password.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LOST_PASSWORD}" />
@@ -32,11 +33,11 @@
 
 							<h:panelGroup styleClass="table-row" layout="block">
 								<div class="table-left">
-									<h:outputLabel for="id" value="#{msg.ENTER_USER_NAME}" />
+									<p:outputLabel for="id" value="#{msg.ENTER_USER_NAME}" />
 								</div>
 
 								<div class="table-right">
-									<h:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
+									<p:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
 								</div>
 							</h:panelGroup>
 
@@ -46,18 +47,18 @@
 
 							<h:panelGroup styleClass="table-row" layout="block">
 								<div class="table-left">
-									<h:outputLabel for="email" value="#{msg.ENTER_EMAIL_ADDRESS}" />
+									<p:outputLabel for="email" value="#{msg.ENTER_EMAIL_ADDRESS}" />
 								</div>
 
 								<div class="table-right">
-									<h:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
+									<p:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
 								</div>
 							</h:panelGroup>
 						</fieldset>
 
 						<div class="table-footer">
-							<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-							<h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
+							<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+							<p:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
 						</div>
 					</h:panelGroup>
 				</h:form>
diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml
index f37ff331..e285b365 100644
--- a/web/guest/user/user_register.xhtml
+++ b/web/guest/user/user_register.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER}" />
@@ -23,7 +24,7 @@
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 				<h:panelGroup styleClass="para" layout="block">
 					<h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1} " />
-					<h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
+					<p:link outcome="user_login" value="#{msg.CLICK_HERE}" />
 					<h:outputText value=" #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
 				</h:panelGroup>
 			</ui:fragment>
diff --git a/web/guest/user/user_register_done.xhtml b/web/guest/user/user_register_done.xhtml
index 73f3b2c0..f26df549 100644
--- a/web/guest/user/user_register_done.xhtml
+++ b/web/guest/user/user_register_done.xhtml
@@ -3,7 +3,8 @@
 				xmlns="http://www.w3.org/1999/xhtml"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_DONE}" />
@@ -19,7 +20,7 @@
 		</h:panelGroup>
 
 		<h:panelGroup layout="block" styleClass="registration_form">
-			<h:link id="resend_link" styleClass="resend_link" value="#{msg.LINK_GUEST_RESEND_CONFIRMATION_LINK}" outcome="user_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
+			<p:link id="resend_link" styleClass="resend_link" value="#{msg.LINK_GUEST_RESEND_CONFIRMATION_LINK}" outcome="user_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
 		</h:panelGroup>
 	</ui:define>
 </ui:composition>
diff --git a/web/guest/user/user_register_page2.xhtml b/web/guest/user/user_register_page2.xhtml
index 658b73ee..394b73e2 100644
--- a/web/guest/user/user_register_page2.xhtml
+++ b/web/guest/user/user_register_page2.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_PAGE2}" />
@@ -21,7 +22,7 @@
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 				<h:panelGroup styleClass="para" layout="block">
 					<h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}" />
-					<h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
+					<p:link outcome="user_login" value="#{msg.CLICK_HERE}" />
 					<h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
 				</h:panelGroup>
 			</ui:fragment>
diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml
index 8bdf9d1f..76d7b1e2 100644
--- a/web/guest/user/user_resend_link.xhtml
+++ b/web/guest/user/user_resend_link.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_INDEX_RESEND_LINK}" />
@@ -30,19 +31,19 @@
 
 					<h:panelGroup styleClass="table-row" layout="block">
 						<div class="table-left">
-							<h:outputLabel for="resendEmailAddress" value="#{msg.GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS}" />
+							<p:outputLabel for="resendEmailAddress" value="#{msg.GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS}" />
 						</div>
 
 						<div class="table-right">
-							<h:inputText styleClass="input" id="resendEmailAddress" size="20" maxlength="255" value="#{userResendConfirmationController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
+							<p:inputText styleClass="input" id="resendEmailAddress" size="20" maxlength="255" value="#{userResendConfirmationController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
 								<f:validator validatorId="EmailAddressValidator" />
-							</h:inputText>
+							</p:inputText>
 						</div>
 					</h:panelGroup>
 				</fieldset>
 
-				<h:panelGroup styleClass="error_container" layout="block">
-					<h:message for="resendEmailAddress" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+				<h:panelGroup styleClass="error-container" layout="block">
+					<p:message for="resendEmailAddress" />
 				</h:panelGroup>
 
 				<h:panelGroup styleClass="table-row" layout="block">
@@ -50,8 +51,8 @@
 				</h:panelGroup>
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="submit" type="submit" id="button_resend_link" value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}" action="#{userResendConfirmationController.doResendLink()}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="submit" type="submit" id="button_resend_link" value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}" action="#{userResendConfirmationController.doResendLink()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/resources/css/default.css b/web/resources/css/default.css
index 9a84a100..42fb9258 100644
--- a/web/resources/css/default.css
+++ b/web/resources/css/default.css
@@ -4,7 +4,6 @@ body {
 	font-family: sans-serif;
 	color: black;
 	margin: 0px;
-	line-height: 14px;
 }
 
 h1 {
@@ -24,7 +23,3 @@ a:link:hover, a:visited:hover {
 	color: #045491;
 	text-decoration : underline;
 }
-
-label {
-	vertical-align: middle;
-}
diff --git a/web/resources/css/layout.css b/web/resources/css/layout.css
index 59ea6530..a3e22a51 100644
--- a/web/resources/css/layout.css
+++ b/web/resources/css/layout.css
@@ -6,10 +6,6 @@ div, table {
 
 #page-header {
 	border-bottom: 1px solid grey;
-	line-height: 20px;
-}
-
-#page-header-container {
 	background-color: steelblue;
 	color: white;
 	padding: 5px;
@@ -46,13 +42,13 @@ div, table {
 	margin: 2px;
 }
 
-.page-header-container a:link, .page-header-container a:visited {
+.page-header a:link, .page-header a:visited {
 	color: white;
 	font-weight : bold;
 	text-decoration: none;
 }
 
-.page-header-container a:link:hover, .page-header-container a:visited:hover  {
+.page-header a:link:hover, .page-header a:visited:hover  {
 	color: black;
 	font-weight : bold;
 	text-decoration : underline;
@@ -166,15 +162,6 @@ ul.navbar-horizontal li.footer-copyright {
 	margin-right: 10px;
 }
 
-.menu ul {
-	list-style: none;
-	padding-left: 5px;
-}
-
-.menu-header {
-	font-weight: bold;
-}
-
 .table-header {
 	text-align: center;
 	font-weight: bold;
@@ -299,33 +286,19 @@ ul.navbar-horizontal li.footer-copyright {
 	margin-right: 2px;
 }
 
-#content-header, .input, .select, .submit, .reset, .button-danger, .button-warning, .fieldset {
-	border: 1px solid grey;
-	border-top-right-radius: 8px;
-	border-bottom-left-radius: 8px;
-}
-
-.checkbox {
+#content-header {
 	border: 1px solid grey;
 }
 
-input, textarea, select, option {
-	background-color: #fbfbfb;
-}
-
-.submit, .reset, .button-danger, .button-warning {
-	cursor: pointer;
+#content-header, .input, .submit, .reset, .button-danger, .button-warning, .fieldset {
+	border-top-right-radius: 8px;
+	border-bottom-left-radius: 8px;
 }
 
 .fieldset {
 	padding: 5px;
 }
 
-.input {
-	padding-left: 4px;
-	padding-right: 4px;
-}
-
 #menu-content-wrapper {
 	overflow: auto;
 }
@@ -342,11 +315,6 @@ input, textarea, select, option {
 	color: white;
 }
 
-input:hover, textarea:hover, select:hover, option:hover {
-	border-color: #666666;
-	background-color: #eeeeee;
-}
-
 .button-danger:hover {
 	border-color: #dd0000;
 	background-color: #aa0000;
@@ -358,6 +326,7 @@ input:hover, textarea:hover, select:hover, option:hover {
 	background-color: #cccc00;
 	color: #eeeeee;
 }
+
 #menu-content-wrapper::after {
 	clear: both;
 }
@@ -366,6 +335,6 @@ input:hover, textarea:hover, select:hover, option:hover {
 	clear: both;
 }
 
-.footer::after {
+#footer::after {
 	clear: both;
 }
diff --git a/web/user/financials/login_financials_add_income.xhtml b/web/user/financials/login_financials_add_income.xhtml
index 50712a6b..ba1fa3fe 100644
--- a/web/user/financials/login_financials_add_income.xhtml
+++ b/web/user/financials/login_financials_add_income.xhtml
@@ -3,7 +3,8 @@
 				xmlns="http://www.w3.org/1999/xhtml"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_LOGIN_FINANCIAL_ADD_INCOME}" />
@@ -22,45 +23,45 @@
 
 				<h:panelGroup styleClass="table-row" layout="block">
 					<div class="table-left-medium">
-						<h:outputLabel for="incomeTitle" value="#{msg.LOGIN_FINANCIAL_INCOME_TITLE}" />
+						<p:outputLabel for="incomeTitle" value="#{msg.LOGIN_FINANCIAL_INCOME_TITLE}" />
 					</div>
 
 					<div class="table-right-medium">
-						<h:inputText styleClass="input" id="incomeTitle" size="2" maxlength="10" value="#{financialIncomeController.incomeTitle}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_TITLE_REQUIRED}">
+						<p:inputText styleClass="input" id="incomeTitle" size="2" maxlength="10" value="#{financialIncomeController.incomeTitle}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_TITLE_REQUIRED}">
 							<f:validator validatorId="IncomeTitleValidator" />
-						</h:inputText>
+						</p:inputText>
 					</div>
 				</h:panelGroup>
 
 				<h:panelGroup styleClass="table-row" layout="block">
 					<div class="table-left-medium">
-						<h:outputLabel for="incomeInterval" value="#{msg.LOGIN_FINANCIAL_INCOME_INTERVAL}" />
+						<p:outputLabel for="incomeInterval" value="#{msg.LOGIN_FINANCIAL_INCOME_INTERVAL}" />
 					</div>
 
 					<div class="table-right-medium">
-						<h:selectOneMenu styleClass="select" id="incomeInterval" value="#{financialIncomeController.incomeInterval}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_REQUIRED}">
+						<p:selectOneMenu id="incomeInterval" value="#{financialIncomeController.incomeInterval}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_REQUIRED}">
 							<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
 							<f:selectItems value="#{financialIncomeController.allIncomeIntervals()}" var="incomeInterval" itemValue="#{incomeInterval}" itemLabel="#{msg[incomeInterval.concat('_INTERVAL')]}" />
-						</h:selectOneMenu>
+						</p:selectOneMenu>
 					</div>
 				</h:panelGroup>
 
 				<h:panelGroup styleClass="table-row" layout="block">
 					<div class="table-left-medium">
-						<h:outputLabel for="incomeSingleValue" value="#{msg.LOGIN_FINANCIAL_INCOME_SINGLE_VALUE}" />
+						<p:outputLabel for="incomeSingleValue" value="#{msg.LOGIN_FINANCIAL_INCOME_SINGLE_VALUE}" />
 					</div>
 
 					<div class="table-right-medium">
-						<h:inputText styleClass="input" id="incomeSingleValue" size="5" maxlength="20" value="#{financialIncomeController.incomeSingleAmount}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_SINGLE_VALUE_REQUIRED}">
+						<p:inputText styleClass="input" id="incomeSingleValue" size="5" maxlength="20" value="#{financialIncomeController.incomeSingleAmount}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_SINGLE_VALUE_REQUIRED}">
 							<f:validator validatorId="CurrencyAmountValidator" />
-						</h:inputText>
+						</p:inputText>
 					</div>
 				</h:panelGroup>
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
-					<h:commandButton styleClass="submit" id="submit_add_income" type="submit" action="#{financialIncomeController.addIncome()}" value="#{msg.BUTTON_LOGIN_FINCIAL_ADD_INCOME}" />
+					<p:commandButton styleClass="submit" id="submit_add_income" type="submit" action="#{financialIncomeController.addIncome()}" value="#{msg.BUTTON_LOGIN_FINCIAL_ADD_INCOME}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/user/financials/login_financials_add_receipt.xhtml b/web/user/financials/login_financials_add_receipt.xhtml
index 0137fca1..f00b2026 100644
--- a/web/user/financials/login_financials_add_receipt.xhtml
+++ b/web/user/financials/login_financials_add_receipt.xhtml
@@ -23,20 +23,20 @@
 
 				<h:panelGroup styleClass="table-row" layout="block">
 					<div class="table-left-medium">
-						<h:outputLabel for="receiptBranchOffice" value="#{msg.LOGIN_FINANCIAL_SELECT_RECEIPT_BRANCH_OFFICE}" />
+						<p:outputLabel for="receiptBranchOffice" value="#{msg.LOGIN_FINANCIAL_SELECT_RECEIPT_BRANCH_OFFICE}" />
 					</div>
 
 					<div class="table-right-medium">
-						<h:selectOneMenu styleClass="select" id="receiptBranchOffice" value="#{receiptController.receiptBranchOffice}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_RECEIPT_BRANCH_OFFICE_REQUIRED}" converter="BasicCompanyDataConverter">
+						<p:selectOneMenu id="receiptBranchOffice" value="#{receiptController.receiptBranchOffice}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_RECEIPT_BRANCH_OFFICE_REQUIRED}" converter="BasicCompanyDataConverter">
 							<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
 							<f:selectItems value="#{branchOfficeController.allBranchOffices()}" var="receiptBranchOffice" itemValue="#{receiptBranchOffice}" itemLabel="#{receiptBranchOffice.companyName}" />
-						</h:selectOneMenu>
+						</p:selectOneMenu>
 					</div>
 				</h:panelGroup>
 
 				<h:panelGroup styleClass="table-row" layout="block">
 					<div class="table-left-medium">
-						<h:outputLabel for="receiptIssued" value="#{msg.LOGIN_FINANCIAL_ENTER_RECEIPT_CREATED}" />
+						<p:outputLabel for="receiptIssued" value="#{msg.LOGIN_FINANCIAL_ENTER_RECEIPT_CREATED}" />
 					</div>
 
 					<div class="table-right-medium">
@@ -46,38 +46,38 @@
 
 				<h:panelGroup styleClass="table-row" layout="block">
 					<div class="table-left-medium">
-						<h:outputLabel for="receiptNumber" value="#{msg.LOGIN_FINANCIAL_RECEIPT_NUMBER}" />
+						<p:outputLabel for="receiptNumber" value="#{msg.LOGIN_FINANCIAL_RECEIPT_NUMBER}" />
 					</div>
 
 					<div class="table-right-medium">
-						<h:inputText styleClass="input" id="receiptNumber" size="2" maxlength="10" value="#{receiptController.receiptNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_NUMBER_INVALID}">
+						<p:inputText styleClass="input" id="receiptNumber" size="2" maxlength="10" value="#{receiptController.receiptNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_NUMBER_INVALID}">
 							<f:validateLongRange minimum="1" maximum="20" />
-						</h:inputText>
+						</p:inputText>
 					</div>
 				</h:panelGroup>
 
 				<h:panelGroup styleClass="table-row" layout="block">
 					<h:outputText value="#{msg.LOGIN_FINANCIAL_COMPANY_NOT_FOUND} " />
-					<h:link title="#{msg.LINK_LOGIN_FINANCIAL_ADD_COMPANY_TITLE}" outcome="login_add_receipt_company" value="#{msg.LINK_LOGIN_FINANCIAL_ADD_COMPANY}" />
+					<p:link title="#{msg.LINK_LOGIN_FINANCIAL_ADD_COMPANY_TITLE}" outcome="login_add_receipt_company" value="#{msg.LINK_LOGIN_FINANCIAL_ADD_COMPANY}" />
 				</h:panelGroup>
 
 				<h:panelGroup styleClass="table-row" layout="block">
 					<div class="table-left-medium">
-						<h:outputLabel for="paymentType" value="#{msg.LOGIN_FINANCIAL_INCOME_INTERVAL}" />
+						<p:outputLabel for="paymentType" value="#{msg.LOGIN_FINANCIAL_INCOME_INTERVAL}" />
 					</div>
 
 					<div class="table-right-medium">
-						<h:selectOneMenu styleClass="select" id="paymentType" value="#{receiptController.paymentType}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_REQUIRED}">
+						<p:selectOneMenu id="paymentType" value="#{receiptController.paymentType}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_REQUIRED}">
 							<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
 							<f:selectItems value="#{receiptController.allPaymentTypes()}" var="paymentType" itemValue="#{paymentType}" itemLabel="#{msg[paymentType]}" />
-						</h:selectOneMenu>
+						</p:selectOneMenu>
 					</div>
 				</h:panelGroup>
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
-					<h:commandButton styleClass="submit" id="submit_add_income" type="submit" action="#{receiptController.addReceipt()}" value="#{msg.BUTTON_LOGIN_FINCIAL_ADD_INCOME}" />
+					<p:commandButton styleClass="submit" id="submit_add_income" type="submit" action="#{receiptController.addReceipt()}" value="#{msg.BUTTON_LOGIN_FINCIAL_ADD_INCOME}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/user/financials/login_financials_overview.xhtml b/web/user/financials/login_financials_overview.xhtml
index 91a9aa6a..b33a6d31 100644
--- a/web/user/financials/login_financials_overview.xhtml
+++ b/web/user/financials/login_financials_overview.xhtml
@@ -3,7 +3,8 @@
 				xmlns="http://www.w3.org/1999/xhtml"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_LOGIN_FINANCIAL_OVERVIEW}" />
@@ -21,19 +22,19 @@
 				</f:facet>
 
 				<h:column>
-					<h:outputLabel for="totalReceipts" styleClass="data_label" value="#{msg.USER_FINANCIALS_TOTAL_RECEIPTS}" />
+					<p:outputLabel for="totalReceipts" styleClass="data_label" value="#{msg.USER_FINANCIALS_TOTAL_RECEIPTS}" />
 
 					<h:outputLink id="totalReceipts" styleClass="data_field" target="list_user_financial_receipts" value="#{financialIncomeController.receipts.size()}" />
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="totalReceipts" styleClass="data_label" value="#{msg.USER_FINANCIALS_TOTAL_OTHER_EXPENSES}" />
+					<p:outputLabel for="totalReceipts" styleClass="data_label" value="#{msg.USER_FINANCIALS_TOTAL_OTHER_EXPENSES}" />
 
 					<h:outputLink id="totalReceipts" styleClass="data_field" target="list_user_financial_other_expenses" value="#{financialIncomeController.otherExpenses.size()}" />
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="totalReceipts" styleClass="data_label" value="#{msg.USER_FINANCIALS_TOTAL_INCOME}" />
+					<p:outputLabel for="totalReceipts" styleClass="data_label" value="#{msg.USER_FINANCIALS_TOTAL_INCOME}" />
 
 					<h:outputLink id="totalReceipts" styleClass="data_field" target="list_user_financial_income" value="#{financialIncomeController.income.size()}" />
 				</h:column>
@@ -45,15 +46,15 @@
 
 			<ul>
 				<li>
-					<h:link  title="#{msg.LINK_USER_FINANCIAL_ADD_RECEIPT_TITLE}" outcome="add_user_fiancial_receipt" value="#{msg.LINK_USER_FINANCIAL_ADD_RECEIPT}" />
+					<p:link  title="#{msg.LINK_USER_FINANCIAL_ADD_RECEIPT_TITLE}" outcome="add_user_fiancial_receipt" value="#{msg.LINK_USER_FINANCIAL_ADD_RECEIPT}" />
 				</li>
 
 				<li>
-					<h:link  title="#{msg.LINK_USER_FINANCIAL_ADD_OTHER_EXPENSES_TITLE}" outcome="add_user_fiancial_other_expenses" value="#{msg.LINK_USER_FINANCIAL_ADD_OTHER_EXPENSES}" />
+					<p:link  title="#{msg.LINK_USER_FINANCIAL_ADD_OTHER_EXPENSES_TITLE}" outcome="add_user_fiancial_other_expenses" value="#{msg.LINK_USER_FINANCIAL_ADD_OTHER_EXPENSES}" />
 				</li>
 
 				<li>
-					<h:link  title="#{msg.LINK_USER_FINANCIAL_ADD_INCOME_TITLE}" outcome="add_user_fiancial_income" value="#{msg.LINK_USER_FINANCIAL_ADD_INCOME}" />
+					<p:link  title="#{msg.LINK_USER_FINANCIAL_ADD_INCOME_TITLE}" outcome="add_user_fiancial_income" value="#{msg.LINK_USER_FINANCIAL_ADD_INCOME}" />
 				</li>
 			</ul>
 		</h:panelGroup>
diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
index e2a2cbca..300c586d 100644
--- a/web/user/login_contact_data_saved.xhtml
+++ b/web/user/login_contact_data_saved.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
@@ -20,7 +21,7 @@
 		<widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
 
 		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-			<h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+			<p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
 		</ui:fragment>
 
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml
index 44336717..8e99559d 100644
--- a/web/user/login_edit_user_data.xhtml
+++ b/web/user/login_edit_user_data.xhtml
@@ -3,7 +3,8 @@
 				xmlns="http://www.w3.org/1999/xhtml"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}" />
@@ -27,18 +28,18 @@
 				<ul>
 					<ui:fragment rendered="#{not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password')}">
 						<li>
-							<h:link title="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_user_change_personal_data" value="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA}" />
+							<p:link title="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_user_change_personal_data" value="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA}" />
 						</li>
 					</ui:fragment>
 
 					<ui:fragment rendered="#{not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password')}">
 						<li>
-							<h:link title="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_user_change_email_address" value="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
+							<p:link title="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_user_change_email_address" value="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
 						</li>
 					</ui:fragment>
 
 					<li>
-						<h:link title="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD_TITLE}" outcome="login_user_change_password" value="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD}" />
+						<p:link title="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD_TITLE}" outcome="login_user_change_password" value="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD}" />
 					</li>
 				</ul>
 			</h:panelGroup>
diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml
index 207e6965..63f89090 100644
--- a/web/user/login_index.xhtml
+++ b/web/user/login_index.xhtml
@@ -3,7 +3,8 @@
 				xmlns="http://www.w3.org/1999/xhtml"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_HOME}" />
@@ -19,7 +20,7 @@
 		</ui:fragment>
 
 		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-			<h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+			<p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
 		</ui:fragment>
 
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
diff --git a/web/user/login_logout.xhtml b/web/user/login_logout.xhtml
index c80d0acc..d0eee5cb 100644
--- a/web/user/login_logout.xhtml
+++ b/web/user/login_logout.xhtml
@@ -3,7 +3,8 @@
 				xmlns="http://www.w3.org/1999/xhtml"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_LOGOUT}" />
@@ -25,7 +26,7 @@
 				</h:panelGroup>
 
 				<div class="table-footer">
-					<h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
+					<p:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml
index fbecaf83..a019ba7d 100644
--- a/web/user/login_user_change_email_address.xhtml
+++ b/web/user/login_user_change_email_address.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
@@ -46,8 +47,8 @@
 				<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
 				<div class="table-footer">
-					<h:commandButton class="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton class="submit" type="submit" id="button_change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userEmailChangeController.doUserChangeEmailAddress()}" />
+					<p:commandButton class="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton class="submit" type="submit" id="button_change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userEmailChangeController.doUserChangeEmailAddress()}" />
 				</div>
 			</h:form>
 		</h:panelGroup>
diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml
index ec604868..ab920063 100644
--- a/web/user/login_user_change_password.xhtml
+++ b/web/user/login_user_change_password.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PASSWORD}" />
@@ -37,30 +38,30 @@
 
 						<h:panelGroup styleClass="table-row" layout="block">
 							<div class="table-left">
-								<h:outputLabel for="userPassword" value="#{msg.USER_ENTER_NEW_PASSWORD}" />
+								<p:outputLabel for="userPassword" value="#{msg.USER_ENTER_NEW_PASSWORD}" />
 							</div>
 
 							<div class="table-right">
-								<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userPasswordController.userPassword}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REQUIRED}" />
+								<p:inputText type="secret" styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userPasswordController.userPassword}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REQUIRED}" />
 							</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 styleClass="error-container" layout="block">
+							<p:message for="userPassword" />
 						</h:panelGroup>
 
 						<h:panelGroup styleClass="table-row" layout="block">
 							<div class="table-left">
-								<h:outputLabel for="userPasswordRepeat" value="#{msg.USER_ENTER_NEW_PASSWORD_REPEAT}" />
+								<p:outputLabel for="userPasswordRepeat" value="#{msg.USER_ENTER_NEW_PASSWORD_REPEAT}" />
 							</div>
 
 							<div class="table-right">
-								<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userPasswordController.userPasswordRepeat}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REPEAT_REQUIRED}" />
+								<p:inputText type="secret" styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userPasswordController.userPasswordRepeat}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REPEAT_REQUIRED}" />
 							</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 styleClass="error-container" layout="block">
+							<p:message for="userPasswordRepeat" />
 						</h:panelGroup>
 					</fieldset>
 
@@ -70,8 +71,8 @@
 					<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
 
 					<div class="table-footer">
-						<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton styleClass="submit" type="submit" id="button_change_password" value="#{msg.BUTTON_USER_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
+						<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+						<p:commandButton styleClass="submit" type="submit" id="button_change_password" value="#{msg.BUTTON_USER_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
 					</div>
 				</h:panelGroup>
 			</h:form>
diff --git a/web/user/login_user_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml
index e5ee9bac..252a3486 100644
--- a/web/user/login_user_change_personal_data.xhtml
+++ b/web/user/login_user_change_personal_data.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PERSONAL_DATA}" />
@@ -18,7 +19,7 @@
 		<widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
 
 		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-			<h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+			<p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
 		</ui:fragment>
 
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
@@ -38,8 +39,8 @@
 				<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
 				<div class="table-footer">
-					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="submit" type="submit" id="button_change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
+					<p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="submit" type="submit" id="button_change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
 				</div>
 			</h:form>
 		</h:panelGroup>
diff --git a/web/user/login_user_contact_data_saved.xhtml b/web/user/login_user_contact_data_saved.xhtml
index 04707419..a5fda2ee 100644
--- a/web/user/login_user_contact_data_saved.xhtml
+++ b/web/user/login_user_contact_data_saved.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CONTACT_DATA_SAVED}" />
@@ -20,7 +21,7 @@
 		<widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
 
 		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-			<h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+			<p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
 		</ui:fragment>
 
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml
index 167bdad5..014da48a 100644
--- a/web/user/login_user_data_saved.xhtml
+++ b/web/user/login_user_data_saved.xhtml
@@ -4,7 +4,8 @@
 				xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}" />
@@ -18,7 +19,7 @@
 		<widgets:outputMessageBox message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
 
 		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-			<h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+			<p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
 		</ui:fragment>
 
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-- 
2.39.5