diff --git a/quiqqer/faq/types/category.html b/quiqqer/faq/types/category.html
index dffa9454835d7876595023fa8007c5b81332bc3f..ae7c9f1347a6822b382956555c1dbd75f38ce6af 100644
--- a/quiqqer/faq/types/category.html
+++ b/quiqqer/faq/types/category.html
@@ -6,28 +6,14 @@
 
 {* Template: default*}
 {if $faqTemplate == 'default'}
-    {if $offset}
-        {*
-        This CSS is used to scroll the page down a bit when accessed with a # in the url.
-        By doing this the menu no longer hides the linked content.
-        *}
-        <style type="text/css">
-            :target::before {
-                content: '';
-                display: block;
-                height: {$offset}px;
-                margin-top: -{$offset}px;
-            }
-        </style>
-    {/if}
-
-    <section itemscope itemtype="http://schema.org/ItemList"
+    <section itemscope itemtype="https://schema.org/ItemList"
              class="content-template quiqqer-faq clear-fix cologne-quiqqer-faq"
              data-qui="package/quiqqer/faq/bin/Category"
              data-qui-options-offset="{$offset}"
+             {if $offset}style="--_qui-faq-scrollOffset: var(--qui-faq-scrollOffset, {$offset}px);"{/if}
     >
         {if count($entries)}
-            <ul class="quiqqer-faq-list" id="faqList" name="faqList">
+            <ul class="quiqqer-faq-list" id="faqList">
                 {foreach $entries as $Faq}
                     <li>
                         <a href="{url site=$Site}#faq{$Faq->getId()}">
@@ -40,7 +26,7 @@
         {/if}
 
         {foreach $entries as $Faq}
-            <article id="faq{$Faq->getId()}" class="clear-fix">
+            <article id="faq{$Faq->getId()}" class="quiqqer-faq__entry">
                 <header>
                     <h2><span class="fa fa-file-text"></span> {$Faq->getAttribute('title')}</h2>
                 </header>
@@ -65,6 +51,10 @@
 
             {/if}
         {/foreach}
+
+        {if $faqStructuredData}
+            {$faqStructuredData}
+        {/if}
     </section>
 {/if}
 
diff --git a/template/topBar.html b/template/topBar.html
index 0098f71dc3fa225f8cc33c06a95f61be75eb70ae..3c6d4878b1baddb3ec0ab2a816ce34c3c4e2119e 100644
--- a/template/topBar.html
+++ b/template/topBar.html
@@ -24,7 +24,7 @@
         {/if}
         {* END language & currency switch *}
 
-        <span class="cologne-header-control-user">
+        <div class="cologne-header-control-user">
             {if $User->getId()}
                 {$Avatar->create()}
             {else}
@@ -34,6 +34,6 @@
             <span class="cologne-header-control-user-loader">
                 <span class="fa fa-pulse fa-circle-o-notch"></span>
             </span>
-        </span>
+        </div>
     </div>
 </div>
\ No newline at end of file