diff --git a/core/modules/system/system.admin.css b/core/modules/system/system.admin.css
index 957d3e0..5716d03 100644
--- a/core/modules/system/system.admin.css
+++ b/core/modules/system/system.admin.css
@@ -61,10 +61,55 @@ small .admin-link:after {
 #system-modules div.incompatible {
   font-weight: bold;
 }
+#system-modules td {
+  vertical-align: top;
+}
+#system-modules .module {
+  background: transparent url(../../misc/menu-collapsed.png) left 1.2em no-repeat;
+}
+#system-modules .expanded .module {
+  background: transparent url(../../misc/menu-expanded.png) left 1.2em no-repeat;
+}
+#system-modules label.module-name {
+  margin-left: 5px;
+}
+#system-modules label.module-name a {
+  color: #1d1d1d;
+  font-size: 1.15em;
+}
+#system-modules .description .inner {
+  color: #5c5c5b;
+  height: 20px;
+  line-height: 20px;
+  overflow: hidden; /* truncates descriptions if too long */
+}
+@media screen and (max-width: 40em) {
+  #system-modules .description .inner .text {
+    visibility: hidden;
+  }
+}
+#system-modules .description .version {
+}
+#system-modules .requirements {
+  padding: 5px 0;
+  max-width: 490px;
+}
+#system-modules .links {
+  overflow: hidden; /* prevents collapse */
+}
+#system-modules .checkbox {
+  margin: 0 5px;
+}
+#system-modules .checkbox label {
+  display: none;
+}
+#system-modules .checkbox .form-item {
+  margin-bottom: 0;
+}
 div.admin-requirements,
 div.admin-required {
   font-size: 0.9em;
-  color: #444;
+  color: #666;
 }
 span.admin-disabled {
   color: #800;
@@ -77,8 +122,10 @@ span.admin-missing {
 }
 a.module-link {
   display: block;
-  padding: 1px 0 1px 20px; /* LTR */
+  padding: 2px 20px; /* LTR */
   white-space: nowrap;
+  margin-top: 2px;
+  float: left; /* LTR */
 }
 a.module-link-help {
   background: url(../../misc/help.png) 0 50% no-repeat; /* LTR */
diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index 109c54b..0f64653 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -853,7 +853,7 @@ function system_modules($form, $form_state = array()) {
           $extra['disabled'] = TRUE;
         }
         elseif ($files[$requires]->status) {
-          $extra['requires'][$requires] = t('@module (<span class="admin-enabled">enabled</span>)', array('@module' => $requires_name));
+          $extra['requires'][$requires] = t('@module', array('@module' => $requires_name));
         }
         else {
           $extra['requires'][$requires] = t('@module (<span class="admin-disabled">disabled</span>)', array('@module' => $requires_name));
@@ -900,7 +900,7 @@ function system_modules($form, $form_state = array()) {
       // Hidden modules are unset already.
       if (isset($visible_files[$required_by])) {
         if ($files[$required_by]->status == 1 && $module->status == 1) {
-          $extra['required_by'][] = t('@module (<span class="admin-enabled">enabled</span>)', array('@module' => $files[$required_by]->info['name']));
+          $extra['required_by'][] = t('@module', array('@module' => $files[$required_by]->info['name']));
           $extra['disabled'] = TRUE;
         }
         else {
@@ -921,9 +921,7 @@ function system_modules($form, $form_state = array()) {
       '#header' => array(
         array('data' => t('Enabled'), 'class' => array('checkbox')),
         t('Name'),
-        array('data' => t('Version'), 'class' => array(RESPONSIVE_PRIORITY_MEDIUM)),
-        array('data' => t('Description'), 'class' => array(RESPONSIVE_PRIORITY_LOW)),
-        array('data' => t('Operations'), 'colspan' => 3),
+        array('data' => t('Description'), 'class' => array(RESPONSIVE_PRIORITY_MEDIUM)),
       ),
       // Ensure that the "Core" package fieldset comes first.
       '#weight' => $package == 'Core' ? -10 : NULL,
@@ -933,6 +931,7 @@ function system_modules($form, $form_state = array()) {
   // Lastly, sort all fieldsets by title.
   uasort($form['modules'], 'element_sort_by_title');
 
+  $form['#attached']['library'][] = array('system', 'drupal.system.modules');
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] = array(
     '#type' => 'submit',
@@ -2495,33 +2494,44 @@ function theme_system_modules_fieldset($variables) {
 
   // Individual table headers.
   $rows = array();
-  // Iterate through all the modules, which are
-  // children of this fieldset.
+  // Iterate through all the modules, which are children of this fieldset.
   foreach (element_children($form) as $key) {
-    // Stick it into $module for easier accessing.
+    // Stick the key into $module for easier access.
     $module = $form[$key];
+    // Create the row for the table.
     $row = array();
+    // Add the checkbox into the first cell.
     unset($module['enable']['#title']);
+    //$row[] = array('class' => array('checkbox'), 'data' => drupal_render($module['enable']));
     $row[] = array('class' => array('checkbox'), 'data' => drupal_render($module['enable']));
-    $label = '<label';
+    // Add the module label and expand/collapse functionalty.
+    $col2 = '<label';
     if (isset($module['enable']['#id'])) {
-      $label .= ' for="' . $module['enable']['#id'] . '"';
+      $col2 .= ' for="' . $module['enable']['#id'] . '"';
     }
-    $row[] = $label . '><strong>' . drupal_render($module['name']) . '</strong></label>';
-    $row[] = drupal_render($module['version']);
+    $col2 .= 'class="module-name" tabindex="0">' . drupal_render($module['name']) . '</label>';
+    $row[] = array('class' => array('module'), 'data' => $col2);
+
     // Add the description, along with any modules it requires.
-    $description = drupal_render($module['description']);
+    $col3 = '<div class="inner">';
+    if (!empty($module['version']['#markup'])) {
+      $col3 .= '<span class="version">' . drupal_render($module['version']) . ' - </span>';
+    }
+    $col3 .= '<span class="text">' . drupal_render($module['description']) . '</span></div>';
+    $col3 .= '  <div class="requirements">';
     if ($module['#requires']) {
-      $description .= '<div class="admin-requirements">' . t('Requires: !module-list', array('!module-list' => implode(', ', $module['#requires']))) . '</div>';
+      $col3 .= '<div class="admin-requirements">' . t('Requires: !module-list', array('!module-list' => implode(', ', $module['#requires']))) . '</div>';
     }
     if ($module['#required_by']) {
-      $description .= '<div class="admin-requirements">' . t('Required by: !module-list', array('!module-list' => implode(', ', $module['#required_by']))) . '</div>';
+      $col3 .= '<div class="admin-requirements">' . t('Required by: !module-list', array('!module-list' => implode(', ', $module['#required_by']))) . '</div>';
     }
-    $row[] = array('data' => $description, 'class' => array('description'));
-    // Display links (such as help or permissions) in their own columns.
+    $col3 .= '  </div>';
+
+    $col3 .= '  <div class="links">';
     foreach (array('help', 'permissions', 'configure') as $key) {
-      $row[] = array('data' => drupal_render($module['links'][$key]), 'class' => array($key));
+      $col3 .= drupal_render($module['links'][$key]);
     }
+    $row[] = $col3;
     $rows[] = $row;
   }
 
@@ -2738,6 +2748,10 @@ function system_date_time_formats() {
       $row[] = array('data' => l(t('delete'), 'admin/config/regional/date-time/formats/' . $format['dfid'] . '/delete'));
       $rows[] = $row;
     }
+    $col3 .= '  </div>';
+
+    $row[] = array('class' => array('description'), 'data' => $col3);
+
   }
 
   $build['date_formats_table'] = array(
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index b41bf08..6189076 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -1955,6 +1955,18 @@ function system_library_info() {
       array('system', 'jquery.once'),
     ),
   );
+  $libraries['drupal.system.modules'] = array(
+    'title' => 'System cron',
+    'version' => VERSION,
+    'js' => array(
+      drupal_get_path('module', 'system') . '/system.modules.js' => array(),
+    ),
+    'dependencies' => array(
+      array('system', 'jquery'),
+      array('system', 'drupal'),
+      array('system', 'jquery.once'),
+    ),
+  );
 
   return $libraries;
 }
diff --git a/core/modules/system/system.modules.js b/core/modules/system/system.modules.js
index 4c71796..9081627 100644
--- a/core/modules/system/system.modules.js
+++ b/core/modules/system/system.modules.js
@@ -10,29 +10,34 @@ $.extend(Drupal.settings, {
 });
 
  /**
-  * Show/hide the requirements information on modules page.
+  * Show/hide the requirements information on the modules page.
   */
 Drupal.behaviors.hideModuleInformation = {
   attach: function (context, settings) {
     var $table = $('#system-modules').once('expand-modules');
     var effect = settings.hideModules;
     if ($table.length) {
+      var $tbodies = $table.find('tbody');
       // Fancy animating.
-      $table.on('click', 'td.module', function (e) {
-        e.preventDefault();
-        var $tr = $(this).closest('tr');
-        $tr.toggleClass('expanded');
-        $tr.find('.requirements, .links')[effect.method](effect.args);
+      $tbodies.on('click keydown', 'tr', function (e) {
+        if (e.type === 'click' || (e.type === 'keydown' && e.keyCode === 13)) {
+          e.preventDefault();
+          var $tr = $(this);
+          $tr.toggleClass('expanded');
+          //$tr.find('.requirements, .links')[effect.method](effect.args);
+          $tr.find('.requirements, .links').toggle();
+        }
       });
       // Makes the whole cell a click target.
-      $table.on('click', 'td.checkbox', function (e) {
+      $tbodies.on('click', 'td.checkbox', function (e) {
+        e.stopPropagation();
         var input = $(this).find('input').get(0);
         if (!input.readOnly && !input.disabled) {
           input.checked = !input.checked;
         }
       });
       // Catch the event on the checkbox to avoid triggering previous handler.
-      $table.on('click', 'input', function (e) {
+      $tbodies.on('click', 'input', function (e) {
         e.stopPropagation();
       });
     }
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index 24b0035..45a6099 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -992,3 +992,33 @@ div.add-or-remove-shortcuts {
   color: #fff;
   border-radius: 8px;
 }
+
+/* Modules page */
+#system-modules fieldset {
+  border: 0;
+}
+#system-modules .fieldset-wrapper {
+  padding: 0;
+}
+#system-modules label {
+  font-weight: normal;
+}
+#system-modules table {
+  border: 0;
+}
+#system-modules tr.even,
+#system-modules tr.odd {
+  background: #f3f4ee;
+  border: 0;
+  border-bottom: 10px solid #fff;
+}
+#system-modules tr td:last-child {
+  border: 0;
+}
+#system-modules table th {
+  border: 0;
+  border-bottom: 10px solid #fff;
+}
+#system-modules .sticky-header th {
+  border: 0;
+}
