diff --git a/majak_uistyleguide/templates/patterns/molecules/candidates/candidate_primary_box.html b/majak_uistyleguide/templates/patterns/molecules/candidates/candidate_primary_box.html
index 88385467bfe90fcadc3d4af49c1dee11f88095d1..c772a5fe8e4bd7f86e23d340557ad6934d781065 100644
--- a/majak_uistyleguide/templates/patterns/molecules/candidates/candidate_primary_box.html
+++ b/majak_uistyleguide/templates/patterns/molecules/candidates/candidate_primary_box.html
@@ -1,5 +1,6 @@
 <ui-candidate-primary-box
   name="{{ name }}"
+  subheading="{{ subheading }}"
   position="{{ position }}"
   description="{{ description }}"
   url="{{ url }}"
diff --git a/majak_uistyleguide/templates/patterns/molecules/candidates/candidate_primary_box.yaml b/majak_uistyleguide/templates/patterns/molecules/candidates/candidate_primary_box.yaml
index 9fe99cdfd348f96e37386ad9081e069f45a075ef..69e3ec17067f4676681185763e102f3219fe8b86 100644
--- a/majak_uistyleguide/templates/patterns/molecules/candidates/candidate_primary_box.yaml
+++ b/majak_uistyleguide/templates/patterns/molecules/candidates/candidate_primary_box.yaml
@@ -1,5 +1,6 @@
 context:
   name: 'Ing. Mgr. et Mgr. Mikuláš Peksa'
+  subheading: 'Podnadpis'
   image_source: '../../../../../static/images/mikulas-arrow.png'
   position: 'Europoslanec'
   description: 'Mikuláš Peksa (18. 6. 1986) vystudoval fyziku na Matematicko-fyzikální fakultě Univerzity Karlovy. V Německu pracoval jako správce Linuxových serverů a programátor v C++. Po návratu do Čech byl v roce 2017 zvolen poslancem PSP ČR, následně v roce 2019 poslancem Evropského parlamentu. Věnuje se zejména tématům spojeným s fungováním společnosti v digitálním věku.'
diff --git a/majak_uistyleguide/templates/patterns/organisms/header/simple_header.html b/majak_uistyleguide/templates/patterns/organisms/header/simple_header.html
index 5c391d90a28ad1424866b95a9151c9348262be8f..6a15547356f3d5dc2dd9a04e9c26dead2d05b832 100644
--- a/majak_uistyleguide/templates/patterns/organisms/header/simple_header.html
+++ b/majak_uistyleguide/templates/patterns/organisms/header/simple_header.html
@@ -52,7 +52,7 @@
               {% if description %}
                 <p
                   class="
-                    text-lg leading-7 pr-4
+                    text-lg leading-7 pr-4 whitespace-pre-line
 
                     xl:pr-0
 
@@ -60,9 +60,7 @@
 
                     {% block description_classes %}{% endblock %}
                   "
-                >
-                  {{ description }}
-                </p>
+                >{{ description }}</p>
               {% endif %}
             {% endblock %}
 
diff --git a/majak_uistyleguide/templates/patterns/templates/main/program/program.html b/majak_uistyleguide/templates/patterns/templates/main/program/program.html
index 676ac747c9c750e3c1b6b649b57a33a452fdd59c..d57ac5b0e43fa63ad54928cf1a93c31bc572ed58 100644
--- a/majak_uistyleguide/templates/patterns/templates/main/program/program.html
+++ b/majak_uistyleguide/templates/patterns/templates/main/program/program.html
@@ -6,7 +6,7 @@
     :sync-location="true"
     v-slot="{ isCurrentView, toggleView }"
   >
-    {% include 'patterns/organisms/header/simple_header_with_ui_switch.html' with title='Program' ui_switch_iterable=programs %}
+    {% include 'patterns/organisms/header/simple_header_with_ui_switch.html' with title='Program' description='Description' ui_switch_iterable=programs %}
 
     <main role="main">
       {% for program in programs %}
diff --git a/src/js/components/CandidatePrimaryBox.vue b/src/js/components/CandidatePrimaryBox.vue
index 1afbe61ee82bfa83673988f81b57787e7a3a158a..da2fd99d9f961a3830e02bd864ec774221645f51 100644
--- a/src/js/components/CandidatePrimaryBox.vue
+++ b/src/js/components/CandidatePrimaryBox.vue
@@ -23,6 +23,10 @@
             {{ name }}
           </h2>
 
+          <h3 class="head-6xl mb-5" v-if="subheading">
+            {{ subheading }}
+          </h3>
+
           <p v-if="position" class="font-bold text-lg mt-[-0.5rem] mb-3">
             {{ position }}
           </p>
@@ -45,9 +49,9 @@
             </li>
           </ul>
 
-          <p class="text-lg mb-8 lg:mb-16">
-            {{ description }}
-          </p>
+          <div class="text-lg mb-8 lg:mb-16">
+            <div v-html="description"></div>
+          </div>
         </div>
 
         <div class="flex justify-start">
@@ -99,7 +103,7 @@
 <script>
 export default {
   name: "CandidatePrimaryBox",
-  props: ["name", "position", "description", "url", "imageSource", "socialLinks"],
+  props: ["name", "subheading", "position", "description", "url", "imageSource", "socialLinks"],
   mounted () {
     var intersectionOptions = {
       rootMargin: '0px',