diff --git a/captcha_keypad.css b/captcha_keypad.css
deleted file mode 100644
index 1b28c9f..0000000
--- a/captcha_keypad.css
+++ /dev/null
@@ -1,36 +0,0 @@
-.captcha-keypad-wrapper .fieldset-wrapper .form-item,
-.captcha-keypad-wrapper .fieldset-wrapper .captcha-keypad {
-  float: left;
-  display: block;
-  margin: 5px;
-  min-height: 75px;
-  vertical-align: middle;
-}
-
-.captcha-keypad-wrapper .fieldset-wrapper .captcha-keypad span,
-.captcha-keypad-wrapper .fieldset-wrapper .clear {
-  cursor: pointer;
-  border: 1px dotted gray;
-  width: 10px;
-  height: 10px;
-  display: inline-table;
-  margin: 2px 2px;
-  padding: 2px 6px;
-  font-family: Arial, Helvetica, sans-serif;
-}
-
-.captcha-keypad-wrapper .fieldset-wrapper .captcha-keypad .inner span:hover,
-.captcha-keypad-wrapper .fieldset-wrapper .clear:hover {
-  background-color: rgb(207, 208, 208);
-}
-
-.captcha-keypad-wrapper .fieldset-wrapper .captcha-keypad .inner {
-  display: block;
-  width: 110px;
-  border: none;
-  height: auto;
-}
-
-#edit-captcha-keypad-input {
-  max-width: 70px;
-}
diff --git a/captcha_keypad.js b/captcha_keypad.js
deleted file mode 100644
index a22d499..0000000
--- a/captcha_keypad.js
+++ /dev/null
@@ -1,47 +0,0 @@
-(function ($, Drupal) {
-
-  'use strict';
-
-  Drupal.behaviors.capcha_keypad = {
-    attach: function (data, settings) {
-      $(document).ready(function () {
-        $('.captcha-keypad-keypad-used').val('');
-
-        $('.captcha-keypad-input').val('').keyup(function () {
-          var wrapper = $(this).parent().parent().parent().parent();
-          var textfield = wrapper.find('.captcha-keypad-input');
-          var message = wrapper.find('.message');
-          textfield.val('');
-          message.css('color', 'red');
-          message.html(Drupal.t('Use keypad ->'));
-        });
-
-        $('.form-item-captcha-keypad-input').append(
-          '<span class="clear">' +
-            Drupal.t('Clear') +
-            '</span><br/>' +
-            '<span class="message"></span>'
-        );
-
-        $('.form-item-captcha-keypad-input .clear').click(function () {
-          var wrapper = $(this).parent().parent().parent().parent();
-          var textfield = wrapper.find('.captcha-keypad-input');
-          var message = wrapper.find('.message');
-          textfield.val('');
-          message.html('');
-        });
-
-        $('.captcha-keypad .inner span').click(function () {
-          var wrapper = $(this).parent().parent().parent().parent();
-          var textfield = wrapper.find('.captcha-keypad-input');
-          var keypadused = wrapper.find('.captcha-keypad-keypad-used');
-          var message = wrapper.find('.message');
-          var value = textfield.val();
-          textfield.val(value + $(this).text());
-          keypadused.val('Yes');
-          message.html('');
-        });
-      });
-    }
-  };
-})(jQuery, Drupal);
diff --git a/captcha_keypad.module b/captcha_keypad.module
index 2f21639..877744c 100644
--- a/captcha_keypad.module
+++ b/captcha_keypad.module
@@ -74,6 +74,7 @@
     '#type' => 'textfield',
     '#attributes' => array('class' => array('captcha-keypad-input')),
     '#size' => $digits,
+    '#field_suffix' => '<div class="clearbtn">Clear</div><span class="message"></span>',
   );
 
   if (!isset($form_state['input']['captcha_keypad_hidden'])) {
@@ -151,6 +152,6 @@
  * Helper to add css and javascript.
  */
 function _captcha_keypad_add_js_css(&$form) {
-  $form['#attached']['js'][] = drupal_get_path('module', 'captcha_keypad') . '/captcha_keypad.js';
-  $form['#attached']['css'][] = drupal_get_path('module', 'captcha_keypad') . '/captcha_keypad.css';
+  $form['#attached']['js'][] = drupal_get_path('module', 'captcha_keypad') . '/js/captcha_keypad.js';
+  $form['#attached']['css'][] = drupal_get_path('module', 'captcha_keypad') . '/css/captcha_keypad.css';
 }
diff --git a/css/captcha_keypad.css b/css/captcha_keypad.css
new file mode 100644
index 0000000..2b1108a
--- /dev/null
+++ b/css/captcha_keypad.css
@@ -0,0 +1,44 @@
+.captcha-keypad-wrapper .form-item,
+.captcha-keypad-wrapper .captcha-keypad {
+  float: left;
+  display: block;
+  margin: 5px;
+  min-height: 75px;
+  vertical-align: middle;
+}
+
+.captcha-keypad-wrapper .captcha-keypad span {
+  cursor: pointer;
+  border: 1px dotted gray;
+  width: 10px;
+  height: 10px;
+  display: inline-table;
+  margin: 2px 2px;
+  padding: 2px 6px;
+  font-family: Arial, Helvetica, sans-serif;
+}
+
+.captcha-keypad-wrapper .captcha-keypad .inner span:hover,
+.captcha-keypad-wrapper .clearbtn:hover {
+  background-color: rgb(207, 208, 208);
+}
+
+.captcha-keypad-wrapper .captcha-keypad .inner {
+  display: block;
+  width: 110px;
+  border: none;
+  height: auto;
+}
+
+#edit-captcha-keypad-input {
+  max-width: 70px;
+}
+
+.captcha-keypad-wrapper .clearbtn {
+  display: block;
+  cursor: pointer;
+  text-align: center;
+  margin-top:6px;
+  width:70px;
+  border: 1px dotted gray;
+}
diff --git a/js/captcha_keypad.js b/js/captcha_keypad.js
new file mode 100644
index 0000000..e272642
--- /dev/null
+++ b/js/captcha_keypad.js
@@ -0,0 +1,38 @@
+(function ($) {
+  Drupal.behaviors.captcha_keypad = {
+    attach: function (data, settings) {
+      jQuery(document).ready(function () {
+
+        jQuery('.captcha-keypad-keypad-used').val('');
+
+        jQuery('.captcha-keypad-input').val('').keyup(function () {
+          var wrapper = $(this).parent().parent().parent().parent();
+          var textfield = wrapper.find('.captcha-keypad-input');
+          var message = wrapper.find('.message');
+          textfield.val('');
+          message.css('color', 'red');
+          message.html(Drupal.t('Use keypad ->'));
+        });
+
+        jQuery('.form-item-captcha-keypad-input .clearbtn').click(function () {
+          var wrapper = jQuery(this).parent().parent().parent().parent();
+          var textfield = wrapper.find('.captcha-keypad-input');
+          var message = wrapper.find('.message');
+          textfield.val('');
+          message.html('');
+        });
+
+        jQuery('.captcha-keypad .inner span').once().click(function () {
+          var wrapper = jQuery(this).parent().parent().parent().parent();
+          var textfield = wrapper.find('.captcha-keypad-input');
+          var keypadused = wrapper.find('.captcha-keypad-keypad-used');
+          var message = wrapper.find('.message');
+          var value = textfield.val();
+          textfield.val(value + jQuery(this).text());
+          keypadused.val('Yes');
+          message.html('');
+        });
+      })
+    }
+  };
+})(jQuery);