From bfa1a6cd083ffea7eab3a4779ae1676e8119c4fc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 15 Aug 2016 15:49:44 +0200
Subject: [PATCH] Continued with switching vanilla HTML -> JSF2.0 tags: (please
 cherry-pick) - Switched some div tags (for "tables") to h:panelGroup - Maybe
 more can be changed without having ugly nested h:panelGroup tags ?
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../admin/contact/admin_contact_links.tpl     |  40 +++---
 .../templates/admin/user/admin_user_links.tpl |  64 +++++-----
 .../templates/guest/user/guest_login_form.tpl |   4 +-
 .../register/guest_form_register_page1.tpl    |   4 +-
 .../register/guest_form_register_page2.tpl    |   4 +-
 .../register/guest_form_register_single.tpl   |   4 +-
 .../templates/user/user_not_logged_in.tpl     |   4 +-
 web/WEB-INF/templates/user/userid_error.tpl   |   4 +-
 web/admin/admin_logout.xhtml                  |   4 +-
 .../cellphone/admin_cellphone_delete.xhtml    |   4 +-
 .../cellphone/admin_cellphone_edit.xhtml      |   4 +-
 .../admin_contact_cellphone_unlink.xhtml      |   4 +-
 web/admin/contact/admin_contact_delete.xhtml  |   4 +-
 web/admin/contact/admin_contact_edit.xhtml    |   4 +-
 web/admin/contact/admin_contact_export.xhtml  |   4 +-
 web/admin/contact/admin_contact_list.xhtml    |   7 +-
 web/admin/country/admin_country_list.xhtml    |   4 +-
 .../admin_mobile_provider_list.xhtml          |   4 +-
 web/admin/user/admin_user_edit.xhtml          |   4 +-
 web/admin/user/admin_user_export.xhtml        |   4 +-
 web/admin/user/admin_user_list.xhtml          |   4 +-
 web/admin/user/admin_user_lock.xhtml          |   4 +-
 web/admin/user/admin_user_unlock.xhtml        |   4 +-
 web/guest/user/confirm_account.xhtml          |  28 ++---
 web/guest/user/lost_passwd.xhtml              |   4 +-
 web/guest/user/resend_link.xhtml              |   4 +-
 web/guest/user/user_list.xhtml                |  35 +++---
 web/user/login_change_email_address.xhtml     |  60 +++++----
 web/user/login_change_password.xhtml          | 114 +++++++++---------
 web/user/login_change_personal_data.xhtml     |  30 +++--
 web/user/login_edit_user_data.xhtml           |  62 +++++-----
 web/user/login_logout.xhtml                   |   4 +-
 32 files changed, 260 insertions(+), 272 deletions(-)

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 175474e2..312e437c 100644
--- a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
@@ -7,28 +7,26 @@
 
 	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
 
-	<ui:fragment rendered="#{not empty beanHelper.contact}">
-		<div class="table">
-			<div class="table_header">
-				<h:outputText value="#{msg.ADMIN_LINKS_HEADER}" />
-			</div>
+	<h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.contact}">
+		<div class="table_header">
+			<h:outputText value="#{msg.ADMIN_LINKS_HEADER}" />
+		</div>
 
-			<div class="table_row">
-				<ul>
-					<li>
-						<h:link outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_CONTACT}" title="#{msg.ADMIN_LINK_EDIT_CONTACT_TITLE}">
-							<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-						</h:link>
-					</li>
+		<div class="table_row">
+			<ul>
+				<li>
+					<h:link outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_CONTACT}" title="#{msg.ADMIN_LINK_EDIT_CONTACT_TITLE}">
+						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+					</h:link>
+				</li>
 
-					<li>
-						<h:link outcome="admin_delete_contact" title="#{msg.ADMIN_LINK_DELETE_CONTACT_TITLE}">
-							<h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_CONTACT}" />
-							<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-						</h:link>
-					</li>
-				</ul>
-			</div>
+				<li>
+					<h:link outcome="admin_delete_contact" title="#{msg.ADMIN_LINK_DELETE_CONTACT_TITLE}">
+						<h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_CONTACT}" />
+						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+					</h:link>
+				</li>
+			</ul>
 		</div>
-	</ui:fragment>
+	</h:panelGroup>
 </ui:composition>
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 34cb19a5..180cc90b 100644
--- a/web/WEB-INF/templates/admin/user/admin_user_links.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
@@ -7,46 +7,44 @@
 
 	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_USER_NOT_SET}" rendered="#{empty beanHelper.user}" />
 
-	<ui:fragment rendered="#{not empty beanHelper.user}">
-		<div class="table">
-			<div class="table_header">
-				<h:outputText value="#{msg.ADMIN_LINKS_HEADER}" />
-			</div>
+	<h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.user}">
+		<div class="table_header">
+			<h:outputText value="#{msg.ADMIN_LINKS_HEADER}" />
+		</div>
 
-			<div class="table_row">
-				<ul>
-					<li>
-						<h:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_USER}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
-							<f:param name="userId" value="#{beanHelper.user.userId}" />
-						</h:link>
-					</li>
+		<div class="table_row">
+			<ul>
+				<li>
+					<h:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_USER}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
+						<f:param name="userId" value="#{beanHelper.user.userId}" />
+					</h:link>
+				</li>
+
+				<li>
+					<h:link outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_CONTACT}" title="#{msg.ADMIN_LINK_EDIT_CONTACT_TITLE}">
+						<f:param name="contactId" value="#{beanHelper.user.userContact.contactId}" />
+					</h:link>
+				</li>
 
+				<ui:fragment rendered="#{beanHelper.user.userAccountStatus != 'UNCONFIRMED'}">
 					<li>
-						<h:link outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_CONTACT}" title="#{msg.ADMIN_LINK_EDIT_CONTACT_TITLE}">
-							<f:param name="contactId" value="#{beanHelper.user.userContact.contactId}" />
+						<h:link outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_USER}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
+							<f:param name="userId" value="#{beanHelper.user.userId}" />
 						</h:link>
-					</li>
-
-					<ui:fragment rendered="#{beanHelper.user.userAccountStatus != 'UNCONFIRMED'}">
-						<li>
-							<h:link outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_USER}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
-								<f:param name="userId" value="#{beanHelper.user.userId}" />
-							</h:link>
 
-							<h:link outcome="admin_lock_user" value="#{msg.ADMIN_LINK_LOCK_USER}" title="#{msg.ADMIN_LINK_LOCK_USER_TITLE}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
-								<f:param name="userId" value="#{beanHelper.user.userId}" />
-							</h:link>
-						</li>
-					</ui:fragment>
-
-					<li>
-						<h:link outcome="admin_delete_user" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}">
-							<h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_USER}" />
+						<h:link outcome="admin_lock_user" value="#{msg.ADMIN_LINK_LOCK_USER}" title="#{msg.ADMIN_LINK_LOCK_USER_TITLE}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
 							<f:param name="userId" value="#{beanHelper.user.userId}" />
 						</h:link>
 					</li>
-				</ul>
-			</div>
+				</ui:fragment>
+
+				<li>
+					<h:link outcome="admin_delete_user" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}">
+						<h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_USER}" />
+						<f:param name="userId" value="#{beanHelper.user.userId}" />
+					</h:link>
+				</li>
+			</ul>
 		</div>
-	</ui:fragment>
+	</h:panelGroup>
 </ui:composition>
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 aeb0ae81..2387a5fe 100644
--- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 	<div id="user_login_content">
 		<h:form id="form_user_login">
-			<div class="table">
+			<h:panelGroup styleClass="table" layout="block">
 				<div class="table_header">
 					#{msg.GUEST_ENTER_USER_LOGIN_DATA_TITLE}
 				</div>
@@ -45,7 +45,7 @@
 					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 					<h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
 				</div>
-			</div>
+			</h:panelGroup>
 		</h:form>
 	</div>
 </ui:composition>
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 284aea50..a1fb51cd 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
@@ -7,7 +7,7 @@
 
 
 	<h:form id="form_register_page1">
-		<div class="table_medium">
+		<h:panelGroup styleClass="table_medium" layout="block">
 			<div class="table_header">
 				#{msg.GUEST_REGISTRATION_PAGE1_TITLE}
 			</div>
@@ -74,6 +74,6 @@
 				<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 				<h:commandButton styleClass="submit" type="submit" id="continueRegisterPage1" value="#{msg.BUTTON_CONTINUE_REGISTER_PAGE2}" action="#{registerController.doRegisterMultiPage1()}" />
 			</div>
-		</div>
+		</h:panelGroup>
 	</h:form>
 </ui:composition>
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
index b62cf97e..b68b6e8d 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
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<h:form id="form_register_page2">
-		<div class="table_medium">
+		<h:panelGroup styleClass="table_medium" layout="block">
 			<div class="table_header">
 				#{msg.GUEST_REGISTRATION_PAGE2_TITLE}
 			</div>
@@ -17,6 +17,6 @@
 				<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 				<h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{registerController.doFinishRegistration()}" />
 			</div>
-		</div>
+		</h:panelGroup>
 	</h:form>
 </ui:composition>
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
index 1b084bd5..cd7b8f40 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
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<h:form id="form_register_single">
-		<div class="table_medium">
+		<h:panelGroup styleClass="table_medium" layout="block">
 			<div class="table_header">
 				<h:outputText value="#{msg.GUEST_REGISTRATION_TITLE}" />
 			</div>
@@ -79,6 +79,6 @@
 				<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 				<h:commandButton styleClass="submit" type="submit" id="finish_registration_single" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{registerController.doFinishRegistration()}" />
 			</div>
-		</div>
+		</h:panelGroup>
 	</h:form>
 </ui:composition>
diff --git a/web/WEB-INF/templates/user/user_not_logged_in.tpl b/web/WEB-INF/templates/user/user_not_logged_in.tpl
index 2bce29de..5981ed05 100644
--- a/web/WEB-INF/templates/user/user_not_logged_in.tpl
+++ b/web/WEB-INF/templates/user/user_not_logged_in.tpl
@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<div class="table">
+	<h:panelGroup styleClass="table" layout="block">
 		<div class="table_header">
 			<h:outputText value="#{msg.TABLE_HEADER_ERROR_USER_NOT_LOGGED_IN}" />
 		</div>
@@ -13,5 +13,5 @@
 		<div class="para errors">
 			<h:outputText value="#{msg.USER_IS_NOT_LOGGED_IN_FULL}" />
 		</div>
-	</div>
+	</h:panelGroup>
 </ui:composition>
diff --git a/web/WEB-INF/templates/user/userid_error.tpl b/web/WEB-INF/templates/user/userid_error.tpl
index 4b3fec3c..0d45fc32 100644
--- a/web/WEB-INF/templates/user/userid_error.tpl
+++ b/web/WEB-INF/templates/user/userid_error.tpl
@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<div class="table">
+	<h:panelGroup styleClass="table" layout="block">
 		<div class="table_header">
 			<h:outputText value="#{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}" />
 		</div>
@@ -13,5 +13,5 @@
 		<div class="para">
 			<h:messages errorClass="errors" fatalClass="fatals" infoClass="infos" warnClass="warnings" showDetail="true" />
 		</div>
-	</div>
+	</h:panelGroup>
 </ui:composition>
diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml
index 17ac3d5e..25b55f29 100644
--- a/web/admin/admin_logout.xhtml
+++ b/web/admin/admin_logout.xhtml
@@ -16,7 +16,7 @@
 
 		<ui:define name="content">
 			<h:form id="form_admin_logout">
-				<div class="table">
+				<h:panelGroup styleClass="table" layout="block">
 					<div class="table_header">
 						<h:outputText value="#{msg.ADMIN_LOGOUT_TITLE}" />
 					</div>
@@ -28,7 +28,7 @@
 					<div class="table_footer">
 						<h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doAdminLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
 					</div>
-				</div>
+				</h:panelGroup>
 			</h:form>
 		</ui:define>
 	</ui:composition>
diff --git a/web/admin/cellphone/admin_cellphone_delete.xhtml b/web/admin/cellphone/admin_cellphone_delete.xhtml
index 38166fb1..1464fc11 100644
--- a/web/admin/cellphone/admin_cellphone_delete.xhtml
+++ b/web/admin/cellphone/admin_cellphone_delete.xhtml
@@ -20,7 +20,7 @@
 
 		<ui:define name="content">
 			<h:form id="form_delete_cellphone" rendered="#{not empty beanHelper.cellPhoneNumber}">
-				<div class="table">
+				<h:panelGroup styleClass="table" layout="block">
 					<div class="table_header">
 						<h:outputText value="#{msg.ADMIN_DELETE_CELLPHONE_TITLE}" />
 					</div>
@@ -39,7 +39,7 @@
 					<div class="table_footer">
 						<h:commandButton styleClass="delete_button" type="submit" id="delete_cellphone" value="#{msg.BUTTON_ADMIN_DELETE_CELLPHONE}" action="#{adminPhoneController.deleteCellphoneData()}" />
 					</div>
-				</div>
+				</h:panelGroup>
 			</h:form>
 
 			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
diff --git a/web/admin/cellphone/admin_cellphone_edit.xhtml b/web/admin/cellphone/admin_cellphone_edit.xhtml
index 192a2914..9c8fe9bf 100644
--- a/web/admin/cellphone/admin_cellphone_edit.xhtml
+++ b/web/admin/cellphone/admin_cellphone_edit.xhtml
@@ -21,7 +21,7 @@
 
 		<ui:define name="content">
 			<h:form id="form_edit_cellphone" rendered="#{not empty beanHelper.cellPhoneNumber}">
-				<div class="table_medium">
+				<h:panelGroup styleClass="table_medium" layout="block">
 					<div class="table_header">
 						#{msg.ADMIN_EDIT_CELLPHONE_TITLE}
 					</div>
@@ -32,7 +32,7 @@
 						<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 						<h:commandButton styleClass="submit" type="submit" id="edit_cellphone" value="#{msg.BUTTON_ADMIN_EDIT_CELLPHONE}" action="#{adminPhoneController.editCellphoneData()}" />
 					</div>
-				</div>
+				</h:panelGroup>
 			</h:form>
 
 			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
diff --git a/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml b/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml
index f39b1e2b..4e15c78d 100644
--- a/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml
+++ b/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml
@@ -21,7 +21,7 @@
 
 		<ui:define name="content">
 			<h:form id="form_unlink_contact_cellphone" rendered="#{not empty beanHelper.cellPhoneNumber and not empty beanHelper.contact and beanHelper.contact.contactCellphoneNumber == beanHelper.cellPhoneNumber}">
-				<div class="table">
+				<h:panelGroup styleClass="table" layout="block">
 					<div class="table_header">
 						<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_CELLPHONE_TITLE}" />
 					</div>
@@ -47,7 +47,7 @@
 					<div class="table_footer">
 						<h:commandButton styleClass="unlink_button" type="submit" id="unlink_cellphone" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_CELLPHONE}" action="#{adminContactPhoneController.unlinkCellphoneContactData()}" />
 					</div>
-				</div>
+				</h:panelGroup>
 			</h:form>
 
 			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index 11b5641c..214ac554 100644
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -23,7 +23,7 @@
 			<h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty beanHelper.contact}" />
 
 			<h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
-				<div class="table">
+				<h:panelGroup styleClass="table" layout="block">
 					<div class="table_header">
 						<h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_TITLE}">
 							<f:param value="#{beanHelper.contact.contactId}" />
@@ -40,7 +40,7 @@
 						<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 						<h:commandButton styleClass="delete_button" type="submit" id="delete_contact" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
 					</div>
-				</div>
+				</h:panelGroup>
 			</h:form>
 		</ui:define>
 	</ui:composition>
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index 7968f503..587d7cc2 100644
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -23,7 +23,7 @@
 			<h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty beanHelper.contact}" />
 
 			<h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
-				<div class="table_medium">
+				<h:panelGroup styleClass="table_medium" layout="block">
 					<div class="table_header">
 						<h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_TITLE}">
 							<f:param value="#{beanHelper.contact.contactId}" />
@@ -42,7 +42,7 @@
 						<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 						<h:commandButton styleClass="submit" type="submit" id="edit_contact" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
 					</div>
-				</div>
+				</h:panelGroup>
 			</h:form>
 		</ui:define>
 	</ui:composition>
diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index 502d57a3..4de001b8 100644
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -153,7 +153,7 @@
 					</p:column>
 				</p:dataTable>
 
-				<div class="table_medium">
+				<h:panelGroup styleClass="table_medium" layout="block">
 					<div class="table_header">
 						<h:outputText value="#{msg.ADMIN_EXPORT_CONTACTS_TITLE}" />
 					</div>
@@ -167,7 +167,7 @@
 							<p:dataExporter type="xls" target="table_export_contacts" fileName="all_contacts" />
 						</h:commandButton>
 					</div>
-				</div>
+				</h:panelGroup>
 			</h:form>
 		</ui:define>
 	</ui:composition>
diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index 3b03197c..4f82f3e2 100644
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -69,8 +69,8 @@
 				</h:column>
 			</h:dataTable>
 
-			<div class="table_medium">
-				<h:form id="form_admin_add_contact">
+			<h:form id="form_admin_add_contact">
+				<h:panelGroup styleClass="table_medium" layout="block">
 					<div class="table_header">
 						<h:outputText value="#{msg.ADMIN_ADD_CONTACT_TITLE}" />
 					</div>
@@ -85,7 +85,8 @@
 						<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 						<h:commandButton styleClass="submit" type="submit" id="add_contact" value="#{msg.BUTTON_ADMIN_ADD_CONTACT}" action="#{adminContactController.addContact()}" />
 					</div>
-				</h:form>
+				</h:panelGroup>
+			</h:form>
 			</div>
 		</ui:define>
 	</ui:composition>
diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
index 752e9f49..a34b3406 100644
--- a/web/admin/country/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -52,7 +52,7 @@
 			</h:dataTable>
 
 			<h:form id="form_add_country">
-				<div class="table_medium">
+				<h:panelGroup styleClass="table_medium" layout="block">
 					<div class="table_header">
 						<h:outputText value="#{msg.ADMIN_ADD_COUNTRY_TITLE}" />
 					</div>
@@ -63,7 +63,7 @@
 						<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 						<h:commandButton styleClass="submit" type="submit" id="add_country" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
 					</div>
-				</div>
+				</h:panelGroup>
 
 				<div class="para notice">
 					<h:outputText value="#{msg.ADMIN_ADD_COUNTRY_NOTICES}" />
diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index 50515f7b..a34d3777 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -62,7 +62,7 @@
 			</h:dataTable>
 
 			<h:form id="form_add_mobile_provider">
-				<div class="table_medium">
+				<h:panelGroup styleClass="table_medium" layout="block">
 					<div class="table_header">
 						<h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}" />
 					</div>
@@ -73,7 +73,7 @@
 						<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 						<h:commandButton styleClass="submit" type="submit" id="add_mobile_provider" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
 					</div>
-				</div>
+				</h:panelGroup>
 
 				<div class="para notice">
 					<h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_NOTICES}" />
diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 2f28bda7..630bb23e 100644
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -24,7 +24,7 @@
 			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
 
 			<h:form id="form_edit_user" rendered="#{not empty beanHelper.user}">
-				<div class="table">
+				<h:panelGroup styleClass="table" layout="block">
 					<div class="table_header">
 						#{msg.ADMIN_EDIT_USER_TITLE}
 					</div>
@@ -41,7 +41,7 @@
 						<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 						<h:commandButton styleClass="submit" type="submit" id="edit_user" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
 					</div>
-				</div>
+				</h:panelGroup>
 			</h:form>
 		</ui:define>
 	</ui:composition>
diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index 151ea73d..41ea92d3 100644
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -171,7 +171,7 @@
 					</p:column>
 				</p:dataTable>
 
-				<div class="table_medium">
+				<h:panelGroup styleClass="table_medium" layout="block">
 					<div class="table_header">
 						<h:outputText value="#{msg.ADMIN_EXPORT_USERS_TITLE}" />
 					</div>
@@ -185,7 +185,7 @@
 							<p:dataExporter type="xls" target="table_export_users" fileName="all_users" />
 						</h:commandButton>
 					</div>
-				</div>
+				</h:panelGroup>
 			</h:form>
 		</ui:define>
 	</ui:composition>
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 6d03cc0d..d81c1ce0 100644
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -85,7 +85,7 @@
 				</h:column>
 			</h:dataTable>
 
-			<div class="table_medium">
+			<h:panelGroup styleClass="table_medium" layout="block">
 				<h:form id="admin_add_user">
 					<div class="table_header">
 						<h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
@@ -133,7 +133,7 @@
 						<h:commandButton styleClass="submit" type="submit" id="add_user" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
 					</div>
 				</h:form>
-			</div>
+			</h:panelGroup>
 		</ui:define>
 	</ui:composition>
 </html>
diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index 7c683b7b..357c1df3 100644
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -24,7 +24,7 @@
 			<h:outputFormat styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
 
 			<h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
-				<div class="table_medium">
+				<h:panelGroup styleClass="table_medium" layout="block">
 					<div class="table_header">
 						<h:outputFormat value="#{msg.ADMIN_LOCK_USER_TITLE}">
 							<f:param value="#{beanHelper.user.userName}" />
@@ -77,7 +77,7 @@
 
 						<h:commandButton styleClass="submit" type="submit" action="#{adminUserController.lockUserAccount(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}" />
 					</div>
-				</div>
+				</h:panelGroup>
 			</h:form>
 
 			<h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 95830395..41cbfe11 100644
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -23,7 +23,7 @@
 			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
 
 			<h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'LOCKED'}">
-				<div class="table_medium">
+				<h:panelGroup styleClass="table_medium" layout="block">
 					<div class="table_header">
 						<h:outputFormat value="#{msg.ADMIN_UNLOCK_USER_TITLE}">
 							<f:param value="#{beanHelper.user.userName}" />
@@ -88,7 +88,7 @@
 
 						<h:commandButton styleClass="submit" type="submit" action="#{adminUserController.unlockUserAccount(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}" />
 					</div>
-				</div>
+				</h:panelGroup>
 			</h:form>
 
 			<h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
diff --git a/web/guest/user/confirm_account.xhtml b/web/guest/user/confirm_account.xhtml
index a7d6a9c1..0adfb02d 100644
--- a/web/guest/user/confirm_account.xhtml
+++ b/web/guest/user/confirm_account.xhtml
@@ -21,25 +21,21 @@
 
 		<ui:define name="content">
 			<ui:fragment rendered="#{not empty confirmationLinkController.confirmationKey}">
-				<ui:fragment rendered="#{not empty beanHelper.user}">
-					<div class="table">
-						<div class="table_header">
-							<h:outputText value="#{msg.GUEST_CONFIRM_USER_ACCOUNT_DONE_TITLE}" />
-						</div>
+				<h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.user}">
+					<div class="table_header">
+						<h:outputText value="#{msg.GUEST_CONFIRM_USER_ACCOUNT_DONE_TITLE}" />
+					</div>
 
-						<div class="table_row">
-							<h:outputFormat value="#{msg.GUEST_USER_CONFIRM_ACCOUNT_DONE}">
-								<f:param value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
-								<f:param value="#{beanHelper.user.userContact.contactFirstName}" />
-								<f:param value="#{beanHelper.user.userContact.contactFamilyName}" />
-							</h:outputFormat>
-						</div>
+					<div class="table_row">
+						<h:outputFormat value="#{msg.GUEST_USER_CONFIRM_ACCOUNT_DONE}">
+							<f:param value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
+							<f:param value="#{beanHelper.user.userContact.contactFirstName}" />
+							<f:param value="#{beanHelper.user.userContact.contactFamilyName}" />
+						</h:outputFormat>
 					</div>
-				</ui:fragment>
+				</h:panelGroup>
 
-				<ui:fragment rendered="#{empty beanHelper.user}">
-					<h:outputText styleClass="errors" value="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" />
-				</ui:fragment>
+				<h:outputText styleClass="errors" value="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" rendered="#{empty beanHelper.user}" />
 			</ui:fragment>
 
 			<ui:fragment rendered="#{empty confirmationLinkController.confirmationKey}">
diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml
index 4bfc01c4..4e8536ea 100644
--- a/web/guest/user/lost_passwd.xhtml
+++ b/web/guest/user/lost_passwd.xhtml
@@ -18,7 +18,7 @@
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required') and featureController.isFeatureEnabled('user_password_recovery')}">
 				<div class="para" id="user_lost_password_content">
 					<h:form id="form_lost_password">
-						<div class="table">
+						<h:panelGroup styleClass="table" layout="block">
 							<div class="table_header">
 								<h:outputText value="#{msg.GUEST_LOST_PASSWORD_TITLE}" />
 							</div>
@@ -62,7 +62,7 @@
 								<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 								<h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
 							</div>
-						</div>
+						</h:panelGroup>
 					</h:form>
 				</div>
 			</ui:fragment>
diff --git a/web/guest/user/resend_link.xhtml b/web/guest/user/resend_link.xhtml
index ff57a37e..49c48c22 100644
--- a/web/guest/user/resend_link.xhtml
+++ b/web/guest/user/resend_link.xhtml
@@ -16,7 +16,7 @@
 
 		<ui:define name="content">
 			<h:form id="form_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
-				<div class="table">
+				<h:panelGroup styleClass="table" layout="block">
 					<div class="table_header">
 						<h:outputText value="#{msg.GUEST_RESEND_LINK_TITLE}" />
 					</div>
@@ -51,7 +51,7 @@
 						<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 						<h:commandButton styleClass="submit" type="submit" id="resend_link" value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}" action="#{resendController.doResendLink()}" />
 					</div>
-				</div>
+				</h:panelGroup>
 			</h:form>
 
 			<<<<<<< HEAD
diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml
index ba581916..a14220e3 100644
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -14,26 +14,25 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_list')}">
-				<div class="table_big">
-					<div class="table_header">
-						<h:outputText value="#{msg.TABLE_HEADER_USER_LIST}" />
-					</div>
+			<h:panelGroup styleClass="table_big" 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.allVisibleUsers()}" headerClass="table_header_column25" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.isVisibleUserFound()}">
-						<h:column>
-							<f:facet name="header">#{msg.USER_NAME}</f:facet>
-							<ui:include src="/WEB-INF/templates/user/user_profile_link.tpl">
-								<ui:param name="user" value="#{user}" />
-							</ui:include>
-						</h:column>
+				<h:dataTable id="userList" var="user" value="#{userController.allVisibleUsers()}" headerClass="table_header_column25" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.isVisibleUserFound()}">
+					<h:column>
+						<f:facet name="header">#{msg.USER_NAME}</f:facet>
+						<ui:include src="/WEB-INF/templates/user/user_profile_link.tpl">
+							<ui:param name="user" value="#{user}" />
+						</ui:include>
+					</h:column>
 
-						<h:column>
-							<f:facet name="header">#{msg.USER_CREATED}</f:facet>
-							<h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
-						</h:column>
-					</h:dataTable>
-				</div>
+					<h:column>
+						<f:facet name="header">#{msg.USER_CREATED}</f:facet>
+						<h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
+					</h:column>
+				</h:dataTable>
+			</h:panelGroup>>
 
 			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_LIST_DISABLED}" rendered="#{featureController.isFeatureEnabled('user_list')}" />
 		</ui:define>
diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml
index edb392c1..73a2fdbb 100644
--- a/web/user/login_change_email_address.xhtml
+++ b/web/user/login_change_email_address.xhtml
@@ -15,44 +15,42 @@
 		</ui:define>
 
 		<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'))}">
-				<div class="table">
-					<div class="table_header">
-						<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
-					</div>
-
-					<h:form id="form_login_change_email_address">
-						<div class="para">
-							<fieldset class="fieldset" id="change_email">
-								<legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">
-									<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_LEGEND}" />
-								</legend>
+			<h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+				<div class="table_header">
+					<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
+				</div>
 
-								<div class="table_row">
-									<div class="table_left">
-										<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}" />
-									</div>
+				<h:form id="form_login_change_email_address">
+					<div class="para">
+						<fieldset class="fieldset" id="change_email">
+							<legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">
+								<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_LEGEND}" />
+							</legend>
 
-									<div class="table_right">
-										<h:outputText value="#{contactController.emailAddress}" />
-									</div>
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}" />
+								</div>
 
-									<div class="clear"></div>
+								<div class="table_right">
+									<h:outputText value="#{contactController.emailAddress}" />
 								</div>
 
-								<ui:include src="/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl" />
-							</fieldset>
-						</div>
+								<div class="clear"></div>
+							</div>
 
-						<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
+							<ui:include src="/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl" />
+						</fieldset>
+					</div>
 
-						<div class="table_footer">
-							<h:commandButton class="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-							<h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{emailChangeController.doChangeEmailAddress()}" />
-						</div>
-					</h:form>
-				</div>
-			</ui:fragment>
+					<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
+
+					<div class="table_footer">
+						<h:commandButton class="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+						<h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{emailChangeController.doChangeEmailAddress()}" />
+					</div>
+				</h:form>
+			</h:panelGroup>
 
 			<h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
 
diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml
index 7d957e14..a4b50d33 100644
--- a/web/user/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -16,80 +16,82 @@
 
 		<ui:define name="content">
 			<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-				<ui:fragment rendered="#{featureController.isFeatureEnabled('change_user_password')}">
-					<div class="table">
-						<div class="table_header">
-							<h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_TITLE}" />
-						</div>
-
-						<h:form id="form_user_change_password">
-							<div class="para">
-								<fieldset class="fieldset" id="change_password">
-									<legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">
-										<h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}" />
-									</legend>
-
-									<div class="table_row">
-										<div class="table_left">
-											<h:outputLabel for="userCurrentPassword" value="#{msg.GUEST_REGISTRATION_ENTER_CURRENT_PASSWORD}" />
-										</div>
+				<h:panelGroup styleClass="table" layout="block" rendered="#{featureController.isFeatureEnabled('change_user_password')}">
+					<div class="table_header">
+						<h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_TITLE}" />
+					</div>
 
-										<div class="table_right">
-											<h:inputSecret styleClass="input" id="userCurrentPassword" size="10" maxlength="255" value="#{userPasswordController.userCurrentPassword}" required="true" requiredMessage="#{msg.USER_CURRENT_PASSWORD_REQUIRED}" />
-										</div>
+					<h:form id="form_user_change_password">
+						<div class="para">
+							<fieldset class="fieldset" id="change_password">
+								<legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">
+									<h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}" />
+								</legend>
 
-										<div class="clear"></div>
+								<div class="table_row">
+									<div class="table_left">
+										<h:outputLabel for="userCurrentPassword" value="#{msg.GUEST_REGISTRATION_ENTER_CURRENT_PASSWORD}" />
 									</div>
 
-									<div class="error_container">
-										<h:message for="userCurrentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+									<div class="table_right">
+										<h:inputSecret styleClass="input" id="userCurrentPassword" size="10" maxlength="255" value="#{userPasswordController.userCurrentPassword}" required="true" requiredMessage="#{msg.USER_CURRENT_PASSWORD_REQUIRED}" />
 									</div>
 
-									<div class="table_row">
-										<div class="table_left">
-											<h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
-										</div>
+									<div class="clear"></div>
+								</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}" />
-										</div>
+								<div class="error_container">
+									<h:message for="userCurrentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+								</div>
+
+								<div class="table_row">
+									<div class="table_left">
+										<h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
 									</div>
 
-									<div class="error_container">
-										<h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+									<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}" />
 									</div>
 
-									<div class="table_row">
-										<div class="table_left">
-											<h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
-										</div>
+									<div class="clear"></div>
+								</div>
+
+								<div class="error_container">
+									<h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+								</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}" />
-										</div>
+								<div class="table_row">
+									<div class="table_left">
+										<h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
 									</div>
 
-									<div class="error_container">
-										<h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+									<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}" />
 									</div>
-								</fieldset>
-							</div>
-
-							<div class="table_footer">
-								<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-								<h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
-							</div>
-						</h:form>
-					</div>
 
-					<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
+									<div class="clear"></div>
+								</div>
+
+								<div class="error_container">
+									<h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+								</div>
+							</fieldset>
+						</div>
+
+						<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.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="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
+						</div>
+					</h:form>
+				</h:panelGroup>
+			</ui:fragment>
 
-					<h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
-				</ui:fragment>
+			<h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
 
-				<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-					<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-				</ui:fragment>
+			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+				<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml
index a968286e..ec2a7cfb 100644
--- a/web/user/login_change_personal_data.xhtml
+++ b/web/user/login_change_personal_data.xhtml
@@ -15,26 +15,24 @@
 		</ui:define>
 
 		<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'))}">
-				<div class="table_medium">
-					<div class="table_header">
-						<h:outputText value="#{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}" />
-					</div>
+			<h:panelGroup styleClass="table_medium" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+				<div class="table_header">
+					<h:outputText value="#{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}" />
+				</div>
 
-					<h:form id="form_login_change_personal">
-						<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
+				<h:form id="form_login_change_personal">
+					<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
 
-							<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
+					<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
 
-							<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
+					<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.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="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
-						</div>
-					</h:form>
-				</div>
-			</ui:fragment>
+					<div class="table_footer">
+						<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+						<h:commandButton styleClass="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
+					</div>
+				</h:form>
+			</h:panelGroup>
 
 			<h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
 
diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml
index fbdda7de..162b2eac 100644
--- a/web/user/login_edit_user_data.xhtml
+++ b/web/user/login_edit_user_data.xhtml
@@ -15,39 +15,37 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-				<div class="table">
-					<div class="table_header">
-						<h:outputText value="#{msg.LOGIN_EDIT_USER_DATA_TITLE}" />
-					</div>
-
-					<div class="para notice">
-						<h:outputText value="#{msg.LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE}" />
-					</div>
-
-					<div class="para">
-						<ul>
-							<ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-								<li>
-									<h: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('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-								<li>
-									<h:link title="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_change_email_address" value="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS}" />
-								</li>
-							</ui:fragment>
-
-							<ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data')}">
-								<li>
-									<h:link title="#{msg.LINK_LOGIN_CHANGE_PASSWORD_TITLE}" outcome="login_change_password" value="#{msg.LINK_LOGIN_CHANGE_PASSWORD}" />
-								</li>
-							</ui:fragment>
-						</ul>
-					</div>
+			<h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+				<div class="table_header">
+					<h:outputText value="#{msg.LOGIN_EDIT_USER_DATA_TITLE}" />
 				</div>
-			</ui:fragment>
+
+				<div class="para notice">
+					<h:outputText value="#{msg.LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE}" />
+				</div>
+
+				<div class="para">
+					<ul>
+						<ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+							<li>
+								<h: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('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+							<li>
+								<h:link title="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_change_email_address" value="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS}" />
+							</li>
+						</ui:fragment>
+
+						<ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data')}">
+							<li>
+								<h:link title="#{msg.LINK_LOGIN_CHANGE_PASSWORD_TITLE}" outcome="login_change_password" value="#{msg.LINK_LOGIN_CHANGE_PASSWORD}" />
+							</li>
+						</ui:fragment>
+					</ul>
+				</div>
+			</h:panelGroup>
 
 			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
 				<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
diff --git a/web/user/login_logout.xhtml b/web/user/login_logout.xhtml
index 957b4f20..4c8a6516 100644
--- a/web/user/login_logout.xhtml
+++ b/web/user/login_logout.xhtml
@@ -16,7 +16,7 @@
 
 		<ui:define name="content">
 			<h:form id="form_user_logout" rendered="#{userLoginController.isUserLoggedIn()}">
-				<div class="table">
+				<h:panelGroup styleClass="table" layout="block">
 					<div class="table_header">
 						<h:outputText value="#{msg.LOGIN_USER_LOGOUT_TITLE}" />
 					</div>
@@ -28,7 +28,7 @@
 					<div class="table_footer">
 						<h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
 					</div>
-				</div>
+				</h:panelGroup>
 			</h:form>
 
 			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-- 
2.39.5