diff --git a/app/static/css/LLPSI.css b/app/static/css/LLPSI.css
index 70eb5ea..da32853 100644
--- a/app/static/css/LLPSI.css
+++ b/app/static/css/LLPSI.css
@@ -1,5 +1,24 @@
+/**
+1. Correct the line height in all browsers.
+2. Prevent adjustments of font size after orientation changes in iOS.
+*/
+
+html {
+  line-height: 1.15; /* 1 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+}
+
 body {
-	margin: 10vw;
+	margin: 0 10vw 0 10vw; 
+}
+
+header {
+    margin: 0;
+    padding: 0;
+}
+
+h1, h2 {
+    margin: 0;
 }
 
 h1 {
@@ -14,14 +33,20 @@ h2 {
 	font-size: 2vw;
 }
 
+span {
+	display: inline-block;
+}
+
 input[type="text"] {
 	-webkit-appearance: none;
 	border: none;
-	border-bottom: 1px solid black;
+	border-bottom: 2px solid black;
+    box-sizing: border-box;
+	font: inherit;
 }
 
 input[type="text"].incorrect {
-	background-color: red;
+	background-color: indianred;
 }
 
 input[type="text"].correct {
diff --git a/app/templates/Pensa/01_Imperium_Romanum_Pensum_A.html b/app/templates/Pensa/01_Imperium_Romanum_Pensum_A.html
index 4d2283f..c3cfe26 100644
--- a/app/templates/Pensa/01_Imperium_Romanum_Pensum_A.html
+++ b/app/templates/Pensa/01_Imperium_Romanum_Pensum_A.html
@@ -1,4 +1,4 @@
-Nīlus fluvi<input type="text" data-expected="us"/> est. Nīlus et Rhēnus fluvi<input type="text" data-expected="ī"/> <input type="text" data-expected="sunt"/>. Crēta īnsul<input type="text" data-expected="a"/> <input type="text" data-expected="est"/>. Crēta et Rhodus īnsul<input type="text" data-expected="ae"/> sunt. Brundisium oppid<input type="text" data-expected="um"/> <input type="text" data-expected="est"/>. Brundisium et Tūsculum oppid<input type="text" data-expected="a"/> <input type="text" data-expected="sunt"/>.<br>
-Rhenus fluvi<input type="text" data-expected="us"/> magn<input type="text" data-expected="us"/> est. Tiberis est fluvi<input type="text" data-expected="us"/> parv<input type="text" data-expected="us"/>. Rhenus et Danuvius non fluvi<input type="text" data-expected="i"/> parv<input type="text" data-expected="i"/>, sed fluvi<input type="text" data-expected="i"/> magn<input type="text" data-expected="i"/> sunt. Sardinia insul<input type="text" data-expected="a"/> magn<input type="text" data-expected="a"/> est. Melita insul<input type="text" data-expected="a"/> parv<input type="text" data-expected="a"/> est. Sardinia et Sicilia non insul<input type="text" data-expected="ae"/> parv<input type="text" data-expected="ae"/>, sed insul<input type="text" data-expected="ae"/> magn<input type="text" data-expected="ae"/> sunt. Brundisium non oppid<input type="text" data-expected="um"/> parv<input type="text" data-expected="um"/>, sed oppid<input type="text" data-expected="um"/> magn<input type="text" data-expected="um"/> est. Tusculum et Delphi non oppid<input type="text" data-expected="a"/> magn<input type="text" data-expected="a"/>, sed oppid<input type="text" data-expected="a"/> parv<input type="text" data-expected="a"/> sunt.<br>
-Creta insul<input type="text" data-expected="a"/> Graec<input type="text" data-expected="a"/> est. Lesbos et Chios et Naxus sunt insul<input type="text" data-expected="ae"/> Graec<input type="text" data-expected="ae"/>. In Graecia mult<input type="text" data-expected="ae"/> insul<input type="text" data-expected="ae"/> sunt. In Gallia sunt mult<input type="text" data-expected="i"/> fluvi<input type="text" data-expected="i"/>. In Italia mult<input type="text" data-expected="a"/> oppid<input type="text" data-expected="a"/> sunt. In Arabia sunt pauc<input type="text" data-expected="i"/> fluvi<input type="text" data-expected="i"/> et pauc<input type="text" data-expected="a"/> oppid<input type="text" data-expected="a"/>.<br>
-A et B litter<input type="text" data-expected="ae"/> Latin<input type="text" data-expected="ae"/> sunt. C quoque litter<input type="text" data-expected="a"/> Latin<input type="text" data-expected="a"/> est. Multi et pauci vocabul<input type="text" data-expected="a"/> Latin<input type="text" data-expected="a"/> sunt. Ubi quoque vocabul<input type="text" data-expected="um"/> Latin<input type="text" data-expected="um"/> est. I et II numer<input type="text" data-expected="i"/> Roman<input type="text" data-expected="i"/> sunt. III quoque numer<input type="text" data-expected="us"/> Roman<input type="text" data-expected="us"/> est.
\ No newline at end of file
+Nīlus <span>fluvi<input type="text" data-expected="us"/></span> est. Nīlus et Rhēnus <span>fluvi<input type="text" data-expected="ī"/></span> <span><input type="text" data-expected="sunt"/>.</span> Crēta <span>īnsul<input type="text" data-expected="a"/></span> <span><input type="text" data-expected="est"/>.</span> Crēta et Rhodus <span>īnsul<input type="text" data-expected="ae"/></span> sunt. Brundisium <span>oppid<input type="text" data-expected="um"/></span> <span><input type="text" data-expected="est"/>.</span> Brundisium et Tūsculum <span>oppid<input type="text" data-expected="a"/></span> <span><input type="text" data-expected="sunt"/>.</span><br>
+Rhenus <span>fluvi<input type="text" data-expected="us"/></span> <span>magn<input type="text" data-expected="us"/></span> est. Tiberis est <span>fluvi<input type="text" data-expected="us"/></span> <span>parv<input type="text" data-expected="us"/>.</span> Rhenus et Danuvius non <span>fluvi<input type="text" data-expected="i"/></span> <span>parv<input type="text" data-expected="i"/></span>, sed <span>fluvi<input type="text" data-expected="i"/></span> <span>magn<input type="text" data-expected="i"/></span> sunt. Sardinia <span>insul<input type="text" data-expected="a"/></span> <span>magn<input type="text" data-expected="a"/></span> est. Melita <span>insul<input type="text" data-expected="a"/></span> <span>parv<input type="text" data-expected="a"/></span> est. Sardinia et Sicilia non <span>insul<input type="text" data-expected="ae"/></span> <span>parv<input type="text" data-expected="ae"/></span>, sed <span>insul<input type="text" data-expected="ae"/></span> <span>magn<input type="text" data-expected="ae"/></span> sunt. Brundisium non <span>oppid<input type="text" data-expected="um"/></span> <span>parv<input type="text" data-expected="um"/></span>, sed <span>oppid<input type="text" data-expected="um"/></span> <span>magn<input type="text" data-expected="um"/></span> est. Tusculum et Delphi non <span>oppid<input type="text" data-expected="a"/></span> <span>magn<input type="text" data-expected="a"/></span>, sed <span>oppid<input type="text" data-expected="a"/></span> <span>parv<input type="text" data-expected="a"/></span> sunt.<br>
+Creta <span>insul<input type="text" data-expected="a"/></span> <span>Graec<input type="text" data-expected="a"/></span> est. Lesbos et Chios et Naxus sunt <span>insul<input type="text" data-expected="ae"/></span> <span>Graec<input type="text" data-expected="ae"/>.</span> In Graecia <span>mult<input type="text" data-expected="ae"/></span> <span>insul<input type="text" data-expected="ae"/></span> sunt. In Gallia sunt <span>mult<input type="text" data-expected="i"/></span> <span>fluvi<input type="text" data-expected="i"/>.</span> In Italia <span>mult<input type="text" data-expected="a"/></span> <span>oppid<input type="text" data-expected="a"/></span> sunt. In Arabia sunt <span>pauc<input type="text" data-expected="i"/></span> <span>fluvi<input type="text" data-expected="i"/></span> et <span>pauc<input type="text" data-expected="a"/></span> <span>oppid<input type="text" data-expected="a"/>.</span><br>
+A et B <span>litter<input type="text" data-expected="ae"/></span> <span>Latin<input type="text" data-expected="ae"/></span> sunt. C quoque <span>litter<input type="text" data-expected="a"/></span> <span>Latin<input type="text" data-expected="a"/></span> est. Multi et pauci <span>vocabul<input type="text" data-expected="a"/></span> <span>Latin<input type="text" data-expected="a"/></span> sunt. Ubi quoque <span>vocabul<input type="text" data-expected="um"/></span> <span>Latin<input type="text" data-expected="um"/></span> est. I et II <span>numer<input type="text" data-expected="i"/></span> <span>Roman<input type="text" data-expected="i"/></span> sunt. III quoque <span>numer<input type="text" data-expected="us"/></span> <span>Roman<input type="text" data-expected="us"/></span> est.
\ No newline at end of file
diff --git a/app/templates/Pensa/01_Imperium_Romanum_Pensum_B.html b/app/templates/Pensa/01_Imperium_Romanum_Pensum_B.html
index 43dfbce..1020c59 100644
--- a/app/templates/Pensa/01_Imperium_Romanum_Pensum_B.html
+++ b/app/templates/Pensa/01_Imperium_Romanum_Pensum_B.html
@@ -1,2 +1,2 @@
-Sicilia <input type="text" data-expected="insula"/> est. Italia insula <input type="text" data-expected="non"/> est. Rhenus <input type="text" data-expected="fluvius"/> est. Brundisium <input type="text" data-expected="oppidum"/> est. Sicilia et Sardinia <input type="text" data-expected="insulae"/> magnae sunt. Melita insula <input type="text" data-expected="parva"/> est. Britannia non <input type="text" data-expected="insula"/> parva, sed <input type="text" data-expected="insula"/> <input type="text" data-expected="magna"/> est. Brundisium non <input type="text" data-expected="oppidum"/> <input type="text" data-expected="parvum"/>, sed <input type="text" data-expected="oppidum"/> magnum est. Est<input type="text" data-expected="ne"/> Brundisium in Graecia? Brundisium <input type="text" data-expected="non"/> est in Graecia, <input type="text" data-expected="sed"/> in Italia. <input type="text" data-expected="Ubi"/> est Sparta? Sparta est in Graecia. Sparta oppidum <input type="text" data-expected="Graecum"/> est. Delphi <input type="text" data-expected="quoque"/> oppidum Graecum est. Euboea, Naxus, Lesbos, Chios <input type="text" data-expected="insulae"/> Graecae sunt. In Graecia sunt <input type="text" data-expected="multae"/> insulae.
-Quid est III? III <input type="text" data-expected="numerus"/> est. Quid est A? A littera est. A, B, C <input type="text" data-expected="litterae"/> Latinae sunt. <input type="text" data-expected="Num"/> Γ littera Latina est? Γ <input type="text" data-expected="non"/> littera <input type="text" data-expected="Latina"/>, sed littera <input type="text" data-expected="Graeca"/> est. Insula <input type="text" data-expected="vocabulum"/> Latinum est.
\ No newline at end of file
+Sicilia <span><input type="text" data-expected="insula"/></span> est. Italia insula <span><input type="text" data-expected="non"/></span> est. Rhenus <span><input type="text" data-expected="fluvius"/></span> est. Brundisium <span><input type="text" data-expected="oppidum"/></span> est. Sicilia et Sardinia <span><input type="text" data-expected="insulae"/></span> magnae sunt. Melita insula <span><input type="text" data-expected="parva"/></span> est. Britannia non <span><input type="text" data-expected="insula"/></span> parva, sed <span><input type="text" data-expected="insula"/></span> <span><input type="text" data-expected="magna"/></span> est. Brundisium non <span><input type="text" data-expected="oppidum"/></span> <span><input type="text" data-expected="parvum"/></span>, sed <span><input type="text" data-expected="oppidum"/></span> magnum est. <span>Est<input type="text" data-expected="ne"/></span> Brundisium in Graecia? Brundisium <span><input type="text" data-expected="non"/></span> est in Graecia, <span><input type="text" data-expected="sed"/></span> in Italia. <span><input type="text" data-expected="Ubi"/></span> est Sparta? Sparta est in Graecia. Sparta oppidum <span><input type="text" data-expected="Graecum"/></span> est. Delphi <span><input type="text" data-expected="quoque"/></span> oppidum Graecum est. Euboea, Naxus, Lesbos, Chios <span><input type="text" data-expected="insulae"/></span> Graecae sunt. In Graecia sunt <span><input type="text" data-expected="multae"/></span> insulae.
+Quid est III? III <span><input type="text" data-expected="numerus"/></span> est. Quid est A? A littera est. A, B, C <span><input type="text" data-expected="litterae"/></span> Latinae sunt. <span><input type="text" data-expected="Num"/></span> Γ littera Latina est? Γ <span><input type="text" data-expected="non"/></span> littera <span><input type="text" data-expected="Latina"/></span>, sed littera <span><input type="text" data-expected="Graeca"/></span> est. Insula <span><input type="text" data-expected="vocabulum"/></span> Latinum est.
\ No newline at end of file
diff --git a/app/templates/Pensa/02_Familia_Romana_Pensum_A.html b/app/templates/Pensa/02_Familia_Romana_Pensum_A.html
index e87f823..081b2fb 100644
--- a/app/templates/Pensa/02_Familia_Romana_Pensum_A.html
+++ b/app/templates/Pensa/02_Familia_Romana_Pensum_A.html
@@ -1,3 +1,3 @@
-Marcus fili<input type="text" data-expected="us"/> Iulii est. Iulia fili<input type="text" data-expected="a"/> Iulii est. Iulius est vir Roman<input type="text" data-expected="us"/>. Aemilia femin<input type="text" data-expected="a"/> Roman<input type="text" data-expected="a"/> est. Iulius domin<input type="text" data-expected="us"/>, Aemilia domin<input type="text" data-expected="a"/> est. Medus serv<input type="text" data-expected="us"/> Graec<input type="text" data-expected="us"/> est, Delia est ancill<input type="text" data-expected="a"/> Graec<input type="text" data-expected="a"/>. Sparta oppid<input type="text" data-expected="um"/> Graec<input type="text" data-expected="um"/> est.
-Iulius pater Marc<input type="text" data-expected="i"/> est. Marcus est filius Iuli<input type="text" data-expected="i"/> et Aemili<input type="text" data-expected="ae"/>. Medus servus Iuli<input type="text" data-expected="i"/> est: Iulius est dominus serv<input type="text" data-expected="i"/>. Iulius dominus Med<input type="text" data-expected="i"/> et Dav<input type="text" data-expected="i"/> est: Iulius dominus serv<input type="text" data-expected="orum"/> est. Numerus serv<input type="text" data-expected="orum"/> magnus est. Delia est ancilla Aemili<input type="text" data-expected="ae"/>: Aemilia domina ancill<input type="text" data-expected="ae"/> est. Aemilia domina Deli<input type="text" data-expected="ae"/> et Syr<input type="text" data-expected="ae"/> est: Aemilia domina ancill<input type="text" data-expected="arum"/> est. In familia Iuli<input type="text" data-expected="i"/> est magnus numerus serv<input type="text" data-expected="orum"/> et ancill<input type="text" data-expected="arum"/>. Aemilia mater Marc<input type="text" data-expected="i"/> et Quint<input type="text" data-expected="i"/> et Iuli<input type="text" data-expected="ae"/> est. Marcus, Quintus Iuliaque sunt liberi Iuli<input type="text" data-expected="i"/> et Aemili<input type="text" data-expected="ae"/>. Numerus liber<input type="text" data-expected="orum"/> est tres. Numerus serv<input type="text" data-expected="orum"/> est centum.
-In pagina prima capitul<input type="text" data-expected="i"/> secund<input type="text" data-expected="i"/> multa vocabula nova sunt. Numerus capitul<input type="text" data-expected="orum"/> non parvus est.
\ No newline at end of file
+Marcus <span>fili<input type="text" data-expected="us"/></span> Iulii est. Iulia <span>fili<input type="text" data-expected="a"/></span> Iulii est. Iulius est vir <span>Roman<input type="text" data-expected="us"/>.</span> Aemilia <span>femin<input type="text" data-expected="a"/></span> <span>Roman<input type="text" data-expected="a"/></span> est. Iulius <span>domin<input type="text" data-expected="us"/></span>, Aemilia <span>domin<input type="text" data-expected="a"/></span> est. Medus <span>serv<input type="text" data-expected="us"/></span> <span>Graec<input type="text" data-expected="us"/></span> est, Delia est <span>ancill<input type="text" data-expected="a"/></span> <span>Graec<input type="text" data-expected="a"/>.</span> Sparta <span>oppid<input type="text" data-expected="um"/></span> <span>Graec<input type="text" data-expected="um"/></span> est.
+Iulius pater <span>Marc<input type="text" data-expected="i"/></span> est. Marcus est filius <span>Iuli<input type="text" data-expected="i"/></span> et <span>Aemili<input type="text" data-expected="ae"/>.</span> Medus servus <span>Iuli<input type="text" data-expected="i"/></span> est: Iulius est dominus <span>serv<input type="text" data-expected="i"/>.</span> Iulius dominus <span>Med<input type="text" data-expected="i"/></span> et <span>Dav<input type="text" data-expected="i"/></span> est: Iulius dominus <span>serv<input type="text" data-expected="orum"/></span> est. Numerus <span>serv<input type="text" data-expected="orum"/></span> magnus est. Delia est ancilla <span>Aemili<input type="text" data-expected="ae"/></span>: Aemilia domina <span>ancill<input type="text" data-expected="ae"/></span> est. Aemilia domina <span>Deli<input type="text" data-expected="ae"/></span> et <span>Syr<input type="text" data-expected="ae"/></span> est: Aemilia domina <span>ancill<input type="text" data-expected="arum"/></span> est. In familia <span>Iuli<input type="text" data-expected="i"/></span> est magnus numerus <span>serv<input type="text" data-expected="orum"/></span> et <span>ancill<input type="text" data-expected="arum"/>.</span> Aemilia mater <span>Marc<input type="text" data-expected="i"/></span> et <span>Quint<input type="text" data-expected="i"/></span> et <span>Iuli<input type="text" data-expected="ae"/></span> est. Marcus, Quintus Iuliaque sunt liberi <span>Iuli<input type="text" data-expected="i"/></span> et <span>Aemili<input type="text" data-expected="ae"/>.</span> Numerus <span>liber<input type="text" data-expected="orum"/></span> est tres. Numerus <span>serv<input type="text" data-expected="orum"/></span> est centum.
+In pagina prima <span>capitul<input type="text" data-expected="i"/></span> <span>secund<input type="text" data-expected="i"/></span> multa vocabula nova sunt. Numerus <span>capitul<input type="text" data-expected="orum"/></span> non parvus est.
\ No newline at end of file
diff --git a/app/templates/Pensa/02_Familia_Romana_Pensum_B b/app/templates/Pensa/02_Familia_Romana_Pensum_B
index 88efb26..de8d102 100644
--- a/app/templates/Pensa/02_Familia_Romana_Pensum_B
+++ b/app/templates/Pensa/02_Familia_Romana_Pensum_B
@@ -1,4 +1,4 @@
 Marcus _puer_ Romanus est. Iulius _vir_ Romanus est. Aemilia est _femina_ Romana. Iulius est _pater_ Marci et Quinti et Iuliae. In _familia_ Iulii sunt tres _liberi_: duo _filii_ et una _filia_. _Mater_ liberorum est Aemilia.<br>
 _Quis_ est Davus? Davus est _servus_ Iulii. Iulius _dominus_ Davi est. _Quae_ est Syra? Syra _ancilla_ Aemiliae est. Aemilia est _domina_ Syrae.<br>
-Cornelius: “_Quot_ servi sunt in familia tua?” Iulius: “In familia _mea_ sunt _centum_ [C] servi.” Cornelius: “Familia _tua_ magna est!”<br>
-‘LINGVA LATINA’ est titulus _libri_ tui Latini.
\ No newline at end of file
+Cornelius: "_Quot_ servi sunt in familia tua?" Iulius: "In familia _mea_ sunt _centum_ [C] servi." Cornelius: "Familia _tua_ magna est!"<br>
+'LINGVA LATINA' est titulus _libri_ tui Latini.
\ No newline at end of file
diff --git a/app/templates/Pensa/02_Familia_Romana_Pensum_B.html b/app/templates/Pensa/02_Familia_Romana_Pensum_B.html
index 2622d90..76d8946 100644
--- a/app/templates/Pensa/02_Familia_Romana_Pensum_B.html
+++ b/app/templates/Pensa/02_Familia_Romana_Pensum_B.html
@@ -1,4 +1,4 @@
-Marcus <input type="text" data-expected="puer"/> Romanus est. Iulius <input type="text" data-expected="vir"/> Romanus est. Aemilia est <input type="text" data-expected="femina"/> Romana. Iulius est <input type="text" data-expected="pater"/> Marci et Quinti et Iuliae. In <input type="text" data-expected="familia"/> Iulii sunt tres <input type="text" data-expected="liberi"/>: duo <input type="text" data-expected="filii"/> et una <input type="text" data-expected="filia"/>. <input type="text" data-expected="Mater"/> liberorum est Aemilia.<br>
-<input type="text" data-expected="Quis"/> est Davus? Davus est <input type="text" data-expected="servus"/> Iulii. Iulius <input type="text" data-expected="dominus"/> Davi est. <input type="text" data-expected="Quae"/> est Syra? Syra <input type="text" data-expected="ancilla"/> Aemiliae est. Aemilia est <input type="text" data-expected="domina"/> Syrae.<br>
-Cornelius: “<input type="text" data-expected="Quot"/> servi sunt in familia tua?” Iulius: “In familia <input type="text" data-expected="mea"/> sunt <input type="text" data-expected="centum"/> [C] servi.” Cornelius: “Familia <input type="text" data-expected="tua"/> magna est!”<br>
-‘LINGVA LATINA’ est titulus <input type="text" data-expected="libri"/> tui Latini.
\ No newline at end of file
+Marcus <span><input type="text" data-expected="puer"/></span> Romanus est. Iulius <span><input type="text" data-expected="vir"/></span> Romanus est. Aemilia est <span><input type="text" data-expected="femina"/></span> Romana. Iulius est <span><input type="text" data-expected="pater"/></span> Marci et Quinti et Iuliae. In <span><input type="text" data-expected="familia"/></span> Iulii sunt tres <span><input type="text" data-expected="liberi"/></span>: duo <span><input type="text" data-expected="filii"/></span> et una <span><input type="text" data-expected="filia"/>.</span> <span><input type="text" data-expected="Mater"/></span> liberorum est Aemilia.<br>
+<span><input type="text" data-expected="Quis"/></span> est Davus? Davus est <span><input type="text" data-expected="servus"/></span> Iulii. Iulius <span><input type="text" data-expected="dominus"/></span> Davi est. <span><input type="text" data-expected="Quae"/></span> est Syra? Syra <span><input type="text" data-expected="ancilla"/></span> Aemiliae est. Aemilia est <span><input type="text" data-expected="domina"/></span> Syrae.<br>
+Cornelius: "<span><input type="text" data-expected="Quot"/></span> servi sunt in familia tua?" Iulius: "In familia <span><input type="text" data-expected="mea"/></span> sunt <span><input type="text" data-expected="centum"/></span> [C] servi." Cornelius: "Familia <span><input type="text" data-expected="tua"/></span> magna est!"<br>
+'LINGVA LATINA' est titulus <span><input type="text" data-expected="libri"/></span> tui Latini.
\ No newline at end of file
diff --git a/app/templates/Pensa/03_Puer_Improbus_Pensum_A b/app/templates/Pensa/03_Puer_Improbus_Pensum_A
index bb60924..eb23624 100644
--- a/app/templates/Pensa/03_Puer_Improbus_Pensum_A
+++ b/app/templates/Pensa/03_Puer_Improbus_Pensum_A
@@ -1,2 +1,2 @@
-Cur Marc_us_ Iuliam pulsat? Marcus Iuli_am_ pulsat, quia Iuli_a_ cantat. Iuli_a_ plor_at_, quia Marcus e_am_ pulsat. Iulia: “Mamma! Marcus _me_ pulsat.” Aemilia puell_am_ aud_it_ et ven_it_. Mater Quint_um_ videt et e_um_ interrog_at_: “Quis me voc_at_?” Quint_us_ respond_et_: “Iulia _te_ vocat.”<br>
-Iulius dorm_it_. Quintus Iuli_um_ voc_at_: “Pater!” Marcus rid_et_, quia Iuli_us_ non venit. Aemilia Marc_um_ verber_at_. Iulius ven_it_, quia Marc_us_ plorat. Iulius Aemili_am_ et Marc_um_ et Quint_um_ et Iuli_am_ videt. Iulius: “Puer qui parv_am_ puell_am_ pulsat improbus est.” Iulius puer_um_ improb_um_ verberat. Quem Iuli_us_ verberat? Puer qu_em_ Iulius verberat est Marcus. Marcus plor_at_. Puer qu_i_ plorat laet_us_ non est. Puella qu_ae_ cantat laet_a_ est.
\ No newline at end of file
+Cur Marc_us_ Iuliam pulsat? Marcus Iuli_am_ pulsat, quia Iuli_a_ cantat. Iuli_a_ plor_at_, quia Marcus e_am_ pulsat. Iulia: "Mamma! Marcus _me_ pulsat." Aemilia puell_am_ aud_it_ et ven_it_. Mater Quint_um_ videt et e_um_ interrog_at_: "Quis me voc_at_?" Quint_us_ respond_et_: "Iulia _te_ vocat."<br>
+Iulius dorm_it_. Quintus Iuli_um_ voc_at_: "Pater!" Marcus rid_et_, quia Iuli_us_ non venit. Aemilia Marc_um_ verber_at_. Iulius ven_it_, quia Marc_us_ plorat. Iulius Aemili_am_ et Marc_um_ et Quint_um_ et Iuli_am_ videt. Iulius: "Puer qui parv_am_ puell_am_ pulsat improbus est." Iulius puer_um_ improb_um_ verberat. Quem Iuli_us_ verberat? Puer qu_em_ Iulius verberat est Marcus. Marcus plor_at_. Puer qu_i_ plorat laet_us_ non est. Puella qu_ae_ cantat laet_a_ est.
\ No newline at end of file
diff --git a/app/templates/Pensa/03_Puer_Improbus_Pensum_A.html b/app/templates/Pensa/03_Puer_Improbus_Pensum_A.html
index fb8089f..9eda91e 100644
--- a/app/templates/Pensa/03_Puer_Improbus_Pensum_A.html
+++ b/app/templates/Pensa/03_Puer_Improbus_Pensum_A.html
@@ -1,2 +1,2 @@
-Cur Marc<input type="text" data-expected="us"/> Iuliam pulsat? Marcus Iuli<input type="text" data-expected="am"/> pulsat, quia Iuli<input type="text" data-expected="a"/> cantat. Iuli<input type="text" data-expected="a"/> plor<input type="text" data-expected="at"/>, quia Marcus e<input type="text" data-expected="am"/> pulsat. Iulia: “Mamma! Marcus <input type="text" data-expected="me"/> pulsat.” Aemilia puell<input type="text" data-expected="am"/> aud<input type="text" data-expected="it"/> et ven<input type="text" data-expected="it"/>. Mater Quint<input type="text" data-expected="um"/> videt et e<input type="text" data-expected="um"/> interrog<input type="text" data-expected="at"/>: “Quis me voc<input type="text" data-expected="at"/>?” Quint<input type="text" data-expected="us"/> respond<input type="text" data-expected="et"/>: “Iulia <input type="text" data-expected="te"/> vocat.”<br>
-Iulius dorm<input type="text" data-expected="it"/>. Quintus Iuli<input type="text" data-expected="um"/> voc<input type="text" data-expected="at"/>: “Pater!” Marcus rid<input type="text" data-expected="et"/>, quia Iuli<input type="text" data-expected="us"/> non venit. Aemilia Marc<input type="text" data-expected="um"/> verber<input type="text" data-expected="at"/>. Iulius ven<input type="text" data-expected="it"/>, quia Marc<input type="text" data-expected="us"/> plorat. Iulius Aemili<input type="text" data-expected="am"/> et Marc<input type="text" data-expected="um"/> et Quint<input type="text" data-expected="um"/> et Iuli<input type="text" data-expected="am"/> videt. Iulius: “Puer qui parv<input type="text" data-expected="am"/> puell<input type="text" data-expected="am"/> pulsat improbus est.” Iulius puer<input type="text" data-expected="um"/> improb<input type="text" data-expected="um"/> verberat. Quem Iuli<input type="text" data-expected="us"/> verberat? Puer qu<input type="text" data-expected="em"/> Iulius verberat est Marcus. Marcus plor<input type="text" data-expected="at"/>. Puer qu<input type="text" data-expected="i"/> plorat laet<input type="text" data-expected="us"/> non est. Puella qu<input type="text" data-expected="ae"/> cantat laet<input type="text" data-expected="a"/> est.
\ No newline at end of file
+Cur <span>Marc<input type="text" data-expected="us"/></span> Iuliam pulsat? Marcus <span>Iuli<input type="text" data-expected="am"/></span> pulsat, quia <span>Iuli<input type="text" data-expected="a"/></span> cantat. <span>Iuli<input type="text" data-expected="a"/></span> <span>plor<input type="text" data-expected="at"/></span>, quia Marcus <span>e<input type="text" data-expected="am"/></span> pulsat. Iulia: "Mamma! Marcus <span><input type="text" data-expected="me"/></span> pulsat." Aemilia <span>puell<input type="text" data-expected="am"/></span> <span>aud<input type="text" data-expected="it"/></span> et <span>ven<input type="text" data-expected="it"/>.</span> Mater <span>Quint<input type="text" data-expected="um"/></span> videt et <span>e<input type="text" data-expected="um"/></span> <span>interrog<input type="text" data-expected="at"/></span>: "Quis me <span>voc<input type="text" data-expected="at"/></span>?" <span>Quint<input type="text" data-expected="us"/></span> <span>respond<input type="text" data-expected="et"/></span>: "Iulia <span><input type="text" data-expected="te"/></span> vocat."<br>
+Iulius <span>dorm<input type="text" data-expected="it"/>.</span> Quintus <span>Iuli<input type="text" data-expected="um"/></span> <span>voc<input type="text" data-expected="at"/></span>: "Pater!" Marcus <span>rid<input type="text" data-expected="et"/></span>, quia <span>Iuli<input type="text" data-expected="us"/></span> non venit. Aemilia <span>Marc<input type="text" data-expected="um"/></span> <span>verber<input type="text" data-expected="at"/>.</span> Iulius <span>ven<input type="text" data-expected="it"/></span>, quia <span>Marc<input type="text" data-expected="us"/></span> plorat. Iulius <span>Aemili<input type="text" data-expected="am"/></span> et <span>Marc<input type="text" data-expected="um"/></span> et <span>Quint<input type="text" data-expected="um"/></span> et <span>Iuli<input type="text" data-expected="am"/></span> videt. Iulius: "Puer qui <span>parv<input type="text" data-expected="am"/></span> <span>puell<input type="text" data-expected="am"/></span> pulsat improbus est." Iulius <span>puer<input type="text" data-expected="um"/></span> <span>improb<input type="text" data-expected="um"/></span> verberat. Quem <span>Iuli<input type="text" data-expected="us"/></span> verberat? Puer <span>qu<input type="text" data-expected="em"/></span> Iulius verberat est Marcus. Marcus <span>plor<input type="text" data-expected="at"/>.</span> Puer <span>qu<input type="text" data-expected="i"/></span> plorat <span>laet<input type="text" data-expected="us"/></span> non est. Puella <span>qu<input type="text" data-expected="ae"/></span> cantat <span>laet<input type="text" data-expected="a"/></span> est.
\ No newline at end of file
diff --git a/app/templates/Pensa/03_Puer_Improbus_Pensum_B b/app/templates/Pensa/03_Puer_Improbus_Pensum_B
index 1ad828d..87f0367 100644
--- a/app/templates/Pensa/03_Puer_Improbus_Pensum_B
+++ b/app/templates/Pensa/03_Puer_Improbus_Pensum_B
@@ -1 +1 @@
-Puella _cantat_: “Lalla.” Puella _quae_ cantat est Iulia. Iulia _laeta_ est. Puer improbus puellam _pulsat_. Puella _plorat_: “Uhuhu!” Puer _ridet_: “Hahahae!” Puer _qui_ ridet est Marcus. Iulia Aemiliam _vocat_: “Mamma!” Aemilia _venit_, et Quintum _interrogat_: “Cur Iulia plorat?” Quintus _respondet_: “Iulia plorat, _quia_ Marcus eam pulsat.” Aemilia: “Marcus puer _probus_ non est, puer _improbus_ est! Ubi est pater?” Aemilia Iulium non _videt_. Quintus: “Pater non _hic_ est.” Quintus Iulium _vocat_: “Pater!” Iulius Quintum non _audit_. _Cur_ Iulius Quintum non audit? Iulius eum non audit, quia _dormit_. Marcus plorat, _quia_ Aemilia eum verberat. Iulius Marcum audit; _iam_ Iulius non dormit. _Quem_ Aemilia verberat? Aemilia Marcum _verberat_. Puer _quem_ Aemilia verberat improbus est. Iulia laeta non est _neque_ ridet.
\ No newline at end of file
+Puella _cantat_: "Lalla." Puella _quae_ cantat est Iulia. Iulia _laeta_ est. Puer improbus puellam _pulsat_. Puella _plorat_: "Uhuhu!" Puer _ridet_: "Hahahae!" Puer _qui_ ridet est Marcus. Iulia Aemiliam _vocat_: "Mamma!" Aemilia _venit_, et Quintum _interrogat_: "Cur Iulia plorat?" Quintus _respondet_: "Iulia plorat, _quia_ Marcus eam pulsat." Aemilia: "Marcus puer _probus_ non est, puer _improbus_ est! Ubi est pater?" Aemilia Iulium non _videt_. Quintus: "Pater non _hic_ est." Quintus Iulium _vocat_: "Pater!" Iulius Quintum non _audit_. _Cur_ Iulius Quintum non audit? Iulius eum non audit, quia _dormit_. Marcus plorat, _quia_ Aemilia eum verberat. Iulius Marcum audit; _iam_ Iulius non dormit. _Quem_ Aemilia verberat? Aemilia Marcum _verberat_. Puer _quem_ Aemilia verberat improbus est. Iulia laeta non est _neque_ ridet.
\ No newline at end of file
diff --git a/app/templates/Pensa/03_Puer_Improbus_Pensum_B.html b/app/templates/Pensa/03_Puer_Improbus_Pensum_B.html
index 82b19d5..a1dbafb 100644
--- a/app/templates/Pensa/03_Puer_Improbus_Pensum_B.html
+++ b/app/templates/Pensa/03_Puer_Improbus_Pensum_B.html
@@ -1 +1 @@
-Puella <input type="text" data-expected="cantat"/>: “Lalla.” Puella <input type="text" data-expected="quae"/> cantat est Iulia. Iulia <input type="text" data-expected="laeta"/> est. Puer improbus puellam <input type="text" data-expected="pulsat"/>. Puella <input type="text" data-expected="plorat"/>: “Uhuhu!” Puer <input type="text" data-expected="ridet"/>: “Hahahae!” Puer <input type="text" data-expected="qui"/> ridet est Marcus. Iulia Aemiliam <input type="text" data-expected="vocat"/>: “Mamma!” Aemilia <input type="text" data-expected="venit"/>, et Quintum <input type="text" data-expected="interrogat"/>: “Cur Iulia plorat?” Quintus <input type="text" data-expected="respondet"/>: “Iulia plorat, <input type="text" data-expected="quia"/> Marcus eam pulsat.” Aemilia: “Marcus puer <input type="text" data-expected="probus"/> non est, puer <input type="text" data-expected="improbus"/> est! Ubi est pater?” Aemilia Iulium non <input type="text" data-expected="videt"/>. Quintus: “Pater non <input type="text" data-expected="hic"/> est.” Quintus Iulium <input type="text" data-expected="vocat"/>: “Pater!” Iulius Quintum non <input type="text" data-expected="audit"/>. <input type="text" data-expected="Cur"/> Iulius Quintum non audit? Iulius eum non audit, quia <input type="text" data-expected="dormit"/>. Marcus plorat, <input type="text" data-expected="quia"/> Aemilia eum verberat. Iulius Marcum audit; <input type="text" data-expected="iam"/> Iulius non dormit. <input type="text" data-expected="Quem"/> Aemilia verberat? Aemilia Marcum <input type="text" data-expected="verberat"/>. Puer <input type="text" data-expected="quem"/> Aemilia verberat improbus est. Iulia laeta non est <input type="text" data-expected="neque"/> ridet.
\ No newline at end of file
+Puella <span><input type="text" data-expected="cantat"/></span>: "Lalla." Puella <span><input type="text" data-expected="quae"/></span> cantat est Iulia. Iulia <span><input type="text" data-expected="laeta"/></span> est. Puer improbus puellam <span><input type="text" data-expected="pulsat"/>.</span> Puella <span><input type="text" data-expected="plorat"/></span>: "Uhuhu!" Puer <span><input type="text" data-expected="ridet"/></span>: "Hahahae!" Puer <span><input type="text" data-expected="qui"/></span> ridet est Marcus. Iulia Aemiliam <span><input type="text" data-expected="vocat"/></span>: "Mamma!" Aemilia <span><input type="text" data-expected="venit"/></span>, et Quintum <span><input type="text" data-expected="interrogat"/></span>: "Cur Iulia plorat?" Quintus <span><input type="text" data-expected="respondet"/></span>: "Iulia plorat, <span><input type="text" data-expected="quia"/></span> Marcus eam pulsat." Aemilia: "Marcus puer <span><input type="text" data-expected="probus"/></span> non est, puer <span><input type="text" data-expected="improbus"/></span> est! Ubi est pater?" Aemilia Iulium non <span><input type="text" data-expected="videt"/>.</span> Quintus: "Pater non <span><input type="text" data-expected="hic"/></span> est." Quintus Iulium <span><input type="text" data-expected="vocat"/></span>: "Pater!" Iulius Quintum non <span><input type="text" data-expected="audit"/>.</span> <span><input type="text" data-expected="Cur"/></span> Iulius Quintum non audit? Iulius eum non audit, quia <span><input type="text" data-expected="dormit"/>.</span> Marcus plorat, <span><input type="text" data-expected="quia"/></span> Aemilia eum verberat. Iulius Marcum audit; <span><input type="text" data-expected="iam"/></span> Iulius non dormit. <span><input type="text" data-expected="Quem"/></span> Aemilia verberat? Aemilia Marcum <span><input type="text" data-expected="verberat"/>.</span> Puer <span><input type="text" data-expected="quem"/></span> Aemilia verberat improbus est. Iulia laeta non est <span><input type="text" data-expected="neque"/></span> ridet.
\ No newline at end of file
diff --git a/app/templates/Pensa/04_Dominus_et_Servi_Pensum_A.html b/app/templates/Pensa/04_Dominus_et_Servi_Pensum_A.html
index 7c3fd9d..2165b25 100644
--- a/app/templates/Pensa/04_Dominus_et_Servi_Pensum_A.html
+++ b/app/templates/Pensa/04_Dominus_et_Servi_Pensum_A.html
@@ -1 +1 @@
-Mēdus ad<input type="text" data-expected="est"/>. Dāvus ab<input type="text" data-expected="est"/>. Iūlius imper<input type="text" data-expected="at"/>: "Voc<input type="text" data-expected="ā"/> Dāvum, Mēd<input type="text" data-expected="e"/>!" Mēdus Dāvum voc<input type="text" data-expected="at"/>: "Dāv<input type="text" data-expected="e"/>! Ven<input type="text" data-expected="ī"/>!" Dāvus ven<input type="text" data-expected="it"/> neque Iūlium vid<input type="text" data-expected="et"/>. Mēdus: "Salūt<input type="text" data-expected="ā"/> dominum!" Dāvus dominum salūt<input type="text" data-expected="at"/>: "Salvē, dominē! Quid est?" Dominus: "Tac<input type="text" data-expected="ē"/>, serv<input type="text" data-expected="e"/>! Nummī meī ubi sunt?" Servus tac<input type="text" data-expected="et"/> neque respond<input type="text" data-expected="et"/>. Iūlius: "Respond<input type="text" data-expected="ē"/>!" Dāvus: "Interrog<input type="text" data-expected="ā"/> Mēdum!" Iūlius Mēdum interrog<input type="text" data-expected="at"/>: "Ubi est pecūnia mea, Mēd<input type="text" data-expected="e"/>?" Mēdus: "Dāvus pecūniam tuam hab<input type="text" data-expected="et"/>." Iūlius: "Pōn<input type="text" data-expected="e"/> sacculum tuum in mēnsā, Dāv<input type="text" data-expected="e"/>!" Dāvus pār<input type="text" data-expected="et"/>: sacculum suum in mēnsā pōn<input type="text" data-expected="it"/>. Dāvus: "Vid<input type="text" data-expected="ē"/>, domin<input type="text" data-expected="ē"/>: sacculus meus vacuus est." Iūlius: "Sūm<input type="text" data-expected="e"/> sacculum tuum et discēd<input type="text" data-expected="e"/>, bon<input type="text" data-expected="e"/> serv<input type="text" data-expected="e"/>!" Dāvus sacculum suum sūm<input type="text" data-expected="it"/> et discēd<input type="text" data-expected="it"/>.
\ No newline at end of file
+Mēdus <span>ad<input type="text" data-expected="est"/>.</span> Dāvus <span>ab<input type="text" data-expected="est"/>.</span> Iūlius <span>imper<input type="text" data-expected="at"/></span>: "<span>Voc<input type="text" data-expected="ā"/></span> Dāvum, <span>Mēd<input type="text" data-expected="e"/></span>!" Mēdus Dāvum <span>voc<input type="text" data-expected="at"/></span>: "<span>Dāv<input type="text" data-expected="e"/></span>! <span>Ven<input type="text" data-expected="ī"/></span>!" Dāvus <span>ven<input type="text" data-expected="it"/></span> neque Iūlium <span>vid<input type="text" data-expected="et"/>.</span> Mēdus: "<span>Salūt<input type="text" data-expected="ā"/></span> dominum!" Dāvus dominum <span>salūt<input type="text" data-expected="at"/></span>: "Salvē, dominē! Quid est?" Dominus: "<span>Tac<input type="text" data-expected="ē"/></span>, <span>serv<input type="text" data-expected="e"/></span>! Nummī meī ubi sunt?" Servus <span>tac<input type="text" data-expected="et"/></span> neque <span>respond<input type="text" data-expected="et"/>.</span> Iūlius: "<span>Respond<input type="text" data-expected="ē"/></span>!" Dāvus: "<span>Interrog<input type="text" data-expected="ā"/></span> Mēdum!" Iūlius Mēdum <span>interrog<input type="text" data-expected="at"/></span>: "Ubi est pecūnia mea, <span>Mēd<input type="text" data-expected="e"/></span>?" Mēdus: "Dāvus pecūniam tuam <span>hab<input type="text" data-expected="et"/>.</span>" Iūlius: "<span>Pōn<input type="text" data-expected="e"/></span> sacculum tuum in mēnsā, <span>Dāv<input type="text" data-expected="e"/></span>!" Dāvus <span>pār<input type="text" data-expected="et"/></span>: sacculum suum in mēnsā <span>pōn<input type="text" data-expected="it"/>.</span> Dāvus: "<span>Vid<input type="text" data-expected="ē"/></span>, <span>domin<input type="text" data-expected="ē"/></span>: sacculus meus vacuus est." Iūlius: "<span>Sūm<input type="text" data-expected="e"/></span> sacculum tuum et <span>discēd<input type="text" data-expected="e"/></span>, <span>bon<input type="text" data-expected="e"/></span> <span>serv<input type="text" data-expected="e"/></span>!" Dāvus sacculum suum <span>sūm<input type="text" data-expected="it"/></span> et <span>discēd<input type="text" data-expected="it"/>.</span>
\ No newline at end of file
diff --git a/app/templates/Pensa/04_Dominus_et_Servi_Pensum_B b/app/templates/Pensa/04_Dominus_et_Servi_Pensum_B
index 7cdd5bc..051a51f 100644
--- a/app/templates/Pensa/04_Dominus_et_Servi_Pensum_B
+++ b/app/templates/Pensa/04_Dominus_et_Servi_Pensum_B
@@ -1,4 +1,4 @@
 In sacculo-o Iu-ulii-i _pecu-uniam_ est. Iu-ulius pecu-uniam _numerat_: "U-Unus, duo, tre-es, _quattuor_, _qui-inque_, sex, _septem_, _octo-o_, _novem_, _decem_." In _sacculo-o_ no-on centum, sed _tantum_ decem nummi-i sunt.<br>
 Da-avus dominum _salu-utat_: "Salve-e, domine!" Iu-ulius _respondet_: "Po-one sacculum tuum in _me-ensa-a_!" Da-avus sacculum _suum_ in me-ensa-a _po-onit_. Sacculus Davi _vacuus_ est, in sacculo _eius_ [: Davi] _nulla_ pecunia est. Davus sacculum suum _sumit_ et discedit.
-Iulius: “Mede! Veni!” Medus non venit, quia _is_ [: Medus] pecuniam Iulii _habet_. Iulius baculum, _quod_ in mensa est, sumit et _discedit_.
+Iulius: "Mede! Veni!" Medus non venit, quia _is_ [: Medus] pecuniam Iulii _habet_. Iulius baculum, _quod_ in mensa est, sumit et _discedit_.
 Dominus imperat, bonus servus _paret_.
\ No newline at end of file
diff --git a/app/templates/Pensa/04_Dominus_et_Servi_Pensum_B.html b/app/templates/Pensa/04_Dominus_et_Servi_Pensum_B.html
index 126dccc..2600557 100644
--- a/app/templates/Pensa/04_Dominus_et_Servi_Pensum_B.html
+++ b/app/templates/Pensa/04_Dominus_et_Servi_Pensum_B.html
@@ -1,4 +1,4 @@
-In sacculō Iūliī <input type="text" data-expected="pecūniam"/> est. Iūlius pecūniam <input type="text" data-expected="numerat"/>: "Ūnus, duo, trēs, <input type="text" data-expected="quattuor"/>, <input type="text" data-expected="quīnque"/>, sex, <input type="text" data-expected="septem"/>, <input type="text" data-expected="octō"/>, <input type="text" data-expected="novem"/>, <input type="text" data-expected="decem"/>." In <input type="text" data-expected="sacculō"/> nōn centum, sed <input type="text" data-expected="tantum"/> decem nummī sunt.<br>
-Dāvus dominum <input type="text" data-expected="salūtat"/>: "Salvē, domine!" Iūlius <input type="text" data-expected="respondet"/>: "Pōne sacculum tuum in <input type="text" data-expected="mēnsā"/>!" Dāvus sacculum <input type="text" data-expected="suum"/> in mēnsā <input type="text" data-expected="pōnit"/>. Sacculus Davi <input type="text" data-expected="vacuus"/> est, in sacculo <input type="text" data-expected="eius"/> [: Davi] <input type="text" data-expected="nulla"/> pecunia est. Davus sacculum suum <input type="text" data-expected="sumit"/> et discedit.
-Iulius: “Mede! Veni!” Medus non venit, quia <input type="text" data-expected="is"/> [: Medus] pecuniam Iulii <input type="text" data-expected="habet"/>. Iulius baculum, <input type="text" data-expected="quod"/> in mensa est, sumit et <input type="text" data-expected="discedit"/>.
-Dominus imperat, bonus servus <input type="text" data-expected="paret"/>.
\ No newline at end of file
+In sacculō Iūliī <span><input type="text" data-expected="pecūniam"/></span> est. Iūlius pecūniam <span><input type="text" data-expected="numerat"/></span>: "Ūnus, duo, trēs, <span><input type="text" data-expected="quattuor"/></span>, <span><input type="text" data-expected="quīnque"/></span>, sex, <span><input type="text" data-expected="septem"/></span>, <span><input type="text" data-expected="octō"/></span>, <span><input type="text" data-expected="novem"/></span>, <span><input type="text" data-expected="decem"/>.</span>" In <span><input type="text" data-expected="sacculō"/></span> nōn centum, sed <span><input type="text" data-expected="tantum"/></span> decem nummī sunt.<br>
+Dāvus dominum <span><input type="text" data-expected="salūtat"/></span>: "Salvē, domine!" Iūlius <span><input type="text" data-expected="respondet"/></span>: "Pōne sacculum tuum in <span><input type="text" data-expected="mēnsā"/></span>!" Dāvus sacculum <span><input type="text" data-expected="suum"/></span> in mēnsā <span><input type="text" data-expected="pōnit"/>.</span> Sacculus Davi <span><input type="text" data-expected="vacuus"/></span> est, in sacculo <span><input type="text" data-expected="eius"/></span> [: Davi] <span><input type="text" data-expected="nulla"/></span> pecunia est. Davus sacculum suum <span><input type="text" data-expected="sumit"/></span> et discedit.
+Iulius: "Mede! Veni!" Medus non venit, quia <span><input type="text" data-expected="is"/></span> [: Medus] pecuniam Iulii <span><input type="text" data-expected="habet"/>.</span> Iulius baculum, <span><input type="text" data-expected="quod"/></span> in mensa est, sumit et <span><input type="text" data-expected="discedit"/>.</span>
+Dominus imperat, bonus servus <span><input type="text" data-expected="paret"/>.</span>
\ No newline at end of file
diff --git a/app/templates/Pensa/05_Villa_et_Hortus_Pensum_A b/app/templates/Pensa/05_Villa_et_Hortus_Pensum_A
index 02a4237..8b36463 100644
--- a/app/templates/Pensa/05_Villa_et_Hortus_Pensum_A
+++ b/app/templates/Pensa/05_Villa_et_Hortus_Pensum_A
@@ -1,2 +1,2 @@
 Iulius et Aemilia in vill_a_ habit_ant_ cum liber_is_ et serv_is_. Dominus mult_os_ serv_os_ et mult_as_ ancill_as_ habet.<br>
-Aemilia in peristÿl_o_ est cum Marc_o_ et Quint_o_ et Iuli_a_. Iulia mult_as_ ros_as_ in hort_o_ vid_et_ et ab Aemili_a_ disced_it_. Iam Aemilia puell_am_ non vid_et_, neque pueri eam vid_ent_. Aemilia: “Marce et Quinte! Voc_ate_ Iuliam!” Pueri Iuli_am_ voc_ant_: “Iulia! Ven_i_!” et Iulia puer_os_ voc_at_: “Marce et Quinte! Ven_ite_!” Iulia pueros non aud_it_, sed pueri Iuli_am_ aud_iunt_. Iulia: “Cur pueri non ven_iunt_?” Iulia ex hort_o_ venit cum V ros_is_ pulchr_is_. Iulia: “Vid_e_ ros_as_ meas, mater! Vid_ete_, pueri!” Marcus: “Rosae pulchrae sunt, puella sine ros_is_ pulchra non est!” Iulia cum un_a_ ros_a_ disced_it_. Pueri rid_ent_. Aemilia: “Tac_ete_, pueri! Sum_ite_ ros_as_ et disced_ite_!” Pueri ros_as_ sum_unt_ et disced_unt_; in atri_o_ aqu_am_ sum_unt_ ex impluvi_o_ et ros_as_ in aqu_a_ pon_unt_.
\ No newline at end of file
+Aemilia in peristÿl_o_ est cum Marc_o_ et Quint_o_ et Iuli_a_. Iulia mult_as_ ros_as_ in hort_o_ vid_et_ et ab Aemili_a_ disced_it_. Iam Aemilia puell_am_ non vid_et_, neque pueri eam vid_ent_. Aemilia: "Marce et Quinte! Voc_ate_ Iuliam!" Pueri Iuli_am_ voc_ant_: "Iulia! Ven_i_!" et Iulia puer_os_ voc_at_: "Marce et Quinte! Ven_ite_!" Iulia pueros non aud_it_, sed pueri Iuli_am_ aud_iunt_. Iulia: "Cur pueri non ven_iunt_?" Iulia ex hort_o_ venit cum V ros_is_ pulchr_is_. Iulia: "Vid_e_ ros_as_ meas, mater! Vid_ete_, pueri!" Marcus: "Rosae pulchrae sunt, puella sine ros_is_ pulchra non est!" Iulia cum un_a_ ros_a_ disced_it_. Pueri rid_ent_. Aemilia: "Tac_ete_, pueri! Sum_ite_ ros_as_ et disced_ite_!" Pueri ros_as_ sum_unt_ et disced_unt_; in atri_o_ aqu_am_ sum_unt_ ex impluvi_o_ et ros_as_ in aqu_a_ pon_unt_.
\ No newline at end of file
diff --git a/app/templates/Pensa/05_Villa_et_Hortus_Pensum_A.html b/app/templates/Pensa/05_Villa_et_Hortus_Pensum_A.html
index ca419df..56e891a 100644
--- a/app/templates/Pensa/05_Villa_et_Hortus_Pensum_A.html
+++ b/app/templates/Pensa/05_Villa_et_Hortus_Pensum_A.html
@@ -1,2 +1,2 @@
-Iulius et Aemilia in vill<input type="text" data-expected="a"/> habit<input type="text" data-expected="ant"/> cum liber<input type="text" data-expected="is"/> et serv<input type="text" data-expected="is"/>. Dominus mult<input type="text" data-expected="os"/> serv<input type="text" data-expected="os"/> et mult<input type="text" data-expected="as"/> ancill<input type="text" data-expected="as"/> habet.<br>
-Aemilia in peristÿl<input type="text" data-expected="o"/> est cum Marc<input type="text" data-expected="o"/> et Quint<input type="text" data-expected="o"/> et Iuli<input type="text" data-expected="a"/>. Iulia mult<input type="text" data-expected="as"/> ros<input type="text" data-expected="as"/> in hort<input type="text" data-expected="o"/> vid<input type="text" data-expected="et"/> et ab Aemili<input type="text" data-expected="a"/> disced<input type="text" data-expected="it"/>. Iam Aemilia puell<input type="text" data-expected="am"/> non vid<input type="text" data-expected="et"/>, neque pueri eam vid<input type="text" data-expected="ent"/>. Aemilia: “Marce et Quinte! Voc<input type="text" data-expected="ate"/> Iuliam!” Pueri Iuli<input type="text" data-expected="am"/> voc<input type="text" data-expected="ant"/>: “Iulia! Ven<input type="text" data-expected="i"/>!” et Iulia puer<input type="text" data-expected="os"/> voc<input type="text" data-expected="at"/>: “Marce et Quinte! Ven<input type="text" data-expected="ite"/>!” Iulia pueros non aud<input type="text" data-expected="it"/>, sed pueri Iuli<input type="text" data-expected="am"/> aud<input type="text" data-expected="iunt"/>. Iulia: “Cur pueri non ven<input type="text" data-expected="iunt"/>?” Iulia ex hort<input type="text" data-expected="o"/> venit cum V ros<input type="text" data-expected="is"/> pulchr<input type="text" data-expected="is"/>. Iulia: “Vid<input type="text" data-expected="e"/> ros<input type="text" data-expected="as"/> meas, mater! Vid<input type="text" data-expected="ete"/>, pueri!” Marcus: “Rosae pulchrae sunt, puella sine ros<input type="text" data-expected="is"/> pulchra non est!” Iulia cum un<input type="text" data-expected="a"/> ros<input type="text" data-expected="a"/> disced<input type="text" data-expected="it"/>. Pueri rid<input type="text" data-expected="ent"/>. Aemilia: “Tac<input type="text" data-expected="ete"/>, pueri! Sum<input type="text" data-expected="ite"/> ros<input type="text" data-expected="as"/> et disced<input type="text" data-expected="ite"/>!” Pueri ros<input type="text" data-expected="as"/> sum<input type="text" data-expected="unt"/> et disced<input type="text" data-expected="unt"/>; in atri<input type="text" data-expected="o"/> aqu<input type="text" data-expected="am"/> sum<input type="text" data-expected="unt"/> ex impluvi<input type="text" data-expected="o"/> et ros<input type="text" data-expected="as"/> in aqu<input type="text" data-expected="a"/> pon<input type="text" data-expected="unt"/>.
\ No newline at end of file
+Iulius et Aemilia in <span>vill<input type="text" data-expected="a"/></span> <span>habit<input type="text" data-expected="ant"/></span> cum <span>liber<input type="text" data-expected="is"/></span> et <span>serv<input type="text" data-expected="is"/>.</span> Dominus <span>mult<input type="text" data-expected="os"/></span> <span>serv<input type="text" data-expected="os"/></span> et <span>mult<input type="text" data-expected="as"/></span> <span>ancill<input type="text" data-expected="as"/></span> habet.<br>
+Aemilia in <span>peristÿl<input type="text" data-expected="o"/></span> est cum <span>Marc<input type="text" data-expected="o"/></span> et <span>Quint<input type="text" data-expected="o"/></span> et <span>Iuli<input type="text" data-expected="a"/>.</span> Iulia <span>mult<input type="text" data-expected="as"/></span> <span>ros<input type="text" data-expected="as"/></span> in <span>hort<input type="text" data-expected="o"/></span> <span>vid<input type="text" data-expected="et"/></span> et ab <span>Aemili<input type="text" data-expected="a"/></span> <span>disced<input type="text" data-expected="it"/>.</span> Iam Aemilia <span>puell<input type="text" data-expected="am"/></span> non <span>vid<input type="text" data-expected="et"/></span>, neque pueri eam <span>vid<input type="text" data-expected="ent"/>.</span> Aemilia: "Marce et Quinte! <span>Voc<input type="text" data-expected="ate"/></span> Iuliam!" Pueri <span>Iuli<input type="text" data-expected="am"/></span> <span>voc<input type="text" data-expected="ant"/></span>: "Iulia! <span>Ven<input type="text" data-expected="i"/></span>!" et Iulia <span>puer<input type="text" data-expected="os"/></span> <span>voc<input type="text" data-expected="at"/></span>: "Marce et Quinte! <span>Ven<input type="text" data-expected="ite"/></span>!" Iulia pueros non <span>aud<input type="text" data-expected="it"/></span>, sed pueri <span>Iuli<input type="text" data-expected="am"/></span> <span>aud<input type="text" data-expected="iunt"/>.</span> Iulia: "Cur pueri non <span>ven<input type="text" data-expected="iunt"/></span>?" Iulia ex <span>hort<input type="text" data-expected="o"/></span> venit cum V <span>ros<input type="text" data-expected="is"/></span> <span>pulchr<input type="text" data-expected="is"/>.</span> Iulia: "<span>Vid<input type="text" data-expected="e"/></span> <span>ros<input type="text" data-expected="as"/></span> meas, mater! <span>Vid<input type="text" data-expected="ete"/></span>, pueri!" Marcus: "Rosae pulchrae sunt, puella sine <span>ros<input type="text" data-expected="is"/></span> pulchra non est!" Iulia cum <span>un<input type="text" data-expected="a"/></span> <span>ros<input type="text" data-expected="a"/></span> <span>disced<input type="text" data-expected="it"/>.</span> Pueri <span>rid<input type="text" data-expected="ent"/>.</span> Aemilia: "<span>Tac<input type="text" data-expected="ete"/></span>, pueri! <span>Sum<input type="text" data-expected="ite"/></span> <span>ros<input type="text" data-expected="as"/></span> et <span>disced<input type="text" data-expected="ite"/></span>!" Pueri <span>ros<input type="text" data-expected="as"/></span> <span>sum<input type="text" data-expected="unt"/></span> et <span>disced<input type="text" data-expected="unt"/></span>; in <span>atri<input type="text" data-expected="o"/></span> <span>aqu<input type="text" data-expected="am"/></span> <span>sum<input type="text" data-expected="unt"/></span> ex <span>impluvi<input type="text" data-expected="o"/></span> et <span>ros<input type="text" data-expected="as"/></span> in <span>aqu<input type="text" data-expected="a"/></span> <span>pon<input type="text" data-expected="unt"/>.</span>
\ No newline at end of file
diff --git a/app/templates/Pensa/05_Villa_et_Hortus_Pensum_B.html b/app/templates/Pensa/05_Villa_et_Hortus_Pensum_B.html
index a85bbc7..1513caa 100644
--- a/app/templates/Pensa/05_Villa_et_Hortus_Pensum_B.html
+++ b/app/templates/Pensa/05_Villa_et_Hortus_Pensum_B.html
@@ -1,3 +1,3 @@
-Iulius in magna <input type="text" data-expected="villa"/> <input type="text" data-expected="habitat"/>. Aemilia cum <input type="text" data-expected="eo"/> [:Iulio] habitat. Iulius Aemiliam <input type="text" data-expected="amat"/>, quia <input type="text" data-expected="ea"/> [: Aemilia] bona et <input type="text" data-expected="pulchra"/> femina est.
-Aemilia in peristÿlo est <input type="text" data-expected="cum"/> liberis suis, sed <input type="text" data-expected="sine"/> viro suo. Iulia <input type="text" data-expected="ab"/> Aemilia discedit; iam puella in <input type="text" data-expected="horto"/> est. Iulia rosas <input type="text" data-expected="carpit"/> et <input type="text" data-expected="ex"/> horto venit cum V <input type="text" data-expected="rosis"/>. Puella laeta est: rosae eam <input type="text" data-expected="delectant"/>.
-Ubi est impluvium? <input type="text" data-expected="Id"/> [: impluvium] est in <input type="text" data-expected="atrio"/>. In impluvio <input type="text" data-expected="aqua"/> est. In atrio nullae <input type="text" data-expected="fenestrae"/> sunt.
\ No newline at end of file
+Iulius in magna <span><input type="text" data-expected="villa"/></span> <span><input type="text" data-expected="habitat"/>.</span> Aemilia cum <span><input type="text" data-expected="eo"/></span> [:Iulio] habitat. Iulius Aemiliam <span><input type="text" data-expected="amat"/></span>, quia <span><input type="text" data-expected="ea"/></span> [: Aemilia] bona et <span><input type="text" data-expected="pulchra"/></span> femina est.
+Aemilia in peristÿlo est <span><input type="text" data-expected="cum"/></span> liberis suis, sed <span><input type="text" data-expected="sine"/></span> viro suo. Iulia <span><input type="text" data-expected="ab"/></span> Aemilia discedit; iam puella in <span><input type="text" data-expected="horto"/></span> est. Iulia rosas <span><input type="text" data-expected="carpit"/></span> et <span><input type="text" data-expected="ex"/></span> horto venit cum V <span><input type="text" data-expected="rosis"/>.</span> Puella laeta est: rosae eam <span><input type="text" data-expected="delectant"/>.</span>
+Ubi est impluvium? <span><input type="text" data-expected="Id"/></span> [: impluvium] est in <span><input type="text" data-expected="atrio"/>.</span> In impluvio <span><input type="text" data-expected="aqua"/></span> est. In atrio nullae <span><input type="text" data-expected="fenestrae"/></span> sunt.
\ No newline at end of file
diff --git a/app/templates/Pensa/06_Via_Latina_Pensum_A.html b/app/templates/Pensa/06_Via_Latina_Pensum_A.html
index 9291554..e26cc27 100644
--- a/app/templates/Pensa/06_Via_Latina_Pensum_A.html
+++ b/app/templates/Pensa/06_Via_Latina_Pensum_A.html
@@ -1,4 +1,4 @@
-Iulius ab oppid<input type="text" data-expected="o"/> Tusculo ad vill<input type="text" data-expected="am"/> su<input type="text" data-expected="am"/> it. Villa eius prope Tuscul<input type="text" data-expected="um"/> est. Iulius in lectica est inter Urs<input type="text" data-expected="um"/> et Dav<input type="text" data-expected="um"/>. Dominus a servis port<input type="text" data-expected="atur"/>. Ursus et Davus non saccos port<input type="text" data-expected="ant"/>, sacc<input type="text" data-expected="i"/> a Syro et Leandro port<input type="text" data-expected="antur"/>. Saccus quem Leander port<input type="text" data-expected="at"/> non tam parvus est quam saccus qui a Syro port<input type="text" data-expected="atur"/>.
-Medus non est apud domin<input type="text" data-expected="um"/>, nam servus malus dominum tim<input type="text" data-expected="et"/>. Dominus a serv<input type="text" data-expected="o"/> mal<input type="text" data-expected="o"/> tim<input type="text" data-expected="etur"/>. Dominus serv<input type="text" data-expected="um"/> mal<input type="text" data-expected="um"/> voc<input type="text" data-expected="at"/> neque ab eo aud<input type="text" data-expected="itur"/>. Serv<input type="text" data-expected="us"/> mal<input type="text" data-expected="us"/> a domin<input type="text" data-expected="o"/> voc<input type="text" data-expected="atur"/> neque eum aud<input type="text" data-expected="it"/>.
-Quo it Medus? Rom<input type="text" data-expected="am"/> it. Unde venit? Medus Tuscul<input type="text" data-expected="o"/> venit. Ante Med<input type="text" data-expected="um"/> est Roma, Tusculum post e<input type="text" data-expected="um"/> est. Cornelius non Tusculo Romam, sed Rom<input type="text" data-expected="a"/> Tuscul<input type="text" data-expected="um"/> it, nam is Tuscul<input type="text" data-expected="i"/> habitat. Cornelius non ambulat, sed equ<input type="text" data-expected="o"/> veh<input type="text" data-expected="itur"/>.
-Lÿdia, amica Medi, Rom<input type="text" data-expected="ae"/> habitat. Iam Medus Rom<input type="text" data-expected="ae"/> apud Lÿdi<input type="text" data-expected="am"/> est. Medus amic<input type="text" data-expected="am"/> su<input type="text" data-expected="am"/> salut<input type="text" data-expected="at"/> et ab amic<input type="text" data-expected="a"/> su<input type="text" data-expected="a"/> salut<input type="text" data-expected="atur"/>, nam Lÿdia Med<input type="text" data-expected="um"/> am<input type="text" data-expected="at"/> et ab e<input type="text" data-expected="o"/> am<input type="text" data-expected="atur"/>.
\ No newline at end of file
+Iulius ab <span>oppid<input type="text" data-expected="o"/></span> Tusculo ad <span>vill<input type="text" data-expected="am"/></span> <span>su<input type="text" data-expected="am"/></span> it. Villa eius prope <span>Tuscul<input type="text" data-expected="um"/></span> est. Iulius in lectica est inter <span>Urs<input type="text" data-expected="um"/></span> et <span>Dav<input type="text" data-expected="um"/>.</span> Dominus a servis <span>port<input type="text" data-expected="atur"/>.</span> Ursus et Davus non saccos <span>port<input type="text" data-expected="ant"/></span>, <span>sacc<input type="text" data-expected="i"/></span> a Syro et Leandro <span>port<input type="text" data-expected="antur"/>.</span> Saccus quem Leander <span>port<input type="text" data-expected="at"/></span> non tam parvus est quam saccus qui a Syro <span>port<input type="text" data-expected="atur"/>.</span>
+Medus non est apud <span>domin<input type="text" data-expected="um"/></span>, nam servus malus dominum <span>tim<input type="text" data-expected="et"/>.</span> Dominus a <span>serv<input type="text" data-expected="o"/></span> <span>mal<input type="text" data-expected="o"/></span> <span>tim<input type="text" data-expected="etur"/>.</span> Dominus <span>serv<input type="text" data-expected="um"/></span> <span>mal<input type="text" data-expected="um"/></span> <span>voc<input type="text" data-expected="at"/></span> neque ab eo <span>aud<input type="text" data-expected="itur"/>.</span> <span>Serv<input type="text" data-expected="us"/></span> <span>mal<input type="text" data-expected="us"/></span> a <span>domin<input type="text" data-expected="o"/></span> <span>voc<input type="text" data-expected="atur"/></span> neque eum <span>aud<input type="text" data-expected="it"/>.</span>
+Quo it Medus? <span>Rom<input type="text" data-expected="am"/></span> it. Unde venit? Medus <span>Tuscul<input type="text" data-expected="o"/></span> venit. Ante <span>Med<input type="text" data-expected="um"/></span> est Roma, Tusculum post <span>e<input type="text" data-expected="um"/></span> est. Cornelius non Tusculo Romam, sed <span>Rom<input type="text" data-expected="a"/></span> <span>Tuscul<input type="text" data-expected="um"/></span> it, nam is <span>Tuscul<input type="text" data-expected="i"/></span> habitat. Cornelius non ambulat, sed <span>equ<input type="text" data-expected="o"/></span> <span>veh<input type="text" data-expected="itur"/>.</span>
+Lÿdia, amica Medi, <span>Rom<input type="text" data-expected="ae"/></span> habitat. Iam Medus <span>Rom<input type="text" data-expected="ae"/></span> apud <span>Lÿdi<input type="text" data-expected="am"/></span> est. Medus <span>amic<input type="text" data-expected="am"/></span> <span>su<input type="text" data-expected="am"/></span> <span>salut<input type="text" data-expected="at"/></span> et ab <span>amic<input type="text" data-expected="a"/></span> <span>su<input type="text" data-expected="a"/></span> <span>salut<input type="text" data-expected="atur"/></span>, nam Lÿdia <span>Med<input type="text" data-expected="um"/></span> <span>am<input type="text" data-expected="at"/></span> et ab <span>e<input type="text" data-expected="o"/></span> <span>am<input type="text" data-expected="atur"/>.</span>
\ No newline at end of file
diff --git a/app/templates/Pensa/06_Via_Latina_Pensum_B.html b/app/templates/Pensa/06_Via_Latina_Pensum_B.html
index 87566c5..814a059 100644
--- a/app/templates/Pensa/06_Via_Latina_Pensum_B.html
+++ b/app/templates/Pensa/06_Via_Latina_Pensum_B.html
@@ -1,2 +1,2 @@
-Ostia non <input type="text" data-expected="procul"/> a Roma, sed <input type="text" data-expected="prope"/> Romam est. <input type="text" data-expected="Unde"/> venit Iulius? Tusculo venit et <input type="text" data-expected="ad"/> villam it. Duo servi eum <input type="text" data-expected="portant"/>. Syrus et Leander, qui <input type="text" data-expected="post"/> lecticam ambulant, duos <input type="text" data-expected="saccos"/> portant. Saccus Syri non <input type="text" data-expected="tam"/> magnus est <input type="text" data-expected="quam"/> saccus qui a Leandro portatur, <input type="text" data-expected="itaque"/> Syrus non tam <input type="text" data-expected="fessus"/> est quam Leander.
-Medus <input type="text" data-expected="apud"/> dominum non est, nam Medus dominum iratum <input type="text" data-expected="timet"/>. Medus servus <input type="text" data-expected="malus"/> [= improbus] est; <input type="text" data-expected="itaque"/> Medus et Iulius non <input type="text" data-expected="amici"/>, sed inimici sunt. Via Latina, quae est <input type="text" data-expected="inter"/> Romam et Capuam, non tam <input type="text" data-expected="longa"/> est quam <input type="text" data-expected="via"/> Appia. <input type="text" data-expected="Quo"/> ambulat Medus? Is Romam ambulat, <input type="text" data-expected="nam"/> amica eius Romae habitat. Cornelius <input type="text" data-expected="autem"/> [= sed C.] Roma Tusculum <input type="text" data-expected="it"/>. Tusculum est <input type="text" data-expected="ante"/> eum, <input type="text" data-expected="post"/> eum est Roma. Cornelius equo <input type="text" data-expected="vehitur"/>, is non <input type="text" data-expected="ambulat"/>. Iulius et Cornelius ad villas suas <input type="text" data-expected="eunt"/>.
\ No newline at end of file
+Ostia non <span><input type="text" data-expected="procul"/></span> a Roma, sed <span><input type="text" data-expected="prope"/></span> Romam est. <span><input type="text" data-expected="Unde"/></span> venit Iulius? Tusculo venit et <span><input type="text" data-expected="ad"/></span> villam it. Duo servi eum <span><input type="text" data-expected="portant"/>.</span> Syrus et Leander, qui <span><input type="text" data-expected="post"/></span> lecticam ambulant, duos <span><input type="text" data-expected="saccos"/></span> portant. Saccus Syri non <span><input type="text" data-expected="tam"/></span> magnus est <span><input type="text" data-expected="quam"/></span> saccus qui a Leandro portatur, <span><input type="text" data-expected="itaque"/></span> Syrus non tam <span><input type="text" data-expected="fessus"/></span> est quam Leander.
+Medus <span><input type="text" data-expected="apud"/></span> dominum non est, nam Medus dominum iratum <span><input type="text" data-expected="timet"/>.</span> Medus servus <span><input type="text" data-expected="malus"/></span> [= improbus] est; <span><input type="text" data-expected="itaque"/></span> Medus et Iulius non <span><input type="text" data-expected="amici"/></span>, sed inimici sunt. Via Latina, quae est <span><input type="text" data-expected="inter"/></span> Romam et Capuam, non tam <span><input type="text" data-expected="longa"/></span> est quam <span><input type="text" data-expected="via"/></span> Appia. <span><input type="text" data-expected="Quo"/></span> ambulat Medus? Is Romam ambulat, <span><input type="text" data-expected="nam"/></span> amica eius Romae habitat. Cornelius <span><input type="text" data-expected="autem"/></span> [= sed C.] Roma Tusculum <span><input type="text" data-expected="it"/>.</span> Tusculum est <span><input type="text" data-expected="ante"/></span> eum, <span><input type="text" data-expected="post"/></span> eum est Roma. Cornelius equo <span><input type="text" data-expected="vehitur"/></span>, is non <span><input type="text" data-expected="ambulat"/>.</span> Iulius et Cornelius ad villas suas <span><input type="text" data-expected="eunt"/>.</span>
\ No newline at end of file
diff --git a/app/templates/Pensum_cloze.html b/app/templates/Pensum_cloze.html
index 68c6129..6bf2513 100644
--- a/app/templates/Pensum_cloze.html
+++ b/app/templates/Pensum_cloze.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="la">
 <head>
-	<meta charset="UTF-8">
+	<meta charset="UTF-8"/>
 	<title>{{pensum_title}}</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<meta name="viewport" content="width=device-width, initial-scale=1"/>
 	<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/LLPSI.css') }}">
 	<script type="text/javascript">
 		function adjust_size() {
@@ -90,9 +90,13 @@
 	</script>
 </head>
 <body>
-	<h1><a href="/llpsi">Lingua Latina Per Se Illustrata</a></h1>
-	<h2>{{pensum_title}}</h2>
-	Quantitās: <input type="checkbox" id="vowel_length">
+	<header>
+		<h1><a href="/llpsi">Lingua Latina Per Se Illustrata</a></h1>
+		<h2>{{pensum_title}}</h2>
+		<label class="toggle">
+			Quantitās: <input type="checkbox" id="vowel_length">
+		</label>
+	</header>
 	<div id="pensum_content">
 		<p>{{pensum_content|safe}}</p>
 		<br>
diff --git a/app/templates/index.html b/app/templates/index.html
index b2d72ea..d57a08c 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -1,22 +1,20 @@
 <!DOCTYPE html>
 <html lang="la">
 <head>
-	<meta charset="UTF-8">
+	<meta charset="UTF-8"/>
 	<title>Lingua Latina Per Se Illustrata</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<meta name="viewport" content="width=device-width, initial-scale=1"/>
 	<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/LLPSI.css') }}">
 </head>
 <body>
 	<h1>Lingua Latina Per Se Illustrata</h1>
-	<ul>
+	<dl>
 	{% for capitulum in capitula %}
-		<li>{{capitulum.title}}
-			<ul>
-				<li><a href="/llpsi/{{capitulum.filename}}_Pensum_A">Pensum A</a></li>
-				<li><a href="/llpsi/{{capitulum.filename}}_Pensum_B">Pensum B</a></li>
-			</ul>
-		</li>
+		<dt>{{capitulum.title}}
+			<dd><a href="/llpsi/{{capitulum.filename}}_Pensum_A">Pensum A</a></dd>
+			<dd><a href="/llpsi/{{capitulum.filename}}_Pensum_B">Pensum B</a></dd>
+		</dt>
 	{% endfor %}
-	</ul>
+	</dl>
 </body>
 </html>
\ No newline at end of file