diff --git a/core/authorize.php b/core/authorize.php
index d033b7e..65495dd 100644
--- a/core/authorize.php
+++ b/core/authorize.php
@@ -121,8 +121,19 @@ function authorize_access_allowed() {
         \Drupal::l(t('Administration pages'), new Url('system.admin')),
         \Drupal::l(t('Front page'), new Url('<front>')),
       ));
+      $links[] = array(
+        'title' => t('Administration pages'),
+        'href' => 'admin',
+      );
+      $links[] = array(
+        'title' => t('Front page'),
+        'href' => '<front>',
+      );
     }
-
+    $heading = array(
+      'text' => t('Next steps'),
+      'level' => 'h3',
+    );
     $content['next_steps'] = array(
       '#theme' => 'item_list',
       '#items' => $links,
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index a1f2c3b..5dcb1c9 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -187,17 +187,33 @@ function node_entity_view_display_alter(EntityViewDisplayInterface $display, $co
  *   $result, or FALSE if there are no rows in $result.
  */
 function node_title_list(StatementInterface $result, $title = NULL) {
-  $items = array();
-  $num_rows = FALSE;
+  $links = array();
+  $has_rows = FALSE;
   foreach ($result as $row) {
     // Do not use $node->label() or $node->urlInfo() here, because we only have
     // database rows, not actual nodes.
+    $attributes = array();
+    if (!empty($node->comment_count)) {
+      $attributes = array('attributes' => array('title' => format_plural($node->comment_count, '1 comment', '@count comments')));
+    }  
     $options = !empty($row->comment_count) ? array('attributes' => array('title' => \Drupal::translation()->formatPlural($row->comment_count, '1 comment', '@count comments'))) : array();
-    $items[] = \Drupal::l($row->title, new Url('entity.node.canonical', ['node' => $row->nid], $options));
-    $num_rows = TRUE;
+    $links[] = array(
+      'title' => $node->title,
+      'href' => 'node/' . $node->nid,
+      'attributes' => $attributes,
+    );
+    $has_rows = TRUE;
   }
-
-  return $num_rows ? array('#theme' => 'item_list__node', '#items' => $items, '#title' => $title) : FALSE;
+    if ($has_rows) {
+    $heading = array(
+      'text' => $title,
+      'level' => 'h3',
+    );
+    return array('#theme' => 'links__node', '#links' => $links, '#heading' => $heading);
+  }
+  else {
+    return FALSE;
+  }  
 }
 
 /**
diff --git a/core/modules/statistics/src/Tests/StatisticsReportsTest.php b/core/modules/statistics/src/Tests/StatisticsReportsTest.php
index 3ec956a..a243409 100644
--- a/core/modules/statistics/src/Tests/StatisticsReportsTest.php
+++ b/core/modules/statistics/src/Tests/StatisticsReportsTest.php
@@ -45,7 +45,7 @@ function testPopularContentBlock() {
     // Get some page and check if the block is displayed.
     $this->drupalGet('user');
     $this->assertText('Popular content', 'Found the popular content block.');
-    $this->assertText("Today's", "Found today's popular content.");
+    $this->assertText(check_plain("Today's"), "Found today's popular content.");
     $this->assertText('All time', 'Found the all time popular content.');
     $this->assertText('Last viewed', 'Found the last viewed popular content.');
 
diff --git a/core/modules/toolbar/tests/modules/toolbar_test/toolbar_test.module b/core/modules/toolbar/tests/modules/toolbar_test/toolbar_test.module
index 9d4e89f..55a4ef8 100644
--- a/core/modules/toolbar/tests/modules/toolbar_test/toolbar_test.module
+++ b/core/modules/toolbar/tests/modules/toolbar_test/toolbar_test.module
@@ -32,11 +32,16 @@ function toolbar_test_toolbar() {
         'id' => 'toolbar-tray-testing',
       ),
       'content' => array(
-        '#theme' => 'item_list',
-        '#items' => array(
-          \Drupal::l(t('link 1'), new Url('<front>', [], array('attributes' => array('title' => 'Test link 1 title')))),
-          \Drupal::l(t('link 2'), new Url('<front>', [], array('attributes' => array('title' => 'Test link 2 title')))),
-          \Drupal::l(t('link 3'), new Url('<front>', [], array('attributes' => array('title' => 'Test link 3 title')))),
+        '#theme' => 'links',
+        '#links' => array(
+          array('title' => t('link 1'), 'href' => '<front>', 'attributes' => array('title' => 'Test link 1 title')),
+          array('title' => t('link 2'), 'href' => '<front>', 'attributes' => array('title' => 'Test link 2 title')),
+          array('title' => t('link 3'), 'href' => '<front>', 'attributes' => array('title' => 'Test link 3 title')),
+        ),
+        '#heading' => array(
+          'text' => t('Test tray'),
+          'level' => 'h2',
+          'class' => array('visually-hidden'), 
         ),
         '#attributes' => array(
           'class' => array('menu'),