diff --git a/samples/SupportLeanbackShowcase/app/src/main/AndroidManifest.xml b/samples/SupportLeanbackShowcase/app/src/main/AndroidManifest.xml
index fbb349ef5..9182d7f56 100644
--- a/samples/SupportLeanbackShowcase/app/src/main/AndroidManifest.xml
+++ b/samples/SupportLeanbackShowcase/app/src/main/AndroidManifest.xml
@@ -34,7 +34,7 @@
         <activity
                 android:name=".app.page.PageAndListRowActivity"
                 android:exported="true"
-                android:theme="@style/Theme.Example.LeanbackLauncher"/>
+                android:theme="@style/Theme.Example.Leanback"/>
         <activity
             android:name=".app.wizard.WizardExampleActivity"
             android:exported="true"
diff --git a/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/details/ShadowRowPresenterSelector.java b/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/details/ShadowRowPresenterSelector.java
index 987365a87..7df3bf846 100644
--- a/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/details/ShadowRowPresenterSelector.java
+++ b/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/details/ShadowRowPresenterSelector.java
@@ -41,4 +41,12 @@ public class ShadowRowPresenterSelector extends PresenterSelector {
         if (row.useShadow()) return mShadowEnabledRowPresenter;
         return mShadowDisabledRowPresenter;
     }
+
+    @Override
+    public Presenter[] getPresenters() {
+        return new Presenter [] {
+                mShadowDisabledRowPresenter,
+                mShadowEnabledRowPresenter
+        };
+    }
 }
diff --git a/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/page/PageAndListRowFragment.java b/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/page/PageAndListRowFragment.java
index bb67b4400..7640de0c2 100644
--- a/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/page/PageAndListRowFragment.java
+++ b/samples/SupportLeanbackShowcase/app/src/main/java/android/support/v17/leanback/supportleanbackshowcase/app/page/PageAndListRowFragment.java
@@ -10,6 +10,7 @@ import android.support.v17.leanback.supportleanbackshowcase.app.details.ShadowRo
 import android.support.v17.leanback.supportleanbackshowcase.cards.presenters.CardPresenterSelector;
 import android.support.v17.leanback.supportleanbackshowcase.models.Card;
 import android.support.v17.leanback.supportleanbackshowcase.models.CardRow;
+import android.support.v17.leanback.supportleanbackshowcase.utils.CardListRow;
 import android.support.v17.leanback.supportleanbackshowcase.utils.Utils;
 import android.support.v17.leanback.widget.ArrayObjectAdapter;
 import android.support.v17.leanback.widget.HeaderItem;
@@ -180,7 +181,7 @@ public class PageAndListRowFragment extends BrowseFragment {
                 public void run() {
                     createRows();
                 }
-            }, 500);
+            }, 200);
 
             setAdapter(mRowsAdapter);
             setOnItemViewClickedListener(new OnItemViewClickedListener() {
@@ -215,7 +216,7 @@ public class PageAndListRowFragment extends BrowseFragment {
             }
 
             HeaderItem headerItem = new HeaderItem(cardRow.getTitle());
-            return new ListRow(headerItem, adapter);
+            return new CardListRow(headerItem, adapter, cardRow);
         }
     }
 }