From: Sven Schöling <s.schoeling@linet-services.de>
Date: Fri, 21 Nov 2014 17:17:16 +0000 (+0100)
Subject: Layout: title Ausgabe normalisieren
X-Git-Tag: release-3.2.0beta~237
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=3aa5cee2f12c1dff757539b60196bf5e1be0a5d6;p=kivitendo-erp.git

Layout: title Ausgabe normalisieren

...mit dem Ziel das später ins Layout zu migrieren.

- In allen Templates den Tital auch wirklich als erstes ins DOM
  verschoben
- unterschiedliche Verwendung der folgenden Muster vereinheitlicht:
  <h1>...</h1>
  <div class='listtop'>...</div>
  <p><div class='listtop'>...</div></p>a
  <tr><th class='listtop' colspan=..>....</th></tr>
- Verwendung der gleichen Klasse im Footer in <h2> geändert
- Puffer <tr height=5> entfert

Das ergibt insgesamt folgende Effekte:

- Einheitliches Rendern der Überschrift
- Einheitlicher Abstand zum Content
- flash/message werden immer unter der Überschrift angezeigt
---

diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl
index f56da182f..67b1c4871 100644
--- a/bin/mozilla/arap.pl
+++ b/bin/mozilla/arap.pl
@@ -169,13 +169,11 @@ sub select_name {
   my $title = $locale->text('Select from one of the names below');
 
   print qq|
+    <h1>$title</h1>
+
 <form method=post action=$form->{script}>
 
 <table width=100%>
-  <tr>
-    <th class=listtop>$title</th>
-  </tr>
-  <tr space=5></tr>
   <tr>
     <td>
       <table width=100%>
diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index d6ecf671f..a51555372 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -288,12 +288,9 @@ sub update_prices {
 #  $form->header;
 #
 #  print qq|
+#  <h1>| . $locale->text('choice part') . qq|</h1>
 #  <form method=post action=ic.pl>
 #    <table width=100%>
-#     <tr>
-#      <th class=listtop colspan=6>| . $locale->text('choice part') . qq|</th>
-#     </tr>
-#        <tr height="5"></tr>
 #        <tr class=listheading>
 #          <th>&nbsp;</th>
 #          <th class=listheading>| . $locale->text('Part Number') . qq|</th>
@@ -722,11 +719,9 @@ sub addtop100 {
   my $colspan = $#column_index + 1;
 
   print qq|
+    <h1>$form->{title}</h1>
+
 <table width=100%>
-  <tr>
-    <th class=listtop colspan=$colspan>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
 
   <tr><td colspan=$colspan>$option</td></tr>
 
diff --git a/templates/webpages/acctranscorrections/analyze_overview.html b/templates/webpages/acctranscorrections/analyze_overview.html
index b059a3a8e..f85ba4ff7 100644
--- a/templates/webpages/acctranscorrections/analyze_overview.html
+++ b/templates/webpages/acctranscorrections/analyze_overview.html
@@ -1,7 +1,6 @@
 [%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
-
- <p><div class="listtop">[% title %]</div></p>
+<h1>[% title %]</h1>
 
  <p>[% 'kivitendo has found one or more problems in the general ledger.' | $T8 %]</p>
 
diff --git a/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys.html b/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys.html
index c82876a1e..8671faacc 100644
--- a/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys.html
+++ b/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys.html
@@ -1,7 +1,6 @@
 [%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
-
- <p><div class="listtop">[% title %]</div></p>
+<h1>[% title %]</h1>
 
  <p>
   [% 'There is at least one transaction for which the user has chosen a logically wrong taxkey.' | $T8 %]
diff --git a/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys.html b/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys.html
index 5971d5c27..458193553 100644
--- a/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys.html
+++ b/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys.html
@@ -1,7 +1,6 @@
 [%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
-
- <p><div class="listtop">[% title %]</div></p>
+<h1>[% title %]</h1>
 
  <p>
   [% 'There is at least one sales or purchase invoice for which kivitendo recorded an inventory transaction with taxkeys even though no tax was recorded.' | $T8 %]
diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxes.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxes.html
index 4d47e605b..0d81bb608 100644
--- a/templates/webpages/acctranscorrections/assistant_for_wrong_taxes.html
+++ b/templates/webpages/acctranscorrections/assistant_for_wrong_taxes.html
@@ -1,7 +1,6 @@
 [%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
-
- <p><div class="listtop">[% title %]</div></p>
+<h1>[% title %]</h1>
 
  <p>
   [% 'The following transaction contains wrong taxes:' | $T8 %]
diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html
index 4d335db54..3ed544f11 100644
--- a/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html
+++ b/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html
@@ -1,7 +1,6 @@
 [%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
-
- <p><div class="listtop">[% title %]</div></p>
+<h1>[% title %]</h1>
 
  <p>
   [% 'The following transaction contains wrong taxkeys:' | $T8 %]
diff --git a/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys.html b/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys.html
index e6252dc7d..e95121596 100644
--- a/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys.html
+++ b/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys.html
@@ -1,7 +1,6 @@
 [%- USE T8 %]
 [% USE HTML %]
-
- <p><div class="listtop">[% title %]</div></p>
+ <h1>[% title %]</h1>
 
  <p>
   [% 'The wrong taxkeys for AP and AR transactions have been fixed.' | $T8 %]
diff --git a/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys.html b/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys.html
index 4fab42b0c..0c13cfbd9 100644
--- a/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys.html
+++ b/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys.html
@@ -1,7 +1,6 @@
 [%- USE T8 %]
 [% USE HTML %]
-
- <p><div class="listtop">[% title %]</div></p>
+ <h1>[% title %]</h1>
 
  <p>
   [% 'The wrong taxkeys for inventory transactions for sales and purchase invoices have been fixed.' | $T8 %]
diff --git a/templates/webpages/acctranscorrections/fix_wrong_taxkeys.html b/templates/webpages/acctranscorrections/fix_wrong_taxkeys.html
index 6fde4eff1..749b4057f 100644
--- a/templates/webpages/acctranscorrections/fix_wrong_taxkeys.html
+++ b/templates/webpages/acctranscorrections/fix_wrong_taxkeys.html
@@ -1,7 +1,6 @@
 [%- USE T8 %]
 [% USE HTML %]
-
- <p><div class="listtop">[% title %]</div></p>
+ <h1>[% title %]</h1>
 
  <p>
   [% 'The wrong taxkeys have been fixed.' | $T8 %]
diff --git a/templates/webpages/am/config.html b/templates/webpages/am/config.html
index 257f6a7ac..13b060a16 100644
--- a/templates/webpages/am/config.html
+++ b/templates/webpages/am/config.html
@@ -1,7 +1,7 @@
 [%- USE T8 %]
 [%- USE LxERP %]
 [%- USE HTML %][%- USE L %]
- <div class="listtop">[% title %]</div>
+<h1>[% title %]</h1>
 
  <form method="post" action="am.pl" name="Form">
   <input type="hidden" name="type" value="preferences">
diff --git a/templates/webpages/am/confirm_delete_warehouse.html b/templates/webpages/am/confirm_delete_warehouse.html
index 28dd70d27..d26b75dbb 100644
--- a/templates/webpages/am/confirm_delete_warehouse.html
+++ b/templates/webpages/am/confirm_delete_warehouse.html
@@ -1,7 +1,6 @@
 [%- USE T8 %]
 [%- USE HTML %]
-
- <div class="listtop">[% title %]</div>
+ <h1>[% title %]</h1>
 
  <p>[% 'Do you really want to delete this warehouse?' | $T8 %]</p>
 
diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html
index 1e5b03ce9..95cd8c09d 100644
--- a/templates/webpages/am/edit_accounts.html
+++ b/templates/webpages/am/edit_accounts.html
@@ -1,6 +1,9 @@
 [%- USE T8 %]
 [%- USE L %]
-[% USE HTML %]<script type="text/javascript" src="js/FormManager.js" >
+[% USE HTML %]
+<h1>[% title %]</h1>
+
+<script type="text/javascript" src="js/FormManager.js" >
 /****************************************************
 * Form Dependency Manager- By Twey- http://www.twey.co.uk
 * Visit Dynamic Drive for this script and more: http://www.dynamicdrive.com
@@ -25,12 +28,6 @@ $(function() {
 <input type="hidden" name="fxgain_accno_id"    value="[% HTML.escape(fxgain_accno_id) %]">
 <input type="hidden" name="fxloss_accno_id"    value="[% HTML.escape(fxloss_accno_id) %]">
 
-<table border="0" width="100%">
-  <tr>
-    <th class="listtop">[% title %]</th>
-  </tr>
-</table>
-
 <fieldset>
   <legend>
     [% 'Main Preferences' | $T8 %]
diff --git a/templates/webpages/am/edit_price_factor.html b/templates/webpages/am/edit_price_factor.html
index 99ab43ef1..0e484dfc5 100644
--- a/templates/webpages/am/edit_price_factor.html
+++ b/templates/webpages/am/edit_price_factor.html
@@ -1,9 +1,9 @@
 [%- USE T8 %]
 [%- USE HTML %]
+<h1>[% title %]</h1>
 
- [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
 
- <div class="listtop">[% title %]</div>
+ [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
 
  <form method="post" action="am.pl">
 
diff --git a/templates/webpages/am/edit_tax.html b/templates/webpages/am/edit_tax.html
index cb86eb2aa..88c7fdc57 100644
--- a/templates/webpages/am/edit_tax.html
+++ b/templates/webpages/am/edit_tax.html
@@ -2,12 +2,12 @@
 [%- USE HTML %]
 [%- USE L %]
 [%- USE LxERP %]
+<h1>[% 'Tax-O-Matic' | $T8 %] [% title %]</h1>
+
  <form method="post" action="am.pl">
   <input type="hidden" name="id" value="[% HTML.escape(id) %]">
   <input type="hidden" name="type" value="tax">
 
-  <div class="listtop">[% 'Tax-O-Matic' | $T8 %] [% title %]</div>
-
   <table width="100%">
    <tr>
     <td>[% 'tax_taxkey' | $T8 %]</td>
diff --git a/templates/webpages/am/edit_templates.html b/templates/webpages/am/edit_templates.html
index 9d7420c13..86bf82899 100644
--- a/templates/webpages/am/edit_templates.html
+++ b/templates/webpages/am/edit_templates.html
@@ -46,11 +46,9 @@
 
 
   [% IF SHOW_CONTENT %]
-   <p>
-    <div class="listtop">
+    <h2>
      [% IF CAN_EDIT %][% 'Edit file' | $T8 %][% ELSE %][% 'Display file' | $T8 %][% END %] [% HTML.escape(display_filename) %]
-    </div>
-   </p>
+    </h2>
 
    [% IF CAN_EDIT %]
     <p><textarea name="content" id="edit_content" cols="100" rows="25"[% IF edit %] class="initial_focus"[% END %]>[% HTML.escape(content) %]</textarea></p>
diff --git a/templates/webpages/am/edit_units.html b/templates/webpages/am/edit_units.html
index db3ae6558..1879d56b9 100644
--- a/templates/webpages/am/edit_units.html
+++ b/templates/webpages/am/edit_units.html
@@ -1,6 +1,6 @@
 [%- USE T8 %][%- USE LxERP %][% USE L %]
 [% USE HTML %]
-
+<h1>[% title %]</h1>
 
  [% IF saved_message %]
   <p>[% saved_message %]</p>
@@ -12,13 +12,6 @@
 
  <input type="hidden" name="type" value="unit">
 
- <table width="100%">
-  <tr>
-   <th class="listtop" colspan="2">[% title %]</th>
-  </tr>
-  <tr height="5"></tr>
- </table>
-
  <p>
   [% LxERP.t8('All units have either no or exactly one base unit of which they are multiples.') %]
   [% LxERP.t8('If you select a base unit then you also have to enter a factor.') %]
@@ -28,9 +21,7 @@
 
  <hr>
 
- <table width="100%">
-  <tr><th class="listtop">[% 'Add unit' | $T8 %]</th></tr>
- </table>
+ <h2>[% 'Add unit' | $T8 %]</h2>
 
  <table>
   <tr>
@@ -64,9 +55,7 @@
 
  <hr>
 
- <table width="100%">
-  <tr><th class="listtop">[% 'Edit units' | $T8 %]</th></tr>
- </table>
+ <h2>[% 'Edit units' | $T8 %]</h2>
 
  <p>
   [% 'Units that have already been used (e.g. for parts and services or in invoices or warehouse transactions) cannot be changed.' | $T8 %]
diff --git a/templates/webpages/am/edit_warehouse.html b/templates/webpages/am/edit_warehouse.html
index 9da65b81c..92573082d 100644
--- a/templates/webpages/am/edit_warehouse.html
+++ b/templates/webpages/am/edit_warehouse.html
@@ -1,5 +1,7 @@
 [%- USE T8 %]
 [%- USE HTML %]
+<h1>[% IF id %][% 'Edit Warehouse' | $T8 %][% ELSE %][% 'Add Warehouse' | $T8 %][% END %]</h1>
+
  [% IF saved_message %]
   <p>[% saved_message %]</p>
  [% END %]
@@ -11,8 +13,6 @@
   <input type="hidden" name="type" value="warehouse">
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
 
-  <div class="listtop">[% IF id %][% 'Edit Warehouse' | $T8 %][% ELSE %][% 'Add Warehouse' | $T8 %][% END %]</div>
-
   <table border="0">
    <tr>
     <td align="right">[% 'Description' | $T8 %]</td>
@@ -51,7 +51,7 @@
 
  <hr height="3">
 
- <div class="listtop">[% 'Edit Bins' | $T8 %]</div>
+ <h2>[% 'Edit Bins' | $T8 %]</h2>
 
  [% UNLESS BINS.size %]
  <p>[% 'No bins have been added to this warehouse yet.' | $T8 %]</p>
diff --git a/templates/webpages/am/language_header.html b/templates/webpages/am/language_header.html
index 205627e92..82124c0bd 100644
--- a/templates/webpages/am/language_header.html
+++ b/templates/webpages/am/language_header.html
@@ -2,6 +2,7 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE T8 %]
+<h1>[% title | html %]</h1>
 
 <form method=post action=am.pl>
 
@@ -9,10 +10,6 @@
 <input type=hidden name=type value=language>
 
 <table width=100%>
-  <tr>
-    <th class=listtop colspan=2>[% title | html %]</th>
-  </tr>
-  <tr height="5"></tr>
   <tr>
     <th align=right>[% 'Language' | $T8 %]</th>
     <td><input name=description size=30 value="[% description | html %]"></td>
diff --git a/templates/webpages/am/language_list.html b/templates/webpages/am/language_list.html
index 30f80802e..9d71ddaa9 100644
--- a/templates/webpages/am/language_list.html
+++ b/templates/webpages/am/language_list.html
@@ -2,13 +2,9 @@
 [%- USE L %]
 [%- USE LxERP %]
 [%- USE T8 %]
-
 <h1>[% title | html %]</h1>
 
 <table width=100%>
-  <tr>
-  </tr>
-  <tr height="5"></tr>
   <tr>
     <td>
       <table width=100%>
diff --git a/templates/webpages/am/lead_header.html b/templates/webpages/am/lead_header.html
index 1a0b03324..f29b0ec5e 100644
--- a/templates/webpages/am/lead_header.html
+++ b/templates/webpages/am/lead_header.html
@@ -1,5 +1,6 @@
 [%- USE HTML %]
 [%- USE T8 %]
+<h1>[% title | html %]</h1>
 
 <form method=post action=am.pl>
 
@@ -7,10 +8,6 @@
 <input type=hidden name=type value=lead>
 
 <table width=100%>
-  <tr>
-    <th class=listtop colspan=2>[% title | html %]</th>
-  </tr>
-  <tr height="5"></tr>
   <tr>
     <th align=right>[% 'Description' | $T8 %]</th>
     <td><input name=description size=50 value="[% lead | html %]"></td>
diff --git a/templates/webpages/am/lead_list.html b/templates/webpages/am/lead_list.html
index 1e756bfc8..1bdac5a29 100644
--- a/templates/webpages/am/lead_list.html
+++ b/templates/webpages/am/lead_list.html
@@ -2,12 +2,9 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
+<h1>[% title | html %]</h1>
 
 <table width=100%>
-  <tr>
-    <th class=listtop>[% title | html %]</th>
-  </tr>
-  <tr height="5"></tr>
   <tr class=listheading>
     <th class=listheading width=100%>[% 'Description' | $T8 %]</th>
   </tr>
diff --git a/templates/webpages/am/list_price_factors.html b/templates/webpages/am/list_price_factors.html
index 4e91ca3be..bc2d0f58a 100644
--- a/templates/webpages/am/list_price_factors.html
+++ b/templates/webpages/am/list_price_factors.html
@@ -1,9 +1,9 @@
 [%- USE T8 %][% USE L %][% USE LxERP %]
 [% USE HTML %]
+<h1>[% title %]</h1>
 
  [% IF MESSAGE %]<p>[% MESSAGE %]</p>[% END %]
 
- <div class="listtop">[% title %]</div>
 
  <p>
   <table width="100%" id="price_factor_list">
diff --git a/templates/webpages/am/list_tax.html b/templates/webpages/am/list_tax.html
index 0ea65af7e..4dcfe041b 100644
--- a/templates/webpages/am/list_tax.html
+++ b/templates/webpages/am/list_tax.html
@@ -1,7 +1,6 @@
 [%- USE T8 %]
 [%- USE HTML %]
-
- <div class="listtop">[% title %]</div>
+ <h1>[% title %]</h1>
 
  <table>
   <tr>
diff --git a/templates/webpages/am/list_warehouses.html b/templates/webpages/am/list_warehouses.html
index dde162cbf..d6735d2d2 100644
--- a/templates/webpages/am/list_warehouses.html
+++ b/templates/webpages/am/list_warehouses.html
@@ -1,10 +1,9 @@
 [%- USE T8 %][% USE LxERP %][% USE L %]
 [% USE HTML %]
+<h1>[% title %]</h1>
 
  [% IF saved_message %]<p>[% saved_message %]</p>[% END %]
 
- <div class="listtop">[% title %]</div>
-
  <p>
   <table width="100%" id="warehouse_list">
    <tr class="listheading">
diff --git a/templates/webpages/ap/search.html b/templates/webpages/ap/search.html
index ff763c046..86aba06ed 100644
--- a/templates/webpages/ap/search.html
+++ b/templates/webpages/ap/search.html
@@ -1,11 +1,10 @@
 [%- USE T8 %]
 [%- USE L %]
+<h1>[% title %]</h1>
 
  <form method=post name="search" action=[% script %]>
 
   <table width=100%>
-  <tr><th class=listtop>[% title %]</th></tr>
-  <tr height="5"></tr>
   <tr>
    <td>
     <table>
diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html
index 71d2b693f..37fbdf04e 100644
--- a/templates/webpages/ar/search.html
+++ b/templates/webpages/ar/search.html
@@ -1,11 +1,10 @@
 [%- USE T8 %]
 [%- USE L %]
+<h1>[% title %]</h1>
 
  <form method=post name="search" action=[% script %]>
 
   <table width=100% border="0">
-  <tr><th class=listtop>[% title %]</th></tr>
-  <tr height="5"></tr>
   <tr>
    <td>
     <table>
diff --git a/templates/webpages/bankaccounts/bank_account_display_form.html b/templates/webpages/bankaccounts/bank_account_display_form.html
index 5b3aeb942..dbc45966f 100644
--- a/templates/webpages/bankaccounts/bank_account_display_form.html
+++ b/templates/webpages/bankaccounts/bank_account_display_form.html
@@ -1,12 +1,11 @@
 [%- USE T8 %]
 [% USE HTML %]
+<h1>[% title %]</h1>
 
 [%- IF params.error %]
  <p><div class="message_error">[% params.error %]</div></p>
 [%- END %]
 
- <p><div class="listtop">[% title %]</div></p>
-
  <form method="post" action="bankaccounts.pl">
 
   <p>
diff --git a/templates/webpages/business/form.html b/templates/webpages/business/form.html
index 590b1d3e7..6fa326b82 100644
--- a/templates/webpages/business/form.html
+++ b/templates/webpages/business/form.html
@@ -1,7 +1,7 @@
 [% USE HTML %][% USE L %][% USE LxERP %]
+<h1>[% FORM.title %]</h1>
 
  <form method="post" action="controller.pl">
-  <div class="listtop">[% FORM.title %]</div>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/business/list.html b/templates/webpages/business/list.html
index c3f3a99f9..f1e5c55f7 100644
--- a/templates/webpages/business/list.html
+++ b/templates/webpages/business/list.html
@@ -1,6 +1,5 @@
 [% USE HTML %][% USE L %][% USE LxERP %]
-
- <div class="listtop">[% FORM.title %]</div>
+<h1>[% FORM.title %]</h1>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/ca/list.html b/templates/webpages/ca/list.html
index 1bd5ff666..964790c5b 100644
--- a/templates/webpages/ca/list.html
+++ b/templates/webpages/ca/list.html
@@ -2,6 +2,8 @@
 [% USE T8 %]
 [% USE HTML %]
 [% USE LxERP %]
+<h1>[% title | html %]</h1>
+
 <form method=post action="[% script %]">
 
 [% L.hidden_tag('accno', accno) %]
@@ -9,11 +11,6 @@
 [% L.hidden_tag('sort', 'transdate') %]
 [% L.hidden_tag('accounttype', accounttype) %]
 
-<table border=0 width=100%>
-  <tr>
-    <th class=listtop>[% title | html %]</th>
-  </tr>
-</table>
 <table>
         <tr>
           <th align=left>[% L.radio_button_tag('reporttype', value='custom', label=LxERP.t8('Customized Report')) %]</th>
diff --git a/templates/webpages/common/show_history.html b/templates/webpages/common/show_history.html
index 1b9b7e127..2368be338 100644
--- a/templates/webpages/common/show_history.html
+++ b/templates/webpages/common/show_history.html
@@ -18,8 +18,8 @@
 [% END %]
 
 <table>
-  <tr>
-    <th class="listtop">
+  <tr class='listheading'>
+    <th>
       <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
         <tr>
           <td align="center" valign="middle">
@@ -31,7 +31,7 @@
         </tr>
       </table>
     </th>
-    <th class=listtop>
+    <th>
       <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
         <tr>
           <td align="center" valign="middle">
@@ -43,7 +43,7 @@
         </tr>
       </table>
     </th>
-    <th class=listtop>
+    <th>
       <table>
         <tr>
           <td>
@@ -52,7 +52,7 @@
         </tr>
       </table>
     </th>
-    <th class=listtop>
+    <th>
       <table>
         <tr>
           <td>
@@ -61,7 +61,7 @@
         </tr>
       </table>
     </th>
-    <th class=listtop>
+    <th>
       <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
         <tr>
           <td align="center" valign="middle">
@@ -73,7 +73,7 @@
         </tr>
       </table>
     </th>
-    <th class=listtop>
+    <th>
       <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" border="0">
         <tr>
           <td align="center" valign="middle">
diff --git a/templates/webpages/common/show_vc_details.html b/templates/webpages/common/show_vc_details.html
index 053c22954..b1f502f7f 100644
--- a/templates/webpages/common/show_vc_details.html
+++ b/templates/webpages/common/show_vc_details.html
@@ -1,5 +1,6 @@
 [%- USE T8 %]
 [% USE HTML %]
+<h1>[% IF is_customer %][% 'Customer details' | $T8 %][% ELSE %][% 'Vendor details' | $T8 %][% END %] &quot;[% HTML.escape(name) %]&quot;</h1>
 
 [% BLOCK jump_block %]
 [%- IF SHIPTO.size || CONTACTS.size %]
@@ -25,11 +26,6 @@
 [%- END %]
 [% END %]
 
-
- <div width="100%" class="listtop">
-  [% IF is_customer %][% 'Customer details' | $T8 %][% ELSE %][% 'Vendor details' | $T8 %][% END %] &quot;[% HTML.escape(name) %]&quot;
- </div>
-
  [%- INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO %]
 
  <a name="billing"><h1>[% 'Billing Address' | $T8 %]</h1></a>
diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html
index 24af07e5b..8702de954 100644
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -2,8 +2,7 @@
 [%- USE LxERP %]
 [%- USE L %]
 [%- USE T8 %]
-
- <div class="listtop">[% FORM.title %]</div>
+ <h1>[% FORM.title %]</h1>
 
  [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/ct/search.html b/templates/webpages/ct/search.html
index 2d237264a..57b970cbe 100644
--- a/templates/webpages/ct/search.html
+++ b/templates/webpages/ct/search.html
@@ -1,12 +1,12 @@
 [%- USE T8 %]
 [%- USE L %]
 [%- USE HTML %]
+<h1>[% title %]</h1>
+
  <form method="post" action="ct.pl" name="Form">
 
   <input type="hidden" name="db" value="[% HTML.escape(db) %]">
 
-  <div class="listtop">[% title %]</div>
-
   <table>
    <tr>
     <th align="right" nowrap>[% IF IS_CUSTOMER %][% 'Customer Number' | $T8 %][% ELSE %][% 'Vendor Number' | $T8 %][% END %]</th>
diff --git a/templates/webpages/ct/search_contact.html b/templates/webpages/ct/search_contact.html
index 7d3295d50..de9ba8b07 100644
--- a/templates/webpages/ct/search_contact.html
+++ b/templates/webpages/ct/search_contact.html
@@ -2,9 +2,9 @@
 [%- USE T8 %]
 [%- USE L %]
 [%- USE LxERP %]
- <form method="post" action="ct.pl" name="Form">
+<h1>[% 'Contacts' | $T8 %]</h1>
 
-  <div class="listtop">[% 'Contacts' | $T8 %]</div>
+ <form method="post" action="ct.pl" name="Form">
 
   <table>
    <tr>
diff --git a/templates/webpages/customer_vendor/form.html b/templates/webpages/customer_vendor/form.html
index e56b3e584..d8498c6d0 100644
--- a/templates/webpages/customer_vendor/form.html
+++ b/templates/webpages/customer_vendor/form.html
@@ -1,13 +1,13 @@
 [%- USE T8 %]
 [%- USE LxERP %]
 [%- USE L %]
+<h1>[% FORM.title %]</h1>
 
 [% L.hidden_tag('_cti_enabled', !!LXCONFIG.cti.dial_command) %]
 
 [% cv_cvars = SELF.cv.cvars_by_config %]
 
 <form method="post" action="controller.pl">
-  <div class="listtop">[% FORM.title %]</div>
 
   [% L.hidden_tag('db', FORM.db) %]
   [% L.hidden_tag('callback', FORM.callback) %]
diff --git a/templates/webpages/customer_vendor/tabs/vcnotes.html b/templates/webpages/customer_vendor/tabs/vcnotes.html
index 403b0ffc1..cf4eeb555 100644
--- a/templates/webpages/customer_vendor/tabs/vcnotes.html
+++ b/templates/webpages/customer_vendor/tabs/vcnotes.html
@@ -59,14 +59,13 @@
     </p>
   [% END %]
 
-
-  <div class="listtop">
+  <h2>
     [% IF ( SELF.note.id ) %]
       [% 'Edit note' | $T8 %]
     [% ELSE %]
       [% 'Add note' | $T8 %]
     [% END %]
-  </div>
+  </h2>
 
   [% L.hidden_tag('note.id', SELF.note.id) %]
 
diff --git a/templates/webpages/datev/export.html b/templates/webpages/datev/export.html
index 5b79f9728..6381c45bf 100644
--- a/templates/webpages/datev/export.html
+++ b/templates/webpages/datev/export.html
@@ -1,12 +1,9 @@
 [%- USE T8 %]
+<h1>[% 'DATEX - Export Assistent' | $T8 %]</h1>
 
 <form method=post action='[% script %]'>
 
-
 <table width=100%>
-  <tr>
-    <th class=listtop>[% 'DATEX - Export Assistent' | $T8 %]</th>
-  </tr>
   <tr>
     <th align=left>[% 'DATEV Angaben' | $T8 %]</th>
   </tr>
diff --git a/templates/webpages/datev/export3.html b/templates/webpages/datev/export3.html
index 9c69bf1d9..7ea194328 100644
--- a/templates/webpages/datev/export3.html
+++ b/templates/webpages/datev/export3.html
@@ -1,6 +1,5 @@
 [%- USE T8 %]
 [%- USE HTML %]
-<html>
   Export in Bearbeitung<br>
 
   <br>
diff --git a/templates/webpages/datev/export_bewegungsdaten.html b/templates/webpages/datev/export_bewegungsdaten.html
index b1ffef87c..2593bb447 100644
--- a/templates/webpages/datev/export_bewegungsdaten.html
+++ b/templates/webpages/datev/export_bewegungsdaten.html
@@ -1,13 +1,10 @@
 [%- USE T8 %]
 [%- USE L %]
+<h1>[% 'DATEX - Export Assistent' | $T8 %]</h1>
 
 <form method=post action="[% script %]">
 
-
 <table width=100%>
-  <tr>
-    <th class=listtop>[% 'DATEX - Export Assistent' | $T8 %]</th>
-  </tr>
   <tr>
     <th align=left>[% 'Zeitraum' | $T8 %]</th>
   </tr>
diff --git a/templates/webpages/datev/export_stammdaten.html b/templates/webpages/datev/export_stammdaten.html
index d6ea25035..593060b53 100644
--- a/templates/webpages/datev/export_stammdaten.html
+++ b/templates/webpages/datev/export_stammdaten.html
@@ -1,10 +1,8 @@
 [%- USE T8 %]
+<h1>[% 'DATEX - Export Assistent' | $T8 %]</h1>
 
 <form method=post action="[% script %]">
 <table width=100%>
-  <tr>
-    <th class=listtop>[% 'DATEX - Export Assistent' | $T8 %]</th>
-  </tr>
   <tr>
     <th align=left>[% 'Konten' | $T8 %]</th>
   </tr>
diff --git a/templates/webpages/dbupgrade/SKR04_3804_already_exists.html b/templates/webpages/dbupgrade/SKR04_3804_already_exists.html
index 464e360a5..2b3370864 100644
--- a/templates/webpages/dbupgrade/SKR04_3804_already_exists.html
+++ b/templates/webpages/dbupgrade/SKR04_3804_already_exists.html
@@ -1,5 +1,6 @@
 [%- USE T8 %]
-[% USE HTML %]<div class="listtop">[% 'Update SKR04: new tax account 3804 (19%)' | $T8 %]</div>
+[% USE HTML %]
+<h1>[% 'Update SKR04: new tax account 3804 (19%)' | $T8 %]</h1>
 
 <form name="Form" method="post" action="login.pl">
 <input type="hidden" name="action" value="login">
diff --git a/templates/webpages/dbupgrade/SKR04_3804_update.html b/templates/webpages/dbupgrade/SKR04_3804_update.html
index c1bcd4e3b..4d949ec52 100644
--- a/templates/webpages/dbupgrade/SKR04_3804_update.html
+++ b/templates/webpages/dbupgrade/SKR04_3804_update.html
@@ -1,5 +1,6 @@
 [%- USE T8 %]
-[% USE HTML %]<div class="listtop">[% 'Update SKR04: new tax account 3804 (19%)' | $T8 %]</div>
+[% USE HTML %]
+<h1>[% 'Update SKR04: new tax account 3804 (19%)' | $T8 %]</h1>
 
 <form name="Form" method="post" action="login.pl">
 <input type="hidden" name="action" value="login">
diff --git a/templates/webpages/dbupgrade/acc_trans_constraints.html b/templates/webpages/dbupgrade/acc_trans_constraints.html
index 389b1d05c..7cfa410df 100644
--- a/templates/webpages/dbupgrade/acc_trans_constraints.html
+++ b/templates/webpages/dbupgrade/acc_trans_constraints.html
@@ -1,6 +1,7 @@
 [%- USE T8 %]
 [%- USE L %]
-[% USE HTML %]<div class="listtop">[% 'Invalid transactions' | $T8 %]</div>
+[% USE HTML %]
+<h1>[% 'Invalid transactions' | $T8 %]</h1>
 
 <form name="Form" method="post" action="login.pl">
 <input type="hidden" name="action" value="login">
diff --git a/templates/webpages/dbupgrade/auth/clients.html b/templates/webpages/dbupgrade/auth/clients.html
index 15ef02ab8..1da8e823a 100644
--- a/templates/webpages/dbupgrade/auth/clients.html
+++ b/templates/webpages/dbupgrade/auth/clients.html
@@ -1,11 +1,10 @@
 [%- USE LxERP -%][%- USE L -%]
+<h1>[%- LxERP.t8("Introduction of clients") %]</h1>
 
 [%- INCLUDE 'common/flash.html' %]
 
 [% L.javascript_tag('jquery.selectboxes', 'jquery.multiselect2side') %]
 
-<h1>[%- LxERP.t8("Introduction of clients") %]</h1>
-
 <p>
  [% LxERP.t8("kivitendo has been extended to handle multiple clients within a single installation.") %]
  [% LxERP.t8("Therefore several settings that had to be made for each user in the past have been consolidated into the client configuration.") %]
diff --git a/templates/webpages/dbupgrade/cp_greeting_update_form.html b/templates/webpages/dbupgrade/cp_greeting_update_form.html
index 1c154e864..ffa6b4972 100644
--- a/templates/webpages/dbupgrade/cp_greeting_update_form.html
+++ b/templates/webpages/dbupgrade/cp_greeting_update_form.html
@@ -1,6 +1,6 @@
 [%- USE T8 %]
-[% USE HTML %]<div class="listtop">[% 'cp_greeting to cp_gender migration' | $T8 %]</div>
-
+[% USE HTML %]
+<h1>[% 'cp_greeting to cp_gender migration' | $T8 %]</h1>
 
 <form action="[% script %]" method="POST">
 <br>
diff --git a/templates/webpages/dbupgrade/default_bin_parts.html b/templates/webpages/dbupgrade/default_bin_parts.html
index 0c8294549..3f6ce5e6a 100644
--- a/templates/webpages/dbupgrade/default_bin_parts.html
+++ b/templates/webpages/dbupgrade/default_bin_parts.html
@@ -2,6 +2,8 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE JavaScript %]
+<h1>[% '<b>Default Bins Migration !READ CAREFULLY!</b>' | $T8 %]</h1>
+
  <script type="text/javascript" src="js/common.js"></script>
  <script type="text/javascript">
   <!--
@@ -89,7 +91,6 @@
 
 
 
-<div class="listtop">[% '<b>Default Bins Migration !READ CAREFULLY!</b>' | $T8 %]</div>
 <form name="Form" method="post" action="login.pl">
 <input type="hidden" name="action" value="login">
 <input type="hidden" name="continued" value="1">
diff --git a/templates/webpages/dbupgrade/default_bin_parts_no_warehouse.html b/templates/webpages/dbupgrade/default_bin_parts_no_warehouse.html
index 23a7b63f9..4d6d8bfb3 100644
--- a/templates/webpages/dbupgrade/default_bin_parts_no_warehouse.html
+++ b/templates/webpages/dbupgrade/default_bin_parts_no_warehouse.html
@@ -1,8 +1,8 @@
 [%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
+<h1>[% '<b>Default Bins Migration !READ CAREFULLY!</b>' | $T8 %]</h1>
 
-<div class="listtop">[% '<b>Default Bins Migration !READ CAREFULLY!</b>' | $T8 %]</div>
 <form name="Form" method="post" action="login.pl">
 <input type="hidden" name="action" value="login">
 <input type="hidden" name="continued" value="1">
diff --git a/templates/webpages/dbupgrade/erzeugnisnummern.html b/templates/webpages/dbupgrade/erzeugnisnummern.html
index 5b8f1a6c5..9f2ae5df9 100644
--- a/templates/webpages/dbupgrade/erzeugnisnummern.html
+++ b/templates/webpages/dbupgrade/erzeugnisnummern.html
@@ -1,5 +1,7 @@
 [%- USE T8 %]
-[% USE HTML %][%- USE LxERP -%]<div class="listtop">[% 'Double partnumbers' | $T8 %]</div>
+[% USE HTML %][%- USE LxERP -%]
+<h1>[% 'Double partnumbers' | $T8 %]</h1>
+
 <script type="text/javascript">
 <!--
 function show_parts(vc) {
diff --git a/templates/webpages/dbupgrade/header.html b/templates/webpages/dbupgrade/header.html
index 285fb83e9..89aa83893 100644
--- a/templates/webpages/dbupgrade/header.html
+++ b/templates/webpages/dbupgrade/header.html
@@ -1,8 +1,3 @@
 [%- USE T8 %]
 [%- USE HTML %]
-
- <table width="100%">
-  <tr>
-   <td class="listtop">[% 'Dataset upgrade' | $T8 %] ([% HTML.escape(dbname) %])</td>
-  </tr>
- </table>
+<h1>[% 'Dataset upgrade' | $T8 %] ([% HTML.escape(dbname) %])</h1>
diff --git a/templates/webpages/dbupgrade/no_default_currency.html b/templates/webpages/dbupgrade/no_default_currency.html
index e5bbe5d69..572532210 100644
--- a/templates/webpages/dbupgrade/no_default_currency.html
+++ b/templates/webpages/dbupgrade/no_default_currency.html
@@ -1,5 +1,6 @@
 [%- USE T8 %]
-[% USE HTML %]<div class="listtop">[% 'No default currency' | $T8 %]</div>
+[% USE HTML %]
+<h1>[% 'No default currency' | $T8 %]</h1>
 
 <form name="Form" method="post" action="login.pl">
 <input type="hidden" name="action" value="login">
diff --git a/templates/webpages/dbupgrade/orphaned_currencies.html b/templates/webpages/dbupgrade/orphaned_currencies.html
index ef613d03c..0db7c7281 100644
--- a/templates/webpages/dbupgrade/orphaned_currencies.html
+++ b/templates/webpages/dbupgrade/orphaned_currencies.html
@@ -1,6 +1,7 @@
 [%- USE T8 %]
 [%- USE L %]
-[% USE HTML %]<div class="listtop">[% 'Orphaned currencies' | $T8 %]</div>
+[% USE HTML %]
+<h1>[% 'Orphaned currencies' | $T8 %]</h1>
 
 <form name="Form" method="post" action="login.pl">
 <input type="hidden" name="action" value="login">
diff --git a/templates/webpages/dbupgrade/show_partlist.html b/templates/webpages/dbupgrade/show_partlist.html
index cb3d83e32..1b0d4c798 100644
--- a/templates/webpages/dbupgrade/show_partlist.html
+++ b/templates/webpages/dbupgrade/show_partlist.html
@@ -1,6 +1,7 @@
 [%- USE T8 %]
 [% USE L %]
-[% USE HTML %][%- USE LxERP -%]<div class="listtop">[% 'Show parts' | $T8 %]</div>
+[% USE HTML %][%- USE LxERP -%]
+<h1>[% 'Show parts' | $T8 %]</h1>
 
 <form method="post" action="controller.pl">
 [% L.hidden_tag("action", "LoginScreen/login") %]
diff --git a/templates/webpages/dbupgrade/steuerfilterung.html b/templates/webpages/dbupgrade/steuerfilterung.html
index dd8aab4ef..8c2a2efb7 100644
--- a/templates/webpages/dbupgrade/steuerfilterung.html
+++ b/templates/webpages/dbupgrade/steuerfilterung.html
@@ -1,8 +1,7 @@
-
 [% USE T8 %]
 [% USE HTML %]
 [% USE L %]
-<div class="listtop">[% 'New filter for tax accounts' | $T8 %]</div>
+<h1>[% 'New filter for tax accounts' | $T8 %]</h1>
 
 <form name="Form" method="post" action="login.pl">
 <input type="hidden" name="action" value="login">
diff --git a/templates/webpages/dbupgrade/tax_constraints.html b/templates/webpages/dbupgrade/tax_constraints.html
index 52e02b4f7..706298099 100644
--- a/templates/webpages/dbupgrade/tax_constraints.html
+++ b/templates/webpages/dbupgrade/tax_constraints.html
@@ -1,5 +1,6 @@
 [%- USE T8 %]
-[% USE HTML %]<div class="listtop">[% 'Inconsistency in database' | $T8 %]</div>
+[% USE HTML %]
+<h1>[% 'Inconsistency in database' | $T8 %]</h1>
 
 <form name="Form" method="post" action="login.pl">
 <input type="hidden" name="action" value="login">
diff --git a/templates/webpages/dbupgrade/taxkey_update.html b/templates/webpages/dbupgrade/taxkey_update.html
index 12f1369a7..d507d8ab0 100644
--- a/templates/webpages/dbupgrade/taxkey_update.html
+++ b/templates/webpages/dbupgrade/taxkey_update.html
@@ -1,5 +1,6 @@
 [%- USE T8 %]
-[% USE HTML %]<div class="listtop">[% 'taxkey 0 is already allocated.' | $T8 %]</div>
+[% USE HTML %]
+<h1>[% 'taxkey 0 is already allocated.' | $T8 %]</h1>
 
 <form name="Form" method="post" action="login.pl">
 <input type="hidden" name="action" value="login">
diff --git a/templates/webpages/dbupgrade/warehouse_form.html b/templates/webpages/dbupgrade/warehouse_form.html
index e56daab28..013f55ca9 100644
--- a/templates/webpages/dbupgrade/warehouse_form.html
+++ b/templates/webpages/dbupgrade/warehouse_form.html
@@ -1,6 +1,6 @@
 [%- USE T8 %]
 [% USE HTML %]
-<div class="listtop">[% 'Warehouse Migration' | $T8 %]</div>
+<h1>[% 'Warehouse Migration' | $T8 %]</h1>
 
 <form action="[% script %]" method="POST">
  <p>
diff --git a/templates/webpages/delivery_term/form.html b/templates/webpages/delivery_term/form.html
index 92d98c210..1aa2f5239 100755
--- a/templates/webpages/delivery_term/form.html
+++ b/templates/webpages/delivery_term/form.html
@@ -1,7 +1,7 @@
 [% USE HTML %][% USE T8 %][% USE L %][% USE LxERP %]
+<h1>[% FORM.title %]</h1>
 
  <form method="post" action="controller.pl">
-  <div class="listtop">[% FORM.title %]</div>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/delivery_term/list.html b/templates/webpages/delivery_term/list.html
index 661e2da57..517d91272 100644
--- a/templates/webpages/delivery_term/list.html
+++ b/templates/webpages/delivery_term/list.html
@@ -1,6 +1,5 @@
 [% USE HTML %][% USE T8 %][% USE L %][% USE LxERP %]
-
- <div class="listtop">[% FORM.title %]</div>
+<h1>[% FORM.title %]</h1>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/department/form.html b/templates/webpages/department/form.html
index 81eb941bc..894e259b3 100644
--- a/templates/webpages/department/form.html
+++ b/templates/webpages/department/form.html
@@ -1,8 +1,8 @@
 [% USE HTML %][% USE T8 %][% USE L %][% USE LxERP %]
 [% SET is_used = SELF.department.is_used %]
+<h1>[% FORM.title %]</h1>
 
  <form method="post" action="controller.pl">
-  <div class="listtop">[% FORM.title %]</div>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/department/list.html b/templates/webpages/department/list.html
index 5406f6362..b932b52c4 100644
--- a/templates/webpages/department/list.html
+++ b/templates/webpages/department/list.html
@@ -1,6 +1,5 @@
 [% USE HTML %][% USE T8 %][% USE L %][% USE LxERP %]
-
- <div class="listtop">[% FORM.title %]</div>
+<h1>[% FORM.title %]</h1>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/do/form_header.html b/templates/webpages/do/form_header.html
index 99c8ebede..9b4e9f26f 100644
--- a/templates/webpages/do/form_header.html
+++ b/templates/webpages/do/form_header.html
@@ -2,6 +2,8 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
+<h1>[% title %]</h1>
+
  <script type="text/javascript" src="js/show_form_details.js"></script>
  <script type="text/javascript" src="js/show_history.js"></script>
  <script type="text/javascript" src="js/show_vc_details.js"></script>
@@ -36,8 +38,6 @@
  [%- SET DISABLED = ' disabled' %]
  [%- END %]
 
- <div class="listtop">[% title %]</div>
-
 [%- INCLUDE 'common/flash.html' %]
 [%- INCLUDE 'generic/set_longdescription.html' %]
 
diff --git a/templates/webpages/do/search.html b/templates/webpages/do/search.html
index 040b0cdb7..e84bbf3e4 100644
--- a/templates/webpages/do/search.html
+++ b/templates/webpages/do/search.html
@@ -1,6 +1,8 @@
 [%- USE T8 %]
 [%- USE L %]
 [%- USE HTML %][%- USE LxERP %]
+<h1>[% title %]</h1>
+
  [%- IF vc == 'customer' %]
  [%- SET is_customer = '1' %]
  [%- ELSE %]
@@ -19,8 +21,6 @@
 
  <form method="post" action="do.pl" name="Form">
 
-  <div class="listtop">[% title %]</div>
-
   <p>
    <table>
     <tr>
diff --git a/templates/webpages/do/stock_in_form.html b/templates/webpages/do/stock_in_form.html
index 135a89837..5a8b18d43 100644
--- a/templates/webpages/do/stock_in_form.html
+++ b/templates/webpages/do/stock_in_form.html
@@ -1,6 +1,8 @@
 [%- USE T8 %]
 [%- USE L %]
 [%- USE HTML %][%- USE LxERP %][%- USE JavaScript %]
+<h1>[% title %]</h1>
+
  [%- UNLESS delivered %]
  <script type="text/javascript">
   <!--
@@ -61,8 +63,6 @@
 
  <form method="post" action="do.pl" name="Form">
 
-  <div class="listtop">[% title %]</div>
-
   [%- IF ERRORS && ERRORS.size %]
   <p><font color="#ff0000">[% ERRORS.join('<br>') %]</font></p>
   [%- END %]
diff --git a/templates/webpages/do/stock_out_form.html b/templates/webpages/do/stock_out_form.html
index fa6cabb30..3aab09827 100644
--- a/templates/webpages/do/stock_out_form.html
+++ b/templates/webpages/do/stock_out_form.html
@@ -1,5 +1,6 @@
 [%- USE T8 %]
 [%- USE HTML %][%- USE LxERP %]
+<h1>[% title %]</h1>
 
  [%- IF delivered %]
  [%- SET RO = ' readonly' %]
@@ -13,8 +14,6 @@
 
  <form method="post" action="do.pl" name="Form">
 
-  <div class="listtop">[% title %]</div>
-
   [%- IF ERRORS && ERRORS.size %]
   <p><font color="#ff0000">[% ERRORS.join('<br>') %]</font></p>
   [%- END %]
diff --git a/templates/webpages/drafts/load.html b/templates/webpages/drafts/load.html
index 87af688ba..60337a535 100644
--- a/templates/webpages/drafts/load.html
+++ b/templates/webpages/drafts/load.html
@@ -1,16 +1,12 @@
 [%- USE T8 %]
 [%- USE HTML %]
+<h1>[% 'Load draft' | $T8 %]</h1>
 
  <form action="[% HTML.escape(script) %]" method="post">
 
   <input type="hidden" name="SAVED_FORM" value="[% HTML.escape(SAVED_FORM) %]">
 
   <table width="100%">
-   <tr>
-    <th class="listtop">[% 'Load draft' | $T8 %]</th>
-   </tr>
-   <tr height="5"></tr>
-
    <tr>
     <td>
      [% 'The following drafts have been saved and can be loaded.' | $T8 %]
diff --git a/templates/webpages/drafts/save_new.html b/templates/webpages/drafts/save_new.html
index ed75369a9..3e11d50b5 100644
--- a/templates/webpages/drafts/save_new.html
+++ b/templates/webpages/drafts/save_new.html
@@ -1,16 +1,12 @@
 [%- USE T8 %]
 [%- USE HTML %]
+<h1>[% 'Save draft' | $T8 %]</h1>
 
  <form action="[% HTML.escape(script) %]" method="post">
 
   <input type="hidden" name="SAVED_FORM" value="[% HTML.escape(SAVED_FORM) %]">
 
   <table width="100%">
-   <tr>
-    <th class="listtop">[% 'Save draft' | $T8 %]</th>
-   </tr>
-   <tr height="5"></tr>
-
    <tr>
     <td>[% 'Enter a description for this new draft.' | $T8 %]</td>
    </tr>
diff --git a/templates/webpages/dunning/add.html b/templates/webpages/dunning/add.html
index 7648bf205..b7898c632 100644
--- a/templates/webpages/dunning/add.html
+++ b/templates/webpages/dunning/add.html
@@ -1,6 +1,6 @@
 [%- USE T8 %]
 [% USE HTML %]<script type="text/javascript" src="js/common.js"></script>
- <div class="listtop">[% title %]</div>
+<h1>[% title %]</h1>
 
  <form method="post" name="search" action="dn.pl">
 
diff --git a/templates/webpages/dunning/edit_config.html b/templates/webpages/dunning/edit_config.html
index 3dabbfa3b..87345bfdd 100644
--- a/templates/webpages/dunning/edit_config.html
+++ b/templates/webpages/dunning/edit_config.html
@@ -1,13 +1,12 @@
 [%- USE T8 %]
 [%- USE HTML %]
+<h1>[% title %]</h1>
+
  <script type="text/javascript" src="js/common.js"></script>
  <script type="text/javascript" src="js/dunning.js"></script>
 
- <div class="listtop" width="100%">[% title %]</div>
-
  <form method="post" action="dn.pl" name="Form">
   <table>
-   <tr height="5"></tr>
 
    <tr>
     <th class="listheading">[% 'Dunning Level' | $T8 %]</th>
diff --git a/templates/webpages/dunning/search.html b/templates/webpages/dunning/search.html
index f27c2fe1e..1c2475681 100644
--- a/templates/webpages/dunning/search.html
+++ b/templates/webpages/dunning/search.html
@@ -1,14 +1,13 @@
 [%- USE T8 %]
 [%- USE HTML %]
 [%- USE L %]
+<h1>[% title %]</h1>
+
  <script type="text/javascript" src="js/common.js"></script>
 
  <form method="post" name="search" action="dn.pl">
 
-  <div class="listtop">[% title %]</div>
-
   <table width="100%">
-   <tr height="5"></tr>
    <tr>
     <td>
      <table>
diff --git a/templates/webpages/dunning/set_email.html b/templates/webpages/dunning/set_email.html
index e2d558d4c..1a40a45cf 100644
--- a/templates/webpages/dunning/set_email.html
+++ b/templates/webpages/dunning/set_email.html
@@ -1,5 +1,7 @@
 [%- USE T8 %]
 [%- USE HTML %]
+<h1>[% title %]</h1>
+
  <script type="text/javascript">
   <!--
       function email_updated() {
@@ -16,8 +18,6 @@
   <input type="hidden" name="input_body" value="[% HTML.escape(input_body) %]">
   <input type="hidden" name="input_attachment" value="[% HTML.escape(input_attachment) %]">
 
-  <div class="listtop" width="100%">[% title %]</div>
-
   <table width="100%">
    <tr>
     <td valign="top">[% 'Subject:' | $T8 %]</td>
diff --git a/templates/webpages/dunning/show_invoices.html b/templates/webpages/dunning/show_invoices.html
index b7ee6ed47..d087ec96d 100644
--- a/templates/webpages/dunning/show_invoices.html
+++ b/templates/webpages/dunning/show_invoices.html
@@ -1,13 +1,13 @@
 [%- USE T8 %]
 [% USE HTML %]
 [% USE L %]
+<h1>[% title %]</h1>
+
 [% SET all_active = 1 %][% FOREACH row = DUNNINGS %][% IF !row.active %][% SET all_active = 0 %][% LAST %][% END %][% END %]
 [% SET all_email = 1 %][% FOREACH row = DUNNINGS %][% IF !row.email %][% SET all_email = 0 %][% LAST %][% END %][% END %]
  <script type="text/javascript" src="js/common.js"></script>
  <script type="text/javascript" src="js/dunning.js"></script>
 
- <div class="listtop" width="100%">[% title %]</div>
-
  <p>[% 'The columns &quot;Dunning Duedate&quot;, &quot;Total Fees&quot; and &quot;Interest&quot; show data for the previous dunning created for this invoice.' | $T8 %]</p>
 
  <form name="Form" method="post" action="dn.pl">
diff --git a/templates/webpages/fu/add_edit.html b/templates/webpages/fu/add_edit.html
index 72f954d8d..e3b3191d2 100644
--- a/templates/webpages/fu/add_edit.html
+++ b/templates/webpages/fu/add_edit.html
@@ -1,6 +1,8 @@
 [%- USE T8 %]
 [%- USE L %]
 [%- USE HTML %]
+<h1>[% title %]</h1>
+
  <script type="text/javascript">
    $(function(){ document.Form.subject.focus(); });
  </script>
@@ -11,8 +13,6 @@
   <p>[% SAVED_MESSAGE %]</p>
   [%- END %]
 
-  <div class="listtop">[% title %]</div>
-
   <input type="hidden" name="id" value="[% HTML.escape(id) %]">
   <input type="hidden" name="note_id" value="[% HTML.escape(note_id) %]">
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
@@ -67,7 +67,7 @@
   [%- IF FOLLOW_UPS.size %]
   <hr height="3" noshade>
 
-  <div class="listtop">[% 'Existing pending follow-ups for this item' | $T8 %]</div>
+  <h2>[% 'Existing pending follow-ups for this item' | $T8 %]</h2>
 
   <p>
    <table>
diff --git a/templates/webpages/fu/edit_access_rights.html b/templates/webpages/fu/edit_access_rights.html
index 999f5a516..b2c6536ff 100644
--- a/templates/webpages/fu/edit_access_rights.html
+++ b/templates/webpages/fu/edit_access_rights.html
@@ -1,12 +1,12 @@
 [%- USE T8 %]
 [% USE HTML %]
+<h1>[% title %]</h1>
+
 
  [%- IF SAVED_MESSAGE %]
  <p>[% SAVED_MESSAGE %]</p>
  [%- END %]
 
- <div class="listtop">[% title %]</div>
-
  <p>[% 'Allow the following users access to my follow-ups:' | $T8 %]</p>
 
  <form action="fu.pl" method="post" name="Form">
diff --git a/templates/webpages/fu/report_for_todo_list.html b/templates/webpages/fu/report_for_todo_list.html
index a0683115a..d54283cca 100644
--- a/templates/webpages/fu/report_for_todo_list.html
+++ b/templates/webpages/fu/report_for_todo_list.html
@@ -1,7 +1,6 @@
 [%- USE T8 %]
 [% USE HTML %]
-
-<div class="listtop">[% 'Unfinished follow-ups' | $T8 %]</div>
+<h1>[% 'Unfinished follow-ups' | $T8 %]</h1>
 
 <form action="fu.pl" method="post" name="TODOFollowUpsForm">
  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
diff --git a/templates/webpages/fu/search.html b/templates/webpages/fu/search.html
index 3b9fcee00..0d1a22a40 100644
--- a/templates/webpages/fu/search.html
+++ b/templates/webpages/fu/search.html
@@ -1,12 +1,12 @@
 [%- USE T8 %]
 [%- USE L %]
 [% USE HTML %]
+<h1>[% title %]</h1>
+
  <script type="text/javascript">
    $(function(){ document.Form.subject.focus(); });
  </script>
 
- <div class="listtop">[% title %]</div>
-
  <form action="fu.pl" method="post" name="Form">
   <input type="hidden" name="nextsub" value="report">
 
diff --git a/templates/webpages/generic/calculate_qty.html b/templates/webpages/generic/calculate_qty.html
index 97e9e4264..035caa674 100644
--- a/templates/webpages/generic/calculate_qty.html
+++ b/templates/webpages/generic/calculate_qty.html
@@ -1,16 +1,13 @@
 [%- USE T8 %]
 [%- USE HTML %]
+<h1>[% title %]</h1>
+
  <form name="Form">
 
   <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
   <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
 
   <table width="100%">
-   <tr>
-    <th class="listtop">[% title %]</th>
-   </tr>
-   <tr height="5"></tr>
-
    <tr><td>[% 'Please insert object dimensions below.' | $T8 %]</td></tr>
 
    <tr>
diff --git a/templates/webpages/generic/cov_selection.html b/templates/webpages/generic/cov_selection.html
index 49ccd3c6e..a2db0d4bb 100644
--- a/templates/webpages/generic/cov_selection.html
+++ b/templates/webpages/generic/cov_selection.html
@@ -1,5 +1,7 @@
 [%- USE T8 %]
 [%- USE HTML %]
+<h1>[% title %]</h1>
+
  <form method="post">
 
   <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
@@ -8,12 +10,6 @@
   <input type="hidden" name="allow_both" value="[% HTML.escape(allow_both) %]">
   <input type="hidden" name="action_on_cov_selected" value="[% HTML.escape(action_on_cov_selected) %]">
 
-  <table width="100%">
-   <tr>
-    <th class="listtop">[% title %]</th>
-   </tr>
-   <tr height="5"></tr>
-
    <tr>
     <td>
      [%- IF !is_vendor %]
diff --git a/templates/webpages/generic/edit_email.html b/templates/webpages/generic/edit_email.html
index a4a3428c6..b248969ce 100644
--- a/templates/webpages/generic/edit_email.html
+++ b/templates/webpages/generic/edit_email.html
@@ -1,13 +1,10 @@
 [%- USE T8 %]
 [%- USE HTML %][%- USE LxERP -%][%- USE L -%]
+<h1>[% title %]</h1>
+
 <form name="Form" method="post" action="[% script %]">
 
 <table width="100%">
-  <tr class="listtop">
-
-    <th class="listtop">[% title %]</th>
-  </tr>
-  <tr height="5"></tr>
   <tr>
     <td>
       <table>
diff --git a/templates/webpages/generic/part_selection.html b/templates/webpages/generic/part_selection.html
index 3bca0a880..974533444 100644
--- a/templates/webpages/generic/part_selection.html
+++ b/templates/webpages/generic/part_selection.html
@@ -1,5 +1,7 @@
 [%- USE T8 %]
 [%- USE HTML %]
+<h1>[% title %]</h1>
+
  <form action="[% HTML.escape(script) %]" method="post" name="Form">
 
   <input type="hidden" name="input_partnumber" value="[% HTML.escape(input_partnumber) %]">
@@ -12,8 +14,6 @@
   <input type="hidden" name="options" value="[% HTML.escape(options) %]">
   <input type="hidden" name="new_description" value="[% HTML.escape(description) %]">
 
-  <div class="listtop">[% title %]</div>
-
   <table width="100%">
    <tr>
     <td>
diff --git a/templates/webpages/generic/select_delivery_customer.html b/templates/webpages/generic/select_delivery_customer.html
index 9f8957eb9..8c8f48ae2 100644
--- a/templates/webpages/generic/select_delivery_customer.html
+++ b/templates/webpages/generic/select_delivery_customer.html
@@ -1,15 +1,13 @@
 [%- USE T8 %]
 [%- USE HTML %]
+<h1>[% title %]</h1>
+
  <form name="Form">
 
   <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
   <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
 
-  <div class="listtop">[% title %]</div>
-
   <table width="100%">
-   <tr height="5"></tr>
-
    <tr><td>[% 'Please select a customer from the list below.' | $T8 %]</td></tr>
 
    <tr>
diff --git a/templates/webpages/generic/select_part.html b/templates/webpages/generic/select_part.html
index fe18fe664..300bf06cb 100644
--- a/templates/webpages/generic/select_part.html
+++ b/templates/webpages/generic/select_part.html
@@ -9,7 +9,7 @@
   <input type="hidden" name="remap_parts_id" value="[% HTML.escape(remap_parts_id) %]">
   <input type="hidden" name="remap_partnumber" value="[% HTML.escape(remap_partnumber) %]">
 
-  <div class="listtop">[% 'Select a part or assembly' | $T8 %]</div>
+  <h1>[% 'Select a part or assembly' | $T8 %]</h1>
 
   <p>
    <table>
diff --git a/templates/webpages/generic/select_vendor.html b/templates/webpages/generic/select_vendor.html
index e34bed9ce..71e5d57fd 100644
--- a/templates/webpages/generic/select_vendor.html
+++ b/templates/webpages/generic/select_vendor.html
@@ -1,15 +1,13 @@
 [%- USE T8 %]
 [%- USE HTML %]
+<h1>[% title %]</h1>
+
  <form name="Form">
 
   <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
   <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
 
-  <div class="listtop">[% title %]</div>
-
   <table width="100%">
-   <tr height="5"></tr>
-
    <tr><td>[% 'Please select a vendor from the list below.' | $T8 %]</td></tr>
 
    <tr>
diff --git a/templates/webpages/generictranslations/edit_greetings.html b/templates/webpages/generictranslations/edit_greetings.html
index 60d01ad03..5e2f31126 100644
--- a/templates/webpages/generictranslations/edit_greetings.html
+++ b/templates/webpages/generictranslations/edit_greetings.html
@@ -1,9 +1,6 @@
 [%- USE T8 %]
 [%- USE HTML %]
-
- <p>
-  <div class="listtop">[% HTML.escape(title) %]</div>
- </p>
+<h1>[% HTML.escape(title) %]</h1>
 
  [%- IF message %]
  <p>
diff --git a/templates/webpages/generictranslations/edit_sepa_strings.html b/templates/webpages/generictranslations/edit_sepa_strings.html
index c5658df8d..e9875b0f3 100644
--- a/templates/webpages/generictranslations/edit_sepa_strings.html
+++ b/templates/webpages/generictranslations/edit_sepa_strings.html
@@ -1,9 +1,6 @@
 [%- USE T8 %]
 [%- USE HTML %]
-
- <p>
-  <div class="listtop">[% HTML.escape(title) %]</div>
- </p>
+<h1>[% HTML.escape(title) %]</h1>
 
  [%- IF message %]
  <p>
diff --git a/templates/webpages/gl/form_header.html b/templates/webpages/gl/form_header.html
index 98bb8f067..e349761cf 100644
--- a/templates/webpages/gl/form_header.html
+++ b/templates/webpages/gl/form_header.html
@@ -2,6 +2,8 @@
 [%- USE LxERP %]
 [%- USE T8 %]
 [%- USE L %]
+<h1>[% title | html %]</h1>
+
 <script type="text/javascript">
   <!--
 function updateTaxes(row)
@@ -47,9 +49,6 @@ function updateTaxes(row)
 <input type="hidden" name="follow_up_rowcount" value="1">
 
 <table width=100%>
-  <tr>
-    <th class=listtop>[% title | html %]</th>
-  </tr>
 [%- IF saved_message %]
   <tr>
     <td>[% saved_message | html %]</th>
diff --git a/templates/webpages/gl/search.html b/templates/webpages/gl/search.html
index 78a16e723..e9ec7970c 100644
--- a/templates/webpages/gl/search.html
+++ b/templates/webpages/gl/search.html
@@ -2,15 +2,13 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
+<h1>[% 'Journal' | $T8 %]</h1>
+
 <form method=post action=gl.pl>
 
 <input type=hidden name=sort value=datesort>
 
 <table width=100%>
-  <tr>
-    <th class=listtop>[% 'Journal' | $T8 %]</th>
-  </tr>
-  <tr height="5"></tr>
   <tr>
     <td>
       <table>
diff --git a/templates/webpages/ic/form_header.html b/templates/webpages/ic/form_header.html
index 9ce47f1f7..7b8455dac 100644
--- a/templates/webpages/ic/form_header.html
+++ b/templates/webpages/ic/form_header.html
@@ -2,7 +2,7 @@
 [%- USE HTML %]
 [%- USE LxERP %][%- USE L -%][%- USE P -%]
 [% PROCESS 'common/select_warehouse_bin.html' %]
- <p><div class="listtop">[% title %]  [% HTML.escape(partnumber) %]  [% HTML.escape(description) %]</div></p>
+ <h1>[% title %]  [% HTML.escape(partnumber) %]  [% HTML.escape(description) %]</h1>
 
 [% PROCESS 'common/flash.html' %]
 
diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html
index 8ed89a449..4433c82a1 100644
--- a/templates/webpages/ic/search.html
+++ b/templates/webpages/ic/search.html
@@ -2,6 +2,7 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
+<h1>[% title %]</h1>
 
  <form method="post" action="ic.pl">
 
@@ -16,10 +17,7 @@
 
   <input type="hidden" name="ndxs_counter" value="[% HTML.escape(ndxs_counter) %]">
 
-  <div class="listtop">[% title %]</div>
-
   <table width="100%">
-   <tr height="5"></tr>
    <tr valign="top">
     <td>
      <table>
diff --git a/templates/webpages/ic/search_update_prices.html b/templates/webpages/ic/search_update_prices.html
index e6eeb9843..bca42dfdb 100644
--- a/templates/webpages/ic/search_update_prices.html
+++ b/templates/webpages/ic/search_update_prices.html
@@ -1,13 +1,12 @@
 [%- USE T8 %]
 [%- USE HTML %]
 [%- USE LxERP %]
+<h1>[% 'Update prices' | $T8 %]</h1>
 
  <form method="post" action="ic.pl">
 
   <input type="hidden" name="title" value="[% 'Update prices' | $T8 %]">
 
-  <div class="listtop">[% 'Update prices' | $T8 %]</div>
-
   <p>
    <table>
     <tr>
diff --git a/templates/webpages/io/select_item.html b/templates/webpages/io/select_item.html
index 351489e6f..9252b45fc 100644
--- a/templates/webpages/io/select_item.html
+++ b/templates/webpages/io/select_item.html
@@ -1,6 +1,5 @@
 [% USE LxERP %][% USE HTML %][% USE L %]
-
- <div class="listtop">[% title %]</div>
+<h1>[% title %]</h1>
 
  <form method="post" action="[% HTML.escape(script) %]">
 
diff --git a/templates/webpages/ir/form_header.html b/templates/webpages/ir/form_header.html
index c0f39c760..673f1a8d0 100644
--- a/templates/webpages/ir/form_header.html
+++ b/templates/webpages/ir/form_header.html
@@ -2,6 +2,8 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
+<h1>[% title %]</h1>
+
 [%- SET follow_up_trans_info = invnumber _ ' (' _ vendor_name _ ')' %]
 <script type="text/javascript" src="js/common.js"></script>
 <script type="text/javascript" src="js/vendor_selection.js"></script>
@@ -21,8 +23,6 @@
 <input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
 <input type="hidden" name="follow_up_rowcount" value="1">
 
-<p><div class="listtop" width="100%">[% title %]</div></p>
-
 [%- INCLUDE 'common/flash.html' %]
 [%- INCLUDE 'generic/set_longdescription.html' %]
 
diff --git a/templates/webpages/login_screen/old_configuration_files.html b/templates/webpages/login_screen/old_configuration_files.html
index cf4ad540a..82c4917b8 100644
--- a/templates/webpages/login_screen/old_configuration_files.html
+++ b/templates/webpages/login_screen/old_configuration_files.html
@@ -1,5 +1,5 @@
 [% USE LxERP %][% USE HTML %]
- <div class="listtop">[% title %]</div>
+<h1>[% title %]</h1>
 
  <p>
   [%- LxERP.t8('Starting with version 2.6.3 the configuration files in "config" have been consolidated.') %]
diff --git a/templates/webpages/oe/check_for_direct_delivery.html b/templates/webpages/oe/check_for_direct_delivery.html
index 06cf9b4c2..b2a5b1685 100644
--- a/templates/webpages/oe/check_for_direct_delivery.html
+++ b/templates/webpages/oe/check_for_direct_delivery.html
@@ -1,7 +1,6 @@
 [%- USE T8 %]
 [%- USE HTML %]
-
- <div class="listtop" width="100%">[% 'Carry over shipping address' | $T8 %]</div>
+<h1>[% 'Carry over shipping address' | $T8 %]</h1>
 
  <p>[% 'You have entered or selected the following shipping address for this customer:' | $T8 %]</p>
 
diff --git a/templates/webpages/oe/edit_periodic_invoices_config.html b/templates/webpages/oe/edit_periodic_invoices_config.html
index 2e6b5a406..093cf0574 100644
--- a/templates/webpages/oe/edit_periodic_invoices_config.html
+++ b/templates/webpages/oe/edit_periodic_invoices_config.html
@@ -1,8 +1,7 @@
 [% USE HTML %]
 [% USE LxERP %]
 [% USE L %]
-
- <div class="listtop">[% title %]</div>
+<h1>[% title %]</h1>
 
  <form name="Form" action="oe.pl" method="post">
 
diff --git a/templates/webpages/oe/report_for_todo_list.html b/templates/webpages/oe/report_for_todo_list.html
index bea5c6747..98b0f4a7b 100644
--- a/templates/webpages/oe/report_for_todo_list.html
+++ b/templates/webpages/oe/report_for_todo_list.html
@@ -1,7 +1,6 @@
 [%- USE T8 %]
 [% USE HTML %][% USE LxERP %]
-
-<div class="listtop">[% 'Overdue sales quotations and requests for quotations' | $T8 %]</div>
+<h1>[% 'Overdue sales quotations and requests for quotations' | $T8 %]</h1>
 
  <table width="100%">
   <tr>
diff --git a/templates/webpages/oe/search.html b/templates/webpages/oe/search.html
index f50a77ba2..06f1429c7 100644
--- a/templates/webpages/oe/search.html
+++ b/templates/webpages/oe/search.html
@@ -2,14 +2,14 @@
 [%- USE T8 %]
 [%- USE LxERP %]
 [%- USE L %]
+<h1>[% HTML.escape(title) %]</h1>
+
 [%- SET vclabel = vc == 'customer' ? LxERP.t8('Customer') : LxERP.t8('Vendor') %]
 [%- SET vcnumberlabel = vc == 'customer' ? LxERP.t8('Customer Number') : LxERP.t8('Vendor Number') %]
 [%- SET vctypelabel = vc == 'customer' ? LxERP.t8('Customer type') : LxERP.t8('Vendor type') %]
 
 <form method="post" action="oe.pl">
 
- <p><div class="listtop">[% HTML.escape(title) %]</div></p>
-
 <table width="100%">
  <tr>
   <td>
diff --git a/templates/webpages/payment_term/form.html b/templates/webpages/payment_term/form.html
index b42986562..f1197289a 100755
--- a/templates/webpages/payment_term/form.html
+++ b/templates/webpages/payment_term/form.html
@@ -1,7 +1,7 @@
 [% USE HTML %][% USE T8 %][% USE L %][% USE LxERP %]
+<h1>[% FORM.title %]</h1>
 
  <form method="post" action="controller.pl">
-  <div class="listtop">[% FORM.title %]</div>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/payment_term/list.html b/templates/webpages/payment_term/list.html
index 41290c2ef..7fb28953e 100644
--- a/templates/webpages/payment_term/list.html
+++ b/templates/webpages/payment_term/list.html
@@ -1,6 +1,5 @@
 [% USE HTML %][% USE T8 %][% USE L %][% USE LxERP %]
-
- <div class="listtop">[% FORM.title %]</div>
+ <h1>[% FORM.title %]</h1>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/pe/partsgroup_form.html b/templates/webpages/pe/partsgroup_form.html
index 686bca695..81fea2b98 100644
--- a/templates/webpages/pe/partsgroup_form.html
+++ b/templates/webpages/pe/partsgroup_form.html
@@ -1,6 +1,7 @@
 [%- USE L %]
 [%- USE T8 %]
 [%- USE HTML %]
+<h1>[% title %]</h1>
 [% L.javascript_tag('show_history.js') %]
 
 <form method=post action="[% script %]">
@@ -9,10 +10,6 @@
 <input type=hidden name=type value="[% type %]">
 
 <table width=100%>
-  <tr>
-    <th class=listtop>[% title %]</th>
-  </tr>
-  <tr height="5"></tr>
   <tr>
     <td>
       <table width=100%>
diff --git a/templates/webpages/pe/partsgroup_report.html b/templates/webpages/pe/partsgroup_report.html
index c833fdcc3..a9fc79e0d 100644
--- a/templates/webpages/pe/partsgroup_report.html
+++ b/templates/webpages/pe/partsgroup_report.html
@@ -1,11 +1,8 @@
 [%- USE HTML %]
 [%- USE T8 %]
+<h1>[% 'Groups' | $T8 %]</h1>
 
 <table width=100%>
-  <tr>
-    <th class=listtop>[% 'Groups' | $T8 %]</th>
-  </tr>
-  <tr height="5"></tr>
   <tr>
     <td>[% option %]</td>
   </tr>
diff --git a/templates/webpages/pe/pricegroup_form.html b/templates/webpages/pe/pricegroup_form.html
index 0b1f8e3ce..328c45a67 100644
--- a/templates/webpages/pe/pricegroup_form.html
+++ b/templates/webpages/pe/pricegroup_form.html
@@ -1,6 +1,7 @@
 [%- USE L %]
 [%- USE T8 %]
 [%- USE HTML %]
+<h1>[% title %]</h1>
 [% L.javascript_tag('show_history.js') %]
 
 <form method=post action="[% script %]">
@@ -9,10 +10,6 @@
 <input type=hidden name=type value="[% type %]">
 
 <table width=100%>
-  <tr>
-    <th class=listtop>[% title %]</th>
-  </tr>
-  <tr height="5"></tr>
   <tr>
     <td>
       <table width=100%>
diff --git a/templates/webpages/pe/pricegroup_report.html b/templates/webpages/pe/pricegroup_report.html
index b1586eb5c..0b04b9d95 100644
--- a/templates/webpages/pe/pricegroup_report.html
+++ b/templates/webpages/pe/pricegroup_report.html
@@ -1,11 +1,8 @@
 [%- USE HTML %]
 [%- USE T8 %]
+<h1>[% 'Pricegroup' | $T8 %]</h1>
 
 <table width=100%>
-  <tr>
-    <th class=listtop>[% 'Pricegroup' | $T8 %]</th>
-  </tr>
-  <tr height="5"></tr>
   <tr>
     <td>[% option %]</td>
   </tr>
diff --git a/templates/webpages/pe/search.html b/templates/webpages/pe/search.html
index 9cbb93189..871eb34dc 100644
--- a/templates/webpages/pe/search.html
+++ b/templates/webpages/pe/search.html
@@ -1,6 +1,7 @@
 [%- USE T8 %]
 [%- USE LxERP %]
 [%- USE HTML %]
+<h1>[% is_pricegroup ? LxERP.t8('Pricegroup') : LxERP.t8('Groups') %]</h1>
 
 <form method=post action="[% script %]">
 
@@ -8,10 +9,6 @@
 <input type=hidden name=type value="[% type %]">
 
 <table width=100%>
-  <tr>
-    <th class=listtop>[% is_pricegroup ? LxERP.t8('Pricegroup') : LxERP.t8('Groups') %]</th>
-  </tr>
-  <tr height="5"></tr>
   <tr>
     <td>
       <table width=100%>
diff --git a/templates/webpages/presenter/record/record_list.html b/templates/webpages/presenter/record/record_list.html
index e75657a85..0dd46e31f 100644
--- a/templates/webpages/presenter/record/record_list.html
+++ b/templates/webpages/presenter/record/record_list.html
@@ -1,5 +1,5 @@
 [% USE L %][% USE LxERP %][%- USE P -%]
-<div class="listtop">[%- P.escape(title) %]</div>
+<h1>[%- P.escape(title) %]</h1>
 
 <div style="padding-bottom: 15px">
  <table style="width: 100%" id="record_list_[% type %]">
diff --git a/templates/webpages/project/search.html b/templates/webpages/project/search.html
index a4a2d82aa..7e6cdeea4 100644
--- a/templates/webpages/project/search.html
+++ b/templates/webpages/project/search.html
@@ -2,13 +2,12 @@
 [%- USE HTML %]
 [%- USE L %]
 [%- USE LxERP %]
+<h1>[% 'Search projects' | $T8 %]</h1>
 
 [%- INCLUDE 'common/flash.html' %]
 
  <form method="post" action="controller.pl">
 
-  <div class="listtop">[% 'Search projects' | $T8 %]</div>
-
   <p>
 [%- INCLUDE 'project/_filter.html' %]
   </p>
diff --git a/templates/webpages/project_status/form.html b/templates/webpages/project_status/form.html
index c331fba99..21735168b 100644
--- a/templates/webpages/project_status/form.html
+++ b/templates/webpages/project_status/form.html
@@ -1,7 +1,7 @@
 [% USE HTML %][% USE L %][% USE LxERP %]
+<h1>[% FORM.title %]</h1>
 
  <form method="post" action="controller.pl">
-  <div class="listtop">[% FORM.title %]</div>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/project_status/list.html b/templates/webpages/project_status/list.html
index d8fd7461d..f510b6d16 100644
--- a/templates/webpages/project_status/list.html
+++ b/templates/webpages/project_status/list.html
@@ -1,6 +1,5 @@
 [% USE HTML %][% USE T8 %][% USE L %][% USE LxERP %]
-
- <div class="listtop">[% FORM.title %]</div>
+ <h1>[% FORM.title %]</h1>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/project_type/form.html b/templates/webpages/project_type/form.html
index 692cb4a1a..79bb121fc 100755
--- a/templates/webpages/project_type/form.html
+++ b/templates/webpages/project_type/form.html
@@ -1,7 +1,7 @@
 [% USE HTML %][% USE L %][% USE LxERP %]
+<h1>[% FORM.title %]</h1>
 
  <form method="post" action="controller.pl">
-  <div class="listtop">[% FORM.title %]</div>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/project_type/list.html b/templates/webpages/project_type/list.html
index fc45c0d1e..d3d91819b 100644
--- a/templates/webpages/project_type/list.html
+++ b/templates/webpages/project_type/list.html
@@ -1,6 +1,5 @@
 [% USE HTML %][% USE T8 %][% USE L %][% USE LxERP %]
-
- <div class="listtop">[% FORM.title %]</div>
+<h1>[% FORM.title %]</h1>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/record_links/add_filter.html b/templates/webpages/record_links/add_filter.html
index 39469f5aa..b101ad7cf 100644
--- a/templates/webpages/record_links/add_filter.html
+++ b/templates/webpages/record_links/add_filter.html
@@ -1,6 +1,6 @@
 [%- USE L -%][%- USE LxERP -%][%- USE JavaScript -%]
 [%- SET style='width: 500px' %]
-<div class="listtop">[%- LxERP.t8("Add link: select records to link with") %]</div>
+<h1>[%- LxERP.t8("Add link: select records to link with") %]</h1>
 
 
 <form method="post" action="controller.pl">
diff --git a/templates/webpages/requirement_spec_acceptance_status/form.html b/templates/webpages/requirement_spec_acceptance_status/form.html
index 7b0a3cafb..299326c41 100755
--- a/templates/webpages/requirement_spec_acceptance_status/form.html
+++ b/templates/webpages/requirement_spec_acceptance_status/form.html
@@ -1,7 +1,7 @@
 [% USE HTML %][% USE L %][% USE LxERP %]
+<h1>[% FORM.title %]</h1>
 
  <form method="post" action="controller.pl">
-  <div class="listtop">[% FORM.title %]</div>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/requirement_spec_acceptance_status/list.html b/templates/webpages/requirement_spec_acceptance_status/list.html
index 75fcf53b2..93049e2a9 100644
--- a/templates/webpages/requirement_spec_acceptance_status/list.html
+++ b/templates/webpages/requirement_spec_acceptance_status/list.html
@@ -1,6 +1,5 @@
 [% USE HTML %][% USE L %][% USE LxERP %]
-
- <div class="listtop">[% FORM.title %]</div>
+<h1>[% FORM.title %]</h1>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/requirement_spec_complexity/form.html b/templates/webpages/requirement_spec_complexity/form.html
index 994fb9464..8088db5e7 100755
--- a/templates/webpages/requirement_spec_complexity/form.html
+++ b/templates/webpages/requirement_spec_complexity/form.html
@@ -1,7 +1,7 @@
 [% USE HTML %][% USE L %][% USE LxERP %]
+<h1>[% FORM.title %]</h1>
 
  <form method="post" action="controller.pl">
-  <div class="listtop">[% FORM.title %]</div>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/requirement_spec_complexity/list.html b/templates/webpages/requirement_spec_complexity/list.html
index 32ef57495..3ce2d9400 100644
--- a/templates/webpages/requirement_spec_complexity/list.html
+++ b/templates/webpages/requirement_spec_complexity/list.html
@@ -1,6 +1,5 @@
 [% USE HTML %][% USE L %][% USE LxERP %]
-
- <div class="listtop">[% FORM.title %]</div>
+<h1>[% FORM.title %]</h1>
 
 [%- INCLUDE "common/flash.html" %]
 
diff --git a/templates/webpages/requirement_spec_predefined_text/form.html b/templates/webpages/requirement_spec_predefined_text/form.html
index 905d3510d..2f03e3501 100755
--- a/templates/webpages/requirement_spec_predefined_text/form.html
+++ b/templates/webpages/requirement_spec_predefined_text/form.html
@@ -1,7 +1,7 @@
 [% USE HTML %][% USE L %][% USE LxERP %]
+<h1>[% FORM.title %]</h1>
 
  <form method="post" action="controller.pl">
-  <div class="listtop">[% FORM.title %]</div>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/requirement_spec_predefined_text/list.html b/templates/webpages/requirement_spec_predefined_text/list.html
index 85f9db2ef..3e1ee2828 100644
--- a/templates/webpages/requirement_spec_predefined_text/list.html
+++ b/templates/webpages/requirement_spec_predefined_text/list.html
@@ -1,6 +1,5 @@
 [% USE HTML %][% USE L %][% USE LxERP %]
-
- <div class="listtop">[% FORM.title %]</div>
+<h1>[% FORM.title %]</h1>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/requirement_spec_risk/form.html b/templates/webpages/requirement_spec_risk/form.html
index 82e8467f0..5f4450283 100755
--- a/templates/webpages/requirement_spec_risk/form.html
+++ b/templates/webpages/requirement_spec_risk/form.html
@@ -1,7 +1,7 @@
 [% USE HTML %][% USE L %][% USE LxERP %]
+<h1>[% FORM.title %]</h1>
 
  <form method="post" action="controller.pl">
-  <div class="listtop">[% FORM.title %]</div>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/requirement_spec_risk/list.html b/templates/webpages/requirement_spec_risk/list.html
index af4a475a3..1803b0f3d 100644
--- a/templates/webpages/requirement_spec_risk/list.html
+++ b/templates/webpages/requirement_spec_risk/list.html
@@ -1,6 +1,5 @@
 [% USE HTML %][% USE L %][% USE LxERP %]
-
- <div class="listtop">[% FORM.title %]</div>
+<h1>[% FORM.title %]</h1>
 
 [%- INCLUDE "common/flash.html" %]
 
diff --git a/templates/webpages/requirement_spec_status/form.html b/templates/webpages/requirement_spec_status/form.html
index 599389d52..8b034f98e 100755
--- a/templates/webpages/requirement_spec_status/form.html
+++ b/templates/webpages/requirement_spec_status/form.html
@@ -1,7 +1,7 @@
 [% USE HTML %][% USE L %][% USE LxERP %]
+<h1>[% FORM.title %]</h1>
 
  <form method="post" action="controller.pl">
-  <div class="listtop">[% FORM.title %]</div>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/requirement_spec_status/list.html b/templates/webpages/requirement_spec_status/list.html
index 0633d62fb..35b78c9b1 100644
--- a/templates/webpages/requirement_spec_status/list.html
+++ b/templates/webpages/requirement_spec_status/list.html
@@ -1,6 +1,5 @@
 [% USE HTML %][% USE L %][% USE LxERP %]
-
- <div class="listtop">[% FORM.title %]</div>
+<h1>[% FORM.title %]</h1>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/requirement_spec_type/form.html b/templates/webpages/requirement_spec_type/form.html
index e9bc2d6c8..a965c868d 100755
--- a/templates/webpages/requirement_spec_type/form.html
+++ b/templates/webpages/requirement_spec_type/form.html
@@ -1,7 +1,7 @@
 [% USE HTML %][% USE L %][% USE LxERP %]
+<h1>[% FORM.title %]</h1>
 
  <form method="post" action="controller.pl">
-  <div class="listtop">[% FORM.title %]</div>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/requirement_spec_type/list.html b/templates/webpages/requirement_spec_type/list.html
index a8920ddd0..3c81986d8 100644
--- a/templates/webpages/requirement_spec_type/list.html
+++ b/templates/webpages/requirement_spec_type/list.html
@@ -1,6 +1,5 @@
 [% USE HTML %][% USE L %][% USE LxERP %]
-
- <div class="listtop">[% FORM.title %]</div>
+<h1>[% FORM.title %]</h1>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/rp/html_report_susa.html b/templates/webpages/rp/html_report_susa.html
index 54e47f7f4..3fb2e9af6 100644
--- a/templates/webpages/rp/html_report_susa.html
+++ b/templates/webpages/rp/html_report_susa.html
@@ -1,5 +1,6 @@
 [%- USE T8 %]
 [%- USE HTML %]
+<h1>[% 'Summen- und Saldenliste' | $T8 %] [% template_fromto %]</h1>
 
  <script type="text/javascript">
   <!--
@@ -28,8 +29,6 @@
   <p>[% MESSAGE %]</p>
  [% END %]
 
- <div class="listtop" width="100%">[% 'Summen- und Saldenliste' | $T8 %] [% template_fromto %]</div>
-
  [% IF TOP_INFO_TEXT %]
   <p>[% TOP_INFO_TEXT %]</p>
  [% END %]
diff --git a/templates/webpages/sepa/bank_transfer_add.html b/templates/webpages/sepa/bank_transfer_add.html
index 4ae82d12d..d09a489ba 100644
--- a/templates/webpages/sepa/bank_transfer_add.html
+++ b/templates/webpages/sepa/bank_transfer_add.html
@@ -9,8 +9,7 @@
  [% SET arap = 'ar' %]
  [% SET iris = 'is' %]
 [%- END %]
-
- <p><div class="listtop">[% title %]</div></p>
+<h1>[% title %]</h1>
 
  <form action="sepa.pl" method="post">
   <p>
diff --git a/templates/webpages/sepa/bank_transfer_create.html b/templates/webpages/sepa/bank_transfer_create.html
index 80af4c49d..cf3cfaddf 100644
--- a/templates/webpages/sepa/bank_transfer_create.html
+++ b/templates/webpages/sepa/bank_transfer_create.html
@@ -10,13 +10,12 @@
  [% SET arap = 'ar' %]
  [% SET iris = 'is' %]
 [%- END %]
+<h1>[% title %]</h1>
 
  [%- IF error_message %]
  <p><div class="message_error">[% error_message %]</div></p>
  [%- END %]
 
- <p><div class="listtop">[% title %]</div></p>
-
  <form action="sepa.pl" method="post">
   <p>1.
    [%- IF is_vendor %]
diff --git a/templates/webpages/sepa/bank_transfer_created.html b/templates/webpages/sepa/bank_transfer_created.html
index 773cdea73..e4930156c 100644
--- a/templates/webpages/sepa/bank_transfer_created.html
+++ b/templates/webpages/sepa/bank_transfer_created.html
@@ -1,7 +1,6 @@
 [%- USE T8 %]
 [% USE HTML %]
-
- <p><div class="listtop">[% title %]</div></p>
+<h1>[% title %]</h1>
 
  <p>
   [% 'The SEPA export has been created.' | $T8 %]
diff --git a/templates/webpages/sepa/bank_transfer_edit.html b/templates/webpages/sepa/bank_transfer_edit.html
index 589b3581b..a0ccd97e6 100644
--- a/templates/webpages/sepa/bank_transfer_edit.html
+++ b/templates/webpages/sepa/bank_transfer_edit.html
@@ -11,8 +11,7 @@
  [% SET arap = 'ar' %]
  [% SET iris = 'is' %]
 [%- END %]
-
- <p><div class="listtop">[% title %]: [% HTML.escape(export.ids.join(', ')) %]</div></p>
+<h1>[% title %]: [% HTML.escape(export.ids.join(', ')) %]</h1>
 
  <form action="sepa.pl" method="post">
   <input type="hidden" name="action" value="dispatcher">
diff --git a/templates/webpages/sepa/bank_transfer_mark_as_closed_step1.html b/templates/webpages/sepa/bank_transfer_mark_as_closed_step1.html
index 9f7629124..f1c049830 100644
--- a/templates/webpages/sepa/bank_transfer_mark_as_closed_step1.html
+++ b/templates/webpages/sepa/bank_transfer_mark_as_closed_step1.html
@@ -1,7 +1,6 @@
 [%- USE T8 %]
 [% USE HTML %]
-
- <p><div class="listtop">[% title %]</div></p>
+<h1>[% title %]</h1>
 
  <form action="sepa.pl" method="post">
   <p>
diff --git a/templates/webpages/sepa/bank_transfer_search.html b/templates/webpages/sepa/bank_transfer_search.html
index 567506cab..a88d402be 100644
--- a/templates/webpages/sepa/bank_transfer_search.html
+++ b/templates/webpages/sepa/bank_transfer_search.html
@@ -2,8 +2,7 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
-
- <p><div class="listtop">[% title %]</div></p>
+<h1>[% title %]</h1>
 
  <form action="sepa.pl" method="post">
   <p>
diff --git a/templates/webpages/task_server/show.html b/templates/webpages/task_server/show.html
index 293ffd26a..4a44ad0db 100644
--- a/templates/webpages/task_server/show.html
+++ b/templates/webpages/task_server/show.html
@@ -1,6 +1,5 @@
 [% USE HTML %][% USE L %][% USE LxERP %]
-
- <div class="listtop">[% FORM.title %]</div>
+<h1>[% FORM.title %]</h1>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/todo/show_todo_list.html b/templates/webpages/todo/show_todo_list.html
index 04566d275..466e6bb6b 100644
--- a/templates/webpages/todo/show_todo_list.html
+++ b/templates/webpages/todo/show_todo_list.html
@@ -1,7 +1,6 @@
 [%- USE T8 %]
 [%- USE HTML %]
-
- <div class="listtop" style="margin-bottom: 10px">[% 'Your TODO list' | $T8 %]</div>
+<h1>[% 'Your TODO list' | $T8 %]</h1>
 
  [%- IF !todo_list %]
  <p>
diff --git a/templates/webpages/ustva/config_step1.html b/templates/webpages/ustva/config_step1.html
index d5b31525a..ad1f8b6b8 100644
--- a/templates/webpages/ustva/config_step1.html
+++ b/templates/webpages/ustva/config_step1.html
@@ -1,13 +1,9 @@
 [%- USE T8 %]
-[% USE HTML %]<!--This file is autogenerated,
- Edit templates/webpages/ustva/config_step1_master.html
- and run locale/<cc>/locales.pl -->
+[% USE HTML %]
+<h1>[% 'Tax Office Preferences' | $T8 %]</h1>
 
 <form name="verzeichnis" method="post" action="[% HTML.escape(script) %]">
 <table width="100%">
-   <tr>
-      <th class="listtop">[% 'Tax Office Preferences' | $T8 %]</th>
-    </tr>
     <tr>
      <td>
        <br />
diff --git a/templates/webpages/ustva/config_step2.html b/templates/webpages/ustva/config_step2.html
index d566dbd29..083118dc1 100644
--- a/templates/webpages/ustva/config_step2.html
+++ b/templates/webpages/ustva/config_step2.html
@@ -1,15 +1,9 @@
 [%- USE T8 %]
-[% USE HTML %]<!--This file is autogenerated,
- Edit templates/webpages/ustva/config_step2_master.html
- and run locale/<cc>/locales.pl -->
-
+[% USE HTML %]
+<h1>[% 'Tax Office Preferences' | $T8 %]</h1>
 
   <form name="elsterform" method="post" action="[% script %]">
     <table width="100%">
-       <tr>
-         <th colspan="2" class="listtop">
-           [% 'Tax Office Preferences' | $T8 %]</th>
-       </tr>
        <tr>
          <td colspan=2>
            <br>
diff --git a/templates/webpages/ustva/report.html b/templates/webpages/ustva/report.html
index f59a4c770..998bbfdd7 100644
--- a/templates/webpages/ustva/report.html
+++ b/templates/webpages/ustva/report.html
@@ -1,17 +1,12 @@
 [%- USE T8 %]
-[% USE HTML %]<!--This file is autogenerated,
- Edit templates/webpages/ustva/report_master.html
- and run locale/<cc>/locales.pl -->
+[% USE HTML %]
+<h1>[% HTML.escape(title) %]</h1>
 
  <form method="post" action="[% HTML.escape(script) %]">
 
  <input type="hidden" name="title" value="[% HTML.escape(title) %]">
 
  <table width="100%">
-  <tr>
-    <th class="listtop">[% HTML.escape(title) %]</th>
-  </tr>
-  <tr height="5"></tr>
   <tr>
     <td>
       <table>
diff --git a/templates/webpages/vk/search_invoice.html b/templates/webpages/vk/search_invoice.html
index 8a773cec6..87626463d 100644
--- a/templates/webpages/vk/search_invoice.html
+++ b/templates/webpages/vk/search_invoice.html
@@ -1,13 +1,11 @@
 [%- USE T8 %]
 [%- USE L %]
+<h1>[% title %]</h1>
 
 <form method=post name="search_invoice" action=[% script %]>
   <input type="hidden" name="sort" value="transdate">
   <input type=hidden name=nextsub value=[% nextsub %]>
 
-  <div class="listtop">[% title %]</div>
-
-
   <table>
 
     <tr>
diff --git a/templates/webpages/webdav/_list.html b/templates/webpages/webdav/_list.html
index 50e92d660..6b643f8ff 100644
--- a/templates/webpages/webdav/_list.html
+++ b/templates/webpages/webdav/_list.html
@@ -1,10 +1,9 @@
 [% USE HTML %][% USE T8 %]
+<h1>[% 'Documents in the WebDAV repository' | $T8 %]</h1>
 
 [%- IF INSTANCE_CONF.get_webdav %]
 <div id="ui-tabs-webdav">
 
- <div class="listtop" align="left">[% 'Documents in the WebDAV repository' | $T8 %]</div>
-
  <table width="100%">
   <tr>
    <td align="left" width="30%"><b>[% 'File name' | $T8 %]</b></td>
diff --git a/templates/webpages/wh/journal_filter.html b/templates/webpages/wh/journal_filter.html
index e6082cd9c..07ec2e7b3 100644
--- a/templates/webpages/wh/journal_filter.html
+++ b/templates/webpages/wh/journal_filter.html
@@ -1,6 +1,8 @@
 [%- USE T8 %]
 [%- USE L %]
 [%- USE HTML %][%- USE JavaScript %]
+<h1>[% 'Report about warehouse transactions' | $T8 %]</h1>
+
  <script type="text/javascript">
    <!--
       warehouses = new Array();
@@ -63,8 +65,6 @@
      -->
  </script>
 
- <div class="listtop">[% 'Report about warehouse transactions' | $T8 %]</div>
-
  <form method="post" name="Form" action="wh.pl">
 
   <input type="hidden" name="nextsub" value="generate_journal">
diff --git a/templates/webpages/wh/removal_parts_selection.html b/templates/webpages/wh/removal_parts_selection.html
index 5cf5ffa35..5bc1e30a9 100644
--- a/templates/webpages/wh/removal_parts_selection.html
+++ b/templates/webpages/wh/removal_parts_selection.html
@@ -1,13 +1,12 @@
 [%- USE T8 %]
 [%- USE HTML %][%- USE JavaScript %]
+<h1>[% title %]</h1>
 
  <form method="post" action="wh.pl">
 
   <input type="hidden" name="nextsub" value="remove_parts">
   <input type="hidden" name="warehouse_id" value="[% HTML.escape(warehouse_id) %]">
 
-  <div class="listtop">[% title %]</div>
-
   <p>[% 'Removal from warehouse' | $T8 %]: [% warehouse_description %]</p>
 
   <p>
diff --git a/templates/webpages/wh/report_filter.html b/templates/webpages/wh/report_filter.html
index 12a3e0b60..70fb4f126 100644
--- a/templates/webpages/wh/report_filter.html
+++ b/templates/webpages/wh/report_filter.html
@@ -1,6 +1,8 @@
 [%- USE T8 %]
 [%- USE L %]
 [%- USE HTML %][%- USE JavaScript %]
+<h1>[% 'Report about warehouse contents' | $T8 %]</h1>
+
  <script type="text/javascript">
    <!--
       warehouses = new Array();
@@ -63,8 +65,6 @@
      -->
  </script>
 
- <div class="listtop">[% 'Report about warehouse contents' | $T8 %]</div>
-
  <form method="post" name="Form" action="wh.pl">
 
   <input type="hidden" name="nextsub" value="generate_report">
diff --git a/templates/webpages/wh/transfer_parts_selection.html b/templates/webpages/wh/transfer_parts_selection.html
index 5a7aabf86..0f5d2f50a 100644
--- a/templates/webpages/wh/transfer_parts_selection.html
+++ b/templates/webpages/wh/transfer_parts_selection.html
@@ -1,5 +1,7 @@
 [%- USE T8 %]
 [%- USE HTML %][%- USE JavaScript %]
+<h1>[% title %]</h1>
+
  <script type="text/javascript">
   <!--
       warehouses = new Array();
@@ -37,8 +39,6 @@
   <input type="hidden" name="nextsub" value="transfer_parts">
   <input type="hidden" name="warehouse_id" value="[% HTML.escape(warehouse_id) %]">
 
-  <div class="listtop">[% title %]</div>
-
   <p>[% 'Transfer from warehouse' | $T8 %]: [% warehouse_description %]</p>
 
   <p>
diff --git a/templates/webpages/wh/warehouse_selection.html b/templates/webpages/wh/warehouse_selection.html
index 429b3b1e6..6b48f4014 100644
--- a/templates/webpages/wh/warehouse_selection.html
+++ b/templates/webpages/wh/warehouse_selection.html
@@ -2,6 +2,8 @@
 [%- USE HTML %]
 [%- USE L %]
 [%- USE JavaScript %]
+<h1>[% title %]</h1>
+
  <script type="text/javascript" src="js/common.js"></script>
  <script type="text/javascript" src="js/part_selection.js"></script>
  <script type="text/javascript">
@@ -68,8 +70,6 @@
   <p>[% saved_message %]</p>
   [% END %]
 
-  <div class="listtop">[% title %]</div>
-
   <p>
    [% 'If you enter values for the part number and / or part description then only those bins containing parts whose part number or part description match your input will be shown.' | $T8 %]
   </p>
diff --git a/templates/webpages/wh/warehouse_selection_assembly.html b/templates/webpages/wh/warehouse_selection_assembly.html
index 4fb3a715f..17a6f9d8a 100644
--- a/templates/webpages/wh/warehouse_selection_assembly.html
+++ b/templates/webpages/wh/warehouse_selection_assembly.html
@@ -1,6 +1,8 @@
 [%- USE T8 %]
 [%- USE L %]
 [%- USE HTML %][%- USE JavaScript %][%- USE LxERP %]
+<h1>[% title %]</h1>
+
  <script type="text/javascript" src="js/common.js"></script>
  <script type="text/javascript" src="js/part_selection.js"></script>
  <script type="text/javascript">
@@ -64,8 +66,6 @@
   <p>[% saved_message %]</p>
   [% END %]
 
-  <div class="listtop">[% title %]</div>
-
   <p>
    <table>
     <tr>
diff --git a/templates/webpages/wh/warehouse_selection_stock.html b/templates/webpages/wh/warehouse_selection_stock.html
index 50da3f1e2..d77f8c5e2 100644
--- a/templates/webpages/wh/warehouse_selection_stock.html
+++ b/templates/webpages/wh/warehouse_selection_stock.html
@@ -1,6 +1,8 @@
 [%- USE T8 %]
 [%- USE L %]
 [%- USE HTML %][%- USE JavaScript %][%- USE LxERP %]
+<h1>[% title %]</h1>
+
  <script type="text/javascript" src="js/common.js"></script>
  <script type="text/javascript" src="js/part_selection.js"></script>
  <script type="text/javascript">
@@ -64,8 +66,6 @@
   <p>[% saved_message %]</p>
   [% END %]
 
-  <div class="listtop">[% title %]</div>
-
   <p>
    <table>
     <tr>