diff --git a/demos/interactive/card-deck.php b/demos/collection/card-deck.php
similarity index 100%
rename from demos/interactive/card-deck.php
rename to demos/collection/card-deck.php
diff --git a/demos/init-app.php b/demos/init-app.php
index 72bb3ea54c..3946355a2e 100644
--- a/demos/init-app.php
+++ b/demos/init-app.php
@@ -62,7 +62,7 @@
     $path = $demosUrl . 'layout/';
     $menu = $layout->addMenuGroup(['Layout', 'icon' => 'object group']);
     $layout->addMenuItem(['Layouts'], [$path . 'layouts'], $menu);
-    $layout->addMenuItem(['Panel'], [$path . 'layout-panel'], $menu);
+    $layout->addMenuItem(['Sliding Panel'], [$path . 'layout-panel'], $menu);
 
     $path = $demosUrl . 'basic/';
     $menu = $layout->addMenuGroup(['Basics', 'icon' => 'cubes']);
@@ -111,9 +111,9 @@
     $layout->addMenuItem('Grid - Table+Bar+Search+Paginator', [$path . 'grid'], $menu);
     $layout->addMenuItem('Crud - Full editing solution', [$path . 'crud'], $menu);
     $layout->addMenuItem(['Crud with Array Persistence'], [$path . 'crud3'], $menu);
+    $layout->addMenuItem('Card Deck', [$path . 'card-deck'], $menu);
     $layout->addMenuItem(['Lister'], [$path . 'lister-ipp'], $menu);
     $layout->addMenuItem(['Table column decorator from model'], [$path . 'tablecolumns'], $menu);
-    $layout->addMenuItem(['Drag n Drop sorting'], [$path . 'jssortable'], $menu);
 
     $path = $demosUrl . 'data-action/';
     $menu = $layout->addMenuGroup(['Data Action Executor', 'icon' => 'wrench']);
@@ -139,6 +139,7 @@
     $layout->addMenuItem(['Pop-up'], [$path . 'popup'], $menu);
     $layout->addMenuItem(['Toast'], [$path . 'toast'], $menu);
     $layout->addMenuItem('Paginator', [$path . 'paginator'], $menu);
+    $layout->addMenuItem(['Drag n Drop sorting'], [$path . 'jssortable'], $menu);
 
     $path = $demosUrl . 'javascript/';
     $menu = $layout->addMenuGroup(['Javascript', 'icon' => 'code']);
diff --git a/demos/collection/jssortable.php b/demos/interactive/jssortable.php
similarity index 100%
rename from demos/collection/jssortable.php
rename to demos/interactive/jssortable.php
diff --git a/src/Card.php b/src/Card.php
index a3f31cb6a4..43830eed43 100644
--- a/src/Card.php
+++ b/src/Card.php
@@ -335,8 +335,6 @@ public function addClickAction(Model\UserAction $action, $button = null, $args =
      */
     public function addExtraFields(Model $model, $fields, $glue = null)
     {
-        $this->setModel($model, false);
-
         // display extra field in line.
         if ($glue) {
             $extra = '';