diff --git a/src/demo/kitchenSink/components/views/Headings.ts b/src/demo/kitchenSink/components/views/Headings.ts
index eadff59..d3673a0 100644
--- a/src/demo/kitchenSink/components/views/Headings.ts
+++ b/src/demo/kitchenSink/components/views/Headings.ts
@@ -1,11 +1,11 @@
 const { h1, h2, h3, h4, h5, h6 } = require('cycle-snabbdom');
-import { Card, CardTitle, CardText } from '@eldarlabs/cycle-ui';
+import { CardText } from '@eldarlabs/cycle-ui';
+import { DemoCardView } from '../../../components/DemoCard';
 
 export function HeadingsView(sources: any) {
   return (
-    Card(sources, null, [
-      CardTitle(sources, { title: 'Headings' } ).DOM,
-      CardText(sources, null, [
+    DemoCardView(sources, 'Headings', [
+      CardText(sources, [
         h1('Heading 1'),
         h2('Heading 2'),
         h3('Heading 3'),
@@ -13,6 +13,6 @@ export function HeadingsView(sources: any) {
         h5('Heading 5'),
         h6('Heading 6'),
       ]).DOM,
-    ]).DOM
+    ])
   );
 }
diff --git a/src/demo/kitchenSink/components/views/Inputs.ts b/src/demo/kitchenSink/components/views/Inputs.ts
index 08e07d5..b2751b6 100644
--- a/src/demo/kitchenSink/components/views/Inputs.ts
+++ b/src/demo/kitchenSink/components/views/Inputs.ts
@@ -1,11 +1,11 @@
 const { h4 } = require('cycle-snabbdom');
-import { Card, CardTitle, CardText, Input } from '@eldarlabs/cycle-ui';
+import { CardText, Input } from '@eldarlabs/cycle-ui';
+import { DemoCardView } from '../../../components/DemoCard';
 
 export function InputsView(sources: any) {
   return (
-    Card(sources, null, [
-      CardTitle(sources, { title: 'Text Inputs' } ).DOM,
-      CardText(sources, null, [
+    DemoCardView(sources, 'Text Inputs', [
+      CardText(sources, [
         h4('Default Input (no properties)'),
         Input(sources).DOM,
         Input(sources, {
@@ -13,6 +13,6 @@ export function InputsView(sources: any) {
             maxLength: 10,
         }).DOM,
       ]).DOM,
-    ]).DOM
+    ])
   );
 }
diff --git a/src/demo/kitchenSink/components/views/Radios.ts b/src/demo/kitchenSink/components/views/Radios.ts
index d9aeba6..75429e1 100644
--- a/src/demo/kitchenSink/components/views/Radios.ts
+++ b/src/demo/kitchenSink/components/views/Radios.ts
@@ -1,10 +1,10 @@
 import { Card, CardTitle, CardActions, RadioButton, RadioGroup } from '@eldarlabs/cycle-ui';
+import { DemoCardView } from '../../../components/DemoCard';
 
 export function RadiosView(sources: any) {
   return (
-    Card(sources, null, [
-      CardTitle(sources, { title: 'Radios (Work in progress)' } ).DOM,
-      CardActions(sources, null, [
+    DemoCardView(sources, 'Radios (Work in progress)', [
+      CardActions(sources, [
         RadioButton(sources, {
           label: 'Radio Single',
           value: 'RadioSingle',
@@ -14,6 +14,6 @@ export function RadiosView(sources: any) {
           RadioButton(sources, { label: 'Radio is not easy', value: 'RadioHard', })
         ]).DOM,
       ]).DOM
-    ]).DOM
+    ])
   );
 }