diff --git a/blasta.py b/blasta.py
index ba0faec..b216511 100644
--- a/blasta.py
+++ b/blasta.py
@@ -677,7 +677,7 @@ class HttpInstance:
             jabber_id = Utilities.is_jid_matches_to_session(accounts, sessions, request)
             hostname = request.url.hostname
             protocol = request.url.scheme
-            hostname = request.url.hostname + ':' + str(request.url.port)
+            hostname = request.url.netloc
             origin = protocol + '://' + hostname
             bookmarklet = 'location.href=`' + origin + '/save?url=${encodeURIComponent(window.location.href)}&title=${encodeURIComponent(document.title)}`;'
             template_file = 'utilities.xhtml'
diff --git a/stylesheet/stylesheet.css b/stylesheet/stylesheet.css
index 7135205..91ebfc1 100644
--- a/stylesheet/stylesheet.css
+++ b/stylesheet/stylesheet.css
@@ -249,13 +249,25 @@ table#software td {
   vertical-align: text-top;
 }
 
+#bookmarklet:hover {
+  background: #fff9df;
+}
+
 #bookmarklet {
   background: #eee;
   border: 1px solid #bbb;
+  font-weight: bold;
+  filter: drop-shadow(1px 1px 1px black);
+  margin-left: 3px;
+  margin-right: 3px;
   padding-left: 3px;
   padding-right: 3px;
 }
 
+#bookmarklet a {
+  color: #0000ff;
+}
+
 #subscribe {
   /* font-size: 75%; */
   padding-top: 1em;
diff --git a/stylesheet/stylesheet.xsl b/stylesheet/stylesheet.xsl
index db9c649..ebab3cc 100644
--- a/stylesheet/stylesheet.xsl
+++ b/stylesheet/stylesheet.xsl
@@ -68,6 +68,7 @@ xmlns:atom='http://www.w3.org/2005/Atom'>
                         <img src='/graphic/blasta_syndicate.svg'/>
                         &#160;
                         <xsl:value-of select='atom:title'/>
+                        (syndication)
                     </h1>
                     <dl id='navigation'>
                         <dd>
diff --git a/template/about.xhtml b/template/about.xhtml
index 04d4351..9efc871 100644
--- a/template/about.xhtml
+++ b/template/about.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / <a href="/help">help</a> / about
             </h1>
             <dl id="navigation">
diff --git a/template/ask.xhtml b/template/ask.xhtml
index 08b8dc2..93651c8 100644
--- a/template/ask.xhtml
+++ b/template/ask.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / {{path}}
             </h1>
             <dl id="navigation">
diff --git a/template/atomsub.xhtml b/template/atomsub.xhtml
index 70195bf..73817ad 100644
--- a/template/atomsub.xhtml
+++ b/template/atomsub.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / <a href="/help">help</a> / <a href="/help/about">about</a> / <a href="/help/about/xmpp">xmpp</a> / atomsub
             </h1>
             <dl id="navigation">
diff --git a/template/browse.xhtml b/template/browse.xhtml
index 14b4338..b3a6a00 100644
--- a/template/browse.xhtml
+++ b/template/browse.xhtml
@@ -22,6 +22,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / {{path}}{% if jid and jid != jabber_id %} / <a href="/jid/{{jid}}">{{jid}}</a>{% endif %}
             </h1>
             <dl id="navigation">
diff --git a/template/connect.xhtml b/template/connect.xhtml
index 431c8a9..9437b68 100644
--- a/template/connect.xhtml
+++ b/template/connect.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / connect
             </h1>
             <dl id="navigation">
diff --git a/template/contact.xhtml b/template/contact.xhtml
index fe755b1..0e8c8e4 100644
--- a/template/contact.xhtml
+++ b/template/contact.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / contact
             </h1>
             <dl id="navigation">
diff --git a/template/edit.xhtml b/template/edit.xhtml
index a8a99e1..3435fb4 100644
--- a/template/edit.xhtml
+++ b/template/edit.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / {{path}}
             </h1>
             <dl id="navigation">
diff --git a/template/feeds.xhtml b/template/feeds.xhtml
index 3ff3206..c2d7b65 100644
--- a/template/feeds.xhtml
+++ b/template/feeds.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / <a href="/help">help</a> / feeds
             </h1>
             <dl id="navigation">
diff --git a/template/folksonomy.xhtml b/template/folksonomy.xhtml
index 990262f..c5e5924 100644
--- a/template/folksonomy.xhtml
+++ b/template/folksonomy.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / <a href="/help">help</a> / <a href="/help/about">about</a> / folksonomy
             </h1>
             <dl id="navigation">
diff --git a/template/help.xhtml b/template/help.xhtml
index f297099..b03c2d9 100644
--- a/template/help.xhtml
+++ b/template/help.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / help
             </h1>
             <dl id="navigation">
diff --git a/template/ideas.xhtml b/template/ideas.xhtml
index b7a928b..d2d11d1 100644
--- a/template/ideas.xhtml
+++ b/template/ideas.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / <a href="/help">help</a> / <a href="/help/about">about</a> / ideas
             </h1>
             <dl id="navigation">
diff --git a/template/libervia.xhtml b/template/libervia.xhtml
index 61d2c9d..6143ba6 100644
--- a/template/libervia.xhtml
+++ b/template/libervia.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / <a href="/help">help</a> / <a href="/help/about">about</a> / <a href="/help/about/xmpp">xmpp</a> / libervia
             </h1>
             <dl id="navigation">
diff --git a/template/movim.xhtml b/template/movim.xhtml
index 18a05fa..575f29e 100644
--- a/template/movim.xhtml
+++ b/template/movim.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / <a href="/help">help</a> / <a href="/help/about">about</a> / <a href="/help/about/xmpp">xmpp</a> / movim
             </h1>
             <dl id="navigation">
diff --git a/template/now.xhtml b/template/now.xhtml
index 2b02fbe..efed154 100644
--- a/template/now.xhtml
+++ b/template/now.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / now
             </h1>
             <dl id="navigation">
diff --git a/template/people.xhtml b/template/people.xhtml
index 449f01b..bc0f8c6 100644
--- a/template/people.xhtml
+++ b/template/people.xhtml
@@ -22,6 +22,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / {{path}}
             </h1>
             <dl id="navigation">
diff --git a/template/philosophy.xhtml b/template/philosophy.xhtml
index 5e6612f..3f634ec 100644
--- a/template/philosophy.xhtml
+++ b/template/philosophy.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / <a href="/help">help</a> / <a href="/help/about">about</a> / philosophy
             </h1>
             <dl id="navigation">
diff --git a/template/profile.xhtml b/template/profile.xhtml
index ecbcdd7..04c7531 100644
--- a/template/profile.xhtml
+++ b/template/profile.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / profile
             </h1>
             <dl id="navigation">
diff --git a/template/projects.xhtml b/template/projects.xhtml
index 0628ade..9b0c97a 100644
--- a/template/projects.xhtml
+++ b/template/projects.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / <a href="/help">help</a> / <a href="/help/about">about</a> / projects
             </h1>
             <dl id="navigation">
diff --git a/template/pubsub.xhtml b/template/pubsub.xhtml
index 946bdea..1241d96 100644
--- a/template/pubsub.xhtml
+++ b/template/pubsub.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / <a href="/help">help</a> / <a href="/help/about">about</a> / <a href="/help/about/xmpp">xmpp</a> / pubsub
             </h1>
             <dl id="navigation">
diff --git a/template/questions.xhtml b/template/questions.xhtml
index 0fd533f..b345461 100644
--- a/template/questions.xhtml
+++ b/template/questions.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / <a href="/help">help</a> / questions
             </h1>
             <dl id="navigation">
diff --git a/template/register.xhtml b/template/register.xhtml
index 9b848e4..ef6513b 100644
--- a/template/register.xhtml
+++ b/template/register.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / register
             </h1>
             <dl id="navigation">
diff --git a/template/result.xhtml b/template/result.xhtml
index c26f3e6..9c42220 100644
--- a/template/result.xhtml
+++ b/template/result.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / {{path}}
             </h1>
             <dl id="navigation">
diff --git a/template/search.xhtml b/template/search.xhtml
index c2d057a..ce7beb8 100644
--- a/template/search.xhtml
+++ b/template/search.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / search / {{path}}
             </h1>
             <dl id="navigation">
diff --git a/template/software.xhtml b/template/software.xhtml
index 4647a2b..06468d1 100644
--- a/template/software.xhtml
+++ b/template/software.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / <a href="/help">help</a> / <a href="/help/about">about</a> / software
             </h1>
             <dl id="navigation">
diff --git a/template/syndication.xhtml b/template/syndication.xhtml
index 3792f00..413f102 100644
--- a/template/syndication.xhtml
+++ b/template/syndication.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / <a href="/help">help</a> / syndication
             </h1>
             <dl id="navigation">
diff --git a/template/tag.xhtml b/template/tag.xhtml
index 56bf5ee..46a5ca6 100644
--- a/template/tag.xhtml
+++ b/template/tag.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / tag
             </h1>
             <dl id="navigation">
diff --git a/template/thanks.xhtml b/template/thanks.xhtml
index 33bb5fe..63cfae1 100644
--- a/template/thanks.xhtml
+++ b/template/thanks.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / <a href="/help">help</a> / <a href="/help/about">about</a> / thanks
             </h1>
             <dl id="navigation">
diff --git a/template/utilities.xhtml b/template/utilities.xhtml
index 2351446..9236347 100644
--- a/template/utilities.xhtml
+++ b/template/utilities.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / <a href="/help">help</a> / utilities
             </h1>
             <dl id="navigation">
@@ -74,11 +75,11 @@
                 <p>
                     Blasta offers a bookmarklet to facilitate the task of saving
                     HTTP links to your collection. Pin this
-                    <span id="bookmarklet">
-                        <img alt="Blasta"
-                             src="/graphic/blasta.svg"/>
-                        <a href="javascript:{{bookmarklet}}"
-                           title="Pin this link to your bookmarks bar.">
+                    <span id="bookmarklet"
+                          title="Pin this link to your bookmarks bar.">
+                        <a href="javascript:{{bookmarklet}}">
+                            <img alt="Blasta"
+                                 src="/graphic/blasta.svg"/>
                             Blastize!</a></span>
                     bookmarklet to your bookmarks bar, and click on it
                     when you want to save a link of a given page to your
@@ -87,25 +88,25 @@
                 <p>
                     You can also pin these links to your bookmarks bar, in order
                     to swiftly navigate to your bookmarks with a single click.
-                    <span id="bookmarklet">
-                        <img alt="Blasta"
-                             src="/graphic/blasta.svg"/>
-                        <a href="/jid"
-                           title="Pin this link to your bookmarks bar.">
+                    <span id="bookmarklet"
+                          title="Pin this link to your bookmarks bar.">
+                        <a href="/jid">
+                            <img alt="Blasta"
+                                 src="/graphic/blasta.svg"/>
                             Blasta</a></span>
                     and
-                    <span id="bookmarklet">
-                        <img alt="Blasta (Private)"
-                             src="/graphic/blasta.svg"/>
-                        <a href="/private"
-                           title="Pin this link to your bookmarks bar.">
+                    <span id="bookmarklet"
+                          title="Pin this link to your bookmarks bar.">
+                        <a href="/private">
+                            <img alt="Blasta (Private)"
+                                 src="/graphic/blasta.svg"/>
                             Private</a></span>
                     and
-                    <span id="bookmarklet">
-                        <img alt="Blasta (Read)"
-                             src="/graphic/blasta.svg"/>
-                        <a href="/read"
-                           title="Pin this link to your bookmarks bar.">
+                    <span id="bookmarklet"
+                          title="Pin this link to your bookmarks bar.">
+                        <a href="/read">
+                            <img alt="Blasta (Read)"
+                                 src="/graphic/blasta.svg"/>
                             Reading List</a></span>.
                 </p>
                 <h4 id="software">
diff --git a/template/xmpp.xhtml b/template/xmpp.xhtml
index 3ab7463..5aedfa2 100644
--- a/template/xmpp.xhtml
+++ b/template/xmpp.xhtml
@@ -15,6 +15,7 @@
         <div id="header" class="row">
             <h1>
                 <img src="/graphic/blasta.svg"/>
+                &nbsp;
                 <a href="/">Blasta</a> / <a href="/help">help</a> / <a href="/help/about">about</a> / xmpp
             </h1>
             <dl id="navigation">