diff --git a/src/Controller/FlagListBuilder.php b/src/Controller/FlagListBuilder.php
index 7b8dcaf..bdcd9c9 100644
--- a/src/Controller/FlagListBuilder.php
+++ b/src/Controller/FlagListBuilder.php
@@ -6,7 +6,7 @@
 
 namespace Drupal\flag\Controller;
 
-use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
+use Drupal\Core\Config\Entity\DraggableListBuilder;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\flag\FlagInterface;
 use Drupal\Core\Url;
@@ -14,7 +14,14 @@ use Drupal\Core\Url;
 /**
  * Provides a entity list page for Flags.
  */
-class FlagListBuilder extends ConfigEntityListBuilder {
+class FlagListBuilder extends DraggableListBuilder {
+
+   /**
+    * {@inheritdoc}
+    */
+   public function getFormId() {
+     return 'flag_list';
+   }
 
   /**
    * {@inheritdoc}
@@ -57,7 +64,9 @@ class FlagListBuilder extends ConfigEntityListBuilder {
       ];
     }
 
-    return rtrim($out, ', ');
+    return [
+      '#markup' => rtrim($out, ', '),
+    ];
   }
 
   /**
@@ -69,9 +78,13 @@ class FlagListBuilder extends ConfigEntityListBuilder {
 
     $row['roles'] = $this->getFlagRoles($entity);
 
-    $row['global'] = $entity->isGlobal() ? t('Yes') : t('No');
+    $row['global'] = [
+      '#markup' => $entity->isGlobal() ? t('Yes') : t('No'),
+    ];
 
-    $row['status'] = $entity->isEnabled() ? t('enabled') : t('disabled');
+    $row['status'] = [
+      '#markup' => $entity->isEnabled() ? t('enabled') : t('disabled'),
+    ];
 
     return $row + parent::buildRow($entity);
   }
diff --git a/src/Entity/Flag.php b/src/Entity/Flag.php
index 24f9550..b140445 100644
--- a/src/Entity/Flag.php
+++ b/src/Entity/Flag.php
@@ -35,6 +35,7 @@ use Drupal\flag\FlagInterface;
  *   entity_keys = {
  *     "id" = "id",
  *     "label" = "label",
+ *     "weight" = "weight"
  *   },
  *   config_export = {
  *     "id",