diff --git a/routes/_components/Layout.html b/routes/_components/Layout.html
index 6c0fad4..271edc2 100644
--- a/routes/_components/Layout.html
+++ b/routes/_components/Layout.html
@@ -1,90 +1,18 @@
-<:Window bind:innerHeight />
 <Nav :page :dynamicPage :dynamicHref :dynamicIcon :dynamicLabel/>
 
-<div class="container" on:scroll="onScroll(event)" on:fullscreen="onFullscreenChange()" ref:node>
+<VirtualListContainer>
   <main>
     <slot></slot>
   </main>
-</div>
+</VirtualListContainer>
 <script>
 	import Nav from './Nav.html';
-	import { virtualListStore } from '../_utils/virtualListStore'
-
-  import debounce from 'lodash/debounce'
-  import throttle from 'lodash/throttle'
-  import { isFullscreen, attachFullscreenListener, detachFullscreenListener } from '../_utils/fullscreen'
-  import { mark, stop } from '../_utils/marks'
-
-  const SCROLL_EVENT_DELAY = 300
-  const RESIZE_EVENT_DELAY = 700
+	import VirtualListContainer from './VirtualListContainer.html'
 
 	export default {
-	  oncreate() {
-      mark('onCreate Layout')
-      let node = this.refs.node
-      this.observe('innerHeight', debounce(() => {
-        // respond to window resize events
-        this.store.set({
-          offsetHeight: node.offsetHeight
-        })
-      }, RESIZE_EVENT_DELAY))
-	    this.store.set({
-        scrollTop: node.scrollTop,
-        scrollHeight: node.scrollHeight,
-        offsetHeight: node.offsetHeight
-      })
-      stop('onCreate Layout')
-    },
 		components: {
+		  VirtualListContainer,
 			Nav
-		},
-    store: () => virtualListStore,
-    events: {
-      scroll(node, callback) {
-        const onScroll = throttle(event => {
-          mark('onScroll')
-          if (this.get('fullscreen')) {
-            return
-          }
-          callback(event)
-          stop('onScroll')
-        }, SCROLL_EVENT_DELAY, {
-          leading: true,
-          trailing: true
-        })
-        node.addEventListener('scroll', onScroll)
-
-        return {
-          teardown() {
-            node.removeEventListener('scroll', onScroll)
-          }
-        }
-      },
-      fullscreen(node, callback) {
-        const onFullscreen = (() => {
-          callback()
-        })
-        attachFullscreenListener(onFullscreen)
-        return {
-          teardown() {
-            detachFullscreenListener(onFullscreen)
-          }
-        }
-      }
-    },
-    methods: {
-		  onScroll(event) {
-		    this.store.set({
-          scrollTop: event.target.scrollTop,
-          scrollHeight: event.target.scrollHeight
-        })
-      },
-      onFullscreenChange() {
-        mark('onFullscreenChange')
-        console.log('is fullscreen? ', isFullscreen())
-        this.set({ fullscreen: isFullscreen() })
-        stop('onFullscreenChange')
-      }
-    }
-	};
+		}
+	}
 </script>
\ No newline at end of file
diff --git a/routes/_components/VirtualListContainer.html b/routes/_components/VirtualListContainer.html
new file mode 100644
index 0000000..4027ede
--- /dev/null
+++ b/routes/_components/VirtualListContainer.html
@@ -0,0 +1,82 @@
+<:Window bind:innerHeight />
+<div class="container" on:scroll="onScroll(event)" on:fullscreen="onFullscreenChange()" ref:node>
+  <slot></slot>
+</div>
+<script>
+  import { virtualListStore } from '../_utils/virtualListStore'
+
+  import debounce from 'lodash/debounce'
+  import throttle from 'lodash/throttle'
+  import { isFullscreen, attachFullscreenListener, detachFullscreenListener } from '../_utils/fullscreen'
+  import { mark, stop } from '../_utils/marks'
+
+  const SCROLL_EVENT_DELAY = 300
+  const RESIZE_EVENT_DELAY = 700
+
+  export default {
+    oncreate() {
+      mark('onCreate VirtualListContainer')
+      let node = this.refs.node
+      this.observe('innerHeight', debounce(() => {
+        // respond to window resize events
+        this.store.set({
+          offsetHeight: node.offsetHeight
+        })
+      }, RESIZE_EVENT_DELAY))
+      this.store.set({
+        scrollTop: node.scrollTop,
+        scrollHeight: node.scrollHeight,
+        offsetHeight: node.offsetHeight
+      })
+      stop('onCreate VirtualListContainer')
+    },
+    store: () => virtualListStore,
+    events: {
+      scroll(node, callback) {
+        const onScroll = throttle(event => {
+          mark('onScroll')
+          if (this.get('fullscreen')) {
+            return
+          }
+          callback(event)
+          stop('onScroll')
+        }, SCROLL_EVENT_DELAY, {
+          leading: true,
+          trailing: true
+        })
+        node.addEventListener('scroll', onScroll)
+
+        return {
+          teardown() {
+            node.removeEventListener('scroll', onScroll)
+          }
+        }
+      },
+      fullscreen(node, callback) {
+        const onFullscreen = (() => {
+          callback()
+        })
+        attachFullscreenListener(onFullscreen)
+        return {
+          teardown() {
+            detachFullscreenListener(onFullscreen)
+          }
+        }
+      }
+    },
+    methods: {
+      onScroll(event) {
+        this.store.set({
+          scrollTop: event.target.scrollTop,
+          scrollHeight: event.target.scrollHeight
+        })
+      },
+      onFullscreenChange() {
+        mark('onFullscreenChange')
+        console.log('is fullscreen? ', isFullscreen())
+        this.set({ fullscreen: isFullscreen() })
+        stop('onFullscreenChange')
+      }
+    }
+  };
+</script>
\ No newline at end of file