commit af6bcf02dfecfaee40003220616ef28f04ded389
Author: Hans Peter Schlaepfer <hanspeter.schlaepfer@revamp-it.ch>
Date:   Fri Jan 4 05:45:40 2019 +0100

    Neues kivitendo Design Aenderungen in templates/webpages/am/..

diff --git a/templates/webpages/am/_units_header_info.html b/templates/webpages/am/_units_header_info.html
index a54a782b0..7c1b914d4 100644
--- a/templates/webpages/am/_units_header_info.html
+++ b/templates/webpages/am/_units_header_info.html
@@ -1,7 +1,9 @@
-[%- USE HTML -%][%- USE LxERP -%][%- USE T8 -%]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE T8 %]
 <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.') %]
- [% LxERP.t8('You have to define a unit as a multiple of a smaller unit.') %]
- [% LxERP.t8('Therefore the definition of "kg" with the base unit "g" and a factor of 1000 is valid while defining "g" with a base unit of "kg" and a factor of "0.001" is not.') %]
+  [% 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.') %]
+  [% LxERP.t8('You have to define a unit as a multiple of a smaller unit.') %]
+  [% LxERP.t8('Therefore the definition of "kg" with the base unit "g" and a factor of 1000 is valid while defining "g" with a base unit of "kg" and a factor of "0.001" is not.') %]
 </p>
diff --git a/templates/webpages/am/add_unit.html b/templates/webpages/am/add_unit.html
index 573121cb5..50cdac5f0 100644
--- a/templates/webpages/am/add_unit.html
+++ b/templates/webpages/am/add_unit.html
@@ -1,39 +1,57 @@
-[%- USE HTML -%][%- USE T8 -%]
+[% USE HTML %]
+[% USE T8 %]
+
 <h1>[% 'Add unit' | $T8 %]</h1>
 
 [% PROCESS "am/_units_header_info.html" %]
 
-<hr>
-
 <form method="post" action="[% HTML.escape(script) %]" id="form">
+<div class="wrapper">
+  <input type="hidden" name="type" value="unit">
+
+  <table class="tbl-horizontal">
+      <colgroup> <col class="wi-normal"><col class="wi-lightwide"> </colgroup>
+    <tbody>
+      <tr>
+        <th>[% 'Unit' | $T8 %]</th>
+        <td><input type="text" name="new_name" size="20" class="wi-normal"></td>
+      </tr>
+      <tr>
+        <th>[% 'Base unit' | $T8 %]</th>
+        <td>
+          <select name="new_base_unit" class="wi-normal">
+            [% FOREACH row = NEW_BASE_UNIT_DDBOX %]
+              <option [% row.selected %]>[% row.name %]</option>
+            [% END %]
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Factor' | $T8 %]</th>
+        <td><input type="text" name="new_factor" class="wi-normal"></td>
+      </tr>
+    </tbody>
+  </table>
+
+  <table class="tbl-horizontal">
+    <caption>[% '' | $T8 %]</caption>
+    <colgroup> <col class="wi-normal"><col class="wi-lightwide"><col class="wi-small"><col class="wi-lightwide"> </colgroup>
+    <tbody>
+      [% FOREACH language = LANGUAGES %]
+        <tr>
+          <th>[% language.description %]</th>
+          <td><input type="text" name="new_localized_[% language.id %]" class="wi-normal" maxlength="20"></td>
+          <th>[% 'Plural' | $T8 %]</th>
+          <td><input type="text" name="new_localized_plural_[% language.id %]" class="wi-normal" maxlength="20"></td>
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+
 
- <input type="hidden" name="type" value="unit">
-
- <table>
-  <tr>
-   <th align="right">[% 'Unit' | $T8 %]</th>
-   <td><input name="new_name" size="20" maxlength="20"></td>
-  </tr>
-  <tr>
-   <th align="right">[% 'Base unit' | $T8 %]</th>
-   <td>
-    <select name="new_base_unit">
-     [% FOREACH row = NEW_BASE_UNIT_DDBOX %]<option [% row.selected %]>[% row.name %]</option>[% END %]
-    </select>
-   </td>
-  </tr>
-  <tr>
-   <th align="right">[% 'Factor' | $T8 %]</th>
-   <td><input name="new_factor"></td>
-  </tr>
-
-  [% FOREACH language = LANGUAGES %]
-   <tr>
-    <th align="right">[% language.description %]</th>
-    <td><input name="new_localized_[% language.id %]" size="20" maxlength="20"></td>
-    <th align="right">[% 'Plural' | $T8 %]</th>
-    <td><input name="new_localized_plural_[% language.id %]" size="20" maxlength="20"></td>
-   </tr>
-  [% END %]
- </table>
+
+
+
+</div><!-- /.wrapper -->
 </form>
+
diff --git a/templates/webpages/am/audit_control.html b/templates/webpages/am/audit_control.html
index 6452b1450..c7ec7ce7f 100644
--- a/templates/webpages/am/audit_control.html
+++ b/templates/webpages/am/audit_control.html
@@ -7,15 +7,18 @@
 
 <form method="post" action="am.pl" id="form">
 
-<table>
-  <tr>
-    <th>[% 'Close Books up to' | $T8 %]</th>
-    <td>[% L.date_tag('closedto', closedto) %]</td>
-  </tr>
-  <tr>
-    <th>[% 'Maximum future booking interval' | $T8 %]</th>
-    <td><input type="text" name="max_future_booking_interval" id="max_future_booking_interval" value="[% HTML.escape(max_future_booking_interval) %]"></td>
-  </tr>
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Close Books up to' | $T8 %]</th>
+      <td>[% L.date_tag('closedto', closedto) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Maximum future booking interval' | $T8 %]</th>
+      <td><input type="text" name="max_future_booking_interval" id="max_future_booking_interval" value="[% HTML.escape(max_future_booking_interval) %]"></td>
+    </tr>
+  </tbody>
 </table>
 
+
 </form>
diff --git a/templates/webpages/am/config.html b/templates/webpages/am/config.html
index 3cea8184c..6717b4c01 100644
--- a/templates/webpages/am/config.html
+++ b/templates/webpages/am/config.html
@@ -1,266 +1,239 @@
-[%- USE T8 %]
-[%- USE LxERP %]
-[%- USE HTML %]
-[%- USE L %]
+[% USE T8 %]
+[% USE LxERP %]
+[% USE HTML %]
+[% USE L %]
 
 <h1>[% title %]</h1>
 
- <form method="post" action="am.pl" name="Form" id="form">
-  <div class="tabwidget">
-   <ul>
-    <li><a href="#page_personal_settings">[% 'Personal settings' | $T8 %]</a></li>
-    <li><a href="#page_display_options">[% 'Display options' | $T8 %]</a></li>
-    <li><a href="#page_print_options">[% 'Print options' | $T8 %]</a></li>
-    <li><a href="#page_todo_list_options">[% 'TODO list options' | $T8 %]</a></li>
-   </ul>
-
-   <div id="page_personal_settings">
-
-    <table>
-     <tr>
-      <th align="right">[% 'Name' | $T8 %]</th>
-      <td><input name="name" size="15" value="[% HTML.escape(MYCONFIG.name) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right">[% 'Password' | $T8 %]</th>
-      <td>
-       [%- IF CAN_CHANGE_PASSWORD %]
-       <input type="password" name="new_password" size="10" value="********">
-       [%- ELSE %]
-       <input type="hidden" name="new_password" value="********">
-       [%- END %]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">[% 'E-mail' | $T8 %]</th>
-      <td><input name="email" size="30" value="[% HTML.escape(MYCONFIG.email) %]"></td>
-     </tr>
-
-     <tr valign="top">
-      <th align="right">[% 'Signature' | $T8 %]</th>
-      <td><textarea id="signature" name="signature" class="toggletextarea" rows="5" cols="50">[% HTML.escape(MYCONFIG.signature) %] </textarea>
-         <span id="full_signature" class="toggletextarea"> <textarea readonly name="full_signature" rows="10" cols="50" >[% HTML.escape(full_signature) %]</textarea> </span>
-         <a href="#" class="togglelink">[% 'Check full signature' | $T8 %]</a>
-         <a href="#" id="edit_signature" class="togglelink">[% 'Edit user signature' | $T8 %]</a>
-          </td> </tr>
-     <tr>
-      <th align="right">[% 'Phone' | $T8 %]</th>
-      <td><input name="tel" size="14" value="[% HTML.escape(MYCONFIG.tel) %]"></td>
-     </tr>
-
-     <tr>
-      <th align="right">[% 'Fax' | $T8 %]</th>
-      <td><input name="fax" size="14" value="[% HTML.escape(MYCONFIG.fax) %]"></td>
-     </tr>
-
+<form method="post" action="am.pl" name="Form" id="form">
+<div class="tabwidget">
+<ul>
+  <li><a href="#page_personal_settings">[% 'Personal settings' | $T8 %]</a></li>
+  <li><a href="#page_display_options">[% 'Display options' | $T8 %]</a></li>
+  <li><a href="#page_print_options">[% 'Print options' | $T8 %]</a></li>
+  <li><a href="#page_todo_list_options">[% 'TODO list options' | $T8 %]</a></li>
+</ul>
+
+
+<div id="page_personal_settings">
+  <div class="wrapper">
+    <table class="tbl-horizontal">
+      <colgroup> <col class="wi-mediumsmall"><col class="wi-lightwide"> </colgroup>
+      <caption> [% 'Personal settings' | $T8 %] </caption>
+      <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>
+      <tbody>
       <tr>
-        <th align="right">[% 'taxincluded checked' | $T8 %]</th>
+        <th>[% 'Name' | $T8 %]</th>
+        <td><input type="text" name="name" class="wi-wide" value="[% HTML.escape(MYCONFIG.name) %]"></td>
+      </tr>
+      <tr>
+        <th>[% 'Password' | $T8 %]</th>
         <td>
-          [% L.yes_no_tag('taxincluded_checked', MYCONFIG.taxincluded_checked) %]
+          [% IF CAN_CHANGE_PASSWORD %]
+            <input type="password" name="new_password" class="wi-wide" value="********">
+          [% ELSE %]
+            <input type="hidden" name="new_password" value="********" class="wi-wide">
+          [% END %]
         </td>
       </tr>
-
       <tr>
-        <th align="right">[% 'Focus position after update' | $T8 %]</th>
+        <th>[% 'E-mail' | $T8 %]</th>
+        <td><input type="text" name="email" class="wi-wide" value="[% HTML.escape(MYCONFIG.email) %]"></td>
+      </tr>
+      <tr>
+        <th>[% 'Signature' | $T8 %]</th>
         <td>
-          [% L.select_tag(
-            'focus_position',
-            [
-              ['new_description',  LxERP.t8('New row, description')],
-              ['new_partnumber',   LxERP.t8('New row, partnumber')],
-              ['new_qty',          LxERP.t8('New row, qty')],
-              ['last_description', LxERP.t8('Last row, description')],
-              ['last_partnumber',  LxERP.t8('Last row, partnumber')],
-              ['last_qty',         LxERP.t8('Last row, qty')],
-            ],
-            default => MYCONFIG.focus_position)
-          %]
+          <textarea id="signature" name="signature" class="toggletextarea" rows="5" cols="50">[% HTML.escape(MYCONFIG.signature) %] </textarea>
+          <span id="full_signature" class="toggletextarea"> <textarea readonly name="full_signature" rows="10" cols="50">[% HTML.escape(full_signature) %]</textarea>
+          </span> <a href="#" class="togglelink">[% 'Check full signature' | $T8 %]</a> <a href="#" id="edit_signature" class="togglelink">[% 'Edit user signature' | $T8 %]</a>
         </td>
       </tr>
-
       <tr>
-        <th align="right">[% 'Item multi selection with qty' | $T8 %]</th>
-        <td>
-          [% L.yes_no_tag('item_multiselect', MYCONFIG.item_multiselect) %]
+        <th>[% 'Phone' | $T8 %]</th>
+        <td><input type="text" name="tel" class="wi-wide" value="[% HTML.escape(MYCONFIG.tel) %]"></td>
+      </tr>
+      <tr>
+        <th>[% 'Fax' | $T8 %]</th>
+        <td><input type="text" name="fax" class="wi-wide" value="[% HTML.escape(MYCONFIG.fax) %]"></td>
+      </tr>
+      <tr>
+        <th>[% 'taxincluded checked' | $T8 %]</th>
+        <td> [% L.yes_no_tag('taxincluded_checked', MYCONFIG.taxincluded_checked, class='wi-small') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Focus position after update' | $T8 %]</th>
+        <td> [% L.select_tag( 'focus_position', [ ['new_description', LxERP.t8('New row, description')], ['new_partnumber', LxERP.t8('New row, partnumber')], ['new_qty', LxERP.t8('New row, qty')], ['last_description', LxERP.t8('Last row, description')], ['last_partnumber', LxERP.t8('Last row, partnumber')], ['last_qty', LxERP.t8('Last row, qty')], ], default => MYCONFIG.focus_position, class='wi-wide') %]
         </td>
       </tr>
-
+      <tr>
+        <th>[% 'Item multi selection with qty' | $T8 %]</th>
+        <td> [% L.yes_no_tag('item_multiselect', MYCONFIG.item_multiselect, class='wi-small') %]
+        </td>
+      </tr>
+    </tbody>
     </table>
-   </div>
-
-   <div id="page_display_options">
-
-    <table>
-     <tr>
-      <th align="right">[% 'Date Format' | $T8 %]</th>
-      <td>
-        [% L.select_tag('dateformat', DATEFORMATS, value_key = 'value', title_key = 'name') %]
-      </td>
-     </tr>
-     <tr>
-       <th align="right">[% 'Time Format' | $T8 %]</th>
-       <td>
-         [% L.select_tag('timeformat', TIMEFORMATS, value_key = 'value', title_key = 'name') %]
-       </td>
-     </tr>
-     <tr>
-      <th align="right">[% 'Output Number Format' | $T8 %]</th>
-      <td>
-        [% L.select_tag('numberformat', NUMBERFORMATS, value_key = 'value', title_key = 'name') %]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">[% 'Language' | $T8 %]</th>
-      <td>
-        [% L.select_tag('countrycode', COUNTRYCODES, value_key = 'value', title_key = 'name') %]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">[% 'Stylesheet' | $T8 %]</th>
-      <td>
-        [% L.select_tag('usestylesheet', STYLESHEETS, value_key = 'value', title_key = 'name') %]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">[% 'Setup Menu' | $T8 %]</th>
-      <td>
-       <select name="menustyle">
-        <option value="old"[% IF MYCONFIG.menustyle == 'old' %] selected[% END %]>[% 'Old (on the side)' | $T8 %]</option>
-        <option value="v3"[% IF MYCONFIG.menustyle == 'v3' %] selected[% END %]>[% 'Top (CSS)' | $T8 %]</option>
-        <option value="neu"[% IF MYCONFIG.menustyle == 'neu' %] selected[% END %]>[% 'Top (Javascript)' | $T8 %]</option>
-       </select>
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">[% 'Form details (second row)' | $T8 %]</th>
+  </div><!-- /.wrapper -->
+</div><!-- /#page_personal_settings -->
+
+<div id="page_display_options">
+  <div class="wrapper">
+    <table class="tbl-horizontal">
+    <colgroup> <col class="wi-mediumsmall"><col class="wi-lightwide"> </colgroup>
+    <caption>[% 'Display options' | $T8 %]</caption>
+    <tbody>
+    <tr>
+      <th>[% 'Date Format' | $T8 %]</th>
+      <td>[% L.select_tag('dateformat', DATEFORMATS, value_key='value', title_key='name', class="wi-small") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Time Format' | $T8 %]</th>
+      <td>[% L.select_tag('timeformat', TIMEFORMATS, value_key='value', title_key='name', class="wi-small") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Output Number Format' | $T8 %]</th>
+      <td>[% L.select_tag('numberformat', NUMBERFORMATS, value_key='value', title_key='name', class="wi-small") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Language' | $T8 %]</th>
+      <td>[% L.select_tag('countrycode', COUNTRYCODES, value_key = 'value', title_key = 'name', class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Stylesheet' | $T8 %]</th>
+      <td>[% L.select_tag('usestylesheet', STYLESHEETS, value_key = 'value', title_key = 'name', class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Setup Menu' | $T8 %]</th>
       <td>
-       <select name="show_form_details">
-        <option value="1"[% IF  MYCONFIG.show_form_details %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
-        <option value="0"[% IF !MYCONFIG.show_form_details %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
-       </select>
+        <select name="menustyle" class="wi-lightwide">
+          <option value="old"[% IF MYCONFIG.menustyle == 'old' %] selected[% END %]>[% 'Old (on the side)' | $T8 %]</option>
+          <option value="v3"[% IF MYCONFIG.menustyle == 'v3' %] selected[% END %]>[% 'Top (CSS)' | $T8 %]</option>
+          <option value="neu"[% IF MYCONFIG.menustyle == 'neu' %] selected[% END %]>[% 'Top (Javascript)' | $T8 %]</option>
+        </select>
       </td>
-     </tr>
-
-     <tr>
-      <th align="right">[% 'Show custom variable search inputs' | $T8 %]</th>
+    </tr>
+    <tr>
+      <th>[% 'Form details (second row)' | $T8 %]</th>
       <td>
-       <select name="hide_cvar_search_options">
-        <option value="0"[% IF !MYCONFIG.hide_cvar_search_options %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
-        <option value="1"[% IF  MYCONFIG.hide_cvar_search_options %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
-       </select>
+        <select name="show_form_details" class="wi-lightwide">
+          <option value="1"[% IF  MYCONFIG.show_form_details %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
+          <option value="0"[% IF !MYCONFIG.show_form_details %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
+        </select>
       </td>
-     </tr>
-
-     <tr>
-      <th align="right">[% 'Number of columns of custom variables in form details (second row)' | $T8 %]</th>
+    </tr>
+    <tr>
+      <th>[% 'Show custom variable search inputs' | $T8 %]</th>
       <td>
-        [% L.input_tag('form_cvars_nr_cols',  MYCONFIG.form_cvars_nr_cols || 3,  size = 5) %]
+        <select name="hide_cvar_search_options" class="wi-lightwide">
+          <option value="0"[% IF !MYCONFIG.hide_cvar_search_options %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
+          <option value="1"[% IF  MYCONFIG.hide_cvar_search_options %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
+        </select>
       </td>
-     </tr>
-     <tr>
-      <th align="right">[% 'Quick Searches that will be shown in the header for this user' | $T8 %]</th>
-      <td colspan=2>
-        <div class="clearfix">
-         [% L.select_tag("quick_search_modules[]",
-           enabled_quick_searchmodules,
-           value_key  = "name",
-           title_key  = "description_config",
-           id         = "quick_searches",
-           multiple   = 1,
-           with_empty = 1
-           size       = enabled_quick_searchmodules.size,
-           default    = default_quick_searchmodules) %]
+    </tr>
+    <tr>
+      <th>[% 'Number of columns of custom variables in form details (second row)' | $T8 %]</th>
+      <td>[% L.input_tag('form_cvars_nr_cols', MYCONFIG.form_cvars_nr_cols || 3, class='wi-verysmall') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Quick Searches that will be shown in the header for this user' | $T8 %]</th>
+      <td>
+        <div>
+          [% L.select_tag("quick_search_modules[]",
+            enabled_quick_searchmodules,
+            value_key  = "name",
+            title_key  = "description_config",
+            id         = "quick_searches",
+            multiple   = 1,
+            with_empty = 1,
+            size       = enabled_quick_searchmodules.size,
+            default    = default_quick_searchmodules) %]
         </div>
       </td>
     </tr>
+    </tbody>
     </table>
-   </div>
-
-   <div id="page_print_options">
-
-    <table>
-     <input name="printer" type="hidden" value="[% HTML.escape(MYCONFIG.printer) %]">
-
-     <tr>
-      <th align="right">[% 'Default template format' | $T8 %]</th>
-      <td>
-        [% L.select_tag('template_format', TEMPLATE_FORMATS, value_key = 'value', title_key = 'name') %]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">[% 'Default output medium' | $T8 %]</th>
-      <td>
-        [% L.select_tag('default_media', MEDIA, value_key = 'value', title_key = 'name') %]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">[% 'Default printer' | $T8 %]</th>
-      <td>
-       [% L.select_tag('default_printer_id', PRINTERS, default = MYCONFIG.default_printer_id, title_key = 'printer_description', with_empty = 1) %]
-      </td>
-     </tr>
-
-     <tr>
-      <th align="right">[% 'Number of copies' | $T8 %]</th>
-      <td><input name="copies" size="10" value="[% HTML.escape(MYCONFIG.copies) %]"></td>
-     </tr>
+  </div><!-- /.wrapper -->
+</div><!-- /#page_display_options -->
+
+
+<div id="page_print_options">
+  <div class="wrapper">
+    <input name="printer" type="hidden" value="[% HTML.escape(MYCONFIG.printer) %]">
+    <table class="tbl-horizontal">
+      <caption>[% 'Print options' | $T8 %]</caption>
+      <tbody>
+        <tr>
+          <th>[% 'Default template format' | $T8 %]</th>
+          <td> [% L.select_tag('template_format', TEMPLATE_FORMATS, value_key = 'value', title_key = 'name', class='wi-normal') %]
+          </td>
+        </tr>
+        <tr>
+          <th>[% 'Default output medium' | $T8 %]</th>
+          <td> [% L.select_tag('default_media', MEDIA, value_key = 'value', title_key = 'name', class='wi-normal') %]
+          </td>
+        </tr>
+        <tr>
+          <th>[% 'Default printer' | $T8 %]</th>
+          <td> [% L.select_tag('default_printer_id', PRINTERS, default = MYCONFIG.default_printer_id, title_key = 'printer_description', with_empty = 1, class='wi-normal') %]
+          </td>
+        </tr>
+        <tr>
+          <th>[% 'Number of copies' | $T8 %]</th>
+          <td>
+          <input type="text" name="copies" size="10" value="[% HTML.escape(MYCONFIG.copies) %]" class="wi-normal">
+          </td>
+        </tr>
+      </tbody>
     </table>
-   </div>
-
-   <div id="page_todo_list_options">
+  </div><!-- /.wrapper -->
+</div><!-- /#page_print_options -->
 
-    <table>
-     <tr>
-      <th align="right">[% 'Show your TODO list after logging in' | $T8 %]</th>
-      <td colspan="2">
-       <input type="radio" name="todo_cfg.show_after_login" id="todo_cfg_show_after_login_1" value="1"[% IF todo_cfg.show_after_login %] checked[% END %]>
-       <label for="todo_cfg_show_after_login_1">[% 'Yes' | $T8 %]</label>
-       <input type="radio" name="todo_cfg.show_after_login" id="todo_cfg_show_after_login_0" value="0"[% IF !todo_cfg.show_after_login %] checked[% END %]>
-       <label for="todo_cfg_show_after_login_0">[% 'No' | $T8 %]</label>
-      </td>
-     </tr>
 
-     <tr class="listheading">
-      <th colspan="3">[% 'Configuration of individual TODO items' | $T8 %]</th>
-     </tr>
+<div id="page_todo_list_options">
+  <div class="wrapper">
+    <table class="tbl-horizontal">
+    <caption>[% 'Todo list options' | $T8 %]</caption>
+      <colgroup> <col class="wi-normal"><col class="wi-normal"> </colgroup>
+    <tbody>
+      <tr>
+        <th>[% 'Show your TODO list after logging in' | $T8 %]</th>
+        <td>
+        <input type="radio" name="todo_cfg.show_after_login" id="todo_cfg_show_after_login_1" value="1"[% IF todo_cfg.show_after_login %] checked[% END %]>
+        <label for="todo_cfg_show_after_login_1">[% 'Yes' | $T8 %]</label>
+        <input type="radio" name="todo_cfg.show_after_login" id="todo_cfg_show_after_login_0" value="0"[% IF !todo_cfg.show_after_login %] checked[% END %]>
+        <label for="todo_cfg_show_after_login_0">[% 'No' | $T8 %]</label>
+        </td>
+      </tr>
+      <tr>
+        <th colspan="2" class="caption">[% 'Configuration of individual TODO items' | $T8 %]</th>
+      </tr>
+      <tr>
+        <th>[% 'Show follow ups...' | $T8 %]</th>
+        <td>
+          <input type="checkbox" name="todo_cfg.show_follow_ups" id="todo_cfg_show_follow_ups" value="1"[% IF todo_cfg.show_follow_ups %] checked[% END %]>
+          <label for="todo_cfg_show_follow_ups">[% '...on the TODO list' | $T8 %]</label> <br>
+          <input type="checkbox" name="todo_cfg.show_follow_ups_login" id="todo_cfg_show_follow_ups_login" value="1"[% IF todo_cfg.show_follow_ups_login %] checked[% END %]>
+          <label for="todo_cfg_show_follow_ups_login">[% '...after logging in' | $T8 %]</label>
+        </td>
+      </tr>
+      [% IF AUTH.assert('sales_quotation_edit', 'may_fail') %]
+      <tr>
+        <th>[% 'Show overdue sales quotations and requests for quotations...' | $T8 %]</th>
+        <td>
+          <input type="checkbox" name="todo_cfg.show_overdue_sales_quotations" id="todo_cfg_show_overdue_sales_quotations" value="1"[% IF todo_cfg.show_overdue_sales_quotations %] checked[% END %]>
+          <label for="todo_cfg_show_overdue_sales_quotations">[% '...on the TODO list' | $T8 %]</label> <br>
+          <input type="checkbox" name="todo_cfg.show_overdue_sales_quotations_login" id="todo_cfg_show_overdue_sales_quotations_login" value="1"[% IF todo_cfg.show_overdue_sales_quotations_login %] checked[% END %]>
+          <label for="todo_cfg_show_overdue_sales_quotations_login">[% '...after logging in' | $T8 %]</label>
+        </td>
+      </tr>
+      [% END %]
+    </tbody>
+    </table>
+  </div><!-- /.wrapper -->
+</div><!-- /#page_todo_list_options -->
 
-     <tr>
-      <th align="right">[% 'Show follow ups...' | $T8 %]</th>
-      <td>
-       <input type="checkbox" name="todo_cfg.show_follow_ups" id="todo_cfg_show_follow_ups" value="1"[% IF todo_cfg.show_follow_ups %] checked[% END %]>
-       <label for="todo_cfg_show_follow_ups">[% '...on the TODO list' | $T8 %]</label>
-      </td>
-      <td>
-       <input type="checkbox" name="todo_cfg.show_follow_ups_login" id="todo_cfg_show_follow_ups_login" value="1"[% IF todo_cfg.show_follow_ups_login %] checked[% END %]>
-       <label for="todo_cfg_show_follow_ups_login">[% '...after logging in' | $T8 %]</label>
-      </td>
-     </tr>
 
-     [%- IF AUTH.assert('sales_quotation_edit', 'may_fail') %]
-     <tr>
-      <th align="right">[% 'Show overdue sales quotations and requests for quotations...' | $T8 %]</th>
-      <td>
-       <input type="checkbox" name="todo_cfg.show_overdue_sales_quotations" id="todo_cfg_show_overdue_sales_quotations" value="1"[% IF todo_cfg.show_overdue_sales_quotations %] checked[% END %]>
-       <label for="todo_cfg_show_overdue_sales_quotations">[% '...on the TODO list' | $T8 %]</label>
-      </td>
-      <td>
-       <input type="checkbox" name="todo_cfg.show_overdue_sales_quotations_login" id="todo_cfg_show_overdue_sales_quotations_login" value="1"[% IF todo_cfg.show_overdue_sales_quotations_login %] checked[% END %]>
-       <label for="todo_cfg_show_overdue_sales_quotations_login">[% '...after logging in' | $T8 %]</label>
-      </td>
-     </tr>
-     [%- END %]
-    </table>
-   </div>
-  </div>
- </form>
+</div>
+</form>
 
  <script type="text/javascript">
   <!--
diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html
index e07484b63..e0026c025 100644
--- a/templates/webpages/am/edit_accounts.html
+++ b/templates/webpages/am/edit_accounts.html
@@ -1,6 +1,7 @@
-[%- USE T8 %]
-[%- USE L %]
+[% USE T8 %]
+[% USE L %]
 [% USE HTML %]
+
 <h1>[% title %]</h1>
 
 <script type="text/javascript" src="js/FormManager.js" >
@@ -18,6 +19,8 @@ $(function() {
 
 <form method="post" name="EditAccount" action="am.pl" id="form">
 
+<div class="wrapper">
+
 <input type="hidden" name="id"                 value="[% HTML.escape(id) %]">
 <input type="hidden" name="type"               value="account">
 <input type="hidden" name="orphaned"           value="[% HTML.escape(orphaned) %]">
@@ -30,271 +33,234 @@ $(function() {
 <input type="hidden" name="rndgain_accno_id"   value="[% HTML.escape(rndgain_accno_id) %]">
 <input type="hidden" name="rndloss_accno_id"   value="[% HTML.escape(rndloss_accno_id) %]">
 
-<fieldset>
-  <legend>
-    [% 'Main Preferences' | $T8 %]
-  </legend>
-  <table>
+<div class="col">
+
+<table class="tbl-horizontal">
+  <caption>[% 'Main Preferences' | $T8 %]</caption>
+  <colgroup><col class="wi-mediumsmall"><col class="wi-wide"></colgroup>
+  <tbody>
     <tr>
-      <td>
-        <label>
-          [% 'Account Number' | $T8 %]
-        </label></td>
-        <td><input id="accno" name="accno" size="20" value="[% HTML.escape(accno) %]"></td>
+      <th> [% 'Account Number' | $T8 %] </th>
+      <td><input id="accno" name="accno" type="text" size="10" class="wi-small" value="[% HTML.escape(accno) %]"></td>
     </tr>
     <tr>
-      <td>
-        <label>
-          [% 'Description' | $T8 %]
-        </label>
-      </td>
-      <td><input id="description" name="description" size="40" value="[% HTML.escape(description) %]"></td>
+      <th> [% 'Description' | $T8 %] </th>
+      <td><input id="description" name="description" type="text" size="40" class="wi-wide" value="[% HTML.escape(description) %]"></td>
+    </tr>
+    <tr>
+      <th> [% 'Chart Type' | $T8 %] </th>
+      <td> [% IF AccountIsPosted %]
+              [% L.select_tag('dummy_charttype',
+                              all_charttypes,
+                              title_key => 'name',
+                              value_key => 'value',
+                              default => selected_charttype,
+                              disabled => '1',
+                              class = 'wi-wide') %]
+              [% L.hidden_tag('charttype', selected_charttype) %]
+          [% ELSE %]
+              [% L.select_tag('charttype',
+                              all_charttypes,
+                              title_key => 'name',
+                              value_key => 'value',
+                              default => selected_charttype,
+                              class = 'wi-wide') %]
+          [% END %] </td>
+    </tr>
+    <tr>
+      <th>[% 'Account Type' | $T8 %]</th>
+      <td><select name="category" id="AccountType" class="wi-wide">[% select_category %]</select></td>
     </tr>
+    [% IF ChartTypeIsAccount %]
     <tr>
+      <th>[% 'Is this a summary account to record' | $T8 %]</th>
       <td>
-        <label>
-          [% 'Chart Type' | $T8 %]
+        [% L.radio_button_tag('summary_account', value => 'AR', disabled => AccountIsPosted, checked  => AR) %]
+        [% 'AR' | $T8 %]<br>
+        [% L.radio_button_tag('summary_account', value => 'AP', disabled => AccountIsPosted, checked  => AP) %]
+        [% 'AP' | $T8 %]<br>
+        [% L.radio_button_tag('summary_account', value => 'IC', disabled => AccountIsPosted, checked  => IC) %]
+        [% 'Inventory' | $T8 %]<br>
+        [% L.radio_button_tag('summary_account', value => '', disabled => AccountIsPosted) %]
+        [% 'No summary account' | $T8 %]
 
-        </label>
-      </td>
-      <td>
-[% IF AccountIsPosted %]
-        [% L.select_tag('dummy_charttype',
-                        all_charttypes,
-                        title_key => 'name',
-                        value_key => 'value',
-                        default => selected_charttype,
-                        disabled => '1') %]
-        [% L.hidden_tag('charttype', selected_charttype) %]
-[% ELSE %]
-        [% L.select_tag('charttype',
-                        all_charttypes,
-                        title_key => 'name',
-                        value_key => 'value',
-                        default => selected_charttype) %]
-[% END %]
+        [% IF AccountIsPosted %]
+          [% IF AR %] [% L.hidden_tag('AR', 'AR') %] [% END %]
+          [% IF AP %] [% L.hidden_tag('AP', 'AP') %] [% END %]
+          [% IF IC %] [% L.hidden_tag('IC', 'IC') %] [% END %]
+        [% END %]
+
+        [% IF AccountIsPosted %]
+          [% IF AR_amount %] [% L.hidden_tag('AR_amount', 'AR_amount') %] [% END %]
+          [% IF AR_paid   %] [% L.hidden_tag('AR_paid',   'AR_paid')   %] [% END %]
+          [% IF AR_tax    %] [% L.hidden_tag('AR_tax',    'AR_tax')    %] [% END %]
+          [% IF AP_amount %] [% L.hidden_tag('AP_amount', 'AP_amount') %] [% END %]
+          [% IF AP_paid   %] [% L.hidden_tag('AP_paid',   'AP_paid')   %] [% END %]
+          [% IF AP_tax    %] [% L.hidden_tag('AP_tax',    'AP_tax')    %] [% END %]
+          [% SET DIS = ' disabled="disabled"' %]
+        [% END %]
       </td>
     </tr>
-  </table>
-</fieldset>
+  </tbody>
+</table>
 
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend>[% 'Account Type' | $T8 %]</legend>
-  <select name="category" id="AccountType" class="DEPENDS ON charttype BEING A">
-          [% select_category %]</select>
-</fieldset>
+<h3 class="caption">[% 'Taxkeys and Taxreport Preferences' | $T8 %]</h3>
+<div class="long-desc small">
+  <p>[% 'Note: Taxkeys must have a "valid from" date, and will not behave correctly without.' | $T8 %]</p>
+</div>
+<table class="tbl-horizontal">
+  <thead>
+    <tr>
+      <th>[% 'Taxkey' | $T8 %]</th>
+      <th>[% 'valid from' | $T8 %]</th>
+      [% IF feature_ustva %]<th>[% 'pos_ustva' | $T8 %]</th>[% END %]
+      <th>[% 'delete' | $T8 %]? </th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH tk = ACCOUNT_TAXKEYS %]
+      <tr>
+        [% IF tk.id %]
+          <td>
+            <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="[% tk.id %]">
+            <select name="taxkey_tax_[% tk.runningnumber %]" class="wi-wider">[% tk.selecttaxkey %]</select>
+          </td>
+          <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]" type="text" class="wi-date"></td>
+          [% IF feature_ustva %]
+            <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]" class="wi-wider">[% tk.select_tax %]</select></td>
+          [% END %]
+          <td class="center">
+            <input name="taxkey_del_[% tk.runningnumber %]" type="checkbox" value="delete">
+          </td>
+        [% ELSE %]
+          <td>
+            <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="NEW">
+            <select name="taxkey_tax_[% tk.runningnumber %]" class="wi-wider">[% tk.selecttaxkey %]</select>
+          </td>
+          <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]" type="text" class="wi-date"></td>
+          [% IF feature_ustva %]
+            <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]" class="wi-wider">[% tk.select_tax %]</select></td>
+          [% END %]
+          <td>&nbsp;</td>
+        [% END %]
+      </tr>
+    [% END %]
+  </tbody>
+</table>
 
-[% IF ChartTypeIsAccount %]
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend>[% 'Is this a summary account to record' | $T8 %]</legend>
-        [% L.radio_button_tag('summary_account',
-          value => 'AR',
-          disabled => AccountIsPosted,
-          checked  => AR) %]
-        &nbsp;[% 'AR' | $T8 %]
-        [% L.radio_button_tag('summary_account',
-          value => 'AP',
-          disabled => AccountIsPosted,
-          checked  => AP) %]
-        &nbsp;[% 'AP' | $T8 %]
-        [% L.radio_button_tag('summary_account',
-          value => 'IC',
-          disabled => AccountIsPosted,
-          checked  => IC) %]
-        &nbsp;[% 'Inventory' | $T8 %]
-        [% L.radio_button_tag('summary_account',
-          value => '',
-          disabled => AccountIsPosted) %]
-        &nbsp;[% 'No summary account' | $T8 %]
 
-[% IF AccountIsPosted %]
-    [% IF AR %] [% L.hidden_tag('AR', 'AR') %] [% END %]
-    [% IF AP %] [% L.hidden_tag('AP', 'AP') %] [% END %]
-    [% IF IC %] [% L.hidden_tag('IC', 'IC') %] [% END %]
+<table class="tbl-horizontal">
+  <caption>[% 'Report and misc. Preferences' | $T8 %]</caption>
+  <colgroup><col class="wi-mediumsmall"><col class="wi-wide"></colgroup>
+  <tbody>
+  [% IF feature_erfolgsrechnung %]
+    <tr>
+      <th>[% 'Erfolgsrechnung' | $T8 %]</th>
+      <td><select name="pos_er" class="wi-wider">[% select_er %]</select></td>
+    </tr>
+  [% END %]
+  [% IF feature_eurechnung %]
+    <tr>
+      <th>[% 'EUER' | $T8 %]</th>
+      <td><select name="pos_eur" class="wi-wider">[% select_eur %]</select></td>
+    </tr>
+    <tr>
+      <th>[% 'BWA' | $T8 %]</th>
+      <td><select name="pos_bwa" class="wi-wider">[% select_bwa %]</select></td>
+    </tr>
+  [% END %]
+  [% IF feature_datev %]
+    <tr>
+      <th>[% 'Datevautomatik' | $T8 %]</th>
+      <td><input name="datevautomatik" type="checkbox" value="T" [% IF datevautomatik %]checked [% END %]>[% 'If checked the taxkey will not be exported in the DATEV Export, but only IF chart taxkeys differ from general ledger taxkeys' | $T8 %] </td>
+    </tr>
+  [% END %]
+  <tr>
+    <th>[% 'Folgekonto' | $T8 %]</th>
+    <td>
+      <select name="new_chart_id" class="wi-wider">[% selectnewaccount %]</select>
+      <span class="label with-element">[% 'Valid from' | $T8 %]
+      <input name="valid_from" value="[% valid_from %]" type="text" class="wi-mediumsmall"></span>
+    </td>
+  </tr>
+  [% #IF feature_balance %]
+    <!-- PENDENT: UPDATE: Diese Steuerfunktion hat keine Auswirkung in der Bilanz und wird erstmal deaktiviert. -->
+    <!--
+    <tr>
+      <th>[% 'Bilanz' | $T8 %]</th>
+      <td colspan="3"><select name="pos_bilanz">[% select_bilanz %]</select></td>
+    </tr>
+   -->
+  [% #END %]
+  </tbody>
+</table>
 [% END %]
 
-</fieldset>
+</div><!-- /.col -->
 
-[% IF AccountIsPosted %]
-  [% IF AR_amount %] [% L.hidden_tag('AR_amount', 'AR_amount') %] [% END %]
-  [% IF AR_paid   %] [% L.hidden_tag('AR_paid',   'AR_paid')   %] [% END %]
-  [% IF AR_tax    %] [% L.hidden_tag('AR_tax',    'AR_tax')    %] [% END %]
-  [% IF AP_amount %] [% L.hidden_tag('AP_amount', 'AP_amount') %] [% END %]
-  [% IF AP_paid   %] [% L.hidden_tag('AP_paid',   'AP_paid')   %] [% END %]
-  [% IF AP_tax    %] [% L.hidden_tag('AP_tax',    'AP_tax')    %] [% END %]
-  [%- SET DIS = ' disabled="disabled"' %]
-[% END %]
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend>[% 'Include in drop-down menus' | $T8 %]</legend>
-  <p style='font-weight:normal'>[% 'Changes in this block are only sensible if the account is NOT a summary account AND there exists one valid taxkey. To select both Receivables and Payables only make sense for Payment / Receipt (i.e. account cash).' | $T8 %]</p>
-  <p style='font-weight:normal'>[% 'Changes to Receivables and Payables are only possible if no transactions to this account are posted yet.' | $T8 %]
-  [% 'The changing of tax-o-matic account is NOT recommended, but if you do so please also (re)configure booking groups and reconfigure ALL charts which point to this tax-o-matic account. ' | $T8 %]</p>
-  <table width="100%">
+<div class="col" style="width:30.0em;">
+
+
+<h3 class="caption">[% 'Include in drop-down menus' | $T8 %]</h3>
+<div class="long-description small"><p>[% 'Changes in this block are only sensible if the account is NOT a summary account AND there exists one valid taxkey. To select both Receivables and Payables only make sense for Payment / Receipt (i.e. account cash).' | $T8 %]</p>
+  <p>
+    [% 'Changes to Receivables and Payables are only possible if no transactions to this account are posted yet.' | $T8 %]
+    [% 'The changing of tax-o-matic account is NOT recommended, but if you do so please also (re)configure booking groups and reconfigure ALL charts which point to this tax-o-matic account. ' | $T8 %]</p>
+</div><!-- /.long-description -->
+
+
+<table class="tbl-horizontal">
+  <colgroup><col class="wi-normal"><col class="wi-normal"></colgroup>
+  <tbody>
     <tr>
-      <th align="left">[% 'Receivables' | $T8 %]</th>
-      <th align="left">[% 'Payables' | $T8 %]</th>
-      <th align="left">[% 'Parts Inventory' | $T8 %]</th>
-      <th align="left">[% 'Service Items' | $T8 %]</th>
+      <td><b>[% 'Receivables' | $T8 %]</b><br>
+        [% L.radio_button_tag('AR_include_in_dropdown', value => 'AR_amount', disabled => AccountIsPosted, checked  => AR_amount) %]
+        [% 'Revenue' | $T8 %] <br>
+        [% L.radio_button_tag('AR_include_in_dropdown', value => 'AR_paid', disabled => AccountIsPosted, checked  => AR_paid) %]
+        [% 'Receipt' | $T8 %] <br>
+        [% L.radio_button_tag('AR_include_in_dropdown', value => 'AR_tax', disabled => AccountIsPosted, checked  => AR_tax) %]
+        [% 'Tax' | $T8 %] <br>
+        [% L.radio_button_tag('AR_include_in_dropdown', value => '', disabled => AccountIsPosted) %]
+        [% 'do not include' | $T8 %]
+      </td>
+      <td><b>[% 'Payables' | $T8 %]</b><br>
+        [% L.radio_button_tag('AP_include_in_dropdown', value => 'AP_amount', disabled => AccountIsPosted, checked  => AP_amount) %]
+        [% 'Expense/Asset' | $T8 %] <br>
+        [% L.radio_button_tag('AP_include_in_dropdown', value => 'AP_paid', disabled => AccountIsPosted, checked  => AP_paid) %]
+        [% 'Payment' | $T8 %] <br>
+        [% L.radio_button_tag('AP_include_in_dropdown', value => 'AP_tax', disabled => AccountIsPosted, checked  => AP_tax) %]
+        [% 'Tax' | $T8 %] <br>
+        [% L.radio_button_tag('AP_include_in_dropdown', value => '', disabled => AccountIsPosted) %]
+        [% 'do not include' | $T8 %]      </td>
     </tr>
     <tr>
-      <td>
-        [% L.radio_button_tag('AR_include_in_dropdown',
-          value => 'AR_amount',
-          disabled => AccountIsPosted,
-          checked  => AR_amount) %]
-        &nbsp;[% 'Revenue' | $T8 %] <br>
-        [% L.radio_button_tag('AR_include_in_dropdown',
-          value => 'AR_paid',
-          disabled => AccountIsPosted,
-          checked  => AR_paid) %]
-        &nbsp;[% 'Receipt' | $T8 %] <br>
-        [% L.radio_button_tag('AR_include_in_dropdown',
-          value => 'AR_tax',
-          disabled => AccountIsPosted,
-          checked  => AR_tax) %]
-        &nbsp;[% 'Tax' | $T8 %] <br>
-        [% L.radio_button_tag('AR_include_in_dropdown',
-          value => '',
-          disabled => AccountIsPosted) %]
-        &nbsp;[% 'do not include' | $T8 %]
-      </td>
-      <td>
-        [% L.radio_button_tag('AP_include_in_dropdown',
-          value => 'AP_amount',
-          disabled => AccountIsPosted,
-          checked  => AP_amount) %]
-        &nbsp;[% 'Expense/Asset' | $T8 %] <br>
-        [% L.radio_button_tag('AP_include_in_dropdown',
-          value => 'AP_paid',
-          disabled => AccountIsPosted,
-          checked  => AP_paid) %]
-        &nbsp;[% 'Payment' | $T8 %] <br>
-        [% L.radio_button_tag('AP_include_in_dropdown',
-          value => 'AP_tax',
-          disabled => AccountIsPosted,
-          checked  => AP_tax) %]
-        &nbsp;[% 'Tax' | $T8 %] <br>
-        [% L.radio_button_tag('AP_include_in_dropdown',
-          value => '',
-          disabled => AccountIsPosted) %]
-        &nbsp;[% 'do not include' | $T8 %]
-      </td>
-      <td>
-        <input name="IC_sale" type="checkbox" class="checkbox" value="IC_sale"
-          [% HTML.escape(IC_sale) %]>&nbsp;
+      <td><b>[% 'Parts Inventory' | $T8 %]</b><br>
+        <input name="IC_sale" type="checkbox" value="IC_sale"[% HTML.escape(IC_sale) %]>
         [% 'Revenue' | $T8 %] <br>
-        <input name="IC_cogs" type="checkbox" class="checkbox" value="IC_cogs"
-          [% HTML.escape(IC_cogs) %]>&nbsp;
+        <input name="IC_cogs" type="checkbox" value="IC_cogs"[% HTML.escape(IC_cogs) %]>
         [% 'Expense' | $T8 %] <br>
-        <input name="IC_taxpart" type="checkbox" class="checkbox" value="IC_taxpart"
-          [% HTML.escape(IC_taxpart) %]>&nbsp;
+        <input name="IC_taxpart" type="checkbox" value="IC_taxpart" [% HTML.escape(IC_taxpart) %]>
         [% 'Tax' | $T8 %]
-        <br><br>
       </td>
-      <td>
-        <input name=IC_income type=checkbox class=checkbox value="IC_income"
-          [% HTML.escape(IC_income) %]>&nbsp;
+      <td><b>[% 'Service Items' | $T8 %]</b><br>
+        <input name=IC_income type=checkbox value="IC_income"[% HTML.escape(IC_income) %]>
         [% 'Revenue' | $T8 %] <br>
-        <input name=IC_expense type=checkbox class=checkbox value="IC_expense"
-          [% HTML.escape(IC_expense) %]>&nbsp;
+        <input name=IC_expense type=checkbox value="IC_expense"[% HTML.escape(IC_expense) %]>
         [% 'Expense' | $T8 %] <br>
-        <input name=IC_taxservice type=checkbox class=checkbox value="IC_taxservice"
-          [% HTML.escape(IC_taxservice) %]>&nbsp;
+        <input name=IC_taxservice type=checkbox value="IC_taxservice"[% HTML.escape(IC_taxservice) %]>
         [% 'Tax' | $T8 %]
-        <br><br>
       </td>
     </tr>
-  </table>
-</fieldset>
-
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend>
-    [% 'Taxkeys and Taxreport Preferences' | $T8 %]
-  </legend>
-  <p style='font-weight:normal'>[% 'Note: Taxkeys must have a "valid from" date, and will not behave correctly without.' | $T8 %]</p>
+  </tbody>
+</table>
+</div><!-- /.col -->
 
-            <table>
-              <tr>
-                <th align="left">[% 'Taxkey' | $T8 %]</th>
-                <th align="left">[% 'valid from' | $T8 %]</th>
-                [% IF feature_ustva %]
-                  <th align="left">[% 'pos_ustva' | $T8 %]</th>
-                [% END %]
-                <th align="left">[% 'delete' | $T8 %] ? </th>
-              </tr>
-[% FOREACH tk = ACCOUNT_TAXKEYS %]
+</div>
 
-              <tr>
-    [% IF tk.id %]
-                <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="[% tk.id %]">
-                <td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td>
-                <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td>
-                [% IF feature_ustva %]
-                  <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td>
-                [% END %]
-                <td><input name="taxkey_del_[% tk.runningnumber %]" type="checkbox"
-                class="checkbox" value="delete"></td>
-    [% ELSE %]
-                <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="NEW">
-                <td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td>
-                <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td>
-                [% IF feature_ustva %]
-                  <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td>
-                [% END %]
-                <td>&nbsp;</td>
-    [% END %]
-              </tr>
 
 
-[% END %]
-    </table>
-</fieldset>
-
-<fieldset class="DEPENDS ON charttype BEING A">
-  <legend>[% 'Report and misc. Preferences' | $T8 %]</legend>
-  <table>
-        [% IF feature_erfolgsrechnung %]
-          <tr>
-            <th align="left">[% 'Erfolgsrechnung' | $T8 %]</th>
-            <td colspan="3"><select name="pos_er">[% select_er %]</select></td>
-          </tr>
-        [% END %]
-        [% IF feature_eurechnung %]
-          <tr>
-            <th align="left">[% 'EUER' | $T8 %]</th>
-            <td colspan="3"><select name="pos_eur">[% select_eur %]</select></td>
-          </tr>
-          <tr>
-            <th align="left">[% 'BWA' | $T8 %]</th>
-            <td colspan="3"><select name="pos_bwa">[% select_bwa %]</select></td>
-          </tr>
-        [% END %]
-        [% IF feature_balance %]
-          <!-- Diese Steuerfunktion hat keine Auswirkung in der Bilanz und wird erstmal deaktiviert. -->
-          <!-- tr>
-            <th align="left">[% 'Bilanz' | $T8 %]</th>
-            <td colspan="3"><select name="pos_bilanz">[% select_bilanz %]</select></td>
-          </tr -->
-        [% END %]
-        [% IF feature_datev %]
-          <tr>
-            <th align="left">[% 'Datevautomatik' | $T8 %]</th>
-            <td colspan="3"><input name="datevautomatik" type="checkbox" class="checkbox" value="T" [% IF datevautomatik %]checked [% END %]>[% 'If checked the taxkey will not be exported in the DATEV Export, but only IF chart taxkeys differ from general ledger taxkeys' | $T8 %] </td>
-          </tr>
-        [% END %]
-        <tr>
-          <th align="left">[% 'Folgekonto' | $T8 %]</th>
-          <td><select name="new_chart_id">[% selectnewaccount %]</select></td>
-          <th align="left">[% 'Valid from' | $T8 %]</th>
-          <td><input name="valid_from" value="[% valid_from %]"></td>
-        </tr>
-  </table>
-[% END %]
-</fieldset>
-<hr size="3" noshade>
-
 [% IF ( id ) %]
-  <script type="text/javascript">
+<script type="text/javascript">
   function callback_save() {
     var prev_desc = "[% description | html %]";
     var prev_accno = "[% accno | html %]";
@@ -306,7 +272,7 @@ $(function() {
     else
       return true;
   }
-  </script>
+</script>
 [% END %]
 [% L.hidden_tag('callback', callback) %]
 </form>
diff --git a/templates/webpages/am/edit_bins.html b/templates/webpages/am/edit_bins.html
index 8762dd34c..dce5dc57d 100644
--- a/templates/webpages/am/edit_bins.html
+++ b/templates/webpages/am/edit_bins.html
@@ -1,7 +1,7 @@
 [%- USE HTML -%][%- USE T8 -%]
 
 <h1>[% title %]</h1>
-
+<div class="wrapper">
 [% UNLESS BINS.size %]
  <p>[% 'No bins have been added to this warehouse yet.' | $T8 %]</p>
 
@@ -18,36 +18,41 @@
   <input type="hidden" name="type" value="bin">
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
 
-  <table border="0">
+  <!-- UPDATE: dieses unlustige Konstrukt mit einem echten Mehrspalter versehen, und das ab einer bestimmten Anzahl Plaetze-->
+  <table class="tbl-list width-moderate">
+    <thead>
    <tr>
-    <th class="listheading">[% 'Delete' | $T8 %]</th><th class="listheading">[% 'Description' | $T8 %]</th>
-    <th class="listheading">[% 'Delete' | $T8 %]</th><th class="listheading">[% 'Description' | $T8 %]</th>
+    <th>[% 'Delete' | $T8 %]</th><th>[% 'Description' | $T8 %]</th>
+    <!-- <th>[% #'Delete' | $T8 %]</th><th>[% #'Description' | $T8 %]</th> -->
    </tr>
+   </thead>
+   <tbody>
    [%- SET row_odd = '1' %]
    [%- USE bin_it = Iterator(BINS) %]
    [%- FOREACH bin = bin_it %]
-   [%- IF row_odd %]
+   [%- #IF row_odd %]
    <tr>
-    [%- END %]
+    [%- #END %]
 
-    <td>[% IF bin.in_use %]&nbsp;[% ELSE %]<input type="checkbox" name="delete_[% bin_it.count %]" value="1">[% END %]</td>
+    <td class="center">[% IF bin.in_use %]&nbsp;[% ELSE %]<input type="checkbox" name="delete_[% bin_it.count %]" value="1">[% END %]</td>
     <td>
      <input type="hidden" name="id_[% bin_it.count %]" value="[% HTML.escape(bin.id) %]">
-     <input name="description_[% bin_it.count %]" value="[% HTML.escape(bin.description) %]">
+     <input name="description_[% bin_it.count %]" value="[% HTML.escape(bin.description) %]" type="text" class="wi-wide">
     </td>
 
-    [%- SET end_tr = '0' %]
-    [%- UNLESS row_odd %][%- SET end_tr = '1' %][%- END %]
-    [%- IF bin_it.last %][%- SET end_tr = '1' %][%- END %]
-    [%- IF end_tr %]
+    [%- #SET end_tr = '0' %]
+    [%- #UNLESS row_odd %][%- #SET end_tr = '1' %][%- #END %]
+    [%- #IF bin_it.last %][%- #SET end_tr = '1' %][%- #END %]
+    [%- #IF end_tr %]
    </tr>
-   [%- END %]
+   [%- #END %]
 
-   [%- IF row_odd %][% SET row_odd = '0' %][% ELSE %][% SET row_odd = '1' %][% END %]
+   [%- #IF row_odd %][% #SET row_odd = '0' %][% #ELSE %][% #SET row_odd = '1' %][% #END %]
    [%- END %]
+   </tbody>
   </table>
 
   <input type="hidden" name="rowcount" value="[% BINS.size %]">
  </form>
-
+</div>
 [% END %]
diff --git a/templates/webpages/am/edit_tax.html b/templates/webpages/am/edit_tax.html
index 616ac2d8f..cd1a816d7 100644
--- a/templates/webpages/am/edit_tax.html
+++ b/templates/webpages/am/edit_tax.html
@@ -1,132 +1,135 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE L %]
-[%- USE LxERP %]
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
 <h1>[% 'Tax-O-Matic' | $T8 %] [% title %]</h1>
 
- <form method="post" action="am.pl" id="form">
-  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-  <input type="hidden" name="type" value="tax">
-
-  <table width="100%">
-   <tr>
-    <td>[% 'tax_taxkey' | $T8 %]</td>
-    <td>[% IF tax_already_used %]<p>[% HTML.escape(taxkey) %]</p>
-        <input type="hidden" name="taxkey" size="2" value="[% HTML.escape(taxkey) %]">
-        [% ELSE %]<input name="taxkey" size="2" value="[% HTML.escape(taxkey) %]">
-        [% END %]</td>
-   </tr>
-
-   <tr>
-    <td>[% 'tax_taxdescription' | $T8 %]</td>
-    <td><input name="taxdescription" size="60" value="[% HTML.escape(taxdescription) %]"></td>
-   </tr>
-
-   [%- FOREACH language = LANGUAGES %]
+<form method="post" action="am.pl" id="form">
+
+<input type="hidden" name="id" value="[% HTML.escape(id) %]">
+<input type="hidden" name="type" value="tax">
+
+<div class="wrapper cols">
+
+<table class="tbl-horizontal col">
+  <caption>[% 'Tax' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th>[% 'tax_taxkey' | $T8 %]</th>
+      <td>
+        [% IF tax_already_used %]
+          [% HTML.escape(taxkey) %]
+          <input type="hidden" name="taxkey" value="[% HTML.escape(taxkey) %]">
+        [% ELSE %]
+          <input name="taxkey" value="[% HTML.escape(taxkey) %]" class="wi-tinynumber" type="text">
+        [% END %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'tax_taxdescription' | $T8 %]</th>
+      <td><input name="taxdescription" value="[% HTML.escape(taxdescription) %]" class="wi-verywide" type="text"></td>
+    </tr>
+    [% FOREACH language = LANGUAGES %]
     <tr>
-     <td>[%- HTML.escape(language.description) %] ([%- LxERP.t8('Translation') %])</td>
-     <td>
-      <input name="translation_[% language.id %]" value="[%- HTML.escape(TAX.translated_attribute('taxdescription', language, 1)) %]" size="60">
-     </td>
+      <th>[% HTML.escape(language.description) %] ([% LxERP.t8('Translation') %])</th>
+      <td><input name="translation_[% language.id %]" value="[% HTML.escape(TAX.translated_attribute('taxdescription', language, 1)) %]" class="wi-verywide" type="text"></td>
     </tr>
-   [%- END %]
-
-   <tr>
-    <td>[% 'tax_percent' | $T8 %]</td>
-    <td>[% IF tax_already_used %]<p>[% HTML.escape(rate) %] %</p>
-        <input type="hidden" name="rate" size="10" value="[% HTML.escape(rate) %]">
-        [% ELSE %]<input name="rate" size="10" value="[% HTML.escape(rate) %]"> %
-        [% END %]</td>
-   </tr>
-
-   <tr>
-    <td>[% 'tax_chartaccno' | $T8 %]</td>
-    <td><select name="chart_id"><option value="">[% 'None' | $T8 %]</option>[% FOREACH row = ACCOUNTS %]<option value="[% HTML.escape(row.id) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.taxaccount) %]</option>[% END %]</select></td>
-   </tr>
-   <tr>
-    <td>[% 'Automatic skonto chart sales' | $T8 %]</td>
-    <td> [% L.select_tag('skonto_sales_chart_id', AR_PAID, value_title_sub = \skontochart_value_title_sub, with_empty = 1, default = skonto_sales_chart_id) %]</td>
-   </tr>
-   <tr>
-    <td>[% 'Automatic skonto chart purchase' | $T8 %]</td>
-    <td> [% L.select_tag('skonto_purchase_chart_id', AP_PAID, value_title_sub = \skontochart_value_title_sub, with_empty = 1, default = skonto_purchase_chart_id) %]</td>
-   </tr>
-   <tr>
-    <td>[% 'Account categories' | $T8 %]</td>
-    <td><table>
-          <colgroup>
-            <col width="10">
-            <col width="130">
-            <col width="10">
-            <col width="130">
-            <col width="10">
-            <col width="130">
-            <col width="10">
-            <col width="130">
-            <col width="10">
-            <col width="130">
-            <col width="10">
-            <col width="130">
-          </colgroup>
-          <tr>
-            <td align="right">[% IF asset %]
-                                [% L.checkbox_tag('asset', value => 1, checked => 1, class => 'checkbox') %]
-                              [% ELSE %]
-                                [% L.checkbox_tag('asset', value => 1, checked => 0, class => 'checkbox') %]
-                              [% END %]
-            </td>
-            <td align="left">[% 'Asset' | $T8 %] (A)</td>
-            <td align="right">[% IF liability %]
-                                [% L.checkbox_tag('liability', value => 1, checked => 1, class => 'checkbox') %]
-                              [% ELSE %]
-                                [% L.checkbox_tag('liability', value => 1, checked => 0, class => 'checkbox') %]
-                              [% END %]
-            </td>
-            <td align="left">[% 'Liability' | $T8 %] (L)</td>
-            <td align="right">[% IF equity %]
-                                [% L.checkbox_tag('equity', value => 1, checked => 1, class => 'checkbox') %]
-                              [% ELSE %]
-                                [% L.checkbox_tag('equity', value => 1, checked => 0, class => 'checkbox') %]
-                              [% END %]
-            </td>
-            <td align="left">[% 'Equity' | $T8 %] (Q)</td>
-            <td align="right">[% IF revenue %]
-                                [% L.checkbox_tag('revenue', value => 1, checked => 1, class => 'checkbox') %]
-                              [% ELSE %]
-                                [% L.checkbox_tag('revenue', value => 1, checked => 0, class => 'checkbox') %]
-                              [% END %]
-            </td>
-            <td align="left">[% 'Revenue' | $T8 %] (I)</td>
-            <td align="right">[% IF expense %]
-                                [% L.checkbox_tag('expense', value => 1, checked => 1, class => 'checkbox') %]
-                              [% ELSE %]
-                                [% L.checkbox_tag('expense', value => 1, checked => 0, class => 'checkbox') %]
-                              [% END %]
-            </td>
-            <td align="left">[% 'Expense' | $T8 %] (E)</td>
-            <td align="right">[% IF costs %]
-                                [% L.checkbox_tag('costs', value => 1, checked => 1, class => 'checkbox') %]
-                              [% ELSE %]
-                                [% L.checkbox_tag('costs', value => 1, checked => 0, class => 'checkbox') %]
-                              [% END %]
-            </td>
-            <td align="left">[% 'Costs' | $T8 %] (C)</td>
-          </tr>
-        </table>
-     </td>
-   </tr>
-
-  </table>
-  </table>
-
-  [% UNLESS orphaned %]
-  <br />
-  [% 'Chartaccounts connected to this Tax:' | $T8 %]
-  [% FOREACH row = TAXINUSE %]
-  <a href="am.pl?action=edit_account&id=[% HTML.url(row.id) %]&callback=[% HTML.url(callback) %]">[% HTML.escape(row.accno) %]</a>&nbsp;
-  [% END %]
-  <br />
-  [% END %]
-
-  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+    [% END %]
+    <tr>
+      <th>[% 'tax_percent' | $T8 %]</th>
+      <td>
+        [% IF tax_already_used %]
+          [% HTML.escape(rate) %]%
+          <input type="hidden" name="rate" value="[% HTML.escape(rate) %]">
+        [% ELSE %]
+          <input name="rate" value="[% HTML.escape(rate) %]" class="wi-tinynumber" type="text">%
+        [% END %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'tax_chartaccno' | $T8 %]</th>
+      <td>
+        <select name="chart_id" class="wi-verywide">
+          <option value="">[% 'None' | $T8 %]</option>
+          [% FOREACH row = ACCOUNTS %]
+            <option value="[% HTML.escape(row.id) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.taxaccount) %]</option>
+          [% END %]
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Automatic skonto chart sales' | $T8 %]</th>
+      <td>[% L.select_tag('skonto_sales_chart_id', AR_PAID, value_title_sub = \skontochart_value_title_sub, with_empty = 1, default = skonto_sales_chart_id, class='wi-verywide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Automatic skonto chart purchase' | $T8 %]</th>
+      <td>[% L.select_tag('skonto_purchase_chart_id', AP_PAID, value_title_sub = \skontochart_value_title_sub, with_empty = 1, default = skonto_purchase_chart_id class='wi-verywide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Account categories' | $T8 %]</th>
+      <td>
+        [% IF asset %]
+          [% L.checkbox_tag('asset', value => 1, checked => 1) %]
+        [% ELSE %]
+          [% L.checkbox_tag('asset', value => 1, checked => 0) %]
+        [% END %]
+        [% 'Asset' | $T8 %] (A) <br>
+
+        [% IF liability %]
+          [% L.checkbox_tag('liability', value => 1, checked => 1) %]
+        [% ELSE %]
+          [% L.checkbox_tag('liability', value => 1, checked => 0) %]
+        [% END %]
+        [% 'Liability' | $T8 %] (L) <br>
+
+        [% IF equity %]
+          [% L.checkbox_tag('equity', value => 1, checked => 1) %]
+        [% ELSE %]
+          [% L.checkbox_tag('equity', value => 1, checked => 0) %]
+        [% END %]
+        [% 'Equity' | $T8 %] (Q) <br>
+
+        [% IF revenue %]
+          [% L.checkbox_tag('revenue', value => 1, checked => 1) %]
+        [% ELSE %]
+          [% L.checkbox_tag('revenue', value => 1, checked => 0) %]
+        [% END %]
+        [% 'Revenue' | $T8 %] (I) <br>
+
+        [% IF expense %]
+          [% L.checkbox_tag('expense', value => 1, checked => 1) %]
+        [% ELSE %]
+          [% L.checkbox_tag('expense', value => 1, checked => 0) %]
+        [% END %]
+        [% 'Expense' | $T8 %] (E) <br>
+
+        [% IF costs %]
+          [% L.checkbox_tag('costs', value => 1, checked => 1) %]
+        [% ELSE %]
+          [% L.checkbox_tag('costs', value => 1, checked => 0) %]
+        [% END %]
+        [% 'Costs' | $T8 %] (C)
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+
+[% UNLESS orphaned %]
+<div class="col">
+  <h3 class="caption">[% 'Chartaccounts connected to this Tax:' | $T8 %]</h3>
+  <ul>
+    [% FOREACH row = TAXINUSE %]
+      <li><a href="am.pl?action=edit_account&id=[% HTML.url(row.id) %]&callback=[% HTML.url(callback) %]">[% HTML.escape(row.accno) %]</a></li>
+    [% END %]
+  </ul>
+</div>
+[% END %]
+
+<input type="hidden" name="callback" value="[% #HTML.escape(callback) %]">
+
+</div><!-- /.wrapper -->
 </form>
+
+
diff --git a/templates/webpages/am/edit_templates.html b/templates/webpages/am/edit_templates.html
index 3b18ce0e0..6e60c760b 100644
--- a/templates/webpages/am/edit_templates.html
+++ b/templates/webpages/am/edit_templates.html
@@ -1,62 +1,69 @@
-[%- USE T8 %]
-[%- USE HTML %]
-
- <h1>[% title %]</h1>
-
-  [% IF type == 'templates' %]
-   <p style="text-align: right;">[<a href="doc/html/ch03s03.html" target="_blank" title="[% 'Open in new window' | $T8 %]">[% 'Help Template Variables' | $T8 %]</a>]</p>
-  [% END %]
-
- <form method="post" name="Form" action="amtemplates.pl" id="form">
-
-  [% FOREACH var = HIDDEN %]<input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">[% END %]
-
-  [% IF SHOW_EDIT_OPTIONS %]
-   <p>
-    [% 'Template' | $T8 %]
-    <select name="formname">
-     [% FOREACH row = FORMNAME %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == formname %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
-    </select>
-
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% title %]</h1>
+
+[% IF type == 'templates' %]
+  <p style="text-align: right;">[<a href="doc/html/ch03s03.html" target="_blank" title="[% 'Open in new window' | $T8 %]">[% 'Help Template Variables' | $T8 %]</a>]</p>
+[% END %]
+
+<form method="post" name="Form" action="amtemplates.pl" id="form">
+[% FOREACH var = HIDDEN %]<input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">[% END %]
+
+[% IF SHOW_EDIT_OPTIONS %]
+<table class="tbl-horizontal">
+  <caption>[% '' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Template' | $T8 %]</th>
+      <td>
+        <select name="formname">
+          [% FOREACH row = FORMNAME %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == formname %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
+        </select>
+      </td>
+    </tr>
     [% IF LANGUAGE.size %]
-     [% 'Language' | $T8 %]
-     <select name="language">
-      <option></option>
-      [% FOREACH row = LANGUAGE %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == language %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
-     </select>
+    <tr>
+      <th>[% 'Language' | $T8 %]</th>
+      <td>
+        <select name="language">
+          <option></option>
+          [% FOREACH row = LANGUAGE %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == language %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
+        </select>
+      </td>
+    </tr>
     [% END %]
-
     [% IF PRINTER.size %]
-     [% 'Printer' | $T8 %]
-     <select name="printer">
-      <option></option>
-      [% FOREACH row = PRINTER %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == printer %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
-     </select>
+    <tr>
+      <th>[% 'Printer' | $T8 %]</th>
+      <td>
+      <select name="printer">
+        <option></option>
+        [% FOREACH row = PRINTER %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == printer %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
+      </select>
+      </td>
+    </tr>
     [% END %]
+  </tbody>
+</table>
 
-    <input type="hidden" name="display_nextsub" value="display_template">
+<input type="hidden" name="display_nextsub" value="display_template">
+<input name="action" type="submit" value="[% 'Display' | $T8 %]">
+[% END %]
 
-    <input name="action" type="submit" class="submit" value="[% 'Display' | $T8 %]">
+[% IF SHOW_CONTENT %]
+  <h2>
+    [% IF CAN_EDIT %][% 'Edit file' | $T8 %][% ELSE %][% 'Display file' | $T8 %][% END %]
+    [% HTML.escape(display_filename) %]
+  </h2>
 
-   </p>
-
-   <hr>
-  [% END %]
-
-  [% IF SHOW_CONTENT %]
-    <h2>
-     [% IF CAN_EDIT %][% 'Edit file' | $T8 %][% ELSE %][% 'Display file' | $T8 %][% END %] [% HTML.escape(display_filename) %]
-    </h2>
-
-   [% IF CAN_EDIT %]
+  [% 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>
-
-    [% ELSE %]
-
+  [% ELSE %]
     <p><pre class="filecontent">[% HTML.escape(content) %]</pre></p>
+  [% END %] <!-- CAN_EDIT -->
 
-   [% END %] <!-- CAN_EDIT -->
-
-  [% END %] <!-- SHOW_CONTENT -->
+[% END %] <!-- SHOW_CONTENT -->
 
- </form>
+</form>
diff --git a/templates/webpages/am/edit_units.html b/templates/webpages/am/edit_units.html
index 00bea73cb..2c1a21008 100644
--- a/templates/webpages/am/edit_units.html
+++ b/templates/webpages/am/edit_units.html
@@ -1,87 +1,99 @@
 [%- USE T8 %][%- USE LxERP %][% USE L %]
 [% USE HTML %]
-<h1>[% title %]</h1>
+<h1>
+  [% title %]
+</h1>
 
 [% INCLUDE "common/flash.html" %]
 
-[% PROCESS "am/_units_header_info.html" %]
+<div class="wrapper">
+
+  <div class="col" style="width:30.0em">
+    [% PROCESS "am/_units_header_info.html" %]
+  </div>
+
+  <div class="col" style="width:30.0em">
+    <p>
+      [% 'Units that have already been used (e.g. for parts and services or in invoices or warehouse transactions) cannot be changed.' | $T8 %]
+    </p>
+    <p>
+      [% 'Units marked for deletion will be deleted upon saving.' | $T8 %]
+    </p>
+    <p>
+      [% 'You can declare different translations for singular and plural for each unit (e.g. &quot;day&quot; and &quot;days).' | $T8 %]
+    </p>
+  </div>
+</div>
+
+<div class="wrapper">
+
+  <form method="post" action="[% HTML.escape(script) %]" id="form">
+    <input type="hidden" name="type" value="unit">
+
+    <table id="unit_list" class="tbl-list wi-moderate">
+      <thead>
+        <tr>
+          <th class="center img"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></th>
+          <th>[% 'Delete' | $T8 %]</th>
+          <th>[% 'Unit' | $T8 %]</th>
+          <th>[% 'Base unit' | $T8 %]</th>
+          <th>[% 'Factor' | $T8 %]</th>
+          [% FOREACH language = LANGUAGES %]
+          <th>[% language.description %]<br>
+          [% 'Singular' | $T8 %]</th>
+          <th><br>
+          [% 'Plural' | $T8 %]</th>
+          [% END %]
+        </tr>
+      </thead>
+      <tbody>
+        [% FOREACH row = UNITS %]
+        <tr id="unit_id_[% row.id %]">
+          <td class="center img dragdrop"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></td>
+        [% IF row.in_use %]
+          <td>
+            <input type="hidden" name="unchangeable_[% loop.count %]" value="1">
+            <input type="hidden" name="old_name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
+          </td>
+          <td><span>[% HTML.escape(row.name) %]</span></td>
+          <td><span>[% IF row.base_unit %][% HTML.escape(row.base_unit) %][% ELSE %]---[% END %]</span></td>
+          <td class="numeric"><span>[% IF row.base_unit %][% HTML.escape(row.factor)    %][% ELSE %]---[% END %]</span></td>
+        [% ELSE %]
+          <td class="center">
+            <input type="checkbox" name="delete_[% loop.count %]">
+          </td>
+          <td>
+            <input type="hidden" name="old_name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
+            <input name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]" maxlength="20" type="text" class="wi-small">
+          </td>
+          <td>
+            <select name="base_unit_[% loop.count %]" class="wi-small">
+              [% FOREACH option = row.BASE_UNIT_DDBOX %]
+                <option [% option.selected %]>[% HTML.escape(option.name) %]</option>
+              [% END %]
+            </select>
+          </td>
+          <td>
+            <input name="factor_[% loop.count %]" value="[% row.factor %]" maxlength="8" type="text" class="wi-verysmall numeric">
+          </td>
+        [% END %]
+        [% FOREACH language = row.UNITLANGUAGES %]
+          <td>
+            <input type="text" name="localized_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized) %]" maxlength="20" class="wi-mediumsmall">
+          </td>
+          <td>
+            <input type="text" name="localized_plural_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized_plural) %]" maxlength="20" class="wi-mediumsmall">
+          </td>
+        [% END %]
+        </tr>
+        [% END %]
+      </tbody>
+    </table>
+
+    <input type="hidden" name="rowcount" value="[% UNITS.size %]">
+
+  </form>
+
+  [% L.sortable_element('#unit_list tbody', url => 'controller.pl?action=Unit/reorder', with => 'unit_id') %]
+</div>
 
-<hr>
-
-<p>
- [% 'Units that have already been used (e.g. for parts and services or in invoices or warehouse transactions) cannot be changed.' | $T8 %]
-</p>
-
-<p>
- [% 'Units marked for deletion will be deleted upon saving.' | $T8 %]
-</p>
-
-<p>
- [% 'You can declare different translations for singular and plural for each unit (e.g. &quot;day&quot; and &quot;days).' | $T8 %]
-</p>
-
-<form method="post" action="[% HTML.escape(script) %]" id="form">
-
- <input type="hidden" name="type" value="unit">
-
- <table id="unit_list">
-  <thead>
-  <tr class="listheading">
-   <th align="center"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></th>
-   <th>[% 'Delete' | $T8 %]</th>
-   <th>[% 'Unit' | $T8 %]</th>
-   <th>[% 'Base unit' | $T8 %]</th>
-   <th>[% 'Factor' | $T8 %]</th>
-   [% FOREACH language = LANGUAGES %]
-    <th>[% language.description %]</th>
-   [% END %]
-  </tr>
-  </thead>
-
-  <tbody>
-  [% FOREACH row = UNITS %]
-   <tr class="listrow[% loop.count % 2 %]" id="unit_id_[% row.id %]">
-    <td align="center" class="dragdrop"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></td>
-    [% IF row.in_use %]
-     <td>
-      <input type="hidden" name="unchangeable_[% loop.count %]" value="1">
-      <input type="hidden" name="old_name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-     </td>
-
-     <td>[% HTML.escape(row.name) %]</td>
-     <td>[% IF row.base_unit %][% HTML.escape(row.base_unit) %][% ELSE %]---[% END %]</td>
-     <td>[% IF row.base_unit %][% HTML.escape(row.factor) %][% ELSE %]---[% END %]</td>
-
-     [% ELSE %]
-
-     <td align="center"><input type="checkbox" name="delete_[% loop.count %]"></td>
-     <td>
-      <input type="hidden" name="old_name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
-      <input name="name_[% loop.count %]" size="10" maxlength="20" value="[% HTML.escape(row.name) %]">
-     </td>
-     <td>
-      <select name="base_unit_[% loop.count %]">
-       [% FOREACH option = row.BASE_UNIT_DDBOX %]<option [% option.selected %]>[% HTML.escape(option.name) %]</option>[% END %]
-      </select>
-     </td>
-     <td><input name="factor_[% loop.count %]" size="8" value="[% row.factor %]"></td>
-    [% END %]
-
-    [% FOREACH language = row.UNITLANGUAGES %]
-     <td>
-      [% 'singular first char' | $T8 %]:
-      <input name="localized_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized) %]" size="6" maxlength="20">
-      [% 'plural first char' | $T8 %]:
-      <input name="localized_plural_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized_plural) %]" size="6" maxlength="20">
-     </td>
-    [% END %]
-   </tr>
-  [% END %]
-  </tbody>
- </table>
-
- <input type="hidden" name="rowcount" value="[% UNITS.size %]">
-
- </form>
-
- [% L.sortable_element('#unit_list tbody', url => 'controller.pl?action=Unit/reorder', with => 'unit_id') %]
diff --git a/templates/webpages/am/edit_warehouse.html b/templates/webpages/am/edit_warehouse.html
index f7731d308..7e8c93a0d 100644
--- a/templates/webpages/am/edit_warehouse.html
+++ b/templates/webpages/am/edit_warehouse.html
@@ -2,6 +2,8 @@
 [%- USE HTML %]
 <h1>[% IF id %][% 'Edit Warehouse' | $T8 %][% ELSE %][% 'Add Warehouse' | $T8 %][% END %]</h1>
 
+<div class="wrapper">
+  <!-- UPDATE. message container -->
  [% IF saved_message %]
   <p>[% saved_message %]</p>
  [% END %]
@@ -9,32 +11,34 @@
  <form method="post" action="am.pl" id="form">
 
   <input type="hidden" name="id" value="[% HTML.escape(id) %]">
-
   <input type="hidden" name="type" value="warehouse">
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
 
-  <table border="0">
+  <table class="tbl-horizontal">
+    <tbody>
    <tr>
-    <td align="right">[% 'Description' | $T8 %]</td>
+    <th>[% 'Description' | $T8 %]</th>
     <td>
-     <input id='description' name="description" size="60" value="[% HTML.escape(description) %]" class="initial_focus">
+     <input type="text" id='description' name="description" size="60" value="[% HTML.escape(description) %]" class="initial_focus">
      <input type="hidden" name="orig_description" value="[% HTML.escape(description) %]">
     </td>
    </tr>
 
    <tr>
-    <td align="right">[% 'Invalid' | $T8 %]</td>
+    <th>[% 'Invalid' | $T8 %]</th>
     <td><input type="checkbox" name="invalid" value="1" [% IF invalid %]checked[% END %]></td>
    </tr>
 
    <tr>
-    <td align="right">[% 'Number of new bins' | $T8 %]</td>
-    <td><input name="number_of_new_bins"></td>
+    <th>[% 'Number of new bins' | $T8 %]</th>
+    <td><input type="text" name="number_of_new_bins"></td>
    </tr>
 
    <tr>
-    <td align="right">[%- 'Prefix for the new bins\' names' | $T8 %]</td>
-    <td><input name="prefix" value="[% 'Bin' | $T8 %]"></td>
+    <th>[%- 'Prefix for the new bins\' names' | $T8 %]</th>
+    <td><input type="text" name="prefix" value="[% 'Bin' | $T8 %]"></td>
    </tr>
+   </tbody>
   </table>
  </form>
+</div>
diff --git a/templates/webpages/am/list_account_details.html b/templates/webpages/am/list_account_details.html
index 884dc7d2b..af97ea45c 100644
--- a/templates/webpages/am/list_account_details.html
+++ b/templates/webpages/am/list_account_details.html
@@ -1,64 +1,70 @@
-[%- USE T8 %]
-[% USE HTML %] [% FOREACH row = CA %]
-<table width="100%">
+[% USE T8 %]
+[% USE HTML %]
+<div class="taxkey-coa">
+[% FOREACH row = CA %]
 
- <colgroup>
-  <col width="10%">
-  <col width="10%">
-  <col width="10%">
-  <col width="50%">
-  <col width="10%">
-  <col width="10%">
- </colgroup>
+<div class="table">
+  <div class="field">
+    <span class="label"> [% 'Category' | $T8 %] </span>
+    <span class="value wi-verywide"> [% HTML.escape(row.category) %] </span>
+  </div>
+<div class="field">
+  <span class="label"> [% 'Linked to...' | $T8 %] </span>
+  <span class="value wi-verywide"> [% IF row.link %][% HTML.escape(row.link).replace('\] \[', ']<br>[') %][% ELSE %]-[% END %] </span>
+</div>
+</div>
+<!-- PENDENT: Klasse wo noch im Einsatz? -->
+<div>
+  <div class="col table">
+    <div class="caption">
+      [% 'Taxlink_coa' | $T8 %]
+    </div>
+    <div class="field">
+      <span class="label"> [% 'Taxkey_coa' | $T8 %] </span>
+      <span class="value"> [% IF row.taxkey %][% HTML.escape(row.taxkey).replace(',', '<br>') %][% ELSE %]-[% END %] </span>
+    </div>
+    <div class="field">
+      <span class="label"> [% 'Taxaccount_coa' | $T8 %] </span>
+      <span class="value"> [% IF row.taxaccount %][% HTML.escape(row.taxaccount).replace(',', '<br>') %][% ELSE %]-[% END %] </span>
+    </div>
+    <div class="field">
+      <span class="label"> [% 'Taxdescription_coa' | $T8 %] </span>
+      <span class="value"> [% IF row.taxdescription %][% HTML.escape(row.taxdescription).replace(',', '<br>') %][% ELSE %]-[% END %] </span>
+    </div>
+    <div class="field">
+      <span class="label"> [% 'Posustva_coa' | $T8 %] </span>
+      <span class="value"> [% IF row.tk_ustva %][% HTML.escape(row.tk_ustva).replace(',', '<br>') %][% ELSE %]-[% END %] </span>
+    </div>
+    <div class="field">
+      <span class="label"> [% 'Starspanate_coa' | $T8 %] </span>
+      <span class="value"> [% IF row.starspanate %][% HTML.escape(row.starspanate).replace(',', '<br>') %][% ELSE %]-[% END %] </span>
+    </div>
+  </div>
+  <div class="col table">
+    <div class="caption">
+      [% 'Report Positions' | $T8 %]
+    </div>
+    <div class="field">
+      <span class="label"> [% 'pos_bwa' | $T8 %] </span>
+      <span class="value"> [% IF row.pos_bwa %][% HTML.escape(row.pos_bwa) %][% ELSE %]-[% END %] </span>
+    </div>
+    <div class="field">
+      <span class="label"> [% 'pos_bilanz' | $T8 %] </span>
+      <span class="value"> [% IF row.pos_bilanz %][% HTML.escape(row.pos_bilanz) %][% ELSE %]-[% END %] </span>
+    </div>
+    <div class="field">
+      <span class="label"> [% 'pos_eur' | $T8 %] </span>
+      <span class="value"> [% IF row.pos_eur %][% HTML.escape(row.pos_eur) %][% ELSE %]-[% END %] </span>
+    </div>
+    <div class="field">
+      <span class="label"> [% 'Datevautomatik' | $T8 %] </span>
+      <span class="value"> [% IF row.datevautomatik %][% 'On' | $T8 %][% ELSE %][% 'Off' | $T8 %][% END %] </span>
+    </div>
+  </div>
+</div>
 
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td rowspan="8" class="coa_detail_emph">[% IF row.id %][% HTML.escape(row.id) %][% ELSE %]-[% END %]</td>
-  <td colspan="5" class="coa_detail_emph">[% HTML.escape(row.category) %]&nbsp;</td>
- </tr>
 
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td colspan="5" class="coa_detail_emph">
-   [% IF row.link %][% HTML.escape(row.link) %][% ELSE %]-[% END %]
-  </td>
- </tr>
 
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td colspan="5" class="coa_details_header">[% 'Taxlink_coa' | $T8 %]</td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_details_header2">[% 'Taxkey_coa' | $T8 %]</td>
-  <td class="coa_details_header2">[% 'Taxaccount_coa' | $T8 %]</td>
-  <td class="coa_details_header2">[% 'Taxdescription_coa' | $T8 %]</td>
-  <td class="coa_details_header2">[% 'Posustva_coa' | $T8 %]</td>
-  <td class="coa_details_header2">[% 'Startdate_coa' | $T8 %]</td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_detail_emph">[% IF row.taxkey         %][% HTML.escape(row.taxkey).replace(',', '<br>')         %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.taxaccount     %][% HTML.escape(row.taxaccount).replace(',', '<br>')     %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.taxdescription %][% HTML.escape(row.taxdescription).replace(',', '<br>') %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.tk_ustva       %][% HTML.escape(row.tk_ustva).replace(',', '<br>')       %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.startdate      %][% HTML.escape(row.startdate).replace(',', '<br>')      %][% ELSE %]-[% END %]</td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td colspan="5" class="coa_details_header">[% 'Report Positions' | $T8 %]</td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_details_header2">[% 'pos_bwa' | $T8 %]</td>
-  <td class="coa_details_header2">[% 'pos_bilanz' | $T8 %]</td>
-  <td class="coa_details_header2">[% 'pos_eur' | $T8 %]</td>
-  <td colspan="2" class="coa_details_header2">[% 'Datevautomatik' | $T8 %]</td>
- </tr>
-
- <tr class="coa_listrow[% loop.count % 2 %]">
-  <td class="coa_detail_emph">[% IF row.pos_bwa    %][% HTML.escape(row.pos_bwa)    %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.pos_bilanz %][% HTML.escape(row.pos_bilanz) %][% ELSE %]-[% END %]</td>
-  <td class="coa_detail_emph">[% IF row.pos_eur    %][% HTML.escape(row.pos_eur)    %][% ELSE %]-[% END %]</td>
-  <td colspan="2" class="coa_detail_emph">[% IF row.datevautomatik %][% 'On' | $T8 %][% ELSE %][% 'Off' | $T8 %][% END %]</td>
- </tr>
-</table>
 
 [% END %]
+</div>
diff --git a/templates/webpages/am/list_accounts.html b/templates/webpages/am/list_accounts.html
index 0938a4553..0c4def83c 100644
--- a/templates/webpages/am/list_accounts.html
+++ b/templates/webpages/am/list_accounts.html
@@ -1,46 +1,41 @@
-[%- USE T8 %]
-[%- USE HTML %]
- <h1>[% title %]</h1>
-
- <table width="100%">
-
-  <colgroup>
-   <col width="10%">
-   <col width="10%">
-   <col width="10%">
-   <col width="50%">
-   <col width="10%">
-   <col width="10%">
-  </colgroup>
-
-  <tr class="listheading">
-   <th>[% 'Account' | $T8 %]</td>
-   <th colspan="3">[% 'Description (Click on Description for details)' | $T8 %]</td>
-   <th>[% 'Debit' | $T8 %]</td>
-   <th>[% 'Credit' | $T8 %]</td>
+[% USE T8 %]
+[% USE HTML %]
+<h1>[% title %]</h1>
+
+
+<table class="tbl-plain width-moderate" style="width:70%;" id="tbl-accounts">
+  <thead>
+    <tr>
+      <th class="right">[% 'Account' | $T8 %]</td>
+      <th>[% 'Description (Click on Description for details)' | $T8 %]</td>
+      <th class="right">[% 'Debit' | $T8 %]</td>
+      <th class="right">[% 'Credit' | $T8 %]</td>
+    </tr>
+  </thead>
+  <tbody>
+  [% FOREACH row = CA %]
+  [% IF row.heading %]
+  [% IF row.accno < 10 %] [% SET rwcls='th1' %] [% ELSE %] [% IF row.accno < 100 %] [% SET rwcls='th2' %] [% ELSE %] [% SET rwcls='th3' %] [% END %] [% END %]
+  <tr class="heading [% rwcls %]">
+    <th class="numeric"><a href="[% row.link_edit_account %]">[% row.accno | html %]</a></th>
+    <th colspan="3">[% row.description | html %]</th>
   </tr>
-
-[%- FOREACH row = CA %]
- [%- IF row.heading %]
-  <tr class="listheading">
-   <td><a href="[% row.link_edit_account %]">[% row.accno | html %]</a></td>
-   <td colspan="5">[% row.description | html %]</td>
-  </tr>
- [% ELSE %]
-  <tr class="listrow[% loop.count % 2 %]">
-   <td><b><a href="[% row.link_edit_account %]">[% row.accno | html %]</a></b></td>
-   <td colspan="3" onclick="account_details([% row.id %])">[% row.description | html %]</td>
-   <td class='numeric'>[% row.debit | html %]</td>
-   <td class='numeric'>[% row.credit | html %]</td>
+  [% ELSE %]
+  <tr>
+    <td class="numeric"><a href="[% row.link_edit_account %]">[% row.accno | html %]</a></td>
+    <td onclick="account_details([% row.id %])">[% row.description | html %]</td>
+    <td class="numeric">[% row.debit | html %]</td>
+    <td class="numeric">[% row.credit | html %]</td>
   </tr>
-
-  <tr id="ajaxrow[% row.id %]" style="display:none", onclick="$(this).toggle()">
-   <td colspan="6" width="100%"><div id="ajaxcontent[% row.id %]"></div></td>
+  <tr id="ajaxrow[% row.id %]" style="display:none" onclick="$(this).toggle()" class="ajax-account-details">
+    <td></td>
+    <td colspan="3" id="ajaxcontent[% row.id %]"></td>
   </tr>
- [% END %]
-[% END %]
+  [% END %]
+  [% END %]
+  </tbody>
+</table>
 
- </table>
 
 <script type='text/javascript'>
   function account_details(id) {
diff --git a/templates/webpages/am/list_tax.html b/templates/webpages/am/list_tax.html
index 4b8ed2d47..1bed260de 100644
--- a/templates/webpages/am/list_tax.html
+++ b/templates/webpages/am/list_tax.html
@@ -1,27 +1,32 @@
 [%- USE T8 %]
 [%- USE HTML %]
- <h1>[% title %]</h1>
 
- <table>
-  <tr>
-   <th class="listheading">[% 'tax_taxkey' | $T8 %]</th>
-   <th class="listheading">[% 'tax_taxdescription' | $T8 %]</th>
-   <th class="listheading">[% 'tax_rate' | $T8 %]</th>
-   <th class="listheading">[% 'taxnumber' | $T8 %]</th>
-   <th class="listheading">[% 'account_description' | $T8 %]</th>
-   <th class="listheading">[% 'Automatic skonto chart sales' | $T8 %]</th>
-   <th class="listheading">[% 'Automatic skonto chart purchase' | $T8 %]</th>
-  </tr>
-
-  [% SET row_odd = '1' %][% FOREACH row = TAX %]
-  <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
-   <td align="right">[% HTML.escape(row.taxkey) %]</td>
-   <td><a href="am.pl?action=edit_tax&id=[% HTML.url(row.id) %]&callback=[% HTML.url(callback) %]">[% HTML.escape(row.taxdescription) %]</a></td>
-   <td align="right">[% HTML.escape(row.rate) %] %</td>
-   <td align="right">[% HTML.escape(row.taxnumber) %]</td>
-   <td>[% HTML.escape(row.account_description) %]</td>
-   <td>[% HTML.escape(row.skonto_chart_accno) %] [% HTML.escape(row.skonto_chart_description) %]</td>
-   <td>[% HTML.escape(row.skonto_chart_purchase_accno) %] [% HTML.escape(row.skonto_chart_purchase_description) %]</td>
-  </tr>
-  [% END %]
- </table>
+<h1>[% title %]</h1>
+<div class="wrapper">
+<table class="tbl-list width-moderate">
+  <thead>
+    <tr>
+      <th class="center">[% 'tax_taxkey' | $T8 %]</th>
+      <th>[% 'tax_taxdescription' | $T8 %]</th>
+      <th>[% 'tax_rate' | $T8 %]</th>
+      <th>[% 'taxnumber' | $T8 %]</th>
+      <th>[% 'account_description' | $T8 %]</th>
+      <th>[% 'Automatic skonto chart sales' | $T8 %]</th>
+      <th>[% 'Automatic skonto chart purchase' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% SET row_odd = '1' %][% FOREACH row = TAX %]
+    <tr>
+      <td class="center">[% HTML.escape(row.taxkey) %]</td>
+      <td><a href="am.pl?action=edit_tax&id=[% HTML.url(row.id) %]&callback=[% HTML.url(callback) %]">[% HTML.escape(row.taxdescription) %]</a></td>
+      <td>[% HTML.escape(row.rate) %] %</td>
+      <td>[% HTML.escape(row.taxnumber) %]</td>
+      <td>[% HTML.escape(row.account_description) %]</td>
+      <td>[% HTML.escape(row.skonto_chart_accno) %] [% HTML.escape(row.skonto_chart_description) %]</td>
+      <td>[% HTML.escape(row.skonto_chart_purchase_accno) %] [% HTML.escape(row.skonto_chart_purchase_description) %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+</div>
diff --git a/templates/webpages/am/list_warehouses.html b/templates/webpages/am/list_warehouses.html
index b9677b354..b861d13d7 100644
--- a/templates/webpages/am/list_warehouses.html
+++ b/templates/webpages/am/list_warehouses.html
@@ -2,26 +2,32 @@
 [% USE HTML %]
 <h1>[% title %]</h1>
 
- [% IF saved_message %]<p>[% saved_message %]</p>[% END %]
 
- <p>
-  <table width="100%" id="warehouse_list">
-   <tr class="listheading">
-    <th align="center"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></th>
-    <th width="70%">[% 'Description' | $T8 %]</th>
-    <th width="20%">[% 'Number of bins' | $T8 %]</th>
-    <th width="10%">[% 'Invalid' | $T8 %]</th>
+<div class="wrapper">
+  <!-- UPDATe: Message Container -->
+  [% IF saved_message %]<p>[% saved_message %]</p>[% END %]
+
+  <table class="tbl-list width-moderate" id="warehouse_list">
+    <thead>
+   <tr>
+    <th><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></th>
+    <th>[% 'Description' | $T8 %]</th>
+    <th>[% 'Number of bins' | $T8 %]</th>
+    <th>[% 'Invalid' | $T8 %]</th>
    </tr>
+   </thead>
 
+    <tbody>
    [% FOREACH warehouse = WAREHOUSES %]
-   <tr class="listrow[% loop.count % 2 %]" id="warehouse_id_[% warehouse.id %]">
-    <td align="center" class="dragdrop"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></td>
+   <tr id="warehouse_id_[% warehouse.id %]">
+    <td class="dragdrop center img"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></td>
     <td><a href="[% url_base %]&action=edit_warehouse&id=[% HTML.url(warehouse.id) %]">[% HTML.escape(warehouse.description) %]</a></td>
     <td>[% HTML.escape(warehouse.number_of_bins) %]</td>
     <td>[% IF warehouse.invalid %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %]</td>
    </tr>
    [% END %]
+   </tbody>
   </table>
- </p>
 
  [% L.sortable_element('#warehouse_list tbody', url => 'controller.pl?action=Warehouse/reorder', with => 'warehouse_id') %]
+</div>
