diff --git a/content/commands.js b/content/commands.js
index d32c467e..35e9cb99 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -1099,10 +1099,10 @@ vimperator.Commands = function () //{{{
             help: "Open a GUI dialog where you can select the printer, number of copies, orientation, etc."
         }
     ));
-    commandManager.add(new vimperator.Command(["h[elp]"],
+    commandManager.add(new vimperator.Command(["H[elp]"],
         function (args, special, count, modifiers) { vimperator.help(args, special, null, modifiers); },
         {
-            usage: ["h[elp] {subject}"],
+            usage: ["H[elp] {subject}"],
             shortHelp: "Open the help window",
             help: "You can jump to the specified <code class=\"argument\">{subject}</code> with <code class=\"command\">:help {subject}</code>.<br/>" +
                   "Make sure you use the full Vim notation when jumping to <code class=\"argument\">{subject}</code>. This means:<br/>" +
@@ -1115,10 +1115,10 @@ vimperator.Commands = function () //{{{
             completer: function (filter) { return vimperator.completion.help(filter); }
         }
     ));
-    commandManager.add(new vimperator.Command(["H[elp]"],
+    commandManager.add(new vimperator.Command(["h[elp]"],
         function (args, special, count, modifiers) { vimperator.Help((args || "intro")); },
         {
-            shortHelp: "Temporary function, will replace :help at some time",
+            shortHelp: "Not all help converted to new format, use :Help if you don't find your information.",
             completer: function (filter) { return vimperator.completion.Help(filter); }
         }
     ));
diff --git a/content/help.js b/content/help.js
index 4bf4aa06..a1cfc734 100644
--- a/content/help.js
+++ b/content/help.js
@@ -304,6 +304,8 @@ vimperator.Help = function(section)
             var elem = vimperator.buffer.getElement('@class="tag" and text()="' + tag + '"');
             if (elem)
                 window.content.scrollTo(0, elem.getBoundingClientRect().top - 10); // 10px context
+            else
+                dump('no element: ' + '@class="tag" and text()="' + tag + '"\n' );
         }, 200);
     }
 
diff --git a/content/ui.js b/content/ui.js
index d1be2bb6..7e0ea3d1 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -1129,12 +1129,15 @@ vimperator.StatusLine = function () //{{{
             if (url == "about:blank")
             {
                 var title = vimperator.buffer.title;
-
-                if (title == "Vimperator Help")
-                    url = "[Help]";
-                else if (!title)
+                if (!title)
                     url = "[No Name]";
             }
+            else
+            {
+                var matches = url.match(/^chrome:\/\/vimperator\/locale\/(\S+)$/)
+                if (matches && matches[1])
+                    url = matches[1] + " [Help]";
+            }
 
             var sh = getWebNavigation().sessionHistory;
             var modified = "";
diff --git a/locale/en-US/asciidoc.conf b/locale/en-US/asciidoc.conf
index c8ad2e46..6c8894da 100644
--- a/locale/en-US/asciidoc.conf
+++ b/locale/en-US/asciidoc.conf
@@ -39,9 +39,9 @@ HEADER=<span style="float: right; padding-top: 10px;"><form action="https://www.
 [section-inlinemacro]
 <table style="border-bottom: 1px solid silver; width: 100%">
 <tr width="100%"><td width="50%"><h2>{target}</h2></td><td width="50%">
-{3? <a id="{3}"/><span class="tag section">{3}</span>}
-{2? <a id="{2}"/><span class="tag section">{2}</span>}
-{1? <a id="{1}"/><span class="tag section">{1}</span>}
+{3? <a id="{3}"/><span class="tag">{3}</span>}
+{2? <a id="{2}"/><span class="tag">{2}</span>}
+{1? <a id="{1}"/><span class="tag">{1}</span>}
 </td></tr>
 </table>
 
diff --git a/locale/en-US/browsing.txt b/locale/en-US/browsing.txt
index 64b21b20..ff52d4ca 100644
--- a/locale/en-US/browsing.txt
+++ b/locale/en-US/browsing.txt
@@ -31,7 +31,7 @@ ________________________________________________________________________________
 section:Opening{nbsp}web{nbsp}pages[opening]
 
 |o| |:o| |:open|
-||:o[pen] [arg1], [arg2], ...|| +
+||:o[pen][!] [arg1], [arg2], ...|| +
 ||o||
 ________________________________________________________________________________
 Open one or more URLs in the current tab.
@@ -63,7 +63,7 @@ ________________________________________________________________________________
 
 
 |t| |:t| |:tabopen|
-||:tabopen [arg1], [arg2], ...|| +
+||:tabopen[!] [arg1], [arg2], ...|| +
 ||t||
 ________________________________________________________________________________
 Just like help::open[browsing.html,:open], but opens the resulting web page(s)
@@ -73,7 +73,7 @@ ________________________________________________________________________________
 
 
 |w| |:w| |:winopen|
-||:winopen [arg1], [arg2], ...|| +
+||:winopen[!] [arg1], [arg2], ...|| +
 ________________________________________________________________________________
 Just like help::open[browsing.html,:open], but opens the resulting web page(s)
 in a new window.
diff --git a/locale/en-US/xhtml11.css b/locale/en-US/xhtml11.css
index a293904e..ec2a0e9b 100644
--- a/locale/en-US/xhtml11.css
+++ b/locale/en-US/xhtml11.css
@@ -7,6 +7,11 @@ span.strong {
   font-weight: bold;
 }
 
+a {
+	color: #4A708B;
+	text-decoration: none;
+}
+
 body blockquote {
   margin-top: .75em;
   line-height: 1.5;
@@ -288,9 +293,9 @@ span.tag, span.hiddentag {
     padding-top: -5px;
     float: right;
 }
-span.section {
-    /*margin-top: 20px !important; /* NOTE: needs change when you change <h2>'s margin */
-	margin-bottom: 0px;
+/* inside a table cell means this tag is part of a section */
+td span.tag {
+	padding-top: 25px !important;
 }
 
 div.key {