diff --git a/app/src/main/java/com/blackcj/customkeyboard/LatinKeyboardView.java b/app/src/main/java/com/blackcj/customkeyboard/LatinKeyboardView.java
index c1936ef..c306ba5 100644
--- a/app/src/main/java/com/blackcj/customkeyboard/LatinKeyboardView.java
+++ b/app/src/main/java/com/blackcj/customkeyboard/LatinKeyboardView.java
@@ -75,16 +75,8 @@ public void onDraw(Canvas canvas) {
         List<Key> keys = getKeyboard().getKeys();
         for(Key key: keys) {
             if(key.label != null) {
-                if (key.label.equals("q")) {
-                    canvas.drawText("1", key.x + (key.width - 25), key.y + 40, paint);
-                } else if (key.label.equals("w")) {
-                    canvas.drawText("2", key.x + (key.width - 25), key.y + 40, paint);
-                } else if (key.label.equals("e")) {
-                    canvas.drawText("3", key.x + (key.width - 25), key.y + 40, paint);
-                } else if (key.label.equals("r")) {
-                    canvas.drawText("4", key.x + (key.width - 25), key.y + 40, paint);
-                } else if (key.label.equals("t")) {
-                    canvas.drawText("5", key.x + (key.width - 25), key.y + 40, paint);
+                if (key.popupCharacters != null && key.popupCharacters.length() == 1) {
+                    canvas.drawText(String.valueOf(key.popupCharacters), key.x + (key.width - 25), key.y + 40, paint);
                 }
             }
 
diff --git a/app/src/main/res/xml/qwerty.xml b/app/src/main/res/xml/qwerty.xml
index 9df7c85..9738166 100755
--- a/app/src/main/res/xml/qwerty.xml
+++ b/app/src/main/res/xml/qwerty.xml
@@ -30,11 +30,11 @@
         <Key android:codes="101" android:keyLabel="e" android:popupCharacters="3" android:popupKeyboard="@xml/keyboard_popup_template"/>
         <Key android:codes="114" android:keyLabel="r" android:popupCharacters="4" android:popupKeyboard="@xml/keyboard_popup_template"/>
         <Key android:codes="116" android:keyLabel="t" android:popupCharacters="5" android:popupKeyboard="@xml/keyboard_popup_template"/>
-        <Key android:codes="121" android:keyLabel="y"/>
-        <Key android:codes="117" android:keyLabel="u"/>
-        <Key android:codes="105" android:keyLabel="i"/>
-        <Key android:codes="111" android:keyLabel="o"/>
-        <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>
+        <Key android:codes="121" android:keyLabel="y" android:popupCharacters="6" android:popupKeyboard="@xml/keyboard_popup_template"/>
+        <Key android:codes="117" android:keyLabel="u" android:popupCharacters="7" android:popupKeyboard="@xml/keyboard_popup_template"/>
+        <Key android:codes="105" android:keyLabel="i" android:popupCharacters="8" android:popupKeyboard="@xml/keyboard_popup_template"/>
+        <Key android:codes="111" android:keyLabel="o" android:popupCharacters="9" android:popupKeyboard="@xml/keyboard_popup_template"/>
+        <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right" android:popupCharacters="0" android:popupKeyboard="@xml/keyboard_popup_template"/>
     </Row>
     
     <Row>