You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2019/06/15 01:27:54 UTC

[openmeetings] branch master updated: [OPENMEETINGS-2042] some html issues are resolved

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 29fa31e  [OPENMEETINGS-2042] some html issues are resolved
29fa31e is described below

commit 29fa31ed578684d88a4e6d57ab48c9d75823f2a2
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Jun 15 08:27:43 2019 +0700

    [OPENMEETINGS-2042] some html issues are resolved
---
 .../src/main/assembly/ROOT/index.html              |   8 +-
 .../mail/template/AbstractTemplatePanel.html       |   1 +
 .../service/mail/template/FeedbackTemplate.html    |   5 +-
 .../service/mail/template/InvitationTemplate.html  |   3 +-
 .../mail/template/RegisterUserTemplate.html        |   3 +-
 .../template/RequestContactConfirmTemplate.html    |   1 +
 .../mail/template/RequestContactTemplate.html      |   1 +
 .../mail/template/ResetPasswordTemplate.html       |   5 +-
 .../mail/template/subject/AppointmentTemplate.html |   1 +
 .../subject/InvitedAppointmentTemplate.html        |   1 +
 .../subject/RecordingExpiringTemplate.html         |   1 +
 .../openmeetings/web/admin/AdminActionsPanel.html  |  27 ++--
 .../openmeetings/web/admin/AdminBasePanel.html     |   1 +
 .../openmeetings/web/admin/backup/BackupPanel.html |   1 +
 .../web/admin/configurations/ConfigsPanel.html     |   1 +
 .../web/admin/connection/ConnectionsPanel.html     |   1 +
 .../openmeetings/web/admin/email/EmailPanel.html   |   1 +
 .../web/admin/groups/GroupUsersPanel.html          |  51 +++---
 .../openmeetings/web/admin/groups/GroupsPanel.html |   1 +
 .../web/admin/labels/AddLanguageDialog.html        |   1 +
 .../openmeetings/web/admin/labels/LangPanel.html   |   1 +
 .../openmeetings/web/admin/ldaps/LdapsPanel.html   |   1 +
 .../openmeetings/web/admin/oauth/OAuthPanel.html   |   1 +
 .../openmeetings/web/admin/rooms/RoomsPanel.html   |   1 +
 .../web/admin/users/PasswordDialog.html            |   1 +
 .../openmeetings/web/admin/users/UserForm.html     |   1 +
 .../openmeetings/web/admin/users/UsersPanel.html   |   1 +
 .../apache/openmeetings/web/common/Captcha.html    |   1 +
 .../openmeetings/web/common/ComunityUserForm.html  |   1 +
 .../web/common/ConfirmableAjaxBorder.html          |   1 +
 .../openmeetings/web/common/ErrorMessagePanel.html |   1 +
 .../openmeetings/web/common/FormActionsPanel.html  |   1 +
 .../openmeetings/web/common/GeneralUserForm.html   |   1 +
 .../openmeetings/web/common/HeaderPanel.html       |   7 +-
 .../apache/openmeetings/web/common/ImagePanel.html |   7 +-
 .../openmeetings/web/common/InvitationDialog.html  |   1 +
 .../openmeetings/web/common/InvitationForm.html    |   1 +
 .../apache/openmeetings/web/common/MainPanel.html  |   1 +
 .../apache/openmeetings/web/common/NameDialog.html |   1 +
 .../openmeetings/web/common/OmPagingNavigator.html |   1 +
 .../web/common/PagedEntityListPanel.html           |  15 +-
 .../web/common/PagingNavigatorPanel.html           |   1 +
 .../web/common/UploadableImagePanel.html           |  21 +--
 .../openmeetings/web/common/menu/MenuPanel.html    |   1 +
 .../web/common/tree/ConvertingErrorsDialog.html    |   1 +
 .../web/common/tree/FileItemPanel.html             |   1 +
 .../web/common/tree/FileTreePanel.html             |   1 +
 .../openmeetings/web/common/tree/FolderPanel.html  |   1 +
 .../openmeetings/web/pages/AccessDeniedPage.html   |   3 +-
 .../apache/openmeetings/web/pages/BasePage.html    |   3 +-
 .../apache/openmeetings/web/pages/HashPage.html    |   3 +-
 .../web/pages/InvitationPasswordDialog.html        |   1 +
 .../apache/openmeetings/web/pages/MainPage.html    |   1 +
 .../openmeetings/web/pages/NotInitedPage.html      |   5 +-
 .../apache/openmeetings/web/pages/PrivacyPage.html |   3 +-
 .../apache/openmeetings/web/pages/ResetPage.html   |   7 +-
 .../web/pages/auth/ForgetPasswordDialog.html       |   1 +
 .../web/pages/auth/KickMessageDialog.html          |  15 +-
 .../web/pages/auth/RegisterDialog.html             |   1 +
 .../web/pages/auth/ResetPasswordDialog.html        |   1 +
 .../openmeetings/web/pages/auth/SignInDialog.html  |   1 +
 .../openmeetings/web/pages/auth/SignInPage.html    |  43 +++---
 .../web/pages/install/CongratulationsPanel.html    |   5 +-
 .../web/pages/install/InstallWizard$DbStep.html    |   1 +
 .../pages/install/InstallWizard$InstallStep.html   |   1 +
 .../pages/install/InstallWizard$ParamsStep1.html   |   1 +
 .../pages/install/InstallWizard$ParamsStep2.html   |   1 +
 .../pages/install/InstallWizard$ParamsStep3.html   |   5 +-
 .../pages/install/InstallWizard$ParamsStep4.html   |   1 +
 .../pages/install/InstallWizard$WelcomeStep.html   |   1 +
 .../web/pages/install/InstallWizardPage.html       |   1 +
 .../openmeetings/web/room/EventDetailDialog.html   |   1 +
 .../apache/openmeetings/web/room/NetTestPanel.html |   1 +
 .../openmeetings/web/room/NicknameDialog.html      |   1 +
 .../apache/openmeetings/web/room/RoomPanel.html    |   1 +
 .../openmeetings/web/room/VideoSettings.html       |   1 +
 .../web/room/activities/ActivitiesPanel.html       |   1 +
 .../web/room/menu/RoomInvitationForm.html          |   1 +
 .../openmeetings/web/room/menu/RoomMenuPanel.html  |   1 +
 .../web/room/menu/SipDialerDialog.html             |   1 +
 .../web/room/poll/CreatePollDialog.html            |   1 +
 .../web/room/poll/PollResultsDialog.html           |   1 +
 .../openmeetings/web/room/poll/VoteDialog.html     |   1 +
 .../web/room/sidebar/ClientIconsPanel.html         |   1 +
 .../web/room/sidebar/RoomClientPanel.html          |   1 +
 .../openmeetings/web/room/sidebar/RoomSidebar.html |   1 +
 .../web/room/sidebar/SelfIconsPanel.html           |   1 +
 .../web/room/sidebar/UploadDialog.html             |   1 +
 .../openmeetings/web/room/wb/InterviewWbPanel.html |   1 +
 .../apache/openmeetings/web/room/wb/WbPanel.html   |   1 +
 .../apache/openmeetings/web/user/AboutDialog.html  |   1 +
 .../web/user/InviteUserMessageDialog.html          |   1 +
 .../web/user/InviteUserToRoomDialog.html           |   1 +
 .../openmeetings/web/user/MessageDialog.html       |   1 +
 .../openmeetings/web/user/UserInfoDialog.html      |   1 +
 .../web/user/calendar/AppointmentDialog.html       | 171 +++++++++++----------
 .../web/user/calendar/CalendarDialog.html          |  61 ++++----
 .../web/user/calendar/CalendarPanel.html           |  45 +++---
 .../apache/openmeetings/web/user/chat/Chat.html    |   1 +
 .../openmeetings/web/user/chat/ChatPanel.html      |   1 +
 .../openmeetings/web/user/chat/ChatToolbar.html    |   9 +-
 .../web/user/dashboard/MyRoomsWidgetView.html      |   7 +-
 .../web/user/dashboard/OmDashboardPanel.html       |   7 +-
 .../web/user/dashboard/RecentRoomsWidgetView.html  |   7 +-
 .../web/user/dashboard/RssWidgetView.html          |   1 +
 .../web/user/dashboard/StartWidgetView.html        |  33 ++--
 .../web/user/dashboard/WelcomeWidgetView.html      |   1 +
 .../dashboard/admin/AdminCleanupInfoDialog.html    |   1 +
 .../web/user/dashboard/admin/AdminWidgetView.html  |   1 +
 .../dashboard/admin/CleanupEntityUnitPanel.html    |   1 +
 .../web/user/dashboard/admin/CleanupUnitPanel.html |   1 +
 .../web/user/profile/ChangePasswordDialog.html     |   1 +
 .../web/user/profile/EditProfileForm.html          |   1 +
 .../web/user/profile/EditProfilePanel.html         |   1 +
 .../web/user/profile/InvitationsPanel.html         |   1 +
 .../web/user/profile/MessagesContactsPanel.html    |   7 +-
 .../web/user/profile/SettingsPanel.html            |   7 +-
 .../web/user/profile/UserProfilePanel.html         |   1 +
 .../web/user/profile/UserSearchPanel.html          |   1 +
 .../web/user/profile/WidgetsPanel.html             |  19 +--
 .../web/user/record/RecordingInvitationForm.html   |   1 +
 .../web/user/record/RecordingsPanel.html           |   1 +
 .../openmeetings/web/user/record/VideoInfo.html    |   1 +
 .../openmeetings/web/user/record/VideoPlayer.html  |   1 +
 .../openmeetings/web/user/rooms/RoomListPanel.html |   1 +
 .../openmeetings/web/user/rooms/RoomsPanel.html    |   1 +
 .../web/user/rooms/RoomsSelectorPanel.html         |   1 +
 .../web/user/rooms/RoomsTabbedPanel.html           |   1 +
 128 files changed, 420 insertions(+), 293 deletions(-)

diff --git a/openmeetings-server/src/main/assembly/ROOT/index.html b/openmeetings-server/src/main/assembly/ROOT/index.html
index 608a7bb..603f628 100644
--- a/openmeetings-server/src/main/assembly/ROOT/index.html
+++ b/openmeetings-server/src/main/assembly/ROOT/index.html
@@ -11,13 +11,13 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE html>
 <html lang="en">
 <head>
-<title>Your Page Title</title>
-<meta http-equiv="REFRESH" content="0;url=openmeetings/">
+	<title>Redirect to openmeetings</title>
+	<meta http-equiv="REFRESH" content="0;url=openmeetings/">
 </head>
 <body>
-Redirect to openmeetings/
+	Redirect to openmeetings
 </body>
 </html>
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.html
index 119a8eb..11a7c33 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.html
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div wicket:id="container">
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.html
index 555053c..39092a2 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.html
@@ -18,13 +18,14 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
-	<b><span wicket:id="appname"></span> - Feedback</b><br />
+	<strong><span wicket:id="appname"></span> - Feedback</strong><br />
 	Message from User: <span wicket:id="username"></span><br/>
 	Mail: <span wicket:id="email"></span><br/>
 	Message: <span wicket:id="message"></span><br/><br/>
-	<b>Click on this link to participate in the Meeting:</b><br/>
+	<strong>Click on this link to participate in the Meeting:</strong><br/>
 	<a wicket:id="invitation_link">Click here to enter room</a><br/>
 </wicket:extend>
 </html>
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html
index b82995e..826f2d3 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html
@@ -18,9 +18,10 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
-	<b><span wicket:id="titleLbl"></span></b><br />
+	<strong><span wicket:id="titleLbl"></span></strong><br />
 	<span wicket:id="userLbl"></span> <span wicket:id="user"></span><br/>
 	<span wicket:id="messageLbl"></span> <span wicket:id="message"></span><br/>
 	<div wicket:id="links">
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
index da5b37d..03833fa 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
@@ -17,12 +17,13 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<span wicket:id="registrationLbl"></span>
 	<br />
 	<br />
-	<b><wicket:message key="507" /></b><br />
+	<strong><wicket:message key="507" /></strong><br />
 	<wicket:message key="108" /> <span wicket:id="username"></span><br />
 	<wicket:message key="510" /> <span wicket:id="email"></span><br />
 	<br />
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html
index 97be226..585cc24 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<span wicket:id="hi"></span>&nbsp;<span wicket:id="firstName"></span>&nbsp;<span wicket:id="lastName"></span><br/>
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html
index 156b0db..b5c53b3 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<span wicket:id="hi"></span>&nbsp;<span wicket:id="addedFirstName"></span>&nbsp;<span wicket:id="addedLastName"></span><br/>
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
index 20ec150..90cf16d 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
@@ -17,10 +17,11 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
-	<b><span wicket:id="reset-header"></span></b><br />
-	<b><wicket:message key="514"/></b><br/>
+	<strong><span wicket:id="reset-header"></span></strong><br />
+	<strong><wicket:message key="514"/></strong><br/>
 	<a wicket:id="reset_link1"><wicket:message key="515"/></a><br/>
 	<wicket:message key="505"/><br/>
 	<span wicket:id="reset_link2"></span>
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentTemplate.html
index a19fee9..406924c 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentTemplate.html
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<span wicket:id="titleLbl"></span>&nbsp;<span wicket:id="title"></span>
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/InvitedAppointmentTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/InvitedAppointmentTemplate.html
index 2c97aa4..fa12b10 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/InvitedAppointmentTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/InvitedAppointmentTemplate.html
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<span wicket:id="invitorLbl"></span>&nbsp;<span wicket:id="invitor"></span><br/>
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.html
index ad612e7..bff58ed 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.html
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<span wicket:id="greetings"></span><br />
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminActionsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminActionsPanel.html
index 635519c..7220304 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminActionsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminActionsPanel.html
@@ -18,18 +18,19 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
-	<wicket:extend>
-		<div class="ui-button ui-widget ui-corner-all ui-button-icon-only" wicket:id="btn-new" wicket:message="title:155">
-			<span class="ui-button-icon ui-icon ui-icon-plusthick"></span>&nbsp;
-		</div>
-		<div class="ui-button ui-widget ui-corner-all ui-button-icon-only ui-state-highlight" wicket:id="btn-delete" wicket:message="title:157">
-			<span class="ui-button-icon ui-icon ui-icon-closethick"></span>&nbsp;
-		</div>
-		<div class="ui-button ui-widget ui-corner-all ui-button-icon-only" wicket:id="btn-restore" wicket:message="title:admin.restore">
-			<span class="ui-button-icon ui-icon ui-icon-circle-check"></span>&nbsp;
-		</div>
-		<span wicket:id="newRecord"></span>
-		<form wicket:id="form" style="display: inline;"></form>
-	</wicket:extend>
+<wicket:extend>
+	<div class="ui-button ui-widget ui-corner-all ui-button-icon-only" wicket:id="btn-new" wicket:message="title:155">
+		<span class="ui-button-icon ui-icon ui-icon-plusthick"></span>&nbsp;
+	</div>
+	<div class="ui-button ui-widget ui-corner-all ui-button-icon-only ui-state-highlight" wicket:id="btn-delete" wicket:message="title:157">
+		<span class="ui-button-icon ui-icon ui-icon-closethick"></span>&nbsp;
+	</div>
+	<div class="ui-button ui-widget ui-corner-all ui-button-icon-only" wicket:id="btn-restore" wicket:message="title:admin.restore">
+		<span class="ui-button-icon ui-icon ui-icon-circle-check"></span>&nbsp;
+	</div>
+	<span wicket:id="newRecord"></span>
+	<form wicket:id="form" style="display: inline;"></form>
+</wicket:extend>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html
index c05f498..d2e367e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="adminPanel">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
index db08def..161264b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div wicket:id="feedback"></div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
index d607edd..daaa8ec 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<div class="adminPanelColumnTable">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
index 8899dec..ce8a837 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<div class="adminPanelColumnTable">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
index 2f365a9..6bd08a7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<div class="adminPanelColumnTable">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
index c414402..7f5a26d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
@@ -17,30 +17,31 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
-	<wicket:panel>
-		<div class="usergroupspanel">
-			<div class="adminNav" wicket:id="navigator">[dataview navigator]</div>
-			<table class="list-table small">
-				<thead>
-					<tr class="ui-widget-header">
-						<th class="col-1" wicket:message="title:98"><wicket:message key="98" /></th>
-						<th class="col-10" ><wicket:message key="177" /></th>
-						<th class="col-1"><wicket:message key="275" /></th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr wicket:id="userList" class="ui-widget-content">
-						<td class="col-1"><input type="checkbox" wicket:id="isModerator"/></td>
-						<td class="col-10"><div class="col-wrapper"><span wicket:id="label"></span></div></td>
-						<td class="col-1">
-							<div class="ui-button ui-widget ui-corner-all ui-button-icon-only ui-state-error" wicket:id="deleteUserBtn" wicket:message="title:274">
-								<span class="ui-button-icon ui-icon ui-icon-closethick"></span>&nbsp;
-							</div>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-		</div>
-	</wicket:panel>
+<wicket:panel>
+	<div class="usergroupspanel">
+		<div class="adminNav" wicket:id="navigator">[dataview navigator]</div>
+		<table class="list-table small">
+			<thead>
+				<tr class="ui-widget-header">
+					<th class="col-1" wicket:message="title:98"><wicket:message key="98" /></th>
+					<th class="col-10" ><wicket:message key="177" /></th>
+					<th class="col-1"><wicket:message key="275" /></th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr wicket:id="userList" class="ui-widget-content">
+					<td class="col-1"><input type="checkbox" wicket:id="isModerator"/></td>
+					<td class="col-10"><div class="col-wrapper"><span wicket:id="label"></span></div></td>
+					<td class="col-1">
+						<div class="ui-button ui-widget ui-corner-all ui-button-icon-only ui-state-error" wicket:id="deleteUserBtn" wicket:message="title:274">
+							<span class="ui-button-icon ui-icon ui-icon-closethick"></span>&nbsp;
+						</div>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+</wicket:panel>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
index 6dfb6d4..9477fd2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<div class="adminPanelColumnTable">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.html
index ca60ee1..7ae57de 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="addLangForm">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
index f95beac..c1f2b99 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:head>
 	<script type="text/javascript">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
index b494b06..3a083d3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<div class="adminPanelColumnTable">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
index 17831bb..55c2d38 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<div class="adminPanelColumnTable">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
index 399622b..1a18cf4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<div class="adminPanelColumnTable rooms">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.html
index 0d4e2bd..42b6054 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="form">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
index 2fd0ef7..2c57f2a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="actions" wicket:id="buttons"></div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
index d146377..4f48314 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<div class="adminPanelColumnTable">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html
index a8f5505..f4b8d96 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<input type="text" wicket:id="captchaText" wicket:message="placeholder:captcha.text,title:captcha.text" style="margin-bottom: 5px;"/><br/>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.html
index 2ab0dca..fbc95b3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="formelementradiobox">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.html
index a1f3be2..cd272e4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:border>
 	<wicket:body/>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ErrorMessagePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ErrorMessagePanel.html
index 0daebb6..de566c4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ErrorMessagePanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ErrorMessagePanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="message error">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormActionsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormActionsPanel.html
index c696064..b2b99c6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormActionsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormActionsPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="ui-widget-header">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
index 59ae1b0..248f6b2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="formelement">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.html
index da6ff80..7361b42 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.html
@@ -18,8 +18,9 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
-	<wicket:panel>
-		<span wicket:id="appName"></span>
-	</wicket:panel>
+<wicket:panel>
+	<span wicket:id="appName"></span>
+</wicket:panel>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html
index e489aa5..05cd415 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html
@@ -17,8 +17,9 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
-	<wicket:panel>
-		<div class="profile"><div wicket:id="profile"><img wicket:id="img"/></div><wicket:child/></div>
-	</wicket:panel>
+<wicket:panel>
+	<div class="profile"><div wicket:id="profile"><img wicket:id="img"/></div><wicket:child/></div>
+</wicket:panel>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.html
index 5c36069..b0aafd5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="form"></form>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html
index 3bd5b31..173c696 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="invitation table">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
index 4522e12..e3b49b5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:head>
 	<script type="text/javascript">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html
index 500bd0c..fb8ec81 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="form">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmPagingNavigator.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmPagingNavigator.html
index 9bd65f1..1efb520 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmPagingNavigator.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmPagingNavigator.html
@@ -15,6 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<a wicket:id="first" class="goto icon ui-icon ui-icon-seek-first"></a>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.html
index a933c39..8928203 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.html
@@ -18,12 +18,13 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
-	<wicket:panel>
-		<div wicket:id="pagedPanel" class="pagedEntityListPanel"></div>
-		<form wicket:id="searchForm" class="searchForm">
-			<input type="text" wicket:id="searchText" wicket:message="title:714"/>
-			<input type="submit" wicket:id="search" wicket:message="value:714"/>
-		</form>
-	</wicket:panel>
+<wicket:panel>
+	<div wicket:id="pagedPanel" class="pagedEntityListPanel"></div>
+	<form wicket:id="searchForm" class="searchForm">
+		<input type="text" wicket:id="searchText" wicket:message="title:714"/>
+		<input type="submit" wicket:id="search" wicket:message="value:714"/>
+	</form>
+</wicket:panel>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.html
index 09b875a..b2f43de 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="pagingForm" class="pagedEntityListPanel">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html
index 2cf2379..3a06a71 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html
@@ -18,15 +18,16 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
-	<wicket:extend>
-		<span class="ui-button-icon ui-icon ui-corner-all ui-icon-closethick remove clickable"
-			wicket:id="remove"></span>
-		<form wicket:id="form"><div
-			class="fileinput fileinput-new" data-provides="fileinput" style="margin: 0;"><div
-			class="fileinput-preview" data-trigger="fileinput"><img wicket:id="img"/></div><div><span
-			class="btn btn-file ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
-			style="width: 120px;"><span class="ui-button-text"><wicket:message key="379"/></span><input
-			type="file" accept="image/*" wicket:id="image"/></span></div></div><span wicket:id="progress">[progressbar]</span></form>
-	</wicket:extend>
+<wicket:extend>
+	<span class="ui-button-icon ui-icon ui-corner-all ui-icon-closethick remove clickable"
+		wicket:id="remove"></span>
+	<form wicket:id="form"><div
+		class="fileinput fileinput-new" data-provides="fileinput" style="margin: 0;"><div
+		class="fileinput-preview" data-trigger="fileinput"><img wicket:id="img"/></div><div><span
+		class="btn btn-file ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+		style="width: 120px;"><span class="ui-button-text"><wicket:message key="379"/></span><input
+		type="file" accept="image/*" wicket:id="image"/></span></div></div><span wicket:id="progress">[progressbar]</span></form>
+</wicket:extend>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
index 618ff88..7e3d78f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div wicket:id="menu" class="ui-widget-header"></div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.html
index 3b648c4..aef0806 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div wicket:id="container" class="dialog errors">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.html
index 6c202a6..a10ec2d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend><span wicket:id="errors" class="errors"></span></wicket:extend>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
index 0dd4dcd..c23ac2e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="form">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.html
index 1b8b067..ec48a8d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="file item"><wicket:child /><span wicket:id="name" class="name"></span></div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/AccessDeniedPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/AccessDeniedPage.html
index 7344de6..f8b095e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/AccessDeniedPage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/AccessDeniedPage.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org" wicket:id="html">
 <wicket:extend>
 	<div class="ui-widget ui-corner-all ui-widget-shadow" style="margin: 4em;">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
index 9f3f5a7..130684a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org" wicket:id="html">
 <head>
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.html
index 2d925dc..ccd343f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<div wicket:id="panel-recording">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.html
index 76e6015..7ecee0f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.html
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="form">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
index cc9a190..97bd696 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<div wicket:id="main-container" style="height: calc(100% - var(--header-height))"><div wicket:id="main" style="height: 100%"/></div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html
index 88bf654..b23a333 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -18,11 +18,12 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<!-- TODO localized versions of this file need to be created -->
 	<div class="message">
-		<b>OpenMeetings - Loading ...</b><br />
+		<strong>OpenMeetings - Loading ...</strong><br />
 		The server is not yet completely initialized. Please try again in a couple of seconds.<br/>
 		If this message persists for several minutes contact your Sys-Administration.<br/>
 		If that message stays forever you should check the logs located in
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/PrivacyPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/PrivacyPage.html
index c4ca248..e401571 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/PrivacyPage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/PrivacyPage.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <head>
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ResetPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ResetPage.html
index c0d7c69..b2d5649 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ResetPage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ResetPage.html
@@ -18,8 +18,9 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
-	<wicket:extend>
-		<div wicket:id="resetPassword"></div>
-	</wicket:extend>
+<wicket:extend>
+	<div wicket:id="resetPassword"></div>
+</wicket:extend>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
index 0bac14e..19266a2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="form">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.html
index 436a059..b0cc105 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.html
@@ -18,12 +18,13 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
-	<wicket:panel>
-		<table>
-			<tr>
-				<td wicket:id="message">[message]</td>
-			</tr>
-		</table>
-	</wicket:panel>
+<wicket:panel>
+	<table>
+		<tr>
+			<td wicket:id="message">[message]</td>
+		</tr>
+	</table>
+</wicket:panel>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
index 30dc8a6..641feea 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="form">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.html
index 6799a36..906cee8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="form">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
index ceb809d..c9bf476 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="signin" class="signin">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.html
index 42b1893..b8522e4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.html
@@ -18,26 +18,27 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
-	<wicket:head>
-		<style>
-			input:not([type='checkbox']):not([type='radio']), select {
-				width: 170px;
-			}
-			td.desc {
-				width: 200px;
-			}
-		</style>
-	</wicket:head>
-	<wicket:extend>
-		<script type="text/javascript">
-			$(function(){
-				$('#area').val(location.hash);
-			});
-		</script>
-		<div wicket:id="signin"></div>
-		<div wicket:id="register"></div>
-		<div wicket:id="forget"></div>
-		<div wicket:id="kick"></div>
-	</wicket:extend>
+<wicket:head>
+	<style>
+		input:not([type='checkbox']):not([type='radio']), select {
+			width: 170px;
+		}
+		td.desc {
+			width: 200px;
+		}
+	</style>
+</wicket:head>
+<wicket:extend>
+	<script type="text/javascript">
+		$(function(){
+			$('#area').val(location.hash);
+		});
+	</script>
+	<div wicket:id="signin"></div>
+	<div wicket:id="register"></div>
+	<div wicket:id="forget"></div>
+	<div wicket:id="kick"></div>
+</wicket:extend>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/CongratulationsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/CongratulationsPanel.html
index 4798ac5..a91ede6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/CongratulationsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/CongratulationsPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<h2>
@@ -26,14 +27,14 @@
 	<div wicket:id="restartPanel" style="font-size: x-large; padding: 20px; color: red;"><wicket:message key="install.wizard.congrats.restart"/></div>
 	<br />
 	<br />
-	<b> <span style="font-size: 1.4em"><wicket:message key="install.wizard.congrats.mail"/></span></b>
+	<strong> <span style="font-size: 1.4em"><wicket:message key="install.wizard.congrats.mail"/></span></strong>
 	<br />
 	<br />
 	<span style="font-size: 1.3em"><a
 		href="https://openmeetings.apache.org/mailing-lists.html" target="_blank">https://openmeetings.apache.org/mailing-lists.html</a></span>
 	<br />
 	<br />
-	<b> <span style="font-size: 1.4em"><wicket:message key="install.wizard.congrats.commercial"/></span></b>
+	<strong> <span style="font-size: 1.4em"><wicket:message key="install.wizard.congrats.commercial"/></span></strong>
 	<br />
 	<br />
 	<span style="font-size: 1.3em"><a
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html
index 22b6724..cba60bb 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<fieldset class="ui-widget-content" id="userData">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html
index ab76233..ac983ac 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$InstallStep.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<p wicket:id="desc"></p>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
index f120225..868a11e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<fieldset class="ui-widget-content" id="userData">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
index 25a3d72..6bfbe17 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<fieldset class="ui-widget-content" id="userConf">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
index 12c5374..1190b90 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<fieldset class="ui-widget-content" id="userConf1">
@@ -59,11 +60,11 @@
 			</li>
 			<li>
 				<p>
-					<i>
+					<em>
 						<wicket:message key="install.wizard.params.step3.seeAlso"/> <a
 						href="https://openmeetings.apache.org/installation.html"
 						target="_blank"><wicket:message key="install.wizard.params.step3.installation"/></a>
-					</i>
+					</em>
 				</p>
 			</li>
 		</ul>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html
index dd9642d..2b01c88 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<fieldset class="ui-widget-content" id="userConf2">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$WelcomeStep.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$WelcomeStep.html
index 8997752..d7d110b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$WelcomeStep.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$WelcomeStep.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div wicket:id="step"></div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.html
index c63bbf9..c29c9ee 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:head>
 	<style type="text/css">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html
index a1b4e77..1d00240 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<table style="width: 100%">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.html
index e783f27..9292964 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:head>
 	<meta http-equiv="cache-control" content="no-cache"/>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.html
index 9766687..45b48d6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.html
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="form">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
index b0ce636..7967e03 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="room holder">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
index 4fbce9c..52bff8c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div id="video-settings" wicket:message="title:51, data-btn-save:144, data-btn-cancel:lbl.cancel" style="display:none;">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
index 4a1ea8c..af00faa 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="ui-widget-header">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.html
index 02943f1..f1b76e2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<div wicket:id="inviteeType">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
index 96d3213..c09bf13 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div wicket:id="menu"></div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html
index 2fa2772..8adbc61 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="sip">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html
index 681812f..0670d74 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="form">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.html
index 59899fa..f3460c5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="selForm">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html
index a4c11e5..db396d3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="form">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.html
index 32014da..48b8c59 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.html
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<span wicket:id="right-video"></span>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html
index 62d0605..41f46b0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<span wicket:id="status" class="ui-icon"></span>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
index 1bad8bd..4504b0e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div id="busy-indicator"></div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html
index 98aedd3..52e1793 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<span wicket:id="settings"></span>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.html
index 8cdc7a2..ade93e5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="form">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.html
index cb610d9..7780cd8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="pod-area" style="width: 1000px;height: 600px;">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
index 63a5a23..7c8dda2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="tabs">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.html
index 5e5cb2f..256c641 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<table>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.html
index 266a27a..64d4289 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="form">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.html
index 12445fb..a6b82c3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="rooms desc info-text"><wicket:message key="1132"/></div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
index 402b81f..52deb76 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:head>
 	<style type="text/css">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.html
index a68a31d..1670e4e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div wicket:id="container">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
index b42577f..398647d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
@@ -18,104 +18,105 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
-	<wicket:panel>
-		<form wicket:id="appForm" class="appointmentPopUp">
-			<span wicket:id="feedback"></span>
-			<div class="tabs">
-				<ul>
-					<li><a href="#tab1"><wicket:message key="appointment.tab.general"/></a></li>
-					<li><a href="#tab2"><wicket:message key="406"/></a></li>
-					<li><a href="#tab3"><wicket:message key="appointment.tab.advanced"/></a></li>
-				</ul>
-				<div id="tab1">
-					<div class="table">
-						<div>
-							<div class="column label"><wicket:message key="572" /></div>
-							<div class="column data"><input type="text" wicket:id="title" /></div>
-						</div>
-						<div>
-							<div class="column label"><wicket:message key="570" /></div>
-							<div class="column data"><span class="date time picker" wicket:id="start"></span></div>
-						</div>
-						<div>
-							<div class="column label"><wicket:message key="571" /></div>
-							<div class="column data"><span class="date time picker" wicket:id="end"></span></div>
-						</div>
-						<div wicket:id="owner-row">
-							<div class="column label"><wicket:message key="1156" /></div>
-							<div class="column data"><span wicket:id="aowner"></span></div>
-						</div>
-						<div wicket:id="inviteeType">
-							<div>
-								<div class="column label"><input type="radio" wicket:id="user"/><label wicket:for="user"><wicket:message key="803" /></label></div>
-								<div class="column data om-select2" wicket:message="title:1588"><select class="appointment attendees input" wicket:id="attendees"></select></div>
-							</div>
-							<div wicket:id="groupContainer">
-								<div class="column label"><input type="radio" wicket:id="group"/><label wicket:for="group"><wicket:message key="126" /></label></div>
-								<div class="column data om-select2"><select wicket:id="groups" class="input invitees"></select></div>
-							</div>
-						</div>
+<wicket:panel>
+	<form wicket:id="appForm" class="appointmentPopUp">
+		<span wicket:id="feedback"></span>
+		<div class="tabs">
+			<ul>
+				<li><a href="#tab1"><wicket:message key="appointment.tab.general"/></a></li>
+				<li><a href="#tab2"><wicket:message key="406"/></a></li>
+				<li><a href="#tab3"><wicket:message key="appointment.tab.advanced"/></a></li>
+			</ul>
+			<div id="tab1">
+				<div class="table">
+					<div>
+						<div class="column label"><wicket:message key="572" /></div>
+						<div class="column data"><input type="text" wicket:id="title" /></div>
+					</div>
+					<div>
+						<div class="column label"><wicket:message key="570" /></div>
+						<div class="column data"><span class="date time picker" wicket:id="start"></span></div>
+					</div>
+					<div>
+						<div class="column label"><wicket:message key="571" /></div>
+						<div class="column data"><span class="date time picker" wicket:id="end"></span></div>
+					</div>
+					<div wicket:id="owner-row">
+						<div class="column label"><wicket:message key="1156" /></div>
+						<div class="column data"><span wicket:id="aowner"></span></div>
+					</div>
+					<div wicket:id="inviteeType">
 						<div>
-							<div class="column label"><wicket:message key="569" /></div>
-							<div class="column data"><input type="text" wicket:id="location" /></div>
+							<div class="column label"><input type="radio" wicket:id="user"/><label wicket:for="user"><wicket:message key="803" /></label></div>
+							<div class="column data om-select2" wicket:message="title:1588"><select class="appointment attendees input" wicket:id="attendees"></select></div>
 						</div>
-						<div>
-							<div class="column label"><wicket:message key="196" /></div>
-							<div class="column data">
-								<div wicket:id="toolbarContainer"></div>
-								<div wicket:id="description"></div>
-							</div>
+						<div wicket:id="groupContainer">
+							<div class="column label"><input type="radio" wicket:id="group"/><label wicket:for="group"><wicket:message key="126" /></label></div>
+							<div class="column data om-select2"><select wicket:id="groups" class="input invitees"></select></div>
 						</div>
 					</div>
-				</div>
-				<div id="tab2">
-					<div class="table">
-						<div wicket:enclosure="createRoom">
-							<input type="checkbox" wicket:id="createRoom" /><label wicket:for="createRoom"><wicket:message key="1509" /></label>
-						</div>
-						<div wicket:id="create-room-block">
-							<div>
-								<div class="column label"><wicket:message key="619" /></div>
-								<div class="column data"><select wicket:id="type" ></select></div>
-							</div>
-							<div>
-								<div class="column label"><label wicket:for="moderated"><wicket:message key="640" /></label></div>
-								<div class="column data"><input type="checkbox" wicket:id="moderated" /></div>
-							</div>
-						</div>
-						<div>
-							<div class="column label"><wicket:message key="406" /></div>
-							<div class="column data"><select wicket:id="groom" ></select></div>
-						</div>
-						<div wicket:id="sip-container">
-							<div class="column label"><wicket:message key="1003"/></div>
-							<div class="column data"><span wicket:id="room.confno"></span></div>
+					<div>
+						<div class="column label"><wicket:message key="569" /></div>
+						<div class="column data"><input type="text" wicket:id="location" /></div>
+					</div>
+					<div>
+						<div class="column label"><wicket:message key="196" /></div>
+						<div class="column data">
+							<div wicket:id="toolbarContainer"></div>
+							<div wicket:id="description"></div>
 						</div>
 					</div>
 				</div>
-				<div id="tab3">
-					<div class="table">
-						<div>
-							<div class="column label"><wicket:message key="565" /></div>
-							<div class="column data"><select wicket:id="reminder" ></select></div>
-						</div>
-						<div>
-							<input type="checkbox" wicket:id="passwordProtected" /><label wicket:for="passwordProtected"><wicket:message key="524" /></label>
-						</div>
+			</div>
+			<div id="tab2">
+				<div class="table">
+					<div wicket:enclosure="createRoom">
+						<input type="checkbox" wicket:id="createRoom" /><label wicket:for="createRoom"><wicket:message key="1509" /></label>
+					</div>
+					<div wicket:id="create-room-block">
 						<div>
-							<div class="column label"><wicket:message key="110" /></div>
-							<div class="column data"><input type="password" wicket:id="password" /></div>
+							<div class="column label"><wicket:message key="619" /></div>
+							<div class="column data"><select wicket:id="type" ></select></div>
 						</div>
-						<div><wicket:message key="1445" /></div>
 						<div>
-							<div class="column label"><wicket:message key="162" /></div>
-							<div class="column data"><select wicket:id="calendar"></select></div>
+							<div class="column label"><label wicket:for="moderated"><wicket:message key="640" /></label></div>
+							<div class="column data"><input type="checkbox" wicket:id="moderated" /></div>
 						</div>
 					</div>
+					<div>
+						<div class="column label"><wicket:message key="406" /></div>
+						<div class="column data"><select wicket:id="groom" ></select></div>
+					</div>
+					<div wicket:id="sip-container">
+						<div class="column label"><wicket:message key="1003"/></div>
+						<div class="column data"><span wicket:id="room.confno"></span></div>
+					</div>
+				</div>
+			</div>
+			<div id="tab3">
+				<div class="table">
+					<div>
+						<div class="column label"><wicket:message key="565" /></div>
+						<div class="column data"><select wicket:id="reminder" ></select></div>
+					</div>
+					<div>
+						<input type="checkbox" wicket:id="passwordProtected" /><label wicket:for="passwordProtected"><wicket:message key="524" /></label>
+					</div>
+					<div>
+						<div class="column label"><wicket:message key="110" /></div>
+						<div class="column data"><input type="password" wicket:id="password" /></div>
+					</div>
+					<div><wicket:message key="1445" /></div>
+					<div>
+						<div class="column label"><wicket:message key="162" /></div>
+						<div class="column data"><select wicket:id="calendar"></select></div>
+					</div>
 				</div>
 			</div>
-		</form>
-		<div wicket:id="confirmDelete"></div>
-	</wicket:panel>
+		</div>
+	</form>
+	<div wicket:id="confirmDelete"></div>
+</wicket:panel>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.html
index d77c3a2..ec9dc2b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.html
@@ -18,35 +18,36 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
-	<wicket:panel>
-		<form wicket:id="calform" class="appointmentPopUp">
-			<span wicket:id="feedback"></span>
-			<div id="tabs">
-				<table>
-					<tr>
-						<td><wicket:message key="572"/></td>
-						<td><input type="text" wicket:id="title"/></td>
-					</tr>
-					<tr>
-						<td wicket:id="urlLabel"></td>
-						<td><input type="url" wicket:id="url" /></td>
-					</tr>
-					<tr>
-						<td wicket:id="userLabel"></td>
-						<td><input type="text" wicket:id="login"/></td>
-					</tr>
-					<tr>
-						<td wicket:id="passLabel"></td>
-						<td><input type="password" wicket:id="password"/></td>
-					</tr>
-					<tr>
-						<td><wicket:message key="calendar.gcal"/></td>
-						<td><input type="checkbox" wicket:id="gcal"/></td>
-					</tr>
-				</table>
-			</div>
-		</form>
-		<div wicket:id="confirmDelete"></div>
-	</wicket:panel>
+<wicket:panel>
+	<form wicket:id="calform" class="appointmentPopUp">
+		<span wicket:id="feedback"></span>
+		<div id="tabs">
+			<table>
+				<tr>
+					<td><wicket:message key="572"/></td>
+					<td><input type="text" wicket:id="title"/></td>
+				</tr>
+				<tr>
+					<td wicket:id="urlLabel"></td>
+					<td><input type="url" wicket:id="url" /></td>
+				</tr>
+				<tr>
+					<td wicket:id="userLabel"></td>
+					<td><input type="text" wicket:id="login"/></td>
+				</tr>
+				<tr>
+					<td wicket:id="passLabel"></td>
+					<td><input type="password" wicket:id="password"/></td>
+				</tr>
+				<tr>
+					<td><wicket:message key="calendar.gcal"/></td>
+					<td><input type="checkbox" wicket:id="gcal"/></td>
+				</tr>
+			</table>
+		</div>
+	</form>
+	<div wicket:id="confirmDelete"></div>
+</wicket:panel>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.html
index 258e1ac..4afd78d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.html
@@ -18,28 +18,29 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
-	<wicket:panel>
-		<div id="calendarlistcontainer">
-			<div class="cell">
-				<button wicket:id="submitCalendar"><span><wicket:message key="calendar.addCalendar"/></span></button>
-				<button wicket:id="syncCalendarButton"><span>Sync</span></button>
-			</div>
-			<ul class="calendarlist striped-table" wicket:id="calendarListContainer">
-				<li wicket:id="items" class="ui-widget-content striped-row clickable">
-					<div wicket:id="item"><span wicket:id="name"></span></div>
-				</li>
-			</ul>
+<wicket:panel>
+	<div id="calendarlistcontainer">
+		<div class="cell">
+			<button wicket:id="submitCalendar"><span><wicket:message key="calendar.addCalendar"/></span></button>
+			<button wicket:id="syncCalendarButton"><span>Sync</span></button>
 		</div>
-		<div id="wrapper-panel-frame" class="ui-corner-all">
-			<form class="main-form" wicket:id="form">
-				<div id="calendar" wicket:id="calendar"></div>
-				<br/>
-				<!-- div wicket:id="feedback"></div -->
-			</form>
-		</div>
-		<div wicket:id="appointment">[appointment]</div>
-		<div wicket:id="calendarDialog"></div>
-		<!-- bottom section -->
-	</wicket:panel>
+		<ul class="calendarlist striped-table" wicket:id="calendarListContainer">
+			<li wicket:id="items" class="ui-widget-content striped-row clickable">
+				<div wicket:id="item"><span wicket:id="name"></span></div>
+			</li>
+		</ul>
+	</div>
+	<div id="wrapper-panel-frame" class="ui-corner-all">
+		<form class="main-form" wicket:id="form">
+			<div id="calendar" wicket:id="calendar"></div>
+			<br/>
+			<!-- div wicket:id="feedback"></div -->
+		</form>
+	</div>
+	<div wicket:id="appointment">[appointment]</div>
+	<div wicket:id="calendarDialog"></div>
+	<!-- bottom section -->
+</wicket:panel>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
index 674a08a..90017ff 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div id="chatTabs">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html
index 771328a..dbad5c2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div id="chatPopup" class="ui-state-default">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
index d09e597..21ed6ba 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:head>
 	<style>
@@ -44,7 +45,7 @@
 			</ul>
 		</div>
 		<div class="btn-group dropup">
-			<a id="fontSize" class="chat btn btn-default dropdown-toggle" data-toggle="dropdown" title="Font Size"> A <b class="caret"></b></a>
+			<a id="fontSize" class="chat btn btn-default dropdown-toggle" data-toggle="dropdown" title="Font Size"> A <b class="caret"></strong></a>
 			<ul class="dropdown-menu">
 				<li><a data-edit="fontSize 5"><font size="3">Huge</font></a></li>
 				<li><a data-edit="fontSize 3"><font size="2">Normal</font></a></li>
@@ -54,7 +55,7 @@
 		<div class="btn-group dropup">
 			<a id="fontStyle" class="chat btn btn-default dropdown-toggle" data-toggle="dropdown" title="Font Style">
 				<span class="chat-tool-icon">&nbsp;</span>
-				<b class="caret"></b>
+				<b class="caret"></strong>
 			</a>
 			<ul class="dropdown-menu btns-only">
 				<li><a class="chat-btn chat-tool-icon btn btn-default" id="bold" data-edit="bold" title="Bold (Ctrl/Cmd+B)" style="font-weight: bold;"> B </a></li>
@@ -73,7 +74,7 @@
 		<div class="btn-group dropup">
 			<a id="actions" class="chat btn btn-default dropdown-toggle" data-toggle="dropdown" wicket:message="title:635">
 				<span class="list chat-tool-icon">&nbsp;</span>
-				<b class="caret"></b>
+				<b class="caret"></strong>
 			</a>
 			<ul class="dropdown-menu btns-only">
 				<li><a class="chat-btn chat-tool-icon btn btn-default save" wicket:message="title:197" wicket:id="save"></a></li>
@@ -81,7 +82,7 @@
 					<span class="ui-button-icon ui-icon ui-icon-closethick"></span>
 				</a></li>
 				<li><a class="chat-btn chat-tool-icon btn btn-default audio" wicket:message="data-sound-enabled:sound.mute,data-sound-muted:sound.enable">&nbsp;</a></li>
-				<li><a class="chat-btn chat-tool-icon btn btn-default send-btn" wicket:message="data-send-enter:send.on.enter,data-send-ctrl:send.on.ctrl.enter"><b>&crarr;</b></a></li>
+				<li><a class="chat-btn chat-tool-icon btn btn-default send-btn" wicket:message="data-send-enter:send.on.enter,data-send-ctrl:send.on.ctrl.enter"><strong>&crarr;</strong></a></li>
 			</ul>
 		</div>
 	</div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.html
index 6d9106b..6f5b002 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.html
@@ -17,8 +17,9 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
-	<wicket:panel>
-		<div class="rooms-widget" wicket:id="rooms"></div>
-	</wicket:panel>
+<wicket:panel>
+	<div class="rooms-widget" wicket:id="rooms"></div>
+</wicket:panel>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.html
index 67fd333..f09251d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.html
@@ -17,8 +17,9 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
-	<wicket:panel>
-		<div wicket:id="dashboard" class="dashboard"></div>
-	</wicket:panel>
+<wicket:panel>
+	<div wicket:id="dashboard" class="dashboard"></div>
+</wicket:panel>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidgetView.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidgetView.html
index 7732b76..20ef822 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidgetView.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidgetView.html
@@ -17,8 +17,9 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
-	<wicket:panel>
-		<div wicket:id="rooms"></div>
-	</wicket:panel>
+<wicket:panel>
+	<div wicket:id="rooms"></div>
+</wicket:panel>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html
index 7c78ac7..7cf26b7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div id="feedcontainer"></div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
index c30db5f..9f1a0be 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
@@ -18,21 +18,22 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
-	<wicket:panel>
-		<h3><wicket:message key="widget.start.header"/></h3>
-		<div><div wicket:id="step1" class="clickable start_step1"><wicket:message key="768"/></div></div>
-		<div><div wicket:id="step2" class="clickable start_step2"><wicket:message key="771"/></div></div>
-		<div><div wicket:id="step3" class="start_step3"><a wicket:id="avTest" target="_blank" rel="noopener"><wicket:message key="772"/></a></div></div>
-		<div><div wicket:id="step4" class="clickable start_step4"><wicket:message key="773"/></div></div>
-		<table>
-			<tr>
-				<td><div wicket:id="123msg"></div></td>
-				<td>
-					<button wicket:id="start" type="button"><wicket:message key="788"/></button><br/>
-					<button wicket:id="calendar" type="button"><wicket:message key="291"/></button>
-				</td>
-			</tr>
-		</table>
-	</wicket:panel>
+<wicket:panel>
+	<h3><wicket:message key="widget.start.header"/></h3>
+	<div><div wicket:id="step1" class="clickable start_step1"><wicket:message key="768"/></div></div>
+	<div><div wicket:id="step2" class="clickable start_step2"><wicket:message key="771"/></div></div>
+	<div><div wicket:id="step3" class="start_step3"><a wicket:id="avTest" target="_blank" rel="noopener"><wicket:message key="772"/></a></div></div>
+	<div><div wicket:id="step4" class="clickable start_step4"><wicket:message key="773"/></div></div>
+	<table>
+		<tr>
+			<td><div wicket:id="123msg"></div></td>
+			<td>
+				<button wicket:id="start" type="button"><wicket:message key="788"/></button><br/>
+				<button wicket:id="calendar" type="button"><wicket:message key="291"/></button>
+			</td>
+		</tr>
+	</table>
+</wicket:panel>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
index 148e5d8..e52b851 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<table>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html
index 820e317..c6ba4ed 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="ui-widget">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.html
index 1728c9b..36d0ad2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<h3><wicket:message key="dashboard.widget.admin.title"/></h3>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupEntityUnitPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupEntityUnitPanel.html
index 76c4fd4..5f42b5b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupEntityUnitPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupEntityUnitPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<ul>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupUnitPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupUnitPanel.html
index 1850f6bb..955111f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupUnitPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupUnitPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<span wicket:id="lbl"></span>&nbsp;&nbsp;<span wicket:id="humanTotal"></span>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.html
index e2f187f..1e157f9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="form">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.html
index dfa3c89..1d0282d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="actions" wicket:id="buttons"></div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfilePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfilePanel.html
index 9952fe3..b80c4a7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfilePanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfilePanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="form" class="adminForm edit-profile"/>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.html
index d9ce01d..660cb5a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="adminPanel">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
index 441561d..0fdad82 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<!-- TODO design should be changed in the future -->
@@ -38,7 +39,7 @@
 					</div>
 				</td>
 				<td class="main">
-					<div><b><wicket:message key="1206"/>&nbsp;(<span wicket:id="unread"></span>)</b></div>
+					<div><strong><wicket:message key="1206"/>&nbsp;(<span wicket:id="unread"></span>)</strong></div>
 					<div class="adminNav" wicket:id="navigator"></div>
 					<table id="messagesTable" class="list-table small full-width">
 						<thead>
@@ -101,8 +102,8 @@
 					</div>
 				</td>
 				<td class="side right" wicket:id="contacts">
-					<div><b><wicket:message key="1189"/>&nbsp;(<span wicket:id="pendingContacts"></span>)</b></div>
-					<div><b><wicket:message key="1188"/>&nbsp;(<span wicket:id="allContacts"></span>)</b></div>
+					<div><strong><wicket:message key="1189"/>&nbsp;(<span wicket:id="pendingContacts"></span>)</strong></div>
+					<div><strong><wicket:message key="1188"/>&nbsp;(<span wicket:id="allContacts"></span>)</strong></div>
 					<table style="width: 100%">
 						<tr>
 							<th><wicket:message key="165"/></th>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.html
index 6d7c7d7..566ce1d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.html
@@ -18,8 +18,9 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
-	<wicket:panel>
-		<div wicket:id="tabs" class="user-settings"></div>
-	</wicket:panel>
+<wicket:panel>
+	<div wicket:id="tabs" class="user-settings"></div>
+</wicket:panel>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
index 94c8b94..5f36e96 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div style="height: 100%; overflow-y: auto;">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
index 5dd5787..1450f8a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<!--  TODO move styles into CSS -->
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.html
index 11f260c..1bc5fd2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.html
@@ -18,14 +18,15 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
-	<wicket:panel>
-		<table class="widget">
-			<tr wicket:id="widgets">
-				<td wicket:id="name"></td>
-				<td wicket:id="description"></td>
-				<td><label wicket:for="display"><wicket:message key="1590"/></label>&nbsp;&nbsp;<input type="checkbox" wicket:id="display"/></td>
-			</tr>
-		</table>
-	</wicket:panel>
+<wicket:panel>
+	<table class="widget">
+		<tr wicket:id="widgets">
+			<td wicket:id="name"></td>
+			<td wicket:id="description"></td>
+			<td><label wicket:for="display"><wicket:message key="1590"/></label>&nbsp;&nbsp;<input type="checkbox" wicket:id="display"/></td>
+		</tr>
+	</table>
+</wicket:panel>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingInvitationForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingInvitationForm.html
index 4053014..7cf82d4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingInvitationForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingInvitationForm.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
 	<div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html
index 64d9d32..f1be7b7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="recording-panel">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.html
index b65390f..bd2a017 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form class="info" wicket:id="form">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
index 1a3e7a7..1882bbf 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="video" wicket:id="container">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html
index 2bed732..4fab5a0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="room-list">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
index 92ff36d..3f2cfb4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="rooms-table">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.html
index 93da52b..9ce81bb 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="rooms-header">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.html
index 9e5bfd5..2f45a05 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.html
@@ -18,6 +18,7 @@
   under the License.
 
 -->
+<!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div id="orgTabs">