diff -u b/diff.services.yml b/diff.services.yml
--- b/diff.services.yml
+++ b/diff.services.yml
@@ -1,28 +1,28 @@
-services:
-  diff.route_subscriber:
-    class: Drupal\diff\Routing\RouteSubscriber
-    tags:
-      - { name: event_subscriber }
-
-  diff.diff.formatter:
-    class: Drupal\diff\DiffFormatter
-    arguments: ['@config.factory']
-
-  plugin.manager.diff.builder:
-    class: Drupal\diff\DiffBuilderManager
-    parent: default_plugin_manager
-    arguments: ['@entity_type.manager', '@config.factory']
-
-  diff.entity_parser:
-    class: Drupal\diff\DiffEntityParser
-    arguments: ['@plugin.manager.diff.builder', '@config.factory']
-
-  diff.breadcrumb:
-    class: Drupal\diff\DiffBreadcrumbBuilder
-    parent: system.breadcrumb.default
-    tags:
-      - { name: breadcrumb_builder, priority: 1000 }
-
-  diff.entity_comparison:
-    class: Drupal\diff\DiffEntityComparison
-    arguments: ['@config.factory', '@diff.diff.formatter','@plugin.manager.field.field_type', '@diff.entity_parser']
+services:
+  diff.route_subscriber:
+    class: Drupal\diff\Routing\RouteSubscriber
+    tags:
+      - { name: event_subscriber }
+
+  diff.diff.formatter:
+    class: Drupal\diff\DiffFormatter
+    arguments: ['@config.factory']
+
+  plugin.manager.diff.builder:
+    class: Drupal\diff\DiffBuilderManager
+    parent: default_plugin_manager
+    arguments: ['@entity_type.manager', '@config.factory']
+
+  diff.entity_parser:
+    class: Drupal\diff\DiffEntityParser
+    arguments: ['@plugin.manager.diff.builder', '@config.factory']
+
+  diff.breadcrumb:
+    class: Drupal\diff\DiffBreadcrumbBuilder
+    parent: system.breadcrumb.default
+    tags:
+      - { name: breadcrumb_builder, priority: 1000 }
+
+  diff.entity_comparison:
+    class: Drupal\diff\DiffEntityComparison
+    arguments: ['@config.factory', '@diff.diff.formatter','@plugin.manager.field.field_type', '@diff.entity_parser']
diff -u b/src/Controller/GenericRevisionController.php b/src/Controller/GenericRevisionController.php
--- b/src/Controller/GenericRevisionController.php
+++ b/src/Controller/GenericRevisionController.php
@@ -1,401 +1,402 @@
-<?php
-
-namespace Drupal\diff\Controller;
-
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Datetime\DateFormatter;
-use Drupal\Component\Render\FormattableMarkup;
-use Drupal\diff\DiffEntityComparison;
-use Drupal\Component\Utility\Xss;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Url;
-use Drupal\node\NodeInterface;
-
-/**
- * Base class for controllers that return responses on entity revision routes.
- */
-class GenericRevisionController extends ControllerBase {
-  /**
-   * The date service.
-   *
-   * @var \Drupal\Core\Datetime\DateFormatter
-   */
-  protected $date;
-
-  /**
-   * Wrapper object for reading simple configuration from diff.settings.yml.
-   */
-  protected $config;
-  /**
-   * Represents non breaking space HTML character entity marked as safe markup.
-   */
-  protected $nonBreakingSpace;
-
-  /**
-   * The entity comparison service for diff.
-   */
-  protected $entityComparison;
-
-  /**
-   * Constructs a GenericRevisionController object.
-   *
-   * @param DateFormatter $date
-   *   DateFormatter service.
-   * @param DiffEntityComparison $entityComparison
-   *   DiffEntityComparison service.
-   */
-  public function __construct(DateFormatter $date, DiffEntityComparison $entityComparison) {
-    $this->date = $date;
-    $this->config = $this->config('diff.settings');
-    $this->nonBreakingSpace = new FormattableMarkup('&nbsp;', array());
-    $this->entityComparison = $entityComparison;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-        $container->get('date.formatter'),
-        $container->get('diff.entity_comparison')
-    );
-  }
-
-  /**
-   * Get all the revision ids of given entity id.
-   *
-   * @param $storage
-   *   The entity storage manager.
-   * @param $entity_id
-   *   The entity to find revisions of.
-   *
-   * @return array
-   */
-  protected function getVids(EntityStorageInterface $storage, $entity_id) {
-    $result = $storage->getQuery()
-      ->allRevisions()
-      ->condition($storage->getEntityType()->getKey('id'), $entity_id)
-      ->execute();
-    $result_array = array_keys($result);
-    sort($result_array);
-    return $result_array;
-  }
-
-  /**
-   * Returns a table which shows the differences between two entity revisions.
-   *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
-   *   The route match.
-   * @param \Drupal\Core\Entity\EntityInterface $left_revision
-   *   The left revision.
-   * @param \Drupal\Core\Entity\EntityInterface $right_revision
-   *   The right revision.
-   * @param string $filter
-   *   If $filter == 'raw' raw text is compared (including html tags)
-   *   If filter == 'raw-plain' markdown function is applied to the text before comparison.
-   *
-   * @return array
-   *   Table showing the diff between the two entity revisions.
-   */
-  public function compareEntityRevisions(RouteMatchInterface $route_match, EntityInterface $left_revision, EntityInterface $right_revision, $filter) {
-    $entity_type_id = $left_revision->getEntityTypeId();
-    $entity = $route_match->getParameter($entity_type_id);
-    $diff_rows = array();
-    $build = array(
-      '#title' => $this->t('Changes to %title', ['%title' => $entity->label()]),
-    );
-    if (!in_array($filter, array('raw', 'raw-plain'))) {
-      $filter = 'raw';
-    }
-    elseif ($filter == 'raw-plain') {
-      $filter = 'raw_plain';
-    }
-
-    $entity_type_id = $entity->getEntityTypeId();
-    $storage = $this->entityTypeManager()->getStorage($entity_type_id);
-
-    // Get language from the entity context.
-    $langcode = $entity->language()->getId();
-
-    // Get left and right revision in current language.
-    $left_revision = $left_revision->getTranslation($langcode);
-    $right_revision = $right_revision->getTranslation($langcode);
-
-    $vids = [];
-    // Filter revisions of current translation and where the translation is
-    // affected.
-    foreach ($this->getVids($storage, $entity->id()) as $vid) {
-      $revision = $storage->loadRevision($vid);
-      if ($revision->hasTranslation($langcode) && $revision->getTranslation($langcode)->isRevisionTranslationAffected()) {
-        $vids[] = $vid;
-      }
-    }
-    $diff_rows[] = $this->buildRevisionsNavigation($entity, $vids, $left_revision->getRevisionId(), $right_revision->getRevisionId());
-    $diff_rows[] = $this->buildMarkdownNavigation($entity, $left_revision->getRevisionId(), $right_revision->getRevisionId(), $filter);
-    $diff_header = $this->buildTableHeader($left_revision, $right_revision);
-
-    // Perform comparison only if both entity revisions loaded successfully.
-    if ($left_revision != FALSE && $right_revision != FALSE) {
-      $fields = $this->entityComparison->compareRevisions($left_revision, $right_revision);
-      // Build the diff rows for each field and append the field rows
-      // to the table rows.
-      foreach ($fields as $field) {
-        $field_label_row = '';
-        if (!empty($field['#name'])) {
-          $field_label_row = array(
-            'data' => $this->t('%name', ['%name' => $field['#name']]),
-            'colspan' => 4,
-            'class' => array('field-name'),
-          );
-        }
-        $field_diff_rows = $this->entityComparison->getRows(
-          $field['#states'][$filter]['#left'],
-          $field['#states'][$filter]['#right']
-        );
-
-        // Add the field label to the table only if there are changes to that field.
-        if (!empty($field_diff_rows) && !empty($field_label_row)) {
-          $diff_rows[] = array($field_label_row);
-        }
-
-        // Add field diff rows to the table rows.
-        $diff_rows = array_merge($diff_rows, $field_diff_rows);
-      }
-
-      // Add the CSS for the diff.
-      $build['#attached']['library'][] = 'diff/diff.general';
-      $theme = $this->config->get('general_settings.theme');
-      if ($theme) {
-        if ($theme == 'default') {
-          $build['#attached']['library'][] = 'diff/diff.default';
-        }
-        elseif ($theme == 'github') {
-          $build['#attached']['library'][] = 'diff/diff.github';
-        }
-      }
-      // If the setting could not be loaded or is missing use the default theme.
-      elseif ($theme == NULL) {
-        $build['#attached']['library'][] = 'diff/diff.default';
-      }
-
-      $build['diff'] = array(
-        '#type' => 'table',
-        '#header' => $diff_header,
-        '#rows' => $diff_rows,
-        '#empty' => $this->t('No visible changes'),
-        '#attributes' => array(
-          'class' => array('diff'),
-        ),
-      );
-
-      if ($entity->hasLinkTemplate('version-history')) {
-        $build['back'] = array(
-          '#type' => 'link',
-          '#attributes' => array(
-            'class' => array(
-              'button',
-              'diff-button',
-            ),
-          ),
-          '#title' => $this->t('Back to Revision Overview'),
-          '#url' => Url::fromRoute("entity.$entity_type_id.version_history", [$entity_type_id => $entity->id()]),
-        );
-      }
-
-      return $build;
-    }
-    else {
-      // @todo When task 'Convert drupal_set_message() to a service' (2278383)
-      //   will be merged use the corresponding service instead.
-      drupal_set_message($this->t('Selected @label revisions could not be loaded.', ['@label' => $entity->getEntityType()->getLabel()]), 'error');
-    }
-  }
-
-  /**
-   * Build the header for the diff table.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $left_revision
-   *   Revision from the left hand side.
-   * @param \Drupal\Core\Entity\EntityInterface $right_revision
-   *   Revision from the right hand side.
-   *
-   * @return array
-   *   Header for Diff table.
-   */
-  protected function buildTableHeader(EntityInterface $left_revision, EntityInterface $right_revision) {
-    $entity_type_id = $left_revision->getEntityTypeId();
-    $revisions = array($left_revision, $right_revision);
-    $header = array();
-
-    foreach ($revisions as $revision) {
-      if ($revision instanceof EntityRevisionLogInterface || $revision instanceof NodeInterface) {
-        $revision_log = $this->nonBreakingSpace;
-
-        if ($revision instanceof EntityRevisionLogInterface) {
-          $revision_log = Xss::filter($revision->getRevisionLogMessage());
-        }
-        elseif ($revision instanceof NodeInterface) {
-          $revision_log = $revision->revision_log->value;
-        }
-        $username = array(
-          '#theme' => 'username',
-          '#account' => $revision->uid->entity,
-        );
-        $revision_date = $this->date->format($revision->getRevisionCreationTime(), 'short');
-        $route_name = $entity_type_id != 'node' ? "entity.$entity_type_id.revisions_diff" : 'entity.node.revision';
-        $revision_link = $this->t($revision_log . '@date', array(
-          '@date' => $this->l($revision_date, Url::fromRoute($route_name, array(
-            $entity_type_id => $revision->id(),
-            $entity_type_id . '_revision' => $revision->getRevisionId(),
-          ))),
-        ));
-      }
-      else {
-        $revision_link = $this->l($revision->label(), $revision->toUrl('revision'));
-      }
-
-      // @todo When theming think about where in the table to integrate this
-      //   link to the revision user. There is some issue about multi-line headers
-      //   for theme table.
-      // $header[] = array(
-      //   'data' => $this->t('by' . '!username', array('!username' => drupal_render($username))),
-      //   'colspan' => 1,
-      // );
-      $header[] = array(
-        'data' => array('#markup' => $this->nonBreakingSpace),
-        'colspan' => 1,
-      );
-      $header[] = array(
-        'data' => array('#markup' => $revision_link),
-        'colspan' => 1,
-      );
-    }
-
-    return $header;
-  }
-
-  /**
-   * Returns the navigation row for diff table.
-   */
-  protected function buildRevisionsNavigation(EntityInterface $entity, $vids, $left_vid, $right_vid) {
-    $revisions_count = count($vids);
-    $i = 0;
-
-    $row = array();
-    // Find the previous revision.
-    while ($left_vid > $vids[$i]) {
-      $i += 1;
-    }
-    if ($i != 0) {
-      // Second column.
-      $row[] = array(
-        'data' => $this->l(
-          $this->t('< Previous difference'), $this->diffRoute($entity, $vids[$i - 1], $left_vid)
-        ),
-        'colspan' => 2,
-        'class' => 'rev-navigation',
-      );
-    }
-    else {
-      // Second column.
-      $row[] = $this->nonBreakingSpace;
-    }
-    // Third column.
-    $row[] = $this->nonBreakingSpace;
-    // Find the next revision.
-    $i = 0;
-    while ($i < $revisions_count && $right_vid >= $vids[$i]) {
-      $i += 1;
-    }
-    if ($revisions_count != $i && $vids[$i - 1] != $vids[$revisions_count - 1]) {
-      // Forth column.
-      $row[] = array(
-        'data' => $this->l(
-          $this->t('Next difference >'), $this->diffRoute($entity, $right_vid, $vids[$i])
-        ),
-        'colspan' => 2,
-        'class' => 'rev-navigation',
-      );
-    }
-    else {
-      // Forth column.
-      $row[] = $this->nonBreakingSpace;
-    }
-
-    // If there are only 2 revision return an empty row.
-    if ($revisions_count == 2) {
-      return array();
-    }
-    else {
-      return $row;
-    }
-  }
-
-  /**
-   * Builds a table row with navigation between raw and raw-plain formats.
-   */
-  protected function buildMarkdownNavigation(EntityInterface $entity, $left_vid, $right_vid, $active_filter) {
-    $links['raw'] = array(
-      'title' => $this->t('Standard'),
-      'url' => $this->diffRoute($entity, $left_vid, $right_vid),
-    );
-    $links['raw_plain'] = array(
-      'title' => $this->t('Markdown'),
-      'url' => $this->diffRoute($entity, $left_vid, $right_vid, 'raw-plain'),
-    );
-
-    // Set as the first element the current filter.
-    $filter = $links[$active_filter];
-    unset($links[$active_filter]);
-    array_unshift($links, $filter);
-
-    $row[] = array(
-      'data' => array(
-        '#type' => 'operations',
-        '#links' => $links,
-      ),
-      'colspan' => 4,
-    );
-
-    return $row;
-  }
-
-  /**
-   * Creates an url object for diff.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity to be compared.
-   * @param $left_vid
-   *   Vid of the left revision.
-   * @param $right_vid
-   *   Vid of the right revision.
-   * @param $filter
-   *   (optional) The filter added to the route.
-   *
-   * @return \Drupal\Core\Url
-   *   The URL object.
-   */
-  protected function diffRoute(EntityInterface $entity, $left_vid, $right_vid, $filter = NULL) {
-    $entity_type_id = $entity->getEntityTypeId();
-    // @todo Remove the diff.revisions_diff route so we avoid adding extra cases.
-    if ($entity->getEntityTypeId() == 'node') {
-      $route_name = 'diff.revisions_diff';
-    }
-    else {
-      $route_name = "entity.$entity_type_id.revisions_diff";
-    }
-    $route_parameters = [
-      $entity_type_id => $entity->id(),
-      'left_revision' => $left_vid,
-      'right_revision' => $right_vid,
-    ];
-    if ($filter) {
-      $route_parameters['filter'] = $filter;
-    }
-    return Url::fromRoute($route_name, $route_parameters);
-  }
-
-}
+<?php
+
+namespace Drupal\diff\Controller;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Datetime\DateFormatter;
+use Drupal\Component\Render\FormattableMarkup;
+use Drupal\diff\DiffEntityComparison;
+use Drupal\Component\Utility\Xss;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Url;
+use Drupal\node\NodeInterface;
+
+/**
+ * Base class for controllers that return responses on entity revision routes.
+ */
+class GenericRevisionController extends ControllerBase {
+
+  /**
+   * The date service.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatter
+   */
+  protected $date;
+
+  /**
+   * Wrapper object for writing/reading configuration from diff.plugins.yml
+   */
+  protected $config;
+
+  /**
+   * Represents non breaking space HTML character entity marked as safe markup.
+   */
+  protected $nonBreakingSpace;
+
+  /**
+   * The diff entity comparison service.
+   */
+  protected $entityComparison;
+
+  /**
+   * Constructs a GenericRevisionController object.
+   *
+   * @param DateFormatter $date
+   *   DateFormatter service.
+   * @param DiffEntityComparison $entityComparison
+   *   DiffEntityComparison service.
+   */
+  public function __construct(DateFormatter $date, DiffEntityComparison $entityComparison) {
+    $this->date = $date;
+    $this->config = $this->config('diff.settings');
+    $this->nonBreakingSpace = new FormattableMarkup('&nbsp;', array());
+    $this->entityComparison = $entityComparison;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+        $container->get('date.formatter'),
+        $container->get('diff.entity_comparison')
+    );
+  }
+
+  /**
+   * Get all the revision ids of given entity id.
+   *
+   * @param $storage
+   *   The entity storage manager.
+   * @param $entity_id
+   *   The entity to find revisions of.
+   *
+   * @return array
+   */
+  protected function getVids(EntityStorageInterface $storage, $entity_id) {
+    $result = $storage->getQuery()
+      ->allRevisions()
+      ->condition($storage->getEntityType()->getKey('id'), $entity_id)
+      ->execute();
+    $result_array = array_keys($result);
+    sort($result_array);
+    return $result_array;
+  }
+
+  /**
+   * Returns a table which shows the differences between two entity revisions.
+   *
+   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   *   The route match.
+   * @param \Drupal\Core\Entity\EntityInterface $left_revision
+   *   The left revision.
+   * @param \Drupal\Core\Entity\EntityInterface $right_revision
+   *   The right revision.
+   * @param string $filter
+   *   If $filter == 'raw' raw text is compared (including html tags)
+   *   If filter == 'raw-plain' markdown function is applied to the text before comparison.
+   *
+   * @return array
+   *   Table showing the diff between the two entity revisions.
+   */
+  public function compareEntityRevisions(RouteMatchInterface $route_match, EntityInterface $left_revision, EntityInterface $right_revision, $filter) {
+    $entity_type_id = $left_revision->getEntityTypeId();
+    $entity = $route_match->getParameter($entity_type_id);
+    $diff_rows = array();
+    $build = array(
+      '#title' => $this->t('Changes to %title', ['%title' => $entity->label()]),
+    );
+    if (!in_array($filter, array('raw', 'raw-plain'))) {
+      $filter = 'raw';
+    }
+    elseif ($filter == 'raw-plain') {
+      $filter = 'raw_plain';
+    }
+
+    $entity_type_id = $entity->getEntityTypeId();
+    $storage = $this->entityTypeManager()->getStorage($entity_type_id);
+
+    // Get language from the entity context.
+    $langcode = $entity->language()->getId();
+
+    // Get left and right revision in current language.
+    $left_revision = $left_revision->getTranslation($langcode);
+    $right_revision = $right_revision->getTranslation($langcode);
+
+    $vids = [];
+    // Filter revisions of current translation and where the translation is
+    // affected.
+    foreach ($this->getVids($storage, $entity->id()) as $vid) {
+      $revision = $storage->loadRevision($vid);
+      if ($revision->hasTranslation($langcode) && $revision->getTranslation($langcode)->isRevisionTranslationAffected()) {
+        $vids[] = $vid;
+      }
+    }
+    $diff_rows[] = $this->buildRevisionsNavigation($entity, $vids, $left_revision->getRevisionId(), $right_revision->getRevisionId());
+    $diff_rows[] = $this->buildMarkdownNavigation($entity, $left_revision->getRevisionId(), $right_revision->getRevisionId(), $filter);
+    $diff_header = $this->buildTableHeader($left_revision, $right_revision);
+
+    // Perform comparison only if both entity revisions loaded successfully.
+    if ($left_revision != FALSE && $right_revision != FALSE) {
+      $fields = $this->entityComparison->compareRevisions($left_revision, $right_revision);
+      // Build the diff rows for each field and append the field rows
+      // to the table rows.
+      foreach ($fields as $field) {
+        $field_label_row = '';
+        if (!empty($field['#name'])) {
+          $field_label_row = array(
+            'data' => $this->t('%name', ['%name' => $field['#name']]),
+            'colspan' => 4,
+            'class' => array('field-name'),
+          );
+        }
+        $field_diff_rows = $this->entityComparison->getRows(
+          $field['#states'][$filter]['#left'],
+          $field['#states'][$filter]['#right']
+        );
+
+        // Add the field label to the table only if there are changes to that field.
+        if (!empty($field_diff_rows) && !empty($field_label_row)) {
+          $diff_rows[] = array($field_label_row);
+        }
+
+        // Add field diff rows to the table rows.
+        $diff_rows = array_merge($diff_rows, $field_diff_rows);
+      }
+
+      // Add the CSS for the diff.
+      $build['#attached']['library'][] = 'diff/diff.general';
+      $theme = $this->config->get('general_settings.theme');
+      if ($theme) {
+        if ($theme == 'default') {
+          $build['#attached']['library'][] = 'diff/diff.default';
+        }
+        elseif ($theme == 'github') {
+          $build['#attached']['library'][] = 'diff/diff.github';
+        }
+      }
+      // If the setting could not be loaded or is missing use the default theme.
+      elseif ($theme == NULL) {
+        $build['#attached']['library'][] = 'diff/diff.default';
+      }
+
+      $build['diff'] = array(
+        '#type' => 'table',
+        '#header' => $diff_header,
+        '#rows' => $diff_rows,
+        '#empty' => $this->t('No visible changes'),
+        '#attributes' => array(
+          'class' => array('diff'),
+        ),
+      );
+
+      if ($entity->hasLinkTemplate('version-history')) {
+        $build['back'] = array(
+          '#type' => 'link',
+          '#attributes' => array(
+            'class' => array(
+              'button',
+              'diff-button',
+            ),
+          ),
+          '#title' => $this->t('Back to Revision Overview'),
+          '#url' => Url::fromRoute("entity.$entity_type_id.version_history", [$entity_type_id => $entity->id()]),
+        );
+      }
+
+      return $build;
+    }
+    else {
+      // @todo When task 'Convert drupal_set_message() to a service' (2278383)
+      //   will be merged use the corresponding service instead.
+      drupal_set_message($this->t('Selected @label revisions could not be loaded.', ['@label' => $entity->getEntityType()->getLabel()]), 'error');
+    }
+  }
+
+  /**
+   * Build the header for the diff table.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $left_revision
+   *   Revision from the left hand side.
+   * @param \Drupal\Core\Entity\EntityInterface $right_revision
+   *   Revision from the right hand side.
+   *
+   * @return array
+   *   Header for Diff table.
+   */
+  protected function buildTableHeader(EntityInterface $left_revision, EntityInterface $right_revision) {
+    $entity_type_id = $left_revision->getEntityTypeId();
+    $revisions = array($left_revision, $right_revision);
+    $header = array();
+
+    foreach ($revisions as $revision) {
+      if ($revision instanceof EntityRevisionLogInterface || $revision instanceof NodeInterface) {
+        $revision_log = $this->nonBreakingSpace;
+
+        if ($revision instanceof EntityRevisionLogInterface) {
+          $revision_log = Xss::filter($revision->getRevisionLogMessage());
+        }
+        elseif ($revision instanceof NodeInterface) {
+          $revision_log = $revision->revision_log->value;
+        }
+        $username = array(
+          '#theme' => 'username',
+          '#account' => $revision->uid->entity,
+        );
+        $revision_date = $this->date->format($revision->getRevisionCreationTime(), 'short');
+        $route_name = $entity_type_id != 'node' ? "entity.$entity_type_id.revisions_diff" : 'entity.node.revision';
+        $revision_link = $this->t($revision_log . '@date', array(
+          '@date' => $this->l($revision_date, Url::fromRoute($route_name, [
+            $entity_type_id => $revision->id(),
+            $entity_type_id . '_revision' => $revision->getRevisionId(),
+          ])),
+        ));
+      }
+      else {
+        $revision_link = $this->l($revision->label(), $revision->toUrl('revision'));
+      }
+
+      // @todo When theming think about where in the table to integrate this
+      //   link to the revision user. There is some issue about multi-line headers
+      //   for theme table.
+      // $header[] = array(
+      //   'data' => $this->t('by' . '!username', array('!username' => drupal_render($username))),
+      //   'colspan' => 1,
+      // );
+      $header[] = array(
+        'data' => array('#markup' => $this->nonBreakingSpace),
+        'colspan' => 1,
+      );
+      $header[] = array(
+        'data' => array('#markup' => $revision_link),
+        'colspan' => 1,
+      );
+    }
+
+    return $header;
+  }
+
+  /**
+   * Returns the navigation row for diff table.
+   */
+  protected function buildRevisionsNavigation(EntityInterface $entity, $vids, $left_vid, $right_vid) {
+    $revisions_count = count($vids);
+    $i = 0;
+
+    $row = array();
+    // Find the previous revision.
+    while ($left_vid > $vids[$i]) {
+      $i += 1;
+    }
+    if ($i != 0) {
+      // Second column.
+      $row[] = array(
+        'data' => $this->l(
+          $this->t('< Previous difference'), $this->diffRoute($entity, $vids[$i - 1], $left_vid)
+        ),
+        'colspan' => 2,
+        'class' => 'rev-navigation',
+      );
+    }
+    else {
+      // Second column.
+      $row[] = $this->nonBreakingSpace;
+    }
+    // Third column.
+    $row[] = $this->nonBreakingSpace;
+    // Find the next revision.
+    $i = 0;
+    while ($i < $revisions_count && $right_vid >= $vids[$i]) {
+      $i += 1;
+    }
+    if ($revisions_count != $i && $vids[$i - 1] != $vids[$revisions_count - 1]) {
+      // Forth column.
+      $row[] = array(
+        'data' => $this->l(
+          $this->t('Next difference >'), $this->diffRoute($entity, $right_vid, $vids[$i])
+        ),
+        'colspan' => 2,
+        'class' => 'rev-navigation',
+      );
+    }
+    else {
+      // Forth column.
+      $row[] = $this->nonBreakingSpace;
+    }
+
+    // If there are only 2 revision return an empty row.
+    if ($revisions_count == 2) {
+      return array();
+    }
+    else {
+      return $row;
+    }
+  }
+
+  /**
+   * Builds a table row with navigation between raw and raw-plain formats.
+   */
+  protected function buildMarkdownNavigation(EntityInterface $entity, $left_vid, $right_vid, $active_filter) {
+    $links['raw'] = array(
+      'title' => $this->t('Standard'),
+      'url' => $this->diffRoute($entity, $left_vid, $right_vid),
+    );
+    $links['raw_plain'] = array(
+      'title' => $this->t('Markdown'),
+      'url' => $this->diffRoute($entity, $left_vid, $right_vid, 'raw-plain'),
+    );
+
+    // Set as the first element the current filter.
+    $filter = $links[$active_filter];
+    unset($links[$active_filter]);
+    array_unshift($links, $filter);
+
+    $row[] = array(
+      'data' => array(
+        '#type' => 'operations',
+        '#links' => $links,
+      ),
+      'colspan' => 4,
+    );
+
+    return $row;
+  }
+
+  /**
+   * Creates an url object for diff.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity to be compared.
+   * @param $left_vid
+   *   Vid of the left revision.
+   * @param $right_vid
+   *   Vid of the right revision.
+   * @param $filter
+   *   (optional) The filter added to the route.
+   *
+   * @return \Drupal\Core\Url
+   *   The URL object.
+   */
+  protected function diffRoute(EntityInterface $entity, $left_vid, $right_vid, $filter = NULL) {
+    $entity_type_id = $entity->getEntityTypeId();
+    // @todo Remove the diff.revisions_diff route so we avoid adding extra cases.
+    if ($entity->getEntityTypeId() == 'node') {
+      $route_name = 'diff.revisions_diff';
+    }
+    else {
+      $route_name = "entity.$entity_type_id.revisions_diff";
+    }
+    $route_parameters = [
+      $entity_type_id => $entity->id(),
+      'left_revision' => $left_vid,
+      'right_revision' => $right_vid,
+    ];
+    if ($filter) {
+      $route_parameters['filter'] = $filter;
+    }
+    return Url::fromRoute($route_name, $route_parameters);
+  }
+}
diff -u b/src/DiffEntityComparison.php b/src/DiffEntityComparison.php
--- b/src/DiffEntityComparison.php
+++ b/src/DiffEntityComparison.php
@@ -16,26 +16,21 @@
 class DiffEntityComparison {
 
   /**
-   * Drupal\Core\Config\ConfigFactory definition.
+   * Contains the configuration object factory.
    *
-   * @var Drupal\Core\Config\ConfigFactory
+   * @var \Drupal\Core\Config\ConfigFactoryInterface
    */
-  protected $configfactory;
+  protected $configFactory;
 
   /**
-   * Wrapper obj. for write/read a simple configuration from diff.settings.yml.
-   */
-  public $config;
-
-  /**
-   * Wrapper object for write/read a simple configuration from diff.plugins.yml.
+   * Wrapper object for writing/reading simple configuration from diff.plugins.yml
    */
   protected $pluginsConfig;
 
   /**
-   * DiffFormatter service.
+   * The diff formatter.
    *
-   * @var \Drupal\diff\DiffFormatter
+   * @var \Drupal\Core\Diff\DiffFormatter
    */
   protected $diffFormatter;
 
@@ -45,7 +40,9 @@
   protected $fieldTypeDefinitions;
 
   /**
-   * The entity comparison service for diff.
+   * The entity parser.
+   *
+   * @var \Drupal\diff\DiffEntityParser
    */
   protected $entityParser;
 
@@ -62,9 +59,8 @@
    *   The diff field builder plugin manager.
    */
   public function __construct(ConfigFactory $config_factory, DiffFormatter $diff_formatter, PluginManagerInterface $plugin_manager, DiffEntityParser $entity_parser) {
-    $this->configfactory = $config_factory;
-    $this->config = $this->configfactory->get('diff.settings');
-    $this->pluginsConfig = $this->configfactory->get('diff.plugins');
+    $this->configFactory = $config_factory;
+    $this->pluginsConfig = $this->configFactory->get('diff.plugins');
     $this->diffFormatter = $diff_formatter;
     $this->fieldTypeDefinitions = $plugin_manager->getDefinitions();
     $this->entityParser = $entity_parser;
@@ -197,7 +193,7 @@
    *   The source string to compare from.
    * @param string $b
    *   The target string to compare to.
-   * @param bool $show_header
+   * @param boolean $show_header
    *   Display diff context headers. For example, "Line x".
    * @param array $line_stats
    *   This structure tracks line numbers across multiple calls to DiffFormatter.