diff --git a/templates/admin.html b/templates/admin.html
index e2a4c6a..98ca33e 100644
--- a/templates/admin.html
+++ b/templates/admin.html
@@ -23,7 +23,9 @@
 <!-- ===================================================================== -->
 <body>
 <nav class="navbar navbar-expand-sm fixed-top navbar-dark bg-danger">
-  <a class="navbar-brand" href="#">Admin</a>
+  <a class="navbar-brand" href="#">
+    <img src="/static/logo_navbar.png" height="30" alt="">
+  </a>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
@@ -38,12 +40,12 @@
     <!-- right -->
     <ul class="navbar-nav">
       <li class="nav-item dropdown">
-        <a class="nav-link dropdown-toggle  active" href="#" id="navbarDropdownAluno" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          Aluno
+        <a class="nav-link dropdown-toggle active" href="#" id="navbarDropdownAluno" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          Acções
         </a>
         <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownAluno">
-          <a class="dropdown-item" href="#" id="novo_aluno" data-toggle="modal" data-target="#novo_aluno_modal">Inserir novo...</a>
-          <a class="dropdown-item" href="#" id="reset_password_menu" data-toggle="modal" data-target="#reset_password_modal">Reset password...</a>
+          <a class="dropdown-item" href="#" id="novo_aluno" data-toggle="modal" data-target="#novo_aluno_modal">Inserir novo aluno...</a>
+          <a class="dropdown-item" href="#" id="reset_password_menu" data-toggle="modal" data-target="#reset_password_modal">Reset password do aluno...</a>
           <a class="dropdown-item" href="#" id="allow_all">Autorizar todos</a>
           <a class="dropdown-item" href="#" id="deny_all">Desautorizar todos</a>
         </div>
diff --git a/templates/question-checkbox.html b/templates/question-checkbox.html
index 4e398c9..d4a780a 100644
--- a/templates/question-checkbox.html
+++ b/templates/question-checkbox.html
@@ -7,10 +7,10 @@
     {% 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="checkbox" id="{{i}}:{{n}}" name="{{i}}" value="{{n}}">
                 </div>
-                <div class="p-1">
+                <div class="p-2">
                     <label for="{{n}}">{{ md(opt, q) }}</label>
                 </div>
             </div>
diff --git a/templates/question.html b/templates/question.html
index 3de1aac..f202e3f 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -21,7 +21,6 @@
         (Cotação: {{ round(q['points'], 2) }} pontos)
       </small>
     </p>
-
   </div>
 </div>
 {% end %}
\ No newline at end of file
diff --git a/templates/review-question-checkbox.html b/templates/review-question-checkbox.html
index 81d1429..86c57e4 100644
--- a/templates/review-question-checkbox.html
+++ b/templates/review-question-checkbox.html
@@ -4,10 +4,17 @@
 {% block answer %}
 <fieldset data-role="controlgroup">
     <ul class="list-group">
-        {% for n, opt in enumerate(q['options']) %}
-            <li class="list-group-item">
-                {% if q['answer'] is not None and str(n) in q['answer'] %}
-                    {{ md('<i class="fa fa-check-square-o" aria-hidden="true"></i> ' + opt, q)}}
+    {% for n, opt in enumerate(q['options']) %}
+        <li class="list-group-item">
+            <div class="d-flex flex-row">
+            {% if q['answer'] is not None and str(n) in q['answer'] %}
+                <div class="p-2">
+                    <i class="fa fa-check-square-o" aria-hidden="true"></i>
+                </div>
+                <div class="p-2">
+                    {{ md(opt, q) }}
+                </div>
+                <div class="ml-auto p-2">
                     {% if q['correct'][n] > 0 %}
                         <div class="text-right text-success">
                             <i class="fa fa-check" aria-hidden="true"></i>
@@ -17,8 +24,16 @@
                             <i class="fa fa-close" aria-hidden="true"></i>
                         </div>
                     {% end %}
-                {% else %}
-                    {{ md('<i class="fa fa-square-o" aria-hidden="true"></i> ' + opt, q) }}
+                </div>
+
+            {% else %}
+                <div class="p-2">
+                    <i class="fa fa-square-o" aria-hidden="true"></i> 
+                </div>
+                <div class="p-2">
+                    {{ md(opt, q) }}
+                </div>
+                <div class="ml-auto p-2">
                     {% if q['correct'][n] > 0 %}
                         <div class="text-right text-danger">
                             <i class="fa fa-close" aria-hidden="true"></i>
@@ -28,9 +43,11 @@
                             <i class="fa fa-check" aria-hidden="true"></i>
                         </div>
                     {% end %}
-                {% end %}
-            </li>
-        {% end %}
+                </div>
+            {% end %}
+            </div>
+        </li>
+    {% end %}
     </ul>
 </fieldset>
 {% end %}
diff --git a/templates/review-question-radio.html b/templates/review-question-radio.html
index 6a53d9d..1bad631 100644
--- a/templates/review-question-radio.html
+++ b/templates/review-question-radio.html
@@ -4,10 +4,17 @@
 {% block answer %}
 <fieldset data-role="controlgroup">
     <ul class="list-group">
-        {% for n, opt in enumerate(q['options']) %}
-            <li class="list-group-item">
-                {% if q['answer'] is not None and str(n)==q['answer'] %}
-                    {{ md('<i class="fa fa-dot-circle-o" aria-hidden="true"></i> ' + opt, q)}}
+    {% for n, opt in enumerate(q['options']) %}
+        <li class="list-group-item">
+            <div class="d-flex flex-row">
+            {% if q['answer'] is not None and str(n)==q['answer'] %}
+                <div class="p-2">
+                    <i class="fa fa-dot-circle-o" aria-hidden="true"></i>
+                </div>
+                <div class="p-2">
+                    {{ md(opt, q) }}
+                </div>
+                <div class="ml-auto p-2">
                     {% if q['correct'][n] > 0 %}
                         <div class="text-right text-success">
                             <i class="fa fa-check" aria-hidden="true"></i>
@@ -17,17 +24,25 @@
                             <i class="fa fa-close" aria-hidden="true"></i>
                         </div>
                     {% end %}
-                {% else %}
-                    {{ md('<i class="fa fa-circle-o" aria-hidden="true"></i> ' + opt, q) }}
+                </div>
 
+            {% else %}
+                <div class="p-2">
+                    <i class="fa fa-circle-o" aria-hidden="true"></i>
+                </div>
+                <div class="p-2">
+                    {{ md(opt, q) }}
+                </div>
+                <div class="ml-auto p-2">
                     {% if q['correct'][n] > 0 %}
                         <div class="text-right text-info">
                             <i class="fa fa-circle" aria-hidden="true"></i>
                         </div>
                     {% end %}
-                {% end %}
-            </li>
-        {% end %}
+                </div>
+            {% end %}
+        </li>
+    {% end %}
     </ul>
 </fieldset>
 {% end %}
\ No newline at end of file
diff --git a/templates/review-question.html b/templates/review-question.html
index b2efbbc..83f9e50 100644
--- a/templates/review-question.html
+++ b/templates/review-question.html
@@ -14,9 +14,9 @@
       </h5> <!-- card-header -->
 
       <div class="card-body">
-        <p id="text">
+        <div id="text">
           {{ md(q['text'], q) }}
-        </p>
+        </div>
 
         {% block answer %}{% end %}
 
diff --git a/templates/review.html b/templates/review.html
index d8876cb..6f37a0e 100644
--- a/templates/review.html
+++ b/templates/review.html
@@ -27,7 +27,7 @@
 </head>
 <!-- ===================================================================== -->
 <body>
-<nav class="navbar navbar-expand-sm fixed-top navbar-dark bg-dark">
+<nav class="navbar navbar-expand-sm fixed-top navbar-dark bg-danger">
   <a class="navbar-brand" href="#">
     <img src="/static/logo_navbar.png" height="30" alt="">
   </a>
--
libgit2 0.21.2