diff --git a/perguntations/static/js/admin.js b/perguntations/static/js/admin.js
index 2857438..dd32549 100644
--- a/perguntations/static/js/admin.js
+++ b/perguntations/static/js/admin.js
@@ -75,7 +75,6 @@ $(document).ready(function() {
             data: {"cmd": "test", "value": ""},
             dataType: "json",
             success: function(data) {
-                // fill jumbotron data
                 $("#title").html(data['data']['title']);
                 $("#ref").html(data['data']['ref']);
                 $("#filename").html(data['data']['filename']);
diff --git a/perguntations/templates/question-checkbox.html b/perguntations/templates/question-checkbox.html
index e1cfd1a..0c8f533 100644
--- a/perguntations/templates/question-checkbox.html
+++ b/perguntations/templates/question-checkbox.html
@@ -8,7 +8,7 @@
         <a class="list-group-item">
             <div class="d-flex flex-row">
                 <div class="p-2">
-                    <input type="checkbox" id="{{i}}:{{n}}" name="{{i}}" value="{{n}}" autocomplete="off">
+                    <input type="checkbox" class="form-check-input" id="{{i}}:{{n}}" name="{{i}}" value="{{n}}" autocomplete="off">
                 </div>
                 <div class="p-2">
                     <label for="{{i}}:{{n}}">{{ md(opt) }}</label>
diff --git a/perguntations/templates/question-radio.html b/perguntations/templates/question-radio.html
index f68ba7a..18498ef 100644
--- a/perguntations/templates/question-radio.html
+++ b/perguntations/templates/question-radio.html
@@ -3,19 +3,19 @@
 
 {% block answer %}
 <fieldset data-role="controlgroup">
-    <div class="list-group">
+  <div class="list-group">
     {% for n, opt in enumerate(q['options']) %}
-        <a class="list-group-item">
-            <div class="d-flex flex-row">
-                <div class="p-2">
-                    <input type="radio" id="{{i}}:{{n}}" name="{{i}}" value="{{n}}" autocomplete="off">
-                </div>
-                <div class="p-2">
-                    <label for="{{i}}:{{n}}">{{ md(opt) }}</label>
-                </div>
-            </div>
-        </a>
+    <a class="list-group-item">
+      <div class="d-flex flex-row">
+        <div class="p-2">
+          <input type="radio" class="form-check-input" id="{{i}}:{{n}}" name="{{i}}" value="{{n}}" autocomplete="off">
+        </div>
+        <div class="p-2">
+          <label for="{{i}}:{{n}}">{{ md(opt) }}</label>
+        </div>
+      </div>
+    </a>
     {% end %}
-    </div>
+  </div>
 </fieldset>
 {% end %}
diff --git a/perguntations/templates/question.html b/perguntations/templates/question.html
index a927030..30d43bd 100644
--- a/perguntations/templates/question.html
+++ b/perguntations/templates/question.html
@@ -2,13 +2,15 @@
 
 {% block question %}
 <div class="card border-dark">
-  <h5 class="card-header text-white bg-dark">
-    {{ q['number'] }}.  {{ q['title'] }}
+  <div class="card-header text-white bg-dark">
+    <strong>
+        {{ q['number'] }}.  {{ q['title'] }}
+    </strong>
     <div class="float-end">
-      <small>Classificar&nbsp;</small>
-      <input type="checkbox" class="question_disabler" data-size="mini" name="answered-{{i}}" id="answered-{{i}}" checked="">
+      Classificar&nbsp;
+      <input type="checkbox" class="question_disabler form-check-input" name="answered-{{i}}" id="answered-{{i}}" checked="">
     </div>
-  </h5>
+  </div>
   <div class="card-body bg-light">
     <div id="text">
       {{ md(q['text']) }}
diff --git a/perguntations/templates/review-question-checkbox.html b/perguntations/templates/review-question-checkbox.html
index e2ec641..4736dbf 100644
--- a/perguntations/templates/review-question-checkbox.html
+++ b/perguntations/templates/review-question-checkbox.html
@@ -9,7 +9,7 @@
       <div class="d-flex flex-row">
       {% if q['answer'] is not None and str(n) in q['answer'] %}
         <div class="p-2">
-          <i class="bi bi-check-square"></i>
+          <i class="bi bi-check-square-fill"></i>
         </div>
         <div class="p-2">
           {{ md(opt) }}
diff --git a/perguntations/templates/review-question.html b/perguntations/templates/review-question.html
index 7395e15..574f424 100644
--- a/perguntations/templates/review-question.html
+++ b/perguntations/templates/review-question.html
@@ -4,13 +4,15 @@
   {% if q['answer'] is not None %}
 
     <div class="card border-dark">
-      <h5 class="card-header text-light bg-dark">
+      <div class="card-header text-light bg-dark">
+        <strong>
         {{ q['number'] }}.  {{ q['title'] }}
+        </strong>
         <div class="float-end">
-          <small>Classificar&nbsp;</small>
+          Classificar&nbsp;
           <i class="bi bi-check-square"></i>
         </div>
-      </h5> <!-- card-header -->
+      </div> <!-- card-header -->
 
       <div class="card-body">
         <div id="text">
@@ -74,13 +76,15 @@
   {% else %}
 
     <div class="card border-secondary">
-      <h5 class="card-header text-secondary bg-light">
+      <div class="card-header text-secondary bg-light">
+        <strong>
         {{ q['number'] }}.  {{ q['title'] }}
+        </strong>
         <div class="float-end">
-          <small>Classificar</small>
+          Classificar&nbsp;
           <i class="bi bi-square"></i>
         </div>
-      </h5> <!-- card-header -->
+      </div> <!-- card-header -->
 
       <div class="card-body text-secondary bg-light">
         <p id="text">
--
libgit2 0.21.2