diff --git a/coder_review/coder_review.module b/coder_review/coder_review.module
index 1eb106f..30db59a 100644
--- a/coder_review/coder_review.module
+++ b/coder_review/coder_review.module
@@ -190,6 +190,10 @@ function coder_review_menu_alter(&$items) {
 /**
  * Implements hook_form_alter().
  *
+ * @see theme_system_modules_fieldset()
+ * @see bartik_system_modules_fieldset()
+ *   This was added to modify the hard-coded foreach loop keys.
+ *
  * Modify the module display view by adding a Coder Review link to every
  * module description.
  */
@@ -199,14 +203,19 @@ function coder_review_form_alter(&$form, &$form_state, $form_id) {
       $form['#attached']['css'] = array(
         drupal_get_path('module', 'coder_review') . '/coder_review.css',
       );
-      foreach ($form['modules'] as $package => $modules) {
-        if (!preg_match('/^#/', $package)) {
-          foreach ($modules as $name => $data) {
-            if (!preg_match('/^#/', $name)) {
-              $description = $data['description']['#markup'];
-              $form['modules'][$package][$name]['description']['#markup'] = $description . ' (' . l(t('Code Review'), "admin/config/development/coder/review/$name") . ')';
-            }
-          }
+      foreach (element_children($form['modules']) as $package) {
+        $form['modules'][$package]['#header'][4] = array('data' => t('Operations'), 'colspan' => 1);
+        $modules = $form['modules'][$package];
+        foreach (element_children($modules) as $name) {
+//           $data = $modules[$name];
+          // Add an operation link.
+          $extra = array(
+            '#type' => 'link',
+            '#title' => t('Review'),
+            '#href' => "admin/config/development/coder/review/$name",
+            '#options' => array('attributes' => array('class' => array('module-link', 'module-link-review'), 'title' => t('Run Coder Review on module'))),
+          );
+          $form['modules'][$package][$name]['links']['review'] = $extra;
         }
       }
     }
