Index: fluid-engage-core/components/codeEntry/css/codeEntry.css
===================================================================
--- fluid-engage-core/components/codeEntry/css/codeEntry.css	(revision 9423)
+++ fluid-engage-core/components/codeEntry/css/codeEntry.css	(working copy)
@@ -50,4 +50,6 @@
 .fl-codeEntry-middleButton {
     margin-left: 1px;
     margin-right: 1px;
-}
\ No newline at end of file
+}
+
+.fl-codeEntry-hidden {position:absolute; left:-10000px; top:auto; width:1px; height:1px; overflow:hidden;}
Index: fluid-engage-core/components/codeEntry/html/codeEntry.html
===================================================================
--- fluid-engage-core/components/codeEntry/html/codeEntry.html	(revision 9423)
+++ fluid-engage-core/components/codeEntry/html/codeEntry.html	(working copy)
@@ -44,24 +44,57 @@
 			
 			<div class="flc-codeEntry-numpad fl-codeEntry-numpad fl-table">
 				<div class="fl-table-row">
-					<img class="flc-codeEntry-numButton" role="button" src="../../../../fluid-engage-core/components/codeEntry/images/1.png" alt="1"/>
-					<img class="flc-codeEntry-numButton fl-codeEntry-middleButton" role="button" src="../../../../fluid-engage-core/components/codeEntry/images/2.png" alt="2"/>
-					<img class="flc-codeEntry-numButton" role="button" src="../../../../fluid-engage-core/components/codeEntry/images/3.png" alt="3"/>
+				    <a class="flc-codeEntry-numButton" role="button" rsf:id="scr=null" href="#">
+    					<img src="../../../../fluid-engage-core/components/codeEntry/images/1.png" alt="1"/>
+                        <span class="fl-codeEntry-hidden">1</span>
+                    </a>
+                    <a class="flc-codeEntry-numButton" role="button" rsf:id="scr=null" href="#">
+					    <img class="fl-codeEntry-middleButton" src="../../../../fluid-engage-core/components/codeEntry/images/2.png" alt="2"/>
+                        <span class="fl-codeEntry-hidden">2</span>
+                    </a>
+                    <a class="flc-codeEntry-numButton" role="button" rsf:id="scr=null" href="#">
+					    <img src="../../../../fluid-engage-core/components/codeEntry/images/3.png" alt="3"/>
+                        <span class="fl-codeEntry-hidden">3</span>
+                    </a>
 				</div>
 				<div class="fl-table-row">
-					<img class="flc-codeEntry-numButton" role="button" src="../../../../fluid-engage-core/components/codeEntry/images/4.png" alt="4"/>
-					<img class="flc-codeEntry-numButton fl-codeEntry-middleButton" role="button" src="../../../../fluid-engage-core/components/codeEntry/images/5.png" alt="5"/>
-					<img class="flc-codeEntry-numButton" role="button" src="../../../../fluid-engage-core/components/codeEntry/images/6.png" alt="6"/>
+				    <a class="flc-codeEntry-numButton" role="button" rsf:id="scr=null" href="#">
+    					<img src="../../../../fluid-engage-core/components/codeEntry/images/4.png" alt="4"/>
+                        <span class="fl-codeEntry-hidden">4</span>
+                    </a>
+                    <a class="flc-codeEntry-numButton" role="button" rsf:id="scr=null" href="#">
+    					<img class="fl-codeEntry-middleButton" src="../../../../fluid-engage-core/components/codeEntry/images/5.png" alt="5"/>
+                        <span class="fl-codeEntry-hidden">5</span>
+                    </a>
+                    <a class="flc-codeEntry-numButton" role="button" rsf:id="scr=null" href="#">
+    					<img src="../../../../fluid-engage-core/components/codeEntry/images/6.png" alt="6"/>
+                        <span class="fl-codeEntry-hidden">6</span>
+                    </a>
 				</div>
 				<div class="fl-table-row">
-					<img class="flc-codeEntry-numButton" role="button" src="../../../../fluid-engage-core/components/codeEntry/images/7.png" alt="7"/>
-					<img class="flc-codeEntry-numButton fl-codeEntry-middleButton" role="button" src="../../../../fluid-engage-core/components/codeEntry/images/8.png" alt="8"/>
-					<img class="flc-codeEntry-numButton" role="button" src="../../../../fluid-engage-core/components/codeEntry/images/9.png" alt="9"/>
+				    <a class="flc-codeEntry-numButton" role="button" rsf:id="scr=null" href="#">
+    					<img src="../../../../fluid-engage-core/components/codeEntry/images/7.png" alt="7"/>
+                        <span class="fl-codeEntry-hidden">7</span>
+                    </a>
+                    <a class="flc-codeEntry-numButton" role="button" rsf:id="scr=null" href="#">
+    					<img class="fl-codeEntry-middleButton" src="../../../../fluid-engage-core/components/codeEntry/images/8.png" alt="8"/>
+                        <span class="fl-codeEntry-hidden">8</span>
+                    </a>
+                    <a class="flc-codeEntry-numButton" role="button" rsf:id="scr=null" href="#">
+    					<img src="../../../../fluid-engage-core/components/codeEntry/images/9.png" alt="9"/>
+                        <span class="fl-codeEntry-hidden">9</span>
+                    </a>
 				</div>
 				<div class="fl-table-row">
-					<img src="../../../../fluid-engage-core/components/codeEntry/images/blank.png" alt=""/>
-					<img class="flc-codeEntry-numButton fl-codeEntry-middleButton" role="button" src="../../../../fluid-engage-core/components/codeEntry/images/0.png" alt="0"/>
-					<img class="flc-codeEntry-delButton" role="button" src="../../../../fluid-engage-core/components/codeEntry/images/del.png" alt="Delete"/>
+				    <img src="../../../../fluid-engage-core/components/codeEntry/images/blank.png" alt=""/>
+                    <a class="flc-codeEntry-numButton" role="button" rsf:id="scr=null" href="#">
+    					<img class="fl-codeEntry-middleButton" src="../../../../fluid-engage-core/components/codeEntry/images/0.png" alt="0"/>
+                        <span class="fl-codeEntry-hidden">0</span>
+                    </a>
+                    <a class="flc-codeEntry-delButton" role="button" rsf:id="scr=null" href="#">
+    					<img src="../../../../fluid-engage-core/components/codeEntry/images/del.png" alt="Delete"/>
+                        <span class="flc-codeEntry-delLabel fl-codeEntry-hidden">Delete</span>
+                    </a>
 				</div>
 			</div>
 		</div>
Index: fluid-engage-core/components/codeEntry/js/CodeEntryView.js
===================================================================
--- fluid-engage-core/components/codeEntry/js/CodeEntryView.js	(revision 9423)
+++ fluid-engage-core/components/codeEntry/js/CodeEntryView.js	(working copy)
@@ -99,8 +99,13 @@
     };
     
     var setupDelete = function (that, button) {
-        button.attr("alt", that.options.strings.deleteLabel);
-        button.click(that.deleteLastDigit);
+        var label = that.options.strings.deleteLabel;
+        that.locate("delLabel").text(label);
+        button.attr("alt", label);
+        button.click(function (evt) {
+            that.deleteLastDigit();
+            evt.preventDefault();
+        });
     };
 
     /**
@@ -125,8 +130,10 @@
         //Initialize number buttons
         that.locate("numButtons").each(function () {
             var btn = $(this);
-            btn.click(function () {
-                that.enterDigit(parseInt(btn.attr("alt"), 10));
+            btn.click(function (evt) {
+                var img = that.locate("buttonImage", btn);
+                that.enterDigit(parseInt(img.attr("alt"), 10));
+                evt.preventDefault();
             });
         });
         
@@ -189,7 +196,9 @@
             firstDigitField : ".flc-codeEntry-firstDigit",
             secondDigitField : ".flc-codeEntry-secondDigit",
             numButtons: ".flc-codeEntry-numButton",
-            delButton: ".flc-codeEntry-delButton"
+            delButton: ".flc-codeEntry-delButton",
+            delLabel: ".flc-codeEntry-delLabel",
+            buttonImage: "img"
         },
         styles : {
             invalidCode : "fl-codeEntry-invalidCode"