diff --git a/core/modules/help/src/Controller/HelpController.php b/core/modules/help/src/Controller/HelpController.php
index e092589..a753ac8 100644
--- a/core/modules/help/src/Controller/HelpController.php
+++ b/core/modules/help/src/Controller/HelpController.php
@@ -56,7 +56,8 @@ public function helpMain() {
       '#attached' => array(
         'library' => ['help/help'],
       ),
-      '#markup' => '<h2>' . $this->t('Help topics') . '</h2><p>' . $this->t('Help is available on the following items:') . '</p>' . $this->helpLinksAsList(),
+      '#markup' => '<h2>' . $this->t('Help topics') . '</h2><p>' . $this->t('Help is available on the following items:') . '</p>',
+      'links' => $this->helpLinksAsList(),
     );
     return $output;
   }
@@ -81,16 +82,30 @@ protected function helpLinksAsList() {
     // Output pretty four-column list.
     $count = count($modules);
     $break = ceil($count / 4);
-    $output = '<div class="clearfix"><div class="layout-column quarter"><ul>';
+    $column = array(
+      '#type' => 'container',
+      'links' => array('#theme' => 'links'),
+      '#attributes' => array('class' => array('layout-column', 'quarter')),
+    );
+    $output = array(
+      '#prefix' => '<div class="clearfix">',
+      '#suffix' => '</div>',
+      0 => $column,
+    );
+
     $i = 0;
+    $current_column = 0;
     foreach ($modules as $module => $name) {
-      $output .= '<li>' . $this->l($name, new Url('help.page', array('name' => $module))) . '</li>';
+      $output[$current_column]['links']['#links'][] = array(
+        'title' => $name,
+        'url' => new Url('help.page', array('name' => $module)),
+      );
       if (($i + 1) % $break == 0 && ($i + 1) != $count) {
-        $output .= '</ul></div><div class="layout-column quarter"><ul>';
+        $current_column++;
+        $output[$current_column] = $column;
       }
       $i++;
     }
-    $output .= '</ul></div></div>';
 
     return $output;
   }