diff --git a/botcha.admin.inc b/botcha.admin.inc
index fc1daf3..129d396 100644
--- a/botcha.admin.inc
+++ b/botcha.admin.inc
@@ -57,6 +57,13 @@ function botcha_admin_settings(&$form_state) {
   // Handle the button for resetting the BOTCHA statistics.
   // This is done here instead of in a submit handler because the button is
   // not a submitting button.
+  $form['botcha_statistics']['botcha_statistics_group']['botcha_statistics_reset'] = array(
+    '#type' => 'button',
+    '#value' => t('Reset BOTCHA statistics'),
+    '#submit' => array('botcha_statistics_reset'),
+    // Pull it down.
+    '#weight' => 100,
+  );
   if (isset($form_state['post']['op']) && $form_state['post']['op']
     == $form['botcha_statistics']['botcha_statistics_group']['botcha_statistics_reset']['#value']) {
     variable_set('botcha_form_passed_counter', 0);
@@ -76,11 +83,6 @@ function botcha_admin_settings(&$form_state) {
     . ($build_cnt > 0 ? ' ' . t('(!percent% of total !build_cnt processed)',
       array('!percent' => sprintf("%0.3f", 100 * $block_cnt / $build_cnt), '!build_cnt' => $build_cnt)) : ''),
   );
-  $form['botcha_statistics']['botcha_statistics_group']['botcha_statistics_reset'] = array(
-    '#type' => 'button',
-    '#value' => t('Reset BOTCHA statistics'),
-    '#submit' => array('botcha_statistics_reset'),
-  );
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save configuration'),
@@ -579,7 +581,7 @@ function theme_botcha_forms_form_botcha_forms($form) {
   foreach (element_children($form['botcha_forms']) as $id) {
     $row = array();
     foreach (element_children($form['botcha_forms'][$id]) as $col) {
-      $row[] = drupal_render($form['botcha_forms'][$id][$col]);
+      $row[$col] = drupal_render($form['botcha_forms'][$id][$col]);
     }
     $rows[$id] = $row;
   }
diff --git a/botcha.test b/botcha.test
index d3ba2b4..4b087bc 100644
--- a/botcha.test
+++ b/botcha.test
@@ -706,6 +706,30 @@ class BotchaAdminTestCase extends BotchaBaseWebTestCase {
   }
 
   /**
+   * Testing general BOTCHA admin functionality.
+   */
+  function testAdminGeneral() {
+    // Log in as admin
+    $this->drupalLogin($this->admin_user);
+    // Clean the environment.
+    Botcha::clean();
+    variable_set('botcha_form_passed_counter',  $pass_cnt = rand(0, 10000));
+    variable_set('botcha_form_blocked_counter', $block_cnt = rand(0, 10000));
+    $build_cnt = $pass_cnt + $block_cnt;
+    // Assert that the statistics is present.
+    $this->drupalGet('admin/user/botcha');
+    $this->assertText("Already {$block_cnt} blocked form submissions.", 'BOTCHA blocked count statistics is present', 'BOTCHA');
+    $percent = sprintf("%0.3f", 100 * $block_cnt / $build_cnt);
+    $this->assertText("({$percent}% of total {$build_cnt} processed)", 'BOTCHA total count statistics is present', 'BOTCHA');
+    // Reset BOTCHA statistics.
+    $this->drupalPost(NULL, array(), t('Reset BOTCHA statistics'));
+    // Assert that the statistics is reset.
+    $this->assertText("BOTCHA statistics have been reset.", "Message displayed", 'BOTCHA');
+    $this->assertText("Already 0 blocked form submissions.", 'BOTCHA blocked count statistics is reset', 'BOTCHA');
+    $this->assertNoText("({$percent}% of total {$build_cnt} processed)", 'BOTCHA total count statistics is reset', 'BOTCHA');
+  }
+
+  /**
    * Testing of the BOTCHA administration links.
    */
   function testBotchaAdminLinks() {