diff --git a/src/admin/templates/msg.tpl b/src/admin/templates/msg.tpl
index ebc4a3a..096fff6 100644
--- a/src/admin/templates/msg.tpl
+++ b/src/admin/templates/msg.tpl
@@ -1,7 +1,7 @@
 <fieldset>
 	<legend>{$msgTitle}</legend>
 	
-	{if $msgIcon}
+	{if !empty($msgIcon)}
 	<table>
 		<tr>
 			<td width="36" valign="top"><img src="{$tpldir}images/{$msgIcon}.png" border="0" alt="" width="32" height="32" /></td>
@@ -12,7 +12,7 @@
 	{$msgText}
 	{/if}
 	
-	{if $backLink}
+	{if !empty($backLink)}
 	<p align="right">
 		<input class="button" type="button" onclick="document.location.href='{$backLink}sid={$sid}';" value=" {lng p="back"} " />
 	</p>
@@ -23,7 +23,7 @@
 	{/if}
 </fieldset>
 
-{if $reloadMenu}
+{if isset($reloadMenu)}
 <script>
 <!--
 	parent.frames['menu'].location.href = 'main.php?action=menu&item=4&sid={$sid}';
diff --git a/src/admin/templates/prefs.widgetlayouts.layout.tpl b/src/admin/templates/prefs.widgetlayouts.layout.tpl
index 8154c99..b456ef9 100644
--- a/src/admin/templates/prefs.widgetlayouts.layout.tpl
+++ b/src/admin/templates/prefs.widgetlayouts.layout.tpl
@@ -12,7 +12,7 @@
 		{/foreach}
 		</div>
 		
-		<script src="../clientlib/dragcontainer.js" type="text/javascript"></script>
+		<script src="../clientlib/dragcontainer.js?{fileDateSig file="../../clientlib/dragcontainer.js"}" type="text/javascript"></script>
 		<script>
 		<!--
 			var dc = new dragContainer('dashboard', 3, 'dc');
diff --git a/src/clientlib/dragcontainer.js b/src/clientlib/dragcontainer.js
index 2afaac0..8750803 100644
--- a/src/clientlib/dragcontainer.js
+++ b/src/clientlib/dragcontainer.js
@@ -51,23 +51,23 @@ function dragContainer(elem, cols, instanceName)
 	}
 
 	this.run = function()
-	{
-		// create table
-		var colWidth = Math.floor(100/this.cols);
-		var tableCode = '<table class="dragTable" onmouseup="' + this.instanceName + '.parentMouseUp(event)" onmousemove="' + this.instanceName + '.parentMouseMove(event)">';
-		tableCode += '<tr>';
-		for(var col=0; col<this.cols; col++)
-			tableCode += '<td id="' + this.name + 'col_' + col + '" class="dragTableColumn" width="' + colWidth + '%">&nbsp;</td>';
-		tableCode += '</tr>';
-		tableCode += '</table>';
-		tableCode += '<div class="dragItem" onmouseup="' + this.instanceName + '.parentMouseUp(event)" onmousemove="' + this.instanceName + '.parentMouseMove(event)" id="' + this.name + 'dc" style="display:none;position:absolute;top:0px;left:0px;"></div>';
+    {
+        // create table
+        var colWidth = Math.floor(100/this.cols);
+        var tableCode = '<div class="dragTable" onmouseup="' + this.instanceName + '.parentMouseUp(event)" onmousemove="' + this.instanceName + '.parentMouseMove(event)">';
+        //tableCode += '<tr>';
+        for(var col=0; col<this.cols; col++)
+            tableCode += '<div id="' + this.name + 'col_' + col + '" class="dragTableColumn">&nbsp;</div>';
+        //tableCode += '</tr>';
+        tableCode += '</div>';
+        tableCode += '<div class="dragItem" onmouseup="' + this.instanceName + '.parentMouseUp(event)" onmousemove="' + this.instanceName + '.parentMouseMove(event)" id="' + this.name + 'dc" style="display:none;position:absolute;top:0px;left:0px;"></div>';
 
-		// render table
-		this.parentContainer.innerHTML = tableCode;
+        // render table
+        this.parentContainer.innerHTML = tableCode;
 
-		// create dock items
-		this.createDockItems();
-	}
+        // create dock items
+        this.createDockItems();
+    }
 
 	this.parseOrder = function(o)
 	{
diff --git a/src/plugins/vbulletin.auth.php b/src/plugins/vbulletin.auth.php
index 6959f97..d639dd6 100644
--- a/src/plugins/vbulletin.auth.php
+++ b/src/plugins/vbulletin.auth.php
@@ -36,7 +36,7 @@ class VBulletinAuthPlugin extends BMPlugin
 	{
 		// plugin info
 		$this->type					= BMPLUGIN_DEFAULT;
-		$this->name					= 'VBulletin Authentication PlugIn';
+		$this->name					= 'vBulletin Authentication PlugIn';
 		$this->author				= 'b1gMail Project';
 		$this->version				= '1.8';
 
diff --git a/src/templates/modern/li/organizer.addressbook.edit.tpl b/src/templates/modern/li/organizer.addressbook.edit.tpl
index 2375553..e311864 100644
--- a/src/templates/modern/li/organizer.addressbook.edit.tpl
+++ b/src/templates/modern/li/organizer.addressbook.edit.tpl
@@ -31,7 +31,7 @@
 					<div align="left">
 						{if !$groups}<small>{lng p="nogroups"}</small>{else}
 						{foreach from=$groups item=group key=groupID}
-							<input type="checkbox" id="group_{$groupID}" name="group_{$groupID}"{if $group.member} checked="checked"{/if} />
+							<input type="checkbox" id="group_{$groupID}" name="group_{$groupID}"{if !empty($group.member)} checked="checked"{/if} />
 							<label for="group_{$groupID}">{text value=$group.title cut=18}</label><br />
 						{/foreach}
 						{/if}
@@ -213,7 +213,7 @@
 		<tr>
 			<td class="listTableLeft">{lng p="birthday"}:</td>
 			<td class="listTableRight">	
-				{if isset($contact.geburtsdatum)}
+				{if !empty($contact.geburtsdatum)}
 				{html_select_date time=$contact.geburtsdatum year_empty="---" day_empty="---" month_empty="---" start_year="-120" end_year="+0" prefix="geburtsdatum_" field_order="DMY"}
 				{else}
 				{html_select_date time="---" year_empty="---" day_empty="---" month_empty="---" start_year="-120" end_year="+0" prefix="geburtsdatum_" field_order="DMY"}
@@ -236,6 +236,6 @@
 	</table>
 </form>
 
-{$jsCode}
+{if !empty($jsCode)}{$jsCode}{/if}
 
 </div></div>
diff --git a/src/templates/modern/li/organizer.addressbook.tpl b/src/templates/modern/li/organizer.addressbook.tpl
index 32476f1..d04d0d6 100644
--- a/src/templates/modern/li/organizer.addressbook.tpl
+++ b/src/templates/modern/li/organizer.addressbook.tpl
@@ -78,7 +78,7 @@
 					<tr id="addr_{$addressID}">
 						{if $templatePrefs.showCheckboxes}
 						<td style="text-align:center;width:24px;">
-							<input type="checkbox" id="selecTable_{$mailID}" />
+							<input type="checkbox" id="selecTable_{$addressID}" />
 						</td>
 						{/if}
 						<td class="{$class}">
diff --git a/src/templates/modern/li/organizer.start.tpl b/src/templates/modern/li/organizer.start.tpl
index 3e75d9f..fedcf54 100644
--- a/src/templates/modern/li/organizer.start.tpl
+++ b/src/templates/modern/li/organizer.start.tpl
@@ -21,7 +21,7 @@
 	</div>
 </div></div>
 
-<script src="./clientlib/dragcontainer.js" type="text/javascript"></script>
+<script src="./clientlib/dragcontainer.js?{fileDateSig file="../../clientlib/dragcontainer.js"}" type="text/javascript"></script>
 <script>
 <!--
 	currentSID = '{$sid}';
diff --git a/src/templates/modern/li/start.page.tpl b/src/templates/modern/li/start.page.tpl
index d29f36b..e1c4ab5 100644
--- a/src/templates/modern/li/start.page.tpl
+++ b/src/templates/modern/li/start.page.tpl
@@ -28,7 +28,7 @@
 	{hook id="start.page.tpl:foot"}
 </div></div>
 
-<script src="./clientlib/dragcontainer.js" type="text/javascript"></script>
+<script src="./clientlib/dragcontainer.js?{fileDateSig file="../../clientlib/dragcontainer.js"}" type="text/javascript"></script>
 <script>
 <!--
 	currentSID = '{$sid}';
diff --git a/src/templates/modern/style/loggedin.css b/src/templates/modern/style/loggedin.css
index f33a941..8ab3fd2 100644
--- a/src/templates/modern/style/loggedin.css
+++ b/src/templates/modern/style/loggedin.css
@@ -2292,11 +2292,15 @@ A:hover
 /* ******************************************************************* */
 .dragTable
 {
-	width: 100%;
+    width: 100%;
+    display: flex;
+      flex-wrap: wrap;
 }
 .dragTableColumn
 {
-	vertical-align: top;
+    flex-grow: 1;
+      flex-shrink: 1;
+      flex-basis: 350px;
 }
 .dragItem
 {