diff --git a/ldoc/html/ldoc_css.lua b/ldoc/html/ldoc_css.lua
index 825f823..7a5a929 100644
--- a/ldoc/html/ldoc_css.lua
+++ b/ldoc/html/ldoc_css.lua
@@ -160,7 +160,7 @@ table.index td { text-align: left; vertical-align: top; }
 
 #navigation {
     float: left;
-    width: 18em;
+    width: 14em;
     vertical-align: top;
     background-color: #f0f0f0;
     overflow: visible;
@@ -194,7 +194,7 @@ table.index td { text-align: left; vertical-align: top; }
 }
 
 #content {
-    margin-left: 18em;
+    margin-left: 14em;
     padding: 1em;
     width: 700px;
     border-left: 2px solid #cccccc;
diff --git a/ldoc/markup.lua b/ldoc/markup.lua
index 1d756cc..fcfc9d8 100644
--- a/ldoc/markup.lua
+++ b/ldoc/markup.lua
@@ -47,7 +47,7 @@ local function resolve_inline_references (ldoc, txt, item, plain)
          label = label:gsub('_','\\_')
       end
       local html = ldoc.href(ref) or '#'
-      label = label or qname
+      label = ldoc.escape(label or qname)
       local res = ('<a href="%s">%s</a>'):format(html,label)
       return res
    end))
@@ -58,6 +58,7 @@ local function resolve_inline_references (ldoc, txt, item, plain)
          if name and do_escape then
             label = name:gsub('_', '\\_')
          end
+         label = ldoc.escape(label)
          if ref then
             return ('<a href="%s">%s</a>'):format(ldoc.href(ref),label)
          else
diff --git a/ldoc/prettify.lua b/ldoc/prettify.lua
index 3b4140d..bb7239a 100644
--- a/ldoc/prettify.lua
+++ b/ldoc/prettify.lua
@@ -24,7 +24,7 @@ end
 
 local spans = {keyword=true,number=true,string=true,comment=true,global=true,backtick=true}
 
-local cpp_lang = {c = true, cpp = true, cxx = true, h = true}
+local cpp_lang = {C = true, c = true, cpp = true, cxx = true, h = true}
 
 function prettify.lua (lang, fname, code, initial_lineno, pre, linenos)
    local res, lexer, tokenizer = List(), require 'ldoc.lexer'