From: Roland Häder <roland@mxchange.org>
Date: Sat, 19 Aug 2017 14:11:42 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=88256b303ab6c51fc1a90bb0290b3df7d91a85d6;p=jfinancials-war.git

Please cherry-pick:
- renamed JSF views with "contact_business" to "business_data"
- moved selection boxes to own template folder "selection_boxes"
- renamed + moved locale_selection_box.tpl to widgets/locale_change_widget.tpl
- renamed "generic" templates folder to "messages"
- TODO: moving out "country selection box" to a template can be done:
  + for each type, land-line and fax number have a separate template
  + the target controllers must all then have same naming, e.g. landLineCountry

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

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index a7fc0766..b8264608 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -109,12 +109,12 @@
 			<to-view-id>/admin/contact/admin_contact_export.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_list_contact_business</from-outcome>
-			<to-view-id>/admin/contact_business/admin_contact_business_list.xhtml</to-view-id>
+			<from-outcome>admin_list_business_data</from-outcome>
+			<to-view-id>/admin/business_data/admin_business_data_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_export_contact_business</from-outcome>
-			<to-view-id>/admin/contact_business/admin_contact_business_export.xhtml</to-view-id>
+			<from-outcome>admin_export_business_data</from-outcome>
+			<to-view-id>/admin/business_data/admin_business_data_export.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_list_user</from-outcome>
diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl
index 12d3bb23..05270cc2 100644
--- a/web/WEB-INF/templates/admin/admin_menu.tpl
+++ b/web/WEB-INF/templates/admin/admin_menu.tpl
@@ -39,8 +39,8 @@
 				</div>
 
 				<ul>
-					<li><h:link title="#{msg.LINK_ADMIN_LIST_CONTACT_BUSINESS_TITLE}" outcome="admin_list_contact_business" value="#{msg.LINK_ADMIN_LIST_CONTACT_BUSINESS}" /></li>
-					<li><h:link title="#{msg.LINK_ADMIN_EXPORT_CONTACT_BUSINESS_TITLE}" outcome="admin_export_contact_business" value="#{msg.LINK_ADMIN_EXPORT_CONTACT_BUSINESS}" /></li>
+					<li><h:link title="#{msg.LINK_ADMIN_LIST_CONTACT_BUSINESS_TITLE}" outcome="admin_list_business_data" value="#{msg.LINK_ADMIN_LIST_CONTACT_BUSINESS}" /></li>
+					<li><h:link title="#{msg.LINK_ADMIN_EXPORT_CONTACT_BUSINESS_TITLE}" outcome="admin_export_business_data" value="#{msg.LINK_ADMIN_EXPORT_CONTACT_BUSINESS}" /></li>
 				</ul>
 			</ui:fragment>
 
diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
index dc8195a6..1fc03955 100644
--- a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty beanHelper.contact}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
index 7ab91ab7..a862af19 100644
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -17,7 +17,7 @@
 				</div>
 
 				<div class="table_right_medium">
-					<ui:include src="/WEB-INF/templates/generic/personal_title_selection_box.tpl">
+					<ui:include src="/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl">
 						<ui:param name="targetController" value="#{adminContactController}" />
 					</ui:include>
 				</div>
@@ -235,15 +235,9 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select right_space" id="mobileProvider" value="#{adminContactController.mobileProvider}">
-						<f:converter converterId="MobileProviderConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
-					</h:selectOneMenu>
-
-					<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminContactController.mobileNumber}">
-						<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					<ui:include src="/WEB-INF/templates/selection_boxes/mobile_selection_box.tpl">
+						<ui:param name="targetController" value="#{adminContactController}" />
+					</ui:include>
 				</div>
 
 				<div class="clear"></div>
diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
index 21f97818..e3cc014a 100644
--- a/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty beanHelper.contact}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
index 72230476..532ef872 100644
--- a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty beanHelper.faxNumber}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
index 33c33bcf..42e0f26d 100644
--- a/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty beanHelper.faxNumber}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
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 df6fefcd..180ad4c0 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
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty beanHelper.contact}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
diff --git a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
index 2665a383..c3aa9fff 100644
--- a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty beanHelper.faxNumber}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
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 22134c7d..d81e62cc 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
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty beanHelper.contact}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
index 0e721a16..52cc1c22 100644
--- a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
index 4ed5e600..82b3ecf4 100644
--- a/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty beanHelper.contact}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
index 45d494ec..4e8b11b6 100644
--- a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
index 4292e6dd..25b36dd3 100644
--- a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
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 0371fcd6..b4892289 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
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty beanHelper.contact}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
index 6066cbec..9f56cfa1 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
index de0dd7e7..9580d1da 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty beanHelper.contact}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
index f579fab2..fbcc22db 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
index 48d218af..0458bd9b 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
index cc7ce2da..e91047b4 100644
--- a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty mode}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ADMIN_USER_DATA_PASSWORD_NOTICE}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
diff --git a/web/WEB-INF/templates/admin/user/admin_user_links.tpl b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
index f5855475..d7c209c6 100644
--- a/web/WEB-INF/templates/admin/user/admin_user_links.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty beanHelper.user}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_USER_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
index 3c24222d..3ea18220 100644
--- a/web/WEB-INF/templates/base.tpl
+++ b/web/WEB-INF/templates/base.tpl
@@ -46,7 +46,8 @@
 						<ui:insert name="menu">
 							<h:outputText value="Default menu" />
 						</ui:insert>
-						<ui:include src="/WEB-INF/templates/generic/locale_selection_box.tpl" />
+
+						<ui:include src="/WEB-INF/templates/widgets/locale_change_widget.tpl" />
 					</div>
 
 					<h:panelGroup id="content_outer" class="left_content" layout="block">
diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index 7f80980d..6b75bebe 100644
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -23,7 +23,7 @@
 				</div>
 
 				<div class="table_right_medium">
-					<ui:include src="/WEB-INF/templates/generic/personal_title_selection_box.tpl">
+					<ui:include src="/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl">
 						<ui:param  name="targetController" value="#{contactController}" />
 					</ui:include>
 				</div>
@@ -267,15 +267,9 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select right_space" id="mobileProvider" value="#{contactController.mobileProvider}">
-						<f:converter converterId="MobileProviderConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
-					</h:selectOneMenu>
-
-					<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{contactController.mobileNumber}">
-						<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					<ui:include src="/WEB-INF/templates/selection_boxes/mobile_selection_box.tpl">
+						<ui:param name="targetController" value="#{adminContactController}" />
+					</ui:include>
 				</div>
 
 				<div class="clear"></div>
@@ -296,7 +290,7 @@
 					</div>
 
 					<div class="table_right_medium">
-						<ui:include src="/WEB-INF/templates/generic/profile_mode_selection_box.tpl" />
+						<ui:include src="/WEB-INF/templates/selection_boxes/profile_mode_selection_box.tpl" />
 					</div>
 
 					<div class="clear"></div>
diff --git a/web/WEB-INF/templates/generic/locale_selection_box.tpl b/web/WEB-INF/templates/generic/locale_selection_box.tpl
deleted file mode 100644
index c4b41bc6..00000000
--- a/web/WEB-INF/templates/generic/locale_selection_box.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<h:form>
-		<h:panelGroup layout="block" styleClass="locale_selection_container">
-			<h:panelGroup layout="block">
-				<h:selectOneMenu styleClass="select" 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>
-			</h:panelGroup>
-
-			<h:commandButton styleClass="submit" type="submit" action="#{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/templates/generic/message_box.tpl b/web/WEB-INF/templates/generic/message_box.tpl
deleted file mode 100644
index 07c5b1e4..00000000
--- a/web/WEB-INF/templates/generic/message_box.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	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"
-	>
-
-	<div class="message_box">
-		<div class="message_header">
-			<h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
-		</div>
-
-		<ui:fragment rendered="#{not empty message}">
-			<ui:fragment rendered="#{not empty styleClass}">
-				<div class="para">
-					<h:outputText styleClass="#{styleClass}" value="#{message}" />
-				</div>
-			</ui:fragment>
-
-			<ui:fragment rendered="#{empty styleClass}">
-				<div class="para">
-					<h:outputText styleClass="okay" value="#{message}" />
-				</div>
-			</ui:fragment>
-		</ui:fragment>
-
-		<ui:fragment rendered="#{empty message}">
-			<div class="errors para">
-				<h:outputText value="#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}" />
-			</div>
-		</ui:fragment>
-	</div>
-</ui:composition>
diff --git a/web/WEB-INF/templates/generic/message_box_mini.tpl b/web/WEB-INF/templates/generic/message_box_mini.tpl
deleted file mode 100644
index e8e1c560..00000000
--- a/web/WEB-INF/templates/generic/message_box_mini.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	>
-
-	<div class="message_box_mini">
-		<div class="message_header">
-			<h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
-		</div>
-
-		<ui:fragment rendered="#{not empty message}">
-			<ui:fragment rendered="#{not empty styleClass}">
-				<div class="para">
-					<h:outputText styleClass="#{styleClass}" value="#{message}" />
-				</div>
-			</ui:fragment>
-
-			<ui:fragment rendered="#{empty styleClass}">
-				<div class="para">
-					<h:outputText styleClass="okay" value="#{message}" />
-				</div>
-			</ui:fragment>
-		</ui:fragment>
-
-		<ui:fragment rendered="#{empty message}">
-			<div class="errors para">
-				<h:outputText value="#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}" />
-			</div>
-		</ui:fragment>
-	</div>
-</ui:composition>
diff --git a/web/WEB-INF/templates/generic/mobile_selection_box.tpl b/web/WEB-INF/templates/generic/mobile_selection_box.tpl
deleted file mode 100644
index 56be7e90..00000000
--- a/web/WEB-INF/templates/generic/mobile_selection_box.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<ui:fragment rendered="#{not empty targetController}">
-		<h:selectOneMenu styleClass="select" id="mobileProvider" value="#{targetController.mobileProvider}">
-			<f:converter converterId="MobileProviderConverter" />
-			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-			<f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
-		</h:selectOneMenu>
-
-		<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
-			<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-		</h:inputText>
-	</ui:fragment>
-
-	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
-</ui:composition>
diff --git a/web/WEB-INF/templates/generic/personal_title_selection_box.tpl b/web/WEB-INF/templates/generic/personal_title_selection_box.tpl
deleted file mode 100644
index 7cd411bd..00000000
--- a/web/WEB-INF/templates/generic/personal_title_selection_box.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<ui:fragment rendered="#{empty targetController}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-			<ui:param name="message" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" />
-			<ui:param name="styleClass" value="errors" />
-		</ui:include>
-	</ui:fragment>
-
-	<ui:fragment rendered="#{not empty targetController}">
-		<h:selectOneMenu styleClass="select" id="personalTitle" value="#{targetController.personalTitle}" required="#{featureController.isFeatureEnabled(targetController.controllerType.concat('_personal_title'))}" requiredMessage="#{msg.FIELD_PERSONAL_TITLE_REQUIRED}">
-			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
-			<f:selectItems value="#{genderController.selectableGenders}" var="personalTitle" itemValue="#{personalTitle}" itemLabel="#{msg[personalTitle.messageKey]}" />
-		</h:selectOneMenu>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/templates/generic/profile_mode_selection_box.tpl b/web/WEB-INF/templates/generic/profile_mode_selection_box.tpl
deleted file mode 100644
index 680c63eb..00000000
--- a/web/WEB-INF/templates/generic/profile_mode_selection_box.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<h:selectOneMenu styleClass="select" id="profileMode" value="#{userController.userProfileMode}">
-		<f:selectItems value="#{profileModeController.allProfileModes}" var="mode" itemValue="#{mode}" itemLabel="#{msg[mode.messageKey]}" />
-	</h:selectOneMenu>
-</ui:composition>
diff --git a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
index ecddbde6..7849f34e 100644
--- a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty targetController}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
diff --git a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
index 6bec8872..da4cb793 100644
--- a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty targetController}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
diff --git a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
index a9ccc2e1..1bfa5771 100644
--- a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
@@ -6,21 +6,15 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty targetController}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
 	</ui:fragment>
 
 	<ui:fragment rendered="#{not empty targetController}">
-		<h:selectOneMenu styleClass="select right_space" id="mobileProvider" value="#{targetController.mobileProvider}">
-			<f:converter converterId="MobileProviderConverter" />
-			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-			<f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
-		</h:selectOneMenu>
-
-		<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
-			<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-		</h:inputText>
+		<ui:include src="/WEB-INF/templates/selection_boxes/mobile_selection_box.tpl">
+			<ui:param name="targetController" value="#{adminContactController}" />
+		</ui:include>
 	</ui:fragment>
 </ui:composition>
diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index f398c0f2..00c63b1c 100644
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -15,7 +15,7 @@
 
 	<ui:define name="menu">
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-			<ui:include src="/WEB-INF/templates/generic/message_box_mini.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box_mini.tpl">
 				<ui:param name="message" value="#{msg.USER_NOT_LOGGED_IN}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/WEB-INF/templates/messages/message_box.tpl b/web/WEB-INF/templates/messages/message_box.tpl
new file mode 100644
index 00000000..07c5b1e4
--- /dev/null
+++ b/web/WEB-INF/templates/messages/message_box.tpl
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	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"
+	>
+
+	<div class="message_box">
+		<div class="message_header">
+			<h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
+		</div>
+
+		<ui:fragment rendered="#{not empty message}">
+			<ui:fragment rendered="#{not empty styleClass}">
+				<div class="para">
+					<h:outputText styleClass="#{styleClass}" value="#{message}" />
+				</div>
+			</ui:fragment>
+
+			<ui:fragment rendered="#{empty styleClass}">
+				<div class="para">
+					<h:outputText styleClass="okay" value="#{message}" />
+				</div>
+			</ui:fragment>
+		</ui:fragment>
+
+		<ui:fragment rendered="#{empty message}">
+			<div class="errors para">
+				<h:outputText value="#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}" />
+			</div>
+		</ui:fragment>
+	</div>
+</ui:composition>
diff --git a/web/WEB-INF/templates/messages/message_box_mini.tpl b/web/WEB-INF/templates/messages/message_box_mini.tpl
new file mode 100644
index 00000000..e8e1c560
--- /dev/null
+++ b/web/WEB-INF/templates/messages/message_box_mini.tpl
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	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"
+	>
+
+	<div class="message_box_mini">
+		<div class="message_header">
+			<h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
+		</div>
+
+		<ui:fragment rendered="#{not empty message}">
+			<ui:fragment rendered="#{not empty styleClass}">
+				<div class="para">
+					<h:outputText styleClass="#{styleClass}" value="#{message}" />
+				</div>
+			</ui:fragment>
+
+			<ui:fragment rendered="#{empty styleClass}">
+				<div class="para">
+					<h:outputText styleClass="okay" value="#{message}" />
+				</div>
+			</ui:fragment>
+		</ui:fragment>
+
+		<ui:fragment rendered="#{empty message}">
+			<div class="errors para">
+				<h:outputText value="#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}" />
+			</div>
+		</ui:fragment>
+	</div>
+</ui:composition>
diff --git a/web/WEB-INF/templates/selection_boxes/mobile_selection_box.tpl b/web/WEB-INF/templates/selection_boxes/mobile_selection_box.tpl
new file mode 100644
index 00000000..56be7e90
--- /dev/null
+++ b/web/WEB-INF/templates/selection_boxes/mobile_selection_box.tpl
@@ -0,0 +1,21 @@
+<?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">
+
+	<ui:fragment rendered="#{not empty targetController}">
+		<h:selectOneMenu styleClass="select" id="mobileProvider" value="#{targetController.mobileProvider}">
+			<f:converter converterId="MobileProviderConverter" />
+			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+			<f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
+		</h:selectOneMenu>
+
+		<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
+			<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
+		</h:inputText>
+	</ui:fragment>
+
+	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
+</ui:composition>
diff --git a/web/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl b/web/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl
new file mode 100644
index 00000000..c09e757a
--- /dev/null
+++ b/web/WEB-INF/templates/selection_boxes/personal_title_selection_box.tpl
@@ -0,0 +1,21 @@
+<?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">
+
+	<ui:fragment rendered="#{empty targetController}">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
+
+	<ui:fragment rendered="#{not empty targetController}">
+		<h:selectOneMenu styleClass="select" id="personalTitle" value="#{targetController.personalTitle}" required="#{featureController.isFeatureEnabled(targetController.controllerType.concat('_personal_title'))}" requiredMessage="#{msg.FIELD_PERSONAL_TITLE_REQUIRED}">
+			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
+			<f:selectItems value="#{genderController.selectableGenders}" var="personalTitle" itemValue="#{personalTitle}" itemLabel="#{msg[personalTitle.messageKey]}" />
+		</h:selectOneMenu>
+	</ui:fragment>
+</ui:composition>
diff --git a/web/WEB-INF/templates/selection_boxes/profile_mode_selection_box.tpl b/web/WEB-INF/templates/selection_boxes/profile_mode_selection_box.tpl
new file mode 100644
index 00000000..680c63eb
--- /dev/null
+++ b/web/WEB-INF/templates/selection_boxes/profile_mode_selection_box.tpl
@@ -0,0 +1,11 @@
+<?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">
+
+	<h:selectOneMenu styleClass="select" id="profileMode" value="#{userController.userProfileMode}">
+		<f:selectItems value="#{profileModeController.allProfileModes}" var="mode" itemValue="#{mode}" itemLabel="#{msg[mode.messageKey]}" />
+	</h:selectOneMenu>
+</ui:composition>
diff --git a/web/WEB-INF/templates/user/user_profile_link.tpl b/web/WEB-INF/templates/user/user_profile_link.tpl
index 1ddb6de7..47abe987 100644
--- a/web/WEB-INF/templates/user/user_profile_link.tpl
+++ b/web/WEB-INF/templates/user/user_profile_link.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{empty user}">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.ERROR_PARAMETER_USER_NOT_SET}" />
 			<ui:param name="styleClass" value="errors" />
 		</ui:include>
diff --git a/web/WEB-INF/templates/widgets/locale_change_widget.tpl b/web/WEB-INF/templates/widgets/locale_change_widget.tpl
new file mode 100644
index 00000000..c4b41bc6
--- /dev/null
+++ b/web/WEB-INF/templates/widgets/locale_change_widget.tpl
@@ -0,0 +1,20 @@
+<?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">
+
+	<h:form>
+		<h:panelGroup layout="block" styleClass="locale_selection_container">
+			<h:panelGroup layout="block">
+				<h:selectOneMenu styleClass="select" 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>
+			</h:panelGroup>
+
+			<h:commandButton styleClass="submit" type="submit" action="#{localizationController.doChangeLocale()}" value="#{msg.BUTTON_CHANGE_LOCALE}" title="#{msg.BUTTON_CHANGE_LOCALE_TITLE}" />
+		</h:panelGroup>
+	</h:form>
+</ui:composition>
diff --git a/web/admin/business_data/admin_business_data_list.xhtml b/web/admin/business_data/admin_business_data_list.xhtml
new file mode 100644
index 00000000..a2e1553a
--- /dev/null
+++ b/web/admin/business_data/admin_business_data_list.xhtml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+				xmlns="http://www.w3.org/1999/xhtml"
+				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+				xmlns:h="http://xmlns.jcp.org/jsf/html"
+				xmlns:f="http://xmlns.jcp.org/jsf/core">
+
+	<ui:define name="admin_title">
+		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_BUSINESS}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_BUSINESS}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<ui:fragment rendered="#{businessDataController.allBusinessContacts().isEmpty()}">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
+				<ui:param name="message" value="#{msg.ADMIN_CONTACT_BUSINESS_LIST_EMPTY}" />
+				<ui:param name="styleClass" value="errors" />
+			</ui:include>
+		</ui:fragment>
+
+		<h:dataTable id="table_list_business_contacts" var="businessContact" value="#{businessDataController.allBusinessContacts()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT_BUSINESS}" rendered="#{not businessDataController.allBusinessContacts().isEmpty()}">
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_ID}" />
+				</f:facet>
+
+				<h:link outcome="admin_show_business_data" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE}" value="#{businessContact.businessDataId}">
+					<f:param name="businessDataId" value="#{businessContact.businessDataId}" />
+				</h:link>
+			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_OWNER_ID}" />
+				</f:facet>
+
+				<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_CONTACT_BUSINESS_OWNER_USER_TITLE}" value="#{businessContact.contactCompanyUserOwner.userId}" rendered="#{not empty businessContact.contactCompanyUserOwner}" />
+
+				<h:link outcome="admin_assign_business_data_owner" title="#{msg.ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_OWNER_USER_TITLE}" value="#{msg[ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_OWNER_USER]}" rendered="#{empty businessContact.contactCompanyUserOwner}" />
+			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_COMPANY_NAME}" />
+				</f:facet>
+
+				<h:outputText value="#{businessContact.companyName} #{businessContact.companyLegalStatus}" />
+			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_CONTACT_PERSON}" />
+				</f:facet>
+
+				<h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_CONTACT_BUSINESS_CONTACT_PERSON_TITLE}" value="#{businessContact.companyContact.employeeId}" rendered="#{not empty businessContact.companyContact}" />
+
+				<h:link outcome="admin_assign_business_data_contact" title="#{msg.ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_CONTACT_PERSON_TITLE}" value="#{msg[ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_CONTACT_PERSON]}" rendered="#{empty businessContact.companyContact}" />
+			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_CREATED}" />
+				</f:facet>
+
+				<h:outputText id="contactCreated" value="#{businessContact.contactCreated.time}">
+					<f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
+				</h:outputText>
+			</h:column>
+		</h:dataTable>
+
+		<h:form id="form_admin_add_business_data">
+			<h:panelGroup styleClass="table_medium" layout="block">
+				<div class="table_header">
+					<h:outputText value="#{msg.ADMIN_ADD_CONTACT_BUSINESS_TITLE}" />
+				</div>
+
+				<div class="para">
+					<h:outputText value="#{msg.ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA}" />
+				</div>
+
+				<ui:include src="/WEB-INF/templates/admin/business_data/admin_form_business_data_data.tpl" />
+
+				<div class="table_footer">
+					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<h:commandButton styleClass="submit" type="submit" id="add_business_basic_data" value="#{msg.BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON}" action="#{adminBusinessDataController.addBusinessBasicData()}" />
+				</div>
+			</h:panelGroup>
+		</h:form>
+	</ui:define>
+</ui:composition>
diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index d02fb758..e334721f 100644
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -22,7 +22,7 @@
 
 	<ui:define name="content">
 		<ui:fragment rendered="#{empty beanHelper.contact}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index 8ae087e9..41ed4f56 100644
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -22,7 +22,7 @@
 
 	<ui:define name="content">
 		<ui:fragment rendered="#{empty beanHelper.contact}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index 4bd0584e..942d4470 100644
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -16,7 +16,7 @@
 
 	<ui:define name="content">
 		<ui:fragment rendered="#{contactController.allContacts().isEmpty()}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ADMIN_CONTACT_LIST_EMPTY}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index 03d8c0e1..a7a50196 100644
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -15,7 +15,7 @@
 
 	<ui:define name="content">
 		<ui:fragment rendered="#{contactController.allContacts().isEmpty()}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ADMIN_CONTACT_LIST_EMPTY}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
index 5820d498..60b6c5f3 100644
--- a/web/admin/contact/admin_contact_show.xhtml
+++ b/web/admin/contact/admin_contact_show.xhtml
@@ -22,7 +22,7 @@
 
 	<ui:define name="content">
 		<ui:fragment rendered="#{empty beanHelper.contact}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index e9d23a02..56743a07 100644
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -53,14 +53,14 @@
 		</h:form>
 
 		<ui:fragment rendered="#{empty beanHelper.faxNumber}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
 		</ui:fragment>
 
 		<ui:fragment rendered="#{empty beanHelper.contact}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index 5c6788d5..906f4b9b 100644
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -51,14 +51,14 @@
 		</h:form>
 
 		<ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
 		</ui:fragment>
 
 		<ui:fragment rendered="#{empty beanHelper.contact}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index 4735bdaf..72ee0953 100644
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -51,14 +51,14 @@
 		</h:form>
 
 		<ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
 		</ui:fragment>
 
 		<ui:fragment rendered="#{empty beanHelper.contact}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/contact_business/admin_contact_business_list.xhtml b/web/admin/contact_business/admin_contact_business_list.xhtml
deleted file mode 100644
index bf0024b8..00000000
--- a/web/admin/contact_business/admin_contact_business_list.xhtml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core">
-
-	<ui:define name="admin_title">
-		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_BUSINESS}" />
-	</ui:define>
-
-	<ui:define name="content_header">
-		<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_BUSINESS}" />
-	</ui:define>
-
-	<ui:define name="content">
-		<ui:fragment rendered="#{businessDataController.allBusinessContacts().isEmpty()}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-				<ui:param name="message" value="#{msg.ADMIN_CONTACT_BUSINESS_LIST_EMPTY}" />
-				<ui:param name="styleClass" value="errors" />
-			</ui:include>
-		</ui:fragment>
-
-		<h:dataTable id="table_list_business_contacts" var="businessContact" value="#{businessDataController.allBusinessContacts()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT_BUSINESS}" rendered="#{not businessDataController.allBusinessContacts().isEmpty()}">
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_ID}" />
-				</f:facet>
-
-				<h:link outcome="admin_show_contact_business" title="#{msg.ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE}" value="#{businessContact.businessDataId}">
-					<f:param name="businessDataId" value="#{businessContact.businessDataId}" />
-				</h:link>
-			</h:column>
-
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_OWNER_ID}" />
-				</f:facet>
-
-				<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_CONTACT_BUSINESS_OWNER_USER_TITLE}" value="#{businessContact.contactCompanyUserOwner.userId}" rendered="#{not empty businessContact.contactCompanyUserOwner}" />
-
-				<h:link outcome="admin_assign_contact_business_owner" title="#{msg.ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_OWNER_USER_TITLE}" value="#{msg[ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_OWNER_USER]}" rendered="#{empty businessContact.contactCompanyUserOwner}" />
-			</h:column>
-
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_COMPANY_NAME}" />
-				</f:facet>
-
-				<h:outputText value="#{businessContact.companyName} #{businessContact.companyLegalStatus}" />
-			</h:column>
-
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_CONTACT_PERSON}" />
-				</f:facet>
-
-				<h:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_CONTACT_BUSINESS_CONTACT_PERSON_TITLE}" value="#{businessContact.companyContact.employeeId}" rendered="#{not empty businessContact.companyContact}" />
-
-				<h:link outcome="admin_assign_contact_business_contact" title="#{msg.ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_CONTACT_PERSON_TITLE}" value="#{msg[ADMIN_LINK_ASSIGN_CONTACT_BUSINESS_CONTACT_PERSON]}" rendered="#{empty businessContact.companyContact}" />
-			</h:column>
-
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_CREATED}" />
-				</f:facet>
-
-				<h:outputText id="contactCreated" value="#{businessContact.contactCreated.time}">
-					<f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
-				</h:outputText>
-			</h:column>
-		</h:dataTable>
-
-		<h:form id="form_admin_add_contact_business">
-			<h:panelGroup styleClass="table_medium" layout="block">
-				<div class="table_header">
-					<h:outputText value="#{msg.ADMIN_ADD_CONTACT_BUSINESS_TITLE}" />
-				</div>
-
-				<div class="para">
-					<h:outputText value="#{msg.ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA}" />
-				</div>
-
-				<ui:include src="/WEB-INF/templates/admin/contact_business/admin_form_contact_business_data.tpl" />
-
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="submit" type="submit" id="add_business_basic_data" value="#{msg.BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON}" action="#{adminBusinessDataController.addBusinessBasicData()}" />
-				</div>
-			</h:panelGroup>
-		</h:form>
-	</ui:define>
-</ui:composition>
diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index 8477adb9..6da5063c 100644
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -45,7 +45,7 @@
 		</h:form>
 
 		<ui:fragment rendered="#{empty beanHelper.faxNumber}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index 14acb2f1..5cfe15ff 100644
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_edit.xhtml
@@ -39,7 +39,7 @@
 		</h:form>
 
 		<ui:fragment rendered="#{empty beanHelper.faxNumber}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml
index fb577651..1df83790 100644
--- a/web/admin/fax/admin_fax_list.xhtml
+++ b/web/admin/fax/admin_fax_list.xhtml
@@ -55,7 +55,7 @@
 		</h:dataTable>
 
 		<ui:fragment rendered="#{phoneController.allFaxNumbers().isEmpty()}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ADMIN_LIST_FAX_NUMBER_EMPTY}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index 9c9894c0..486ff2d7 100644
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.xhtml
@@ -45,7 +45,7 @@
 		</h:form>
 
 		<ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml
index d4f0a1e7..969a36fa 100644
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_edit.xhtml
@@ -39,7 +39,7 @@
 		</h:form>
 
 		<ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml
index 8767fe93..426230c8 100644
--- a/web/admin/landline/admin_landline_list.xhtml
+++ b/web/admin/landline/admin_landline_list.xhtml
@@ -55,7 +55,7 @@
 		</h:dataTable>
 
 		<ui:fragment rendered="#{phoneController.allLandLineNumbers().isEmpty()}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ADMIN_LIST_LAND_LINE_EMPTY}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index eae1af98..a7b54554 100644
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -45,7 +45,7 @@
 		</h:form>
 
 		<ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index e067086f..c5c6c1fa 100644
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -39,7 +39,7 @@
 		</h:form>
 
 		<ui:fragment rendered="#{empty beanHelper.mobileNumber}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml
index 8f0ea330..e6bedf9a 100644
--- a/web/admin/mobile/admin_mobile_list.xhtml
+++ b/web/admin/mobile/admin_mobile_list.xhtml
@@ -65,7 +65,7 @@
 		</h:dataTable>
 
 		<ui:fragment rendered="#{phoneController.allMobileNumbers().isEmpty()}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ADMIN_LIST_MOBILE_EMPTY}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index 686c0e7d..6991e52c 100644
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -22,7 +22,7 @@
 
 	<ui:define name="content">
 		<ui:fragment rendered="#{empty beanHelper.user}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index f988b3ec..b95f567a 100644
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -22,7 +22,7 @@
 
 	<ui:define name="content">
 		<ui:fragment rendered="#{empty beanHelper.user}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index fef405b5..e6602eeb 100644
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -22,7 +22,7 @@
 
 	<ui:define name="content">
 		<ui:fragment rendered="#{empty beanHelper.user}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index 79731fec..db18fe83 100644
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -16,7 +16,7 @@
 
 	<ui:define name="content">
 		<ui:fragment rendered="#{userController.allUsers().isEmpty()}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ADMIN_USER_LIST_EMPTY}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 14a7b0a9..74267d91 100644
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -15,7 +15,7 @@
 
 	<ui:define name="content">
 		<ui:fragment rendered="#{userController.allUsers().isEmpty()}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ADMIN_USER_LIST_EMPTY}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index c88cb2be..0f1e7b0e 100644
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -22,7 +22,7 @@
 
 	<ui:define name="content">
 		<ui:fragment rendered="#{empty beanHelper.user}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml
index dba93f62..aab5e8e6 100644
--- a/web/admin/user/admin_user_resend_confirmation_link.xhtml
+++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml
@@ -22,7 +22,7 @@
 
 	<ui:define name="content">
 		<ui:fragment rendered="#{empty beanHelper.user}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 993374a9..02c2dddc 100644
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -22,7 +22,7 @@
 
 	<ui:define name="content">
 		<ui:fragment rendered="#{empty beanHelper.user}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index d98c0368..074c56d1 100644
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -22,7 +22,7 @@
 
 	<ui:define name="content">
 		<ui:fragment rendered="#{empty beanHelper.user}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml
index c9c380d8..da804aa4 100644
--- a/web/guest/user/user_confirm_account.xhtml
+++ b/web/guest/user/user_confirm_account.xhtml
@@ -37,7 +37,7 @@
 			</h:panelGroup>
 
 			<ui:fragment rendered="#{empty beanHelper.user}">
-				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+				<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 					<ui:param name="message" value="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" />
 					<ui:param name="styleClass" value="errors" />
 				</ui:include>
@@ -45,7 +45,7 @@
 		</ui:fragment>
 
 		<ui:fragment rendered="#{empty userConfirmationLinkController.confirmationKey}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml
index 663d97a9..ba45e295 100644
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -41,7 +41,7 @@
 		</h:panelGroup>>
 
 		<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_list')}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_USER_LIST_DISABLED}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml
index bf08a860..55e02a4c 100644
--- a/web/guest/user/user_login.xhtml
+++ b/web/guest/user/user_login.xhtml
@@ -33,7 +33,7 @@
 		</ui:fragment>
 
 		<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml
index cab17c33..a68301a6 100644
--- a/web/guest/user/user_lost_password.xhtml
+++ b/web/guest/user/user_lost_password.xhtml
@@ -67,7 +67,7 @@
 		</ui:fragment>
 
 		<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
index 200bf166..34296e01 100644
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -31,7 +31,7 @@
 			</ui:fragment>
 
 			<ui:fragment rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}">
-				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+				<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 					<ui:param name="message" value="#{msg.ERROR_PROFILE_NOT_VISIBLE}" />
 					<ui:param name="styleClass" value="errors" />
 				</ui:include>
@@ -49,7 +49,7 @@
 		</ui:fragment>
 
 		<ui:fragment rendered="#{not userController.isPublicUserProfileEnabled()}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml
index 128e806c..792cf678 100644
--- a/web/guest/user/user_register.xhtml
+++ b/web/guest/user/user_register.xhtml
@@ -35,14 +35,14 @@
 		</ui:fragment>
 
 		<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration')}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
 		</ui:fragment>
 
 		<ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/guest/user/user_register_page2.xhtml b/web/guest/user/user_register_page2.xhtml
index d18f23ec..2c982608 100644
--- a/web/guest/user/user_register_page2.xhtml
+++ b/web/guest/user/user_register_page2.xhtml
@@ -29,7 +29,7 @@
 		</ui:fragment>
 
 		<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_NOT_ENABLED}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/guest/user/user_resend_done.xhtml b/web/guest/user/user_resend_done.xhtml
index 8f6d50d7..f291735a 100644
--- a/web/guest/user/user_resend_done.xhtml
+++ b/web/guest/user/user_resend_done.xhtml
@@ -14,7 +14,7 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+		<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 			<ui:param name="message" value="#{msg.GUEST_USER_RESEND_LINK_COMPLETED}" />
 		</ui:include>
 	</ui:define>
diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml
index cb9aa3a2..92742a69 100644
--- a/web/guest/user/user_resend_link.xhtml
+++ b/web/guest/user/user_resend_link.xhtml
@@ -54,7 +54,7 @@
 		</h:form>
 
 		<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
index afd73815..170e5fcb 100644
--- a/web/user/login_contact_data_saved.xhtml
+++ b/web/user/login_contact_data_saved.xhtml
@@ -15,7 +15,7 @@
 
 	<ui:define name="content">
 		<ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
 			</ui:include>
 		</ui:fragment>
diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml
index c21ff285..6ddb2373 100644
--- a/web/user/login_data_saved.xhtml
+++ b/web/user/login_data_saved.xhtml
@@ -15,7 +15,7 @@
 
 	<ui:define name="content">
 		<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
 			</ui:include>
 		</ui:fragment>
diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml
index 2127d8a0..36821750 100644
--- a/web/user/login_user_change_email_address.xhtml
+++ b/web/user/login_user_change_email_address.xhtml
@@ -52,7 +52,7 @@
 		</h:panelGroup>
 
 		<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml
index 16e42405..7eddb313 100644
--- a/web/user/login_user_change_password.xhtml
+++ b/web/user/login_user_change_password.xhtml
@@ -15,7 +15,7 @@
 
 	<ui:define name="content">
 		<ui:fragment rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" />
 			</ui:include>
 		</ui:fragment>
@@ -79,7 +79,7 @@
 		</ui:fragment>
 
 		<ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_password')}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/user/login_user_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml
index 89e5b773..18b8be0d 100644
--- a/web/user/login_user_change_personal_data.xhtml
+++ b/web/user/login_user_change_personal_data.xhtml
@@ -34,7 +34,7 @@
 		</h:panelGroup>
 
 		<ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/user/login_user_contact_data_saved.xhtml b/web/user/login_user_contact_data_saved.xhtml
index 3fe4121f..047c2649 100644
--- a/web/user/login_user_contact_data_saved.xhtml
+++ b/web/user/login_user_contact_data_saved.xhtml
@@ -15,7 +15,7 @@
 
 	<ui:define name="content">
 		<ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
 			</ui:include>
 		</ui:fragment>
@@ -25,7 +25,7 @@
 		</ui:fragment>
 
 		<ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
 				<ui:param name="styleClass" value="errors" />
 			</ui:include>
diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml
index 6f9eadcc..aa7c6062 100644
--- a/web/user/login_user_data_saved.xhtml
+++ b/web/user/login_user_data_saved.xhtml
@@ -15,7 +15,7 @@
 
 	<ui:define name="content">
 		<ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
 				<ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
 			</ui:include>
 		</ui:fragment>