diff --git a/locale/en-US/asciidoc.conf b/locale/en-US/asciidoc.conf
index e76a8be9..8406e2bf 100644
--- a/locale/en-US/asciidoc.conf
+++ b/locale/en-US/asciidoc.conf
@@ -38,10 +38,13 @@ HEADER=<span style="float: right; padding-top: 10px;"><form action="https://www.
 # maximum 3 tags for now
 [section-inlinemacro]
 <a id="{target}" />
+<table style="border-bottom: 1px solid silver; width: 100%">
+<tr width="100%"><td width="50%"><h2>{target}</h2></td><td width="50%">
 {3? <span class="tag section">{3}</span>}
 {2? <span class="tag section">{2}</span>}
 {1? <span class="tag section">{1}</span>}
-<h2>{target}</h2>
+</td></tr>
+</table>
 
 [help-inlinemacro]
 <a href="chrome://vimperator/locale/{1}">{target}</a>
diff --git a/locale/en-US/browsing.txt b/locale/en-US/browsing.txt
index 6587e172..64b21b20 100644
--- a/locale/en-US/browsing.txt
+++ b/locale/en-US/browsing.txt
@@ -84,13 +84,15 @@ section:Navigating[navigating]
 
 |H| |<C-o>| |CTRL-O| |:ba| |:back|
 ||:[count]ba[ck][!] [url]|| +
+||CTRL-o||
 ________________________________________________________________________________
 Go [count] pages back in the browser history.
 The special version [c]:back![c] goes to the beginning of the browser history.
 ________________________________________________________________________________
 
 |L| |<C-i>| |CTRL-i| |:fo| |:fw| |:forward|
-||:[count]fo[rward] [!] [url]|| +
+||:[count]fo[rward][!] [url]|| +
+||CTRL-i||
 ________________________________________________________________________________
 Go [count] pages back in the browser history.
 The special version [c]:forward![c] goes to the end of the browser history.
diff --git a/locale/en-US/options.txt b/locale/en-US/options.txt
index 7acf6c23..a2fab7bc 100644
--- a/locale/en-US/options.txt
+++ b/locale/en-US/options.txt
@@ -81,7 +81,27 @@ exactly as they appear in the option.  Remove flags
 one by one to avoid problems.
 ____
 
-''''
+section:Setting{nbsp}Firefox{nbsp}options[firefox-options]
+
+Most Firefox options are not touched/overriden by Vimperator. In order to set
+any of these preferences use either of the following:
+
+|:prefs| |:preferences|
+||:pref[erences]||
+________________________________________________________________________________
+Show Browser Preferences +
+You can change the browser preferences from this dialog. Be aware that not
+all Firefox preferences work, because Vimperator overrides some key
+bindings and changes Firefox's GUI.
+________________________________________________________________________________
+
+|:prefs!| |:preferences!|
+||:pref[erences]!||
+________________________________________________________________________________
+Opens about:config in the current tab where you can change advanced Firefox
+preferences.
+________________________________________________________________________________
+
 
 section:List{nbsp}of{nbsp}options[list-options]
 
@@ -214,15 +234,18 @@ ____
 
 
 |\'nohls'| |\'nohlsearch'| |\'hls'| |\'hlsearch'|
-||'hlsearch' 'hls'|| boolean (default: off)
+||'hlsearch' 'hls'|| boolean (default off)
 ____
 Highlight previous search pattern matches
 ____
 
 
 |\'hlss'| |\'hlsearchstyle'|
-||'hlsearchstyle' 'hlss'|| string (default: color: black; background-color: yellow; padding: 0; display: inline;)
+||'hlsearchstyle' 'hlss'||
 ____
+string (default: color: black; background-color: yellow; padding: 0; display:
+inline;) +
+
 CSS specification of highlighted search items
 ____
 
@@ -235,14 +258,14 @@ ____
 
 
 |\'nois'| |\'noincsearch'| |\'is'| |\'incsearch'|
-||'incsearch' 'is'|| boolean (default: on)
+||'incsearch' 'is'|| boolean (default on)
 ____
 Show where the search pattern matches as it is typed. +
 NOTE: Incremental searching currently only works in the forward direction.
 ____
 
 |\'noim'| |\'noinsertmode'| |\'im'| |\'insertmode'|
-||'insertmode' 'im'|| boolean (default: on)
+||'insertmode' 'im'|| boolean (default on)
 ____
 Use Insert mode as the default for text areas.
 Makes Vimperator work in a way that Insert mode is the default mode for text areas.
@@ -271,7 +294,7 @@ This includes (X)HTML elements with an "href" atrribute and XLink "simple" links
 ____
 
 |\'nomore'| |\'more'|
-||'more'|| boolean (default: on)
+||'more'|| boolean (default on)
 ____
 Pause the message list window when more than one screen of listings is displayed
 ____
diff --git a/locale/en-US/xhtml11.css b/locale/en-US/xhtml11.css
index 785bae51..7da3e5f7 100644
--- a/locale/en-US/xhtml11.css
+++ b/locale/en-US/xhtml11.css
@@ -51,9 +51,11 @@ body h1 {
 }
 
 body h2 {
-  margin-top: 50px;
+  /* necessary, because we put h2 into tables */
+  margin-top: 20px !important;
+  margin-bottom: 0px !important;
   line-height: 1.3;
-  border-bottom: 1px solid silver;
+  /*border-bottom: 1px solid silver;*/
 }
 
 body h3 {
@@ -286,7 +288,8 @@ span.tag {
     float: right;
 }
 span.section {
-    padding-top: 35px !important; /* NOTE: needs change when you change <h2>'s margin */
+    /*margin-top: 20px !important; /* NOTE: needs change when you change <h2>'s margin */
+	margin-bottom: 0px;
 }
 
 div.key {
@@ -321,5 +324,5 @@ fieldset.paypal {
 }
 .quoteblock {
 	margin-left: 140px;
-	margin-bottom: 20px;
+	padding-bottom: 20px;
 }