diff --git a/perguntations/templates/question-checkbox.html b/perguntations/templates/question-checkbox.html
index 88bd802..7c2ee25 100644
--- a/perguntations/templates/question-checkbox.html
+++ b/perguntations/templates/question-checkbox.html
@@ -11,7 +11,7 @@
                     <input type="checkbox" id="{{i}}:{{n}}" name="{{i}}" value="{{n}}">
                 </div>
                 <div class="p-2">
-                    <label for="{{n}}">{{ md(opt) }}</label>
+                    <label for="{{i}}:{{n}}">{{ md(opt) }}</label>
                 </div>
             </div>
         </a>
diff --git a/perguntations/templates/question-radio.html b/perguntations/templates/question-radio.html
index d41f636..e57eb89 100644
--- a/perguntations/templates/question-radio.html
+++ b/perguntations/templates/question-radio.html
@@ -7,11 +7,11 @@
     {% for n, opt in enumerate(q['options']) %}
         <a class="list-group-item">
             <div class="d-flex flex-row">
-                <div class="p-1">
+                <div class="p-2">
                     <input type="radio" id="{{i}}:{{n}}" name="{{i}}" value="{{n}}">
                 </div>
-                <div class="p-1">
-                    <label for="{{n}}">{{ md(opt) }}</label>
+                <div class="p-2">
+                    <label for="{{i}}:{{n}}">{{ md(opt) }}</label>
                 </div>
             </div>
         </a>
--
libgit2 0.21.2