diff --git a/demo/demo.yaml b/demo/demo.yaml
index 7a4b462..f9587c4 100644
--- a/demo/demo.yaml
+++ b/demo/demo.yaml
@@ -22,7 +22,7 @@ title: Teste de demonstração (tutorial)
 # Duration in minutes.
 # (0 or undefined means infinite time)
 duration: 10
-autosubmit: false
+autosubmit: true
 
 # Show points for each question, scale 0-20.
 # (default: false)
diff --git a/perguntations/__init__.py b/perguntations/__init__.py
index d749702..b3d98ee 100644
--- a/perguntations/__init__.py
+++ b/perguntations/__init__.py
@@ -32,7 +32,7 @@ proof of submission and for review.
 '''
 
 APP_NAME = 'perguntations'
-APP_VERSION = '2020.03.dev1'
+APP_VERSION = '2020.04.dev1'
 APP_DESCRIPTION = __doc__
 
 __author__ = 'Miguel Barão'
diff --git a/perguntations/templates/test.html b/perguntations/templates/test.html
index fc1bfcc..c29eabf 100644
--- a/perguntations/templates/test.html
+++ b/perguntations/templates/test.html
@@ -91,7 +91,11 @@
       </div>
       <div class="row">
         <label for="duracao" class="col-sm-3">Duração:</label>
-        <div class="col-sm-9" id="duracao">{{ str(t['duration'])+' minutos' if t['duration'] > 0 else chr(8734) }}</div>
+        <div class="col-sm-9" id="duracao">{{ str(t['duration'])+' minutos' if t['duration'] > 0 else 'sem limite' }}</div>
+      </div>
+      <div class="row">
+        <label for="submissao" class="col-sm-3">Submissão:</label>
+        <div class="col-sm-9" id="submissao">{{ 'automática' if t['autosubmit'] else 'manual' }}</div>
       </div>
     </h5>
   </div>
@@ -147,9 +151,14 @@
 </script>
 
 <script>
-
   var finishtime = new Date().getTime() + {{ t['duration']*60*1000 }};
 
+  {% if t['duration'] == 0 %}
+    $("#clock").html("+\u221e");
+  {% else %}
+
+
+
   // Update the count down every 1 second
   var x = setInterval(function() {
     var now = new Date().getTime();
@@ -159,8 +168,8 @@
     var minutes = Math.floor((distance / (1000 * 60)));
     var seconds = Math.floor((distance % (1000 * 60)) / 1000);
 
-    if (distance >= 1000*50) {
-      $("#clock").html(minutes + ":" + seconds);
+    if (distance >= 1000*60) {
+      $("#clock").html(minutes + ":" + (seconds<10?'0':'') +seconds);
     }
     else if (distance >= 0) {
       $("#navbar").removeClass('bg-dark').addClass("bg-danger");
@@ -174,6 +183,8 @@
     }
   }, 1000);
 
+  {% end %}
+
 </script>
 
 
--
libgit2 0.21.2