diff --git a/src/App.vue b/src/App.vue
index 73b69aa61a83229191d11e9b795c2f0bb9101e0b..1814b22afc8140b1aed1e202bdf8bb7c62677e5f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -149,7 +149,7 @@ h1 > a.xs, h1 > a.sm {
   
 }
 
-.banner a, h2 a {
+.banner a {
   text-decoration: none;
   color: var(--v-primary-base) !important;
 }
diff --git a/src/components/Header.vue b/src/components/Header.vue
index 9fa7d827e95933ad79bd9262e2677b023235ce82..2c6fc9563c085f912359e85a277b261c40716631 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -2,8 +2,8 @@
 <template>
   <div class="header">
     <span class="dict-label">{{dict_label}}</span>
-    <div v-for="(lemma_group, i) in lemma_groups" :key="i">
-    <h2><router-link tabindex="0" 
+    <div v-bind:class="{ 'lookup': $route.name=='lookup'}" v-for="(lemma_group, i) in lemma_groups" :key="i">
+    <h2><router-link v-if="$route.name!='lookup'" tabindex="0" 
                  :id="title_id" 
                  :to="$parent.link_to_self.ref" 
                  @click.native="$parent.details_click($parent.link_to_self)"
@@ -14,6 +14,19 @@
                 <!--
       
     --><span v-for="(lemma, index) in lemma_group.lemmas" 
+          :key="index"><u>{{lemma.lemma}}</u><!--
+          --><span v-if="lemma.hgno"
+                   :aria-label="'Betydning nummer ' + parseInt(lemma.hgno)" 
+                   :title="'Betydning nummer '+parseInt(lemma.hgno)"
+                   class="hgno">{{" "+roman_hgno(lemma)}}</span><!--
+                    --><span 
+                   class="title_comma" 
+                   v-if="lemma_group.lemmas[1] && index < lemma_group.lemmas.length-1">{{", "}}
+                  </span>
+    </span>
+    </router-link>
+      
+    <span v-else v-for="(lemma, index) in lemma_group.lemmas" 
           :key="index">{{lemma.lemma}}<!--
           --><span v-if="lemma.hgno"
                    :aria-label="'Betydning nummer ' + parseInt(lemma.hgno)" 
@@ -24,7 +37,10 @@
                    v-if="lemma_group.lemmas[1] && index < lemma_group.lemmas.length-1">{{", "}}
                   </span>
     </span>
-    </router-link></h2>
+
+    
+    
+    </h2>
     
     <span class="header_group_list" 
           v-if="lemma_group.description">{{lemma_group.description}}</span>
@@ -243,11 +259,18 @@ div.lemma {
 
 
 .article_header {
-  text-decoration: none;
   overflow:auto;
   word-wrap: normal;
 }
 
+h2 a {
+  text-decoration: none;
+}
+
+h2 a u {
+  text-decoration-thickness: 1px;
+}
+
 .long_lemma {
   font-size: 18px !important;