diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php
index ddbeb6c..e1c5de5 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php
@@ -167,7 +167,7 @@ public function buildForm(array $form, array &$form_state) {
     $form['actions']['submit'] = array(
       '#type' => 'submit',
       '#value' => t('Save order'),
-      '#submit' => array(array($this, 'submit')),
+      '#submit' => array(array($this, 'submitForm')),
       '#button_type' => 'primary',
     );
 
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeListController.php b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeListController.php
index 8ef270c..c504dd4 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeListController.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeListController.php
@@ -20,7 +20,7 @@ class CustomBlockTypeListController extends ConfigEntityListController {
    */
   public function getOperations(EntityInterface $entity) {
     $operations = parent::getOperations($entity);
-    if (module_exists('field_ui')) {
+    if ($this->moduleHandler->moduleExists('field_ui')) {
       $uri = $entity->uri();
       $operations['manage-fields'] = array(
         'title' => t('Manage fields'),
diff --git a/core/modules/contact/lib/Drupal/contact/CategoryListController.php b/core/modules/contact/lib/Drupal/contact/CategoryListController.php
index 5b4d175..3442298 100644
--- a/core/modules/contact/lib/Drupal/contact/CategoryListController.php
+++ b/core/modules/contact/lib/Drupal/contact/CategoryListController.php
@@ -8,6 +8,7 @@
 
 use Drupal\Core\Config\Entity\ConfigEntityListController;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Component\Utility\String;
 
 /**
  * Provides a listing of contact categories.
@@ -53,8 +54,8 @@ public function buildHeader() {
     // first ones.
     // @todo Simplify this http://drupal.org/node/1876718
     return array_slice($row, 0, 1, TRUE) + array(
-      'selected' => t('Selected'),
       'recipients' => t('Recipients'),
+      'selected' => t('Selected'),
     ) + array_slice($row, 0, NULL, TRUE);
   }
 
@@ -65,12 +66,12 @@ public function buildRow(EntityInterface $entity) {
     $default_category = config('contact.settings')->get('default_category');
     // Add own columns.
     return parent::buildRow($entity) + array(
+      'recipients' => array(
+        '#markup' => ($entity->id() == 'personal' ? t('Selected user') : String::checkPlain(implode(', ', $entity->recipients))),
+      ),
       'selected' => array(
         '#markup' => ($default_category == $entity->id() && $entity->id() != 'personal' ? t('Yes') : t('No')),
       ),
-      'recipients' => array(
-        '#markup' => check_plain(implode(', ', $entity->recipients)),
-      ),
     );
   }