diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index 1317bf77ccdeb092717e4d519263b7c5267c3eab..370e57f608cc74e43d6e3c99c7e5a20171598761 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -302,6 +302,30 @@ $form["tabs"]['domains'] = array (
 	)
 );
 
+/* TODO_ BEGIN: Branding
+
+$form["tabs"]['domains'] = array (
+	'title' 	=> "Branding",
+	'width' 	=> 70,
+	'template' 	=> "templates/system_config_branding_edit.htm",
+	'fields' 	=> array (
+	##################################
+	# Begin Datatable fields
+	##################################
+                'allow_themechange' => array (
+                        'datatype'	=> 'VARCHAR',
+                        'formtype'	=> 'CHECKBOX',
+                        'default'	=> 'N',
+                        'value'         => array(0 => 'n',1 => 'y')
+                ),
+	##################################
+	# ENDE Datatable fields
+	##################################
+	)
+);
+
+
+ END: Branding */
 $form["tabs"]['misc'] = array (
 	'title' 	=> "Misc",
 	'width' 	=> 70,
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index 7ff0c06112b026906166de100c6132c3f2981e04..5a9591792533ca4834c3a9ef26b032f920820d46 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -95,6 +95,18 @@
                     {tmpl_var name='enable_ip_wildcard'}
                 </div>
             </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='overtraffic_notify_admin_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='overtraffic_notify_admin'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='overtraffic_notify_client_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='overtraffic_notify_client'}
+                </div>
+            </div>
             <div class="subsectiontoggle"><span></span>{tmpl_var name='ssl_settings_txt'}<em></em></div>
             <div style="display:none;">
                 <div class="ctrlHolder">
diff --git a/interface/web/admin/templates/server_php_list.htm b/interface/web/admin/templates/server_php_list.htm
index f8c67558d21b2bb439ba3da2d8dd422968f279c9..92aa0801c7a138e41fd9e58f6dc2d45442efcc09 100644
--- a/interface/web/admin/templates/server_php_list.htm
+++ b/interface/web/admin/templates/server_php_list.htm
@@ -18,14 +18,14 @@
                 <thead>
                     <tr class="caption">
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-                        <th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
-                        <th class="tbl_col_ip_address" scope="col"><tmpl_var name="name_txt"></th>
+                        <th class="tbl_col_clientname" scope="col"><tmpl_var name="client_id_txt"></th>
+                        <th class="tbl_col_phpname" scope="col"><tmpl_var name="name_txt"></th>
                         <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
                     <tr class="filter">
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
-                        <td class="tbl_col_client_pid"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
-                        <td class="tbl_col_ip_address"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+                        <td class="tbl_col_clientname"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
+                        <td class="tbl_col_phpname"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
                         <td class="tbl_col_buttons">
                             <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/server_php_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
                         </td>
@@ -35,8 +35,8 @@
                     <tmpl_loop name="records">
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                             <td class="tbl_col_server_id"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-                            <td class="tbl_col_client_pid"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
-                            <td class="tbl_col_name"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+                            <td class="tbl_col_clientname"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_phpname"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
                             <td class="tbl_col_buttons">
                                 <a class="button icons16 icoDelete" href="javascript: del_record('admin/server_php_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
                             </td>
diff --git a/interface/web/admin/templates/software_package_list.htm b/interface/web/admin/templates/software_package_list.htm
index 8fc0973310beee7b4b56fb2a1878abc2eaba64a4..d030e5e5c46dc4d8061c7ce9cdc2e073f4175840 100644
--- a/interface/web/admin/templates/software_package_list.htm
+++ b/interface/web/admin/templates/software_package_list.htm
@@ -22,7 +22,7 @@
                         <th class="tbl_col_package_title" scope="col"><tmpl_var name="package_title_txt"></th>
                         <th class="tbl_col_package_description" scope="col"><tmpl_var name="package_description_txt"></th>
                         <th class="tbl_col_package_description" scope="col"><tmpl_var name="package_id_txt"></th>
-						<th class="tbl_col_buttons" scope="col">&nbsp;</th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -32,7 +32,7 @@
                             <td class="tbl_col_package_title">{tmpl_var name="package_title"}</td>
                             <td class="tbl_col_package_description">{tmpl_var name="package_description"}</td>
                             <td class="tbl_col_package_description">ispapp{tmpl_var name="package_id"}</td>
-							<td class="tbl_col_buttons">
+                            <td class="tbl_col_buttons">
                                 <a class="button icons16 icoDelete" href="javascript: del_record('admin/software_package_del.php?software_update_inst_id={tmpl_var name="software_update_inst_id"}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
                             </td>
                         </tr>
diff --git a/interface/web/client/lib/module.conf.php b/interface/web/client/lib/module.conf.php
index 2575ba26691939f82e78a90b3e5ceb201cd1d6b1..233d4f6731c3a2d48ff5868073e1e30d417616e5 100644
--- a/interface/web/client/lib/module.conf.php
+++ b/interface/web/client/lib/module.conf.php
@@ -1,74 +1,68 @@
 <?php
 
-$module["name"] 		= "client";
-$module["title"] 		= "top_menu_client";
+$module["name"] 	= "client";
+$module["title"] 	= "top_menu_client";
 $module["template"] 	= "module.tpl.htm";
 $module["startpage"] 	= "client/client_list.php";
 $module["tab_width"]    = '';
 
-/*
-	Email accounts menu
-*/
 
+$items[] = array(   'title' 	=> "Edit Client",
+                    'target' 	=> 'content',
+                    'link'	=> 'client/client_list.php',
+                    'html_id'   => 'client_list');
 
-
-
-$items[] = array( 'title' 	=> "Edit Client",
-				  'target' 	=> 'content',
-				  'link'	=> 'client/client_list.php',
-				  'html_id' => 'client_list');
-
-$items[] = array( 'title' 	=> "Add Client",
-				  'target' 	=> 'content',
-				  'link'	=> 'client/client_edit.php',
-				  'html_id' => 'client_add');
+$items[] = array(   'title' 	=> "Add Client",
+                    'target' 	=> 'content',
+                    'link'	=> 'client/client_edit.php',
+                    'html_id'   => 'client_add');
 				  
-				  if($_SESSION["s"]["user"]["typ"] == 'admin'){
-	$items[] = array( 'title' 	=> "Edit Client-Templates",
-					  'target' 	=> 'content',
-					  'link'	=> 'client/client_template_list.php',
-					  'html_id' => 'client_template_list');
+if($_SESSION["s"]["user"]["typ"] == 'admin'){
+$items[] = array(   'title' 	=> "Edit Client-Templates",
+                    'target' 	=> 'content',
+                    'link'	=> 'client/client_template_list.php',
+                    'html_id'   => 'client_template_list');
 }
 
-$module["nav"][] = array(	'title'	=> 'Clients',
-							'open' 	=> 1,
-							'items'	=> $items);
+$module["nav"][] = array(   'title'	=> 'Clients',
+                            'open' 	=> 1,
+                            'items'	=> $items);
 
 unset($items);
 
 
 if($_SESSION["s"]["user"]["typ"] == 'admin'){
 
-$items[] = array( 'title' 	=> "Edit Reseller",
-				  'target' 	=> 'content',
-				  'link'	=> 'client/reseller_list.php',
-				  'html_id' => 'reseller_list');
+$items[] = array(   'title' 	=> "Edit Reseller",
+                    'target' 	=> 'content',
+                    'link'	=> 'client/reseller_list.php',
+                    'html_id'   => 'reseller_list');
 
-$items[] = array( 'title' 	=> "Add Reseller",
-				  'target' 	=> 'content',
-				  'link'	=> 'client/reseller_edit.php',
-				  'html_id' => 'reseller_add');
+$items[] = array(   'title' 	=> "Add Reseller",
+                    'target' 	=> 'content',
+                    'link'	=> 'client/reseller_edit.php',
+                    'html_id'   => 'reseller_add');
 
-$module["nav"][] = array(	'title'	=> 'Resellers',
-							'open' 	=> 1,
-							'items'	=> $items);
+$module["nav"][] = array(   'title'	=> 'Resellers',
+                            'open' 	=> 1,
+                            'items'	=> $items);
 
 unset($items);
 }
 
-$items[] = array( 'title' 	=> "Edit Client Circle",
-				  'target' 	=> 'content',
-				  'link'	=> 'client/client_circle_list.php',
-				  'html_id' => 'client_circle_list');
+$items[] = array(   'title' 	=> "Edit Client Circle",
+                    'target' 	=> 'content',
+                    'link'	=> 'client/client_circle_list.php',
+                    'html_id'   => 'client_circle_list');
 
-$items[] = array( 'title' 	=> "Send email",
-				  'target' 	=> 'content',
-				  'link'	=> 'client/client_message.php',
-				  'html_id' => 'reseller_add');
+$items[] = array(   'title' 	=> "Send email",
+                    'target' 	=> 'content',
+                    'link'	=> 'client/client_message.php',
+                    'html_id'   => 'reseller_add');
 
-$module["nav"][] = array(	'title'	=> 'Messaging',
-							'open' 	=> 1,
-							'items'	=> $items);
+$module["nav"][] = array(   'title'	=> 'Messaging',
+                            'open' 	=> 1,
+                            'items'	=> $items);
 
 unset($items);
 
@@ -87,5 +81,18 @@ if ($settings['use_domain_module'] == 'y') {
 
 	unset($items);
 }
-							
+
+if($_SESSION["s"]["user"]["typ"] == 'admin'){
+$items[] = array(   'title' 	=> "Interface Settings",
+                    'target' 	=> 'content',
+                    'link'	=> 'client/reseller_admin_interface.php',
+                    'html_id'   => 'reseller_admin_interface');
+
+
+$module["nav"][] = array(   'title'	=> 'Reseller Panel',
+                            'open' 	=> 1,
+                            'items'	=> $items);
+
+unset($items);
+}
 ?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/de_dns_wizard.lng b/interface/web/dns/lib/lang/de_dns_wizard.lng
index 9bcaae1f4dfd9442ed8df6d5fdb35b8d53366a0a..e8c1715695bdff2b48cb9d38fc2b5c4d951a527d 100644
--- a/interface/web/dns/lib/lang/de_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/de_dns_wizard.lng
@@ -1,4 +1,6 @@
 <?php
+$wb['list_head_txt'] = 'DNS-Zonen Assistent';
+$wb['list_desc_txt'] = 'Erstelle eine DNS-Zone per Assistent';
 $wb['dns_zone_txt'] = 'DNS-Zone';
 $wb['template_id_txt'] = 'Vorlage';
 $wb['server_id_txt'] = 'Server';
diff --git a/interface/web/dns/lib/lang/en_dns_wizard.lng b/interface/web/dns/lib/lang/en_dns_wizard.lng
index d1a4234f6a0f2ab126f9928d27fd5c1e16dc1e39..8f9153d9fd1baf81e7d84eabc3c73371505ae133 100644
--- a/interface/web/dns/lib/lang/en_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/en_dns_wizard.lng
@@ -1,4 +1,6 @@
 <?php
+$wb['list_head_txt'] = 'DNS Zone Wizard';
+$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
 $wb['dns_zone_txt'] = 'DNS Zone';
 $wb['template_id_txt'] = 'Template';
 $wb['server_id_txt'] = 'Server';
diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm
index d1fcc5cc45a818b619ad556b9237730d533d628b..37247f8b96b1aaa1c6b612f4af42ecfb19dc5c26 100644
--- a/interface/web/dns/templates/dns_a_list.htm
+++ b/interface/web/dns/templates/dns_a_list.htm
@@ -1,4 +1,4 @@
-c<div class="pnl_toolsarea">
+<div class="pnl_toolsarea">
     <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
         <div class="buttons topbuttons">
             <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}');"><span>A</span></button>
diff --git a/interface/web/help/templates/faq_manage_questions_list.htm b/interface/web/help/templates/faq_manage_questions_list.htm
index 809ce84a26f598b8ef996339e8fc4f0e456bd3bc..4907b73d7828b8f8d8aff223be69b914953b2ed7 100644
--- a/interface/web/help/templates/faq_manage_questions_list.htm
+++ b/interface/web/help/templates/faq_manage_questions_list.htm
@@ -17,20 +17,20 @@
                 <thead>
                     <tr class="caption">
                         <th class="tbl_col_active" scope="col">{tmpl_var name="faq_question_txt"}</th>
-                        <th class="tbl_col_active" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
-                        <th class="tbl_col_server_id" scope="col">{tmpl_var name="faq_delete_txt"}</th>
-                        <th class="tbl_col_domain" scope="col">{tmpl_var name="faq_edit_txt"}</th>
+                        <th class="tbl_col_section_name" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
+                        <th class="tbl_col_buttons" scope="col">{tmpl_var name="faq_delete_txt"}</th>
+                        <th class="tbl_col_buttons" scope="col">{tmpl_var name="faq_edit_txt"}</th>
                     </tr>
                 </thead>
                 <tmpl_loop name="records">
-                    <tr>
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                         <td>{tmpl_var name='hf_question'}</td>
                         <td>{tmpl_var name='hf_section'}</td>
                         <td class="tbl_col_buttons">
                             <a class="button icons16 icoDelete" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name="faq_delete_txt"}</span></a>
                         </td>
-                        <td>
-                            <a href="#" onclick="loadContent('help/faq_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="faq_edit_txt"}</a>
+                        <td class="tbl_col_buttons">
+                            <a class="button icons16 icoEdit" href="javascript: loadContent('help/faq_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name="faq_edit_txt"}</span></a>
                         </td>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/help/templates/help_faq_sections_list.htm b/interface/web/help/templates/help_faq_sections_list.htm
index 39b2b4000fd5497bb332cad2e14b336105fdaadd..9166f13141205d296cc9b055528565e9da6cd702 100644
--- a/interface/web/help/templates/help_faq_sections_list.htm
+++ b/interface/web/help/templates/help_faq_sections_list.htm
@@ -18,19 +18,19 @@
             <table class="list">
                 <thead>
                     <tr class="caption">
-                        <th class="tbl_col_active" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
-                        <th class="tbl_col_server_id" scope="col">{tmpl_var name="faq_delete_txt"}</th>
-                        <th class="tbl_col_domain" scope="col">{tmpl_var name="faq_edit_txt"}</th>
+                        <th class="tbl_col_section_name" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
+                        <th class="tbl_col_buttons" scope="col">{tmpl_var name="faq_delete_txt"}</th>
+                        <th class="tbl_col_buttons" scope="col">{tmpl_var name="faq_edit_txt"}</th>
                     </tr>
                 </thead>
                 <tmpl_loop name="records">
-                    <tr>
-                        <td><b>{tmpl_var name='hfs_name'}</b></td>
-                        <td>
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <th class="tbl_col_section_name"><b>{tmpl_var name='hfs_name'}</b></td>
+                        <td class="tbl_col_buttons">
                             <a class="button icons16 icoDelete" href="javascript: del_record('help/faq_sections_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name="faq_delete_txt"}</span></a>
                         </td>
-                        <td>
-                            <a href="#" onclick="loadContent('help/faq_sections_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="faq_edit_txt"}</a>
+                        <td class="tbl_col_buttons">
+                            <a class="button icons16 icoEdit" href="javascript: loadContent('help/faq_sections_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name="faq_edit_txt"}</span></a>
                         </td>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/mail/templates/spamfilter_config_list.htm b/interface/web/mail/templates/spamfilter_config_list.htm
index cf46159ae300c529bc685b8b78985cb9b952776a..d2e936924996ce929700ef470af41dab3da69552 100644
--- a/interface/web/mail/templates/spamfilter_config_list.htm
+++ b/interface/web/mail/templates/spamfilter_config_list.htm
@@ -38,7 +38,6 @@
                         </tr>
                     </tmpl_loop>
                 </tbody>
-
                 <tfoot>
                     <tr>
                         <td class="tbl_footer tbl_paging" colspan="2"><tmpl_var name="paging"></td>
diff --git a/interface/web/monitor/templates/show_sys_state.htm b/interface/web/monitor/templates/show_sys_state.htm
index 740141b26998f91426e3559dda7aed00839aadc8..55aeeb28a248d3e003f777a557ce0acdb919f3a9 100644
--- a/interface/web/monitor/templates/show_sys_state.htm
+++ b/interface/web/monitor/templates/show_sys_state.htm
@@ -7,7 +7,7 @@
         <fieldset class="inlineLabels"><legend><tmpl_var name="monTransRefreshsq"></legend>
             <div class="buttons">
                 <div class="ctrlHolder">
-                    <label for="refreshinterval">{tmpl_var name='refreshinterval_txt'}</label>
+                    <label for="refreshinterval">&nbsp;</label>
                     <select name="refreshinterval" id="refreshinterval" class="selectInput withicons" onChange="loadContentRefresh('monitor/show_sys_state.php?state={tmpl_var name="state_type"}')">
                         {tmpl_var name='refresh'}
                     </select>
diff --git a/interface/web/sites/lib/lang/de_aps.lng b/interface/web/sites/lib/lang/de_aps.lng
index ad29227ff2fe74ac69436860e46699c555851ab5..f5684556ec5a97a39f3406e8b7ba25308ab4e69d 100644
--- a/interface/web/sites/lib/lang/de_aps.lng
+++ b/interface/web/sites/lib/lang/de_aps.lng
@@ -26,8 +26,8 @@ $wb['settings_txt'] = 'Einstellungen';
 $wb['install_package_txt'] = 'Dieses Paket installieren';
 $wb['installation_txt'] = 'Installation';
 $wb['install_location_txt'] = 'Installationsort';
-$wb['btn_install'] = 'Installieren';
-$wb['btn_cancel'] = 'Abbrechen';
+$wb['btn_install_txt'] = 'Installieren';
+$wb['btn_cancel_txt'] = 'Abbrechen';
 $wb['acceptance_txt'] = 'Lizenzvereinbarung';
 $wb['acceptance_text_txt'] = 'Ja, ich habe die Lizenzvereinbarung gelesen und akzeptiere sie.';
 $wb['install_language_txt'] = 'Sprache der Oberfläche';
diff --git a/interface/web/sites/lib/lang/en_aps.lng b/interface/web/sites/lib/lang/en_aps.lng
index d0ecb771fb4170f2ad430906f5c00625d10eba27..2ab54024b200f6dec6a6b012f1f84f767e92bb6f 100644
--- a/interface/web/sites/lib/lang/en_aps.lng
+++ b/interface/web/sites/lib/lang/en_aps.lng
@@ -26,8 +26,8 @@ $wb['settings_txt'] = 'Settings';
 $wb['install_package_txt'] = 'Install this package';
 $wb['installation_txt'] = 'Installation';
 $wb['install_location_txt'] = 'Install location';
-$wb['btn_install'] = 'Install';
-$wb['btn_cancel'] = 'Cancel';
+$wb['btn_install_txt'] = 'Install';
+$wb['btn_cancel_txt'] = 'Cancel';
 $wb['acceptance_txt'] = 'Acceptance';
 $wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
 $wb['install_language_txt'] = 'Interface language';
diff --git a/interface/web/sites/templates/aps_install_package.htm b/interface/web/sites/templates/aps_install_package.htm
index 4aba7ed4292f3ff7f888288b112a2865333e14be..4468475ff6e9504b42cd40a7740f127e76205c29 100644
--- a/interface/web/sites/templates/aps_install_package.htm
+++ b/interface/web/sites/templates/aps_install_package.htm
@@ -48,8 +48,8 @@
             
         <input type="hidden" name="install" value="0" />
         <div class="buttonHolder buttons">
-            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_install'}" name="btn_install" onclick="document.pageForm.install.value=1; submitForm('pageForm','sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');"><span>{tmpl_var name='btn_install'}</span></button>
-            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel'}" onclick="loadContent('aps/availablepackages_list.php');"><span>{tmpl_var name='btn_cancel'}</span></button>
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_install_txt'}" name="btn_install" onclick="document.pageForm.install.value=1; submitForm('pageForm','sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');"><span>{tmpl_var name='btn_install'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('aps/availablepackages_list.php');"><span>{tmpl_var name='btn_cancel'}</span></button>
         </div>
     </div>
     
diff --git a/interface/web/sites/templates/aps_instances_list.htm b/interface/web/sites/templates/aps_instances_list.htm
index 46312889dc1f22b6601effe6bf74e15d6bd76a39..11de54fdd65739072f02167baf85f4b9ce467c29 100644
--- a/interface/web/sites/templates/aps_instances_list.htm
+++ b/interface/web/sites/templates/aps_instances_list.htm
@@ -14,7 +14,7 @@
                         </tmpl_if>
                         <th class="tbl_col_installlocation" scope="col">{tmpl_var name='install_location_txt'}</th>
                         <th class="tbl_col_instancestatus" scope="col">{tmpl_var name='status_txt'}</th>
-                        <th class="tbl_col_buttons" scope="col" >&nbsp;</th>
+                        <th class="tbl_col_limit" scope="col" >&nbsp;</th>
                     </tr>
                     <tr class="filter">
                         <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
diff --git a/interface/web/sites/templates/aps_packages_list.htm b/interface/web/sites/templates/aps_packages_list.htm
index bfd8c627f82c995174e18467bfc25d38134b2c92..819bba09938fb59b507fc7a5648e60c4035aadfd 100644
--- a/interface/web/sites/templates/aps_packages_list.htm
+++ b/interface/web/sites/templates/aps_packages_list.htm
@@ -13,7 +13,7 @@
                             <tmpl_if name='is_admin'>
                                 <th class="tbl_col_status" scope="col">{tmpl_var name='status_txt'}</th>
                             </tmpl_if>
-                        <th class="tbl_col_buttons" scope="col" width="60px;">&nbsp;</th>
+                        <th class="tbl_col_limit" scope="col">&nbsp;</th>
                     </tr>
                     <tr class="filter">
                         <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
@@ -34,7 +34,7 @@
                                 <tmpl_if name='is_admin'>
                                     <td class="tbl_col_status"><a href="javascript:loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=change_status&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');"><span id="status_content{tmpl_var name='__ROWNUM__'}">{tmpl_var name='package_status'}</span></a></td>
                                 </tmpl_if>
-                            <td>&nbsp;</td>
+                            <td class="tbl_col_buttons">&nbsp;</td>
                         </tr>
                     </tmpl_loop>
                 </tbody>
diff --git a/interface/web/sites/templates/database_user_admin_list.htm b/interface/web/sites/templates/database_user_admin_list.htm
index 0e33a887d3d21381f32e866e0a5403a3b311893f..93df0b17471ee4abe478768efbd8a8a4bb5f80d4 100644
--- a/interface/web/sites/templates/database_user_admin_list.htm
+++ b/interface/web/sites/templates/database_user_admin_list.htm
@@ -1,4 +1,5 @@
 <h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
 
 <div class="panel panel_list_database_user_admin">
 
@@ -16,12 +17,12 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_database_user" scope="col"><tmpl_var name="database_user_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
-                        <td class="tbl_col_database_user"><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}" /></td>
+                    <tr class="filter">
+                        <td class="tbl_col_database_user"><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}"/></td>
                         <td class="tbl_col_buttons"><button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></td>
                     </tr>
                 </thead>
diff --git a/interface/web/sites/templates/database_user_list.htm b/interface/web/sites/templates/database_user_list.htm
index b3e1efed12198df58dc4c2b891203985d117e53b..f1d80af8956adba21eacafc4ac4a1487a0f909f8 100644
--- a/interface/web/sites/templates/database_user_list.htm
+++ b/interface/web/sites/templates/database_user_list.htm
@@ -17,11 +17,11 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_database_user" scope="col"><tmpl_var name="database_user_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_database_user"><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}"/></td>
                         <td class="tbl_col_buttons"><button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></td>
                     </tr>
diff --git a/interface/web/sites/templates/web_backup_list.htm b/interface/web/sites/templates/web_backup_list.htm
index 51c3c3356645e26301ea006a6ab8916217b819e4..46db0adf946cce4b4ccb6ec015a23ba04c1967d2 100644
--- a/interface/web/sites/templates/web_backup_list.htm
+++ b/interface/web/sites/templates/web_backup_list.htm
@@ -16,7 +16,7 @@
                         <th class="tbl_col_date" scope="col"><tmpl_var name="date_txt"></th>
                         <th class="tbl_col_date" scope="col"><tmpl_var name="backup_type_txt"></th>
                         <th class="tbl_col_filename" scope="col"><tmpl_var name="filename_txt"></th>
-                        <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
                 </thead>
                 <tbody>
diff --git a/interface/web/sites/templates/web_domain_stats.htm b/interface/web/sites/templates/web_domain_stats.htm
index d0f6f16a315d17a6fca891fc774a519fc4db26b6..f497f1bb993fe17aa5c7619fc58c511b3f371056 100644
--- a/interface/web/sites/templates/web_domain_stats.htm
+++ b/interface/web/sites/templates/web_domain_stats.htm
@@ -12,9 +12,14 @@
                 <label for="stats_password">{tmpl_var name='stats_password_txt'}</label>
                 <input name="stats_password" id="stats_password" value="{tmpl_var name='stats_password'}" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" onkeyup="checkPassMatch('stats_password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onclick="generatePassword('stats_password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
             </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
             <div class="ctrlHolder">
                 <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
-                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('stats_password','repeat_password');" />
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" onkeyup="checkPassMatch('stats_password','repeat_password');" />
             </div>
             <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
             <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
diff --git a/interface/web/sites/templates/web_sites_stats_list.htm b/interface/web/sites/templates/web_sites_stats_list.htm
index 0a4da6432541a774f2f591979023bf75f8b2f068..5c40a79523e3fcafc58ccddff498d254f0406cfd 100644
--- a/interface/web/sites/templates/web_sites_stats_list.htm
+++ b/interface/web/sites/templates/web_sites_stats_list.htm
@@ -37,17 +37,6 @@
                         <td class="tbl_col_buttons"></td>
                     </tr>
                 </tmpl_loop>
-				<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                        <td class="tbl_col_domain"><a href="#" onclick="return false;" style="font-weight:bold;">{tmpl_var name="sum_txt"}</a></td>
-                        <td class="tbl_col_this_month"><a href="#" onclick="return false;" style="font-weight:bold;">{tmpl_var name="sum_this_month"} MB</a></td>
-                        <td class="tbl_col_last_month"><a href="#" onclick="return false;" style="font-weight:bold;">{tmpl_var name="sum_last_month"} MB</a></td>
-                        <td class="tbl_col_this_year"><a href="#" onclick="return false;" style="font-weight:bold;">{tmpl_var name="sum_this_year"} MB</a></td>
-                        <td class="tbl_col_last_year"><a href="#" onclick="return false;" style="font-weight:bold;">{tmpl_var name="sum_last_year"} MB</a></td>
-                        <td class="tbl_col_buttons">
-                            <div class="buttons icons16">    
-                            </div>
-                        </td>
-                    </tr>
                 </tbody>
                 <tfoot>
                     <tr>
diff --git a/interface/web/sites/templates/web_vhost_subdomain_advanced.htm b/interface/web/sites/templates/web_vhost_subdomain_advanced.htm
index f61cf500c7dfdb72e298686a33df400795b7f696..d71e30b1bb4ee1973769530d6d5af0527323bd43 100644
--- a/interface/web/sites/templates/web_vhost_subdomain_advanced.htm
+++ b/interface/web/sites/templates/web_vhost_subdomain_advanced.htm
@@ -82,8 +82,8 @@
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
         <div class="buttonHolder buttons">
-            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_subdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
         </div>
     </div>
 
diff --git a/interface/web/sites/templates/web_vhost_subdomain_backup.htm b/interface/web/sites/templates/web_vhost_subdomain_backup.htm
index 3c78fe73de2fcf8bb3e9c83ea5c9cb265855c85d..6c55e50a53dc6daa2cda95007a220d56feaf12fc 100644
--- a/interface/web/sites/templates/web_vhost_subdomain_backup.htm
+++ b/interface/web/sites/templates/web_vhost_subdomain_backup.htm
@@ -24,8 +24,8 @@
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
         <div class="buttonHolder buttons">
-            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_subdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
         </div>
     </div>
 
diff --git a/interface/web/sites/templates/web_vhost_subdomain_redirect.htm b/interface/web/sites/templates/web_vhost_subdomain_redirect.htm
index ddbdc04bbd9926185d3f7e8fa01b7b4ad001e692..ac504f12473f11e955d530c1e071a4d2c11a2be2 100644
--- a/interface/web/sites/templates/web_vhost_subdomain_redirect.htm
+++ b/interface/web/sites/templates/web_vhost_subdomain_redirect.htm
@@ -26,8 +26,8 @@
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
         <div class="buttonHolder buttons">
-            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_subdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
         </div>
     </div>
 
diff --git a/interface/web/sites/templates/web_vhost_subdomain_ssl.htm b/interface/web/sites/templates/web_vhost_subdomain_ssl.htm
index 832d623f616f2bae612092726f25dcbfdc02ec15..e5b13c1d0db33855d199f6faab2ff1d9e1563908 100644
--- a/interface/web/sites/templates/web_vhost_subdomain_ssl.htm
+++ b/interface/web/sites/templates/web_vhost_subdomain_ssl.htm
@@ -60,8 +60,8 @@
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
         <div class="buttonHolder buttons">
-            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_subdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
         </div>
     </div>
 
diff --git a/interface/web/sites/templates/web_vhost_subdomain_stats.htm b/interface/web/sites/templates/web_vhost_subdomain_stats.htm
index d0f6f16a315d17a6fca891fc774a519fc4db26b6..aa1605e434f04c3a89c5f2192e15de3bc4880b3d 100644
--- a/interface/web/sites/templates/web_vhost_subdomain_stats.htm
+++ b/interface/web/sites/templates/web_vhost_subdomain_stats.htm
@@ -29,8 +29,8 @@
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
         <div class="buttonHolder buttons">
-            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_subdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
         </div>
     </div>
 
diff --git a/interface/web/tools/templates/dns_import_tupa.htm b/interface/web/tools/templates/dns_import_tupa.htm
index bf1ed65d2cfb9f7eb383224c88ff475865a628bf..9bd7ba37fc7dfd8e8840e831f72deacc0790cc48 100644
--- a/interface/web/tools/templates/dns_import_tupa.htm
+++ b/interface/web/tools/templates/dns_import_tupa.htm
@@ -1,7 +1,7 @@
-<h2>Import DNS recods from Tupa PowerDNS controlpanel</h2>
+<h2><tmpl_var name="list_head_txt">Import DNS recods from Tupa PowerDNS controlpanel</h2>
 <p><tmpl_var name="list_desc_txt"></p>
 
-<div class="panel panel_language_import">
+<div class="panel panel_tupa_import">
   
     <div class="pnl_formsarea">
         <fieldset class="inlineLabels"><legend>PowerDNS Tupa import</legend>
@@ -28,8 +28,7 @@
                 <div class="multiField">
                     <input id="dbpassword" type="text" value="{tmpl_var name='dbpassword'}" name="dbpassword" />
                 </div>
-            </div>
-                
+            </div>                
             <div class="ctrlHolder">
                 <p class="label">Import DNS Records</p>
                 <div class="multiField">
@@ -48,8 +47,8 @@
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
             
         <div class="buttonHolder buttons">
-            <button class="positive iconstxt icoPositive" type="button" value="Import" onclick="submitForm('pageForm','tools/dns_import_tupa.php');"><span>Start</span></button>
-            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onclick="loadContent('tools/index.php');"><span>Cancel</span></button>
+            <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/dns_import_tupa.php');"><span>Start</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>Cancel</span></button>
         </div>
     </div>
   
diff --git a/interface/web/tools/templates/import_ispconfig.htm b/interface/web/tools/templates/import_ispconfig.htm
index 465c8c519d283c9108a70cf293b261c43ae601fd..f7b97e8e6255873891e7c885402f21e4db92c706 100644
--- a/interface/web/tools/templates/import_ispconfig.htm
+++ b/interface/web/tools/templates/import_ispconfig.htm
@@ -1,4 +1,4 @@
-<h2>{tmpl_var name="head_txt"}</h2>
+<h2><tmpl_var name="head_txt"></h2>
 <p><tmpl_var name="list_desc_txt"></p>
 
 <div class="panel panel_language_import">
@@ -91,13 +91,13 @@
     <input type="hidden" name="connected" value="{tmpl_var name='connected'}">
     <tmpl_if name="connected">
         <div class="buttonHolder buttons">
-            <button class="positive iconstxt icoPositive" type="button" value="Import" onclick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_start_txt"}</span></button>
-            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onclick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+            <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_start_txt"}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
         </div>
     <tmpl_else>
         <div class="buttonHolder buttons">
-            <button class="positive iconstxt icoPositive" type="button" value="Import" onclick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_connect_txt"}</span></button>
-            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onclick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+            <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_connect_txt"}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
         </div>
     </tmpl_if>
   </div>
\ No newline at end of file
diff --git a/interface/web/tools/templates/import_plesk.htm b/interface/web/tools/templates/import_plesk.htm
index 10a73d7a689edde36796458a7f2d7ed8b563d7e6..363d72860c06e8d2f59b858a4c88f39989ce6c88 100644
--- a/interface/web/tools/templates/import_plesk.htm
+++ b/interface/web/tools/templates/import_plesk.htm
@@ -1,4 +1,4 @@
-<h2>Import plesk panel data</h2>
+<h2><tmpl_var name="list_head_txt">Import plesk panel data</h2>
 <p><tmpl_var name="list_desc_txt"></p>
 
 <div class="panel panel_language_import">
@@ -66,8 +66,8 @@
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
             
         <div class="buttonHolder buttons">
-            <button class="positive iconstxt icoPositive" type="button" value="Import" onclick="submitForm('pageForm','tools/import_plesk.php');"><span>Start</span></button>
-            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onclick="loadContent('tools/index.php');"><span>Cancel</span></button>
+            <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_plesk.php');"><span>Start</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>Cancel</span></button>
         </div>
     </div>
   
diff --git a/interface/web/tools/templates/interface_settings.htm b/interface/web/tools/templates/interface_settings.htm
index 978355f0fc306fcb47bf666c80ee22156af7f981..a9057c874d63e76c463ca1179ba3b659608b7f4c 100644
--- a/interface/web/tools/templates/interface_settings.htm
+++ b/interface/web/tools/templates/interface_settings.htm
@@ -12,6 +12,7 @@
                     {tmpl_var name='app_theme'}
                 </select>
             </div>
+            <!-- TODO: Limit to activated modules -->
             <div class="ctrlHolder">
                 <label for="startmodule">{tmpl_var name='startmodule_txt'}</label>
                 <select name="startmodule" id="startmodule" class="selectInput formLengthHalf">
diff --git a/interface/web/tools/templates/resync.htm b/interface/web/tools/templates/resync.htm
index 62b3a1d01aca1a2d568b5fa5fc1aab3262ad057f..f16466053c39203afa696a40eb4b099e55a2f297 100644
--- a/interface/web/tools/templates/resync.htm
+++ b/interface/web/tools/templates/resync.htm
@@ -1,4 +1,4 @@
-<h2>{tmpl_var name="head_txt"}</h2>
+<h2><tmpl_var name="head_txt"></h2>
 <p><tmpl_var name="list_desc_txt"></p>
 
 <div class="panel panel_language_import">
@@ -59,8 +59,8 @@
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
         <div class="buttonHolder buttons">
-            <button class="positive iconstxt icoPositive" type="button" value="Import" onclick="submitForm('pageForm','tools/resync.php');"><span>{tmpl_var name="btn_start_txt"}</span></button>
-            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onclick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+            <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/resync.php');"><span>{tmpl_var name="btn_start_txt"}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
         </div>
     </div>