diff --git a/src/components/App.jsx b/src/components/App.jsx
index ac12e14..f876253 100644
--- a/src/components/App.jsx
+++ b/src/components/App.jsx
@@ -1,13 +1,11 @@
 import '../scss/main.scss'
 import React from 'react'
-import Dashboard from './Dashboard.jsx'
+import Layout from './Layout'
 
 class App extends React.Component {
   render () {
     return (
-      <div>
-        <Dashboard />
-      </div>
+      <Layout />
     )
   }
 }
diff --git a/src/components/Dashboard.jsx b/src/components/Layout.js
similarity index 97%
rename from src/components/Dashboard.jsx
rename to src/components/Layout.js
index 133b744..8a26dd8 100644
--- a/src/components/Dashboard.jsx
+++ b/src/components/Layout.js
@@ -4,8 +4,8 @@ import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import * as actions from '../actions'
 
-import SourceOverlay from './SourceOverlay.jsx'
-import LoadingOverlay from './presentational/LoadingOverlay'
+import MediaOverlay from './Overlay/Media'
+import LoadingOverlay from './Overlay/Loading'
 import Map from './Map.jsx'
 import Toolbar from './Toolbar.jsx'
 import CardStack from './CardStack.jsx'
@@ -171,7 +171,7 @@ class Dashboard extends React.Component {
           onToggle={actions.markNotificationsRead}
         />
         {app.source ? (
-          <SourceOverlay
+          <MediaOverlay
             source={app.source}
             onCancel={() => {
               actions.updateSource(null)
diff --git a/src/components/Overlay/Content.js b/src/components/Overlay/Content.js
new file mode 100644
index 0000000..9c1db50
--- /dev/null
+++ b/src/components/Overlay/Content.js
@@ -0,0 +1,61 @@
+import React from 'react'
+import { Player } from 'video-react'
+import Img from 'react-image'
+import Md from './Md'
+import Spinner from '../presentational/Spinner'
+import NoSource from '../presentational/NoSource'
+
+export default ({ media, viewIdx }) => {
+  const el = document.querySelector(`.source-media-gallery`)
+  const shiftW = el ? el.getBoundingClientRect().width : 0
+
+  function renderMedia (media) {
+    const { path, type } = media
+    switch (type) {
+      case 'Image':
+        return (
+          <div className='source-image-container'>
+            <Img
+              className='source-image'
+              src={path}
+              loader={<div className='source-image-loader'><Spinner /></div>}
+              unloader={<NoSource failedUrls={[ path ]} />}
+            />
+          </div>
+        )
+      case 'Video':
+        return (
+          <div className='media-player'>
+            <Player
+              className='source-video'
+              playsInline
+              src={path}
+            />
+          </div>
+        )
+      case 'Text':
+        return (
+          <div className='source-text-container'>
+            <Md
+              path={path}
+              loader={<Spinner />}
+              unloader={() => this.renderError()}
+            />
+          </div>
+        )
+      default:
+        return (
+          <NoSource failedUrls={[`Application does not support extension: ${path.split('.')[1]}`]} />
+        )
+    }
+  }
+
+  return (
+    <div
+      className='source-media-gallery'
+      style={{ transform: `translate(${viewIdx * -shiftW}px)` }}
+    >
+      {media.map((m) => renderMedia(m))}
+    </div>
+  )
+}
diff --git a/src/components/Overlay/Controls.js b/src/components/Overlay/Controls.js
new file mode 100644
index 0000000..e547123
--- /dev/null
+++ b/src/components/Overlay/Controls.js
@@ -0,0 +1,36 @@
+import React from 'react'
+
+export default ({ viewIdx, paths, onShiftHandler }) => {
+  const backArrow = viewIdx !== 0 ? (
+    <div
+      className='back'
+      onClick={() => onShiftHandler(-1)}
+    >
+      <svg>
+        <path d='M0,-7.847549217020565L6.796176979388489,3.9237746085102825L-6.796176979388489,3.9237746085102825Z' />
+      </svg>
+    </div>
+  ) : null
+  const forwardArrow = viewIdx < paths.length - 1 ? (
+    <div
+      className='next'
+      onClick={() => onShiftHandler(1)}
+    >
+      <svg>
+        <path d='M0,-7.847549217020565L6.796176979388489,3.9237746085102825L-6.796176979388489,3.9237746085102825Z' />
+      </svg>
+    </div>
+  ) : null
+
+  if (paths.length > 1) {
+    return (
+      <div className='media-gallery-controls'>
+        {backArrow}
+        {forwardArrow}
+      </div>
+    )
+  }
+  return (
+    <div className='media-gallery-controls' />
+  )
+}
diff --git a/src/components/presentational/LoadingOverlay.js b/src/components/Overlay/Loading.js
similarity index 100%
rename from src/components/presentational/LoadingOverlay.js
rename to src/components/Overlay/Loading.js
diff --git a/src/components/Md.jsx b/src/components/Overlay/Md.js
similarity index 100%
rename from src/components/Md.jsx
rename to src/components/Overlay/Md.js
diff --git a/src/components/Overlay/Media.js b/src/components/Overlay/Media.js
new file mode 100644
index 0000000..158f8ae
--- /dev/null
+++ b/src/components/Overlay/Media.js
@@ -0,0 +1,77 @@
+import React from 'react'
+import Content from './Content'
+import Controls from './Controls'
+import { selectTypeFromPath } from '../../js/utilities'
+
+class SourceOverlay extends React.Component {
+  constructor () {
+    super()
+    this.state = { idx: 0 }
+    this.onShiftGallery = this.onShiftGallery.bind(this)
+  }
+
+  getTypeCounts (media) {
+    return media.reduce(
+      (acc, vl) => {
+        acc[vl.type] += 1
+        return acc
+      },
+      { Image: 0, Video: 0, Text: 0 }
+    )
+  }
+
+  onShiftGallery (shift) {
+    // no more left
+    if (this.state.idx === 0 && shift === -1) return
+    // no more right
+    if (this.state.idx === this.props.source.paths.length - 1 && shift === 1) return
+    this.setState({ idx: this.state.idx + shift })
+  }
+
+  render () {
+    if (typeof (this.props.source) !== 'object') {
+      return this.renderError()
+    }
+    const { url, title, paths, date, type, desc } = this.props.source
+
+    return (
+      <div className='mo-overlay' onClick={this.props.onCancel}>
+        <div className='mo-container' onClick={e => e.stopPropagation()}>
+          <div className='mo-header'>
+            <div className='mo-header-close' onClick={this.props.onCancel}>
+              <button className='side-menu-burg is-active'><span /></button>
+            </div>
+            <div className='mo-header-text'>{this.props.source.title.substring(0, 200)}</div>
+          </div>
+          <div className='mo-media-container'>
+            <Content media={paths.map(selectTypeFromPath)} viewIdx={this.state.idx} />
+            <Controls paths={paths} viewIdx={this.state.idx} onShiftHandler={this.onShiftGallery} />
+          </div>
+          <div className='mo-meta-container'>
+            <div className='mo-box-title'>
+              {title ? <p><b>{title}</b></p> : null}
+              <div>{desc}</div>
+            </div>
+
+            <div className='mo-box'>
+              <div>
+                {type ? <h4>Media type</h4> : null}
+                {type ? <p><i className='material-icons left'>perm_media</i>{type}</p> : null}
+              </div>
+              <div>
+                {date ? <h4>Date</h4> : null}
+                {date ? <p><i className='material-icons left'>today</i>{date}</p> : null}
+              </div>
+              <div>
+                {url ? <h4>Link</h4> : null}
+                {url ? <span><i className='material-icons left'>link</i><a href={url} target='_blank'>Link to original URL</a></span> : null}
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    )
+  }
+}
+
+export default SourceOverlay
diff --git a/src/components/SourceOverlay.jsx b/src/components/SourceOverlay.jsx
deleted file mode 100644
index 5b3a254..0000000
--- a/src/components/SourceOverlay.jsx
+++ /dev/null
@@ -1,216 +0,0 @@
-import React from 'react'
-import Img from 'react-image'
-import { Player } from 'video-react'
-import Md from './Md.jsx'
-import Spinner from './presentational/Spinner'
-import NoSource from './presentational/NoSource'
-// TODO: move render functions into presentational components
-
-class SourceOverlay extends React.Component {
-  constructor () {
-    super()
-    this.state = { idx: 0 }
-  }
-
-  renderImage (path) {
-    return (
-      <div className='source-image-container'>
-        <Img
-          className='source-image'
-          src={path}
-          loader={<div className='source-image-loader'><Spinner /></div>}
-          unloader={<NoSource failedUrls={this.props.source.paths} />}
-        />
-      </div>
-    )
-  }
-
-  renderVideo (path) {
-    return (
-      <div className='media-player'>
-        <Player
-          className='source-video'
-          playsInline
-          src={path}
-        />
-      </div>
-    )
-  }
-
-  renderText (path) {
-    return (
-      <div className='source-text-container'>
-        <Md
-          path={path}
-          loader={<Spinner />}
-          unloader={() => this.renderError()}
-        />
-      </div>
-    )
-  }
-
-  renderNoSupport (ext) {
-    return (
-      <NoSource failedUrls={[`Application does not support extension: ${ext}`]} />
-    )
-  }
-
-  toMedia (path) {
-    let type
-    switch (true) {
-      case /\.(png|jpg)$/.test(path):
-        type = 'Image'; break
-      case /\.(mp4)$/.test(path):
-        type = 'Video'; break
-      case /\.(md)$/.test(path):
-        type = 'Text'; break
-      default:
-        type = 'Unknown'; break
-    }
-    return { type, path }
-  }
-
-  getTypeCounts (media) {
-    return media.reduce(
-      (acc, vl) => {
-        acc[vl.type] += 1
-        return acc
-      },
-      { Image: 0, Video: 0, Text: 0 }
-    )
-  }
-
-  _renderPath (media) {
-    const { path, type } = media
-    switch (type) {
-      case 'Image':
-        return this.renderImage(path)
-      case 'Video':
-        return this.renderVideo(path)
-      case 'Text':
-        return this.renderText(path)
-      default:
-        return this.renderNoSupport(path.split('.')[1])
-    }
-  }
-
-  _renderCounts (counts) {
-    const strFor = type =>
-      counts[type] > 0
-        ? `${counts[type]} ${type.toLowerCase()}${counts[type] > 1 ? 's' : ''}`
-        : ''
-    const img = strFor('Image')
-    const vid = strFor('Video')
-    const txt = strFor('Text')
-
-    return (
-      <div>
-        {img || ''}
-        {(img && vid) ? `, ${vid}` : (vid || '')}
-        {((img || vid) && txt) ? `, ${txt}` : (txt || '')}
-      </div>
-    )
-  }
-
-  _renderContent (media) {
-    const el = document.querySelector(`.source-media-gallery`)
-    const shiftW = el ? el.getBoundingClientRect().width : 0
-    return (
-      <div className='source-media-gallery' style={{ transform: `translate(${this.state.idx * -shiftW}px)` }}>
-        {media.map((m) => this._renderPath(m))}
-      </div>
-    )
-  }
-
-  onShiftGallery (shift) {
-    // no more left
-    if (this.state.idx === 0 && shift === -1) return
-    // no more right
-    if (this.state.idx === this.props.source.paths.length - 1 && shift === 1) return
-    this.setState({ idx: this.state.idx + shift })
-  }
-
-  _renderControls () {
-    const backArrow = this.state.idx !== 0 ? (
-      <div
-        className='back'
-        onClick={() => this.onShiftGallery(-1)}
-      >
-        <svg>
-          <path d='M0,-7.847549217020565L6.796176979388489,3.9237746085102825L-6.796176979388489,3.9237746085102825Z' />
-        </svg>
-      </div>
-    ) : null
-    const forwardArrow = this.state.idx < this.props.source.paths.length - 1 ? (
-      <div
-        className='next'
-        onClick={() => this.onShiftGallery(1)}
-      >
-        <svg>
-          <path d='M0,-7.847549217020565L6.796176979388489,3.9237746085102825L-6.796176979388489,3.9237746085102825Z' />
-        </svg>
-      </div>
-    ) : null
-
-    if (this.props.source.paths.length > 1) {
-      return (
-        <div className='media-gallery-controls'>
-          {backArrow}
-          {forwardArrow}
-        </div>
-      )
-    }
-    return (
-      <div className='media-gallery-controls' />
-    )
-  }
-
-  render () {
-    if (typeof (this.props.source) !== 'object') {
-      return this.renderError()
-    }
-    const { url, title, paths, date, type, desc } = this.props.source
-    const media = paths.map(this.toMedia)
-
-    return (
-      <div className='mo-overlay' onClick={this.props.onCancel}>
-        <div className='mo-container' onClick={e => e.stopPropagation()}>
-          <div className='mo-header'>
-            <div className='mo-header-close' onClick={this.props.onCancel}>
-              <button className='side-menu-burg is-active'><span /></button>
-            </div>
-            <div className='mo-header-text'>{this.props.source.title.substring(0, 200)}</div>
-          </div>
-          <div className='mo-media-container'>
-            {this._renderContent(media)}
-            {this._renderControls()}
-          </div>
-          <div className='mo-meta-container'>
-            <div className='mo-box-title'>
-              {/* <p>{`${this.state.idx+1} / ${paths.length}`}</p> */}
-              {title ? <p><b>{title}</b></p> : null}
-              <div>{desc}</div>
-            </div>
-
-            <div className='mo-box'>
-              <div>
-                {type ? <h4>Media type</h4> : null}
-                {type ? <p><i className='material-icons left'>perm_media</i>{type}</p> : null}
-              </div>
-              <div>
-                {date ? <h4>Date</h4> : null}
-                {date ? <p><i className='material-icons left'>today</i>{date}</p> : null}
-              </div>
-              <div>
-                {url ? <h4>Link</h4> : null}
-                {url ? <span><i className='material-icons left'>link</i><a href={url} target='_blank'>Link to original URL</a></span> : null}
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    )
-  }
-}
-
-export default SourceOverlay
diff --git a/src/js/utilities.js b/src/js/utilities.js
index 8d04788..00d9987 100644
--- a/src/js/utilities.js
+++ b/src/js/utilities.js
@@ -136,3 +136,18 @@ export function toggleFlagAC (flag) {
     }
   })
 }
+
+export function selectTypeFromPath (path) {
+  let type
+  switch (true) {
+    case /\.(png|jpg)$/.test(path):
+      type = 'Image'; break
+    case /\.(mp4)$/.test(path):
+      type = 'Video'; break
+    case /\.(md)$/.test(path):
+      type = 'Text'; break
+    default:
+      type = 'Unknown'; break
+  }
+  return { type, path }
+}