diff --git a/interface/web/admin/templates/directive_snippets_edit.htm b/interface/web/admin/templates/directive_snippets_edit.htm
index 4366a6892defa7a896791e1ebcaa6d2ae9f011ca..2bb7da5ff2e36042e45f2e29efd13a32dfa5b1df 100644
--- a/interface/web/admin/templates/directive_snippets_edit.htm
+++ b/interface/web/admin/templates/directive_snippets_edit.htm
@@ -12,8 +12,8 @@
                 <label for="type" class="col-sm-3 control-label">{tmpl_var name='type_txt'}</label>
                 <div class="col-sm-9"><select name="type" id="type" class="form-control">
                     {tmpl_var name='type'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
 			<div class="form-group">
                 <label for="snippet" class="col-sm-3 control-label">{tmpl_var name='snippet_txt'}</label>
                 <div class="col-sm-9"><textarea class="form-control" name="snippet" id="snippet" rows='10' cols='50' style="width:400px;">{tmpl_var name='snippet'}</textarea></div><span class="nginx"> &nbsp; {tmpl_var name='variables_txt'}: </span><a href="javascript:void(0);" class="addPlaceholder nginx">{DOCROOT}</a><span class="nginx">, </span><a href="javascript:void(0);" class="addPlaceholder nginx">{FASTCGIPASS}</a>
diff --git a/interface/web/admin/templates/firewall_edit.htm b/interface/web/admin/templates/firewall_edit.htm
index c629d448743678435ea2b3ec31f6ec6aab984b9f..f864b8550f652d5dd47a7fdc2ac4e3c5bcbabd3a 100644
--- a/interface/web/admin/templates/firewall_edit.htm
+++ b/interface/web/admin/templates/firewall_edit.htm
@@ -9,8 +9,8 @@
                 <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                 <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                     {tmpl_var name='server_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="tcp_port" class="col-sm-3 control-label">{tmpl_var name='tcp_port_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="tcp_port" id="tcp_port" value="{tmpl_var name='tcp_port'}" class="form-control" /></div></div>
diff --git a/interface/web/admin/templates/iptables_edit.htm b/interface/web/admin/templates/iptables_edit.htm
index 4a5b76396e19a678667c9d977ef31394ebc4ae6a..c1ead2b1e21e1dcef34f9daca7c2309984f038e8 100644
--- a/interface/web/admin/templates/iptables_edit.htm
+++ b/interface/web/admin/templates/iptables_edit.htm
@@ -8,20 +8,20 @@
                 <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                 <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                     {tmpl_var name='server_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="table" class="col-sm-3 control-label">{tmpl_var name='table_txt'}</label>
                 <div class="col-sm-9"><select name="table" id="table" class="form-control">
                     {tmpl_var name='table'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="protocol" class="col-sm-3 control-label">{tmpl_var name='protocol_txt'}</label>
                 <div class="col-sm-9"><select name="protocol" id="protocol" class="form-control">
                     {tmpl_var name='protocol'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="singleport" class="col-sm-3 control-label">{tmpl_var name='singleport_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="singleport" id="singleport" value="{tmpl_var name='singleport'}" class="form-control" /></div></div>
@@ -41,8 +41,8 @@
                 <label for="target" class="col-sm-3 control-label">{tmpl_var name='target_txt'}</label>
                 <div class="col-sm-9"><select name="target" id="target" class="form-control">
                     {tmpl_var name='target'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/admin/templates/language_add.htm b/interface/web/admin/templates/language_add.htm
index 5c0e81f14c1bf619d975abba50a0460572429d12..72bb15d2a235c6810f9f8d084b80252f3d7a748e 100644
--- a/interface/web/admin/templates/language_add.htm
+++ b/interface/web/admin/templates/language_add.htm
@@ -7,10 +7,10 @@
         <legend>Language Add</legend>
             <div class="form-group">
                 <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
-                <div class="col-sm-9"><select name="lng_select" id="language" class="form-control">
+                <div class="col-sm-9"><select name="lng_select" id="language" class="form-control flags">
                     {tmpl_var name='language_option'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="lng_new" class="col-sm-3 control-label">{tmpl_var name='language_new_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="lng_new" id="lng_new" value="" class="form-control" /></div><p class="formHint">{tmpl_var name='language_new_hint_txt'}</p>
diff --git a/interface/web/admin/templates/language_complete.htm b/interface/web/admin/templates/language_complete.htm
index dc722c788fd8759a337ad9a6f6acf6a94527843e..584ac47ce915e82e1a29ec0fe0d15c22f245b967 100644
--- a/interface/web/admin/templates/language_complete.htm
+++ b/interface/web/admin/templates/language_complete.htm
@@ -16,10 +16,10 @@
         <legend>Language Complete</legend>
             <div class="form-group">
                 <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
-                <div class="col-sm-9"><select name="lng_select" id="language" class="form-control">
+                <div class="col-sm-9"><select name="lng_select" id="language" class="form-control flags">
                     {tmpl_var name='language_option'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
 			<div class="clear"><div class="right">
 				<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/language_complete.php');">{tmpl_var name='btn_save_txt'}</button>
 				<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
diff --git a/interface/web/admin/templates/language_export.htm b/interface/web/admin/templates/language_export.htm
index d18ba1005544eada4f08763298d207635c535706..15184a59c0b12f9c420e91ab319fa35bb38bcf19 100644
--- a/interface/web/admin/templates/language_export.htm
+++ b/interface/web/admin/templates/language_export.htm
@@ -7,10 +7,10 @@
         <legend>Language Export</legend>
             <div class="form-group">
                 <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
-                <div class="col-sm-9"><select name="lng_select" id="lng_select" class="form-control">
+                <div class="col-sm-9"><select name="lng_select" id="lng_select" class="form-control flags">
                     {tmpl_var name='language_option'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
                 
                 
             <tmpl_if name="msg">
diff --git a/interface/web/admin/templates/language_list.htm b/interface/web/admin/templates/language_list.htm
index 1e89b50b62b572dd0c4d066e4c36ed496c6e07f8..55c27eb10d97553edc38c7ea750046f20c375115 100644
--- a/interface/web/admin/templates/language_list.htm
+++ b/interface/web/admin/templates/language_list.htm
@@ -8,11 +8,10 @@
             
                 <div class="form-group">
                     <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
-                    <div class="col-sm-9"><select name="lng_select" id="language" class="form-control" onChange="submitForm('pageForm','admin/language_list.php');">
+                    <div class="col-sm-9"><select name="lng_select" id="language" class="form-control flags" onChange="submitForm('pageForm','admin/language_list.php');">
                         {tmpl_var name='language_option'}
-                    </select>
+                    </select></div>
                 
-            </div>
         
     </div>
   
diff --git a/interface/web/admin/templates/remote_action_ispcupdate.htm b/interface/web/admin/templates/remote_action_ispcupdate.htm
index 5761726a6e30dee08cdf5f6de032c1f8f20c81b7..1fe5f767792caac631e74497743713c69b5dfac3 100644
--- a/interface/web/admin/templates/remote_action_ispcupdate.htm
+++ b/interface/web/admin/templates/remote_action_ispcupdate.htm
@@ -19,8 +19,8 @@
               <label for="server_select" class="col-sm-3 control-label">{tmpl_var name='select_server_txt'}</label>
               <div class="col-sm-9"><select name="server_select" id="server" class="form-control" onchange="document.getElementById('OKMsg').style.visibility = 'hidden'; ">
                                               {tmpl_var name='server_option'}
-                                      </select>
-            </div></div>
+                                      </select></div>
+            </div>
           
       
               <tmpl_if name="msg">
diff --git a/interface/web/admin/templates/remote_action_osupdate.htm b/interface/web/admin/templates/remote_action_osupdate.htm
index 72990d5d7bba4e4fcdd5da2992d94f5357a64ea7..ba43e0816c6b7b64a90fe7065f4bfbd8ce424c6f 100644
--- a/interface/web/admin/templates/remote_action_osupdate.htm
+++ b/interface/web/admin/templates/remote_action_osupdate.htm
@@ -9,8 +9,8 @@
                 <label for="server_select" class="col-sm-3 control-label">{tmpl_var name='select_server_txt'}</label>
                 <div class="col-sm-9"><select name="server_select" id="server" class="form-control" onchange="$('#OKMsg').hide(); ">
                     {tmpl_var name='server_option'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
         
             
         <tmpl_if name="msg">
diff --git a/interface/web/admin/templates/server_config_fastcgi_edit.htm b/interface/web/admin/templates/server_config_fastcgi_edit.htm
index 8db25a98dbec5145c3f8411bd44477046a3129e1..b8676c5fc0b1b56c667668a39f52f062128427cf 100644
--- a/interface/web/admin/templates/server_config_fastcgi_edit.htm
+++ b/interface/web/admin/templates/server_config_fastcgi_edit.htm
@@ -30,8 +30,8 @@
                 <label for="fastcgi_config_syntax" class="col-sm-3 control-label">{tmpl_var name='fastcgi_config_syntax_txt'}</label>
                 <div class="col-sm-9"><select name="fastcgi_config_syntax" id="fastcgi_config_syntax" class="form-control">
                     {tmpl_var name='fastcgi_config_syntax'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
         
             
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm
index fcc320e4ff9cae43ba80f280879c2bed797a592c..30f9de01033792355147f58bf063d03250089aba 100644
--- a/interface/web/admin/templates/server_config_mail_edit.htm
+++ b/interface/web/admin/templates/server_config_mail_edit.htm
@@ -9,8 +9,8 @@
                 <label for="module" class="col-sm-3 control-label">{tmpl_var name='module_txt'}</label>
                 <div class="col-sm-9"><select name="module" id="module" class="form-control">
                     {tmpl_var name='module'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="maildir_path" class="col-sm-3 control-label">{tmpl_var name='maildir_path_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="maildir_path" id="maildir_path" value="{tmpl_var name='maildir_path'}" class="form-control" /></div></div>
@@ -25,24 +25,24 @@
 				<div class="col-sm-9">
 					<div class="col-sm-9"><select name="dkim_strength" id="dkim_strength" class="form-control">
 						{tmpl_var name='dkim_strength'}
-					</select>
-				</div></div>
+					</select></div>
+				</div>
 			</div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='pop3_imap_daemon_txt'}</label>
                 <div class="col-sm-9">
                     <div class="col-sm-9"><select name="pop3_imap_daemon" id="pop3_imap_daemon" class="form-control">
                         {tmpl_var name='pop3_imap_daemon'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='mail_filter_syntax_txt'}</label>
                 <div class="col-sm-9">
                     <div class="col-sm-9"><select name="mail_filter_syntax" id="mail_filter_syntax" class="form-control">
                         {tmpl_var name='mail_filter_syntax'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
             </div>
             <div class="form-group">
                 <label for="mailuser_uid" class="col-sm-3 control-label">{tmpl_var name='mailuser_uid_txt'}</label>
diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm
index 3cf6af500f19b5ffba1199792c85303f40a07420..3cda9418d0b6e693eaf79893a0c14dc478c21bf6 100644
--- a/interface/web/admin/templates/server_config_server_edit.htm
+++ b/interface/web/admin/templates/server_config_server_edit.htm
@@ -34,20 +34,20 @@
                 <label for="firewall" class="col-sm-3 control-label">{tmpl_var name='firewall_txt'}</label>
                 <div class="col-sm-9"><select name="firewall" id="firewall" class="form-control">
                     {tmpl_var name='firewall'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="loglevel" class="col-sm-3 control-label">{tmpl_var name='loglevel_txt'}</label>
                 <div class="col-sm-9"><select name="loglevel" id="loglevel" class="form-control">
                     {tmpl_var name='loglevel'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
 			<div class="form-group">
                 <label for="admin_notify_events" class="col-sm-3 control-label">{tmpl_var name='admin_notify_events_txt'}</label>
                 <div class="col-sm-9"><select name="admin_notify_events" id="admin_notify_events" class="form-control">
                     {tmpl_var name='admin_notify_events'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="backup_dir" class="col-sm-3 control-label">{tmpl_var name='backup_dir_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="backup_dir" id="backup_dir" value="{tmpl_var name='backup_dir'}" class="form-control" /></div></div>
@@ -61,8 +61,8 @@
                 <label for="backup_mode" class="col-sm-3 control-label">{tmpl_var name='backup_mode_txt'}</label>
                 <div class="col-sm-9"><select name="backup_mode" id="backup_mode" class="form-control">
                     {tmpl_var name='backup_mode'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='backup_delete_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/admin/templates/server_config_ufw_edit.htm b/interface/web/admin/templates/server_config_ufw_edit.htm
index 0c71ae9d6ab220e09c45146d78ace6c4410e9c10..941f35928ed79931ecdf6755d243fb8e3a01474b 100644
--- a/interface/web/admin/templates/server_config_ufw_edit.htm
+++ b/interface/web/admin/templates/server_config_ufw_edit.htm
@@ -27,32 +27,32 @@
                 <label for="ufw_default_input_policy" class="col-sm-3 control-label">{tmpl_var name='ufw_default_input_policy_txt'}</label>
                 <div class="col-sm-9"><select name="ufw_default_input_policy" id="ufw_default_input_policy" class="form-control">
                     {tmpl_var name='ufw_default_input_policy'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="ufw_default_output_policy" class="col-sm-3 control-label">{tmpl_var name='ufw_default_output_policy_txt'}</label>
                 <div class="col-sm-9"><select name="ufw_default_output_policy" id="ufw_default_output_policy" class="form-control">
                     {tmpl_var name='ufw_default_output_policy'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="ufw_default_forward_policy" class="col-sm-3 control-label">{tmpl_var name='ufw_default_forward_policy_txt'}</label>
                 <div class="col-sm-9"><select name="ufw_default_forward_policy" id="ufw_default_forward_policy" class="form-control">
                     {tmpl_var name='ufw_default_forward_policy'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="ufw_default_application_policy" class="col-sm-3 control-label">{tmpl_var name='ufw_default_application_policy_txt'}</label>
                 <div class="col-sm-9"><select name="ufw_default_application_policy" id="ufw_default_application_policy" class="form-control">
                     {tmpl_var name='ufw_default_application_policy'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="ufw_log_level" class="col-sm-3 control-label">{tmpl_var name='ufw_log_level_txt'}</label>
                 <div class="col-sm-9"><select name="ufw_log_level" id="ufw_log_level" class="form-control">
                     {tmpl_var name='ufw_log_level'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
         
             
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index 9f621e0d41a45bae4974d9044e0b7637ba5bc67b..855fea5f1368228d9b663da51483d07efe6e112d 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -10,8 +10,8 @@
                 <div class="col-sm-9">
                     <div class="col-sm-9"><select name="server_type" id="server_type" class="form-control">
                         {tmpl_var name='server_type'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
             </div>
             <div class="form-group">
                 <label for="website_basedir" class="col-sm-3 control-label">{tmpl_var name='website_basedir_txt'}</label>
@@ -61,8 +61,8 @@
                 <div class="col-sm-9">
                     <div class="col-sm-9"><select name="security_level" id="security_level" class="form-control">
                         {tmpl_var name='security_level'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
             </div>
             <div class="form-group apache">
                 <label class="col-sm-3 control-label">{tmpl_var name='check_apache_config_txt'}</label>
@@ -228,8 +228,8 @@
                     <div class="col-sm-9">
                         <div class="col-sm-9"><select name="php_handler" id="php_handler" class="form-control">
                             {tmpl_var name='php_handler'}
-                        </select>
-                    </div></div>
+                        </select></div>
+                    </div>
                 </div>
             </div>
             <div class="subsectiontoggle"><span></span>{tmpl_var name='apps_vhost_settings_txt'}<em></em></div>
diff --git a/interface/web/admin/templates/server_edit_services.htm b/interface/web/admin/templates/server_edit_services.htm
index b59bc7efb5d70b122f104c62b1f044a069d63278..d7c068d076ce625e536447da34a95b16692e1239 100644
--- a/interface/web/admin/templates/server_edit_services.htm
+++ b/interface/web/admin/templates/server_edit_services.htm
@@ -48,14 +48,14 @@
                 <label for="mirror_server_id" class="col-sm-3 control-label">{tmpl_var name='mirror_server_id_txt'}</label>
                 <div class="col-sm-9"><select name="mirror_server_id" id="server_id" class="form-control">
                     {tmpl_var name='mirror_server_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="active" class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-9"><select name="active" id="active" class="form-control">
                     {tmpl_var name='active'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
         
             
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/admin/templates/server_ip_edit.htm b/interface/web/admin/templates/server_ip_edit.htm
index 922157368463edb6e13224c67a225596b16fc38c..7901c9359e198319f53b3d0e9f1960b264db0597 100644
--- a/interface/web/admin/templates/server_ip_edit.htm
+++ b/interface/web/admin/templates/server_ip_edit.htm
@@ -9,20 +9,20 @@
                 <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                 <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                     {tmpl_var name='server_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="client_id" class="col-sm-3 control-label">{tmpl_var name='client_id_txt'}</label>
                 <div class="col-sm-9"><select name="client_id" id="client_id" class="form-control">
                     {tmpl_var name='client_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="ip_type" class="col-sm-3 control-label">{tmpl_var name='ip_type_txt'}</label>
                 <div class="col-sm-9"><select name="ip_type" id="ip_type" class="form-control">
                     {tmpl_var name='ip_type'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="ip_address" class="col-sm-3 control-label">{tmpl_var name='ip_address_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" class="form-control" /></div></div>
diff --git a/interface/web/admin/templates/server_php_name_edit.htm b/interface/web/admin/templates/server_php_name_edit.htm
index 2f1dcd0d7453c0ef25caacc0f15824c2fa7653ab..e46d84ce1adf240e168c8da85e838b915c25e712 100644
--- a/interface/web/admin/templates/server_php_name_edit.htm
+++ b/interface/web/admin/templates/server_php_name_edit.htm
@@ -9,14 +9,14 @@
                 <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                 <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                     {tmpl_var name='server_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="client_id" class="col-sm-3 control-label">{tmpl_var name='client_id_txt'}</label>
                 <div class="col-sm-9"><select name="client_id" id="client_id" class="form-control">
                     {tmpl_var name='client_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" /></div></div>
diff --git a/interface/web/admin/templates/software_update_list.htm b/interface/web/admin/templates/software_update_list.htm
index 60ee779e573709131e1785f51fda488826783a10..edeac05ec8f579de93b2ec1a9522ae900b36dae2 100644
--- a/interface/web/admin/templates/software_update_list.htm
+++ b/interface/web/admin/templates/software_update_list.htm
@@ -12,9 +12,8 @@
                         <tmpl_loop name="servers">
                             <option value="{tmpl_var name='server_id'}" {tmpl_var name='selected'}>{tmpl_var name='server_name'}</option>
                         </tmpl_loop>
-                    </select>
+                    </select></div>
                 
-            </div>
         
     </div>
   
diff --git a/interface/web/admin/templates/system_config_mail_edit.htm b/interface/web/admin/templates/system_config_mail_edit.htm
index 20dca2a64603a63034d34d26f3b5502f91cd958d..72d332cfc9fd547f858ab6619a0667c1c23ba26a 100644
--- a/interface/web/admin/templates/system_config_mail_edit.htm
+++ b/interface/web/admin/templates/system_config_mail_edit.htm
@@ -76,14 +76,14 @@
                 <label for="smtp_crypt" class="col-sm-3 control-label">{tmpl_var name='smtp_crypt_txt'}</label>
                 <div class="col-sm-9"><select name="smtp_crypt" id="smtp_crypt" class="form-control">
                     {tmpl_var name='smtp_crypt'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="default_mailserver" class="col-sm-3 control-label">{tmpl_var name='default_mailserver_txt'}</label>
                 <div class="col-sm-9"><select name="default_mailserver" id="default_mailserver" class="form-control">
                     {tmpl_var name='default_mailserver'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
         
             
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/admin/templates/system_config_misc_edit.htm b/interface/web/admin/templates/system_config_misc_edit.htm
index 7e813096c66ae32158b5615784e434130edaac2b..69d723d7c2001051b2ee0bf9c44c92670c5da187 100644
--- a/interface/web/admin/templates/system_config_misc_edit.htm
+++ b/interface/web/admin/templates/system_config_misc_edit.htm
@@ -90,8 +90,8 @@
                 <label for="min_password_strength" class="col-sm-3 control-label">{tmpl_var name='min_password_strength_txt'}</label>
                 <div class="col-sm-9"><select name="min_password_strength" id="min_password_strength" class="form-control">
                     {tmpl_var name='min_password_strength'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
 			<div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='maintenance_mode_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/admin/templates/system_config_sites_edit.htm b/interface/web/admin/templates/system_config_sites_edit.htm
index 25bd29eb57fdde96dfacb6c68f62bb2a01d70588..a3a39c8c2462ff69b4692e3d37ff4bee52d8d80c 100644
--- a/interface/web/admin/templates/system_config_sites_edit.htm
+++ b/interface/web/admin/templates/system_config_sites_edit.htm
@@ -61,14 +61,14 @@
                 <label for="default_webserver" class="col-sm-3 control-label">{tmpl_var name='default_webserver_txt'}</label>
                 <div class="col-sm-9"><select name="default_webserver" id="default_webserver" class="form-control">
                     {tmpl_var name='default_webserver'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="default_dbserver" class="col-sm-3 control-label">{tmpl_var name='default_dbserver_txt'}</label>
                 <div class="col-sm-9"><select name="default_dbserver" id="default_dbserver" class="form-control">
                     {tmpl_var name='default_dbserver'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
         
             
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/admin/templates/users_groups_edit.htm b/interface/web/admin/templates/users_groups_edit.htm
index b7fd454e6c5f6c8c241e98c6df540eff6fe92984..f9fbc8302585760150d51b73d8ce8d758c475bd6 100644
--- a/interface/web/admin/templates/users_groups_edit.htm
+++ b/interface/web/admin/templates/users_groups_edit.htm
@@ -9,8 +9,8 @@
                 <label for="default_group" class="col-sm-3 control-label">{tmpl_var name='default_group_txt'}</label>
                 <div class="col-sm-9"><select name="default_group" id="default_group" class="form-control">
                     {tmpl_var name='default_group'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='groups_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm
index 54ad0ddf93199cff2b536d99990d58e8b597c71b..d55351f9dc58a4ea068b9611664785b2bd5b55ce 100644
--- a/interface/web/admin/templates/users_user_edit.htm
+++ b/interface/web/admin/templates/users_user_edit.htm
@@ -32,8 +32,8 @@
                 <label for="startmodule" class="col-sm-3 control-label">{tmpl_var name='startmodule_txt'}</label>
                 <div class="col-sm-9"><select name="startmodule" id="startmodule" class="form-control">
                     {tmpl_var name='startmodule'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='app_theme_txt'}</label>
                 <div class="col-sm-9">
@@ -54,10 +54,10 @@
             </div>
             <div class="form-group">
                 <label for="language" class="col-sm-3 control-label">{tmpl_var name='language_txt'}</label>
-                <div class="col-sm-9"><select name="language" id="language" class="form-control">
+                <div class="col-sm-9"><select name="language" id="language" class="form-control flags">
                     {tmpl_var name='language'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='lost_password_function_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm
index e2508575a47a2202d27bd5d6dc7055e7fdf9670a..255a85d017f3589577b339ff361811fb1fc4790c 100644
--- a/interface/web/client/templates/client_edit_address.htm
+++ b/interface/web/client/templates/client_edit_address.htm
@@ -12,8 +12,8 @@
                 <label for="gender" class="col-sm-3 control-label">{tmpl_var name='gender_txt'}</label>
                 <div class="col-sm-9"><select name="gender" id="gender" class="form-control">
                     {tmpl_var name='gender'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
 			<div class="form-group">
                 <label for="contact_firstname" class="col-sm-3 control-label">{tmpl_var name='contact_firstname_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="contact_firstname" id="contact_firstname" value="{tmpl_var name='contact_firstname'}" class="form-control" /></div></div>
@@ -43,16 +43,16 @@
             <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
             <div class="form-group">
                 <label for="language" class="col-sm-3 control-label">{tmpl_var name='language_txt'}</label>
-                <div class="col-sm-9"><select name="language" id="language" class="form-control">
+                <div class="col-sm-9"><select name="language" id="language" class="form-control flags">
                     {tmpl_var name='language'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="usertheme" class="col-sm-3 control-label">{tmpl_var name='usertheme_txt'}</label>
                 <div class="col-sm-9"><select name="usertheme" id="usertheme" class="form-control">
                     {tmpl_var name='usertheme'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="street" class="col-sm-3 control-label">{tmpl_var name='street_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="street" id="street" value="{tmpl_var name='street'}" class="form-control" /></div></div>
@@ -67,10 +67,10 @@
                 <div class="col-sm-9"><input type="text" name="state" id="state" value="{tmpl_var name='state'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="country" class="col-sm-3 control-label">{tmpl_var name='country_txt'}</label>
-                <div class="col-sm-9"><select name="country" id="country" class="form-control">
+                <div class="col-sm-9"><select name="country" id="country" class="form-control flags">
                     {tmpl_var name='country'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="telephone" class="col-sm-3 control-label">{tmpl_var name='telephone_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="telephone" id="telephone" value="{tmpl_var name='telephone'}" class="form-control" /></div></div>
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index dccb2ecf3e5c31d7b87bd6277d495ca0bd8041ef..f01acce9d9d8327d65ee4b48156d6bc7dc34ee9a 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -19,14 +19,14 @@
                     <label for="template_master" class="col-sm-3 control-label">{tmpl_var name='template_master_txt'}</label>
                     <div class="col-sm-9"><select name="template_master" id="template_master" class="form-control">
                         {tmpl_var name='template_master'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="template_additional" class="col-sm-3 control-label">{tmpl_var name='template_additional_txt'}</label>
                     <div class="col-sm-9"><select name="tpl_add_select" id="tpl_add_select" class="form-control">
                         {tmpl_var name='tpl_add_select'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label class="col-sm-3 control-label">{tmpl_var name='active_template_additional_txt'}</label>
                     <div id="template_additional_list" class="multiField">
@@ -44,8 +44,8 @@
                     <label for="parent_client_id_id" class="col-sm-3 control-label">{tmpl_var name='parent_client_id_txt'}</label>
                     <div class="col-sm-9"><select name="parent_client_id" id="parent_client_id" class="form-control">
                         {tmpl_var name='parent_client_id'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="reseller" class="col-sm-3 control-label">{tmpl_var name='reseller_txt'}</label>
                     <div class="col-sm-9"><input class="form-control" type="checkbox" name="reseller" value="1" id="reseller" /></div></div>
@@ -56,8 +56,8 @@
                     <label for="web_servers" class="col-sm-3 control-label">{tmpl_var name='web_servers_txt'}</label>
                     <div class="col-sm-9"><select data-placeholder="{tmpl_var name='web_servers_placeholder'}" multiple name="web_servers[]" id="web_servers" class="form-control">
                         {tmpl_var name='web_servers'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="limit_web_domain" class="col-sm-3 control-label">{tmpl_var name='limit_web_domain_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" class="form-control" /></div></div>
@@ -163,8 +163,8 @@
                     <label for="mail_servers" class="col-sm-3 control-label">{tmpl_var name='mail_servers_txt'}</label>
                     <div class="col-sm-9"><select data-placeholder="{tmpl_var name='mail_servers_placeholder'}" multiple name="mail_servers[]" id="mail_servers" class="form-control">
                         {tmpl_var name='mail_servers'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="limit_maildomain" class="col-sm-3 control-label">{tmpl_var name='limit_maildomain_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" class="form-control" /></div></div>
@@ -215,8 +215,8 @@
                     <label for="db_servers" class="col-sm-3 control-label">{tmpl_var name='db_servers_txt'}</label>
                     <div class="col-sm-9"><select data-placeholder="{tmpl_var name='db_servers_placeholder'}" multiple name="db_servers[]" id="db_servers" class="form-control">
                         {tmpl_var name='db_servers'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="limit_database" class="col-sm-3 control-label">{tmpl_var name='limit_database_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" class="form-control" /></div></div>
@@ -234,8 +234,8 @@
                     <label for="limit_cron_type" class="col-sm-3 control-label">{tmpl_var name='limit_cron_type_txt'}</label>
                     <div class="col-sm-9"><select name="limit_cron_type" id="limit_cron_type" class="form-control">
                         {tmpl_var name='limit_cron_type'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="limit_cron_frequency" class="col-sm-3 control-label">{tmpl_var name='limit_cron_frequency_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" class="form-control" /></div></div>
@@ -246,8 +246,8 @@
                     <label for="dns_servers" class="col-sm-3 control-label">{tmpl_var name='dns_servers_txt'}</label>
                     <div class="col-sm-9"><select data-placeholder="{tmpl_var name='dns_servers_placeholder'}" multiple name="dns_servers[]" id="dns_servers" class="form-control">
                         {tmpl_var name='dns_servers'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="limit_dns_zone" class="col-sm-3 control-label">{tmpl_var name='limit_dns_zone_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_dns_zone" id="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" class="form-control" /></div></div>
@@ -255,8 +255,8 @@
                     <label for="default_slave_dnsserver" class="col-sm-3 control-label">{tmpl_var name='default_slave_dnsserver_txt'}</label>
                     <div class="col-sm-9"><select name="default_slave_dnsserver" id="default_slave_dnsserver" class="form-control">
                         {tmpl_var name='default_slave_dnsserver'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="limit_dns_slave_zone" class="col-sm-3 control-label">{tmpl_var name='limit_dns_slave_zone_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_dns_slave_zone" id="limit_dns_slave_zone" value="{tmpl_var name='limit_dns_slave_zone'}" class="form-control" /></div></div>
@@ -273,8 +273,8 @@
                     <label for="limit_openvz_vm_template_id" class="col-sm-3 control-label">{tmpl_var name='limit_openvz_vm_template_id_txt'}</label>
                     <div class="col-sm-9"><select name="limit_openvz_vm_template_id" id="limit_openvz_vm_template_id" class="form-control">
                         {tmpl_var name='limit_openvz_vm_template_id'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
             </div>
 			<div class="subsectiontoggle"><span></span>{tmpl_var name='aps_limits_txt'}<em></em></div>
             <div style="display:none;">
diff --git a/interface/web/client/templates/client_message.htm b/interface/web/client/templates/client_message.htm
index 0ef1855eabfdc11bf3f08ef1f7ccbbe4bbfb7725..caa7391bc9df3183057205ad1439d061c1d01659 100644
--- a/interface/web/client/templates/client_message.htm
+++ b/interface/web/client/templates/client_message.htm
@@ -18,8 +18,8 @@
                 <label for="recipient" class="col-sm-3 control-label">{tmpl_var name='recipient_txt'}</label>
                 <div class="col-sm-9"><select name="recipient" id="recipient" class="form-control">
                     {tmpl_var name='recipient'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="subject" class="col-sm-3 control-label">{tmpl_var name='subject_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="subject" id="subject" value="{tmpl_var name='subject'}" style="width:500px" class="form-control" /></div></div>
diff --git a/interface/web/client/templates/client_template_edit_limits.htm b/interface/web/client/templates/client_template_edit_limits.htm
index 88896601a54c880fae087867a0fb308cdbc8033b..09cbd663116075ad92bd6ac74d75ae8d678d031a 100644
--- a/interface/web/client/templates/client_template_edit_limits.htm
+++ b/interface/web/client/templates/client_template_edit_limits.htm
@@ -11,8 +11,8 @@
                     <label for="default_webserver" class="col-sm-3 control-label">{tmpl_var name='default_webserver_txt'}</label>
                     <div class="col-sm-9"><select name="default_webserver" id="default_webserver" class="form-control">
                         {tmpl_var name='default_webserver'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="limit_web_domain" class="col-sm-3 control-label">{tmpl_var name='limit_web_domain_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" class="form-control" /></div></div>
@@ -118,8 +118,8 @@
                     <label for="default_mailserver" class="col-sm-3 control-label">{tmpl_var name='default_mailserver_txt'}</label>
                     <div class="col-sm-9"><select name="default_mailserver" id="default_mailserver" class="form-control">
                         {tmpl_var name='default_mailserver'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="limit_maildomain" class="col-sm-3 control-label">{tmpl_var name='limit_maildomain_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" class="form-control" /></div></div>
@@ -169,8 +169,8 @@
                     <label for="default_dbserver" class="col-sm-3 control-label">{tmpl_var name='default_dbserver_txt'}</label>
                     <div class="col-sm-9"><select name="default_dbserver" id="default_dbserver" class="form-control">
                         {tmpl_var name='default_dbserver'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="limit_database" class="col-sm-3 control-label">{tmpl_var name='limit_database_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" class="form-control" /></div></div>
@@ -188,8 +188,8 @@
                     <label for="limit_cron_type" class="col-sm-3 control-label">{tmpl_var name='limit_cron_type_txt'}</label>
                     <div class="col-sm-9"><select name="limit_cron_type" id="limit_cron_type" class="form-control">
                         {tmpl_var name='limit_cron_type'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="limit_cron_frequency" class="col-sm-3 control-label">{tmpl_var name='limit_cron_frequency_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" class="form-control" /></div></div>
@@ -200,8 +200,8 @@
                     <label for="default_dnsserver" class="col-sm-3 control-label">{tmpl_var name='default_dnsserver_txt'}</label>
                     <div class="col-sm-9"><select name="default_dnsserver" id="default_dnsserver" class="form-control">
                         {tmpl_var name='default_dnsserver'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="limit_dns_zone" class="col-sm-3 control-label">{tmpl_var name='limit_dns_zone_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_dns_zone" id="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" class="form-control" /></div></div>
@@ -209,8 +209,8 @@
                     <label for="default_slave_dnsserver" class="col-sm-3 control-label">{tmpl_var name='default_slave_dnsserver_txt'}</label>
                     <div class="col-sm-9"><select name="default_slave_dnsserver" id="default_slave_dnsserver" class="form-control">
                         {tmpl_var name='default_slave_dnsserver'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="limit_dns_slave_zone" class="col-sm-3 control-label">{tmpl_var name='limit_dns_slave_zone_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_dns_slave_zone" id="limit_dns_slave_zone" value="{tmpl_var name='limit_dns_slave_zone'}" class="form-control" /></div></div>
@@ -227,8 +227,8 @@
                     <label for="limit_openvz_vm_template_id" class="col-sm-3 control-label">{tmpl_var name='limit_openvz_vm_template_id_txt'}</label>
                     <div class="col-sm-9"><select name="limit_openvz_vm_template_id" id="limit_openvz_vm_template_id" class="form-control">
                         {tmpl_var name='limit_openvz_vm_template_id'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
             </div>
 			<div class="subsectiontoggle"><span></span>{tmpl_var name='aps_limits_txt'}<em></em></div>
             <div style="display:none;">
diff --git a/interface/web/client/templates/client_template_edit_template.htm b/interface/web/client/templates/client_template_edit_template.htm
index 42fd92566e81e779f95032b6e08eadb75d7ea0ad..6009a3e7a2a52b05252d7513ce88c7e06816d510 100644
--- a/interface/web/client/templates/client_template_edit_template.htm
+++ b/interface/web/client/templates/client_template_edit_template.htm
@@ -9,8 +9,8 @@
                 <label for="template_type" class="col-sm-3 control-label">{tmpl_var name='template_type_txt'}</label>
                 <div class="col-sm-9"><select name="template_type" id="template_type" class="form-control">
                     {tmpl_var name='template_type'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="template_name" class="col-sm-3 control-label">{tmpl_var name='template_name_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="template_name" id="template_name" value="{tmpl_var name='template_name'}" class="form-control" /></div></div>
diff --git a/interface/web/client/templates/domain_edit.htm b/interface/web/client/templates/domain_edit.htm
index b1faf4b1bbe94e36f509566099b87b44f40b3367..7e6fdeb79393d77f89aa4491fee06cb7454d1e4a 100644
--- a/interface/web/client/templates/domain_edit.htm
+++ b/interface/web/client/templates/domain_edit.htm
@@ -12,8 +12,8 @@
                 <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
                 <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                     {tmpl_var name='client_group_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
         
 
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/client/templates/message_template.htm b/interface/web/client/templates/message_template.htm
index 190b836d2f334bd5c47b72381c26154759d2db4e..9855768b13b72c2504179195bc5e0ba90ac3ca4e 100644
--- a/interface/web/client/templates/message_template.htm
+++ b/interface/web/client/templates/message_template.htm
@@ -11,8 +11,8 @@
       	<label for="template_type" class="col-sm-3 control-label">{tmpl_var name='template_type_txt'}</label>
         <div class="col-sm-9"><select name="template_type" id="template_type" class="form-control">
 					{tmpl_var name='template_type'}
-				</select>
-      </div></div>
+				</select></div>
+      </div>
       <div class="form-group">
       	<label for="template_name" class="col-sm-3 control-label">{tmpl_var name='template_name_txt'}</label>
         <div class="col-sm-9"><input type="text" name="template_name" id="template_name" value="{tmpl_var name='template_name'}" class="form-control" /></div></div>
diff --git a/interface/web/client/templates/reseller_edit_address.htm b/interface/web/client/templates/reseller_edit_address.htm
index 9b8d62007a17363544050d54bf9579f94996c761..e0cf2164d972dd31e8639d0905b493d7064c8f5a 100644
--- a/interface/web/client/templates/reseller_edit_address.htm
+++ b/interface/web/client/templates/reseller_edit_address.htm
@@ -12,8 +12,8 @@
                 <label for="gender" class="col-sm-3 control-label">{tmpl_var name='gender_txt'}</label>
                 <div class="col-sm-9"><select name="gender" id="gender" class="form-control">
                     {tmpl_var name='gender'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
 			<div class="form-group">
                 <label for="contact_firstname" class="col-sm-3 control-label">{tmpl_var name='contact_firstname_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="contact_firstname" id="contact_firstname" value="{tmpl_var name='contact_firstname'}" class="form-control" /></div></div>
@@ -43,16 +43,16 @@
             <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
             <div class="form-group">
                 <label for="language" class="col-sm-3 control-label">{tmpl_var name='language_txt'}</label>
-                <div class="col-sm-9"><select name="language" id="language" class="form-control">
+                <div class="col-sm-9"><select name="language" id="language" class="form-control flags">
                     {tmpl_var name='language'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="usertheme" class="col-sm-3 control-label">{tmpl_var name='usertheme_txt'}</label>
                 <div class="col-sm-9"><select name="usertheme" id="usertheme" class="form-control">
                     {tmpl_var name='usertheme'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="street" class="col-sm-3 control-label">{tmpl_var name='street_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="street" id="street" value="{tmpl_var name='street'}" class="form-control" /></div></div>
@@ -67,10 +67,10 @@
                 <div class="col-sm-9"><input type="text" name="state" id="state" value="{tmpl_var name='state'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="country" class="col-sm-3 control-label">{tmpl_var name='country_txt'}</label>
-                <div class="col-sm-9"><select name="country" id="country" class="form-control">
+                <div class="col-sm-9"><select name="country" id="country" class="form-control flags">
                     {tmpl_var name='country'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="telephone" class="col-sm-3 control-label">{tmpl_var name='telephone_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="telephone" id="telephone" value="{tmpl_var name='telephone'}" class="form-control" /></div></div>
diff --git a/interface/web/client/templates/reseller_edit_limits.htm b/interface/web/client/templates/reseller_edit_limits.htm
index 020497dfcd047745ae7ddc179cfb5b9209f2e153..db616f68bace0d591252c0d23e9cb3de2646d7bf 100644
--- a/interface/web/client/templates/reseller_edit_limits.htm
+++ b/interface/web/client/templates/reseller_edit_limits.htm
@@ -22,14 +22,14 @@
                     <label for="template_master" class="col-sm-3 control-label">{tmpl_var name='template_master_txt'}</label>
                     <div class="col-sm-9"><select name="template_master" id="template_master" class="form-control">
                         {tmpl_var name='template_master'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="template_additional" class="col-sm-3 control-label">{tmpl_var name='template_additional_txt'}</label>
                     <div class="col-sm-9"><select name="tpl_add_select" id="tpl_add_select" class="form-control">
                         {tmpl_var name='tpl_add_select'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label class="col-sm-3 control-label">{tmpl_var name='active_template_additional_txt'}</label>
                     <div id="template_additional_list" class="multiField">
@@ -58,8 +58,8 @@
                     <label for="web_servers" class="col-sm-3 control-label">{tmpl_var name='web_servers_txt'}</label>
                     <div class="col-sm-9"><select data-placeholder="{tmpl_var name='web_servers_placeholder'}" multiple name="web_servers[]" id="web_servers" class="form-control">
                         {tmpl_var name='web_servers'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="limit_web_domain" class="col-sm-3 control-label">{tmpl_var name='limit_web_domain_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" class="form-control" /></div></div>
@@ -165,8 +165,8 @@
                     <label for="mail_servers" class="col-sm-3 control-label">{tmpl_var name='mail_servers_txt'}</label>
                     <div class="col-sm-9"><select data-placeholder="{tmpl_var name='mail_servers_placeholder'}" multiple name="mail_servers[]" id="mail_servers" class="form-control">
                         {tmpl_var name='mail_servers'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="limit_maildomain" class="col-sm-3 control-label">{tmpl_var name='limit_maildomain_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" class="form-control" /></div></div>
@@ -217,8 +217,8 @@
                     <label for="db_servers" class="col-sm-3 control-label">{tmpl_var name='db_servers_txt'}</label>
                     <div class="col-sm-9"><select data-placeholder="{tmpl_var name='db_servers_placeholder'}" multiple name="db_servers[]" id="db_servers" class="form-control">
                         {tmpl_var name='db_servers'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="limit_database" class="col-sm-3 control-label">{tmpl_var name='limit_database_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" class="form-control" /></div></div>
@@ -232,8 +232,8 @@
                     <label for="limit_cron_type" class="col-sm-3 control-label">{tmpl_var name='limit_cron_type_txt'}</label>
                     <div class="col-sm-9"><select name="limit_cron_type" id="limit_cron_type" class="form-control">
                         {tmpl_var name='limit_cron_type'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="limit_cron_frequency" class="col-sm-3 control-label">{tmpl_var name='limit_cron_frequency_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" class="form-control" /></div></div>
@@ -244,8 +244,8 @@
                     <label for="dns_servers" class="col-sm-3 control-label">{tmpl_var name='dns_servers_txt'}</label>
                     <div class="col-sm-9"><select data-placeholder="{tmpl_var name='dns_servers_placeholder'}" multiple name="dns_servers[]" id="dns_servers" class="form-control">
                         {tmpl_var name='dns_servers'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="limit_dns_zone" class="col-sm-3 control-label">{tmpl_var name='limit_dns_zone_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_dns_zone" id="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" class="form-control" /></div></div>
@@ -253,8 +253,8 @@
                     <label for="default_slave_dnsserver" class="col-sm-3 control-label">{tmpl_var name='default_slave_dnsserver_txt'}</label>
                     <div class="col-sm-9"><select name="default_slave_dnsserver" id="default_slave_dnsserver" class="form-control">
                         {tmpl_var name='default_slave_dnsserver'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="limit_dns_slave_zone" class="col-sm-3 control-label">{tmpl_var name='limit_dns_slave_zone_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_dns_slave_zone" id="limit_dns_slave_zone" value="{tmpl_var name='limit_dns_slave_zone'}" class="form-control" /></div></div>
@@ -271,8 +271,8 @@
                     <label for="limit_openvz_vm_template_id" class="col-sm-3 control-label">{tmpl_var name='limit_openvz_vm_template_id_txt'}</label>
                     <div class="col-sm-9"><select name="limit_openvz_vm_template_id" id="limit_openvz_vm_template_id" class="form-control">
                         {tmpl_var name='limit_openvz_vm_template_id'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
             </div>
 			<div class="subsectiontoggle"><span></span>{tmpl_var name='aps_limits_txt'}<em></em></div>
             <div style="display:none;">
diff --git a/interface/web/dns/templates/dns_import.htm b/interface/web/dns/templates/dns_import.htm
index fcf32e8886160c2a15353317a3f82a1e29586cdd..43dd3ff6310e2b251aeeb4282de7091ec36ad4df 100644
--- a/interface/web/dns/templates/dns_import.htm
+++ b/interface/web/dns/templates/dns_import.htm
@@ -10,14 +10,14 @@
                     <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                     <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                         {tmpl_var name='server_id'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
                     <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                         {tmpl_var name='client_group_id'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
             <tmpl_else>
                 <tmpl_if name="only_one_server">
                     <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
@@ -26,8 +26,8 @@
                         <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                         <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                             {tmpl_var name='server_id'}
-                        </select>
-                    </div></div>
+                        </select></div>
+                    </div>
                 </tmpl_if>
             </tmpl_if>
             <div class="form-group">
@@ -35,8 +35,8 @@
                 <tmpl_if name="domain_option">
                     <div class="col-sm-9"><select name="domain" id="domain" class="form-control">
                         {tmpl_var name='domain_option'}
-                    </select>
-                    </div><tmpl_else>
+                    </select></div>
+                    <tmpl_else>
                         <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" onkeydown="keydown(event.which);" /></div></tmpl_if>
                 <p class="value"><tmpl_var name='domain_field_desc_txt'}</p>
             </div>    
diff --git a/interface/web/dns/templates/dns_slave_edit.htm b/interface/web/dns/templates/dns_slave_edit.htm
index 73804b60bb99f4cd946a57baab2de959b7b67571..b60aa54f3dadd6b35b9371e023edefb1541cd8bc 100644
--- a/interface/web/dns/templates/dns_slave_edit.htm
+++ b/interface/web/dns/templates/dns_slave_edit.htm
@@ -11,22 +11,22 @@
                         <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                         <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
                             {tmpl_var name='server_id'}
-                        </select>
-                        </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                        </select></div>
+                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
                     <tmpl_else>
                             <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                             <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                                 {tmpl_var name='server_id'}
-                            </select>
-                    </div></tmpl_if>
+                            </select></div>
+                    </tmpl_if>
                 </div>
                 <tmpl_unless name="domain_option">
                     <div class="form-group">
                         <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
                         <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                             {tmpl_var name='client_group_id'}
-                        </select>
-                    </div></div>
+                        </select></div>
+                    </div>
                 </tmpl_unless>
             </tmpl_if>
             <tmpl_if name="is_reseller">
@@ -35,8 +35,8 @@
                         <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
                         <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                             {tmpl_var name='client_group_id'}
-                        </select>
-                    </div></div>
+                        </select></div>
+                    </div>
                 </tmpl_unless>
             </tmpl_if>
             <div class="form-group">
@@ -44,8 +44,8 @@
                 <tmpl_if name="domain_option">
                     <div class="col-sm-9"><select name="origin" id="origin" class="form-control">
                         {tmpl_var name='domain_option'}
-                    </select>
-                    </div><tmpl_else>
+                    </select></div>
+                    <tmpl_else>
                         <div class="col-sm-9"><input type="text" name="origin" id="origin" value="{tmpl_var name='origin'}" class="form-control" /></div></tmpl_if>
                 <p class="formHint">{tmpl_var name='eg_domain_tld'}</p>
             </div>
diff --git a/interface/web/dns/templates/dns_soa_edit.htm b/interface/web/dns/templates/dns_soa_edit.htm
index 04ebe0954c93a1d0d50ddcf8a9830dd0c3614171..1a4d3b4d24b4672f3a69bb56a3ad8d9e41f403dc 100644
--- a/interface/web/dns/templates/dns_soa_edit.htm
+++ b/interface/web/dns/templates/dns_soa_edit.htm
@@ -11,22 +11,22 @@
                         <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                         <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
                             {tmpl_var name='server_id'}
-                        </select>
-                        </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                        </select></div>
+                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
                         <tmpl_else>
                             <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                             <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                                 {tmpl_var name='server_id'}
-                            </select>
-                    </div></tmpl_if>
+                            </select></div>
+                    </tmpl_if>
                 </div>
                 <tmpl_unless name="domain_option">
                     <div class="form-group">
                         <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
                         <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                             {tmpl_var name='client_group_id'}
-                        </select>
-                    </div></div>
+                        </select></div>
+                    </div>
                 </tmpl_unless>
             <tmpl_else>
                 <tmpl_if name="only_one_server">
@@ -37,14 +37,14 @@
                             <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                             <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
                                 {tmpl_var name='client_server_id'}
-                            </select>
-                            </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                            </select></div>
+                            <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
                         <tmpl_else>
                             <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                             <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                                 {tmpl_var name='client_server_id'}
-                            </select>
-                        </div></tmpl_if>
+                            </select></div>
+                        </tmpl_if>
                     </div>
                 </tmpl_if>
             </tmpl_if>
@@ -54,8 +54,8 @@
                         <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
                         <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                             {tmpl_var name='client_group_id'}
-                        </select>
-                    </div></div>
+                        </select></div>
+                    </div>
                 </tmpl_unless>
             </tmpl_if>
             <div class="form-group">
@@ -63,8 +63,8 @@
                 <tmpl_if name="domain_option">
                     <div class="col-sm-9"><select name="origin" id="origin" class="form-control">
                         {tmpl_var name='domain_option'}
-                    </select>
-                    </div><tmpl_else>
+                    </select></div>
+                    <tmpl_else>
                         <div class="col-sm-9"><input type="text" name="origin" id="origin" value="{tmpl_var name='origin'}" class="form-control" /></div></tmpl_if>
                 <p class="formHint">{tmpl_var name='eg_domain_tld'}</p>
             </div>
diff --git a/interface/web/dns/templates/dns_wizard.htm b/interface/web/dns/templates/dns_wizard.htm
index 6361f29deb72e5961fa938a1c1130eeffb0dc456..b607a27ae127142a4ca62ac9f5ef90536b7858a7 100644
--- a/interface/web/dns/templates/dns_wizard.htm
+++ b/interface/web/dns/templates/dns_wizard.htm
@@ -13,22 +13,22 @@
                 <label for="template_id" class="col-sm-3 control-label">{tmpl_var name='template_id_txt'}</label>
                 <div class="col-sm-9"><select name="template_id" id="template_id" class="form-control" onChange="submitForm('pageForm','dns/dns_wizard.php')">
                     {tmpl_var name='template_id_option'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <tmpl_if name="is_admin">
                 <div class="form-group">
                     <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                     <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                         {tmpl_var name='server_id'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <tmpl_unless name="domain_option">
                     <div class="form-group">
                         <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
                         <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                             {tmpl_var name='client_group_id'}
-                        </select>
-                    </div></div>
+                        </select></div>
+                    </div>
                 </tmpl_unless>
             <tmpl_else>
                 <tmpl_if name="only_one_server">
@@ -38,8 +38,8 @@
                         <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                         <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                             {tmpl_var name='server_id'}
-                        </select>
-                    </div></div>
+                        </select></div>
+                    </div>
                 </tmpl_if>
             </tmpl_if>
             <tmpl_if name="is_reseller">
@@ -48,8 +48,8 @@
                         <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
                         <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                             {tmpl_var name='client_group_id'}
-                        </select>
-                    </div></div>
+                        </select></div>
+                    </div>
                 </tmpl_unless>
             </tmpl_if>
             <tmpl_if name="DOMAIN_VISIBLE">
@@ -58,8 +58,8 @@
                     <tmpl_if name="domain_option">
                         <div class="col-sm-9"><select name="domain" id="domain" class="form-control">
                             {tmpl_var name='domain_option'}
-                        </select>
-                        </div><tmpl_else>
+                        </select></div>
+                        <tmpl_else>
                             <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" /></div></tmpl_if>
                 </div>
             </tmpl_if>
diff --git a/interface/web/help/templates/faq_edit.htm b/interface/web/help/templates/faq_edit.htm
index 7b79bd132ad9882e962cae0e8902ebe0f2fe6d73..1a1bc4a37539d6891c5c5c8f0e48e44a2255b51a 100644
--- a/interface/web/help/templates/faq_edit.htm
+++ b/interface/web/help/templates/faq_edit.htm
@@ -4,8 +4,8 @@
                 <label for="hf_section" class="col-sm-3 control-label">{tmpl_var name='faq_section_txt'}</label>
                 <div class="col-sm-9"><select name="hf_section" id="hf_section" class="form-control">
                     {tmpl_var name='hf_section'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="hf_question" class="col-sm-3 control-label">{tmpl_var name='faq_question_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="hf_question" id="hf_question" value="{tmpl_var name='hf_question'}" class="form-control" /></div></div>
diff --git a/interface/web/help/templates/support_message_edit.htm b/interface/web/help/templates/support_message_edit.htm
index 894b8d4a7c2fae51f460bb05f5ea94f5f959c42a..6a033898ca1909288f7ecbd9939d554677668b86 100644
--- a/interface/web/help/templates/support_message_edit.htm
+++ b/interface/web/help/templates/support_message_edit.htm
@@ -9,8 +9,8 @@
                 <label for="recipient_id" class="col-sm-3 control-label">{tmpl_var name='recipient_id_txt'}</label>
                 <div class="col-sm-9"><select name="recipient_id" id="recipient_id" class="form-control">
                     {tmpl_var name='recipient_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="subject" class="col-sm-3 control-label">{tmpl_var name='subject_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="subject" id="subject" value="{tmpl_var name='subject'}" class="form-control" /></div></div>
diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index 0c79fc455cd5389cf6862eb7a7ff1d5ebe7bee16..65bfe64ce0b77657521c235e813bea7b3825d773 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -100,6 +100,14 @@ if($server_config_array['misc']['use_combobox'] == 'y'){
 		width: 'element',
 		selectOnBlur: true,
 		allowClear: true,
+		formatResult: function(o) {
+			if(o.id && $(o.element).parent().hasClass('flags')) return '<span class="flags flag-' + o.id.toLowerCase() + '"></span>' + o.text;
+			else return o.text;
+		},
+		formatSelection: function(o) {
+			if(o.id && $(o.element).parent().hasClass('flags')) return '<span class="flags flag-' + o.id.toLowerCase() + '"></span>' + o.text;
+			else return o.text;
+		}
 	}).on('change', function(e) {
             if (jQuery("#pageForm .table #Filter").length > 0) {
                 jQuery("#pageForm .table #Filter").trigger('click');
diff --git a/interface/web/mail/templates/mail_alias_edit.htm b/interface/web/mail/templates/mail_alias_edit.htm
index d98fd03838886043fcb55598d3afd3ada42feebd..612447bec6c4dc2021bbb03f2a510fa125c16dd2 100644
--- a/interface/web/mail/templates/mail_alias_edit.htm
+++ b/interface/web/mail/templates/mail_alias_edit.htm
@@ -17,8 +17,8 @@
                 <label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>
                 <div class="col-sm-9"><select name="destination" id="destination" class="form-control">
                     {tmpl_var name='destination'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/mail/templates/mail_aliasdomain_edit.htm b/interface/web/mail/templates/mail_aliasdomain_edit.htm
index 697e22942edeeb9aec8d83bff747ad345afe03e5..3770d10b7f245f3c8ec19560c032069d439452cb 100644
--- a/interface/web/mail/templates/mail_aliasdomain_edit.htm
+++ b/interface/web/mail/templates/mail_aliasdomain_edit.htm
@@ -9,14 +9,14 @@
                 <label for="destination" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
                 <div class="col-sm-9"><select name="source" id="source" class="form-control">
                     {tmpl_var name='source_domain'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>
                 <div class="col-sm-9"><select name="destination" id="destination" class="form-control">
                     {tmpl_var name='destination_domain'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/mail/templates/mail_blacklist_edit.htm b/interface/web/mail/templates/mail_blacklist_edit.htm
index b448f4812d540bc9e755c595b09180f642234668..0e12de345224d4ea6fbb72beea1191dd5bbd068b 100644
--- a/interface/web/mail/templates/mail_blacklist_edit.htm
+++ b/interface/web/mail/templates/mail_blacklist_edit.htm
@@ -9,8 +9,8 @@
                 <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                 <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                     {tmpl_var name='server_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="source" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="source" id="source" value="{tmpl_var name='source'}" class="form-control" /></div></div>
@@ -18,8 +18,8 @@
                 <label for="type" class="col-sm-3 control-label">{tmpl_var name='type_txt'}</label>
                 <div class="col-sm-9"><select name="type" id="type" class="form-control">
                     {tmpl_var name='type'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/mail/templates/mail_content_filter_edit.htm b/interface/web/mail/templates/mail_content_filter_edit.htm
index 3ced2f8f5f81c86f983a944a28405df39975c063..8b679d4f934bef9b1b7ff465b4f5028d855a62dd 100644
--- a/interface/web/mail/templates/mail_content_filter_edit.htm
+++ b/interface/web/mail/templates/mail_content_filter_edit.htm
@@ -9,14 +9,14 @@
                 <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                 <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                     {tmpl_var name='server_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="type" class="col-sm-3 control-label">{tmpl_var name='type_txt'}</label>
                 <div class="col-sm-9"><select name="type" id="type" class="form-control">
                     {tmpl_var name='type'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="pattern" class="col-sm-3 control-label">{tmpl_var name='pattern_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="pattern" id="pattern" value="{tmpl_var name='pattern'}" class="form-control" /></div></div>
@@ -27,8 +27,8 @@
                 <label for="action" class="col-sm-3 control-label">{tmpl_var name='action_txt'}</label>
                 <div class="col-sm-9"><select name="action" id="action" class="form-control">
                     {tmpl_var name='action'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index 9ad308b8a517813a9d01211cf2d60d1189d46556..1278381b202b7745b9846fab0fdab9d0ee26b674 100644
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -11,22 +11,22 @@
                         <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                         <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
                             {tmpl_var name='server_id'}
-                        </select>
-                        </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                        </select></div>
+                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
                         <tmpl_else>
                             <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                             <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                                 {tmpl_var name='server_id'}
-                            </select>
-                    </div></tmpl_if>
+                            </select></div>
+                    </tmpl_if>
                 </div>
                 <tmpl_unless name="domain_option">
                     <div class="form-group">
                         <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
                         <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                             {tmpl_var name='client_group_id'}
-                        </select>
-                    </div></div>
+                        </select></div>
+                    </div>
                 </tmpl_unless>
             <tmpl_else>
                 <tmpl_if name="only_one_server">
@@ -37,14 +37,14 @@
                             <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                             <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
                                 {tmpl_var name='client_server_id'}
-                            </select>
-                            </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                            </select></div>
+                            <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
                         <tmpl_else>
                             <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                             <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                                 {tmpl_var name='client_server_id'}
-                            </select>
-                        </div></tmpl_if>
+                            </select></div>
+                        </tmpl_if>
                     </div>
                 </tmpl_if>
             </tmpl_if>
@@ -55,8 +55,8 @@
                         <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
                         <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                             {tmpl_var name='client_group_id'}
-                        </select>
-                    </div></div>
+                        </select></div>
+                    </div>
                 </tmpl_unless>
             </tmpl_if>
 
@@ -65,16 +65,16 @@
                 <tmpl_if name="domain_option">
                     <div class="col-sm-9"><select name="domain" id="domain" class="form-control">
                         {tmpl_var name='domain_option'}
-                    </select>
-                    </div><tmpl_else>
+                    </select></div>
+                    <tmpl_else>
                         <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" /></div></tmpl_if>
             </div>
             <div class="form-group">
                 <label for="policy" class="col-sm-3 control-label">{tmpl_var name='policy_txt'}</label>
                 <div class="col-sm-9"><select name="policy" id="policy" class="form-control">
                     {tmpl_var name='policy'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/mail/templates/mail_get_edit.htm b/interface/web/mail/templates/mail_get_edit.htm
index 5a9b80ff1a8eecd7c25f7355d04662c0df7b8369..a848d02a9bceae0013b6adb9ee6dee09e8064090 100644
--- a/interface/web/mail/templates/mail_get_edit.htm
+++ b/interface/web/mail/templates/mail_get_edit.htm
@@ -9,8 +9,8 @@
                 <label for="type" class="col-sm-3 control-label">{tmpl_var name='type_txt'}</label>
                 <div class="col-sm-9"><select name="type" id="type" class="form-control">
                     {tmpl_var name='type'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="source_server" class="col-sm-3 control-label">{tmpl_var name='source_server_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="source_server" id="source_server" value="{tmpl_var name='source_server'}" class="form-control" /></div></div>
@@ -36,8 +36,8 @@
                 <label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>
                 <div class="col-sm-9"><select name="destination" id="destination" class="form-control">
                     {tmpl_var name='destination'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/mail/templates/mail_mailinglist_edit.htm b/interface/web/mail/templates/mail_mailinglist_edit.htm
index b1c73f42a17182139e1b6d4e54cc5fce26b3f80d..ad13434749399a1376898561a2f3537268ad2f98 100644
--- a/interface/web/mail/templates/mail_mailinglist_edit.htm
+++ b/interface/web/mail/templates/mail_mailinglist_edit.htm
@@ -10,8 +10,8 @@
                     <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
                     <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                         {tmpl_var name='client_group_id'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
             </tmpl_if>
 
             <tmpl_if name="is_reseller">
@@ -19,8 +19,8 @@
                     <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
                     <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                         {tmpl_var name='client_group_id'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
             </tmpl_if>
 
             <tmpl_if name="edit_disabled">
@@ -28,8 +28,8 @@
                     <label for="domain_disabled" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
                     <div class="col-sm-9"><select name="domain_disabled" id="domain_disabled" class="form-control" disabled="disabled">
                         {tmpl_var name='domain_option'}
-                    </select>
-                    </div><input type="hidden" name="domain" value="{tmpl_var name='domain_value'}" />
+                    </select></div>
+                    <input type="hidden" name="domain" value="{tmpl_var name='domain_value'}" />
                 </div>
 
                 <div class="form-group">
@@ -45,8 +45,8 @@
                         <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
                         <div class="col-sm-9"><select name="domain" id="domain" class="form-control">
                             {tmpl_var name='domain_option'}
-                        </select>
-                    </div></div>
+                        </select></div>
+                    </div>
                     <div class="form-group">
                         <label for="listname" class="col-sm-3 control-label">{tmpl_var name='listname_txt'}</label>
                         <div class="col-sm-9"><input type="text" name="listname" id="listname" value="{tmpl_var name='listname'}" class="form-control" /></div></div>
diff --git a/interface/web/mail/templates/mail_relay_recipient_edit.htm b/interface/web/mail/templates/mail_relay_recipient_edit.htm
index 3e64586fcb41905ec702f0af40597dc09da03bec..685527bd7685db1cc2fdcb5cd89292c5f3136366 100644
--- a/interface/web/mail/templates/mail_relay_recipient_edit.htm
+++ b/interface/web/mail/templates/mail_relay_recipient_edit.htm
@@ -9,8 +9,8 @@
                 <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                 <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                     {tmpl_var name='server_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="source" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="source" id="source" value="{tmpl_var name='source'}" class="form-control" /></div></div>
diff --git a/interface/web/mail/templates/mail_transport_edit.htm b/interface/web/mail/templates/mail_transport_edit.htm
index 066413fa07b6211ebbf25a9171581a7bd85704fd..121e35fb8e1d14524f29bd992442ab02aa2540c4 100644
--- a/interface/web/mail/templates/mail_transport_edit.htm
+++ b/interface/web/mail/templates/mail_transport_edit.htm
@@ -9,8 +9,8 @@
                 <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                 <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                     {tmpl_var name='server_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" /></div></div>
@@ -18,8 +18,8 @@
                 <label for="type" class="col-sm-3 control-label">{tmpl_var name='type_txt'}</label>
                 <div class="col-sm-9"><select name="type" id="type" class="form-control">
                     {tmpl_var name='type'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='mx_txt'}</label>
                 <div class="col-sm-9">
@@ -32,8 +32,8 @@
                 <label for="sort_order" class="col-sm-3 control-label">{tmpl_var name='sort_order_txt'}</label>
                 <div class="col-sm-9"><select name="sort_order" id="sort_order" class="form-control">
                     {tmpl_var name='sort_order'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/mail/templates/mail_user_backup.htm b/interface/web/mail/templates/mail_user_backup.htm
index 873a040468bd57befb5663591329bb3281144bb2..cfe4e1cd20bdb579a262f831d790cd149a91fc2b 100644
--- a/interface/web/mail/templates/mail_user_backup.htm
+++ b/interface/web/mail/templates/mail_user_backup.htm
@@ -18,14 +18,14 @@
                 <label for="backup_interval" class="col-sm-3 control-label">{tmpl_var name='backup_interval_txt'}</label>
                 <div class="col-sm-9"><select name="backup_interval" id="backup_interval" class="form-control">
                     {tmpl_var name='backup_interval'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="backup_copies" class="col-sm-3 control-label">{tmpl_var name='backup_copies_txt'}</label>
                 <div class="col-sm-9"><select name="backup_copies" id="backup_copies" class="form-control">
                     {tmpl_var name='backup_copies'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
         
         {tmpl_var name='backup_records'}
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm
index dc67f360a000cbb31fc1da78254775bcb404f61f..b35061fff1822fc9d076f0ef712428a30922f3f4 100644
--- a/interface/web/mail/templates/mail_user_mailbox_edit.htm
+++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm
@@ -51,8 +51,8 @@
                 <label for="policy" class="col-sm-3 control-label">{tmpl_var name='policy_txt'}</label>
                 <div class="col-sm-9"><select name="policy" id="policy" class="form-control">
                     {tmpl_var name='policy'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='postfix_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/mail/templates/mail_whitelist_edit.htm b/interface/web/mail/templates/mail_whitelist_edit.htm
index d6309960ff9fabbb0c0dc1e7c714830a45d214bd..77e949b6e8e05a320bc99d6e37f0bf23bf05d400 100644
--- a/interface/web/mail/templates/mail_whitelist_edit.htm
+++ b/interface/web/mail/templates/mail_whitelist_edit.htm
@@ -9,8 +9,8 @@
                 <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                 <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                     {tmpl_var name='server_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="source" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="source" id="source" value="{tmpl_var name='source'}" class="form-control" /></div></div>
@@ -18,8 +18,8 @@
                 <label for="type" class="col-sm-3 control-label">{tmpl_var name='type_txt'}</label>
                 <div class="col-sm-9"><select name="type" id="type" class="form-control">
                     {tmpl_var name='type'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/mail/templates/spamfilter_blacklist_edit.htm b/interface/web/mail/templates/spamfilter_blacklist_edit.htm
index 01862be9744c2044611a7071d4e704bda9a2f702..4667c65009f8b30c24d47879d5c28e68f2159b25 100644
--- a/interface/web/mail/templates/spamfilter_blacklist_edit.htm
+++ b/interface/web/mail/templates/spamfilter_blacklist_edit.htm
@@ -10,15 +10,15 @@
                     <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                     <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                                                     {tmpl_var name='server_id'}
-                                            </select>
-                </div></div>
+                                            </select></div>
+                </div>
             -->
             <div class="form-group">
                 <label for="rid" class="col-sm-3 control-label">{tmpl_var name='rid_txt'}</label>
                 <div class="col-sm-9"><select name="rid" id="rid" class="form-control">
                     {tmpl_var name='rid'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" /></div></div>
@@ -26,8 +26,8 @@
                 <label for="priority" class="col-sm-3 control-label">{tmpl_var name='priority_txt'}</label>
                 <div class="col-sm-9"><select name="priority" id="priority" class="form-control">
                     {tmpl_var name='priority'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/mail/templates/spamfilter_other_edit.htm b/interface/web/mail/templates/spamfilter_other_edit.htm
index 00a6bf650808ea1af6ac4ee1c8d92f6534857e44..4a6f7398f61399d51629810180734651c8da0dc2 100644
--- a/interface/web/mail/templates/spamfilter_other_edit.htm
+++ b/interface/web/mail/templates/spamfilter_other_edit.htm
@@ -21,20 +21,20 @@
                 <label for="warnvirusrecip" class="col-sm-3 control-label">{tmpl_var name='warnvirusrecip_txt'}</label>
                 <div class="col-sm-9"><select name="warnvirusrecip" id="warnvirusrecip" class="form-control">
                     {tmpl_var name='warnvirusrecip'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="warnbannedrecip" class="col-sm-3 control-label">{tmpl_var name='warnbannedrecip_txt'}</label>
                 <div class="col-sm-9"><select name="warnbannedrecip" id="warnbannedrecip" class="form-control">
                     {tmpl_var name='warnbannedrecip'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="warnbadhrecip" class="col-sm-3 control-label">{tmpl_var name='warnbadhrecip_txt'}</label>
                 <div class="col-sm-9"><select name="warnbadhrecip" id="warnbadhrecip" class="form-control">
                     {tmpl_var name='warnbadhrecip'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="newvirus_admin" class="col-sm-3 control-label">{tmpl_var name='newvirus_admin_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="newvirus_admin" id="newvirus_admin" value="{tmpl_var name='newvirus_admin'}" class="form-control" /></div></div>
diff --git a/interface/web/mail/templates/spamfilter_policy_edit.htm b/interface/web/mail/templates/spamfilter_policy_edit.htm
index e265cd9f2a11f19f93ebf054e629d2122595c227..ba53feb85a45e2be884b441b1b28aea8112cb257 100644
--- a/interface/web/mail/templates/spamfilter_policy_edit.htm
+++ b/interface/web/mail/templates/spamfilter_policy_edit.htm
@@ -12,44 +12,44 @@
                 <label for="virus_lover" class="col-sm-3 control-label">{tmpl_var name='virus_lover_txt'}</label>
                 <div class="col-sm-9"><select name="virus_lover" id="virus_lover" class="form-control">
                     {tmpl_var name='virus_lover'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="spam_lover" class="col-sm-3 control-label">{tmpl_var name='spam_lover_txt'}</label>
                 <div class="col-sm-9"><select name="spam_lover" id="spam_lover" class="form-control">
                     {tmpl_var name='spam_lover'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="banned_files_lover" class="col-sm-3 control-label">{tmpl_var name='banned_files_lover_txt'}</label>
                 <div class="col-sm-9"><select name="banned_files_lover" id="banned_files_lover" class="form-control">
                     {tmpl_var name='banned_files_lover'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="bad_header_lover" class="col-sm-3 control-label">{tmpl_var name='bad_header_lover_txt'}</label>
                 <div class="col-sm-9"><select name="bad_header_lover" id="bad_header_lover" class="form-control">
                     {tmpl_var name='bad_header_lover'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="bypass_virus_checks" class="col-sm-3 control-label">{tmpl_var name='bypass_virus_checks_txt'}</label>
                 <div class="col-sm-9"><select name="bypass_virus_checks" id="bypass_virus_checks" class="form-control">
                     {tmpl_var name='bypass_virus_checks'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="bypass_banned_checks" class="col-sm-3 control-label">{tmpl_var name='bypass_banned_checks_txt'}</label>
                 <div class="col-sm-9"><select name="bypass_banned_checks" id="bypass_banned_checks" class="form-control">
                     {tmpl_var name='bypass_banned_checks'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="bypass_header_checks" class="col-sm-3 control-label">{tmpl_var name='bypass_header_checks_txt'}</label>
                 <div class="col-sm-9"><select name="bypass_header_checks" id="bypass_header_checks" class="form-control">
                     {tmpl_var name='bypass_header_checks'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
         
 
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/mail/templates/spamfilter_taglevel_edit.htm b/interface/web/mail/templates/spamfilter_taglevel_edit.htm
index 3f7a948106f93398e4e4d41ed2701ec5d82909d9..7a802e9a5867e23add79e916f5070ea325c8fb6d 100644
--- a/interface/web/mail/templates/spamfilter_taglevel_edit.htm
+++ b/interface/web/mail/templates/spamfilter_taglevel_edit.htm
@@ -24,8 +24,8 @@
                 <label for="spam_modifies_subj" class="col-sm-3 control-label">{tmpl_var name='spam_modifies_subj_txt'}</label>
                 <div class="col-sm-9"><select name="spam_modifies_subj" id="spam_modifies_subj" class="form-control">
                     {tmpl_var name='spam_modifies_subj'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="spam_subject_tag" class="col-sm-3 control-label">{tmpl_var name='spam_subject_tag_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="spam_subject_tag" id="spam_subject_tag" value="{tmpl_var name='spam_subject_tag'}" class="form-control" /></div></div>
diff --git a/interface/web/mail/templates/spamfilter_users_edit.htm b/interface/web/mail/templates/spamfilter_users_edit.htm
index e18aa5e32c826e9dce7330528434cc41a0662420..0f6d18acd006c53cb5aace5073d8ac10f5709c7e 100644
--- a/interface/web/mail/templates/spamfilter_users_edit.htm
+++ b/interface/web/mail/templates/spamfilter_users_edit.htm
@@ -9,20 +9,20 @@
                 <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                 <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                     {tmpl_var name='server_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="priority" class="col-sm-3 control-label">{tmpl_var name='priority_txt'}</label>
                 <div class="col-sm-9"><select name="priority" id="priority" class="form-control">
                     {tmpl_var name='priority'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="policy_id" class="col-sm-3 control-label">{tmpl_var name='policy_id_txt'}</label>
                 <div class="col-sm-9"><select name="policy_id" id="policy_id" class="form-control">
                     {tmpl_var name='policy_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" /></div></div>
@@ -33,8 +33,8 @@
                 <label for="local" class="col-sm-3 control-label">{tmpl_var name='local_txt'}</label>
                 <div class="col-sm-9"><select name="local" id="local" class="form-control">
                     {tmpl_var name='local'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
         
 
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/mail/templates/spamfilter_whitelist_edit.htm b/interface/web/mail/templates/spamfilter_whitelist_edit.htm
index 35c39c5eb27718ff4d53f00cab84713dbea186eb..2f0d9775de19a1b794ee8450cd803adc686cc916 100644
--- a/interface/web/mail/templates/spamfilter_whitelist_edit.htm
+++ b/interface/web/mail/templates/spamfilter_whitelist_edit.htm
@@ -10,15 +10,15 @@
                     <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                     <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                                                     {tmpl_var name='server_id'}
-                                            </select>
-                  </div></div>
+                                            </select></div>
+                  </div>
             -->
             <div class="form-group">
                 <label for="rid" class="col-sm-3 control-label">{tmpl_var name='rid_txt'}</label>
                 <div class="col-sm-9"><select name="rid" id="rid" class="form-control">
                     {tmpl_var name='rid'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" /></div></div>
@@ -26,8 +26,8 @@
                 <label for="priority" class="col-sm-3 control-label">{tmpl_var name='priority_txt'}</label>
                 <div class="col-sm-9"><select name="priority" id="priority" class="form-control">
                     {tmpl_var name='priority'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm b/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm
index 7b73286297e4b23ed53c91d63da35bfbf127fc6d..8ebe2a27681a71f20564c9fb16fd771725e6df62 100644
--- a/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm
@@ -13,8 +13,8 @@
                 <label for="policy" class="col-sm-3 control-label">{tmpl_var name='policy_txt'}</label>
                 <div class="col-sm-9"><select name="policy" id="policy" class="form-control">
                     {tmpl_var name='policy'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
         
 
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/monitor/templates/show_log.htm b/interface/web/monitor/templates/show_log.htm
index befb5ebd4f25c5a2ebb442ff89b823797a1cd936..df3bb8e0b70aad6ccd2084400f7090844eca9d84 100644
--- a/interface/web/monitor/templates/show_log.htm
+++ b/interface/web/monitor/templates/show_log.htm
@@ -10,9 +10,8 @@
                     <label for="refreshinterval" class="col-sm-3 control-label">{tmpl_var name='refreshinterval_txt'}</label>
                     <div class="col-sm-9"><select name="refreshinterval" id="refreshinterval" class="form-control" onChange="loadContentRefresh('monitor/show_log.php?log={tmpl_var name="log_id"}')">
                         {tmpl_var name='refresh'}
-                    </select>
+                    </select></div>
                 
-            </div>
         
     </div>
   
diff --git a/interface/web/monitor/templates/show_sys_state.htm b/interface/web/monitor/templates/show_sys_state.htm
index 262425c8e639ecfae237e75e7f8f17add1f093c2..ee4b42c351fae3b7985873550b2eb0d8f268b6d3 100644
--- a/interface/web/monitor/templates/show_sys_state.htm
+++ b/interface/web/monitor/templates/show_sys_state.htm
@@ -10,9 +10,8 @@
                     <label for="refreshinterval" class="col-sm-3 control-label">&nbsp;</label>
                     <div class="col-sm-9"><select name="refreshinterval" id="refreshinterval" class="form-control" onChange="loadContentRefresh('monitor/show_sys_state.php?state={tmpl_var name="state_type"}')">
                         {tmpl_var name='refresh'}
-                    </select>
+                    </select></div>
                 
-            </div>
         
     </div>
   
diff --git a/interface/web/sites/templates/cron_edit.htm b/interface/web/sites/templates/cron_edit.htm
index 2a3e753dc416fcc275ae48e670b5018e6ad84d04..7fb59c766eaa42ad632bef1ca1f259780c435fbd 100644
--- a/interface/web/sites/templates/cron_edit.htm
+++ b/interface/web/sites/templates/cron_edit.htm
@@ -10,14 +10,14 @@
                     <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
                     <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control" disabled="disabled">
                         {tmpl_var name='parent_domain_id'}
-                    </select>
-                    </div><input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
+                    </select></div>
+                    <input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
                     <tmpl_else>
                         <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
                         <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control">
                             {tmpl_var name='parent_domain_id'}
-                        </select>
-                </div></tmpl_if>
+                        </select></div>
+                </tmpl_if>
             </div>
             <div class="form-group">
                 <label for="run_min" class="col-sm-3 control-label">{tmpl_var name='run_min_txt'}</label>
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
index 51a8c9f79148330ab40670eb2cade33d6f99a26c..a93011fef0ec741a57ffd36b9fbcb9aa66e99719 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -11,14 +11,14 @@
                         <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                         <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
                             {tmpl_var name='server_id'}
-                        </select>
-                        </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                        </select></div>
+                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
                         <tmpl_else>
                             <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                             <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                                 {tmpl_var name='server_id'}
-                            </select>
-                    </div></tmpl_if>
+                            </select></div>
+                    </tmpl_if>
                 </div>
             <tmpl_else>
                 <tmpl_if name="only_one_server">
@@ -29,14 +29,14 @@
                             <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                             <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
                                 {tmpl_var name='server_id'}
-                            </select>
-                            </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                            </select></div>
+                            <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
                             <tmpl_else>
                                 <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                                 <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                                     {tmpl_var name='server_id'}
-                                </select>
-                        </div></tmpl_if>
+                                </select></div>
+                        </tmpl_if>
                     </div>
                 </tmpl_if>
             </tmpl_if>
@@ -44,14 +44,14 @@
                 <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
                 <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control">
                     {tmpl_var name='parent_domain_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="type" class="col-sm-3 control-label">{tmpl_var name='type_txt'}</label>
                 <div class="col-sm-9"><select name="type" id="type" class="form-control">
                     {tmpl_var name='type'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="database_name" class="col-sm-3 control-label">{tmpl_var name='database_name_txt'}</label>
                 <p class="prefix">{tmpl_var name='database_name_prefix'}</p>
@@ -68,27 +68,27 @@
                 <label for="database_user_id" class="col-sm-3 control-label">{tmpl_var name='database_user_txt'}</label>
                 <div class="col-sm-9"><select name="database_user_id" id="database_user_id" class="form-control">
                     {tmpl_var name='database_user_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="database_ro_user_id" class="col-sm-3 control-label">{tmpl_var name='database_ro_user_txt'}</label>
                 <div class="col-sm-9"><select name="database_ro_user_id" id="database_ro_user_id" class="form-control">
                     {tmpl_var name='database_ro_user_id'}
-                </select>&nbsp;{tmpl_var name='optional_txt'}
-            </div></div>
+                </select></div>&nbsp;{tmpl_var name='optional_txt'}
+            </div>
             <div class="form-group">
                 <tmpl_if name="edit_disabled">
                     <label for="database_charset_disabled" class="col-sm-3 control-label">{tmpl_var name='database_charset_txt'}</label>
                     <div class="col-sm-9"><select name="database_charset_disabled" id="database_charset_disabled" class="form-control" disabled="disabled">
                         {tmpl_var name='database_charset'}
-                    </select>
-                    </div><input type="hidden" name="database_charset" value="{tmpl_var name='database_charset_value'}" />
+                    </select></div>
+                    <input type="hidden" name="database_charset" value="{tmpl_var name='database_charset_value'}" />
                     <tmpl_else>
                         <label for="database_charset" class="col-sm-3 control-label">{tmpl_var name='database_charset_txt'}</label>
                         <div class="col-sm-9"><select name="database_charset" id="database_charset" class="form-control">
                             {tmpl_var name='database_charset'}
-                        </select>
-                </div></tmpl_if>
+                        </select></div>
+                </tmpl_if>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='remote_access_txt'}</label>
diff --git a/interface/web/sites/templates/database_user_edit.htm b/interface/web/sites/templates/database_user_edit.htm
index 936601789777605dfef194c5d8aaccdd418dd676..b06de154ad9495f19f74fc18194b61240f00ec78 100644
--- a/interface/web/sites/templates/database_user_edit.htm
+++ b/interface/web/sites/templates/database_user_edit.htm
@@ -10,16 +10,16 @@
                     <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
                     <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                         {tmpl_var name='client_group_id'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
             </tmpl_if>
             <tmpl_if name="is_reseller">
                 <div class="form-group">
                     <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
                     <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                         {tmpl_var name='client_group_id'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
             </tmpl_if>
             <div class="form-group">
                 <label for="database_user" class="col-sm-3 control-label">{tmpl_var name='database_user_txt'}</label>
diff --git a/interface/web/sites/templates/ftp_user_edit.htm b/interface/web/sites/templates/ftp_user_edit.htm
index 997fa75fef40e33b432602358089e98b1faa5375..5e55ce47badf82249766909243c3e4f6eb01deef 100644
--- a/interface/web/sites/templates/ftp_user_edit.htm
+++ b/interface/web/sites/templates/ftp_user_edit.htm
@@ -9,8 +9,8 @@
                 <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
                 <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control">
                     {tmpl_var name='parent_domain_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
                 <p class="prefix">{tmpl_var name='username_prefix'}</p>
diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm
index 207b425d2882b9d346a3ca5054bf76ba3ae343ec..0afee2109aa399ef0a510eef600c2da4a05d8538 100644
--- a/interface/web/sites/templates/shell_user_edit.htm
+++ b/interface/web/sites/templates/shell_user_edit.htm
@@ -10,14 +10,14 @@
                     <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
                     <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control" disabled="disabled">
                         {tmpl_var name='parent_domain_id'}
-                    </select>
-                    </div><input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
+                    </select></div>
+                    <input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
                 <tmpl_else>
                         <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
                         <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control">
                             {tmpl_var name='parent_domain_id'}
-                        </select>
-                </div></tmpl_if>
+                        </select></div>
+                </tmpl_if>
             </div>
             <div class="form-group">
                 <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
@@ -41,8 +41,8 @@
                 <label for="chroot" class="col-sm-3 control-label">{tmpl_var name='chroot_txt'}</label>
                 <div class="col-sm-9"><select name="chroot" id="chroot" class="form-control">
                     {tmpl_var name='chroot'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="quota_size" class="col-sm-3 control-label">{tmpl_var name='quota_size_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" class="form-control" /></div><label class="col-sm-3 control-label">MB</label>
diff --git a/interface/web/sites/templates/web_childdomain_edit.htm b/interface/web/sites/templates/web_childdomain_edit.htm
index 04a355d291802541d07522ff135b09e9867e7d40..1b65b19c3cf5b0c68fded81a4aa123e06aa3f1e4 100644
--- a/interface/web/sites/templates/web_childdomain_edit.htm
+++ b/interface/web/sites/templates/web_childdomain_edit.htm
@@ -9,8 +9,8 @@
             <tmpl_if name="domain_option">
             <div class="form-group">
                 <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
-                <div class="col-sm-9"><select id="parent_domain_id" name="parent_domain_id" class="form-control">{tmpl_var name='parent_domain_id'}</select>
-            </div></div>
+                <div class="col-sm-9"><select id="parent_domain_id" name="parent_domain_id" class="form-control">{tmpl_var name='parent_domain_id'}</select></div>
+            </div>
             </tmpl_if>
             <div class="form-group">
                 <label for="domain" class="col-sm-3 control-label">{tmpl_var name='host_txt'}</label>
@@ -20,13 +20,13 @@
                 <label for="sel_domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
                     <div class="col-sm-9"><select name="sel_domain" id="sel_domain" class="form-control">
                         {tmpl_var name='domain_option'}
-                    </select>
-            </div></div>
+                    </select></div>
+            </div>
             <tmpl_else>
             <div class="form-group">
                 <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
-                <div class="col-sm-9"><select id="parent_domain_id" name="parent_domain_id" class="form-control">{tmpl_var name='parent_domain_id'}</select>
-            </div></div>
+                <div class="col-sm-9"><select id="parent_domain_id" name="parent_domain_id" class="form-control">{tmpl_var name='parent_domain_id'}</select></div>
+            </div>
             </tmpl_if>
 			<tmpl_else>
             <div class="form-group">
@@ -34,8 +34,8 @@
                     <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
                     <div class="col-sm-9"><select name="domain" id="domain" class="form-control">
                         {tmpl_var name='domain_option'}
-                    </select>
-                </div><tmpl_else>
+                    </select></div>
+                <tmpl_else>
                     <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" /></div></tmpl_if>
             </div>
@@ -43,15 +43,15 @@
                 <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
                 <div class="col-sm-9"><select id="parent_domain_id" name="parent_domain_id" class="form-control">
                     {tmpl_var name='parent_domain_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
 			</tmpl_if>
             <div class="form-group">
                 <label for="redirect_type" class="col-sm-3 control-label">{tmpl_var name='redirect_type_txt'}</label>
                 <div class="col-sm-9"><select name="redirect_type" id="redirect_type" class="form-control">
                     {tmpl_var name='redirect_type'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="redirect_path" class="col-sm-3 control-label">{tmpl_var name='redirect_path_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" class="form-control" /></div></div>
@@ -60,14 +60,14 @@
                 <label for="subdomain" class="col-sm-3 control-label">{tmpl_var name='subdomain_txt'}</label>
                 <div class="col-sm-9"><select name="subdomain" id="subdomain" class="form-control">
                     {tmpl_var name='subdomain'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
 			<div class="form-group">
                 <label for="seo_redirect" class="col-sm-3 control-label">{tmpl_var name='seo_redirect_txt'}</label>
                 <div class="col-sm-9"><select name="seo_redirect" id="seo_redirect" class="form-control">
                     {tmpl_var name='seo_redirect'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
 			</tmpl_if>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
diff --git a/interface/web/sites/templates/web_directive_snippets.htm b/interface/web/sites/templates/web_directive_snippets.htm
index e89581fb551f9b8a35d8109ddb67f9353afed4bd..93e8b94f84f2208b763afcf62514c5670991f8ba 100644
--- a/interface/web/sites/templates/web_directive_snippets.htm
+++ b/interface/web/sites/templates/web_directive_snippets.htm
@@ -10,5 +10,5 @@
 			{tmpl_var name='name'}
 		</option>
 		</tmpl_loop>
-	</select>
-</div></div>
\ No newline at end of file
+	</select></div>
+</div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_folder_edit.htm b/interface/web/sites/templates/web_folder_edit.htm
index 7177365618e8a9a96517043f7bfb1bc60bd749ed..e02727a60e76d8f2dc36b84198a88b0811c994de 100644
--- a/interface/web/sites/templates/web_folder_edit.htm
+++ b/interface/web/sites/templates/web_folder_edit.htm
@@ -9,8 +9,8 @@
                 <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
                 <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control">
                     {tmpl_var name='parent_domain_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="path" class="col-sm-3 control-label">{tmpl_var name='path_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="path" id="path" value="{tmpl_var name='path'}" class="form-control" /></div></div>
diff --git a/interface/web/sites/templates/web_folder_user_edit.htm b/interface/web/sites/templates/web_folder_user_edit.htm
index be941b1db238f76d9aa8efc41d8004debd3c8866..f1e4cd179a7f53e817a35c3eeaed893de4694c0a 100644
--- a/interface/web/sites/templates/web_folder_user_edit.htm
+++ b/interface/web/sites/templates/web_folder_user_edit.htm
@@ -9,8 +9,8 @@
                 <label for="web_folder_id" class="col-sm-3 control-label">{tmpl_var name='web_folder_id_txt'}</label>
                 <div class="col-sm-9"><select name="web_folder_id" id="web_folder_id" class="form-control">
                     {tmpl_var name='web_folder_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control" /></div></div>
diff --git a/interface/web/sites/templates/web_vhost_domain_advanced.htm b/interface/web/sites/templates/web_vhost_domain_advanced.htm
index dbeaf077f5bed28adf379fa8fcc9934521d45e4a..9a3a4f332b719cffefeefaf60848e718bcd88d4b 100644
--- a/interface/web/sites/templates/web_vhost_domain_advanced.htm
+++ b/interface/web/sites/templates/web_vhost_domain_advanced.htm
@@ -45,8 +45,8 @@
                     <label for="pm" class="col-sm-3 control-label">{tmpl_var name='pm_txt'}</label>
                     <div class="col-sm-9"><select name="pm" id="pm" class="form-control">
                         {tmpl_var name='pm'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="ctrlHolder pm_ondemand" style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
                     {tmpl_var name='pm_ondemand_hint_txt'}
                 </div>
diff --git a/interface/web/sites/templates/web_vhost_domain_backup.htm b/interface/web/sites/templates/web_vhost_domain_backup.htm
index 4213a92cc6b58665cfdff1cd031c84f059c07e65..ae94a61d4c6fe4765323b2d8b36a48b3f2f98a13 100644
--- a/interface/web/sites/templates/web_vhost_domain_backup.htm
+++ b/interface/web/sites/templates/web_vhost_domain_backup.htm
@@ -18,14 +18,14 @@
                 <label for="backup_interval" class="col-sm-3 control-label">{tmpl_var name='backup_interval_txt'}</label>
                 <div class="col-sm-9"><select name="backup_interval" id="backup_interval" class="form-control">
                     {tmpl_var name='backup_interval'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="backup_copies" class="col-sm-3 control-label">{tmpl_var name='backup_copies_txt'}</label>
                 <div class="col-sm-9"><select name="backup_copies" id="backup_copies" class="form-control">
                     {tmpl_var name='backup_copies'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
 			<div class="form-group">
                 <label for="backup_excludes" class="col-sm-3 control-label">{tmpl_var name='backup_excludes_txt'}</label>
                 <div class="col-sm-6"><input type="text" name="backup_excludes" id="backup_excludes" value="{tmpl_var name='backup_excludes'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='backup_excludes_note_txt'}
diff --git a/interface/web/sites/templates/web_vhost_domain_edit.htm b/interface/web/sites/templates/web_vhost_domain_edit.htm
index 6f480e867e83a15bcdb32c4ba183c3386ed29c4f..25d871121bd070d8c4d88608bc895ce699a3d24b 100644
--- a/interface/web/sites/templates/web_vhost_domain_edit.htm
+++ b/interface/web/sites/templates/web_vhost_domain_edit.htm
@@ -21,22 +21,22 @@
                         <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                         <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
                             {tmpl_var name='server_id'}
-                        </select>
-                        </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                        </select></div>
+                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
                         <tmpl_else>
                             <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                             <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                                 {tmpl_var name='server_id'}
-                            </select>
-                    </div></tmpl_if>
+                            </select></div>
+                    </tmpl_if>
                 </div>
                 <tmpl_unless name="domain_option">
                     <div class="form-group">
                         <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_group_id_txt'}</label>
                         <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                             {tmpl_var name='client_group_id'}
-                        </select>
-                    </div></div>
+                        </select></div>
+                    </div>
                 </tmpl_unless>
             <tmpl_else>
                 <tmpl_if name="only_one_server">
@@ -47,14 +47,14 @@
                             <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                             <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
                                 {tmpl_var name='server_id'}
-                            </select>
-                            </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                            </select></div>
+                            <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
                         <tmpl_else>
                             <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                             <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                                 {tmpl_var name='server_id'}
-                            </select>
-                        </div></tmpl_if>
+                            </select></div>
+                        </tmpl_if>
                     </div>
                 </tmpl_if>
             </tmpl_if>
@@ -64,29 +64,29 @@
                         <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_group_id_txt'}</label>
                         <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                             {tmpl_var name='client_group_id'}
-                        </select>
-                    </div></div>
+                        </select></div>
+                    </div>
                 </tmpl_unless>
             </tmpl_if>
             <div class="form-group">
                 <label for="ip_address" class="col-sm-3 control-label">{tmpl_var name='ip_address_txt'}</label>
                 <div class="col-sm-9"><select name="ip_address" id="ip_address" class="form-control">
                     {tmpl_var name='ip_address'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="ipv6_address" class="col-sm-3 control-label">{tmpl_var name='ipv6_address_txt'}</label>
                 <div class="col-sm-9"><select name="ipv6_address" id="ipv6_address" class="form-control">
                     {tmpl_var name='ipv6_address'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
                 <tmpl_if name="domain_option">
                     <div class="col-sm-9"><select name="domain" id="domain" class="form-control">
                         {tmpl_var name='domain_option'}
-                    </select>
-                    </div><tmpl_else>
+                    </select></div>
+                    <tmpl_else>
                         <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" /></div></tmpl_if>
             </div>
             <div class="form-group">
@@ -99,8 +99,8 @@
             <tmpl_if name="domain_option">
             <div class="form-group">
                 <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
-                <div class="col-sm-9"><select id="parent_domain_id" name="parent_domain_id" class="form-control">{tmpl_var name='parent_domain_id'}</select>
-            </div></div>
+                <div class="col-sm-9"><select id="parent_domain_id" name="parent_domain_id" class="form-control">{tmpl_var name='parent_domain_id'}</select></div>
+            </div>
             </tmpl_if>
             <div class="form-group">
                 <label for="domain" class="col-sm-3 control-label">{tmpl_var name='host_txt'}</label>
@@ -110,13 +110,13 @@
                 <label for="sel_domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
                     <div class="col-sm-9"><select name="sel_domain" id="sel_domain" class="form-control">
                         {tmpl_var name='domain_option'}
-                    </select>
-            </div></div>
+                    </select></div>
+            </div>
             <tmpl_else>
             <div class="form-group">
                 <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
-                <div class="col-sm-9"><select id="parent_domain_id" name="parent_domain_id" class="form-control">{tmpl_var name='parent_domain_id'}</select>
-            </div></div>
+                <div class="col-sm-9"><select id="parent_domain_id" name="parent_domain_id" class="form-control">{tmpl_var name='parent_domain_id'}</select></div>
+            </div>
             </tmpl_if>
             <div class="form-group">
                 <label for="web_folder" class="col-sm-3 control-label">{tmpl_var name='web_folder_txt'}</label>
@@ -130,16 +130,16 @@
                 <tmpl_if name="domain_option">
                     <div class="col-sm-9"><select name="domain" id="domain" class="form-control">
                         {tmpl_var name='domain_option'}
-                    </select>
-                    </div><tmpl_else>
+                    </select></div>
+                    <tmpl_else>
                         <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" /></div></tmpl_if>
             </div>
             <div class="form-group">
                 <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
                 <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control">
                     {tmpl_var name='parent_domain_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="web_folder" class="col-sm-3 control-label">{tmpl_var name='web_folder_txt'}</label>
                 <div class="col-sm-6"><input type="text" name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" class="form-control"<tmpl_if name='fixed_folder' op='==' value='y'></div><div class="col-sm-3 input-sm"> readonly="readonly"</div></tmpl_if> />
@@ -196,8 +196,8 @@
                 <label for="subdomain" class="col-sm-3 control-label">{tmpl_var name='subdomain_txt'}</label>
                 <div class="col-sm-9"><select name="subdomain" id="subdomain" class="form-control">
                     {tmpl_var name='subdomain'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <tmpl_if name="limit_ssl" op="==" value="y"><div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='ssl_txt'}</label>
                 <div class="col-sm-9">
@@ -208,14 +208,14 @@
                 <label for="php" class="col-sm-3 control-label">{tmpl_var name='php_txt'}</label>
                 <div class="col-sm-9"><select name="php" id="php" class="form-control">
                     {tmpl_var name='php'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group fastcgi_php_version">
                 <label for="fastcgi_php_version" class="col-sm-3 control-label">{tmpl_var name='fastcgi_php_version_txt'}</label>
                 <div class="col-sm-9"><select name="fastcgi_php_version" id="fastcgi_php_version" class="form-control">
                     {tmpl_var name='fastcgi_php_version'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
 			{tmpl_var name="directive_snippets_id"}
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
diff --git a/interface/web/sites/templates/web_vhost_domain_redirect.htm b/interface/web/sites/templates/web_vhost_domain_redirect.htm
index 355791e6db4a10b46c4c04458bc59fd994d2a3ee..5367afff26c32716ffbf5b22985972ac936fb483 100644
--- a/interface/web/sites/templates/web_vhost_domain_redirect.htm
+++ b/interface/web/sites/templates/web_vhost_domain_redirect.htm
@@ -18,8 +18,8 @@
                 <label for="redirect_type" class="col-sm-3 control-label">{tmpl_var name='redirect_type_txt'}</label>
                 <div class="col-sm-9"><select name="redirect_type" id="redirect_type" class="form-control">
                     {tmpl_var name='redirect_type'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="redirect_path" class="col-sm-3 control-label">{tmpl_var name='redirect_path_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" class="form-control" /></div></div>
@@ -27,8 +27,8 @@
                 <label for="seo_redirect" class="col-sm-3 control-label">{tmpl_var name='seo_redirect_txt'}</label>
                 <div class="col-sm-9"><select name="seo_redirect" id="seo_redirect" class="form-control">
                     {tmpl_var name='seo_redirect'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
 			<div class="form-group nginx">
                 <label for="rewrite_rules" class="col-sm-3 control-label">{tmpl_var name='rewrite_rules_txt'}</label>
                 <div class="col-sm-9"><textarea class="form-control" name="rewrite_rules" id="rewrite_rules" rows='10' cols='50' style="width:400px;">{tmpl_var name='rewrite_rules'}</textarea></div>&nbsp;<b>{tmpl_var name="allowed_rewrite_rule_directives_txt"}</b><br><br>&nbsp;break<br>&nbsp;if<br>&nbsp;return<br>&nbsp;rewrite<br>&nbsp;set<br><br>&nbsp;<a href="http://wiki.nginx.org/HttpRewriteModule" target="_blank">http://wiki.nginx.org/HttpRewriteModule</a>
diff --git a/interface/web/sites/templates/web_vhost_domain_ssl.htm b/interface/web/sites/templates/web_vhost_domain_ssl.htm
index 65ceb4f217c4386fd9b351be24963941f4db7666..f5ddbeab7526f3af7cb6ee019bd5206f72a6fe6d 100644
--- a/interface/web/sites/templates/web_vhost_domain_ssl.htm
+++ b/interface/web/sites/templates/web_vhost_domain_ssl.htm
@@ -28,16 +28,16 @@
                 <div class="col-sm-9"><input type="text" name="ssl_organisation_unit" id="ssl_organisation_unit" value="{tmpl_var name='ssl_organisation_unit'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="ssl_country" class="col-sm-3 control-label">{tmpl_var name='ssl_country_txt'}</label>
-                <div class="col-sm-9"><select name="ssl_country" id="ssl_country" class="form-control">
+                <div class="col-sm-9"><select name="ssl_country" id="ssl_country" class="form-control flags">
                     {tmpl_var name='ssl_country'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='ssl_domain_txt'}</label>
                 <div class="col-sm-9"><select name="ssl_domain" id="ssl_domain" class="form-control">
                     {tmpl_var name='ssl_domain'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
 			<div class="form-group">
                 <label for="ssl_request" class="col-sm-3 control-label">{tmpl_var name='ssl_key_txt'}</label>
                 <div class="col-sm-9"><textarea class="form-control" name="ssl_key" id="ssl_key" rows='10' cols='30'>{tmpl_var name='ssl_key'}</textarea></div>
@@ -58,8 +58,8 @@
                 <label for="ssl_action" class="col-sm-3 control-label">{tmpl_var name='ssl_action_txt'}</label>
                 <div class="col-sm-9"><select name="ssl_action" id="ssl_action" class="form-control">
                     {tmpl_var name='ssl_action'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
 			{tmpl_if name="is_spdy_enabled"}
 			<div class="form-group">
 				<label class="col-sm-3 control-label">{tmpl_var name='enable_spdy_txt'}</label>
diff --git a/interface/web/sites/templates/web_vhost_domain_stats.htm b/interface/web/sites/templates/web_vhost_domain_stats.htm
index e40b0521f4e4fc57cfc2cee0402b85f33c4f800c..a0a41f98f8a0d946f800a75c271f291b04a7753d 100644
--- a/interface/web/sites/templates/web_vhost_domain_stats.htm
+++ b/interface/web/sites/templates/web_vhost_domain_stats.htm
@@ -35,8 +35,8 @@
                 <label for="stats_type" class="col-sm-3 control-label">{tmpl_var name='stats_type_txt'}</label>
                 <div class="col-sm-9"><select name="stats_type" id="stats_type" class="form-control" >
                     {tmpl_var name='stats_type'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
         
 
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/sites/templates/webdav_user_edit.htm b/interface/web/sites/templates/webdav_user_edit.htm
index 7301c7b82277738886bf65a78c4d57dd324b45fa..777c44e05d79c11624e843157133193536cb05d5 100644
--- a/interface/web/sites/templates/webdav_user_edit.htm
+++ b/interface/web/sites/templates/webdav_user_edit.htm
@@ -10,14 +10,14 @@
                     <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
                     <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control" disabled="disabled">
                         {tmpl_var name='parent_domain_id'}
-                    </select>
-                    </div><input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
+                    </select></div>
+                    <input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
                     <tmpl_else>
                         <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
                         <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control">
                             {tmpl_var name='parent_domain_id'}
-                        </select>
-                </div></tmpl_if>
+                        </select></div>
+                </tmpl_if>
             </div>
             <div class="form-group">
                 <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
diff --git a/interface/web/themes/default/assets/images/flags_sprite.png b/interface/web/themes/default/assets/images/flags_sprite.png
new file mode 100644
index 0000000000000000000000000000000000000000..036a8aa41674a8e06d494a5f70e40734ed70b1f0
Binary files /dev/null and b/interface/web/themes/default/assets/images/flags_sprite.png differ
diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.css b/interface/web/themes/default/assets/stylesheets/ispconfig.css
index e17343975d4372361844e0e28ede0ce44e5cdd46..7064c57c43e72342d0bdcb6e482be29b9dab49c6 100644
--- a/interface/web/themes/default/assets/stylesheets/ispconfig.css
+++ b/interface/web/themes/default/assets/stylesheets/ispconfig.css
@@ -367,6 +367,258 @@ ul.gs-resultbox li:last-child {
   border-bottom-left-radius: 5px;
   border-bottom-right-radius: 5px; }
 
+span.flags {
+    display: inline-block;
+    background-image: url("../images/flags_sprite.png");
+    background-repeat: no-repeat;
+    height: 20px;
+    width: 30px;
+    vertical-align: middle;
+}
+span.flag-el {background-position:0 -1475px}
+span.flag-ad {background-position:0 -1px}
+span.flag-ae {background-position:0 -23px}
+span.flag-af {background-position:0 -45px}
+span.flag-ag {background-position:0 -67px}
+span.flag-ai {background-position:0 -89px}
+span.flag-al {background-position:0 -111px}
+span.flag-am {background-position:0 -133px}
+span.flag-an {background-position:0 -155px}
+span.flag-ao {background-position:0 -177px}
+span.flag-aq {background-position:0 -199px}
+span.flag-ar {background-position:0 -221px}
+span.flag-as {background-position:0 -243px}
+span.flag-at {background-position:0 -265px}
+span.flag-au {background-position:0 -287px}
+span.flag-aw {background-position:0 -309px}
+span.flag-ax {background-position:0 -331px}
+span.flag-az {background-position:0 -353px}
+span.flag-ba {background-position:0 -375px}
+span.flag-bb {background-position:0 -397px}
+span.flag-bd {background-position:0 -419px}
+span.flag-be {background-position:0 -441px}
+span.flag-bf {background-position:0 -463px}
+span.flag-bg {background-position:0 -485px}
+span.flag-bh {background-position:0 -507px}
+span.flag-bi {background-position:0 -529px}
+span.flag-bj {background-position:0 -551px}
+span.flag-bm {background-position:0 -573px}
+span.flag-bn {background-position:0 -595px}
+span.flag-bo {background-position:0 -617px}
+span.flag-br {background-position:0 -639px}
+span.flag-bs {background-position:0 -661px}
+span.flag-bt {background-position:0 -683px}
+span.flag-bv {background-position:0 -705px}
+span.flag-bw {background-position:0 -727px}
+span.flag-by {background-position:0 -749px}
+span.flag-bz {background-position:0 -771px}
+span.flag-ca {background-position:0 -793px}
+span.flag-cc {background-position:0 -837px}
+span.flag-cd {background-position:0 -859px}
+span.flag-cf {background-position:0 -881px}
+span.flag-cg {background-position:0 -903px}
+span.flag-ch {background-position:0 -925px}
+span.flag-ci {background-position:0 -947px}
+span.flag-ck {background-position:0 -969px}
+span.flag-cl {background-position:0 -991px}
+span.flag-cm {background-position:0 -1013px}
+span.flag-cn {background-position:0 -1035px}
+span.flag-co {background-position:0 -1057px}
+span.flag-cr {background-position:0 -1079px}
+span.flag-cs {background-position:0 -1101px}
+span.flag-cu {background-position:0 -1123px}
+span.flag-cv {background-position:0 -1145px}
+span.flag-cx {background-position:0 -1167px}
+span.flag-cy {background-position:0 -1189px}
+span.flag-cz {background-position:0 -1211px}
+span.flag-de {background-position:0 -1233px}
+span.flag-dj {background-position:0 -1255px}
+span.flag-dk {background-position:0 -1277px}
+span.flag-dm {background-position:0 -1299px}
+span.flag-do {background-position:0 -1321px}
+span.flag-dz {background-position:0 -1343px}
+span.flag-ec {background-position:0 -1365px}
+span.flag-ee {background-position:0 -1387px}
+span.flag-eg {background-position:0 -1409px}
+span.flag-eh {background-position:0 -1431px}
+span.flag-er {background-position:0 -1475px}
+span.flag-es {background-position:0 -1497px}
+span.flag-et {background-position:0 -1519px}
+span.flag-fi {background-position:0 -1585px}
+span.flag-fj {background-position:0 -1607px}
+span.flag-fk {background-position:0 -1629px}
+span.flag-fm {background-position:0 -1651px}
+span.flag-fo {background-position:0 -1673px}
+span.flag-fr {background-position:0 -1695px}
+span.flag-ga {background-position:0 -1717px}
+span.flag-gb {background-position:0 -1739px}
+span.flag-gd {background-position:0 -1761px}
+span.flag-ge {background-position:0 -1783px}
+span.flag-gf {background-position:0 -1805px}
+span.flag-gh {background-position:0 -1827px}
+span.flag-gi {background-position:0 -1849px}
+span.flag-gl {background-position:0 -1871px}
+span.flag-gm {background-position:0 -1893px}
+span.flag-gn {background-position:0 -1915px}
+span.flag-gp {background-position:0 -1937px}
+span.flag-gq {background-position:0 -1959px}
+span.flag-gr {background-position:0 -1981px}
+span.flag-gs {background-position:0 -2003px}
+span.flag-gt {background-position:0 -2025px}
+span.flag-gu {background-position:0 -2047px}
+span.flag-gw {background-position:0 -2069px}
+span.flag-gy {background-position:0 -2091px}
+span.flag-hk {background-position:0 -2113px}
+span.flag-hm {background-position:0 -2135px}
+span.flag-hn {background-position:0 -2157px}
+span.flag-hr {background-position:0 -2179px}
+span.flag-ht {background-position:0 -2201px}
+span.flag-hu {background-position:0 -2223px}
+span.flag-id {background-position:0 -2245px}
+span.flag-ie {background-position:0 -2267px}
+span.flag-il {background-position:0 -2289px}
+span.flag-in {background-position:0 -2311px}
+span.flag-io {background-position:0 -2333px}
+span.flag-iq {background-position:0 -2355px}
+span.flag-ir {background-position:0 -2377px}
+span.flag-is {background-position:0 -2399px}
+span.flag-it {background-position:0 -2421px}
+span.flag-jm {background-position:0 -2443px}
+span.flag-jo {background-position:0 -2465px}
+span.flag-jp {background-position:0 -2487px}
+span.flag-ke {background-position:0 -2509px}
+span.flag-kg {background-position:0 -2531px}
+span.flag-kh {background-position:0 -2553px}
+span.flag-ki {background-position:0 -2575px}
+span.flag-km {background-position:0 -2597px}
+span.flag-kn {background-position:0 -2619px}
+span.flag-kp {background-position:0 -2641px}
+span.flag-kr {background-position:0 -2663px}
+span.flag-kw {background-position:0 -2685px}
+span.flag-ky {background-position:0 -2707px}
+span.flag-kz {background-position:0 -2729px}
+span.flag-la {background-position:0 -2751px}
+span.flag-lb {background-position:0 -2773px}
+span.flag-lc {background-position:0 -2795px}
+span.flag-li {background-position:0 -2817px}
+span.flag-lk {background-position:0 -2839px}
+span.flag-lr {background-position:0 -2861px}
+span.flag-ls {background-position:0 -2883px}
+span.flag-lt {background-position:0 -2905px}
+span.flag-lu {background-position:0 -2927px}
+span.flag-lv {background-position:0 -2949px}
+span.flag-ly {background-position:0 -2971px}
+span.flag-ma {background-position:0 -2993px}
+span.flag-mc {background-position:0 -3015px}
+span.flag-md {background-position:0 -3037px}
+span.flag-me {background-position:0 -3059px}
+span.flag-mg {background-position:0 -3081px}
+span.flag-mh {background-position:0 -3103px}
+span.flag-mk {background-position:0 -3125px}
+span.flag-ml {background-position:0 -3147px}
+span.flag-mm {background-position:0 -3169px}
+span.flag-mn {background-position:0 -3191px}
+span.flag-mo {background-position:0 -3213px}
+span.flag-mp {background-position:0 -3235px}
+span.flag-mq {background-position:0 -3257px}
+span.flag-mr {background-position:0 -3279px}
+span.flag-ms {background-position:0 -3301px}
+span.flag-mt {background-position:0 -3323px}
+span.flag-mu {background-position:0 -3345px}
+span.flag-mv {background-position:0 -3367px}
+span.flag-mw {background-position:0 -3389px}
+span.flag-mx {background-position:0 -3411px}
+span.flag-my {background-position:0 -3433px}
+span.flag-mz {background-position:0 -3455px}
+span.flag-na {background-position:0 -3477px}
+span.flag-nc {background-position:0 -3499px}
+span.flag-ne {background-position:0 -3521px}
+span.flag-nf {background-position:0 -3543px}
+span.flag-ng {background-position:0 -3565px}
+span.flag-ni {background-position:0 -3587px}
+span.flag-nl {background-position:0 -3609px}
+span.flag-no {background-position:0 -3631px}
+span.flag-np {background-position:0 -3653px}
+span.flag-nr {background-position:0 -3675px}
+span.flag-nu {background-position:0 -3697px}
+span.flag-nz {background-position:0 -3719px}
+span.flag-om {background-position:0 -3741px}
+span.flag-pa {background-position:0 -3763px}
+span.flag-pe {background-position:0 -3785px}
+span.flag-pf {background-position:0 -3807px}
+span.flag-pg {background-position:0 -3829px}
+span.flag-ph {background-position:0 -3851px}
+span.flag-pk {background-position:0 -3873px}
+span.flag-pl {background-position:0 -3895px}
+span.flag-pm {background-position:0 -3917px}
+span.flag-pn {background-position:0 -3939px}
+span.flag-pr {background-position:0 -3961px}
+span.flag-ps {background-position:0 -3983px}
+span.flag-pt {background-position:0 -4005px}
+span.flag-pw {background-position:0 -4027px}
+span.flag-py {background-position:0 -4049px}
+span.flag-qa {background-position:0 -4071px}
+span.flag-re {background-position:0 -4093px}
+span.flag-ro {background-position:0 -4115px}
+span.flag-rs {background-position:0 -4137px}
+span.flag-ru {background-position:0 -4159px}
+span.flag-rw {background-position:0 -4181px}
+span.flag-sa {background-position:0 -4203px}
+span.flag-sb {background-position:0 -4225px}
+span.flag-sc {background-position:0 -4247px}
+span.flag-sd {background-position:0 -4291px}
+span.flag-se {background-position:0 -4313px}
+span.flag-sg {background-position:0 -4335px}
+span.flag-sh {background-position:0 -4357px}
+span.flag-si {background-position:0 -4379px}
+span.flag-sj {background-position:0 -4401px}
+span.flag-sk {background-position:0 -4423px}
+span.flag-sl {background-position:0 -4445px}
+span.flag-sm {background-position:0 -4467px}
+span.flag-sn {background-position:0 -4489px}
+span.flag-so {background-position:0 -4511px}
+span.flag-sr {background-position:0 -4533px}
+span.flag-st {background-position:0 -4555px}
+span.flag-sv {background-position:0 -4577px}
+span.flag-sy {background-position:0 -4599px}
+span.flag-sz {background-position:0 -4621px}
+span.flag-tc {background-position:0 -4643px}
+span.flag-td {background-position:0 -4665px}
+span.flag-tf {background-position:0 -4687px}
+span.flag-tg {background-position:0 -4709px}
+span.flag-th {background-position:0 -4731px}
+span.flag-tj {background-position:0 -4753px}
+span.flag-tk {background-position:0 -4775px}
+span.flag-tl {background-position:0 -4797px}
+span.flag-tm {background-position:0 -4819px}
+span.flag-tn {background-position:0 -4841px}
+span.flag-to {background-position:0 -4863px}
+span.flag-tr {background-position:0 -4885px}
+span.flag-tt {background-position:0 -4907px}
+span.flag-tv {background-position:0 -4929px}
+span.flag-tw {background-position:0 -4951px}
+span.flag-tz {background-position:0 -4973px}
+span.flag-ua {background-position:0 -4995px}
+span.flag-ug {background-position:0 -5017px}
+span.flag-um {background-position:0 -5039px}
+span.flag-us {background-position:0 -5061px}
+span.flag-uy {background-position:0 -5083px}
+span.flag-uz {background-position:0 -5105px}
+span.flag-va {background-position:0 -5127px}
+span.flag-vc {background-position:0 -5149px}
+span.flag-ve {background-position:0 -5171px}
+span.flag-vg {background-position:0 -5193px}
+span.flag-vi {background-position:0 -5215px}
+span.flag-vn {background-position:0 -5237px}
+span.flag-vu {background-position:0 -5259px}
+span.flag-wf {background-position:0 -5303px}
+span.flag-ws {background-position:0 -5325px}
+span.flag-ye {background-position:0 -5347px}
+span.flag-yt {background-position:0 -5369px}
+span.flag-za {background-position:0 -5391px}
+span.flag-zm {background-position:0 -5413px}
+span.flag-zw {background-position:0 -5435px}
+
 @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   #logo {
     background-image: url("../images/logo@2x.png");
diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.min.css b/interface/web/themes/default/assets/stylesheets/ispconfig.min.css
index 693063a876eab676b8bdb34a4bf824c61a7b0af3..326a9de69a34be547bd9867698d58bf16a35785c 100644
--- a/interface/web/themes/default/assets/stylesheets/ispconfig.min.css
+++ b/interface/web/themes/default/assets/stylesheets/ispconfig.min.css
@@ -1 +1 @@
-body{overflow-y:scroll}.left{float:left}.right{float:right}.clear:after{content:"";display:table;clear:both}.marginTop15{margin-top:15px}.paddingX5{padding-left:5px!important;padding-right:5px!important}.width65{width:65px}.form-group input[type='checkbox']{margin-top:10px}.control-label{font-weight:normal}.control-label:after{content:":"}.formbutton-default{padding:6px 30px;border-bottom-style:solid;border-bottom-width:2px;font-size:12px;font-weight:bold;transition:all ease 500ms}.formbutton-success,.formbutton-danger{padding:6px 30px;border-style:solid;border-width:1px;border-bottom-width:solid;font-size:12px;font-weight:bold;transition:all ease 500ms}.formbutton-narrow{padding:6px 8px;margin-left:2px;margin-right:2px}.formbutton-narrower{padding:4px 6px}#main-wrapper{margin:0 auto;width:95%;max-width:1260px}#logo{float:left;width:200px;height:65px;background:url("../images/logo.png") no-repeat}#logo a{display:block;width:100%;height:100%}#headerbar{float:right}#searchform{float:right;margin-top:16px}#searchform>div{position:relative;display:table}#searchform>div>div{display:table-cell;padding-right:8px;vertical-align:top}#searchform .icon{padding:0 2px;font-size:16px}#logout-button{float:right;margin-top:16px;margin-left:25px;border-bottom-style:solid;border-bottom-width:2px;transition:all ease 500ms}#main-navigation{margin-top:24px}#main-navigation a{padding:0 12px;height:70px;border-bottom-style:solid;botder-bottom-width:2px;transition:all ease 500ms}#main-navigation .icon{font-size:32px}#main-navigation .title{margin-top:2px;font-weight:bold}.btn-group-justified .btn{border-right-width:0}.btn-group-justified .btn:last-of-type{border-right-width:1px}#content{width:78%}#sidebar{margin-top:27px;width:18%;border-style:solid;border-width:1px;border-radius:4px}#sidebar header{margin:1px;padding:0 10px;height:40px;line-height:40px;font-weight:bold;border-top-left-radius:2px;border-top-right-radius:2px}#sidebar ul{margin:0;padding:0;list-style:none}#sidebar li{padding:10px;border-top-style:solid;border-top-width:1px;font-size:12px}#sidebar a{text-decoration:none;transition:color ease 500ms}.page-header{margin:20px 0;padding:0}.alert-notification a{font-weight:bold;text-decoration:none;transition:color ease 500ms}.alert-label,.alert-content{display:inline-block;vertical-align:top}.alert-label{width:60px}.modules{margin:0;padding:0;list-style:none}.modules li{float:left;margin-right:15px;margin-bottom:15px;padding:8px;width:200px;border-radius:4px;border-style:solid;border-width:1px}.modules .icon{float:left;margin-right:15px;font-size:50px}.modules .left{margin-top:5px}.modules .title{margin-top:6px;margin-left:20px;font-size:16px;font-weight:bold}.modules .button{margin-top:10px;width:100%;border-bottom-style:solid;border-bottom-width:2px;font-size:12px;font-weight:bold;transition:all ease 500ms}.modules a{text-decoration:none}.table-wrapper{margin-bottom:20px;border-radius:4px;border-style:solid;border-width:1px}.table{table-layout:fixed;margin-bottom:1px}.table caption{padding:5px 10px;text-align:left;font-weight:bold;font-size:18px;border-bottom-style:solid;border-bottom-width:1px}.table tbody tr{border-top-style:solid;border-top-width:1px;transition:background ease 500ms}.table tbody tr:last-child{border-radius:4px}.tfooter{margin-top:-1px;height:40px;border-top-style:solid;border-top-width:1px}.pagination{margin:10px 0}.progress{display:inline-block;margin-bottom:0;width:150px;height:10px}.content-tab-wrapper{border-style:solid;border-width:1px;border-radius:4px}.content-tab-wrapper .nav-tabs>li>a{border-radius:0;border:none!important;border-right-style:solid!important;border-right-width:1px!important;outline:0;font-weight:bold;transition:background ease 500ms}.content-tab-wrapper .nav-tabs li:not(:first-child) a{margin-left:-2px}.tab-content{padding:25px 10px}.input-group-btn .icon-calendar{font-size:18px}thead.dark th{height:40px;line-height:40px;font-weight:normal}thead.dark th.small-col{width:14%}thead.dark th.tiny-col{width:8%;overflow:hidden;text-overflow:ellipsis}thead.dark td input,thead.dark td select{width:100%}#footer{margin:20px 0;padding-top:20px;border-top-style:solid;border-top-width:1px;text-align:center;font-size:10px}.menu-btn{display:none;cursor:pointer}.df-container,.gs-container{position:relative}.gs-container:after{content:"";display:table;clear:both}ul.df-resultbox,ul.gs-resultbox{display:block;position:absolute;left:0;top:100%;margin:0;padding:0 0 10px;min-width:250px;max-width:500px;z-index:999999;background:#fff;list-style:none;box-shadow:2px 2px 5px #c5c5c5;border-radius:5px}ul.df-resultbox li,ul.gs-resultbox li{float:none;display:block;cursor:pointer;padding:0 10px}ul.gs-resultbox li{padding:3px 10px;line-height:1.1;font-size:.9em}ul.df-resultbox li:nth-child(even),ul.gs-resultbox li:nth-child(even){background:#f2f5f7}ul.df-resultbox li.df-cheader,ul.gs-resultbox li.gs-cheader{background:#fff;padding-top:10px;margin-bottom:10px}ul.df-resultbox li p,ul.gs-resultbox li p{margin-bottom:0;color:inherit}ul.df-resultbox li.df-cheader p.df-cheader-title,ul.gs-resultbox li.gs-cheader p.gs-cheader-title{font-weight:bold;margin-bottom:0}ul.df-resultbox li.df-cheader p.df-cheader-limit,ul.gs-resultbox li.gs-cheader p.gs-cheader-limit{font-weight:normal}ul.df-resultbox li.df-cdata img,ul.gs-resultbox li.gs-cdata img{margin-right:12px}ul.df-resultbox li.df-cdata p span.df-cdata-title,ul.gs-resultbox li.gs-cdata p span.gs-cdata-title{font-weight:bold}ul.gs-resultbox li.gs-cdata p span.gs-cdata-title{display:block}ul.df-resultbox li:first-child,ul.gs-resultbox li:first-child{border-top-left-radius:5px;border-top-right-radius:5px}ul.df-resultbox li:last-child,ul.gs-resultbox li:last-child{border-bottom-left-radius:5px;border-bottom-right-radius:5px}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#logo{background-image:url("../images/logo@2x.png");background-size:200px 65px}}
\ No newline at end of file
+body{overflow-y:scroll}.left{float:left}.right{float:right}.clear:after{content:"";display:table;clear:both}.marginTop15{margin-top:15px}.paddingX5{padding-left:5px!important;padding-right:5px!important}.width65{width:65px}.form-group input[type='checkbox']{margin-top:10px}.control-label{font-weight:normal}.control-label:after{content:":"}.formbutton-default{padding:6px 30px;border-bottom-style:solid;border-bottom-width:2px;font-size:12px;font-weight:bold;transition:all ease 500ms}.formbutton-success,.formbutton-danger{padding:6px 30px;border-style:solid;border-width:1px;border-bottom-width:solid;font-size:12px;font-weight:bold;transition:all ease 500ms}.formbutton-narrow{padding:6px 8px;margin-left:2px;margin-right:2px}.formbutton-narrower{padding:4px 6px}#main-wrapper{margin:0 auto;width:95%;max-width:1260px}#logo{float:left;width:200px;height:65px;background:url("../images/logo.png") no-repeat}#logo a{display:block;width:100%;height:100%}#headerbar{float:right}#searchform{float:right;margin-top:16px}#searchform>div{position:relative;display:table}#searchform>div>div{display:table-cell;padding-right:8px;vertical-align:top}#searchform .icon{padding:0 2px;font-size:16px}#logout-button{float:right;margin-top:16px;margin-left:25px;border-bottom-style:solid;border-bottom-width:2px;transition:all ease 500ms}#main-navigation{margin-top:24px}#main-navigation a{padding:0 12px;height:70px;border-bottom-style:solid;botder-bottom-width:2px;transition:all ease 500ms}#main-navigation .icon{font-size:32px}#main-navigation .title{margin-top:2px;font-weight:bold}.btn-group-justified .btn{border-right-width:0}.btn-group-justified .btn:last-of-type{border-right-width:1px}#content{width:78%}#sidebar{margin-top:27px;width:18%;border-style:solid;border-width:1px;border-radius:4px}#sidebar header{margin:1px;padding:0 10px;height:40px;line-height:40px;font-weight:bold;border-top-left-radius:2px;border-top-right-radius:2px}#sidebar ul{margin:0;padding:0;list-style:none}#sidebar li{padding:10px;border-top-style:solid;border-top-width:1px;font-size:12px}#sidebar a{text-decoration:none;transition:color ease 500ms}.page-header{margin:20px 0;padding:0}.alert-notification a{font-weight:bold;text-decoration:none;transition:color ease 500ms}.alert-label,.alert-content{display:inline-block;vertical-align:top}.alert-label{width:60px}.modules{margin:0;padding:0;list-style:none}.modules li{float:left;margin-right:15px;margin-bottom:15px;padding:8px;width:200px;border-radius:4px;border-style:solid;border-width:1px}.modules .icon{float:left;margin-right:15px;font-size:50px}.modules .left{margin-top:5px}.modules .title{margin-top:6px;margin-left:20px;font-size:16px;font-weight:bold}.modules .button{margin-top:10px;width:100%;border-bottom-style:solid;border-bottom-width:2px;font-size:12px;font-weight:bold;transition:all ease 500ms}.modules a{text-decoration:none}.table-wrapper{margin-bottom:20px;border-radius:4px;border-style:solid;border-width:1px}.table{table-layout:fixed;margin-bottom:1px}.table caption{padding:5px 10px;text-align:left;font-weight:bold;font-size:18px;border-bottom-style:solid;border-bottom-width:1px}.table tbody tr{border-top-style:solid;border-top-width:1px;transition:background ease 500ms}.table tbody tr:last-child{border-radius:4px}.tfooter{margin-top:-1px;height:40px;border-top-style:solid;border-top-width:1px}.pagination{margin:10px 0}.progress{display:inline-block;margin-bottom:0;width:150px;height:10px}.content-tab-wrapper{border-style:solid;border-width:1px;border-radius:4px}.content-tab-wrapper .nav-tabs>li>a{border-radius:0;border:none!important;border-right-style:solid!important;border-right-width:1px!important;outline:0;font-weight:bold;transition:background ease 500ms}.content-tab-wrapper .nav-tabs li:not(:first-child) a{margin-left:-2px}.tab-content{padding:25px 10px}.input-group-btn .icon-calendar{font-size:18px}thead.dark th{height:40px;line-height:40px;font-weight:normal}thead.dark th.small-col{width:14%}thead.dark th.tiny-col{width:8%;overflow:hidden;text-overflow:ellipsis}thead.dark td input,thead.dark td select{width:100%}#footer{margin:20px 0;padding-top:20px;border-top-style:solid;border-top-width:1px;text-align:center;font-size:10px}.menu-btn{display:none;cursor:pointer}.df-container,.gs-container{position:relative}.gs-container:after{content:"";display:table;clear:both}ul.df-resultbox,ul.gs-resultbox{display:block;position:absolute;left:0;top:100%;margin:0;padding:0 0 10px;min-width:250px;max-width:500px;z-index:999999;background:#fff;list-style:none;box-shadow:2px 2px 5px #c5c5c5;border-radius:5px}ul.df-resultbox li,ul.gs-resultbox li{float:none;display:block;cursor:pointer;padding:0 10px}ul.gs-resultbox li{padding:3px 10px;line-height:1.1;font-size:.9em}ul.df-resultbox li:nth-child(even),ul.gs-resultbox li:nth-child(even){background:#f2f5f7}ul.df-resultbox li.df-cheader,ul.gs-resultbox li.gs-cheader{background:#fff;padding-top:10px;margin-bottom:10px}ul.df-resultbox li p,ul.gs-resultbox li p{margin-bottom:0;color:inherit}ul.df-resultbox li.df-cheader p.df-cheader-title,ul.gs-resultbox li.gs-cheader p.gs-cheader-title{font-weight:bold;margin-bottom:0}ul.df-resultbox li.df-cheader p.df-cheader-limit,ul.gs-resultbox li.gs-cheader p.gs-cheader-limit{font-weight:normal}ul.df-resultbox li.df-cdata img,ul.gs-resultbox li.gs-cdata img{margin-right:12px}ul.df-resultbox li.df-cdata p span.df-cdata-title,ul.gs-resultbox li.gs-cdata p span.gs-cdata-title{font-weight:bold}ul.gs-resultbox li.gs-cdata p span.gs-cdata-title{display:block}ul.df-resultbox li:first-child,ul.gs-resultbox li:first-child{border-top-left-radius:5px;border-top-right-radius:5px}ul.df-resultbox li:last-child,ul.gs-resultbox li:last-child{border-bottom-left-radius:5px;border-bottom-right-radius:5px}span.flags{display:inline-block;background-image:url("../images/flags_sprite.png");background-repeat:no-repeat;height:20px;width:30px;vertical-align:middle}span.flag-el{background-position:0 -1475px}span.flag-ad{background-position:0 -1px}span.flag-ae{background-position:0 -23px}span.flag-af{background-position:0 -45px}span.flag-ag{background-position:0 -67px}span.flag-ai{background-position:0 -89px}span.flag-al{background-position:0 -111px}span.flag-am{background-position:0 -133px}span.flag-an{background-position:0 -155px}span.flag-ao{background-position:0 -177px}span.flag-aq{background-position:0 -199px}span.flag-ar{background-position:0 -221px}span.flag-as{background-position:0 -243px}span.flag-at{background-position:0 -265px}span.flag-au{background-position:0 -287px}span.flag-aw{background-position:0 -309px}span.flag-ax{background-position:0 -331px}span.flag-az{background-position:0 -353px}span.flag-ba{background-position:0 -375px}span.flag-bb{background-position:0 -397px}span.flag-bd{background-position:0 -419px}span.flag-be{background-position:0 -441px}span.flag-bf{background-position:0 -463px}span.flag-bg{background-position:0 -485px}span.flag-bh{background-position:0 -507px}span.flag-bi{background-position:0 -529px}span.flag-bj{background-position:0 -551px}span.flag-bm{background-position:0 -573px}span.flag-bn{background-position:0 -595px}span.flag-bo{background-position:0 -617px}span.flag-br{background-position:0 -639px}span.flag-bs{background-position:0 -661px}span.flag-bt{background-position:0 -683px}span.flag-bv{background-position:0 -705px}span.flag-bw{background-position:0 -727px}span.flag-by{background-position:0 -749px}span.flag-bz{background-position:0 -771px}span.flag-ca{background-position:0 -793px}span.flag-cc{background-position:0 -837px}span.flag-cd{background-position:0 -859px}span.flag-cf{background-position:0 -881px}span.flag-cg{background-position:0 -903px}span.flag-ch{background-position:0 -925px}span.flag-ci{background-position:0 -947px}span.flag-ck{background-position:0 -969px}span.flag-cl{background-position:0 -991px}span.flag-cm{background-position:0 -1013px}span.flag-cn{background-position:0 -1035px}span.flag-co{background-position:0 -1057px}span.flag-cr{background-position:0 -1079px}span.flag-cs{background-position:0 -1101px}span.flag-cu{background-position:0 -1123px}span.flag-cv{background-position:0 -1145px}span.flag-cx{background-position:0 -1167px}span.flag-cy{background-position:0 -1189px}span.flag-cz{background-position:0 -1211px}span.flag-de{background-position:0 -1233px}span.flag-dj{background-position:0 -1255px}span.flag-dk{background-position:0 -1277px}span.flag-dm{background-position:0 -1299px}span.flag-do{background-position:0 -1321px}span.flag-dz{background-position:0 -1343px}span.flag-ec{background-position:0 -1365px}span.flag-ee{background-position:0 -1387px}span.flag-eg{background-position:0 -1409px}span.flag-eh{background-position:0 -1431px}span.flag-er{background-position:0 -1475px}span.flag-es{background-position:0 -1497px}span.flag-et{background-position:0 -1519px}span.flag-fi{background-position:0 -1585px}span.flag-fj{background-position:0 -1607px}span.flag-fk{background-position:0 -1629px}span.flag-fm{background-position:0 -1651px}span.flag-fo{background-position:0 -1673px}span.flag-fr{background-position:0 -1695px}span.flag-ga{background-position:0 -1717px}span.flag-gb{background-position:0 -1739px}span.flag-gd{background-position:0 -1761px}span.flag-ge{background-position:0 -1783px}span.flag-gf{background-position:0 -1805px}span.flag-gh{background-position:0 -1827px}span.flag-gi{background-position:0 -1849px}span.flag-gl{background-position:0 -1871px}span.flag-gm{background-position:0 -1893px}span.flag-gn{background-position:0 -1915px}span.flag-gp{background-position:0 -1937px}span.flag-gq{background-position:0 -1959px}span.flag-gr{background-position:0 -1981px}span.flag-gs{background-position:0 -2003px}span.flag-gt{background-position:0 -2025px}span.flag-gu{background-position:0 -2047px}span.flag-gw{background-position:0 -2069px}span.flag-gy{background-position:0 -2091px}span.flag-hk{background-position:0 -2113px}span.flag-hm{background-position:0 -2135px}span.flag-hn{background-position:0 -2157px}span.flag-hr{background-position:0 -2179px}span.flag-ht{background-position:0 -2201px}span.flag-hu{background-position:0 -2223px}span.flag-id{background-position:0 -2245px}span.flag-ie{background-position:0 -2267px}span.flag-il{background-position:0 -2289px}span.flag-in{background-position:0 -2311px}span.flag-io{background-position:0 -2333px}span.flag-iq{background-position:0 -2355px}span.flag-ir{background-position:0 -2377px}span.flag-is{background-position:0 -2399px}span.flag-it{background-position:0 -2421px}span.flag-jm{background-position:0 -2443px}span.flag-jo{background-position:0 -2465px}span.flag-jp{background-position:0 -2487px}span.flag-ke{background-position:0 -2509px}span.flag-kg{background-position:0 -2531px}span.flag-kh{background-position:0 -2553px}span.flag-ki{background-position:0 -2575px}span.flag-km{background-position:0 -2597px}span.flag-kn{background-position:0 -2619px}span.flag-kp{background-position:0 -2641px}span.flag-kr{background-position:0 -2663px}span.flag-kw{background-position:0 -2685px}span.flag-ky{background-position:0 -2707px}span.flag-kz{background-position:0 -2729px}span.flag-la{background-position:0 -2751px}span.flag-lb{background-position:0 -2773px}span.flag-lc{background-position:0 -2795px}span.flag-li{background-position:0 -2817px}span.flag-lk{background-position:0 -2839px}span.flag-lr{background-position:0 -2861px}span.flag-ls{background-position:0 -2883px}span.flag-lt{background-position:0 -2905px}span.flag-lu{background-position:0 -2927px}span.flag-lv{background-position:0 -2949px}span.flag-ly{background-position:0 -2971px}span.flag-ma{background-position:0 -2993px}span.flag-mc{background-position:0 -3015px}span.flag-md{background-position:0 -3037px}span.flag-me{background-position:0 -3059px}span.flag-mg{background-position:0 -3081px}span.flag-mh{background-position:0 -3103px}span.flag-mk{background-position:0 -3125px}span.flag-ml{background-position:0 -3147px}span.flag-mm{background-position:0 -3169px}span.flag-mn{background-position:0 -3191px}span.flag-mo{background-position:0 -3213px}span.flag-mp{background-position:0 -3235px}span.flag-mq{background-position:0 -3257px}span.flag-mr{background-position:0 -3279px}span.flag-ms{background-position:0 -3301px}span.flag-mt{background-position:0 -3323px}span.flag-mu{background-position:0 -3345px}span.flag-mv{background-position:0 -3367px}span.flag-mw{background-position:0 -3389px}span.flag-mx{background-position:0 -3411px}span.flag-my{background-position:0 -3433px}span.flag-mz{background-position:0 -3455px}span.flag-na{background-position:0 -3477px}span.flag-nc{background-position:0 -3499px}span.flag-ne{background-position:0 -3521px}span.flag-nf{background-position:0 -3543px}span.flag-ng{background-position:0 -3565px}span.flag-ni{background-position:0 -3587px}span.flag-nl{background-position:0 -3609px}span.flag-no{background-position:0 -3631px}span.flag-np{background-position:0 -3653px}span.flag-nr{background-position:0 -3675px}span.flag-nu{background-position:0 -3697px}span.flag-nz{background-position:0 -3719px}span.flag-om{background-position:0 -3741px}span.flag-pa{background-position:0 -3763px}span.flag-pe{background-position:0 -3785px}span.flag-pf{background-position:0 -3807px}span.flag-pg{background-position:0 -3829px}span.flag-ph{background-position:0 -3851px}span.flag-pk{background-position:0 -3873px}span.flag-pl{background-position:0 -3895px}span.flag-pm{background-position:0 -3917px}span.flag-pn{background-position:0 -3939px}span.flag-pr{background-position:0 -3961px}span.flag-ps{background-position:0 -3983px}span.flag-pt{background-position:0 -4005px}span.flag-pw{background-position:0 -4027px}span.flag-py{background-position:0 -4049px}span.flag-qa{background-position:0 -4071px}span.flag-re{background-position:0 -4093px}span.flag-ro{background-position:0 -4115px}span.flag-rs{background-position:0 -4137px}span.flag-ru{background-position:0 -4159px}span.flag-rw{background-position:0 -4181px}span.flag-sa{background-position:0 -4203px}span.flag-sb{background-position:0 -4225px}span.flag-sc{background-position:0 -4247px}span.flag-sd{background-position:0 -4291px}span.flag-se{background-position:0 -4313px}span.flag-sg{background-position:0 -4335px}span.flag-sh{background-position:0 -4357px}span.flag-si{background-position:0 -4379px}span.flag-sj{background-position:0 -4401px}span.flag-sk{background-position:0 -4423px}span.flag-sl{background-position:0 -4445px}span.flag-sm{background-position:0 -4467px}span.flag-sn{background-position:0 -4489px}span.flag-so{background-position:0 -4511px}span.flag-sr{background-position:0 -4533px}span.flag-st{background-position:0 -4555px}span.flag-sv{background-position:0 -4577px}span.flag-sy{background-position:0 -4599px}span.flag-sz{background-position:0 -4621px}span.flag-tc{background-position:0 -4643px}span.flag-td{background-position:0 -4665px}span.flag-tf{background-position:0 -4687px}span.flag-tg{background-position:0 -4709px}span.flag-th{background-position:0 -4731px}span.flag-tj{background-position:0 -4753px}span.flag-tk{background-position:0 -4775px}span.flag-tl{background-position:0 -4797px}span.flag-tm{background-position:0 -4819px}span.flag-tn{background-position:0 -4841px}span.flag-to{background-position:0 -4863px}span.flag-tr{background-position:0 -4885px}span.flag-tt{background-position:0 -4907px}span.flag-tv{background-position:0 -4929px}span.flag-tw{background-position:0 -4951px}span.flag-tz{background-position:0 -4973px}span.flag-ua{background-position:0 -4995px}span.flag-ug{background-position:0 -5017px}span.flag-um{background-position:0 -5039px}span.flag-us{background-position:0 -5061px}span.flag-uy{background-position:0 -5083px}span.flag-uz{background-position:0 -5105px}span.flag-va{background-position:0 -5127px}span.flag-vc{background-position:0 -5149px}span.flag-ve{background-position:0 -5171px}span.flag-vg{background-position:0 -5193px}span.flag-vi{background-position:0 -5215px}span.flag-vn{background-position:0 -5237px}span.flag-vu{background-position:0 -5259px}span.flag-wf{background-position:0 -5303px}span.flag-ws{background-position:0 -5325px}span.flag-ye{background-position:0 -5347px}span.flag-yt{background-position:0 -5369px}span.flag-za{background-position:0 -5391px}span.flag-zm{background-position:0 -5413px}span.flag-zw{background-position:0 -5435px}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#logo{background-image:url("../images/logo@2x.png");background-size:200px 65px}}
\ No newline at end of file
diff --git a/interface/web/tools/templates/import_ispconfig.htm b/interface/web/tools/templates/import_ispconfig.htm
index 0dbdfd0fcc0f9e7e775dbd83bf61f49fea58771d..83064501283de73c01d77fa0478b8b0c52768ae3 100644
--- a/interface/web/tools/templates/import_ispconfig.htm
+++ b/interface/web/tools/templates/import_ispconfig.htm
@@ -32,14 +32,14 @@
                     <label for="mail_domain" class="col-sm-3 control-label">{tmpl_var name='mail_domain_txt'}</label>
                     <div class="col-sm-9"><select name="mail_domain" id="mail_domain" class="form-control">
                         {tmpl_var name='mail_domain'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_group_id_txt'}</label>
                     <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                         {tmpl_var name='client_group_id'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <div class="form-group">
                     <label class="col-sm-3 control-label">{tmpl_var name="import_mailbox_txt"}</label>
                     <div class="col-sm-9">
diff --git a/interface/web/tools/templates/interface_settings.htm b/interface/web/tools/templates/interface_settings.htm
index d13739fa2388aeb855b070cf1db1eef0780f3bf7..54e55f5d48ff596565e0769a6dd5ec34935f1808 100644
--- a/interface/web/tools/templates/interface_settings.htm
+++ b/interface/web/tools/templates/interface_settings.htm
@@ -10,15 +10,15 @@
                 <label for="app_theme" class="col-sm-3 control-label">{tmpl_var name='app_theme_txt'}</label>
                 <div class="col-sm-9"><select name="app_theme" id="app_theme" class="form-control">
                     {tmpl_var name='app_theme'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <!-- TODO: Limit to activated modules -->
             <div class="form-group">
                 <label for="startmodule" class="col-sm-3 control-label">{tmpl_var name='startmodule_txt'}</label>
                 <div class="col-sm-9"><select name="startmodule" id="startmodule" class="form-control">
                     {tmpl_var name='startmodule'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
         
         
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/tools/templates/resync.htm b/interface/web/tools/templates/resync.htm
index 81b6ea4b3e67c5b78693b703b486364a2db6d82e..31e111a2ac0112a5aee3a2ee7ef944f65be6077c 100644
--- a/interface/web/tools/templates/resync.htm
+++ b/interface/web/tools/templates/resync.htm
@@ -10,8 +10,8 @@
 				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_sites" value="1" name="resync_sites"></div><label for="resync_sites" class="col-sm-3 control-label">{tmpl_var name='resync_sites_txt'}</label>
 				<div class="col-sm-9"><select name="web_server_id" id="web_server_id" class="form-control">
 					{tmpl_var name='web_server_id'}
-				</select>
-			</div><tmpl_else>
+				</select></div>
+			<tmpl_else>
 				<label for="resync_sites" class="col-sm-3 control-label">{tmpl_var name="resync_sites_txt"}</label> 
 				<span style="color:red">
 					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
@@ -26,8 +26,8 @@
 				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_ftp" value="1" name="resync_ftp"></div><label for="resync_ftp" class="col-sm-3 control-label">{tmpl_var name="resync_ftp_txt"}</label> 
 				<div class="col-sm-9"><select name="ftp_server_id" id="ftp_server_id" class="form-control">
 					{tmpl_var name='ftp_server_id'}
-				</select>
-			</div><tmpl_else>
+				</select></div>
+			<tmpl_else>
 				<label for="resync_ftp" class="col-sm-3 control-label">{tmpl_var name="resync_ftp_txt"}</label> 
 				<span style="color:red">
 					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
@@ -42,8 +42,8 @@
 				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_webdav" value="1" name="resync_webdav"></div><label for="resync_webdav" class="col-sm-3 control-label">{tmpl_var name="resync_webdav_txt"}</label> 
 				<div class="col-sm-9"><select name="webdav_server_id" id="webdav_server_id" class="form-control">
 					{tmpl_var name='file_server_id'}
-				</select>
-			</div><tmpl_else>
+				</select></div>
+			<tmpl_else>
 				<label for="resync_webdav" class="col-sm-3 control-label">{tmpl_var name="resync_webdav_txt"}</label> 
 				<span style="color:red">
 					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
@@ -58,8 +58,8 @@
 				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_shell" value="1" name="resync_shell"></div><label for="resync_shell" class="col-sm-3 control-label">{tmpl_var name="resync_shell_txt"}</label> 
 				<div class="col-sm-9"><select name="shell_server_id" id="shell_server_id" class="form-control">
 					{tmpl_var name='web_server_id'}
-				</select>
-			</div><tmpl_else>
+				</select></div>
+			<tmpl_else>
 				<label for="resync_shell" class="col-sm-3 control-label">{tmpl_var name="resync_shell_txt"}</label> 
 				<span style="color:red">
 					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
@@ -74,8 +74,8 @@
 				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_cron" value="1" name="resync_cron"></div><label for="resync_cron" class="col-sm-3 control-label">{tmpl_var name="resync_cron_txt"}</label> 
 				<div class="col-sm-9"><select name="cron_server_id" id="cron_server_id" class="form-control">
 					{tmpl_var name='web_server_id'}
-				</select>
-			</div><tmpl_else>
+				</select></div>
+			<tmpl_else>
 				<label for="resync_cron" class="col-sm-3 control-label">{tmpl_var name="resync_cron_txt"}</label> 
 				<span style="color:red">
 					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
@@ -90,8 +90,8 @@
 				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_db" value="1" name="resync_db"></div><label for="resync_db" class="col-sm-3 control-label">{tmpl_var name="resync_db_txt"}</label> 
 				<div class="col-sm-9"><select name="db_server_id" id="db_server_id" class="form-control">
 					{tmpl_var name='db_server_id'}
-				</select>
-			</div><tmpl_else>
+				</select></div>
+			<tmpl_else>
 				<label for="resync_db" class="col-sm-3 control-label">{tmpl_var name="resync_db_txt"}</label> 
 				<span style="color:red">
 					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
@@ -106,8 +106,8 @@
 				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_mail" value="1" name="resync_mail"></div><label for="resync_mail" class="col-sm-3 control-label">{tmpl_var name="resync_mail_txt"}</label> 
 				<div class="col-sm-9"><select name="mail_server_id" id="mail_server_id" class="form-control">
 					{tmpl_var name='mail_server_id'}
-				</select>
-			</div><tmpl_else>
+				</select></div>
+			<tmpl_else>
 				<label for="resync_mail" class="col-sm-3 control-label">{tmpl_var name="resync_mail_txt"}</label> 
 				<span style="color:red">
 					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
@@ -122,8 +122,8 @@
 				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_mailbox" value="1" name="resync_mailbox"></div><label for="resync_mailbox" class="col-sm-3 control-label">{tmpl_var name="resync_mailbox_txt"}</label> 
 				<div class="col-sm-9"><select name="mailbox_server_id" id="mailbox_server_id" class="form-control">
 					{tmpl_var name='mail_server_id'}
-				</select>
-			</div><tmpl_else>
+				</select></div>
+			<tmpl_else>
 				<label for="resync_mailbox" class="col-sm-3 control-label">{tmpl_var name="resync_mailbox_txt"}</label> 
 				<span style="color:red">
 					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
@@ -137,8 +137,8 @@
 				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_dns" value="1" name="resync_dns"></div><label for="resync_dns" class="col-sm-3 control-label">{tmpl_var name="resync_dns_txt"}</label> 
 				<div class="col-sm-9"><select name="dns_server_id" id="dns_server_id" class="form-control">
 					{tmpl_var name='dns_server_id'}
-				</select>
-			</div><tmpl_else>
+				</select></div>
+			<tmpl_else>
 				<label for="resync_dns" class="col-sm-3 control-label">{tmpl_var name="resync_dns_txt"}</label> 
 				<span style="color:red">
 					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
@@ -153,8 +153,8 @@
 				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_vserver" value="1" name="resync_vserver"></div><label for="resync_vserver" class="col-sm-3 control-label">{tmpl_var name="resync_vserver_txt"}</label> 
 				<div class="col-sm-9"><select name="vserver_server_id" id="vserver_server_id" class="form-control">
 					{tmpl_var name='vserver_server_id'}
-				</select>
-			</div><tmpl_else>
+				</select></div>
+			<tmpl_else>
 				<label for="resync_vserver" class="col-sm-3 control-label">{tmpl_var name="resync_vserver_txt"}</label> 
 				<span style="color:red">
 					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
@@ -169,8 +169,8 @@
 				<div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_firewall" value="1" name="resync_firewall"></div><label for="resync_firewall" class="col-sm-3 control-label">{tmpl_var name="resync_firewall_txt"}</label> 
 				<div class="col-sm-9"><select name="firewall_server_id" id="firewall_server_id" class="form-control">
 					{tmpl_var name='firewall_server_id'}
-				</select>
-			</div><tmpl_else>
+				</select></div>
+			<tmpl_else>
 				<label for="resync_firewall" class="col-sm-3 control-label">{tmpl_var name="resync_firewall_txt"}</label> 
 				<span style="color:red">
 					<strong>{tmpl_var name="resync_no_server_txt"}</strong>
diff --git a/interface/web/tools/templates/user_settings.htm b/interface/web/tools/templates/user_settings.htm
index 483e1d3fe68d5b11e85746040660dd39d25799d3..cfc54255351a9b59536127079894ff2d51edf7fb 100644
--- a/interface/web/tools/templates/user_settings.htm
+++ b/interface/web/tools/templates/user_settings.htm
@@ -21,10 +21,10 @@
             <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
             <div class="form-group">
                 <label for="language" class="col-sm-3 control-label">{tmpl_var name='language_txt'}</label>
-                <div class="col-sm-9"><select name="language" id="language" class="form-control">
+                <div class="col-sm-9"><select name="language" id="language" class="form-control flags">
                     {tmpl_var name='language'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
         
         
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/vm/templates/openvz_ip_edit.htm b/interface/web/vm/templates/openvz_ip_edit.htm
index 2d981dbd663ee49b75ed29431807e179cb9127b2..d5a45169c26c90ccf2d7797f623acd5bca17e920 100644
--- a/interface/web/vm/templates/openvz_ip_edit.htm
+++ b/interface/web/vm/templates/openvz_ip_edit.htm
@@ -9,8 +9,8 @@
                 <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                 <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                     {tmpl_var name='server_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="ip_address" class="col-sm-3 control-label">{tmpl_var name='ip_address_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" class="form-control" /></div></div>
@@ -18,8 +18,8 @@
                 <label for="vm_id" class="col-sm-3 control-label">{tmpl_var name='vm_id_txt'}</label>
                 <div class="col-sm-9"><select name="vm_id" id="vm_id" class="form-control" disabled="disabled">
                     {tmpl_var name='vm_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='reserved_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/vm/templates/openvz_ostemplate_edit.htm b/interface/web/vm/templates/openvz_ostemplate_edit.htm
index b39fb1aa63d456145ede646583b12eb07ad50e91..b4fa8c62fb76f37482ee3c14fab63b8233068d97 100644
--- a/interface/web/vm/templates/openvz_ostemplate_edit.htm
+++ b/interface/web/vm/templates/openvz_ostemplate_edit.htm
@@ -15,8 +15,8 @@
                 <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                 <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
                     {tmpl_var name='server_id'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='allservers_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/vm/templates/openvz_vm_edit.htm b/interface/web/vm/templates/openvz_vm_edit.htm
index 871094aec4a57e749ff61c90e8cbcfd0539246c8..c4d449e4bc7e0cad1d2389b1e15ad77af94531f6 100644
--- a/interface/web/vm/templates/openvz_vm_edit.htm
+++ b/interface/web/vm/templates/openvz_vm_edit.htm
@@ -11,58 +11,58 @@
                         <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                         <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
                             {tmpl_var name='server_id'}
-                        </select>
-                        </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                        </select></div>
+                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
                     <tmpl_else>
                             <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                             <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control" onChange="loadOptionInto('ip_address','vm/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
                                 {tmpl_var name='server_id'}
-                            </select>
-                    </div></tmpl_if>
+                            </select></div>
+                    </tmpl_if>
                 </div>
                 <div class="form-group">
                     <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_group_id_txt'}</label>
                     <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                         {tmpl_var name='client_group_id'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
             </tmpl_if>
             <tmpl_if name="is_reseller">
                 <div class="form-group">
                     <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_group_id_txt'}</label>
                     <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                         {tmpl_var name='client_group_id'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
             </tmpl_if>
             <tmpl_if name="edit_disabled">
                 <div class="form-group">
                     <label for="ostemplate_id_disabled" class="col-sm-3 control-label">{tmpl_var name='ostemplate_id_txt'}</label>
                     <div class="col-sm-9"><select name="ostemplate_id_disabled" id="ostemplate_id_disabled" class="form-control" disabled="disabled">
                         {tmpl_var name='ostemplate_id'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
                 <input type="hidden" name="ostemplate_id" value="{tmpl_var name='ostemplate_id_value'}">
             <tmpl_else>
                 <div class="form-group">
                     <label for="ostemplate_id" class="col-sm-3 control-label">{tmpl_var name='ostemplate_id_txt'}</label>
                     <div class="col-sm-9"><select name="ostemplate_id" id="ostemplate_id" class="form-control">
                         {tmpl_var name='ostemplate_id'}
-                    </select>
-                </div></div>
+                    </select></div>
+                </div>
             </tmpl_if>
             <div class="form-group">
                 <label for="template_id" class="col-sm-3 control-label">{tmpl_var name='template_id_txt'}</label>
                 <div class="col-sm-9"><select name="template_id" id="template_id" class="form-control">
                     {tmpl_var name='template_id_select'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="ip_address" class="col-sm-3 control-label">{tmpl_var name='ip_address_txt'}</label>
                 <div class="col-sm-9"><select name="ip_address" id="ip_address" class="form-control">
                     {tmpl_var name='ip_address'}
-                </select>
-            </div></div>
+                </select></div>
+            </div>
             <div class="form-group">
                 <label for="hostname" class="col-sm-3 control-label">{tmpl_var name='hostname_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="hostname" id="hostname" value="{tmpl_var name='hostname'}" class="form-control" /></div></div>