diff --git a/app/views/komponenty/examples/button.njk b/app/views/komponenty/examples/button.njk
index 42f90e94a8..665362ed4f 100644
--- a/app/views/komponenty/examples/button.njk
+++ b/app/views/komponenty/examples/button.njk
@@ -6,7 +6,8 @@
     "text": "E-mailová adresa"
   },
   "id": "input-email",
-  "name": "email"
+  "name": "email",
+  "type": "email"
 }) }}
 {{ idskButton({
   "text": "Uložiť a pokračovať"
diff --git a/src/idsk/components/stepper/stepper.js b/src/idsk/components/stepper/stepper.js
index a2ffb8a39c..8bc72a5865 100644
--- a/src/idsk/components/stepper/stepper.js
+++ b/src/idsk/components/stepper/stepper.js
@@ -68,7 +68,7 @@ Stepper.prototype.initControls = function () {
     // Create "Zobraziť všetko" button and set attributes
     this.$openAllButton = document.createElement('button')
     this.$openAllButton.setAttribute('type', 'button')
-    this.$openAllButton.innerHTML = $accordionControls.dataset.line1 + ' <span class="govuk-visually-hidden">sections</span>'
+    this.$openAllButton.innerHTML = $accordionControls.dataset.line1 + ' <span class="govuk-visually-hidden">sekcie</span>'
     this.$openAllButton.setAttribute('class', this.$openAllClass)
     this.$openAllButton.setAttribute('aria-expanded', 'false')
     this.$openAllButton.setAttribute('type', 'button')
@@ -235,7 +235,7 @@ Stepper.prototype.updateOpenAllButton = function ($expanded) {
   
   if ($accordionControls) {
     var $newButtonText = $expanded ? $accordionControls.dataset.line2 : $accordionControls.dataset.line1
-    $newButtonText += '<span class="govuk-visually-hidden"> sections</span>'
+    $newButtonText += '<span class="govuk-visually-hidden">sekcie</span>'
     this.$openAllButton.setAttribute('aria-expanded', $expanded)
     this.$openAllButton.innerHTML = $newButtonText
   } else {
diff --git a/src/idsk/components/stepper/template.njk b/src/idsk/components/stepper/template.njk
index 6f0fcf69b9..f58732d393 100644
--- a/src/idsk/components/stepper/template.njk
+++ b/src/idsk/components/stepper/template.njk
@@ -19,10 +19,10 @@
         {% if item %}
             {% if item.heading.isTitle %}
                 <div class="idsk-stepper__section-title">
-                    <div class="idsk-stepper__section-header idsk-stepper__section-subtitle">
+                    <h1 class="idsk-stepper__section-header idsk-stepper__section-subtitle">
                         <p class="govuk-heading-m">{{item.heading.text}}
                         </p>
-                    </div>
+                    </h1>
                 </div>
             {% else %}
             {% set counter = counter + 1 %}
diff --git a/src/idsk/components/table/template.njk b/src/idsk/components/table/template.njk
index 8c4c4ef45b..f0264f4798 100644
--- a/src/idsk/components/table/template.njk
+++ b/src/idsk/components/table/template.njk
@@ -17,11 +17,13 @@
         <div class="idsk-table__heading-extended">
           <div class="govuk-form-group">
             <div class="govuk-radios govuk-radios--inline">
+              <fieldset class="govuk-fieldset">
                 {% for radio in params.radioOptions.slice(0, 2) %}
                     <div class="govuk-radios__item">
-                        <input class="govuk-radios__input" type="radio" name="radio-{{ params.uniqueId + '-' + loop.index }}" id="radio-{{ params.uniqueId + '-' + loop.index }}" value="{{ radio.value }}" {% if loop.index == 1 %}checked=""{% endif %}>
-                        <label class="govuk-label govuk-radios__label" for="radio-{{ params.uniqueId + '-' + loop.index }}">{{ radio.title }}</label>
+                        <input class="govuk-radios__input" type="radio" name="radio-{{ params.uniqueId }}" id="radio-{{ params.uniqueId + '-' + loop.index }}" value="{{ radio.value }}" {% if loop.index == 1 %}checked=""{% endif %}>
+                        <label class="govuk-label govuk-radios__label" for="radio-{{ params.uniqueId }}">{{ radio.title }}</label>
                     </div>
+                  </fieldset>
                 {% endfor %}
             </div>
           </div>