diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index aaffcdc..041a0f8 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -152,10 +152,7 @@ function aggregator_menu() {
   $items['aggregator/categories/%aggregator_category'] = array(
     'title callback' => '_aggregator_category_title',
     'title arguments' => array(2),
-    'page callback' => 'aggregator_page_category',
-    'page arguments' => array(2),
-    'access arguments' => array('access news feeds'),
-    'file' => 'aggregator.pages.inc',
+    'route_name' => 'aggregator_category_view',
   );
   $items['aggregator/categories/%aggregator_category/view'] = array(
     'title' => 'View',
@@ -175,10 +172,7 @@ function aggregator_menu() {
   $items['aggregator/sources/%aggregator_feed'] = array(
     'title callback' => 'entity_page_label',
     'title arguments' => array(2),
-    'page callback' => 'aggregator_page_source',
-    'page arguments' => array(2),
-    'access arguments' => array('access news feeds'),
-    'file' => 'aggregator.pages.inc',
+    'route_name' => 'aggregator_feed_view',
   );
   $items['aggregator/sources/%aggregator_feed/view'] = array(
     'title' => 'View',
diff --git a/core/modules/aggregator/aggregator.pages.inc b/core/modules/aggregator/aggregator.pages.inc
index 86f8be3..2a8e5f7 100644
--- a/core/modules/aggregator/aggregator.pages.inc
+++ b/core/modules/aggregator/aggregator.pages.inc
@@ -9,49 +9,6 @@
 use Drupal\Core\Entity\EntityInterface;
 
 /**
- * Page callback: Displays all the items captured from the particular feed.
- *
- * @param \Drupal\aggregator\Entity\Feed $feed
- *   The feed for which to display all items.
- *
- * @return string
- *   The rendered list of items for the feed.
- *
- * @see aggregator_menu()
- */
-function aggregator_page_source(Feed $feed) {
-  $feed_source = entity_view($feed, 'default');
-
-  // It is safe to include the fid in the query because it's loaded from the
-  // database by aggregator_feed_load().
-  $items = aggregator_load_feed_items('source', $feed);
-
-  return _aggregator_page_list($items, arg(3), $feed_source);
-}
-
-/**
- * Form constructor to list items aggregated in a category.
- *
- * @param $category
- *   The category for which to list all of the aggregated items.
- *
- * @return string
- *   The rendered list of items for the feed.
- *
- * @see aggregator_menu()
- * @ingroup forms
- */
-function aggregator_page_category($category) {
-  drupal_add_feed('aggregator/rss/' . $category->cid, Drupal::config('system.site')->get('name') . ' ' . t('aggregator - @title', array('@title' => $category->title)));
-
-  // It is safe to include the cid in the query because it's loaded from the
-  // database by aggregator_category_load().
-  $items = aggregator_load_feed_items('category', $category);
-
-  return _aggregator_page_list($items, arg(3));
-}
-
-/**
  * Loads and optionally filters feed items.
  *
  * @param string $type
@@ -94,36 +51,6 @@ function aggregator_load_feed_items($type, $data = NULL, $limit = 20) {
 }
 
 /**
- * Prints an aggregator page listing a number of feed items.
- *
- * Various menu callbacks use this function to print their feeds.
- *
- * @param $items
- *   The items to be listed.
- * @param $op
- *   Which form should be added to the items. Only 'categorize' is now
- *   recognized.
- * @param $feed_source
- *   The feed source URL.
- *
- * @return
- *   The rendered list of items for the feed.
- */
-function _aggregator_page_list($items, $op, $feed_source = '') {
-  // Assemble output.
-  $build = array(
-    '#type' => 'container',
-    '#attributes' => array('class' => array('aggregator-wrapper')),
-  );
-  $build['feed_source'] = is_array($feed_source) ? $feed_source : array('#markup' => $feed_source);
-  if ($items) {
-    $build['items'] = entity_view_multiple($items, 'default');
-    $build['pager'] = array('#theme' => 'pager');
-  }
-  return $build;
-}
-
-/**
  * Default theme implementation to present a linked feed item for summaries.
  *
  * @param $variables
diff --git a/core/modules/aggregator/aggregator.routing.yml b/core/modules/aggregator/aggregator.routing.yml
index 57da7ee..1e314c2 100644
--- a/core/modules/aggregator/aggregator.routing.yml
+++ b/core/modules/aggregator/aggregator.routing.yml
@@ -1,12 +1,12 @@
 aggregator_admin_overview:
-  pattern: 'admin/config/services/aggregator'
+  pattern: '/admin/config/services/aggregator'
   defaults:
     _content: '\Drupal\aggregator\Controller\AggregatorController::adminOverview'
   requirements:
     _permission: 'administer news feeds'
 
 aggregator_admin_settings:
-  pattern: 'admin/config/services/aggregator/settings'
+  pattern: '/admin/config/services/aggregator/settings'
   defaults:
     _form: '\Drupal\aggregator\Form\SettingsForm'
   requirements:
@@ -34,14 +34,14 @@ aggregator_feed_add:
     _permission: 'administer news feeds'
 
 aggregator_feed_configure:
-  pattern: 'aggregator/sources/{aggregator_feed}/configure'
+  pattern: '/aggregator/sources/{aggregator_feed}/configure'
   defaults:
     _entity_form: 'aggregator_feed.default'
   requirements:
     _permission: 'administer news feeds'
 
 aggregator_feed_edit:
-  pattern: 'admin/config/services/aggregator/edit/feed/{aggregator_feed}'
+  pattern: '/admin/config/services/aggregator/edit/feed/{aggregator_feed}'
   defaults:
     _entity_form: 'aggregator_feed.default'
   requirements:
@@ -61,6 +61,13 @@ aggregator_opml_add:
   requirements:
     _permission: 'administer news feeds'
 
+aggregator_feed_view:
+  pattern: '/aggregator/sources/{aggregator_feed}'
+  defaults:
+    _content: '\Drupal\aggregator\Controller\AggregatorController::viewFeed'
+  requirements:
+    _permission: 'access news feeds'
+
 aggregator_page_last:
   pattern: '/aggregator'
   defaults:
@@ -82,29 +89,36 @@ aggregator_categories:
   requirements:
     _access_aggregator_categories: 'TRUE'
 
+aggregator_category_view:
+  pattern: '/aggregator/categories/{cid}'
+  defaults:
+    _content: '\Drupal\aggregator\Controller\AggregatorController::viewCategory'
+  requirements:
+    _permission: 'access news feeds'
+
 aggregator_category_edit:
-  pattern: 'aggregator/categories/{cid}/configure'
+  pattern: '/aggregator/categories/{cid}/configure'
   defaults:
     _form: '\Drupal\aggregator\Form\CategoryAdminForm'
   requirements:
     _permission: 'administer news feeds'
 
 aggregator_category_admin_edit:
-  pattern: 'admin/config/services/aggregator/edit/category/{cid}'
+  pattern: '/admin/config/services/aggregator/edit/category/{cid}'
   defaults:
     _form: '\Drupal\aggregator\Form\CategoryAdminForm'
   requirements:
     _permission: 'administer news feeds'
 
 aggregator_category_delete:
-  pattern: 'admin/config/services/aggregator/delete/category/{cid}'
+  pattern: '/admin/config/services/aggregator/delete/category/{cid}'
   defaults:
     _form: '\Drupal\aggregator\Form\CategoryDeleteForm'
   requirements:
     _permission: 'administer news feeds'
 
 aggregator_category_add:
-  pattern: 'admin/config/services/aggregator/add/category'
+  pattern: '/admin/config/services/aggregator/add/category'
   defaults:
     _form: '\Drupal\aggregator\Form\CategoryAdminForm'
   requirements:
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php b/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php
index 0873ded..cd239b5 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php
@@ -7,78 +7,46 @@
 
 namespace Drupal\aggregator\Controller;
 
-use Drupal\aggregator\FeedInterface;
-use Drupal\Core\Config\ConfigFactory;
+use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\aggregator\CategoryStorageControllerInterface;
+use Drupal\aggregator\FeedInterface;
+use Drupal\aggregator\ItemInterface;
 use Drupal\Core\Database\Connection;
-use Drupal\Core\Entity\EntityManager;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Routing\UrlGeneratorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
 /**
  * Returns responses for aggregator module routes.
  */
-class AggregatorController implements ContainerInjectionInterface {
-
-  /**
-   * Stores the Entity manager.
-   *
-   * @var \Drupal\Core\Entity\EntityManager
-   */
-  protected $entityManager;
-
-  /**
-   * The configuration factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactory
-   */
-  protected $configFactory;
+class AggregatorController extends ControllerBase implements ContainerInjectionInterface {
 
   /**
    * The database connection.
    *
    * @var \Drupal\Core\Database\Connection;
    */
-  protected $database;
+  protected $connection;
 
   /**
-   * The module handler.
+   * The category storage controller.
    *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   * @var \Drupal\aggregator\CategoryStorageControllerInterface
    */
-  protected $moduleHandler;
-
-  /**
-   * The url generator.
-   *
-   * @var \Drupal\Core\Routing\UrlGeneratorInterface
-   */
-  protected $urlGenerator;
+  protected $categoryStorage;
 
   /**
    * Constructs a \Drupal\aggregator\Controller\AggregatorController object.
    *
-   * @param \Drupal\Core\Entity\EntityManager $entity_manager
-   *   The Entity manager.
-   * @param \Drupal\Core\Config\ConfigFactory $config_factory
-   *   The config factory.
-   * @param \Drupal\Core\Database\Connection $database
+   * @param \Drupal\Core\Database\Connection $connection
    *   The database connection.
-   * @param \Drupal\Core\Config\ConfigFactory $config_factory
-   *   The config factory.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler.
+   * @param \Drupal\aggregator\CategoryStorageControllerInterface $category_storage
+   *   The category storage service.
    */
-  public function __construct(EntityManager $entity_manager, Connection $database, ConfigFactory $config_factory, ModuleHandlerInterface $module_handler, UrlGeneratorInterface $url_generator) {
-    $this->entityManager = $entity_manager;
-    $this->database = $database;
-    $this->configFactory = $config_factory;
-    $this->moduleHandler = $module_handler;
-    $this->urlGenerator = $url_generator;
+  public function __construct(Connection $connection, CategoryStorageControllerInterface $category_storage) {
+    $this->connection = $connection;
+    $this->categoryStorage = $category_storage;
   }
 
   /**
@@ -86,11 +54,8 @@ public function __construct(EntityManager $entity_manager, Connection $database,
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager'),
       $container->get('database'),
-      $container->get('config.factory'),
-      $container->get('module_handler'),
-      $container->get('url_generator')
+      $container->get('aggregator.category.storage')
     );
   }
 
@@ -101,13 +66,76 @@ public static function create(ContainerInterface $container) {
    *   A form array as expected by drupal_render().
    */
   public function feedAdd() {
-    $feed = $this->entityManager
+    $feed = $this->entityManager()
       ->getStorageController('aggregator_feed')
       ->create(array(
         'refresh' => 3600,
         'block' => 5,
       ));
-    return $this->entityManager->getForm($feed);
+    return $this->entityManager()->getForm($feed);
+  }
+
+  /**
+   * Displays all the items captured from the particular feed.
+   *
+   * @param \Drupal\aggregator\FeedInterface $aggregator_feed
+   *   The feed for which to display all items.
+   *
+   * @return array
+   *   The rendered list of items for the feed.
+   */
+  public function viewFeed(FeedInterface $aggregator_feed) {
+    $feed_source = $this->entityManager()->getRenderController('aggregator_feed')
+      ->view($aggregator_feed, 'default');
+    // Load aggregator feed item for the particular feed id.
+    $items = $this->entityManager()->getStorageController('aggregator_item')->loadByFeed($aggregator_feed->id());
+    // Print the feed items.
+    $build = $this->buildPageList($items, $feed_source);
+    $build['#title'] = $aggregator_feed->label();
+    return $build;
+  }
+
+  /**
+   * Displays feed items aggregated in a category.
+   *
+   * @param int $cid
+   *   The category id for which to list all of the aggregated items.
+   *
+   * @return array
+   *   The render array with list of items for the feed.
+   */
+  public function viewCategory($cid) {
+    $category = $this->categoryStorage->load($cid);
+    $items = $this->entityManager()->getStorageController('aggregator_item')->loadByCategory($cid);
+    $build = $this->buildPageList($items);
+    $build['#title'] = $category->title;
+    return $build;
+  }
+
+  /**
+   * Builds a listing of aggregator feed items.
+   *
+   * @param \Drupal\aggregator\ItemInterface[] $items
+   *   The items to be listed.
+   * @param array|string $feed_source
+   *   The feed source URL.
+   *
+   * @return array
+   *   The rendered list of items for the feed.
+   */
+  protected function buildPageList(array $items, $feed_source = '') {
+    // Assemble output.
+    $build = array(
+      '#type' => 'container',
+      '#attributes' => array('class' => array('aggregator-wrapper')),
+    );
+    $build['feed_source'] = is_array($feed_source) ? $feed_source : array('#markup' => $feed_source);
+    if ($items) {
+      $build['items'] = $this->entityManager()->getRenderController('aggregator_item')
+        ->viewMultiple($items, 'default');
+      $build['pager'] = array('#theme' => 'pager');
+    }
+    return $build;
   }
 
   /**
@@ -135,7 +163,7 @@ public function feedRefresh(FeedInterface $aggregator_feed, Request $request) {
 
     // @todo after https://drupal.org/node/1972246 find a new place for it.
     aggregator_refresh($aggregator_feed);
-    return new RedirectResponse($this->urlGenerator->generateFromPath('admin/config/services/aggregator', array('absolute' => TRUE)));
+    return $this->redirect('aggregator_admin_overview');
   }
 
   /**
@@ -145,31 +173,31 @@ public function feedRefresh(FeedInterface $aggregator_feed, Request $request) {
    *   A render array as expected by drupal_render().
    */
   public function adminOverview() {
-    $result = $this->database->query('SELECT f.fid, f.title, f.url, f.refresh, f.checked, f.link, f.description, f.hash, f.etag, f.modified, f.image, f.block, COUNT(i.iid) AS items FROM {aggregator_feed} f LEFT JOIN {aggregator_item} i ON f.fid = i.fid GROUP BY f.fid, f.title, f.url, f.refresh, f.checked, f.link, f.description, f.hash, f.etag, f.modified, f.image, f.block ORDER BY f.title');
+    $result = $this->connection->query('SELECT f.fid, f.title, f.url, f.refresh, f.checked, f.link, f.description, f.hash, f.etag, f.modified, f.image, f.block, COUNT(i.iid) AS items FROM {aggregator_feed} f LEFT JOIN {aggregator_item} i ON f.fid = i.fid GROUP BY f.fid, f.title, f.url, f.refresh, f.checked, f.link, f.description, f.hash, f.etag, f.modified, f.image, f.block ORDER BY f.title');
 
-    $header = array(t('Title'), t('Items'), t('Last update'), t('Next update'), t('Operations'));
+    $header = array(t('Title'), $this->t('Items'), $this->t('Last update'), $this->t('Next update'), $this->t('Operations'));
     $rows = array();
     foreach ($result as $feed) {
       $row = array();
       $row[] = l($feed->title, "aggregator/sources/$feed->fid");
       $row[] = format_plural($feed->items, '1 item', '@count items');
-      $row[] = ($feed->checked ? t('@time ago', array('@time' => format_interval(REQUEST_TIME - $feed->checked))) : t('never'));
-      $row[] = ($feed->checked && $feed->refresh ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - REQUEST_TIME))) : t('never'));
+      $row[] = ($feed->checked ? $this->t('@time ago', array('@time' => format_interval(REQUEST_TIME - $feed->checked))) : $this->t('never'));
+      $row[] = ($feed->checked && $feed->refresh ? $this->t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - REQUEST_TIME))) : $this->t('never'));
       $links = array();
       $links['edit'] = array(
-        'title' => t('Edit'),
+        'title' => $this->t('Edit'),
         'href' => "admin/config/services/aggregator/edit/feed/$feed->fid",
       );
       $links['delete'] = array(
-        'title' => t('Delete'),
+        'title' => $this->t('Delete'),
         'href' => "admin/config/services/aggregator/delete/feed/$feed->fid",
       );
       $links['remove'] = array(
-        'title' => t('Remove items'),
+        'title' => $this->t('Remove items'),
         'href' => "admin/config/services/aggregator/remove/$feed->fid",
       );
       $links['update'] = array(
-        'title' => t('Update items'),
+        'title' => $this->t('Update items'),
         'href' => "admin/config/services/aggregator/update/$feed->fid",
         'query' => array('token' => drupal_get_token("aggregator/update/$feed->fid")),
       );
@@ -182,16 +210,16 @@ public function adminOverview() {
       $rows[] = $row;
     }
     $build['feeds'] = array(
-      '#prefix' => '<h3>' . t('Feed overview') . '</h3>',
+      '#prefix' => '<h3>' . $this->t('Feed overview') . '</h3>',
       '#theme' => 'table',
       '#header' => $header,
       '#rows' => $rows,
-      '#empty' => t('No feeds available. <a href="@link">Add feed</a>.', array('@link' => $this->urlGenerator->generateFromPath('admin/config/services/aggregator/add/feed'))),
+      '#empty' => $this->t('No feeds available. <a href="@link">Add feed</a>.', array('@link' => $this->urlGenerator()->generateFromPath('admin/config/services/aggregator/add/feed'))),
     );
 
-    $result = $this->database->query('SELECT c.cid, c.title, COUNT(ci.iid) as items FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid GROUP BY c.cid, c.title ORDER BY title');
+    $result = $this->connection->query('SELECT c.cid, c.title, COUNT(ci.iid) as items FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid GROUP BY c.cid, c.title ORDER BY title');
 
-    $header = array(t('Title'), t('Items'), t('Operations'));
+    $header = array(t('Title'), $this->t('Items'), $this->t('Operations'));
     $rows = array();
     foreach ($result as $category) {
       $row = array();
@@ -199,11 +227,11 @@ public function adminOverview() {
       $row[] = format_plural($category->items, '1 item', '@count items');
       $links = array();
       $links['edit'] = array(
-        'title' => t('Edit'),
+        'title' => $this->t('Edit'),
         'href' => "admin/config/services/aggregator/edit/category/$category->cid",
       );
       $links['delete'] = array(
-        'title' => t('Delete'),
+        'title' => $this->t('Delete'),
         'href' => "admin/config/services/aggregator/delete/category/$category->cid",
       );
       $row[] = array(
@@ -215,11 +243,11 @@ public function adminOverview() {
       $rows[] = $row;
     }
     $build['categories'] = array(
-      '#prefix' => '<h3>' . t('Category overview') . '</h3>',
+      '#prefix' => '<h3>' . $this->t('Category overview') . '</h3>',
       '#theme' => 'table',
       '#header' => $header,
       '#rows' => $rows,
-      '#empty' => t('No categories available. <a href="@link">Add category</a>.', array('@link' => $this->urlGenerator->generateFromPath('admin/config/services/aggregator/add/category'))),
+      '#empty' => $this->t('No categories available. <a href="@link">Add category</a>.', array('@link' => $this->urlGenerator()->generateFromPath('admin/config/services/aggregator/add/category'))),
     );
 
     return $build;
@@ -232,25 +260,23 @@ public function adminOverview() {
    *   A render array.
    */
   public function categories() {
-    // @todo Refactor this once all controller conversions are complete.
-    $this->moduleHandler->loadInclude('aggregator', 'inc', 'aggregator.pages');
-
-    $result = $this->database->query('SELECT c.cid, c.title, c.description FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid LEFT JOIN {aggregator_item} i ON ci.iid = i.iid GROUP BY c.cid, c.title, c.description');
+    $result = $this->connection->query('SELECT c.cid, c.title, c.description FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid LEFT JOIN {aggregator_item} i ON ci.iid = i.iid GROUP BY c.cid, c.title, c.description');
 
     $build = array(
       '#type' => 'container',
       '#attributes' => array('class' => array('aggregator-wrapper')),
       '#sorted' => TRUE,
     );
-    $aggregator_summary_items = $this->configFactory->get('aggregator.settings')->get('source.list_max');
+    $aggregator_summary_items = $this->config('aggregator.settings')->get('source.list_max');
     foreach ($result as $category) {
       $summary_items = array();
       if ($aggregator_summary_items) {
-        if ($items = aggregator_load_feed_items('category', $category, $aggregator_summary_items)) {
-          $summary_items = $this->entityManager->getRenderController('aggregator_item')->viewMultiple($items, 'summary');
+        $items = $this->entityManager()->getStorageController('aggregator_item')->loadByCategory($category->cid);
+        if ($items) {
+          $summary_items = $this->entityManager()->getRenderController('aggregator_item')->viewMultiple($items, 'summary');
         }
       }
-      $category->url = $this->urlGenerator->generateFromPath('aggregator/categories/' . $category->cid);
+      $category->url = $this->urlGenerator()->generateFromPath('aggregator/categories/' . $category->cid);
       $build[$category->cid] = array(
         '#theme' => 'aggregator_summary_items',
         '#summary_items' => $summary_items,
@@ -267,16 +293,10 @@ public function categories() {
    *   The rendered list of items for the feed.
    */
   public function pageLast() {
-    drupal_add_feed('aggregator/rss', $this->configFactory->get('system.site')->get('name') . ' ' . t('aggregator'));
-
-    // @todo Refactor this function once after all controller conversions are
-    // done.
-    $this->moduleHandler->loadInclude('aggregator', 'inc', 'aggregator.pages');
-    $items = aggregator_load_feed_items('sum');
+    drupal_add_feed('aggregator/rss', $this->config('system.site')->get('name') . ' ' . $this->t('aggregator'));
 
-    // @todo Refactor this function once after all controller conversions are
-    // done.
-    return _aggregator_page_list($items, arg(1));
+    $items = $this->entityManager()->getStorageController('aggregator_item')->loadAll();
+    return $this->buildPageList($items);
   }
 
   /**
@@ -287,7 +307,7 @@ public function pageLast() {
    */
   public function sources() {
 
-    $feeds = $this->entityManager->getStorageController('aggregator_feed')->loadMultiple();
+    $feeds = $this->entityManager()->getStorageController('aggregator_feed')->loadMultiple();
 
     $build = array(
       '#type' => 'container',
@@ -295,24 +315,20 @@ public function sources() {
       '#sorted' => TRUE,
     );
 
-    // @todo remove this once aggregator_load_feed_items() is refactored after
-    // http://drupal.org/node/15266 is in.
-    $this->moduleHandler->loadInclude('aggregator', 'inc', 'aggregator.pages');
-
     foreach ($feeds as $feed) {
       // Most recent items:
       $summary_items = array();
-      $aggregator_summary_items = $this->configFactory
-        ->get('aggregator.settings')
+      $aggregator_summary_items = $this->config('aggregator.settings')
         ->get('source.list_max');
       if ($aggregator_summary_items) {
-        if ($items = aggregator_load_feed_items('source', $feed, $aggregator_summary_items)) {
-          $summary_items = $this->entityManager
+        $items = $this->entityManager()->getStorageController('aggregator_item')->loadByFeed($feed->id());
+        if ($items) {
+          $summary_items = $this->entityManager()
             ->getRenderController('aggregator_item')
             ->viewMultiple($items, 'summary');
         }
       }
-      $feed->url = $this->urlGenerator->generateFromPath('aggregator/sources/' . $feed->id());
+      $feed->url = $this->urlGenerator()->generateFromRoute('aggregator_feed_view', array('aggregator_feed' => $feed->id()));
       $build[$feed->id()] = array(
         '#theme' => 'aggregator_summary_items',
         '#summary_items' => $summary_items,
@@ -322,7 +338,7 @@ public function sources() {
     $build['feed_icon'] = array(
       '#theme' => 'feed_icon',
       '#url' => 'aggregator/opml',
-      '#title' => t('OPML feed'),
+      '#title' => $this->t('OPML feed'),
     );
     return $build;
   }