diff --git a/card templates/Card 2/front.html b/card templates/Card 2/front.html
index 5a661c9..0910d63 100644
--- a/card templates/Card 2/front.html	
+++ b/card templates/Card 2/front.html	
@@ -13,11 +13,11 @@
 <script>
     if (Persistence.isAvailable()) {
         if (Persistence.getItem("text-pinyin") == "true" && Persistence.getItem("text-zhuyin") == "false") {
-            document.querySelector(".question").innerHTML = "pinyin";
+            document.querySelector(".question-sub-text").innerHTML = "pinyin";
         } else if (Persistence.getItem("text-pinyin") == "false" && Persistence.getItem("text-zhuyin") == "true") {
-            document.querySelector(".question").innerHTML = "zhuyin";
+            document.querySelector(".question-sub-text").innerHTML = "zhuyin";
         } else {
-            document.querySelector(".question").innerHTML = "pinyin & zhuyin";
+            document.querySelector(".question-sub-text").innerHTML = "pinyin & zhuyin";
         }
     }
 
diff --git a/card templates/Card 3/front.html b/card templates/Card 3/front.html
index 9ebf266..2d84c4f 100644
--- a/card templates/Card 3/front.html	
+++ b/card templates/Card 3/front.html	
@@ -32,9 +32,14 @@
     }
 
     var pinyinList = document.getElementById("char_pinyin").children;
+    var pinyinQuestionList = []
     for (var pinyin of pinyinList) {
-        pinyin.innerText = removeToneMarks(pinyin);
+        var removedTone  = removeToneMarks(pinyin);
+        if (!pinyinQuestionList.includes(removedTone)) {
+            pinyinQuestionList.push(removedTone)
+        }
     }
+    document.getElementById("char_pinyin").innerText = pinyinQuestionList.join(", ");
 
     var zhuyinList = document.getElementById("char_zhuyin").children;
     var zhuyinQuestionList = []
@@ -42,6 +47,7 @@
         zhuyin.innerText = zhuyin.innerText.replace("ˋ", "");
         zhuyin.innerText = zhuyin.innerText.replace("ˊ", "");
         zhuyin.innerText = zhuyin.innerText.replace("˙", "");
+        zhuyin.innerText = zhuyin.innerText.replace("ˇ", "");
 
         if (!zhuyinQuestionList.includes(zhuyin.innerText)) {
             zhuyinQuestionList.push(zhuyin.innerText)
diff --git a/card templates/Card 5/front.html b/card templates/Card 5/front.html
index 2345ac9..c04f2a1 100644
--- a/card templates/Card 5/front.html	
+++ b/card templates/Card 5/front.html	
@@ -288,6 +288,10 @@ <h3>xie hanzi</h3>
     function setPrefs(e) {
         if (e.id == "practice-select") {
             Persistence.setItem(e.id, e.selectedIndex);
+            characters = document.getElementById("practice-select").selectedIndex == "0"
+            ? document.getElementById('char_sim').innerHTML
+            : document.getElementById('char_trad').innerHTML;
+            doPractice();
         }
 
         if (e.type == "checkbox") {
@@ -480,6 +484,12 @@ <h3>xie hanzi</h3>
     async function writeFunction(c) {
         // Wrap the code inside a Promise constructor callback
         return new Promise(function (resolve, reject) {
+            if (Persistence.getItem("text-grid") == "true") {
+                document.getElementById("char_grid").style.display = "block";
+            } else {
+                document.getElementById("char_grid").style.display = "none";
+            }
+
             var writer = HanziWriter.create('grid-background-target', c, {
                 onLoadCharDataSuccess: function (data) {
                     document.getElementById("ch_load_status").style.color = "#4caf50";
@@ -501,12 +511,6 @@ <h3>xie hanzi</h3>
                 padding: 5
             });
 
-            if (Persistence.getItem("text-grid") == "true") {
-                document.getElementById("char_grid").style.display = "block";
-            } else {
-                document.getElementById("char_grid").style.display = "none";
-            }
-
             var revealClickCount = 0;
             document.getElementById("btnRevealChar").onclick = function () {
                 btnTapAudio();