diff --git a/database.py b/database.py
index 1d59c52..666c936 100644
--- a/database.py
+++ b/database.py
@@ -29,6 +29,21 @@ class Database(object):
                 ORDER BY grade DESC, finish_time DESC;'''
             return c.execute(cmd, [test_id]).fetchall()
 
+    # return list of students and their results for a given test
+    def test_grades2(self, test_id):
+        with sqlite3.connect(self.db) as c:
+            # with all tests done by each student:
+            # cmd = 'SELECT student_id,name,grade FROM students INNER JOIN tests ON students.number=tests.student_id WHERE test_id==? ORDER BY grade DESC;'
+
+            # only the best result for each student
+            cmd = '''
+                SELECT student_id, name, grade, start_time, finish_time
+                FROM students INNER JOIN tests
+                ON students.number=tests.student_id
+                WHERE test_id==?
+                ORDER BY finish_time ASC;'''
+            return c.execute(cmd, [test_id]).fetchall()
+
     # get list of students in the database
     def get_students(self):
         with sqlite3.connect(self.db) as c:
diff --git a/serve.py b/serve.py
index cbad33d..070273f 100755
--- a/serve.py
+++ b/serve.py
@@ -17,7 +17,6 @@ except ImportError:
 
 try:
     from mako.lookup import TemplateLookup
-    import djks
 except ImportError:
     print('The package "mako" is missing. See README.md for instructions.')
     sys.exit(1)
@@ -78,9 +77,11 @@ class Root(object):
             for num in reset_pw:
                 cherrypy.log.error('Password updated for student %s.' % str(num), 'APPLICATION')
 
+        grades = self.database.test_grades2(self.testconf['ref'])
         students = self.database.get_students()
+
         template = self.templates.get_template('/students.html')
-        return template.render(students=students, tags=self.tags)
+        return template.render(students=students, tags=self.tags, grades=grades)
 
     # --- RESULTS ------------------------------------------------------------
     @cherrypy.expose
diff --git a/templates/students.html b/templates/students.html
index 7a66a8f..2a6debe 100644
--- a/templates/students.html
+++ b/templates/students.html
@@ -33,46 +33,102 @@
 <div class="container">
     <div class="panel panel-default drop-shadow">
         <div class="panel-heading">
-            <span class="badge">${len(tags['online'])} online</span> <span class="badge">${len(tags['finished'])} finished</span>
+            ${len(tags['finished'])} Terminado(s)</span>
         </div>
-        <!-- <div class="panel-body"> -->
-        <table class="table">
-            <thead>
-                <tr>
-                    <th>Tags</th>
-                    <th>Número</th>
-                    <th>Nome</th>
-                    <th>Password</th>
-                </tr>
-            </thead>
-            <tbody>
-                % for r in students:
+        <div class="panel-body">
+            <table class="table">
+                <thead>
                     <tr>
-                        <td>
-                            % if r[0] in tags['online']:
-                                <span class="label label-primary">online</span>
-                            % endif
+                        <th>Número</th>
+                        <th>Nome</th>
+                        <th>Login</th>
+                        <th>Logout</th>
+                        <th>Nota</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    % for r in grades:
+                        <tr>
                             % if r[0] in tags['finished']:
-                                <span class="label label-success">finished</span>
+                                <td>${r[0]}</td>  <!-- numero -->
+                                <td>${r[1]}</td>  <!-- nome -->
+                                <td>${r[3][:19]}</td>
+                                <td>${r[4][:19]}</td>
+                                <td>${r[2]}</td>
+
                             % endif
-                        </td>
-                        <td>${r[0]}</td>  <!-- numero -->
-                        <td>${r[1]}</td>  <!-- nome -->
-                        <td class="col-sm-3">
-                            <form action="/students/" method="post" id="${r[0]}">
-                                <div class="input-group">
-                                    <input type="password" class="form-control" placeholder="${r[2][:8]}" name="${r[0]}">
-                                    <span class="input-group-btn">
-                                        <button form="${r[0]}" type="submit" value="submit" class="btn btn-danger">reset</button>
-                                    </span>
-                                </div><!-- /input-group -->
-                            </form>
-                        </td>  <!-- password -->
+                        </tr>
+                    % endfor
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div class="panel panel-success drop-shadow">
+        <div class="panel-heading">
+            ${len(tags['online'])} Activo(s)</span>
+        </div>
+        <div class="panel-body">
+            <table class="table">
+                <thead>
+                    <tr>
+                        <th>Número</th>
+                        <th>Nome</th>
+<!--                         <th>Login</th> -->
                     </tr>
-            % endfor
-            </tbody>
-        </table>
-    </div> <!-- panel -->
+                </thead>
+                <tbody>
+                    % for r in students:
+                        <tr>
+                            % if r[0] in tags['online']:
+                                <td>${r[0]}</td>  <!-- numero -->
+                                <td>${r[1]}</td>  <!-- nome -->
+                            % endif
+                        </tr>
+                    % endfor
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+
+    <div class="panel panel-danger drop-shadow">
+        <div class="panel-heading">
+            ${len(students)-len(tags['online'])} Inactivo(s)</span>
+        </div>
+        <div class="panel-body">
+
+            <table class="table">
+                <thead>
+                    <tr>
+                        <th>Número</th>
+                        <th>Nome</th>
+                        <th>Password</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    % for r in students:
+                        <tr>
+                            % if r[0] not in tags['online']:
+                                <td>${r[0]}</td>  <!-- numero -->
+                                <td>${r[1]}</td>  <!-- nome -->
+                                <td class="col-sm-3">
+                                    <form action="/students/" method="post" id="${r[0]}">
+                                        <div class="input-group">
+                                            <input type="password" class="form-control" placeholder="${r[2][:8]}" name="${r[0]}">
+                                            <span class="input-group-btn">
+                                                <button form="${r[0]}" type="submit" value="submit" class="btn btn-danger">reset</button>
+                                            </span>
+                                        </div><!-- /input-group -->
+                                    </form>
+                                </td>  <!-- password -->
+                            % endif
+                        </tr>
+                    % endfor
+                </tbody>
+            </table>
+        </div>
+    </div>
 </div> <!-- container -->
 </body>
 </html>
--
libgit2 0.21.2