diff --git a/pmd-jbuilder/lib/PMDOpenTool.jar b/pmd-jbuilder/lib/PMDOpenTool.jar
index dc03dd88b5..f8ec00ce8b 100644
Binary files a/pmd-jbuilder/lib/PMDOpenTool.jar and b/pmd-jbuilder/lib/PMDOpenTool.jar differ
diff --git a/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/AcceleratorPropertyPage.java b/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/AcceleratorPropertyPage.java
index 060d0fc891..f9a3d5532f 100644
--- a/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/AcceleratorPropertyPage.java
+++ b/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/AcceleratorPropertyPage.java
@@ -34,13 +34,15 @@ public class AcceleratorPropertyPage extends PropertyPage {
     private JLabel jLabel1 = new JLabel();
     private JComboBox jComboBox1 = new JComboBox();
     private JPanel jPanel2 = new JPanel();
-    private JTextField jTextField1 = new JTextField();
     int keycode;
     int modifiers;
     private FlowLayout flowLayout1 = new FlowLayout();
     private JTextField jTextField2 = new JTextField();
     private JTextField jTextField3 = new JTextField();
     private VerticalFlowLayout verticalFlowLayout1 = new VerticalFlowLayout();
+    private JPanel jPanel3 = new JPanel();
+    private JLabel jLabel2 = new JLabel();
+    private JLabel jLabel3 = new JLabel();
 
     /**
      * Constuctor
@@ -63,18 +65,25 @@ public class AcceleratorPropertyPage extends PropertyPage {
         this.setLayout(verticalFlowLayout1);
         jLabel1.setText("Select the Action");
         jPanel2.setLayout(flowLayout1);
-        jTextField2.setPreferredSize(new Dimension(50, 21));
-        jTextField2.setEditable(false);
-        jTextField3.setPreferredSize(new Dimension(50, 21));
+        jTextField2.setPreferredSize(new Dimension(60, 21));
+        jTextField3.setEnabled(false);
+        jTextField3.setPreferredSize(new Dimension(60, 21));
         jTextField3.setEditable(false);
-        jTextField1.setPreferredSize(new Dimension(50, 21));
+        jLabel2.setPreferredSize(new Dimension(60, 17));
+        jLabel2.setHorizontalAlignment(SwingConstants.CENTER);
+        jLabel2.setText("Mod");
+        jLabel3.setPreferredSize(new Dimension(60, 17));
+        jLabel3.setHorizontalAlignment(SwingConstants.CENTER);
+        jLabel3.setText("Key");
         this.add(jPanel1, null);
         jPanel1.add(jLabel1, null);
         jPanel1.add(jComboBox1, null);
+        this.add(jPanel3, null);
+        jPanel3.add(jLabel2, null);
+        jPanel3.add(jLabel3, null);
         this.add(jPanel2, null);
-        jPanel2.add(jTextField1, null);
-        jPanel2.add(jTextField2, null);
         jPanel2.add(jTextField3, null);
+        jPanel2.add(jTextField2, null);
     }
 
 
@@ -82,8 +91,9 @@ public class AcceleratorPropertyPage extends PropertyPage {
      * non-Jbuilder specific initialization stuff
      */
     private void init2() {
-        jTextField1.addKeyListener(new KeyAdapter() {
-
+        jComboBox1.addItem("Check File");
+        jComboBox1.addItem("Check Project");
+        jTextField2.addKeyListener(new KeyAdapter() {
              public void keyPressed(KeyEvent e)
              {
                  keycode = e.getKeyCode();
@@ -92,7 +102,7 @@ public class AcceleratorPropertyPage extends PropertyPage {
                  {
                      jTextField2.setText(KeyEvent.getKeyText(keycode));
                      jTextField3.setText(KeyEvent.getKeyModifiersText(modifiers));
-                     jTextField1.setText("");
+                     //jTextField2.setText("");
 
                  }
              }
@@ -101,7 +111,7 @@ public class AcceleratorPropertyPage extends PropertyPage {
              {
                  jTextField2.setText(KeyEvent.getKeyText(keycode));
                  jTextField3.setText(KeyEvent.getKeyModifiersText(modifiers));
-                 jTextField1.setText("");
+                 //jTextField2.setText("");
              }
 
         });