From a526ba1ca68b81b51323dce92db1aa8730b47936 Mon Sep 17 00:00:00 2001
From: Sean Anderson <Sean.Palmer.Anderson@gmail.com>
Date: Mon, 6 Jul 2015 23:21:35 -0700
Subject: [PATCH] Squashed commit of the following:

commit 55a3f05e00a8d13071c8537c2c962ac8ea08b5a9
Author: Sean Anderson <Sean.Palmer.Anderson@gmail.com>
Date:   Mon Jul 6 23:20:39 2015 -0700

    v0.178

commit c9a391c28a746bf56e349bb4027ba026f21fbfbd
Author: Sean Anderson <Sean.Palmer.Anderson@gmail.com>
Date:   Mon Jul 6 20:38:19 2015 -0700

    Test cases and fixing naming conventions

commit 8650561e51f2efaa37931add09ecd26488597dfb
Author: Sean Anderson <Sean.Palmer.Anderson@gmail.com>
Date:   Mon Jul 6 19:36:39 2015 -0700

    Fixing linting

commit a99a7fa3a36c9ffe76707c4ac74a4616573672bc
Author: Sean Anderson <Sean.Palmer.Anderson@gmail.com>
Date:   Mon Jul 6 19:36:10 2015 -0700

    Changed implementation; much more simple now + more performant, woot!

commit 5a993bf7f166abbc6913f005308a8b34c931b5ec
Author: Sean Anderson <Sean.Palmer.Anderson@gmail.com>
Date:   Mon Jul 6 17:45:09 2015 -0700

    Pushing logic down a level to give more flexibility

commit e92b507b213580b086c790e614c9535f8e8260e3
Author: Sean Anderson <Sean.Palmer.Anderson@gmail.com>
Date:   Mon Jul 6 17:04:35 2015 -0700

    Adding some test cases

commit 45c5feae7f876339d4be277efba3cabe03c1de25
Author: Sean Anderson <Sean.Palmer.Anderson@gmail.com>
Date:   Mon Jul 6 16:41:58 2015 -0700

    Fixing #596

commit 7082f468a9754a4366269362308a56a4414d3ddf
Author: Sean Anderson <Sean.Palmer.Anderson@gmail.com>
Date:   Sun Jul 5 18:53:37 2015 -0700

    Togglable split pane view implemented, need to test

commit a0e0e5f36d648df92b10a1960f9b7b2d75571929
Author: Sean Anderson <Sean.Palmer.Anderson@gmail.com>
Date:   Sun Jul 5 11:35:42 2015 -0700

    Adding a LayoutType enum, but support for it isn't complete

commit f31b8637eb4d5bea983511acee5897b270ebf897
Author: Sean Anderson <Sean.Palmer.Anderson@gmail.com>
Date:   Sun Jul 5 11:25:47 2015 -0700

    Updating Marionette version

commit ab9a3b5a2745a71d1e65445d0753582fc1bd5f3a
Author: Sean Anderson <Sean.Palmer.Anderson@gmail.com>
Date:   Fri Jul 3 13:04:06 2015 -0700

    Removing save, didn't need mean to add this.

commit 8c74cd82bf8143e70b2f1864e87fcb18ef741f3d
Author: Sean Anderson <Sean.Palmer.Anderson@gmail.com>
Date:   Fri Jul 3 13:03:50 2015 -0700

    Patching 'settings' to have backwards compatibility for loading BrowserSettings

commit 803f82a961ac1eb6c7360d8d3973a83f5cfa0075
Merge: 23aca24 99cc8d8
Author: Sean Anderson <Meo.DDR@gmail.com>
Date:   Fri Jul 3 12:50:40 2015 -0700

    Merge pull request #599 from L3K0V/Development

    Browser settings merged into Settings

commit 99cc8d88db928a929ffca2dc410a59a592006768
Author: Asen Lekov <asenlekoff@gmail.com>
Date:   Fri Jul 3 02:53:50 2015 +0300

    Browser settings merged into Settings

commit 23aca249e965ba6a3cfd90b574b69a5e2f354a0d
Merge: 995cc80 4c44e91
Author: Sean Anderson <Meo.DDR@gmail.com>
Date:   Thu Jul 2 13:42:52 2015 -0700

    Merge pull request #589 from L3K0V/Development

    Bulgarian locale added

commit 4c44e91041574364d318054d2c74316398f8a623
Author: Asen Lekov <asenlekoff@gmail.com>
Date:   Thu Jul 2 15:46:18 2015 +0300

    Updated to v0.177

commit 4e41c2daf4cec766cb6684b01f81cc4341eace05
Merge: 2d0c501 995cc80
Author: Asen Lekov <asenlekoff@gmail.com>
Date:   Thu Jul 2 15:24:37 2015 +0300

    Merge remote-tracking branch 'MeoMix/Development' into Development

commit 995cc80fdcfd4af0f158d195f3b08ef222f64a9d
Merge: fbb6a86 6d470f1
Author: Sean Anderson <Meo.DDR@gmail.com>
Date:   Wed Jul 1 15:54:50 2015 -0700

    Merge pull request #590 from MeoMix/master

    v0.177

commit 2d0c50111e8e4c4609f822794d5cfabe9d27dddb
Author: Asen Lekov <asenlekoff@gmail.com>
Date:   Wed Jul 1 02:07:12 2015 +0300

    Better translation and fixed typos

commit 1af981315d3b5d73f1d6246e1338addb05b273b6
Merge: d2daaf5 c639eee
Author: Asen Lekov <asenlekoff@gmail.com>
Date:   Wed Jul 1 01:57:39 2015 +0300

    Merge branch 'locale' into Development

commit c639eeecff557b9e48aaa9a9b75614326491a220
Author: Asen Lekov <asenlekoff@gmail.com>
Date:   Wed Jul 1 01:54:35 2015 +0300

    Better translation

commit 502201dc5190415b2e07816b6ffdc8a49e81410d
Author: Asen Lekov <asenlekoff@gmail.com>
Date:   Wed Jul 1 01:45:53 2015 +0300

    Fixes

commit efbd18c93a0314886262dcd270f1d42710950562
Author: Asen Lekov <asenlekoff@gmail.com>
Date:   Tue Jun 30 22:48:41 2015 +0300

    Added bulgarian locale
---
 Gruntfile.js                                  |    4 +-
 Streamus Chrome Extension.csproj              |   39 +-
 package.json                                  |    2 +-
 src/_locales/bg/messages.json                 |  606 ++
 src/_locales/cs/messages.json                 |    7 +-
 src/_locales/de/messages.json                 |    3 -
 src/_locales/en/messages.json                 |   26 +-
 src/_locales/es/messages.json                 |    7 +-
 src/_locales/fr/messages.json                 |    7 +-
 src/_locales/ko/messages.json                 |    7 +-
 src/_locales/nl/messages.json                 |    7 +-
 src/_locales/no/messages.json                 |    7 +-
 src/_locales/pt_BR/messages.json              |    7 +-
 src/_locales/ro/messages.json                 |    7 +-
 src/_locales/ru/messages.json                 |    7 +-
 src/_locales/tr/messages.json                 |    5 +-
 src/_locales/uk/messages.json                 |    7 +-
 src/js/background/collection/playlists.js     |   44 +-
 .../background/model/activePlaylistManager.js |   17 +-
 src/js/background/model/backgroundArea.js     |   20 +-
 src/js/background/model/browserSettings.js    |  116 -
 .../model/chromeContextMenusManager.js        |   34 +-
 src/js/background/model/settings.js           |  109 +-
 src/js/common/enum/layoutType.js              |    4 +
 src/js/contentScript/youTube.js               |    3 +-
 .../collection/activePane/activePanes.js      |  108 +
 .../foreground/collection/activePane/panes.js |   11 -
 .../enum/{paneType.js => activePaneType.js}   |    0
 .../foreground/model/activePane/activePane.js |   14 +
 src/js/foreground/model/activePane/pane.js    |   14 -
 .../view/activePane/activePaneRegion.js       |   23 -
 .../view/activePane/activePaneView.js         |   97 +-
 .../view/activePane/activePanesRegion.js      |   28 +
 .../view/activePane/activePanesView.js        |   35 +
 src/js/foreground/view/activePane/paneView.js |    9 -
 .../foreground/view/activePane/panesView.js   |   33 -
 .../view/appBar/activePaneFilterView.js       |   27 +-
 .../view/appBar/adminMenuAreaView.js          |   10 +-
 src/js/foreground/view/appBar/appBarView.js   |    1 +
 .../view/behavior/viewModelContainer.js       |    1 +
 .../view/dialog/browserSettingsDialogView.js  |   29 -
 .../view/dialog/browserSettingsView.js        |   68 -
 src/js/foreground/view/dialog/settingsView.js |   31 +-
 src/js/foreground/view/foregroundAreaView.js  |    6 +-
 src/js/foreground/view/search/searchRegion.js |   15 +
 .../view/stream/clearStreamButtonView.js      |    2 +-
 .../view/stream/saveStreamButtonView.js       |    2 +-
 src/js/foreground/view/video/videoView.js     |    5 +-
 .../collection/activePane/activePanes.spec.js |  148 +
 .../test/foreground/foregroundSpecLoader.js   |    4 +
 .../view/activePane/activePaneSpecLoader.js   |    2 +
 .../view/activePane/activePaneView.spec.js    |   74 +-
 .../view/activePane/activePanesRegion.spec.js |   36 +
 .../view/activePane/activePanesView.spec.js   |   32 +
 .../dialog/browserSettingsDialogView.spec.js  |   30 -
 .../view/dialog/browserSettingsView.spec.js   |   22 -
 .../view/dialog/dialogSpecLoader.js           |    4 +-
 src/js/test/testUtility.js                    |   32 +
 src/js/thirdParty/backbone.marionette.js      | 6495 +++++++++--------
 src/less/activePane.less                      |    5 +
 src/less/dialog.less                          |    2 +-
 src/less/foreground.less                      |    8 +-
 src/less/searchArea.less                      |    9 +
 src/manifest.json                             |    2 +-
 src/template/activePane/activePane.html       |    3 +-
 src/template/activePane/activePanes.html      |    2 +
 src/template/appBar/adminMenuArea.html        |    9 +-
 src/template/dialog/browserSettings.html      |   26 -
 src/template/dialog/dialog.html               |    2 +-
 src/template/dialog/settings.html             |   30 +-
 src/template/foregroundArea.html              |    4 +-
 src/template/stream/clearStreamButton.html    |    2 +-
 src/template/stream/saveStreamButton.html     |    2 +-
 73 files changed, 4794 insertions(+), 3862 deletions(-)
 create mode 100644 src/_locales/bg/messages.json
 delete mode 100644 src/js/background/model/browserSettings.js
 create mode 100644 src/js/common/enum/layoutType.js
 create mode 100644 src/js/foreground/collection/activePane/activePanes.js
 delete mode 100644 src/js/foreground/collection/activePane/panes.js
 rename src/js/foreground/enum/{paneType.js => activePaneType.js} (100%)
 create mode 100644 src/js/foreground/model/activePane/activePane.js
 delete mode 100644 src/js/foreground/model/activePane/pane.js
 delete mode 100644 src/js/foreground/view/activePane/activePaneRegion.js
 create mode 100644 src/js/foreground/view/activePane/activePanesRegion.js
 create mode 100644 src/js/foreground/view/activePane/activePanesView.js
 delete mode 100644 src/js/foreground/view/activePane/paneView.js
 delete mode 100644 src/js/foreground/view/activePane/panesView.js
 delete mode 100644 src/js/foreground/view/dialog/browserSettingsDialogView.js
 delete mode 100644 src/js/foreground/view/dialog/browserSettingsView.js
 create mode 100644 src/js/test/foreground/collection/activePane/activePanes.spec.js
 create mode 100644 src/js/test/foreground/view/activePane/activePanesRegion.spec.js
 create mode 100644 src/js/test/foreground/view/activePane/activePanesView.spec.js
 delete mode 100644 src/js/test/foreground/view/dialog/browserSettingsDialogView.spec.js
 delete mode 100644 src/js/test/foreground/view/dialog/browserSettingsView.spec.js
 create mode 100644 src/less/activePane.less
 create mode 100644 src/less/searchArea.less
 create mode 100644 src/template/activePane/activePanes.html
 delete mode 100644 src/template/dialog/browserSettings.html

diff --git a/Gruntfile.js b/Gruntfile.js
index 3bb23f24..b622aace 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -243,7 +243,7 @@ module.exports = function(grunt) {
         src: ['package.json', 'src/manifest.json']
       }
     },
-    'webstore_upload': {
+    'webstore-upload': {
       accounts: {
         'default': {
           publish: false
@@ -321,7 +321,7 @@ module.exports = function(grunt) {
     grunt.task.run('compressRelease:' + operaReleaseDirectory + ':sanitize=true');
 
     if (isRelease) {
-      grunt.task.run('webstore_upload');
+      grunt.task.run('webstore-upload');
     }
   });
 
diff --git a/Streamus Chrome Extension.csproj b/Streamus Chrome Extension.csproj
index 2843da74..5815a95c 100644
--- a/Streamus Chrome Extension.csproj	
+++ b/Streamus Chrome Extension.csproj	
@@ -73,27 +73,32 @@
     <Content Include="src\img\streamus_icon38.png" />
     <Content Include="src\img\streamus_icon48.png" />
     <Content Include="src\img\streamus_icon_white19.png" />
+    <Content Include="src\js\foreground\collection\activePane\activePanes.js" />
     <Content Include="src\js\background\enum\entityType.js" />
     <Content Include="src\js\background\model\activePlaylistManager.js" />
     <Content Include="src\js\background\model\analyticsManager.js" />
+    <Content Include="src\js\foreground\model\activePane\activePane.js" />
     <Content Include="src\js\background\model\videoButton.js" />
     <Content Include="src\js\common\enum\desktopNotificationDuration.js" />
+    <Content Include="src\js\common\enum\layoutType.js" />
     <Content Include="src\js\common\lodashMixin.js" />
     <Content Include="src\js\contentScript\interceptor.js" />
     <Content Include="src\js\foreground\enum\fixedPosition.js" />
+    <Content Include="src\js\foreground\enum\activePaneType.js" />
     <Content Include="src\js\foreground\model\appBar\activePaneFilter.js" />
     <Content Include="src\js\foreground\model\dialog\createPlaylist.js" />
     <Content Include="src\js\foreground\model\dialog\editPlaylist.js" />
     <Content Include="src\js\foreground\model\listItemButton\listItemButton.js" />
     <Content Include="src\js\foreground\model\song\songActions.js" />
+    <Content Include="src\js\foreground\model\streamControlBar\timeLabelArea.js" />
+    <Content Include="src\js\foreground\model\streamControlBar\timeSlider.js" />
     <Content Include="src\js\foreground\model\video\mediaSourceWrapper.js" />
     <Content Include="src\js\foreground\model\video\sourceBufferWrapper.js" />
     <Content Include="src\js\foreground\enum\keyCode.js" />
     <Content Include="src\js\foreground\model\tooltip\tooltip.js" />
-    <Content Include="src\js\foreground\view\activePane\activePaneRegion.js" />
+    <Content Include="src\js\foreground\view\activePane\activePanesRegion.js" />
+    <Content Include="src\js\foreground\view\activePane\activePanesView.js" />
     <Content Include="src\js\foreground\view\activePane\activePaneView.js" />
-    <Content Include="src\js\foreground\view\activePane\panesView.js" />
-    <Content Include="src\js\foreground\view\activePane\paneView.js" />
     <Content Include="src\js\foreground\view\appBar\activePaneFilterView.js" />
     <Content Include="src\js\foreground\view\appBar\searchInputAreaView.js" />
     <Content Include="src\js\foreground\view\behavior\dialogContent.js" />
@@ -109,11 +114,8 @@
     <Content Include="src\js\foreground\view\listItemButton\playlistOptionsButtonView.js" />
     <Content Include="src\js\foreground\view\simpleMenu\simpleMenuItemsView.js" />
     <Content Include="src\js\foreground\view\leftPane\activePlaylistAreaView.js" />
-    <Content Include="src\js\foreground\view\leftPane\leftPaneRegion.js" />
-    <Content Include="src\js\foreground\view\leftPane\leftPaneView.js" />
     <Content Include="src\js\foreground\view\leftPane\playlistItemsView.js" />
     <Content Include="src\js\foreground\view\leftPane\playlistItemView.js" />
-    <Content Include="src\js\foreground\view\leftPane\signInView.js" />
     <Content Include="src\js\foreground\view\listItemButton\songOptionsButtonView.js" />
     <Content Include="src\js\foreground\view\streamControlBar\nextButtonView.js" />
     <Content Include="src\js\foreground\view\streamControlBar\playPauseButtonView.js" />
@@ -139,9 +141,12 @@
     <Content Include="src\js\test\chrome.mock.js" />
     <Content Include="src\js\test\common\commonSpecLoader.js" />
     <Content Include="src\js\test\background\model\activePlaylistManager.spec.js" />
+    <Content Include="src\js\test\foreground\collection\activePane\panes.spec.js" />
     <Content Include="src\js\test\foreground\model\appBar\activePaneFilter.spec.js" />
-    <Content Include="src\js\test\foreground\view\activePane\activePaneView.spec.js" />
+    <Content Include="src\js\test\foreground\view\activePane\activePanesRegion.spec.js" />
     <Content Include="src\js\test\foreground\view\activePane\activePaneSpecLoader.js" />
+    <Content Include="src\js\test\foreground\view\activePane\activePanesView.spec.js" />
+    <Content Include="src\js\test\foreground\view\activePane\activePaneView.spec.js" />
     <Content Include="src\js\test\foreground\view\appBar\activePaneFilterView.spec.js" />
     <Content Include="src\js\test\foreground\view\appBar\adminMenuAreaView.spec.js" />
     <Content Include="src\js\test\foreground\view\appBar\appBarRegion.spec.js" />
@@ -158,9 +163,6 @@
     <Content Include="src\js\test\foreground\view\streamControlBar\streamControlBarView.spec.js" />
     <Content Include="src\js\test\foreground\view\streamControlBar\timeLabelAreaView.spec.js" />
     <Content Include="src\js\test\foreground\view\streamControlBar\timeSliderView.spec.js" />
-    <Content Include="src\js\test\foreground\view\stream\nextButtonView.spec.js" />
-    <Content Include="src\js\test\foreground\view\stream\playPauseButtonView.spec.js" />
-    <Content Include="src\js\test\foreground\view\stream\previousButtonView.spec.js" />
     <Content Include="src\js\test\foreground\view\appBar\volumeAreaView.spec.js" />
     <Content Include="src\js\test\foreground\view\behavior\behaviorSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\behavior\collectionViewMultiSelect.spec.js" />
@@ -228,19 +230,13 @@
     <Content Include="src\js\test\foreground\view\selectionBar\selectionBarRegion.spec.js" />
     <Content Include="src\js\test\foreground\view\selectionBar\selectionBarSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\selectionBar\selectionBarView.spec.js" />
-    <Content Include="src\js\test\foreground\view\stream\activeStreamItemView.spec.js" />
     <Content Include="src\js\test\foreground\view\stream\clearStreamButtonView.spec.js" />
-    <Content Include="src\js\test\foreground\view\stream\radioButtonView.spec.js" />
-    <Content Include="src\js\test\foreground\view\stream\repeatButtonView.spec.js" />
     <Content Include="src\js\test\foreground\view\stream\saveStreamButtonView.spec.js" />
-    <Content Include="src\js\test\foreground\view\stream\shuffleButtonView.spec.js" />
     <Content Include="src\js\test\foreground\view\stream\streamItemsView.spec.js" />
     <Content Include="src\js\test\foreground\view\stream\streamItemView.spec.js" />
     <Content Include="src\js\test\foreground\view\stream\streamRegion.spec.js" />
     <Content Include="src\js\test\foreground\view\stream\streamSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\stream\streamView.spec.js" />
-    <Content Include="src\js\test\foreground\view\stream\timeLabelAreaView.spec.js" />
-    <Content Include="src\js\test\foreground\view\stream\timeSliderView.spec.js" />
     <Content Include="src\js\test\foreground\view\tooltip\tooltipRegion.spec.js" />
     <Content Include="src\js\test\foreground\view\tooltip\tooltipSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\tooltip\tooltipView.spec.js" />
@@ -252,6 +248,7 @@
     <Content Include="src\js\thirdParty\test\chai.js" />
     <Content Include="src\js\thirdParty\test\mocha.js" />
     <Content Include="src\js\thirdParty\test\sinon.js" />
+    <Content Include="src\template\activePane\activePanes.html" />
     <Content Include="src\template\activePane\activePane.html" />
     <Content Include="src\template\appBar\activePaneFilter.html" />
     <Content Include="src\template\appBar\searchInputArea.html" />
@@ -308,7 +305,6 @@
     <Content Include="src\js\background\main.js" />
     <Content Include="src\js\background\mixin\collectionMultiSelect.js" />
     <Content Include="src\js\background\mixin\collectionSequence.js" />
-    <Content Include="src\js\background\model\browserSettings.js" />
     <Content Include="src\js\background\model\nextButton.js" />
     <Content Include="src\js\background\model\playPauseButton.js" />
     <Content Include="src\js\background\model\previousButton.js" />
@@ -389,10 +385,8 @@
     <Content Include="src\js\foreground\view\listItemButton\addPlaylistButtonView.js" />
     <Content Include="src\js\foreground\view\listItemButton\deletePlaylistButtonView.js" />
     <Content Include="src\js\foreground\view\playlist\playlistsView.js" />
-    <Content Include="src\js\foreground\view\dialog\browserSettingsView.js" />
     <Content Include="src\js\foreground\view\listItemButton\playPlaylistButtonView.js" />
     <Content Include="src\js\foreground\view\dialog\exportPlaylistView.js" />
-    <Content Include="src\js\foreground\view\dialog\browserSettingsDialogView.js" />
     <Content Include="src\js\foreground\view\selectionBar\selectionBarRegion.js" />
     <Content Include="src\js\foreground\view\selectionBar\selectionBarView.js" />
     <Content Include="src\js\foreground\view\stream\clearStreamButtonView.js" />
@@ -452,8 +446,6 @@
     <Content Include="src\js\test\background\model\clientErrorManager.spec.js" />
     <Content Include="src\js\test\background\model\signInManager.spec.js" />
     <Content Include="src\js\test\background\model\user.spec.js" />
-    <Content Include="src\js\test\foreground\view\dialog\browserSettingsDialogView.spec.js" />
-    <Content Include="src\js\test\foreground\view\dialog\browserSettingsView.spec.js" />
     <Content Include="src\js\test\foreground\view\dialog\clearStreamDialogView.spec.js" />
     <Content Include="src\js\test\foreground\view\dialog\createPlaylistDialogView.spec.js" />
     <Content Include="src\js\test\foreground\view\dialog\createPlaylistView.spec.js" />
@@ -505,6 +497,7 @@
     <Content Include="src\less\appBar.less" />
     <Content Include="src\less\flexRow.less" />
     <Content Include="src\less\activePaneFilter.less" />
+    <Content Include="src\less\activePane.less" />
     <None Include="src\less\foreground.less" />
     <Content Include="src\template\appBar\appBar.html" />
     <Content Include="src\template\backgroundArea.html" />
@@ -521,7 +514,6 @@
     <Content Include="src\template\listItemButton\optionsListItemButton.html" />
     <Content Include="src\template\listItemButton\playPauseSongButton.html" />
     <Content Include="src\template\playlist\playlists.html" />
-    <Content Include="src\template\dialog\browserSettings.html" />
     <Content Include="src\template\dialog\exportPlaylist.html" />
     <Content Include="src\template\appBar\adminMenuArea.html" />
     <Content Include="src\template\notification\notification.html" />
@@ -609,6 +601,7 @@
     <Content Include="src\less\streamControlBar.less" />
     <Content Include="src\less\video.less" />
     <Content Include="src\less\searchInputArea.less" />
+    <Content Include="src\less\searchArea.less" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="src\manifest.json" />
@@ -644,7 +637,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
diff --git a/package.json b/package.json
index a057196b..8fe9bd88 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Streamus",
-  "version": "0.177.0",
+  "version": "0.178.0",
   "private": true,
   "description": "Streamus - The most popular Chrome extension YouTube music player",
   "devDependencies": {
diff --git a/src/_locales/bg/messages.json b/src/_locales/bg/messages.json
new file mode 100644
index 00000000..a0dc6377
--- /dev/null
+++ b/src/_locales/bg/messages.json
@@ -0,0 +1,606 @@
+{
+    "extensionName": {
+        "message": "Streamus"
+    },
+    "extensionDescription": {
+        "message": "Простичко, стриймва музика."
+    },
+    "toggleRadio": {
+        "message": "Радио вкл./изкл."
+    },
+    "toggleShuffle": {
+        "message": "Разбъркване икзл./вкл."
+    },
+    "toggleRepeat": {
+        "message": "Повтаряне изкл./всички песен/текущата песен"
+    },
+    "increaseVolume": {
+        "message": "Увеличаване на звука"
+    },
+    "decreaseVolume": {
+        "message": "Намаляване на звука"
+    },
+    "showSongDetails": {
+        "message": "Покажи детайли за песента"
+    },
+    "nextSong": {
+        "message": "Следваща песен"
+    },
+    "previousSong": {
+        "message": "Предишна песен"
+    },
+    "toggleSong": {
+        "message": "Пусни/спри песента"
+    },
+    "deleteSong": {
+        "message": "Изтрий песента"
+    },
+    "copySongUrl": {
+        "message": "Копирай адреса на песента"
+    },
+    "copySongTitleAndUrl": {
+        "message": "Копирай заглавието и адреса на песента"
+    },
+    "save": {
+        "message": "Запази"
+    },
+    "copyUrl": {
+        "message": "Копирай адреса"
+    },
+    "copyTitleAndUrl": {
+        "message": "Копирай заглавието и адреса"
+    },
+    "delete": {
+        "message": "Изтрий"
+    },
+    "clearStream": {
+        "message": "Изчисти потока"
+    },
+    "saveStream": {
+        "message": "Запази потока"
+    },
+    "addToStreamus": {
+        "message": "Добави към Streamus"
+    },
+    "youTubePlayerErrorSongNotFound": {
+        "message": "Песента е премахната или недостъпна."
+    },
+    "youTubePlayerErrorNoPlayEmbedded": {
+        "message": "Песента не може да бъде изпълнена."
+    },
+    "errorEncountered": {
+        "message": "Опа...появи се грешка."
+    },
+    "saving": {
+        "message": "Запазване"
+    },
+    "installed": {
+        "message": "Инсталирано"
+    },
+    "repeatOff": {
+        "message": "Не повтаряй"
+    },
+    "repeatSong": {
+        "message": "Повтаряй песента"
+    },
+    "repeatAll": {
+        "message": "Повтаряй всичко"
+    },
+    "radioOn": {
+        "message": "Включено радио"
+    },
+    "radioOff": {
+        "message": "Изключено радио"
+    },
+    "shufflingOn": {
+        "message": "Включено разбъркване"
+    },
+    "shufflingOff": {
+        "message": "Изключено разбъркване"
+    },
+    "elapsedTime": {
+        "message": "Изминало време"
+    },
+    "remainingTime": {
+        "message": "Оставащо време"
+    },
+    "totalTime": {
+        "message": "Общо"
+    },
+    "highest": {
+        "message": "Високо"
+    },
+    "auto": {
+        "message": "Автоматично"
+    },
+    "lowest": {
+        "message": "Ниско"
+    },
+    "reload": {
+        "message": "Презареждане"
+    },
+    "playAll": {
+        "message": "Пусни всички"
+    },
+    "addAll": {
+        "message": "Добави всички"
+    },
+    "addSelected": {
+        "message": "Добави избраните"
+    },
+    "playSelected": {
+        "message": "Пусни избраните"
+    },
+    "saveSelected": {
+        "message": "Запази селектираните"
+    },
+    "search": {
+        "message": "Търсене"
+    },
+    "searching": {
+        "message": "Търсене..."
+    },
+    "noResultsFound": {
+        "message": "Няма намерени резултати"
+    },
+    "clearStream": {
+        "message": "Изчисти потока"
+    },
+    "createPlaylist": {
+        "message": "Създай списък"
+    },
+    "ok": {
+        "message": "Ок"
+    },
+    "playlist": {
+        "message": "Списък"
+    },
+    "stream": {
+        "message": "Поток"
+    },
+    "settings": {
+        "message": "Настройки"
+    },
+    "edit": {
+        "message": "Редактирай"
+    },
+    "cantDeleteLastPlaylist": {
+        "message": "Последният списък не може да бъде изтрит"
+    },
+    "clearStreamQuestion": {
+        "message": "Изчистване на потока?"
+    },
+    "play": {
+        "message": "Пусни"
+    },
+    "add": {
+        "message": "Добави"
+    },
+    "title": {
+        "message": "Заглавие"
+    },
+    "url": {
+        "message": "Адрес"
+    },
+    "playlists": {
+        "message": "Списъци"
+    },
+    "remind": {
+        "message": "Потвърждение"
+    },
+    "reminders": {
+        "message": "Потвърждения"
+    },
+    "remindClearStream": {
+        "message": "Потврждение при изчистване на потока"
+    },
+    "remindDeletePlaylist": {
+        "message": "Потвърждение при изтриване на списък"
+    },
+    "minute": {
+        "message": "Минута"
+    },
+    "minutes": {
+        "message": "Минути"
+    },
+    "hours": {
+        "message": "Часове"
+    },
+    "days": {
+        "message": "Дни"
+    },
+    "errorLoadingTitle": {
+        "message": "Проблем при зареждане"
+    },
+    "keyboardCommandFailure": {
+        "message": "Неуспешна клавишна комбинация"
+    },
+    "streamEmpty": {
+        "message": "Празен поток"
+    },
+    "playlistEmpty": {
+        "message": "Празен списък"
+    },
+    "create": {
+        "message": "Създаване"
+    },
+    "update": {
+        "message": "Опресняване"
+    },
+    "wouldYouLikeTo": {
+        "message": "Искате ли да"
+    },
+    "general": {
+        "message": "Основни"
+    },
+    "startTyping": {
+        "message": "Започнете да пишете"
+    },
+    "resultsWillAppearAsYouSearch": {
+        "message": "Резултатите ще се появяват докато търсите."
+    },
+    "trySearchingForSomethingElse": {
+        "message": "Опитайте да потърсите нещо друго."
+    },
+    "watchOnYouTube": {
+        "message": "Гледай в YouTube"
+    },
+    "notSignedIn": {
+        "message": "Не сте влезнали"
+    },
+    "signingIn": {
+        "message": "Влизане..."
+    },
+    "signIn": {
+        "message": "Влизане"
+    },
+    "signInFailed": {
+        "message": "Неуспешно влизане"
+    },
+    "pleaseWait": {
+        "message": "Моля изчакайте..."
+    },
+    "anUpdateIsAvailable": {
+        "message": "Има налична актуализация"
+    },
+    "pressEnterToPlay": {
+        "message": "Натиснете enter за да пуснете"
+    },
+    "volume": {
+        "message": "Звук"
+    },
+    "songAdded": {
+        "message": "Песен добавена"
+    },
+    "addSong": {
+        "message": "Добави песен"
+    },
+    "song": {
+        "message": "Песен"
+    },
+    "songs": {
+        "message": "Песни"
+    },
+    "cantSkipToNextSong": {
+        "message": "Песента не може да бъде прескочена"
+    },
+    "cantGoBackToPreviousSong": {
+        "message": "Не може да се отиде при предишната песен"
+    },
+    "cantToggleSong": {
+        "message": "Песента не може да бъде избрана"
+    },
+    "searchForSongs": {
+        "message": "Търсене за песни"
+    },
+    "songQuality": {
+        "message": "Качество"
+    },
+    "whyNotAddASongFromAPlaylistOr": {
+        "message": "Защо не добавите песен от някой списък или",
+        "description": "Пълното изречение е 'Защо не потърсите или не добавите песен от някой списък?' но трябваше да бъде побрано в HTML-a"
+    },
+    "searchAndPlay": {
+        "message": "Търси и Пусни"
+    },
+    "searchAndAdd": {
+        "message": "Търси и Добави"
+    },
+    "linkAccountsMessage": {
+        "message": "Streamus не е свързан с вашият Chrome профил. Вашите списъци ще бъдат налични на други устройства, само ако имате свързан профил."
+    },
+    "link": {
+        "message": "Свързване",
+        "description": "Свържи моят профил"
+    },
+    "googleSignInMessage": {
+        "message": "Вие не сте влезнали с профил в Chrome. Вашите списъци ще са налични само на този компютър."
+    },
+    "remindGoogleSignIn": {
+        "message": "Напомняне за влизане в Google"
+    },
+    "keyboardShortcuts": {
+        "message": "Клавишни комбинации"
+    },
+    "export": {
+        "message": "Експортирай"
+    },
+    "openInTab": {
+        "message": "Отвори в таб"
+    },
+    "contextMenus": {
+        "message": "Десен бутон"
+    },
+    "websiteEnhancements": {
+        "message": "Подобрения в сайта"
+    },
+    "textSelection": {
+        "message": "Селекция на текст"
+    },
+    "youTubeLinks": {
+        "message": "YouTube адреси"
+    },
+    "youTubePages": {
+        "message": "YouTube страници"
+    },
+    "youTube": {
+        "message": "YouTube"
+    },
+    "beatport": {
+        "message": "Beatport"
+    },
+    "fileType": {
+        "message": "Тип"
+    },
+    "csv": {
+        "message": "CSV"
+    },
+    "json": {
+        "message": "JSON"
+    },
+    "failedToFindSong": {
+        "message": "Песента не беше намерена"
+    },
+    "failedToFindSongs": {
+        "message": "Песните не бяха намерени"
+    },
+    "loadingYouTube": {
+        "message": "Зареждане на YouTube"
+    },
+    "loadingYouTubeFailed": {
+        "message": "Неуспешно зарежда не YouTube"
+    },
+    "loadAttempt": {
+        "message": "Опит $currentLoadAttempt$ от общо $maxLoadAttempts$",
+        "placeholders": {
+            "currentLoadAttempt": {
+                "content": "$1"
+            },
+            "maxLoadAttempts": {
+                "content": "$2"
+            }
+        }
+    },
+    "songAlreadyInCollection": {
+        "message": "Песента е вече в $collectionName$",
+        "placeholders": {
+            "collectionName": {
+                "content": "$1"
+            }
+        }
+    },
+    "allSongsAlreadyInCollection": {
+        "message": "Всички песни са вече в $collectionName$",
+        "placeholders": {
+            "collectionName": {
+                "content": "$1"
+            }
+        }
+    },
+    "songsAlreadyInCollection": {
+        "message": "$duplicateSongCount$ от $draggedSongCount$ песни вече са в $collectionName$",
+        "placeholders": {
+            "duplicateSongCount": {
+                "content": "$1"
+            },
+            "draggedSongCount": {
+                "content": "$2"
+            },
+            "collectionName": {
+                "content": "$3"
+            }
+        }
+    },
+    "urlCopied": {
+        "message": "Адреса е копиран"
+    },
+    "copyFailed": {
+        "message": "Копирането е провалено"
+    },
+    "playlistExported": {
+        "message": "Списъкът е запазен успешно."
+    },
+    "playing": {
+        "message": "Свири в момента"
+    },
+    "buffering": {
+        "message": "Буфериране..."
+    },
+    "paused": {
+        "message": "Паузиран"
+    },
+    "cancel": {
+        "message": "Отказ"
+    },
+    "errorLoadingUrl": {
+        "message": "Проблем при зареждането на страницата"
+    },
+    "playlistLoaded": {
+        "message": "Списъкът е зареден"
+    },
+    "playlistCreated": {
+      "message": "Списъкът $playlistTitle$ беше създаден",
+      "placeholders": {
+        "playlistTitle": {
+          "content": "$1"
+        }
+      }
+    },
+    "playlistCreatedWithSong": {
+      "message": "Списъкът $playlistTitle$ беше създаден с $count$ песен",
+      "placeholders": {
+        "playlistTitle": {
+          "content": "$1"
+        },
+        "count": {
+          "content": "$2"
+        }
+      }
+    },
+    "playlistCreatedWithSongs": {
+      "message": "Списъкът $playlistTitle$ беше създаден с $count$ песни",
+      "placeholders": {
+        "playlistTitle": {
+          "content": "$1"
+        },
+        "count": {
+          "content": "$2"
+        }
+      }
+    },
+    "extensionConflict": {
+        "message": "Друг плъгин или проблем принуждава YouTube да ползва Flash.$lineBreak$ Streamus няма да може да работи подобаващо докато този плъгин не бъде изключен или проблема не бъде отстранен и Streamus бъде рестартиран.",
+        "placeholders": {
+            "lineBreak": {
+                "content": "$1"
+            }
+        }
+    },
+    "searchResults": {
+        "message": "Резултати от търсенето"
+    },
+    "collectionCantBeDeleted": {
+        "message": "$collectionName$ не може да бъде изтрита",
+        "placeholders": {
+            "collectionName": {
+                "content": "$1"
+            }
+        }
+    },
+    "collectionSelected": {
+        "message": "$count$ $collectionName$ избрани",
+        "description": "Когато има 0, 1 или 2 избрани песни",
+        "placeholders": {
+            "count": {
+                "content": "$1"
+            },
+            "collectionName": {
+                "content": "$2"
+            }
+        }
+    },
+    "saveAll": {
+        "message": "Запази всички"
+    },
+    "saveSong": {
+        "message": "Запази песен"
+    },
+    "songSavedToPlaylist": {
+        "message": "$songTitle$ е запазена в $playlistTitle$",
+        "placeholders": {
+            "songTitle": {
+                "content": "$1"
+            },
+            "playlistTitle": {
+                "content": "$2"
+            }
+        }
+    },
+    "songsSavedToPlaylist": {
+        "message": "$count$ песни са запазени в $playlistTitle$",
+        "placeholders": {
+            "count": {
+                "content": "$1"
+            },
+            "playlistTitle": {
+                "content": "$2"
+            }
+        }
+    },
+    "desktopNotifications": {
+        "message": "Известия на работния плот"
+    },
+    "showNotifications": {
+        "message": "Показвай известия"
+    },
+    "notificationDuration": {
+        "message": "Продължителност на известието"
+    },
+    "oneSecond": {
+        "message": "Една секунда"
+    },
+    "twoSeconds": {
+        "message": "Две секунди"
+    },
+    "threeSeconds": {
+        "message": "Три секунди"
+    },
+    "fourSeconds": {
+        "message": "Четири секунди"
+    },
+    "fiveSeconds": {
+        "message": "Пет секунди"
+    },
+    "tenSeconds": {
+        "message": "Десет секунди"
+    },
+    "playlistUrl": {
+        "message": "Адрес на списъка с песни"
+    },
+    "aboutStreamus": {
+        "message": "За Streamus"
+    },
+    "applicationDetails": {
+        "message": "Детайли за приложението"
+    },
+    "openHomepage": {
+        "message": "Начална страница"
+    },
+    "version": {
+        "message": "Версия"
+    },
+    "openPatchNotes": {
+        "message": "Последни промени"
+    },
+    "moreOptions": {
+      "message": "Още настройки"
+    },
+    "nowPlaying": {
+      "message": "Сега свири"
+    },
+    "videoOn": {
+      "message": "Включено видео"
+    },
+    "videoOff": {
+      "message": "Изключено видео"
+    },
+    "deleteAll": {
+      "message": "Изтрий всички"
+    },
+    "songsAddedToStream": {
+      "message": "$count$ песни бяха добавени",
+      "placeholders": {
+        "count": {
+          "content": "$1"
+        }
+      }
+    },
+    "songAddedToStream":  {
+      "message": "$songTitle$ е добавена към потока",
+      "placeholders": {
+        "songTitle": {
+          "content": "$1"
+        }
+      }
+    }
+}
diff --git a/src/_locales/cs/messages.json b/src/_locales/cs/messages.json
index 47e3c1d9..e3bd1ae5 100644
--- a/src/_locales/cs/messages.json
+++ b/src/_locales/cs/messages.json
@@ -210,7 +210,7 @@
         "message": "Dnu"
     },
     "errorLoadingTitle": {
-        "message": "Nelze nacíst název"	
+        "message": "Nelze nacíst název"
     },
     "keyboardCommandFailure": {
         "message": "Chyba provedení klávesové zkratky"
@@ -328,9 +328,6 @@
     "openInTab": {
         "message": "Otevrít na karte"
     },
-    "browserSettings": {
-        "message": "Nastavení prohlížece"
-    },
     "contextMenus": {
         "message": "Kontextová menu"
     },
@@ -522,4 +519,4 @@
     "playlistUrl": {
         "message": "URL seznamu"
     }
-}
\ No newline at end of file
+}
diff --git a/src/_locales/de/messages.json b/src/_locales/de/messages.json
index 22fb6262..c504df40 100644
--- a/src/_locales/de/messages.json
+++ b/src/_locales/de/messages.json
@@ -328,9 +328,6 @@
     "openInTab": {
         "message": "In Tab öffnen"
     },
-    "browserSettings": {
-        "message": "Browsereinstellungen"
-    },
     "contextMenus": {
         "message": "Kontextmenüs"
     },
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index dd39e9cd..3fb0798a 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -143,9 +143,6 @@
     "noResultsFound": {
         "message": "No results found"
     },
-    "clearStream": {
-        "message": "Clear stream"
-    },
     "createPlaylist": {
         "message": "Create playlist"
     },
@@ -328,9 +325,6 @@
     "openInTab": {
         "message": "Open in tab"
     },
-    "browserSettings": {
-        "message": "Browser settings"
-    },
     "contextMenus": {
         "message": "Context menus"
     },
@@ -455,7 +449,7 @@
             "playlistTitle": {
                 "content": "$1"
             },
-            "count": { 
+            "count": {
                 "content": "$2"
             }
         }
@@ -466,7 +460,7 @@
             "playlistTitle": {
                 "content": "$1"
             },
-            "count": { 
+            "count": {
                 "content": "$2"
             }
         }
@@ -598,12 +592,24 @@
             }
         }
     },
-    "songAddedToStream":  {
+    "songAddedToStream": {
         "message": "$songTitle$ added to stream",
         "placeholders": {
             "songTitle": {
                 "content": "$1"
             }
         }
+    },
+    "layoutType": {
+        "message": "Layout type"
+    },
+    "fullPane": {
+        "message": "Full pane"
+    },
+    "splitPane": {
+        "message": "Split pane"
+    },
+    "clear": { 
+        "message": "Clear"
     }
-}
\ No newline at end of file
+}
diff --git a/src/_locales/es/messages.json b/src/_locales/es/messages.json
index 3994f647..19775791 100644
--- a/src/_locales/es/messages.json
+++ b/src/_locales/es/messages.json
@@ -210,7 +210,7 @@
         "message": "Días"
     },
     "errorLoadingTitle": {
-        "message": "Error cargando título"	
+        "message": "Error cargando título"
     },
     "keyboardCommandFailure": {
         "message": "Falla en comando de teclado"
@@ -328,9 +328,6 @@
     "openInTab": {
         "message": "Abrir en pestaña"
     },
-    "browserSettings": {
-        "message": "Ajustes de explorador"
-    },
     "contextMenus": {
         "message": "Menúes contextuales"
     },
@@ -522,4 +519,4 @@
     "playlistUrl": {
         "message": "Lista de reproducción URL"
     }
-}
\ No newline at end of file
+}
diff --git a/src/_locales/fr/messages.json b/src/_locales/fr/messages.json
index 146fe420..db46399d 100644
--- a/src/_locales/fr/messages.json
+++ b/src/_locales/fr/messages.json
@@ -210,7 +210,7 @@
         "message": "Jours"
     },
     "errorLoadingTitle": {
-        "message": "Échec du chargement du titre"	
+        "message": "Échec du chargement du titre"
     },
     "keyboardCommandFailure": {
         "message": "Échec du raccourci clavier"
@@ -328,9 +328,6 @@
     "openInTab": {
         "message": "Ouvrir dans un onglet"
     },
-    "browserSettings": {
-        "message": "Paramètres Chrome"
-    },
     "contextMenus": {
         "message": "Menus contextuels"
     },
@@ -522,4 +519,4 @@
     "playlistUrl": {
         "message": "URL de la playlist"
     }
-}
\ No newline at end of file
+}
diff --git a/src/_locales/ko/messages.json b/src/_locales/ko/messages.json
index 99503483..a1bd5a2a 100644
--- a/src/_locales/ko/messages.json
+++ b/src/_locales/ko/messages.json
@@ -210,7 +210,7 @@
         "message": "일"
     },
     "errorLoadingTitle": {
-        "message": "제목 불러오기 실패"	
+        "message": "제목 불러오기 실패"
     },
     "keyboardCommandFailure": {
         "message": "키보드 커맨드 실패"
@@ -328,9 +328,6 @@
     "openInTab": {
         "message": "탭에서 열기"
     },
-    "browserSettings": {
-        "message": "브라우저 설정"
-    },
     "contextMenus": {
         "message": "메뉴"
     },
@@ -522,4 +519,4 @@
     "playlistUrl": {
         "message": "재생목록 주소"
     }
-}
\ No newline at end of file
+}
diff --git a/src/_locales/nl/messages.json b/src/_locales/nl/messages.json
index bdabb385..ff8af8f5 100644
--- a/src/_locales/nl/messages.json
+++ b/src/_locales/nl/messages.json
@@ -210,7 +210,7 @@
         "message": "Dagen"
     },
     "errorLoadingTitle": {
-        "message": "Probleem bij het laden van de titel"	
+        "message": "Probleem bij het laden van de titel"
     },
     "keyboardCommandFailure": {
         "message": "Probleem met toetsenbord commando"
@@ -328,9 +328,6 @@
     "openInTab": {
         "message": "Open in tabblad"
     },
-    "browserSettings": {
-        "message": "Browser instellingen"
-    },
     "contextMenus": {
         "message": "Contextmenu's"
     },
@@ -522,4 +519,4 @@
     "playlistUrl": {
         "message": "Afspeellijst nettadresse"
     }
-}
\ No newline at end of file
+}
diff --git a/src/_locales/no/messages.json b/src/_locales/no/messages.json
index 2982b15c..030a7ae0 100644
--- a/src/_locales/no/messages.json
+++ b/src/_locales/no/messages.json
@@ -210,7 +210,7 @@
         "message": "Dager"
     },
     "errorLoadingTitle": {
-        "message": "Feil ved lasting av tittel"	
+        "message": "Feil ved lasting av tittel"
     },
     "keyboardCommandFailure": {
         "message": "Tastaturkommando mislyktes"
@@ -328,9 +328,6 @@
     "openInTab": {
         "message": "Åpne i ny fane"
     },
-    "browserSettings": {
-        "message": "Nettleserinnstillinger"
-    },
     "contextMenus": {
         "message": "hurtigmenyer"
     },
@@ -522,4 +519,4 @@
     "playlistUrl": {
         "message": "Spilleliste nettadresse"
     }
-}
\ No newline at end of file
+}
diff --git a/src/_locales/pt_BR/messages.json b/src/_locales/pt_BR/messages.json
index c4e3f8d0..d49ce4c6 100644
--- a/src/_locales/pt_BR/messages.json
+++ b/src/_locales/pt_BR/messages.json
@@ -210,7 +210,7 @@
 		"message": "Dias"
 	},
 	"errorLoadingTitle": {
-		"message": "Erro ao carregar título"	
+		"message": "Erro ao carregar título"
 	},
 	"keyboardCommandFailure": {
 		"message": "Falha na tecla de atalho"
@@ -328,9 +328,6 @@
 	"openInTab": {
 		"message": "Abrir em aba"
 	},
-	"browserSettings": {
-		"message": "Configurações do Navegador"
-	},
 	"contextMenus": {
 		"message": "Menu de contexto"
 	},
@@ -522,4 +519,4 @@
 	"playlistUrl": {
 		"message": "URL da lista de reprodução"
 	}
-}
\ No newline at end of file
+}
diff --git a/src/_locales/ro/messages.json b/src/_locales/ro/messages.json
index f0c67227..7797c719 100644
--- a/src/_locales/ro/messages.json
+++ b/src/_locales/ro/messages.json
@@ -210,7 +210,7 @@
         "message": "Zile"
     },
     "errorLoadingTitle": {
-        "message": "Nu am putut incarca titlul"	
+        "message": "Nu am putut incarca titlul"
     },
     "keyboardCommandFailure": {
         "message": "Comanda de la tastatura nu a functionat"
@@ -328,9 +328,6 @@
     "openInTab": {
         "message": "Deschide in tab nou"
     },
-    "browserSettings": {
-        "message": "Setari browser"
-    },
     "contextMenus": {
         "message": "Meniuri context"
     },
@@ -522,4 +519,4 @@
     "playlistUrl": {
         "message": "Lista URL"
     }
-}
\ No newline at end of file
+}
diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json
index c1eec4a5..745561f3 100644
--- a/src/_locales/ru/messages.json
+++ b/src/_locales/ru/messages.json
@@ -328,9 +328,6 @@
     "openInTab": {
         "message": "Открывать во вкладке"
     },
-    "browserSettings": {
-        "message": "Настройки браузера"
-    },
     "contextMenus": {
         "message": "Контекстное меню"
     },
@@ -534,7 +531,7 @@
     "version": {
         "message": "Версия"
     },
-    "openPatchNotes": { 
+    "openPatchNotes": {
         "message":  "Открыть информацию про обновления"
     }
-}
\ No newline at end of file
+}
diff --git a/src/_locales/tr/messages.json b/src/_locales/tr/messages.json
index f76e2417..d67eb3a5 100644
--- a/src/_locales/tr/messages.json
+++ b/src/_locales/tr/messages.json
@@ -211,7 +211,7 @@
         "message": "Günler"
     },
     "errorLoadingTitle": {
-        "message": "Başlığı yüklerken hata "	
+        "message": "Başlığı yüklerken hata "
     },
     "keyboardCommandFailure": {
         "message": "Klavye komutu hatası"
@@ -330,9 +330,6 @@
     "openInTab": {
         "message": "Sekmede Aç"
     },
-    "browserSettings": {
-        "message": "Tarayıcı Ayarları"
-    },
     "contextMenus": {
         "message": "Açılır Menü"
     },
diff --git a/src/_locales/uk/messages.json b/src/_locales/uk/messages.json
index d82c2704..7af7c598 100644
--- a/src/_locales/uk/messages.json
+++ b/src/_locales/uk/messages.json
@@ -328,9 +328,6 @@
     "openInTab": {
         "message": "Відкривати у вкладці"
     },
-    "browserSettings": {
-        "message": "Налаштування браузера"
-    },
     "contextMenus": {
         "message": "Контекстне меню"
     },
@@ -534,7 +531,7 @@
     "version": {
         "message": "Версія"
     },
-    "openPatchNotes": { 
+    "openPatchNotes": {
         "message":  "Відкрити інформацію про оновлення"
     }
-}
\ No newline at end of file
+}
diff --git a/src/js/background/collection/playlists.js b/src/js/background/collection/playlists.js
index 38f729e9..7b200691 100644
--- a/src/js/background/collection/playlists.js
+++ b/src/js/background/collection/playlists.js
@@ -8,6 +8,7 @@
   var ListItemType = require('common/enum/listItemType');
   var DataSource = require('background/model/dataSource');
   var Utility = require('common/utility');
+  var LayoutType = require('common/enum/layoutType');
 
   var Playlists = Backbone.Collection.extend({
     model: Playlist,
@@ -26,7 +27,7 @@
       this.on('remove', this._onRemove);
       this.on('change:active', this._onChangeActive);
       this.on('change:sequence', this._onChangeSequence);
-      this.on('reset', this._onReset);
+      this.listenTo(StreamusBG.settings, 'change:layoutType', this._onSettingsChangeLayoutType);
     },
 
     getActivePlaylist: function() {
@@ -105,14 +106,7 @@
     },
 
     loadStoredState: function() {
-      var activePlaylistId = localStorage.getItem('activePlaylistId');
-      var playlist = this.get(activePlaylistId);
-
-      // Safer to check if playlist is undefined rather than activePlaylistId is null.
-      if (!_.isUndefined(playlist)) {
-        playlist.set('active', true);
-      }
-
+      this._ensureActivePlaylist();
       this._setCanDelete(this.length > 1);
     },
 
@@ -129,10 +123,6 @@
       this.invoke('set', 'canDelete', canDelete);
     },
 
-    _onReset: function() {
-      this._setCanDelete(this.length > 1);
-    },
-
     _onChangeSequence: function(model) {
       // Let the collection adjust the model's index after its sequence changes
       _.defer(function() {
@@ -194,14 +184,11 @@
 
     _onChangeActive: function(changedPlaylist, active) {
       // Ensure only one playlist is active at a time by de-activating all other active playlists.
+      // Purposefully don't remove activePlaylistId because it's useful for restoring state when
+      // changing from Layout.FullPane w/ Stream visible to SplitPane.
       if (active) {
         this._deactivateAllExcept(changedPlaylist);
         localStorage.setItem('activePlaylistId', changedPlaylist.get('id'));
-      } else {
-        var activePlaylist = this.getActivePlaylist();
-        if (_.isUndefined(activePlaylist)) {
-          localStorage.removeItem('activePlaylistId');
-        }
       }
     },
 
@@ -276,6 +263,27 @@
       });
     },
 
+    _onSettingsChangeLayoutType: function(settings, layoutType) {
+      if (layoutType === LayoutType.SplitPane) {
+        this._ensureActivePlaylist();
+      }
+    },
+
+    _ensureActivePlaylist: function() {
+      var activePlaylistId = localStorage.getItem('activePlaylistId');
+      var playlist = this.get(activePlaylistId);
+
+      // Safer to check if playlist is undefined rather than activePlaylistId is null.
+      if (_.isUndefined(playlist)) {
+        // Ensure that there's an active playlist if an active playlist needs to be shown.
+        if (this.length > 0 && StreamusBG.settings.get('layoutType') === LayoutType.SplitPane) {
+          this.at(0).set('active', true);
+        }
+      } else {
+        playlist.set('active', true);
+      }
+    },
+
     _notifyChromeRuntimeMessageError: function(sendResponse) {
       StreamusBG.channels.backgroundNotification.commands.trigger('show:notification', {
         title: chrome.i18n.getMessage('errorEncountered')
diff --git a/src/js/background/model/activePlaylistManager.js b/src/js/background/model/activePlaylistManager.js
index 7376acd4..13a49ca8 100644
--- a/src/js/background/model/activePlaylistManager.js
+++ b/src/js/background/model/activePlaylistManager.js
@@ -5,6 +5,7 @@
   // whether a user is signed in or not.
   var ActivePlaylistManager = Backbone.Model.extend({
     defaults: {
+      // TODO: This could be a little less verbose -- probably just want to call it PlaylistManager.
       activePlaylist: null,
       signInManager: null
     },
@@ -21,9 +22,9 @@
       this._setActivePlaylist(signedInUser);
     },
 
-    _onSignInManagerChangeSignedInUser: function(model, signedInUser) {
+    _onSignInManagerChangeSignedInUser: function(signInManager, signedInUser) {
       if (_.isNull(signedInUser)) {
-        var previousSignedInUser = model.previous('signedInUser');
+        var previousSignedInUser = signInManager.previous('signedInUser');
 
         if (!_.isNull(previousSignedInUser)) {
           this._setUserBindings(previousSignedInUser, false);
@@ -35,21 +36,23 @@
       this._setActivePlaylist(signedInUser);
     },
 
-    _onPlaylistsChangeActive: function(model, active) {
+    _onPlaylistsChangeActive: function(playlist, active) {
       if (active) {
-        this.set('activePlaylist', model);
+        this.set('activePlaylist', playlist);
       } else {
-        if (this.get('activePlaylist') === model) {
+        if (this.get('activePlaylist') === playlist) {
           this.set('activePlaylist', null);
         }
       }
     },
 
     _setUserBindings: function(user, isBinding) {
+      var playlists = user.get('playlists');
       if (isBinding) {
-        this.listenTo(user.get('playlists'), 'change:active', this._onPlaylistsChangeActive);
+        this.listenTo(playlists, 'change:active', this._onPlaylistsChangeActive);
+        this.listenTo(playlists, 'remove', this._onPlaylistsRemove);
       } else {
-        this.stopListening(user.get('playlists'));
+        this.stopListening(playlists);
       }
     },
 
diff --git a/src/js/background/model/backgroundArea.js b/src/js/background/model/backgroundArea.js
index 20ee332e..befa99f4 100644
--- a/src/js/background/model/backgroundArea.js
+++ b/src/js/background/model/backgroundArea.js
@@ -2,7 +2,6 @@
   'use strict';
 
   var AnalyticsManager = require('background/model/analyticsManager');
-  var BrowserSettings = require('background/model/browserSettings');
   var ChromeContextMenusManager = require('background/model/chromeContextMenusManager');
   var ChromeIconManager = require('background/model/chromeIconManager');
   var ChromeNotificationsManager = require('background/model/chromeNotificationsManager');
@@ -28,7 +27,6 @@
   var BackgroundArea = Backbone.Model.extend({
     defaults: function() {
       return {
-        browserSettings: new BrowserSettings(),
         settings: new Settings(),
         youTubePlayer: new YouTubePlayer(),
         radioButton: new RadioButton(),
@@ -40,6 +38,7 @@
         signInManager: new SignInManager(),
         analyticsManager: new AnalyticsManager(),
         dataSourceManager: new DataSourceManager(),
+        activePlaylistManager: null,
         player: null,
         stream: null,
         nextButton: null,
@@ -50,6 +49,9 @@
     },
 
     initialize: function() {
+      // TODO: Just trying this pattern out for now.
+      StreamusBG.settings = this.get('settings');
+
       this.listenTo(StreamusBG.channels.foreground.vent, 'started', this._onForegroundStarted.bind(this));
       this.listenTo(StreamusBG.channels.foreground.vent, 'beginUnload', this._onForegroundBeginUnload.bind(this));
       this.listenTo(StreamusBG.channels.foreground.vent, 'endUnload', this._onForegroundEndUnload.bind(this));
@@ -74,8 +76,13 @@
       });
       this.set('stream', stream);
 
+      var activePlaylistManager = new ActivePlaylistManager({
+        signInManager: this.get('signInManager')
+      });
+      this.set('activePlaylistManager', activePlaylistManager);
+
       var chromeContextMenusManager = new ChromeContextMenusManager({
-        browserSettings: this.get('browserSettings'),
+        settings: this.get('settings'),
         tabManager: this.get('tabManager'),
         signInManager: this.get('signInManager'),
         streamItems: stream.get('items')
@@ -115,17 +122,12 @@
         repeatButton: this.get('repeatButton'),
         stream: stream
       }));
-
-      this.set('activePlaylistManager', new ActivePlaylistManager({
-        signInManager: this.get('signInManager')
-      }));
     },
 
     getExposedProperties: function() {
       return {
         activePlaylistManager: this.get('activePlaylistManager'),
         analyticsManager: this.get('analyticsManager'),
-        browserSettings: this.get('browserSettings'),
         dataSourceManager: this.get('dataSourceManager'),
         nextButton: this.get('nextButton'),
         playPauseButton: this.get('playPauseButton'),
@@ -181,4 +183,4 @@
   });
 
   return BackgroundArea;
-});
\ No newline at end of file
+});
diff --git a/src/js/background/model/browserSettings.js b/src/js/background/model/browserSettings.js
deleted file mode 100644
index 99043702..00000000
--- a/src/js/background/model/browserSettings.js
+++ /dev/null
@@ -1,116 +0,0 @@
-define(function(require) {
-  'use strict';
-
-  var SyncActionType = require('background/enum/syncActionType');
-
-  var BrowserSettings = Backbone.Model.extend({
-    localStorage: new Backbone.LocalStorage('BrowserSettings'),
-
-    defaults: {
-      // Need to set the ID for Backbone.LocalStorage
-      id: 'BrowserSettings',
-      showTextSelectionContextMenu: true,
-      showYouTubeLinkContextMenu: true,
-      showYouTubePageContextMenu: true,
-      enhanceYouTube: true,
-      enhanceBeatport: true,
-      enhanceBeatportPermission: {
-        origins: ['*://*.pro.beatport.com/*']
-      }
-    },
-
-    // Don't save permission objects because they can't change
-    blacklist: ['enhanceYouTubePermission', 'enhanceBeatportPermission'],
-    toJSON: function() {
-      return this.omit(this.blacklist);
-    },
-
-    initialize: function() {
-      // Load from Backbone.LocalStorage
-      this.fetch();
-
-      this._ensurePermission('enhanceBeatport');
-
-      chrome.runtime.onMessage.addListener(this._onChromeRuntimeMessage.bind(this));
-      this.on('change:enhanceYouTube', this._onChangeEnhanceYouTube);
-      this.on('change:enhanceBeatport', this._onChangeEnhanceBeatport);
-    },
-
-    _onChromeRuntimeMessage: function(request, sender, sendResponse) {
-      switch (request.method) {
-        case 'getBeatportContentScriptData':
-          sendResponse({
-            canEnhance: this.get('enhanceBeatport')
-          });
-          break;
-        case 'getYouTubeContentScriptData':
-          sendResponse({
-            canEnhance: this.get('enhanceYouTube'),
-            SyncActionType: SyncActionType
-          });
-          break;
-      }
-    },
-
-    _onChangeEnhanceYouTube: function(model, enhanceYouTube) {
-      this._notifyTab('youTube', enhanceYouTube);
-    },
-
-    _onChangeEnhanceBeatport: function(model, enhanceBeatport) {
-      this._handleEnhanceChangeRequest(enhanceBeatport, 'beatport', 'enhanceBeatport');
-    },
-
-    _handleEnhanceChangeRequest: function(enhance, tabName, permissionName) {
-      var permission = this.get(permissionName + 'Permission');
-
-      // If the user wants to enhance a website they need to have granted permission
-      if (enhance) {
-        var response = this._onChromePermissionContainsResponse.bind(this, permissionName, tabName);
-        chrome.permissions.contains(permission, response);
-      } else {
-        // Cleanup permission if they disable functionality.
-        this._notifyTab(tabName, enhance);
-        chrome.permissions.remove(permission);
-      }
-    },
-
-    _onChromePermissionContainsResponse: function(permissionName, tabName, hasPermission) {
-      // If permission is granted then perform the enhance logic by notifying open tabs.
-      // Otherwise, request permission and, if given, do the same thing. If not granted, disable the permission.
-      if (hasPermission) {
-        this._notifyTab(tabName, true);
-      } else {
-        var permission = this.get(permissionName + 'Permission');
-
-        chrome.permissions.request(permission, function(permissionGranted) {
-          if (permissionGranted) {
-            this._notifyTab(tabName, true);
-          } else {
-            this.save(permissionName, false);
-          }
-        }.bind(this));
-      }
-    },
-
-    _ensurePermission: function(permissionName) {
-      // Disable setting if permission has not been granted.
-      if (this.get(permissionName)) {
-        var permission = this.get(permissionName + 'Permission');
-        chrome.permissions.contains(permission, function(hasPermission) {
-          if (!hasPermission) {
-            this.save(permissionName, false);
-          }
-        }.bind(this));
-      }
-    },
-
-    _notifyTab: function(tabType, enhance) {
-      StreamusBG.channels.tab.commands.trigger('notify:' + tabType, {
-        action: 'toggleContentScript',
-        value: enhance
-      });
-    }
-  });
-
-  return BrowserSettings;
-});
\ No newline at end of file
diff --git a/src/js/background/model/chromeContextMenusManager.js b/src/js/background/model/chromeContextMenusManager.js
index 6e339875..f9fecfa5 100644
--- a/src/js/background/model/chromeContextMenusManager.js
+++ b/src/js/background/model/chromeContextMenusManager.js
@@ -16,7 +16,7 @@
       youTubePageAddId: -1,
       youTubePageSaveId: -1,
       streamItems: null,
-      browserSettings: null,
+      settings: null,
       tabManager: null,
       signInManager: null
     },
@@ -26,11 +26,11 @@
       this._setYouTubeLinks();
       this._setYouTubePages();
 
-      var browserSettings = this.get('browserSettings');
-      this.listenTo(browserSettings, {
-        'change:showTextSelectionContextMenu': this._onBrowserSettingsChangeShowTextSelectionContextMenu,
-        'change:showYouTubeLinkContextMenu': this._onBrowserSettingsChangeShowYouTubeLinkContextMenu,
-        'change:showYouTubePageContextMenu': this._onBrowserSettingsChangeShowYouTubePageContextMenu
+      var settings = this.get('settings');
+      this.listenTo(settings, {
+        'change:showTextSelectionContextMenu': this._onSettingsChangeShowTextSelectionContextMenu,
+        'change:showYouTubeLinkContextMenu': this._onSettingsChangeShowYouTubeLinkContextMenu,
+        'change:showYouTubePageContextMenu': this._onSettingsChangeShowYouTubePageContextMenu
       });
 
       var signInManager = this.get('signInManager');
@@ -42,24 +42,24 @@
       }
     },
 
-    _onBrowserSettingsChangeShowTextSelectionContextMenu: function() {
+    _onSettingsChangeShowTextSelectionContextMenu: function() {
       this._setTextSelection();
     },
 
-    _onBrowserSettingsChangeShowYouTubeLinkContextMenu: function() {
+    _onSettingsChangeShowYouTubeLinkContextMenu: function() {
       this._setYouTubeLinks();
     },
 
-    _onBrowserSettingsChangeShowYouTubePageContextMenu: function() {
+    _onSettingsChangeShowYouTubePageContextMenu: function() {
       this._setYouTubePages();
     },
 
     _onPlaylistsAdd: function(model) {
-      if (this.get('browserSettings').get('showYouTubeLinkContextMenu')) {
+      if (this.get('settings').get('showYouTubeLinkContextMenu')) {
         this._createPlaylistContextMenu(this._getContextMenuOptions(true), this.get('youTubeLinkSaveId'), model);
       }
 
-      if (this.get('browserSettings').get('showYouTubePageContextMenu')) {
+      if (this.get('settings').get('showYouTubePageContextMenu')) {
         this._createPlaylistContextMenu(this._getContextMenuOptions(false), this.get('youTubePageSaveId'), model);
       }
     },
@@ -73,18 +73,18 @@
       } else {
         this.listenTo(signedInUser.get('playlists'), 'add', this._onPlaylistsAdd);
 
-        if (this.get('browserSettings').get('showYouTubeLinkContextMenu')) {
+        if (this.get('settings').get('showYouTubeLinkContextMenu')) {
           this.set('youTubeLinkSaveId', this._createSaveContextMenu(this._getContextMenuOptions(true)));
         }
 
-        if (this.get('browserSettings').get('showYouTubePageContextMenu')) {
+        if (this.get('settings').get('showYouTubePageContextMenu')) {
           this.set('youTubePageSaveId', this._createSaveContextMenu(this._getContextMenuOptions(false)));
         }
       }
     },
 
     _setTextSelection: function() {
-      if (this.get('browserSettings').get('showTextSelectionContextMenu')) {
+      if (this.get('settings').get('showTextSelectionContextMenu')) {
         this._createTextSelection();
       } else {
         this._removeTextSelection();
@@ -92,7 +92,7 @@
     },
 
     _setYouTubeLinks: function() {
-      if (this.get('browserSettings').get('showYouTubeLinkContextMenu')) {
+      if (this.get('settings').get('showYouTubeLinkContextMenu')) {
         this._createYouTubeLinks();
       } else {
         this._removeYouTubeLinks();
@@ -100,7 +100,7 @@
     },
 
     _setYouTubePages: function() {
-      if (this.get('browserSettings').get('showYouTubePageContextMenu')) {
+      if (this.get('settings').get('showYouTubePageContextMenu')) {
         this._createYouTubePages();
       } else {
         this._removeYouTubePages();
@@ -290,4 +290,4 @@
   });
 
   return ChromeContextMenusManager;
-});
\ No newline at end of file
+});
diff --git a/src/js/background/model/settings.js b/src/js/background/model/settings.js
index 67ed13cd..87f9c529 100644
--- a/src/js/background/model/settings.js
+++ b/src/js/background/model/settings.js
@@ -3,6 +3,8 @@
 
   var SongQuality = require('common/enum/songQuality');
   var DesktopNotificationDuration = require('common/enum/desktopNotificationDuration');
+  var SyncActionType = require('background/enum/syncActionType');
+  var LayoutType = require('common/enum/layoutType');
 
   var Settings = Backbone.Model.extend({
     localStorage: new Backbone.LocalStorage('Settings'),
@@ -16,15 +18,118 @@
       remindLinkUserId: true,
       remindGoogleSignIn: true,
       openInTab: false,
+      layoutType: LayoutType.SplitPane,
       desktopNotificationsEnabled: true,
-      desktopNotificationDuration: DesktopNotificationDuration.ThreeSeconds
+      desktopNotificationDuration: DesktopNotificationDuration.ThreeSeconds,
+      showTextSelectionContextMenu: true,
+      showYouTubeLinkContextMenu: true,
+      showYouTubePageContextMenu: true,
+      enhanceYouTube: true,
+      enhanceBeatport: true,
+      enhanceBeatportPermission: {
+        origins: ['*://*.pro.beatport.com/*']
+      }
+    },
+
+    // Don't save permission objects because they can't change
+    blacklist: ['enhanceYouTubePermission', 'enhanceBeatportPermission'],
+    toJSON: function() {
+      return this.omit(this.blacklist);
     },
 
     initialize: function() {
       // Load from Backbone.LocalStorage
       this.fetch();
+
+      // Need to look in localStorage's BrowserSettings for backwards compatibility. This can be removed in v0.179+
+      var serializedBrowserSettings = localStorage.getItem('BrowserSettings-BrowserSettings');
+      if (!_.isNull(serializedBrowserSettings)) {
+        this.set(JSON.parse(serializedBrowserSettings));
+        localStorage.removeItem('BrowserSettings-BrowserSettings');
+      }
+
+      this._ensurePermission('enhanceBeatport');
+
+      chrome.runtime.onMessage.addListener(this._onChromeRuntimeMessage.bind(this));
+      this.on('change:enhanceYouTube', this._onChangeEnhanceYouTube);
+      this.on('change:enhanceBeatport', this._onChangeEnhanceBeatport);
+    },
+
+    _onChromeRuntimeMessage: function(request, sender, sendResponse) {
+      switch (request.method) {
+        case 'getBeatportContentScriptData':
+          sendResponse({
+            canEnhance: this.get('enhanceBeatport')
+          });
+          break;
+        case 'getYouTubeContentScriptData':
+          sendResponse({
+            canEnhance: this.get('enhanceYouTube'),
+            SyncActionType: SyncActionType
+          });
+          break;
+      }
+    },
+
+    _onChangeEnhanceYouTube: function(model, enhanceYouTube) {
+      this._notifyTab('youTube', enhanceYouTube);
+    },
+
+    _onChangeEnhanceBeatport: function(model, enhanceBeatport) {
+      this._handleEnhanceChangeRequest(enhanceBeatport, 'beatport', 'enhanceBeatport');
+    },
+
+    _handleEnhanceChangeRequest: function(enhance, tabName, permissionName) {
+      var permission = this.get(permissionName + 'Permission');
+
+      // If the user wants to enhance a website they need to have granted permission
+      if (enhance) {
+        var response = this._onChromePermissionContainsResponse.bind(this, permissionName, tabName);
+        chrome.permissions.contains(permission, response);
+      } else {
+        // Cleanup permission if they disable functionality.
+        this._notifyTab(tabName, enhance);
+        chrome.permissions.remove(permission);
+      }
+    },
+
+    _onChromePermissionContainsResponse: function(permissionName, tabName, hasPermission) {
+      // If permission is granted then perform the enhance logic by notifying open tabs.
+      // Otherwise, request permission and, if given, do the same thing. If not granted, disable the permission.
+      if (hasPermission) {
+        this._notifyTab(tabName, true);
+      } else {
+        var permission = this.get(permissionName + 'Permission');
+
+        chrome.permissions.request(permission, function(permissionGranted) {
+          if (permissionGranted) {
+            this._notifyTab(tabName, true);
+          } else {
+            this.save(permissionName, false);
+          }
+        }.bind(this));
+      }
+    },
+
+    _ensurePermission: function(permissionName) {
+      // Disable setting if permission has not been granted.
+      if (this.get(permissionName)) {
+        var permission = this.get(permissionName + 'Permission');
+        chrome.permissions.contains(permission, function(hasPermission) {
+          if (!hasPermission) {
+            this.save(permissionName, false);
+          }
+        }.bind(this));
+      }
+    },
+
+    _notifyTab: function(tabType, enhance) {
+      StreamusBG.channels.tab.commands.trigger('notify:' + tabType, {
+        action: 'toggleContentScript',
+        value: enhance
+      });
     }
   });
 
   return Settings;
-});
\ No newline at end of file
+});
diff --git a/src/js/common/enum/layoutType.js b/src/js/common/enum/layoutType.js
new file mode 100644
index 00000000..ca6a7438
--- /dev/null
+++ b/src/js/common/enum/layoutType.js
@@ -0,0 +1,4 @@
+define({
+  FullPane: 'fullPane',
+  SplitPane: 'splitPane'
+});
\ No newline at end of file
diff --git a/src/js/contentScript/youTube.js b/src/js/contentScript/youTube.js
index 68542f46..307ffe1d 100644
--- a/src/js/contentScript/youTube.js
+++ b/src/js/contentScript/youTube.js
@@ -246,8 +246,9 @@
 
         var observer = new MutationObserver(function(mutations) {
           var hasPageLoadedClass = mutations[0].target.classList.contains('page-loaded');
+          var isVideoPage = window.location.href.indexOf('watch') !== -1;
 
-          if (hasPageLoadedClass && !isPageLoaded) {
+          if (hasPageLoadedClass && isVideoPage && !isPageLoaded) {
             this.appendHtml();
           }
 
diff --git a/src/js/foreground/collection/activePane/activePanes.js b/src/js/foreground/collection/activePane/activePanes.js
new file mode 100644
index 00000000..e14f272a
--- /dev/null
+++ b/src/js/foreground/collection/activePane/activePanes.js
@@ -0,0 +1,108 @@
+define(function(require) {
+  'use strict';
+
+  var ActivePane = require('foreground/model/activePane/activePane');
+  var ActivePaneType = require('foreground/enum/activePaneType');
+  var LayoutType = require('common/enum/layoutType');
+
+  var ActivePanes = Backbone.Collection.extend({
+    model: ActivePane,
+    stream: null,
+    settings: null,
+    activePlaylistManager: null,
+
+    initialize: function(models, options) {
+      this.stream = options.stream;
+      this.settings = options.settings;
+      this.activePlaylistManager = options.activePlaylistManager;
+
+      this.listenTo(this.settings, 'change:layoutType', this._onSettingsChangeLayoutType);
+      this.listenTo(this.activePlaylistManager, 'change:activePlaylist', this._onActivePlaylistManagerChangeActivePlaylist);
+
+      var layoutType = this.settings.get('layoutType');
+      var activePlaylist = this.activePlaylistManager.get('activePlaylist');
+      this._initializePanes(layoutType, activePlaylist);
+    },
+
+    // Determine whether the stream is visible or not based on the layoutType.
+    // Playlist visibility is handled through the 'active' state on playlists rather than here.
+    _onSettingsChangeLayoutType: function(settings, layoutType) {
+      this._setStreamPaneVisibility(layoutType, this.activePlaylistManager.has('activePlaylist'));
+    },
+
+    _onActivePlaylistManagerChangeActivePlaylist: function(activePlaylistManager, activePlaylist) {
+      var layoutType = this.settings.get('layoutType');
+      var previousActivePlaylist = activePlaylistManager.previous('activePlaylist');
+      this._initializePanes(layoutType, activePlaylist, previousActivePlaylist);
+    },
+
+    _initializePanes: function(layoutType, activePlaylist, previousActivePlaylist) {
+      var activePlaylistExists = !_.isNull(activePlaylist);
+      this._setStreamPaneVisibility(layoutType, activePlaylistExists);
+
+      if (activePlaylistExists) {
+        this._addPlaylistPane(activePlaylist);
+      }
+
+      if (previousActivePlaylist) {
+        this._removePlaylistPane(previousActivePlaylist);
+      }
+    },
+
+    _addPlaylistPane: function(playlist) {
+      this.add({
+        type: ActivePaneType.Playlist,
+        relatedModel: playlist
+      });
+    },
+
+    _removePlaylistPane: function(playlist) {
+      var playlistPane = this.findWhere({
+        relatedModel: playlist
+      });
+      this.remove(playlistPane);
+    },
+
+    _addStreamPane: function() {
+      this.add({
+        type: ActivePaneType.Stream,
+        relatedModel: this.stream
+      });
+    },
+
+    _removeStreamPane: function() {
+      var streamPane = this._getStreamPane();
+      this.remove(streamPane);
+    },
+
+    _getStreamPaneVisibility: function(layoutType, activePlaylistExists) {
+      var isStreamPaneVisible = layoutType === LayoutType.SplitPane || !activePlaylistExists;
+      return isStreamPaneVisible;
+    },
+
+    _setStreamPaneVisibility: function(layoutType, activePlaylistExists) {
+      var isStreamPaneVisible = this._getStreamPaneVisibility(layoutType, activePlaylistExists);
+
+      if (isStreamPaneVisible && !this._hasStreamPane()) {
+        this._addStreamPane();
+      } else if (!isStreamPaneVisible && this._hasStreamPane()) {
+        this._removeStreamPane();
+      }
+    },
+
+    _hasStreamPane: function() {
+      var streamPane = this._getStreamPane();
+      return !_.isUndefined(streamPane);
+    },
+
+    _getStreamPane: function() {
+      var streamPane = this.findWhere({
+        type: ActivePaneType.Stream
+      });
+
+      return streamPane;
+    }
+  });
+
+  return ActivePanes;
+});
\ No newline at end of file
diff --git a/src/js/foreground/collection/activePane/panes.js b/src/js/foreground/collection/activePane/panes.js
deleted file mode 100644
index f65f67ce..00000000
--- a/src/js/foreground/collection/activePane/panes.js
+++ /dev/null
@@ -1,11 +0,0 @@
-define(function(require) {
-  'use strict';
-
-  var Pane = require('foreground/model/pane');
-
-  var Panes = Backbone.Collection.extend({
-    model: Pane
-  });
-
-  return Panes;
-});
\ No newline at end of file
diff --git a/src/js/foreground/enum/paneType.js b/src/js/foreground/enum/activePaneType.js
similarity index 100%
rename from src/js/foreground/enum/paneType.js
rename to src/js/foreground/enum/activePaneType.js
diff --git a/src/js/foreground/model/activePane/activePane.js b/src/js/foreground/model/activePane/activePane.js
new file mode 100644
index 00000000..026e1fa2
--- /dev/null
+++ b/src/js/foreground/model/activePane/activePane.js
@@ -0,0 +1,14 @@
+define(function(require) {
+  'use strict';
+
+  var ActivePaneType = require('foreground/enum/activePaneType');
+
+  var ActivePane = Backbone.Model.extend({
+    defaults: {
+      type: ActivePaneType.None,
+      relatedModel: null
+    }
+  });
+
+  return ActivePane;
+});
\ No newline at end of file
diff --git a/src/js/foreground/model/activePane/pane.js b/src/js/foreground/model/activePane/pane.js
deleted file mode 100644
index a13ee31f..00000000
--- a/src/js/foreground/model/activePane/pane.js
+++ /dev/null
@@ -1,14 +0,0 @@
-define(function(require) {
-  'use strict';
-
-  var PaneType = require('foreground/enum/paneType');
-
-  var Pane = Backbone.Model.extend({
-    defaults: {
-      type: PaneType.None,
-      modelId: null
-    }
-  });
-
-  return Pane;
-});
\ No newline at end of file
diff --git a/src/js/foreground/view/activePane/activePaneRegion.js b/src/js/foreground/view/activePane/activePaneRegion.js
deleted file mode 100644
index da9e7c90..00000000
--- a/src/js/foreground/view/activePane/activePaneRegion.js
+++ /dev/null
@@ -1,23 +0,0 @@
-define(function(require) {
-  'use strict';
-
-  var ActivePaneView = require('foreground/view/activePane/activePaneView');
-
-  var ActivePaneRegion = Marionette.Region.extend({
-    initialize: function() {
-      this.listenTo(StreamusFG.channels.foregroundArea.vent, 'rendered', this._onForegroundAreaRendered);
-    },
-
-    _onForegroundAreaRendered: function() {
-      this._showActivePaneView();
-    },
-
-    _showActivePaneView: function() {
-      this.show(new ActivePaneView({
-        activePlaylistManager: StreamusFG.backgroundProperties.activePlaylistManager
-      }));
-    }
-  });
-
-  return ActivePaneRegion;
-});
\ No newline at end of file
diff --git a/src/js/foreground/view/activePane/activePaneView.js b/src/js/foreground/view/activePane/activePaneView.js
index ef420930..d1ea2e6e 100644
--- a/src/js/foreground/view/activePane/activePaneView.js
+++ b/src/js/foreground/view/activePane/activePaneView.js
@@ -1,80 +1,59 @@
 define(function(require) {
   'use strict';
 
-  // TODO: It's weird that I am pulling in views from other folders.
-  var ActivePaneTemplate = require('text!template/activePane/activePane.html');
+  var ActivePaneType = require('foreground/enum/activePaneType');
   var StreamView = require('foreground/view/stream/streamView');
   var ActivePlaylistAreaView = require('foreground/view/leftPane/activePlaylistAreaView');
-  // TODO: Potentially show a 'sign in' view?
+  var ActivePaneTemplate = require('text!template/activePane/activePane.html');
+
   var ActivePaneView = Marionette.LayoutView.extend({
-    className: 'flexColumn',
+    className: 'activePane flexColumn',
     template: _.template(ActivePaneTemplate),
 
     regions: {
-      stream: '[data-region=stream]',
-      activePlaylistArea: '[data-region=activePlaylistArea]'
-    },
-
-    ui: {
-      // TODO: I don't like regions being part of the UI like this.
-      streamRegion: '[data-ui~=streamRegion]',
-      activePlaylistAreaRegion: '[data-ui~=activePlaylistAreaRegion]'
+      content: '[data-region=content]'
     },
 
-    activePlaylistManager: null,
-    activePlaylistManagerEvents: {
-      'change:activePlaylist': '_onChangeActivePlaylist'
-    },
+    streamItems: null,
 
     initialize: function(options) {
-      this.activePlaylistManager = options.activePlaylistManager;
-      this.bindEntityEvents(this.activePlaylistManager, this.activePlaylistManagerEvents);
+      this.streamItems = options.streamItems;
     },
 
     onRender: function() {
-      this._setState(this.activePlaylistManager.get('activePlaylist'));
-    },
-
-    _onChangeActivePlaylist: function(model, activePlaylist) {
-      this._setState(activePlaylist);
-    },
-
-    _setState: function(activePlaylist) {
-      if (_.isNull(activePlaylist)) {
-        this._hideActivePlaylistAreaView();
-        this._showStreamView();
-      } else {
-        this._hideStreamView();
-        this._showActivePlaylistAreaView(activePlaylist);
+      this._showContentView();
+    },
+
+    // Show a dynamically determined view inside of the content region.
+    _showContentView: function() {
+      var contentView = this._getContentView();
+      this.showChildView('content', contentView);
+    },
+
+    // Returns an instantiated StreamView or ActivePlaylistAreaView depending on the pane's type.
+    _getContentView: function() {
+      var contentView;
+      var relatedModel = this.model.get('relatedModel');
+      var activePaneType = this.model.get('type');
+
+      switch (activePaneType) {
+        case ActivePaneType.Stream:
+          contentView = new StreamView({
+            model: relatedModel
+          });
+          break;
+        case ActivePaneType.Playlist:
+          contentView = new ActivePlaylistAreaView({
+            model: relatedModel,
+            collection: relatedModel.get('items'),
+            streamItems: this.streamItems
+          });
+          break;
+        default:
+          throw new Error('Unhandled activePaneType' + activePaneType);
       }
-    },
-
-    _showStreamView: function() {
-      this.ui.streamRegion.removeClass('is-hidden');
-
-      this.showChildView('stream', new StreamView({
-        model: StreamusFG.backgroundProperties.stream
-      }));
-    },
-
-    _hideStreamView: function() {
-      this.ui.streamRegion.addClass('is-hidden');
-      this.getRegion('stream').empty();
-    },
-
-    _showActivePlaylistAreaView: function(activePlaylist) {
-      this.ui.activePlaylistAreaRegion.removeClass('is-hidden');
-
-      this.showChildView('activePlaylistArea', new ActivePlaylistAreaView({
-        model: activePlaylist,
-        collection: activePlaylist.get('items'),
-        streamItems: StreamusFG.backgroundProperties.stream.get('items')
-      }));
-    },
 
-    _hideActivePlaylistAreaView: function() {
-      this.ui.activePlaylistAreaRegion.addClass('is-hidden');
-      this.getRegion('activePlaylistArea').empty();
+      return contentView;
     }
   });
 
diff --git a/src/js/foreground/view/activePane/activePanesRegion.js b/src/js/foreground/view/activePane/activePanesRegion.js
new file mode 100644
index 00000000..2066bc78
--- /dev/null
+++ b/src/js/foreground/view/activePane/activePanesRegion.js
@@ -0,0 +1,28 @@
+define(function(require) {
+  'use strict';
+
+  var ActivePanesView = require('foreground/view/activePane/activePanesView');
+  var ActivePanes = require('foreground/collection/activePane/activePanes');
+
+  var ActivePaneRegion = Marionette.Region.extend({
+    initialize: function() {
+      this.listenTo(StreamusFG.channels.foregroundArea.vent, 'rendered', this._onForegroundAreaRendered);
+    },
+
+    _onForegroundAreaRendered: function() {
+      this._showActivePanesView();
+    },
+
+    _showActivePanesView: function() {
+      this.show(new ActivePanesView({
+        collection: new ActivePanes(null, {
+          stream: StreamusFG.backgroundProperties.stream,
+          settings: StreamusFG.backgroundProperties.settings,
+          activePlaylistManager: StreamusFG.backgroundProperties.activePlaylistManager
+        })
+      }));
+    }
+  });
+
+  return ActivePaneRegion;
+});
\ No newline at end of file
diff --git a/src/js/foreground/view/activePane/activePanesView.js b/src/js/foreground/view/activePane/activePanesView.js
new file mode 100644
index 00000000..960e2294
--- /dev/null
+++ b/src/js/foreground/view/activePane/activePanesView.js
@@ -0,0 +1,35 @@
+// TODO: Show a sign-in view.
+define(function(require) {
+  'use strict';
+
+  var ActivePaneType = require('foreground/enum/activePaneType');
+  var ActivePaneView = require('foreground/view/activePane/activePaneView');
+  var ActivePanesTemplate = require('text!template/activePane/activePanes.html');
+  var ViewModelContainer = require('foreground/view/behavior/viewModelContainer');
+
+  var ActivePanesView = Marionette.CollectionView.extend({
+    className: 'activePanes flexRow',
+    childView: ActivePaneView,
+    template: _.template(ActivePanesTemplate),
+
+    childViewOptions: function() {
+      return {
+        streamItems: StreamusFG.backgroundProperties.stream.get('items')
+      };
+    },
+
+    behaviors: {
+      ViewModelContainer: {
+        behaviorClass: ViewModelContainer,
+        viewModelNames: ['collection']
+      }
+    },
+
+    // Sort the panes such that the stream appears on the right side.
+    viewComparator: function(activePane) {
+      return activePane.get('type') === ActivePaneType.Stream ? 1 : 0;
+    }
+  });
+
+  return ActivePanesView;
+});
\ No newline at end of file
diff --git a/src/js/foreground/view/activePane/paneView.js b/src/js/foreground/view/activePane/paneView.js
deleted file mode 100644
index 71468a0b..00000000
--- a/src/js/foreground/view/activePane/paneView.js
+++ /dev/null
@@ -1,9 +0,0 @@
-define(function(require) {
-  'use strict';
-
-  var PaneView = Marionette.LayoutView.extend({
-    template: _.template('')
-  });
-
-  return PaneView;
-});
\ No newline at end of file
diff --git a/src/js/foreground/view/activePane/panesView.js b/src/js/foreground/view/activePane/panesView.js
deleted file mode 100644
index 5c455530..00000000
--- a/src/js/foreground/view/activePane/panesView.js
+++ /dev/null
@@ -1,33 +0,0 @@
-define(function(require) {
-  'use strict';
-
-  //var PaneView = require('foreground/view/activePane/paneView');
-  var PaneType = require('foreground/enum/paneType');
-  var StreamView = require('foreground/view/stream/streamView');
-  var ActivePlaylistAreaView = require('foreground/view/leftPane/activePlaylistAreaView');
-
-  var PanesView = Marionette.CollectionView.extend({
-    template: _.template(''),
-
-    getChildView: function(model) {
-      var ChildView = null;
-      var paneType = model.get('paneType');
-
-      switch (paneType) {
-        case PaneType.Stream:
-          ChildView = StreamView;
-          break;
-        case PaneType.Playlist:
-          ChildView = ActivePlaylistAreaView;
-          break;
-        default:
-          // TODO: Log error
-          console.error('Unhandled pane type ' + paneType);
-      }
-
-      return ChildView;
-    }
-  });
-
-  return PanesView;
-});
\ No newline at end of file
diff --git a/src/js/foreground/view/appBar/activePaneFilterView.js b/src/js/foreground/view/appBar/activePaneFilterView.js
index 17855c16..459414f6 100644
--- a/src/js/foreground/view/appBar/activePaneFilterView.js
+++ b/src/js/foreground/view/appBar/activePaneFilterView.js
@@ -3,6 +3,7 @@
 
   var FixedPosition = require('foreground/enum/fixedPosition');
   var ViewModelContainer = require('foreground/view/behavior/viewModelContainer');
+  var LayoutType = require('common/enum/layoutType');
   var ActivePaneFilterTemplate = require('text!template/appBar/activePaneFilter.html');
 
   // A view which shows the title of the currently active pane and provides a drop-down menu for selecting another
@@ -32,6 +33,13 @@
       'change:isEnabled': '_onChangeIsEnabled'
     },
 
+    settings: null,
+
+    initialize: function(options) {
+      this.settings = options.settings;
+    },
+
+    // TODO: Review setState here, not sure if always relevant.
     onRender: function() {
       this._setState(this.model.get('isEnabled'));
     },
@@ -60,16 +68,23 @@
 
       var activePlaylist = this.model.get('activePlaylistManager').get('activePlaylist');
 
-      StreamusFG.channels.simpleMenu.commands.trigger('show:simpleMenu', {
-        top: offset.top,
-        left: offset.left,
-        simpleMenuItems: simpleMenuItems,
-        fixedMenuItem: {
+      var fixedMenuItem = null;
+      var layoutType = this.settings.get('layoutType');
+
+      if (layoutType === LayoutType.FullPane) {
+        fixedMenuItem = {
           active: _.isNull(activePlaylist),
           text: chrome.i18n.getMessage('stream'),
           fixedPosition: FixedPosition.Top,
           onClick: this._onClickFixedMenuItem.bind(this)
-        }
+        };
+      }
+
+      StreamusFG.channels.simpleMenu.commands.trigger('show:simpleMenu', {
+        top: offset.top,
+        left: offset.left,
+        simpleMenuItems: simpleMenuItems,
+        fixedMenuItem: fixedMenuItem
       });
     },
 
diff --git a/src/js/foreground/view/appBar/adminMenuAreaView.js b/src/js/foreground/view/appBar/adminMenuAreaView.js
index b0c34c23..5621098e 100644
--- a/src/js/foreground/view/appBar/adminMenuAreaView.js
+++ b/src/js/foreground/view/appBar/adminMenuAreaView.js
@@ -2,7 +2,6 @@
   'use strict';
 
   var SettingsDialogView = require('foreground/view/dialog/settingsDialogView');
-  var BrowserSettingsDialogView = require('foreground/view/dialog/browserSettingsDialogView');
   var AboutStreamusDialogView = require('foreground/view/dialog/aboutStreamusDialogView');
   var AdminMenuAreaTemplate = require('text!template/appBar/adminMenuArea.html');
   var SettingsIcon = require('text!template/icon/settingsIcon_24.svg');
@@ -13,7 +12,6 @@
 
     templateHelpers: {
       settingsMessage: chrome.i18n.getMessage('settings'),
-      browserSettingsMessage: chrome.i18n.getMessage('browserSettings'),
       keyboardShortcutsMessage: chrome.i18n.getMessage('keyboardShortcuts'),
       openInTabMessage: chrome.i18n.getMessage('openInTab'),
       aboutStreamusMessage: chrome.i18n.getMessage('aboutStreamus'),
@@ -25,7 +23,6 @@
       menuButton: '[data-ui~=menuButton]',
       menu: '[data-ui~=menu]',
       settings: '[data-ui~=settings]',
-      browserSettings: '[data-ui~=browserSettings]',
       openInTab: '[data-ui~=openInTab]',
       keyboardShortcuts: '[data-ui~=keyboardShortcuts]',
       aboutStreamus: '[data-ui~=aboutStreamus]',
@@ -35,7 +32,6 @@
     events: {
       'click @ui.menuButton': '_onClickMenuButton',
       'click @ui.settings': '_onClickSettings',
-      'click @ui.browserSettings': '_onClickBrowserSettings',
       'click @ui.keyboardShortcuts': '_onClickKeyboardShortcuts',
       'click @ui.openInTab': '_onClickOpenInTab',
       'click @ui.aboutStreamus': '_onClickAboutStreamus',
@@ -66,10 +62,6 @@
       StreamusFG.channels.dialog.commands.trigger('show:dialog', SettingsDialogView);
     },
 
-    _onClickBrowserSettings: function() {
-      StreamusFG.channels.dialog.commands.trigger('show:dialog', BrowserSettingsDialogView);
-    },
-
     _onClickKeyboardShortcuts: function() {
       this.tabManager.showKeyboardShortcutsTab();
     },
@@ -115,4 +107,4 @@
   });
 
   return AdminMenuAreaView;
-});
\ No newline at end of file
+});
diff --git a/src/js/foreground/view/appBar/appBarView.js b/src/js/foreground/view/appBar/appBarView.js
index 2f9d4f98..9eda2e1d 100644
--- a/src/js/foreground/view/appBar/appBarView.js
+++ b/src/js/foreground/view/appBar/appBarView.js
@@ -63,6 +63,7 @@
       this._setShowPlaylistsAreaButtonState(signedInUser);
 
       this.showChildView('activePaneFilter', new ActivePaneFilterView({
+        settings: StreamusFG.backgroundProperties.settings,
         model: new ActivePaneFilter({
           signInManager: StreamusFG.backgroundProperties.signInManager,
           activePlaylistManager: StreamusFG.backgroundProperties.activePlaylistManager
diff --git a/src/js/foreground/view/behavior/viewModelContainer.js b/src/js/foreground/view/behavior/viewModelContainer.js
index ca893eb4..ad4eafd5 100644
--- a/src/js/foreground/view/behavior/viewModelContainer.js
+++ b/src/js/foreground/view/behavior/viewModelContainer.js
@@ -1,6 +1,7 @@
 define(function() {
   'use strict';
 
+  // TODO: This can be used for Collections as well, but the name doesn't imply so much.
   // Provides event handler unbinding of models given to the implementing view.
   // If a view's model has bound event listeners and the view is destroyed then those event listeners
   // become a memory leak if no references to the model remain.
diff --git a/src/js/foreground/view/dialog/browserSettingsDialogView.js b/src/js/foreground/view/dialog/browserSettingsDialogView.js
deleted file mode 100644
index d26e02dd..00000000
--- a/src/js/foreground/view/dialog/browserSettingsDialogView.js
+++ /dev/null
@@ -1,29 +0,0 @@
-define(function(require) {
-  'use strict';
-
-  var Dialog = require('foreground/model/dialog/dialog');
-  var BrowserSettingsView = require('foreground/view/dialog/browserSettingsView');
-  var DialogView = require('foreground/view/dialog/dialogView');
-
-  var BrowserSettingsDialogView = DialogView.extend({
-    id: 'browserSettingsDialog',
-
-    initialize: function() {
-      this.model = new Dialog({
-        submitButtonText: chrome.i18n.getMessage('save')
-      });
-
-      this.contentView = new BrowserSettingsView({
-        model: StreamusFG.backgroundProperties.browserSettings
-      });
-
-      DialogView.prototype.initialize.apply(this, arguments);
-    },
-
-    onSubmit: function() {
-      this.contentView.save();
-    }
-  });
-
-  return BrowserSettingsDialogView;
-});
\ No newline at end of file
diff --git a/src/js/foreground/view/dialog/browserSettingsView.js b/src/js/foreground/view/dialog/browserSettingsView.js
deleted file mode 100644
index 926e46b5..00000000
--- a/src/js/foreground/view/dialog/browserSettingsView.js
+++ /dev/null
@@ -1,68 +0,0 @@
-define(function(require) {
-  'use strict';
-
-  var Checkboxes = require('foreground/collection/element/checkboxes');
-  var CheckboxView = require('foreground/view/element/checkboxView');
-  var DialogContent = require('foreground/view/behavior/dialogContent');
-  var BrowserSettingsTemplate = require('text!template/dialog/browserSettings.html');
-
-  var BrowserSettingsView = Marionette.LayoutView.extend({
-    id: 'browserSettings',
-    template: _.template(BrowserSettingsTemplate),
-
-    templateHelpers: {
-      contextMenusMessage: chrome.i18n.getMessage('contextMenus'),
-      websiteEnhancementsMessage: chrome.i18n.getMessage('websiteEnhancements')
-    },
-
-    regions: {
-      showTextSelectionContextMenu: '[data-region=showTextSelectionContextMenu]',
-      showYouTubeLinkContextMenu: '[data-region=showYouTubeLinkContextMenu]',
-      showYouTubePageContextMenu: '[data-region=showYouTubePageContextMenu]',
-      enhanceYouTube: '[data-region=enhanceYouTube]',
-      enhanceBeatport: '[data-region=enhanceBeatport]'
-    },
-
-    behaviors: {
-      DialogContent: {
-        behaviorClass: DialogContent
-      }
-    },
-
-    initialize: function() {
-      this.checkboxes = new Checkboxes();
-    },
-
-    save: function() {
-      var currentValues = {};
-
-      this.checkboxes.each(function(checkbox) {
-        currentValues[checkbox.get('property')] = checkbox.get('checked');
-      });
-
-      this.model.save(currentValues);
-    },
-
-    onRender: function() {
-      this._showCheckbox('showTextSelectionContextMenu', 'textSelection');
-      this._showCheckbox('showYouTubeLinkContextMenu', 'youTubeLinks');
-      this._showCheckbox('showYouTubePageContextMenu', 'youTubePages');
-      this._showCheckbox('enhanceYouTube', 'youTube');
-      this._showCheckbox('enhanceBeatport', 'beatport');
-    },
-
-    _showCheckbox: function(propertyName, message) {
-      var checkbox = this.checkboxes.add({
-        labelText: chrome.i18n.getMessage(message),
-        checked: this.model.get(propertyName),
-        property: propertyName
-      });
-
-      this.showChildView(propertyName, new CheckboxView({
-        model: checkbox
-      }));
-    }
-  });
-
-  return BrowserSettingsView;
-});
\ No newline at end of file
diff --git a/src/js/foreground/view/dialog/settingsView.js b/src/js/foreground/view/dialog/settingsView.js
index 06fe4ba6..6d7972a1 100644
--- a/src/js/foreground/view/dialog/settingsView.js
+++ b/src/js/foreground/view/dialog/settingsView.js
@@ -2,6 +2,7 @@
   'use strict';
 
   var SongQuality = require('common/enum/songQuality');
+  var LayoutType = require('common/enum/layoutType');
   var DesktopNotificationDurations = require('common/enum/desktopNotificationDuration');
   var Checkboxes = require('foreground/collection/element/checkboxes');
   var RadioGroups = require('foreground/collection/element/radioGroups');
@@ -22,7 +23,9 @@
       generalMessage: chrome.i18n.getMessage('general'),
       songQualityMessage: chrome.i18n.getMessage('songQuality'),
       remindersMessage: chrome.i18n.getMessage('reminders'),
-      desktopNotificationsMessage: chrome.i18n.getMessage('desktopNotifications')
+      desktopNotificationsMessage: chrome.i18n.getMessage('desktopNotifications'),
+      contextMenusMessage: chrome.i18n.getMessage('contextMenus'),
+      websiteEnhancementsMessage: chrome.i18n.getMessage('websiteEnhancements')
     },
 
     regions: {
@@ -32,8 +35,14 @@
       remindDeletePlaylist: '[data-region=remindDeletePlaylist]',
       remindLinkAccount: '[data-region=remindLinkAccount]',
       remindGoogleSignIn: '[data-region=remindGoogleSignIn]',
+      layoutType: '[data-region=layoutType]',
       desktopNotificationsEnabled: '[data-region=desktopNotificationsEnabled]',
-      desktopNotificationDuration: '[data-region=desktopNotificationDuration]'
+      desktopNotificationDuration: '[data-region=desktopNotificationDuration]',
+      showTextSelectionContextMenu: '[data-region=showTextSelectionContextMenu]',
+      showYouTubeLinkContextMenu: '[data-region=showYouTubeLinkContextMenu]',
+      showYouTubePageContextMenu: '[data-region=showYouTubePageContextMenu]',
+      enhanceYouTube: '[data-region=enhanceYouTube]',
+      enhanceBeatport: '[data-region=enhanceBeatport]'
     },
 
     behaviors: {
@@ -83,6 +92,18 @@
         labelKey: 'notificationDuration',
         options: _.values(DesktopNotificationDurations)
       });
+
+      this._showSimpleListItem({
+        propertyName: 'layoutType',
+        labelKey: 'layoutType',
+        options: _.values(LayoutType)
+      });
+
+      this._showCheckbox('showTextSelectionContextMenu', 'textSelection');
+      this._showCheckbox('showYouTubeLinkContextMenu', 'youTubeLinks');
+      this._showCheckbox('showYouTubePageContextMenu', 'youTubePages');
+      this._showSwitch('enhanceYouTube', 'youTube');
+      this._showSwitch('enhanceBeatport', 'beatport');
     },
 
     _showSimpleListItem: function(options) {
@@ -120,9 +141,9 @@
       }));
     },
 
-    _showCheckbox: function(propertyName) {
+    _showCheckbox: function(propertyName, labelKey) {
       var checkbox = this.checkboxes.add({
-        labelText: chrome.i18n.getMessage(propertyName),
+        labelText: chrome.i18n.getMessage(_.isUndefined(labelKey) ? propertyName : labelKey),
         checked: this.model.get(propertyName),
         property: propertyName
       });
@@ -169,4 +190,4 @@
   });
 
   return SettingsView;
-});
\ No newline at end of file
+});
diff --git a/src/js/foreground/view/foregroundAreaView.js b/src/js/foreground/view/foregroundAreaView.js
index 435ea165..099b6304 100644
--- a/src/js/foreground/view/foregroundAreaView.js
+++ b/src/js/foreground/view/foregroundAreaView.js
@@ -1,7 +1,7 @@
 define(function(require) {
   'use strict';
 
-  var ActivePaneRegion = require('foreground/view/activePane/activePaneRegion');
+  var ActivePanesRegion = require('foreground/view/activePane/activePanesRegion');
   var AppBarRegion = require('foreground/view/appBar/appBarRegion');
   var SimpleMenuRegion = require('foreground/view/simpleMenu/simpleMenuRegion');
   var StreamControlBarRegion = require('foreground/view/streamControlBar/streamControlBarRegion');
@@ -80,8 +80,8 @@
           signInManager: StreamusFG.backgroundProperties.signInManager
         },
         activePane: {
-          selector: '[data-region=activePane]',
-          regionClass: ActivePaneRegion
+          selector: '[data-region=activePanes]',
+          regionClass: ActivePanesRegion
         },
         selectionBar: {
           selector: '[data-region=selectionBar]',
diff --git a/src/js/foreground/view/search/searchRegion.js b/src/js/foreground/view/search/searchRegion.js
index e71f077e..bd17d72d 100644
--- a/src/js/foreground/view/search/searchRegion.js
+++ b/src/js/foreground/view/search/searchRegion.js
@@ -2,6 +2,7 @@
   'use strict';
 
   var SearchView = require('foreground/view/search/searchView');
+  var LayoutType = require('common/enum/layoutType');
 
   var SearchRegion = Marionette.Region.extend({
     settings: null,
@@ -13,9 +14,11 @@
       this.listenTo(StreamusFG.channels.search.commands, 'hide:search', this._hideSearch);
       this.listenTo(StreamusFG.channels.foregroundArea.vent, 'rendered', this._onForegroundAreaRendered);
       this.listenTo(StreamusFG.channels.foregroundArea.vent, 'idle', this._onForegroundAreaIdle);
+      this.listenTo(this.settings, 'change:layoutType', this._onSettingsChangeLayoutType);
     },
 
     _onForegroundAreaRendered: function() {
+      this._setWidth(this.settings.get('layoutType'));
       var search = StreamusFG.backgroundProperties.search;
 
       if (search.hasQuery()) {
@@ -36,6 +39,10 @@
       }
     },
 
+    _onSettingsChangeLayoutType: function(settings, layoutType) {
+      this._setWidth(layoutType);
+    },
+
     _createSearchView: function() {
       if (!this.hasView()) {
         var searchView = new SearchView({
@@ -68,6 +75,14 @@
 
     _hideSearch: function() {
       this.$el.removeClass('is-instant is-visible');
+    },
+
+    _setWidth: function(layoutType) {
+      // TODO: How can I safely get the reference to this region's element?
+      var element = this.$el.length > 0 ? this.$el : $(this.el);
+
+      element.toggleClass('is-fullWidth', layoutType === LayoutType.FullPane);
+      element.toggleClass('is-halfWidth', layoutType === LayoutType.SplitPane);
     }
   });
 
diff --git a/src/js/foreground/view/stream/clearStreamButtonView.js b/src/js/foreground/view/stream/clearStreamButtonView.js
index 142d1853..091668dc 100644
--- a/src/js/foreground/view/stream/clearStreamButtonView.js
+++ b/src/js/foreground/view/stream/clearStreamButtonView.js
@@ -11,7 +11,7 @@
     className: 'button button--flat',
     template: _.template(ClearStreamButtonTemplate),
     templateHelpers: {
-      clearStreamMessage: chrome.i18n.getMessage('clearStream')
+      clearMessage: chrome.i18n.getMessage('clear')
     },
 
     attributes: {
diff --git a/src/js/foreground/view/stream/saveStreamButtonView.js b/src/js/foreground/view/stream/saveStreamButtonView.js
index 07d9f2c5..ac37abbe 100644
--- a/src/js/foreground/view/stream/saveStreamButtonView.js
+++ b/src/js/foreground/view/stream/saveStreamButtonView.js
@@ -11,7 +11,7 @@
     className: 'button button--flat',
     template: _.template(SaveStreamButtonTemplate),
     templateHelpers: {
-      saveStreamMessage: chrome.i18n.getMessage('saveStream')
+      saveAllMessage: chrome.i18n.getMessage('saveAll')
     },
 
     attributes: {
diff --git a/src/js/foreground/view/video/videoView.js b/src/js/foreground/view/video/videoView.js
index 3dcdafd0..0dc40f95 100644
--- a/src/js/foreground/view/video/videoView.js
+++ b/src/js/foreground/view/video/videoView.js
@@ -105,7 +105,6 @@
 
     _onWindowResize: function() {
       this._setBoundingClientRect();
-      //this._setHoveredState();
     },
 
     // Whenever a video is created its time/state might not be synced with an existing video.
@@ -162,6 +161,10 @@
 
     _setHiddenState: function(isHidden) {
       this.$el.toggleClass('is-hidden', isHidden);
+
+      if (!isHidden) {
+        this._setBoundingClientRect();
+      }
     },
 
     // Determine whether the mouse is hovering over the video element and set its state accordingly.
diff --git a/src/js/test/foreground/collection/activePane/activePanes.spec.js b/src/js/test/foreground/collection/activePane/activePanes.spec.js
new file mode 100644
index 00000000..c46e73c7
--- /dev/null
+++ b/src/js/test/foreground/collection/activePane/activePanes.spec.js
@@ -0,0 +1,148 @@
+define(function(require) {
+  'use strict';
+
+  var ActivePanes = require('foreground/collection/activePane/activePanes');
+  var SignInManager = require('background/model/signInManager');
+  var Settings = require('background/model/settings');
+  var ActivePlaylistManager = require('background/model/activePlaylistManager');
+  var LayoutType = require('common/enum/layoutType');
+  var TestUtility = require('test/testUtility');
+
+  describe('Panes', function() {
+    beforeEach(function() {
+      this.collection = new ActivePanes(null, {
+        stream: TestUtility.buildStream(),
+        settings: new Settings(),
+        activePlaylistManager: new ActivePlaylistManager({
+          signInManager: new SignInManager()
+        })
+      });
+    });
+
+    afterEach(function() {
+      this.collection.stopListening();
+    });
+
+    describe('_initializePanes', function() {
+      beforeEach(function() {
+        sinon.stub(this.collection, '_addPlaylistPane');
+        sinon.stub(this.collection, '_removePlaylistPane');
+      });
+
+      afterEach(function() {
+        this.collection._addPlaylistPane.restore();
+        this.collection._removePlaylistPane.restore();
+      });
+
+      it('should call _addPlaylistPane if an active playlist exists', function() {
+        var playlist = TestUtility.buildPlaylist();
+        this.collection._initializePanes(LayoutType.FullPane, playlist);
+        expect(this.collection._addPlaylistPane.calledWith(playlist)).to.equal(true);
+      });
+
+      it('should not call _addPlaylistPane if an active playlist does not exist', function() {
+        this.collection._initializePanes(LayoutType.FullPane, null);
+        expect(this.collection._addPlaylistPane.called).to.equal(false);
+      });
+
+      it('should call _removePlaylistPane if a previously active playlist exists', function() {
+        var playlist = TestUtility.buildPlaylist();
+        this.collection._initializePanes(LayoutType.FullPane, null, playlist);
+        expect(this.collection._removePlaylistPane.calledWith(playlist)).to.equal(true);
+      });
+
+      it('should not call _removePlaylistPane if a previously active playlist does not exist', function() {
+        var playlist = TestUtility.buildPlaylist();
+        this.collection._initializePanes(LayoutType.FullPane, playlist);
+        expect(this.collection._removePlaylistPane.called).to.equal(false);
+      });
+    });
+
+    describe('_addPlaylistPane', function() {
+      it('should be able to add a playlist pane', function() {
+        var initialLength = this.collection.length;
+        this.collection._addPlaylistPane(TestUtility.buildPlaylist());
+        expect(this.collection.length).to.equal(initialLength + 1);
+      });
+    });
+
+    describe('_removePlaylistPane', function() {
+      it('should be able to remove a specific playlist pane', function() {
+        var playlist = TestUtility.buildPlaylist();
+        this.collection._addPlaylistPane(playlist);
+        var initialLength = this.collection.length;
+        this.collection._removePlaylistPane(playlist);
+        expect(this.collection.length).to.equal(initialLength - 1);
+      });
+    });
+
+    describe('_getStreamPaneVisibility', function() {
+      it('should return true if layoutType is SplitPane', function() {
+        var streamPaneVisibility = this.collection._getStreamPaneVisibility(LayoutType.SplitPane, true);
+        expect(streamPaneVisibility).to.equal(true);
+      });
+
+      it('should return true if layoutType is FullPane and no active playlist exists', function() {
+        var streamPaneVisibility = this.collection._getStreamPaneVisibility(LayoutType.FullPane, false);
+        expect(streamPaneVisibility).to.equal(true);
+      });
+
+      it('should return false if layoutType is FullPane and an active playlist exists', function() {
+        var streamPaneVisibility = this.collection._getStreamPaneVisibility(LayoutType.FullPane, true);
+        expect(streamPaneVisibility).to.equal(false);
+      });
+    });
+
+    describe('_addStreamPane', function() {
+      it('should be able to add the stream as a pane', function() {
+        var initialLength = this.collection.length;
+        this.collection._addStreamPane();
+        expect(this.collection.length).to.equal(initialLength + 1);
+      });
+    });
+
+    describe('_removeStreamPane', function() {
+      it('should be able to remove the stream pane', function() {
+        this.collection.reset();
+        this.collection._addStreamPane();
+        var initialLength = this.collection.length;
+        this.collection._removeStreamPane();
+        expect(this.collection.length).to.equal(initialLength - 1);
+      });
+    });
+
+    describe('_setStreamPaneVisibility', function() {
+      beforeEach(function() {
+        sinon.stub(this.collection, '_addStreamPane');
+        sinon.stub(this.collection, '_removeStreamPane');
+      });
+
+      afterEach(function() {
+        this.collection._addStreamPane.restore();
+        this.collection._removeStreamPane.restore();
+      });
+
+      it('should call _addStreamPane if the streamPane is visible and does not already contain it', function() {
+        this.collection.reset();
+        this.collection._setStreamPaneVisibility(LayoutType.SplitPane, false);
+        expect(this.collection._addStreamPane.called).to.equal(true);
+      });
+
+      it('should not called _addStreamPane if the streamPane is visible but is already present', function() {
+        this.collection._setStreamPaneVisibility(LayoutType.SplitPane, false);
+        expect(this.collection._addStreamPane.called).to.equal(false);
+      });
+
+      it('should call _removeStreamPane if the streamPane is not visible and is already present', function() {
+        this.collection._setStreamPaneVisibility(LayoutType.FullPane, true);
+        expect(this.collection._removeStreamPane.called).to.equal(true);
+      });
+
+      it('should not called _removeStreamPane if the streamPane is not visible and does not exist as a pane', function() {
+        this.collection.reset();
+        this.collection._setStreamPaneVisibility(LayoutType.FullPane, true);
+        expect(this.collection._removeStreamPane.called).to.equal(false);
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/js/test/foreground/foregroundSpecLoader.js b/src/js/test/foreground/foregroundSpecLoader.js
index ca49cb71..496c7d50 100644
--- a/src/js/test/foreground/foregroundSpecLoader.js
+++ b/src/js/test/foreground/foregroundSpecLoader.js
@@ -1,6 +1,10 @@
 define(function(require) {
   'use strict';
 
+  // /collection/
+  // /collection/activePane/
+  require('test/foreground/collection/activePane/activePanes.spec');
+
   // /model/
   // /model/appBar/
   require('test/foreground/model/appBar/activePaneFilter.spec');
diff --git a/src/js/test/foreground/view/activePane/activePaneSpecLoader.js b/src/js/test/foreground/view/activePane/activePaneSpecLoader.js
index 730459d1..166edbb0 100644
--- a/src/js/test/foreground/view/activePane/activePaneSpecLoader.js
+++ b/src/js/test/foreground/view/activePane/activePaneSpecLoader.js
@@ -1,5 +1,7 @@
 define(function(require) {
   'use strict';
 
+  require('test/foreground/view/activePane/activePanesRegion.spec');
+  require('test/foreground/view/activePane/activePanesView.spec');
   require('test/foreground/view/activePane/activePaneView.spec');
 });
\ No newline at end of file
diff --git a/src/js/test/foreground/view/activePane/activePaneView.spec.js b/src/js/test/foreground/view/activePane/activePaneView.spec.js
index 30c77466..f0c6d2db 100644
--- a/src/js/test/foreground/view/activePane/activePaneView.spec.js
+++ b/src/js/test/foreground/view/activePane/activePaneView.spec.js
@@ -1,25 +1,69 @@
 define(function(require) {
   'use strict';
 
+  var ActivePaneType = require('foreground/enum/activePaneType');
   var ActivePaneView = require('foreground/view/activePane/activePaneView');
-  var ActivePlaylistManager = require('background/model/activePlaylistManager');
-  var SignInManager = require('background/model/signInManager');
-  var viewTestUtility = require('test/foreground/view/viewTestUtility');
-
-  describe(ActivePaneView, function() {
-    beforeEach(function() {
-      this.documentFragment = document.createDocumentFragment();
-      this.view = new ActivePaneView({
-        activePlaylistManager: new ActivePlaylistManager({
-          signInManager: new SignInManager()
-        })
+  var ActivePane = require('foreground/model/activePane/activePane');
+  var StreamView = require('foreground/view/stream/streamView');
+  var ActivePlaylistAreaView = require('foreground/view/leftPane/activePlaylistAreaView');
+  var ViewTestUtility = require('test/foreground/view/viewTestUtility');
+  var TestUtility = require('test/testUtility');
+
+  describe('ActivePaneView', function() {
+    describe('PlaylistActivePaneView', function() {
+      beforeEach(function() {
+        this.documentFragment = document.createDocumentFragment();
+        var stream = TestUtility.buildStream();
+
+        this.view = new ActivePaneView({
+          model: new ActivePane({
+            type: ActivePaneType.Stream,
+            relatedModel: stream
+          }),
+          streamItems: stream.get('items')
+        });
       });
-    });
 
-    afterEach(function() {
-      this.view.destroy();
+      afterEach(function() {
+        this.view.destroy();
+      });
+
+      ViewTestUtility.ensureBasicAssumptions.call(this);
+
+      describe('_getContentView', function() {
+        it('should return a StreamView', function() {
+          var contentView = this.view._getContentView();
+          expect(contentView instanceof StreamView).to.equal(true);
+        });
+      });
     });
 
-    viewTestUtility.ensureBasicAssumptions.call(this);
+    describe('PlaylistActivePaneView', function() {
+      beforeEach(function() {
+        this.documentFragment = document.createDocumentFragment();
+        var stream = TestUtility.buildStream();
+
+        this.view = new ActivePaneView({
+          model: new ActivePane({
+            type: ActivePaneType.Playlist,
+            relatedModel: TestUtility.buildPlaylist()
+          }),
+          streamItems: stream.get('items')
+        });
+      });
+
+      afterEach(function() {
+        this.view.destroy();
+      });
+
+      ViewTestUtility.ensureBasicAssumptions.call(this);
+
+      describe('_getContentView', function() {
+        it('should return a ActivePlaylistAreaView', function() {
+          var contentView = this.view._getContentView();
+          expect(contentView instanceof ActivePlaylistAreaView).to.equal(true);
+        });
+      });
+    });
   });
 });
\ No newline at end of file
diff --git a/src/js/test/foreground/view/activePane/activePanesRegion.spec.js b/src/js/test/foreground/view/activePane/activePanesRegion.spec.js
new file mode 100644
index 00000000..1f80d186
--- /dev/null
+++ b/src/js/test/foreground/view/activePane/activePanesRegion.spec.js
@@ -0,0 +1,36 @@
+define(function(require) {
+  'use strict';
+
+  var ActivePanesRegion = require('foreground/view/activePane/activePanesRegion');
+
+  describe('ActivePanesRegion', function() {
+    beforeEach(function() {
+      $('body').append('<div data-region=activePanes></div>');
+
+      this.region = new ActivePanesRegion({
+        el: '[data-region=activePanes]'
+      });
+    });
+
+    afterEach(function() {
+      this.region.empty();
+      $('body').remove('[data-region=activePanes]');
+    });
+
+    describe('_onForegroundAreaRendered', function() {
+      it('should call _showActivePanesView', function() {
+        sinon.stub(this.region, '_showActivePanesView');
+        this.region._onForegroundAreaRendered();
+        expect(this.region._showActivePanesView.calledOnce).to.equal(true);
+        this.region._showActivePanesView.restore();
+      });
+    });
+
+    describe('_showActivePanesView', function() {
+      it('should successfully show a view', function() {
+        this.region._showActivePanesView();
+        expect(this.region.hasView()).to.equal(true);
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/js/test/foreground/view/activePane/activePanesView.spec.js b/src/js/test/foreground/view/activePane/activePanesView.spec.js
new file mode 100644
index 00000000..62beaa6d
--- /dev/null
+++ b/src/js/test/foreground/view/activePane/activePanesView.spec.js
@@ -0,0 +1,32 @@
+define(function(require) {
+  'use strict';
+
+  var ActivePanesView = require('foreground/view/activePane/activePanesView');
+  var ActivePanes = require('foreground/collection/activePane/activePanes');
+  var SignInManager = require('background/model/signInManager');
+  var Settings = require('background/model/settings');
+  var ActivePlaylistManager = require('background/model/activePlaylistManager');
+  var ViewTestUtility = require('test/foreground/view/viewTestUtility');
+  var TestUtility = require('test/testUtility');
+
+  describe('ActivePanesView', function() {
+    beforeEach(function() {
+      this.documentFragment = document.createDocumentFragment();
+      this.view = new ActivePanesView({
+        collection: new ActivePanes(null, {
+          stream: TestUtility.buildStream(),
+          settings: new Settings(),
+          activePlaylistManager: new ActivePlaylistManager({
+            signInManager: new SignInManager()
+          })
+        })
+      });
+    });
+
+    afterEach(function() {
+      this.view.destroy();
+    });
+
+    ViewTestUtility.ensureBasicAssumptions.call(this);
+  });
+});
\ No newline at end of file
diff --git a/src/js/test/foreground/view/dialog/browserSettingsDialogView.spec.js b/src/js/test/foreground/view/dialog/browserSettingsDialogView.spec.js
deleted file mode 100644
index 7555fc6f..00000000
--- a/src/js/test/foreground/view/dialog/browserSettingsDialogView.spec.js
+++ /dev/null
@@ -1,30 +0,0 @@
-define(function(require) {
-  'use strict';
-
-  var BrowserSettingsDialogView = require('foreground/view/dialog/browserSettingsDialogView');
-  var viewTestUtility = require('test/foreground/view/viewTestUtility');
-
-  describe('BrowserSettingsDialogView', function() {
-    beforeEach(function() {
-      this.documentFragment = document.createDocumentFragment();
-      this.view = new BrowserSettingsDialogView();
-    });
-
-    afterEach(function() {
-      this.view.destroy();
-    });
-
-    viewTestUtility.ensureBasicAssumptions.call(this);
-
-    describe('onSubmit', function() {
-      it('should save configured settings', function() {
-        sinon.stub(this.view.contentView, 'save');
-
-        this.view.onSubmit();
-        expect(this.view.contentView.save.calledOnce).to.equal(true);
-
-        this.view.contentView.save.restore();
-      });
-    });
-  });
-});
\ No newline at end of file
diff --git a/src/js/test/foreground/view/dialog/browserSettingsView.spec.js b/src/js/test/foreground/view/dialog/browserSettingsView.spec.js
deleted file mode 100644
index b7962776..00000000
--- a/src/js/test/foreground/view/dialog/browserSettingsView.spec.js
+++ /dev/null
@@ -1,22 +0,0 @@
-define(function(require) {
-  'use strict';
-
-  var BrowserSettingsView = require('foreground/view/dialog/browserSettingsView');
-  var Settings = require('background/model/settings');
-  var viewTestUtility = require('test/foreground/view/viewTestUtility');
-
-  describe('BrowserSettingsView', function() {
-    beforeEach(function() {
-      this.documentFragment = document.createDocumentFragment();
-      this.view = new BrowserSettingsView({
-        model: new Settings()
-      });
-    });
-
-    afterEach(function() {
-      this.view.destroy();
-    });
-
-    viewTestUtility.ensureBasicAssumptions.call(this);
-  });
-});
\ No newline at end of file
diff --git a/src/js/test/foreground/view/dialog/dialogSpecLoader.js b/src/js/test/foreground/view/dialog/dialogSpecLoader.js
index 214c83b2..24ed2d23 100644
--- a/src/js/test/foreground/view/dialog/dialogSpecLoader.js
+++ b/src/js/test/foreground/view/dialog/dialogSpecLoader.js
@@ -4,8 +4,6 @@
   /* jshint ignore:start */
   require('test/foreground/view/dialog/aboutStreamusDialogView.spec');
   require('test/foreground/view/dialog/aboutStreamusView.spec');
-  require('test/foreground/view/dialog/browserSettingsDialogView.spec');
-  require('test/foreground/view/dialog/browserSettingsView.spec');
   require('test/foreground/view/dialog/clearStreamDialogView.spec');
   require('test/foreground/view/dialog/clearStreamView.spec');
   require('test/foreground/view/dialog/createPlaylistDialogView.spec');
@@ -29,4 +27,4 @@
   require('test/foreground/view/dialog/updateStreamusDialogView.spec');
   require('test/foreground/view/dialog/updateStreamusView.spec');
   /* jshint ignore:end */
-});
\ No newline at end of file
+});
diff --git a/src/js/test/testUtility.js b/src/js/test/testUtility.js
index 1141dc60..e92ac4c9 100644
--- a/src/js/test/testUtility.js
+++ b/src/js/test/testUtility.js
@@ -4,6 +4,15 @@
   var Song = require('background/model/song');
   var Playlist = require('background/model/playlist');
   var PlaylistItem = require('background/model/playlistItem');
+  var Player = require('background/model/player');
+  var Stream = require('background/model/stream');
+  var Settings = require('background/model/settings');
+  var SignInManager = require('background/model/signInManager');
+  var YouTubePlayer = require('background/model/youTubePlayer');
+  var ActivePlaylistManager = require('background/model/activePlaylistManager');
+  var ShuffleButton = require('background/model/shuffleButton');
+  var RepeatButton = require('background/model/repeatButton');
+  var RadioButton = require('background/model/radioButton');
 
   var TestUtility = {
     songIdLength: 7,
@@ -64,6 +73,29 @@
       return new Playlist({
         title: 'Playlist'
       });
+    },
+
+    buildPlayer: function() {
+      var player = new Player({
+        settings: new Settings(),
+        youTubePlayer: new YouTubePlayer()
+      });
+
+      return player;
+    },
+
+    buildStream: function() {
+      var stream = new Stream({
+        player: this.buildPlayer(),
+        activePlaylistManager: new ActivePlaylistManager({
+          signInManager: new SignInManager()
+        }),
+        shuffleButton: new ShuffleButton(),
+        radioButton: new RadioButton(),
+        repeatButton: new RepeatButton()
+      });
+
+      return stream;
     }
   };
 
diff --git a/src/js/thirdParty/backbone.marionette.js b/src/js/thirdParty/backbone.marionette.js
index 667b5a76..40cbfb4f 100644
--- a/src/js/thirdParty/backbone.marionette.js
+++ b/src/js/thirdParty/backbone.marionette.js
@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v2.4.1
+// v2.4.2
 //
 // Copyright (c)2015 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -19,3801 +19,3872 @@
 
 (function(root, factory) {
 
-    /* istanbul ignore next */
-    if (typeof define === 'function' && define.amd) {
-        define(['backbone', 'underscore'], function(Backbone, _) {
-            return (root.Marionette = root.Mn = factory(root, Backbone, _));
-        });
-    } else if (typeof exports !== 'undefined') {
-        var Backbone = require('backbone');
-        var _ = require('underscore');
-        module.exports = factory(root, Backbone, _);
-    } else {
-        root.Marionette = root.Mn = factory(root, root.Backbone, root._);
-    }
+  /* istanbul ignore next */
+  if (typeof define === 'function' && define.amd) {
+    define(['backbone', 'underscore'], function(Backbone, _) {
+      return (root.Marionette = root.Mn = factory(root, Backbone, _));
+    });
+  } else if (typeof exports !== 'undefined') {
+    var Backbone = require('backbone');
+    var _ = require('underscore');
+    module.exports = factory(root, Backbone, _);
+  } else {
+    root.Marionette = root.Mn = factory(root, root.Backbone, root._);
+  }
 
 }(this, function(root, Backbone, _) {
-    'use strict';
-
-    /* istanbul ignore next */
-    // Backbone.BabySitter
-    // -------------------
-    // v0.1.6
-    //
-    // Copyright (c)2015 Derick Bailey, Muted Solutions, LLC.
-    // Distributed under MIT license
-    //
-    // http://github.com/marionettejs/backbone.babysitter
-    (function(Backbone, _) {
-        "use strict";
-        var previousChildViewContainer = Backbone.ChildViewContainer;
-        // BabySitter.ChildViewContainer
-        // -----------------------------
-        //
-        // Provide a container to store, retrieve and
-        // shut down child views.
-        Backbone.ChildViewContainer = function(Backbone, _) {
-            // Container Constructor
-            // ---------------------
-            var Container = function(views) {
-                this._views = {};
-                this._indexByModel = {};
-                this._indexByCustom = {};
-                this._updateLength();
-                _.each(views, this.add, this);
-            };
-            // Container Methods
-            // -----------------
-            _.extend(Container.prototype, {
-                // Add a view to this container. Stores the view
-                // by `cid` and makes it searchable by the model
-                // cid (and model itself). Optionally specify
-                // a custom key to store an retrieve the view.
-                add: function(view, customIndex) {
-                    var viewCid = view.cid;
-                    // store the view
-                    this._views[viewCid] = view;
-                    // index it by model
-                    if (view.model) {
-                        this._indexByModel[view.model.cid] = viewCid;
-                    }
-                    // index by custom
-                    if (customIndex) {
-                        this._indexByCustom[customIndex] = viewCid;
-                    }
-                    this._updateLength();
-                    return this;
-                },
-                // Find a view by the model that was attached to
-                // it. Uses the model's `cid` to find it.
-                findByModel: function(model) {
-                    return this.findByModelCid(model.cid);
-                },
-                // Find a view by the `cid` of the model that was attached to
-                // it. Uses the model's `cid` to find the view `cid` and
-                // retrieve the view using it.
-                findByModelCid: function(modelCid) {
-                    var viewCid = this._indexByModel[modelCid];
-                    return this.findByCid(viewCid);
-                },
-                // Find a view by a custom indexer.
-                findByCustom: function(index) {
-                    var viewCid = this._indexByCustom[index];
-                    return this.findByCid(viewCid);
-                },
-                // Find by index. This is not guaranteed to be a
-                // stable index.
-                findByIndex: function(index) {
-                    return _.values(this._views)[index];
-                },
-                // retrieve a view by its `cid` directly
-                findByCid: function(cid) {
-                    return this._views[cid];
-                },
-                // Remove a view
-                remove: function(view) {
-                    var viewCid = view.cid;
-                    // delete model index
-                    if (view.model) {
-                        delete this._indexByModel[view.model.cid];
-                    }
-                    // delete custom index
-                    _.any(this._indexByCustom, function(cid, key) {
-                        if (cid === viewCid) {
-                            delete this._indexByCustom[key];
-                            return true;
-                        }
-                    }, this);
-                    // remove the view from the container
-                    delete this._views[viewCid];
-                    // update the length
-                    this._updateLength();
-                    return this;
-                },
-                // Call a method on every view in the container,
-                // passing parameters to the call method one at a
-                // time, like `function.call`.
-                call: function(method) {
-                    this.apply(method, _.tail(arguments));
-                },
-                // Apply a method on every view in the container,
-                // passing parameters to the call method one at a
-                // time, like `function.apply`.
-                apply: function(method, args) {
-                    _.each(this._views, function(view) {
-                        if (_.isFunction(view[method])) {
-                            view[method].apply(view, args || []);
-                        }
-                    });
-                },
-                // Update the `.length` attribute on this container
-                _updateLength: function() {
-                    this.length = _.size(this._views);
-                }
-            });
-            // Borrowing this code from Backbone.Collection:
-            // http://backbonejs.org/docs/backbone.html#section-106
-            //
-            // Mix in methods from Underscore, for iteration, and other
-            // collection related features.
-            var methods = ["forEach", "each", "map", "find", "detect", "filter", "select", "reject", "every", "all", "some", "any", "include", "contains", "invoke", "toArray", "first", "initial", "rest", "last", "without", "isEmpty", "pluck", "reduce"];
-            _.each(methods, function(method) {
-                Container.prototype[method] = function() {
-                    var views = _.values(this._views);
-                    var args = [views].concat(_.toArray(arguments));
-                    return _[method].apply(_, args);
-                };
-            });
-            // return the public API
-            return Container;
-        }(Backbone, _);
-        Backbone.ChildViewContainer.VERSION = "0.1.6";
-        Backbone.ChildViewContainer.noConflict = function() {
-            Backbone.ChildViewContainer = previousChildViewContainer;
-            return this;
-        };
-        return Backbone.ChildViewContainer;
-    })(Backbone, _);
-
-    /* istanbul ignore next */
-    // Backbone.Wreqr (Backbone.Marionette)
-    // ----------------------------------
-    // v1.3.1
-    //
-    // Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
-    // Distributed under MIT license
+  'use strict';
+
+  /* istanbul ignore next */
+  // Backbone.BabySitter
+  // -------------------
+  // v0.1.7
+  //
+  // Copyright (c)2015 Derick Bailey, Muted Solutions, LLC.
+  // Distributed under MIT license
+  //
+  // http://github.com/marionettejs/backbone.babysitter
+  (function(Backbone, _) {
+    "use strict";
+    var previousChildViewContainer = Backbone.ChildViewContainer;
+    // BabySitter.ChildViewContainer
+    // -----------------------------
     //
-    // http://github.com/marionettejs/backbone.wreqr
-    (function(Backbone, _) {
-        "use strict";
-        var previousWreqr = Backbone.Wreqr;
-        var Wreqr = Backbone.Wreqr = {};
-        Backbone.Wreqr.VERSION = "1.3.1";
-        Backbone.Wreqr.noConflict = function() {
-            Backbone.Wreqr = previousWreqr;
-            return this;
+    // Provide a container to store, retrieve and
+    // shut down child views.
+    Backbone.ChildViewContainer = function(Backbone, _) {
+      // Container Constructor
+      // ---------------------
+      var Container = function(views) {
+        this._views = {};
+        this._indexByModel = {};
+        this._indexByCustom = {};
+        this._updateLength();
+        _.each(views, this.add, this);
+      };
+      // Container Methods
+      // -----------------
+      _.extend(Container.prototype, {
+        // Add a view to this container. Stores the view
+        // by `cid` and makes it searchable by the model
+        // cid (and model itself). Optionally specify
+        // a custom key to store an retrieve the view.
+        add: function(view, customIndex) {
+          var viewCid = view.cid;
+          // store the view
+          this._views[viewCid] = view;
+          // index it by model
+          if (view.model) {
+            this._indexByModel[view.model.cid] = viewCid;
+          }
+          // index by custom
+          if (customIndex) {
+            this._indexByCustom[customIndex] = viewCid;
+          }
+          this._updateLength();
+          return this;
+        },
+        // Find a view by the model that was attached to
+        // it. Uses the model's `cid` to find it.
+        findByModel: function(model) {
+          return this.findByModelCid(model.cid);
+        },
+        // Find a view by the `cid` of the model that was attached to
+        // it. Uses the model's `cid` to find the view `cid` and
+        // retrieve the view using it.
+        findByModelCid: function(modelCid) {
+          var viewCid = this._indexByModel[modelCid];
+          return this.findByCid(viewCid);
+        },
+        // Find a view by a custom indexer.
+        findByCustom: function(index) {
+          var viewCid = this._indexByCustom[index];
+          return this.findByCid(viewCid);
+        },
+        // Find by index. This is not guaranteed to be a
+        // stable index.
+        findByIndex: function(index) {
+          return _.values(this._views)[index];
+        },
+        // retrieve a view by its `cid` directly
+        findByCid: function(cid) {
+          return this._views[cid];
+        },
+        // Remove a view
+        remove: function(view) {
+          var viewCid = view.cid;
+          // delete model index
+          if (view.model) {
+            delete this._indexByModel[view.model.cid];
+          }
+          // delete custom index
+          _.any(this._indexByCustom, function(cid, key) {
+            if (cid === viewCid) {
+              delete this._indexByCustom[key];
+              return true;
+            }
+          }, this);
+          // remove the view from the container
+          delete this._views[viewCid];
+          // update the length
+          this._updateLength();
+          return this;
+        },
+        // Call a method on every view in the container,
+        // passing parameters to the call method one at a
+        // time, like `function.call`.
+        call: function(method) {
+          this.apply(method, _.tail(arguments));
+        },
+        // Apply a method on every view in the container,
+        // passing parameters to the call method one at a
+        // time, like `function.apply`.
+        apply: function(method, args) {
+          _.each(this._views, function(view) {
+            if (_.isFunction(view[method])) {
+              view[method].apply(view, args || []);
+            }
+          });
+        },
+        // Update the `.length` attribute on this container
+        _updateLength: function() {
+          this.length = _.size(this._views);
+        }
+      });
+      // Borrowing this code from Backbone.Collection:
+      // http://backbonejs.org/docs/backbone.html#section-106
+      //
+      // Mix in methods from Underscore, for iteration, and other
+      // collection related features.
+      var methods = ["forEach", "each", "map", "find", "detect", "filter", "select", "reject", "every", "all", "some", "any", "include", "contains", "invoke", "toArray", "first", "initial", "rest", "last", "without", "isEmpty", "pluck", "reduce"];
+      _.each(methods, function(method) {
+        Container.prototype[method] = function() {
+          var views = _.values(this._views);
+          var args = [views].concat(_.toArray(arguments));
+          return _[method].apply(_, args);
         };
-        // Handlers
-        // --------
-        // A registry of functions to call, given a name
-        Wreqr.Handlers = function(Backbone, _) {
-            "use strict";
-            // Constructor
-            // -----------
-            var Handlers = function(options) {
-                this.options = options;
-                this._wreqrHandlers = {};
-                if (_.isFunction(this.initialize)) {
-                    this.initialize(options);
-                }
-            };
-            Handlers.extend = Backbone.Model.extend;
-            // Instance Members
-            // ----------------
-            _.extend(Handlers.prototype, Backbone.Events, {
-                // Add multiple handlers using an object literal configuration
-                setHandlers: function(handlers) {
-                    _.each(handlers, function(handler, name) {
-                        var context = null;
-                        if (_.isObject(handler) && !_.isFunction(handler)) {
-                            context = handler.context;
-                            handler = handler.callback;
-                        }
-                        this.setHandler(name, handler, context);
-                    }, this);
-                },
-                // Add a handler for the given name, with an
-                // optional context to run the handler within
-                setHandler: function(name, handler, context) {
-                    var config = {
-                        callback: handler,
-                        context: context
-                    };
-                    this._wreqrHandlers[name] = config;
-                    this.trigger("handler:add", name, handler, context);
-                },
-                // Determine whether or not a handler is registered
-                hasHandler: function(name) {
-                    return !!this._wreqrHandlers[name];
-                },
-                // Get the currently registered handler for
-                // the specified name. Throws an exception if
-                // no handler is found.
-                getHandler: function(name) {
-                    var config = this._wreqrHandlers[name];
-                    if (!config) {
-                        return;
-                    }
-                    return function() {
-                        var args = Array.prototype.slice.apply(arguments);
-                        return config.callback.apply(config.context, args);
-                    };
-                },
-                // Remove a handler for the specified name
-                removeHandler: function(name) {
-                    delete this._wreqrHandlers[name];
-                },
-                // Remove all handlers from this registry
-                removeAllHandlers: function() {
-                    this._wreqrHandlers = {};
-                }
-            });
-            return Handlers;
-        }(Backbone, _);
-        // Wreqr.CommandStorage
-        // --------------------
-        //
-        // Store and retrieve commands for execution.
-        Wreqr.CommandStorage = function() {
-            "use strict";
-            // Constructor function
-            var CommandStorage = function(options) {
-                this.options = options;
-                this._commands = {};
-                if (_.isFunction(this.initialize)) {
-                    this.initialize(options);
-                }
-            };
-            // Instance methods
-            _.extend(CommandStorage.prototype, Backbone.Events, {
-                // Get an object literal by command name, that contains
-                // the `commandName` and the `instances` of all commands
-                // represented as an array of arguments to process
-                getCommands: function(commandName) {
-                    var commands = this._commands[commandName];
-                    // we don't have it, so add it
-                    if (!commands) {
-                        // build the configuration
-                        commands = {
-                            command: commandName,
-                            instances: []
-                        };
-                        // store it
-                        this._commands[commandName] = commands;
-                    }
-                    return commands;
-                },
-                // Add a command by name, to the storage and store the
-                // args for the command
-                addCommand: function(commandName, args) {
-                    var command = this.getCommands(commandName);
-                    command.instances.push(args);
-                },
-                // Clear all commands for the given `commandName`
-                clearCommands: function(commandName) {
-                    var command = this.getCommands(commandName);
-                    command.instances = [];
-                }
-            });
-            return CommandStorage;
-        }();
-        // Wreqr.Commands
-        // --------------
-        //
-        // A simple command pattern implementation. Register a command
-        // handler and execute it.
-        Wreqr.Commands = function(Wreqr) {
-            "use strict";
-            return Wreqr.Handlers.extend({
-                // default storage type
-                storageType: Wreqr.CommandStorage,
-                constructor: function(options) {
-                    this.options = options || {};
-                    this._initializeStorage(this.options);
-                    this.on("handler:add", this._executeCommands, this);
-                    var args = Array.prototype.slice.call(arguments);
-                    Wreqr.Handlers.prototype.constructor.apply(this, args);
-                },
-                // Execute a named command with the supplied args
-                execute: function(name, args) {
-                    name = arguments[0];
-                    args = Array.prototype.slice.call(arguments, 1);
-                    if (this.hasHandler(name)) {
-                        this.getHandler(name).apply(this, args);
-                    } else {
-                        this.storage.addCommand(name, args);
-                    }
-                },
-                // Internal method to handle bulk execution of stored commands
-                _executeCommands: function(name, handler, context) {
-                    var command = this.storage.getCommands(name);
-                    // loop through and execute all the stored command instances
-                    _.each(command.instances, function(args) {
-                        handler.apply(context, args);
-                    });
-                    this.storage.clearCommands(name);
-                },
-                // Internal method to initialize storage either from the type's
-                // `storageType` or the instance `options.storageType`.
-                _initializeStorage: function(options) {
-                    var storage;
-                    var StorageType = options.storageType || this.storageType;
-                    if (_.isFunction(StorageType)) {
-                        storage = new StorageType();
-                    } else {
-                        storage = StorageType;
-                    }
-                    this.storage = storage;
-                }
-            });
-        }(Wreqr);
-        // Wreqr.RequestResponse
-        // ---------------------
-        //
-        // A simple request/response implementation. Register a
-        // request handler, and return a response from it
-        Wreqr.RequestResponse = function(Wreqr) {
-            "use strict";
-            return Wreqr.Handlers.extend({
-                request: function() {
-                    var name = arguments[0];
-                    var args = Array.prototype.slice.call(arguments, 1);
-                    if (this.hasHandler(name)) {
-                        return this.getHandler(name).apply(this, args);
-                    }
-                }
-            });
-        }(Wreqr);
-        // Event Aggregator
-        // ----------------
-        // A pub-sub object that can be used to decouple various parts
-        // of an application through event-driven architecture.
-        Wreqr.EventAggregator = function(Backbone, _) {
-            "use strict";
-            var EA = function() { };
-            // Copy the `extend` function used by Backbone's classes
-            EA.extend = Backbone.Model.extend;
-            // Copy the basic Backbone.Events on to the event aggregator
-            _.extend(EA.prototype, Backbone.Events);
-            return EA;
-        }(Backbone, _);
-        // Wreqr.Channel
-        // --------------
-        //
-        // An object that wraps the three messaging systems:
-        // EventAggregator, RequestResponse, Commands
-        Wreqr.Channel = function(Wreqr) {
-            "use strict";
-            var Channel = function(channelName) {
-                this.vent = new Backbone.Wreqr.EventAggregator();
-                this.reqres = new Backbone.Wreqr.RequestResponse();
-                this.commands = new Backbone.Wreqr.Commands();
-                this.channelName = channelName;
-            };
-            _.extend(Channel.prototype, {
-                // Remove all handlers from the messaging systems of this channel
-                reset: function() {
-                    this.vent.off();
-                    this.vent.stopListening();
-                    this.reqres.removeAllHandlers();
-                    this.commands.removeAllHandlers();
-                    return this;
-                },
-                // Connect a hash of events; one for each messaging system
-                connectEvents: function(hash, context) {
-                    this._connect("vent", hash, context);
-                    return this;
-                },
-                connectCommands: function(hash, context) {
-                    this._connect("commands", hash, context);
-                    return this;
-                },
-                connectRequests: function(hash, context) {
-                    this._connect("reqres", hash, context);
-                    return this;
-                },
-                // Attach the handlers to a given message system `type`
-                _connect: function(type, hash, context) {
-                    if (!hash) {
-                        return;
-                    }
-                    context = context || this;
-                    var method = type === "vent" ? "on" : "setHandler";
-                    _.each(hash, function(fn, eventName) {
-                        this[type][method](eventName, _.bind(fn, context));
-                    }, this);
-                }
-            });
-            return Channel;
-        }(Wreqr);
-        // Wreqr.Radio
-        // --------------
-        //
-        // An object that lets you communicate with many channels.
-        Wreqr.radio = function(Wreqr) {
-            "use strict";
-            var Radio = function() {
-                this._channels = {};
-                this.vent = {};
-                this.commands = {};
-                this.reqres = {};
-                this._proxyMethods();
-            };
-            _.extend(Radio.prototype, {
-                channel: function(channelName) {
-                    if (!channelName) {
-                        throw new Error("Channel must receive a name");
-                    }
-                    return this._getChannel(channelName);
-                },
-                _getChannel: function(channelName) {
-                    var channel = this._channels[channelName];
-                    if (!channel) {
-                        channel = new Wreqr.Channel(channelName);
-                        this._channels[channelName] = channel;
-                    }
-                    return channel;
-                },
-                _proxyMethods: function() {
-                    _.each(["vent", "commands", "reqres"], function(system) {
-                        _.each(messageSystems[system], function(method) {
-                            this[system][method] = proxyMethod(this, system, method);
-                        }, this);
-                    }, this);
-                }
-            });
-            var messageSystems = {
-                vent: ["on", "off", "trigger", "once", "stopListening", "listenTo", "listenToOnce"],
-                commands: ["execute", "setHandler", "setHandlers", "removeHandler", "removeAllHandlers"],
-                reqres: ["request", "setHandler", "setHandlers", "removeHandler", "removeAllHandlers"]
-            };
-            var proxyMethod = function(radio, system, method) {
-                return function(channelName) {
-                    var messageSystem = radio._getChannel(channelName)[system];
-                    var args = Array.prototype.slice.call(arguments, 1);
-                    return messageSystem[method].apply(messageSystem, args);
-                };
-            };
-            return new Radio();
-        }(Wreqr);
-        return Backbone.Wreqr;
-    })(Backbone, _);
-
-    var previousMarionette = root.Marionette;
-    var previousMn = root.Mn;
-
-    var Marionette = Backbone.Marionette = {};
-
-    Marionette.VERSION = '2.4.1';
-
-    Marionette.noConflict = function() {
-        root.Marionette = previousMarionette;
-        root.Mn = previousMn;
-        return this;
+      });
+      // return the public API
+      return Container;
+    }(Backbone, _);
+    Backbone.ChildViewContainer.VERSION = "0.1.7";
+    Backbone.ChildViewContainer.noConflict = function() {
+      Backbone.ChildViewContainer = previousChildViewContainer;
+      return this;
     };
-
-    Backbone.Marionette = Marionette;
-
-    // Get the Deferred creator for later use
-    Marionette.Deferred = Backbone.$.Deferred;
-
-    /* jshint unused: false *//* global console */
-
-    // Helpers
-    // -------
-
-    // Marionette.extend
-    // -----------------
-
-    // Borrow the Backbone `extend` method so we can use it as needed
-    Marionette.extend = Backbone.Model.extend;
-
-    // Marionette.isNodeAttached
-    // -------------------------
-
-    // Determine if `el` is a child of the document
-    Marionette.isNodeAttached = function(el) {
-        return Backbone.$.contains(document.documentElement, el);
-    };
-
-    // Merge `keys` from `options` onto `this`
-    Marionette.mergeOptions = function(options, keys) {
-        if (!options) { return; }
-        _.extend(this, _.pick(options, keys));
+    return Backbone.ChildViewContainer;
+  })(Backbone, _);
+
+  /* istanbul ignore next */
+  // Backbone.Wreqr (Backbone.Marionette)
+  // ----------------------------------
+  // v1.3.3
+  //
+  // Copyright (c)2015 Derick Bailey, Muted Solutions, LLC.
+  // Distributed under MIT license
+  //
+  // http://github.com/marionettejs/backbone.wreqr
+  (function(Backbone, _) {
+    "use strict";
+    var previousWreqr = Backbone.Wreqr;
+    var Wreqr = Backbone.Wreqr = {};
+    Backbone.Wreqr.VERSION = "1.3.3";
+    Backbone.Wreqr.noConflict = function() {
+      Backbone.Wreqr = previousWreqr;
+      return this;
     };
-
-    // Marionette.getOption
-    // --------------------
-
-    // Retrieve an object, function or other value from a target
-    // object or its `options`, with `options` taking precedence.
-    Marionette.getOption = function(target, optionName) {
-        if (!target || !optionName) { return; }
-        if (target.options && (target.options[optionName] !== undefined)) {
-            return target.options[optionName];
-        } else {
-            return target[optionName];
+    // Handlers
+    // --------
+    // A registry of functions to call, given a name
+    Wreqr.Handlers = function(Backbone, _) {
+      "use strict";
+      // Constructor
+      // -----------
+      var Handlers = function(options) {
+        this.options = options;
+        this._wreqrHandlers = {};
+        if (_.isFunction(this.initialize)) {
+          this.initialize(options);
         }
-    };
-
-    // Proxy `Marionette.getOption`
-    Marionette.proxyGetOption = function(optionName) {
-        return Marionette.getOption(this, optionName);
-    };
-
-    // Similar to `_.result`, this is a simple helper
-    // If a function is provided we call it with context
-    // otherwise just return the value. If the value is
-    // undefined return a default value
-    Marionette._getValue = function(value, context, params) {
-        if (_.isFunction(value)) {
-            value = params ? value.apply(context, params) : value.call(context);
+      };
+      Handlers.extend = Backbone.Model.extend;
+      // Instance Members
+      // ----------------
+      _.extend(Handlers.prototype, Backbone.Events, {
+        // Add multiple handlers using an object literal configuration
+        setHandlers: function(handlers) {
+          _.each(handlers, function(handler, name) {
+            var context = null;
+            if (_.isObject(handler) && !_.isFunction(handler)) {
+              context = handler.context;
+              handler = handler.callback;
+            }
+            this.setHandler(name, handler, context);
+          }, this);
+        },
+        // Add a handler for the given name, with an
+        // optional context to run the handler within
+        setHandler: function(name, handler, context) {
+          var config = {
+            callback: handler,
+            context: context
+          };
+          this._wreqrHandlers[name] = config;
+          this.trigger("handler:add", name, handler, context);
+        },
+        // Determine whether or not a handler is registered
+        hasHandler: function(name) {
+          return !!this._wreqrHandlers[name];
+        },
+        // Get the currently registered handler for
+        // the specified name. Throws an exception if
+        // no handler is found.
+        getHandler: function(name) {
+          var config = this._wreqrHandlers[name];
+          if (!config) {
+            return;
+          }
+          return function() {
+            return config.callback.apply(config.context, arguments);
+          };
+        },
+        // Remove a handler for the specified name
+        removeHandler: function(name) {
+          delete this._wreqrHandlers[name];
+        },
+        // Remove all handlers from this registry
+        removeAllHandlers: function() {
+          this._wreqrHandlers = {};
         }
-        return value;
-    };
-
-    // Marionette.normalizeMethods
-    // ----------------------
-
-    // Pass in a mapping of events => functions or function names
-    // and return a mapping of events => functions
-    Marionette.normalizeMethods = function(hash) {
-        return _.reduce(hash, function(normalizedHash, method, name) {
-            if (!_.isFunction(method)) {
-                method = this[method];
-            }
-            if (method) {
-                normalizedHash[name] = method;
-            }
-            return normalizedHash;
-        }, {}, this);
-    };
-
-    // utility method for parsing @ui. syntax strings
-    // into associated selector
-    Marionette.normalizeUIString = function(uiString, ui) {
-        return uiString.replace(/@ui\.[a-zA-Z_$0-9]*/g, function(r) {
-            return ui[r.slice(4)];
-        });
-    };
-
-    // allows for the use of the @ui. syntax within
-    // a given key for triggers and events
-    // swaps the @ui with the associated selector.
-    // Returns a new, non-mutated, parsed events hash.
-    Marionette.normalizeUIKeys = function(hash, ui) {
-        return _.reduce(hash, function(memo, val, key) {
-            var normalizedKey = Marionette.normalizeUIString(key, ui);
-            memo[normalizedKey] = val;
-            return memo;
-        }, {});
-    };
-
-    // allows for the use of the @ui. syntax within
-    // a given value for regions
-    // swaps the @ui with the associated selector
-    Marionette.normalizeUIValues = function(hash, ui, properties) {
-        _.each(hash, function(val, key) {
-            if (_.isString(val)) {
-                hash[key] = Marionette.normalizeUIString(val, ui);
-            } else if (_.isObject(val) && _.isArray(properties)) {
-                _.extend(val, Marionette.normalizeUIValues(_.pick(val, properties), ui));
-                /* Value is an object, and we got an array of embedded property names to normalize. */
-                _.each(properties, function(property) {
-                    var propertyVal = val[property];
-                    if (_.isString(propertyVal)) {
-                        val[property] = Marionette.normalizeUIString(propertyVal, ui);
-                    }
-                });
-            }
-        });
-        return hash;
-    };
-
-    // Mix in methods from Underscore, for iteration, and other
-    // collection related features.
-    // Borrowing this code from Backbone.Collection:
-    // http://backbonejs.org/docs/backbone.html#section-121
-    Marionette.actAsCollection = function(object, listProperty) {
-        var methods = ['forEach', 'each', 'map', 'find', 'detect', 'filter',
-          'select', 'reject', 'every', 'all', 'some', 'any', 'include',
-          'contains', 'invoke', 'toArray', 'first', 'initial', 'rest',
-          'last', 'without', 'isEmpty', 'pluck'];
-
-        _.each(methods, function(method) {
-            object[method] = function() {
-                var list = _.values(_.result(this, listProperty));
-                var args = [list].concat(_.toArray(arguments));
-                return _[method].apply(_, args);
-            };
-        });
-    };
-
-    var deprecate = Marionette.deprecate = function(message, test) {
-        if (_.isObject(message)) {
-            message = (
-              message.prev + ' is going to be removed in the future. ' +
-              'Please use ' + message.next + ' instead.' +
-              (message.url ? ' See: ' + message.url : '')
-            );
+      });
+      return Handlers;
+    }(Backbone, _);
+    // Wreqr.CommandStorage
+    // --------------------
+    //
+    // Store and retrieve commands for execution.
+    Wreqr.CommandStorage = function() {
+      "use strict";
+      // Constructor function
+      var CommandStorage = function(options) {
+        this.options = options;
+        this._commands = {};
+        if (_.isFunction(this.initialize)) {
+          this.initialize(options);
         }
-
-        if ((test === undefined || !test) && !deprecate._cache[message]) {
-            deprecate._warn('Deprecation warning: ' + message);
-            deprecate._cache[message] = true;
+      };
+      // Instance methods
+      _.extend(CommandStorage.prototype, Backbone.Events, {
+        // Get an object literal by command name, that contains
+        // the `commandName` and the `instances` of all commands
+        // represented as an array of arguments to process
+        getCommands: function(commandName) {
+          var commands = this._commands[commandName];
+          // we don't have it, so add it
+          if (!commands) {
+            // build the configuration
+            commands = {
+              command: commandName,
+              instances: []
+            };
+            // store it
+            this._commands[commandName] = commands;
+          }
+          return commands;
+        },
+        // Add a command by name, to the storage and store the
+        // args for the command
+        addCommand: function(commandName, args) {
+          var command = this.getCommands(commandName);
+          command.instances.push(args);
+        },
+        // Clear all commands for the given `commandName`
+        clearCommands: function(commandName) {
+          var command = this.getCommands(commandName);
+          command.instances = [];
         }
-    };
-
-    deprecate._warn = typeof console !== 'undefined' && (console.warn || console.log) || function() { };
-    deprecate._cache = {};
-
-    /* jshint maxstatements: 14, maxcomplexity: 7 */
-
-    // Trigger Method
+      });
+      return CommandStorage;
+    }();
+    // Wreqr.Commands
     // --------------
-
-    Marionette._triggerMethod = (function() {
-        // split the event name on the ":"
-        var splitter = /(^|:)(\w)/gi;
-
-        // take the event section ("section1:section2:section3")
-        // and turn it in to uppercase name
-        function getEventName(match, prefix, eventName) {
-            return eventName.toUpperCase();
-        }
-
-        return function(context, event, args) {
-            var noEventArg = arguments.length < 3;
-            if (noEventArg) {
-                args = event;
-                event = args[0];
-            }
-
-            // get the method name from the event name
-            var methodName = 'on' + event.replace(splitter, getEventName);
-            var method = context[methodName];
-            var result;
-
-            // call the onMethodName if it exists
-            if (_.isFunction(method)) {
-                // pass all args, except the event name
-                result = method.apply(context, noEventArg ? _.rest(args) : args);
-            }
-
-            // trigger the event, if a trigger method exists
-            if (_.isFunction(context.trigger)) {
-                if (noEventArg + args.length > 1) {
-                    context.trigger.apply(context, noEventArg ? args : [event].concat(_.drop(args, 0)));
-                } else {
-                    context.trigger(event);
-                }
-            }
-
-            return result;
-        };
-    })();
-
-    // Trigger an event and/or a corresponding method name. Examples:
-    //
-    // `this.triggerMethod("foo")` will trigger the "foo" event and
-    // call the "onFoo" method.
     //
-    // `this.triggerMethod("foo:bar")` will trigger the "foo:bar" event and
-    // call the "onFooBar" method.
-    Marionette.triggerMethod = function(event) {
-        return Marionette._triggerMethod(this, arguments);
-    };
-
-    // triggerMethodOn invokes triggerMethod on a specific context
-    //
-    // e.g. `Marionette.triggerMethodOn(view, 'show')`
-    // will trigger a "show" event or invoke onShow the view.
-    Marionette.triggerMethodOn = function(context) {
-        var fnc = _.isFunction(context.triggerMethod) ?
-                      context.triggerMethod :
-                      Marionette.triggerMethod;
-
-        return fnc.apply(context, _.rest(arguments));
-    };
-
-    // DOM Refresh
-    // -----------
-
-    // Monitor a view's state, and after it has been rendered and shown
-    // in the DOM, trigger a "dom:refresh" event every time it is
-    // re-rendered.
-
-    Marionette.MonitorDOMRefresh = function(view) {
-
-        // track when the view has been shown in the DOM,
-        // using a Marionette.Region (or by other means of triggering "show")
-        function handleShow() {
-            view._isShown = true;
-            triggerDOMRefresh();
-        }
-
-        // track when the view has been rendered
-        function handleRender() {
-            view._isRendered = true;
-            triggerDOMRefresh();
-        }
-
-        // Trigger the "dom:refresh" event and corresponding "onDomRefresh" method
-        function triggerDOMRefresh() {
-            if (view._isShown && view._isRendered && Marionette.isNodeAttached(view.el)) {
-                if (_.isFunction(view.triggerMethod)) {
-                    view.triggerMethod('dom:refresh');
-                }
-            }
+    // A simple command pattern implementation. Register a command
+    // handler and execute it.
+    Wreqr.Commands = function(Wreqr, _) {
+      "use strict";
+      return Wreqr.Handlers.extend({
+        // default storage type
+        storageType: Wreqr.CommandStorage,
+        constructor: function(options) {
+          this.options = options || {};
+          this._initializeStorage(this.options);
+          this.on("handler:add", this._executeCommands, this);
+          Wreqr.Handlers.prototype.constructor.apply(this, arguments);
+        },
+        // Execute a named command with the supplied args
+        execute: function(name) {
+          name = arguments[0];
+          var args = _.rest(arguments);
+          if (this.hasHandler(name)) {
+            this.getHandler(name).apply(this, args);
+          } else {
+            this.storage.addCommand(name, args);
+          }
+        },
+        // Internal method to handle bulk execution of stored commands
+        _executeCommands: function(name, handler, context) {
+          var command = this.storage.getCommands(name);
+          // loop through and execute all the stored command instances
+          _.each(command.instances, function(args) {
+            handler.apply(context, args);
+          });
+          this.storage.clearCommands(name);
+        },
+        // Internal method to initialize storage either from the type's
+        // `storageType` or the instance `options.storageType`.
+        _initializeStorage: function(options) {
+          var storage;
+          var StorageType = options.storageType || this.storageType;
+          if (_.isFunction(StorageType)) {
+            storage = new StorageType();
+          } else {
+            storage = StorageType;
+          }
+          this.storage = storage;
         }
-
-        view.on({
-            show: handleShow,
-            render: handleRender
-        });
-    };
-
-    /* jshint maxparams: 5 */
-
-    // Bind Entity Events & Unbind Entity Events
-    // -----------------------------------------
-    //
-    // These methods are used to bind/unbind a backbone "entity" (e.g. collection/model)
-    // to methods on a target object.
+      });
+    }(Wreqr, _);
+    // Wreqr.RequestResponse
+    // ---------------------
     //
-    // The first parameter, `target`, must have the Backbone.Events module mixed in.
-    //
-    // The second parameter is the `entity` (Backbone.Model, Backbone.Collection or
-    // any object that has Backbone.Events mixed in) to bind the events from.
+    // A simple request/response implementation. Register a
+    // request handler, and return a response from it
+    Wreqr.RequestResponse = function(Wreqr, _) {
+      "use strict";
+      return Wreqr.Handlers.extend({
+        request: function(name) {
+          if (this.hasHandler(name)) {
+            return this.getHandler(name).apply(this, _.rest(arguments));
+          }
+        }
+      });
+    }(Wreqr, _);
+    // Event Aggregator
+    // ----------------
+    // A pub-sub object that can be used to decouple various parts
+    // of an application through event-driven architecture.
+    Wreqr.EventAggregator = function(Backbone, _) {
+      "use strict";
+      var EA = function() { };
+      // Copy the `extend` function used by Backbone's classes
+      EA.extend = Backbone.Model.extend;
+      // Copy the basic Backbone.Events on to the event aggregator
+      _.extend(EA.prototype, Backbone.Events);
+      return EA;
+    }(Backbone, _);
+    // Wreqr.Channel
+    // --------------
     //
-    // The third parameter is a hash of { "event:name": "eventHandler" }
-    // configuration. Multiple handlers can be separated by a space. A
-    // function can be supplied instead of a string handler name.
-
-    (function(Marionette) {
-        'use strict';
-
-        // Bind the event to handlers specified as a string of
-        // handler names on the target object
-        function bindFromStrings(target, entity, evt, methods) {
-            var methodNames = methods.split(/\s+/);
-
-            _.each(methodNames, function(methodName) {
-
-                var method = target[methodName];
-                if (!method) {
-                    throw new Marionette.Error('Method "' + methodName +
-                      '" was configured as an event handler, but does not exist.');
-                }
-
-                target.listenTo(entity, evt, method);
-            });
+    // An object that wraps the three messaging systems:
+    // EventAggregator, RequestResponse, Commands
+    Wreqr.Channel = function(Wreqr) {
+      "use strict";
+      var Channel = function(channelName) {
+        this.vent = new Backbone.Wreqr.EventAggregator();
+        this.reqres = new Backbone.Wreqr.RequestResponse();
+        this.commands = new Backbone.Wreqr.Commands();
+        this.channelName = channelName;
+      };
+      _.extend(Channel.prototype, {
+        // Remove all handlers from the messaging systems of this channel
+        reset: function() {
+          this.vent.off();
+          this.vent.stopListening();
+          this.reqres.removeAllHandlers();
+          this.commands.removeAllHandlers();
+          return this;
+        },
+        // Connect a hash of events; one for each messaging system
+        connectEvents: function(hash, context) {
+          this._connect("vent", hash, context);
+          return this;
+        },
+        connectCommands: function(hash, context) {
+          this._connect("commands", hash, context);
+          return this;
+        },
+        connectRequests: function(hash, context) {
+          this._connect("reqres", hash, context);
+          return this;
+        },
+        // Attach the handlers to a given message system `type`
+        _connect: function(type, hash, context) {
+          if (!hash) {
+            return;
+          }
+          context = context || this;
+          var method = type === "vent" ? "on" : "setHandler";
+          _.each(hash, function(fn, eventName) {
+            this[type][method](eventName, _.bind(fn, context));
+          }, this);
         }
-
-        // Bind the event to a supplied callback function
-        function bindToFunction(target, entity, evt, method) {
-            target.listenTo(entity, evt, method);
+      });
+      return Channel;
+    }(Wreqr);
+    // Wreqr.Radio
+    // --------------
+    //
+    // An object that lets you communicate with many channels.
+    Wreqr.radio = function(Wreqr, _) {
+      "use strict";
+      var Radio = function() {
+        this._channels = {};
+        this.vent = {};
+        this.commands = {};
+        this.reqres = {};
+        this._proxyMethods();
+      };
+      _.extend(Radio.prototype, {
+        channel: function(channelName) {
+          if (!channelName) {
+            throw new Error("Channel must receive a name");
+          }
+          return this._getChannel(channelName);
+        },
+        _getChannel: function(channelName) {
+          var channel = this._channels[channelName];
+          if (!channel) {
+            channel = new Wreqr.Channel(channelName);
+            this._channels[channelName] = channel;
+          }
+          return channel;
+        },
+        _proxyMethods: function() {
+          _.each(["vent", "commands", "reqres"], function(system) {
+            _.each(messageSystems[system], function(method) {
+              this[system][method] = proxyMethod(this, system, method);
+            }, this);
+          }, this);
         }
+      });
+      var messageSystems = {
+        vent: ["on", "off", "trigger", "once", "stopListening", "listenTo", "listenToOnce"],
+        commands: ["execute", "setHandler", "setHandlers", "removeHandler", "removeAllHandlers"],
+        reqres: ["request", "setHandler", "setHandlers", "removeHandler", "removeAllHandlers"]
+      };
+      var proxyMethod = function(radio, system, method) {
+        return function(channelName) {
+          var messageSystem = radio._getChannel(channelName)[system];
+          return messageSystem[method].apply(messageSystem, _.rest(arguments));
+        };
+      };
+      return new Radio();
+    }(Wreqr, _);
+    return Backbone.Wreqr;
+  })(Backbone, _);
 
-        // Bind the event to handlers specified as a string of
-        // handler names on the target object
-        function unbindFromStrings(target, entity, evt, methods) {
-            var methodNames = methods.split(/\s+/);
-
-            _.each(methodNames, function(methodName) {
-                var method = target[methodName];
-                target.stopListening(entity, evt, method);
-            });
-        }
+  var previousMarionette = root.Marionette;
+  var previousMn = root.Mn;
 
-        // Bind the event to a supplied callback function
-        function unbindToFunction(target, entity, evt, method) {
-            target.stopListening(entity, evt, method);
-        }
+  var Marionette = Backbone.Marionette = {};
 
-        // generic looping function
-        function iterateEvents(target, entity, bindings, functionCallback, stringCallback) {
-            if (!entity || !bindings) { return; }
+  Marionette.VERSION = '2.4.2';
 
-            // type-check bindings
-            if (!_.isObject(bindings)) {
-                throw new Marionette.Error({
-                    message: 'Bindings must be an object or function.',
-                    url: 'marionette.functions.html#marionettebindentityevents'
-                });
-            }
+  Marionette.noConflict = function() {
+    root.Marionette = previousMarionette;
+    root.Mn = previousMn;
+    return this;
+  };
 
-            // allow the bindings to be a function
-            bindings = Marionette._getValue(bindings, target);
+  Backbone.Marionette = Marionette;
 
-            // iterate the bindings and bind them
-            _.each(bindings, function(methods, evt) {
+  // Get the Deferred creator for later use
+  Marionette.Deferred = Backbone.$.Deferred;
 
-                // allow for a function as the handler,
-                // or a list of event names as a string
-                if (_.isFunction(methods)) {
-                    functionCallback(target, entity, evt, methods);
-                } else {
-                    stringCallback(target, entity, evt, methods);
-                }
+  /* jshint unused: false *//* global console */
 
-            });
-        }
+  // Helpers
+  // -------
 
-        // Export Public API
-        Marionette.bindEntityEvents = function(target, entity, bindings) {
-            iterateEvents(target, entity, bindings, bindToFunction, bindFromStrings);
-        };
+  // Marionette.extend
+  // -----------------
 
-        Marionette.unbindEntityEvents = function(target, entity, bindings) {
-            iterateEvents(target, entity, bindings, unbindToFunction, unbindFromStrings);
-        };
+  // Borrow the Backbone `extend` method so we can use it as needed
+  Marionette.extend = Backbone.Model.extend;
 
-        // Proxy `bindEntityEvents`
-        Marionette.proxyBindEntityEvents = function(entity, bindings) {
-            return Marionette.bindEntityEvents(this, entity, bindings);
-        };
+  // Marionette.isNodeAttached
+  // -------------------------
 
-        // Proxy `unbindEntityEvents`
-        Marionette.proxyUnbindEntityEvents = function(entity, bindings) {
-            return Marionette.unbindEntityEvents(this, entity, bindings);
-        };
-    })(Marionette);
+  // Determine if `el` is a child of the document
+  Marionette.isNodeAttached = function(el) {
+    return Backbone.$.contains(document.documentElement, el);
+  };
 
+  // Merge `keys` from `options` onto `this`
+  Marionette.mergeOptions = function(options, keys) {
+    if (!options) { return; }
+    _.extend(this, _.pick(options, keys));
+  };
 
-    // Error
-    // -----
+  // Marionette.getOption
+  // --------------------
 
-    var errorProps = ['description', 'fileName', 'lineNumber', 'name', 'message', 'number'];
+  // Retrieve an object, function or other value from a target
+  // object or its `options`, with `options` taking precedence.
+  Marionette.getOption = function(target, optionName) {
+    if (!target || !optionName) { return; }
+    if (target.options && (target.options[optionName] !== undefined)) {
+      return target.options[optionName];
+    } else {
+      return target[optionName];
+    }
+  };
+
+  // Proxy `Marionette.getOption`
+  Marionette.proxyGetOption = function(optionName) {
+    return Marionette.getOption(this, optionName);
+  };
+
+  // Similar to `_.result`, this is a simple helper
+  // If a function is provided we call it with context
+  // otherwise just return the value. If the value is
+  // undefined return a default value
+  Marionette._getValue = function(value, context, params) {
+    if (_.isFunction(value)) {
+      value = params ? value.apply(context, params) : value.call(context);
+    }
+    return value;
+  };
+
+  // Marionette.normalizeMethods
+  // ----------------------
+
+  // Pass in a mapping of events => functions or function names
+  // and return a mapping of events => functions
+  Marionette.normalizeMethods = function(hash) {
+    return _.reduce(hash, function(normalizedHash, method, name) {
+      if (!_.isFunction(method)) {
+        method = this[method];
+      }
+      if (method) {
+        normalizedHash[name] = method;
+      }
+      return normalizedHash;
+    }, {}, this);
+  };
+
+  // utility method for parsing @ui. syntax strings
+  // into associated selector
+  Marionette.normalizeUIString = function(uiString, ui) {
+    return uiString.replace(/@ui\.[a-zA-Z_$0-9]*/g, function(r) {
+      return ui[r.slice(4)];
+    });
+  };
+
+  // allows for the use of the @ui. syntax within
+  // a given key for triggers and events
+  // swaps the @ui with the associated selector.
+  // Returns a new, non-mutated, parsed events hash.
+  Marionette.normalizeUIKeys = function(hash, ui) {
+    return _.reduce(hash, function(memo, val, key) {
+      var normalizedKey = Marionette.normalizeUIString(key, ui);
+      memo[normalizedKey] = val;
+      return memo;
+    }, {});
+  };
+
+  // allows for the use of the @ui. syntax within
+  // a given value for regions
+  // swaps the @ui with the associated selector
+  Marionette.normalizeUIValues = function(hash, ui, properties) {
+    _.each(hash, function(val, key) {
+      if (_.isString(val)) {
+        hash[key] = Marionette.normalizeUIString(val, ui);
+      } else if (_.isObject(val) && _.isArray(properties)) {
+        _.extend(val, Marionette.normalizeUIValues(_.pick(val, properties), ui));
+        /* Value is an object, and we got an array of embedded property names to normalize. */
+        _.each(properties, function(property) {
+          var propertyVal = val[property];
+          if (_.isString(propertyVal)) {
+            val[property] = Marionette.normalizeUIString(propertyVal, ui);
+          }
+        });
+      }
+    });
+    return hash;
+  };
+
+  // Mix in methods from Underscore, for iteration, and other
+  // collection related features.
+  // Borrowing this code from Backbone.Collection:
+  // http://backbonejs.org/docs/backbone.html#section-121
+  Marionette.actAsCollection = function(object, listProperty) {
+    var methods = ['forEach', 'each', 'map', 'find', 'detect', 'filter',
+      'select', 'reject', 'every', 'all', 'some', 'any', 'include',
+      'contains', 'invoke', 'toArray', 'first', 'initial', 'rest',
+      'last', 'without', 'isEmpty', 'pluck'];
+
+    _.each(methods, function(method) {
+      object[method] = function() {
+        var list = _.values(_.result(this, listProperty));
+        var args = [list].concat(_.toArray(arguments));
+        return _[method].apply(_, args);
+      };
+    });
+  };
+
+  var deprecate = Marionette.deprecate = function(message, test) {
+    if (_.isObject(message)) {
+      message = (
+        message.prev + ' is going to be removed in the future. ' +
+        'Please use ' + message.next + ' instead.' +
+        (message.url ? ' See: ' + message.url : '')
+      );
+    }
 
-    Marionette.Error = Marionette.extend.call(Error, {
-        urlRoot: 'http://marionettejs.com/docs/v' + Marionette.VERSION + '/',
+    if ((test === undefined || !test) && !deprecate._cache[message]) {
+      deprecate._warn('Deprecation warning: ' + message);
+      deprecate._cache[message] = true;
+    }
+  };
 
-        constructor: function(message, options) {
-            if (_.isObject(message)) {
-                options = message;
-                message = options.message;
-            } else if (!options) {
-                options = {};
-            }
+  deprecate._warn = typeof console !== 'undefined' && (console.warn || console.log) || function() { };
+  deprecate._cache = {};
 
-            var error = Error.call(this, message);
-            _.extend(this, _.pick(error, errorProps), _.pick(options, errorProps));
+  /* jshint maxstatements: 14, maxcomplexity: 7 */
 
-            this.captureStackTrace();
+  // Trigger Method
+  // --------------
 
-            if (options.url) {
-                this.url = this.urlRoot + options.url;
-            }
-        },
+  Marionette._triggerMethod = (function() {
+    // split the event name on the ":"
+    var splitter = /(^|:)(\w)/gi;
 
-        captureStackTrace: function() {
-            if (Error.captureStackTrace) {
-                Error.captureStackTrace(this, Marionette.Error);
-            }
-        },
+    // take the event section ("section1:section2:section3")
+    // and turn it in to uppercase name
+    function getEventName(match, prefix, eventName) {
+      return eventName.toUpperCase();
+    }
 
-        toString: function() {
-            return this.name + ': ' + this.message + (this.url ? ' See: ' + this.url : '');
+    return function(context, event, args) {
+      var noEventArg = arguments.length < 3;
+      if (noEventArg) {
+        args = event;
+        event = args[0];
+      }
+
+      // get the method name from the event name
+      var methodName = 'on' + event.replace(splitter, getEventName);
+      var method = context[methodName];
+      var result;
+
+      // call the onMethodName if it exists
+      if (_.isFunction(method)) {
+        // pass all args, except the event name
+        result = method.apply(context, noEventArg ? _.rest(args) : args);
+      }
+
+      // trigger the event, if a trigger method exists
+      if (_.isFunction(context.trigger)) {
+        if (noEventArg + args.length > 1) {
+          context.trigger.apply(context, noEventArg ? args : [event].concat(_.drop(args, 0)));
+        } else {
+          context.trigger(event);
         }
-    });
-
-    Marionette.Error.extend = Marionette.extend;
+      }
 
-    // Callbacks
-    // ---------
-
-    // A simple way of managing a collection of callbacks
-    // and executing them at a later point in time, using jQuery's
-    // `Deferred` object.
-    Marionette.Callbacks = function() {
-        this._deferred = Marionette.Deferred();
-        this._callbacks = [];
+      return result;
     };
+  })();
+
+  // Trigger an event and/or a corresponding method name. Examples:
+  //
+  // `this.triggerMethod("foo")` will trigger the "foo" event and
+  // call the "onFoo" method.
+  //
+  // `this.triggerMethod("foo:bar")` will trigger the "foo:bar" event and
+  // call the "onFooBar" method.
+  Marionette.triggerMethod = function(event) {
+    return Marionette._triggerMethod(this, arguments);
+  };
+
+  // triggerMethodOn invokes triggerMethod on a specific context
+  //
+  // e.g. `Marionette.triggerMethodOn(view, 'show')`
+  // will trigger a "show" event or invoke onShow the view.
+  Marionette.triggerMethodOn = function(context) {
+    var fnc = _.isFunction(context.triggerMethod) ?
+                  context.triggerMethod :
+                  Marionette.triggerMethod;
+
+    return fnc.apply(context, _.rest(arguments));
+  };
+
+  // DOM Refresh
+  // -----------
+
+  // Monitor a view's state, and after it has been rendered and shown
+  // in the DOM, trigger a "dom:refresh" event every time it is
+  // re-rendered.
+
+  Marionette.MonitorDOMRefresh = function(view) {
+
+    // track when the view has been shown in the DOM,
+    // using a Marionette.Region (or by other means of triggering "show")
+    function handleShow() {
+      view._isShown = true;
+      triggerDOMRefresh();
+    }
 
-    _.extend(Marionette.Callbacks.prototype, {
-
-        // Add a callback to be executed. Callbacks added here are
-        // guaranteed to execute, even if they are added after the
-        // `run` method is called.
-        add: function(callback, contextOverride) {
-            var promise = _.result(this._deferred, 'promise');
-
-            this._callbacks.push({ cb: callback, ctx: contextOverride });
-
-            promise.then(function(args) {
-                if (contextOverride) { args.context = contextOverride; }
-                callback.call(args.context, args.options);
-            });
-        },
-
-        // Run all registered callbacks with the context specified.
-        // Additional callbacks can be added after this has been run
-        // and they will still be executed.
-        run: function(options, context) {
-            this._deferred.resolve({
-                options: options,
-                context: context
-            });
-        },
-
-        // Resets the list of callbacks to be run, allowing the same list
-        // to be run multiple times - whenever the `run` method is called.
-        reset: function() {
-            var callbacks = this._callbacks;
-            this._deferred = Marionette.Deferred();
-            this._callbacks = [];
+    // track when the view has been rendered
+    function handleRender() {
+      view._isRendered = true;
+      triggerDOMRefresh();
+    }
 
-            _.each(callbacks, function(cb) {
-                this.add(cb.cb, cb.ctx);
-            }, this);
+    // Trigger the "dom:refresh" event and corresponding "onDomRefresh" method
+    function triggerDOMRefresh() {
+      if (view._isShown && view._isRendered && Marionette.isNodeAttached(view.el)) {
+        if (_.isFunction(view.triggerMethod)) {
+          view.triggerMethod('dom:refresh');
         }
+      }
+    }
+
+    view.on({
+      show: handleShow,
+      render: handleRender
     });
+  };
+
+  /* jshint maxparams: 5 */
+
+  // Bind Entity Events & Unbind Entity Events
+  // -----------------------------------------
+  //
+  // These methods are used to bind/unbind a backbone "entity" (e.g. collection/model)
+  // to methods on a target object.
+  //
+  // The first parameter, `target`, must have the Backbone.Events module mixed in.
+  //
+  // The second parameter is the `entity` (Backbone.Model, Backbone.Collection or
+  // any object that has Backbone.Events mixed in) to bind the events from.
+  //
+  // The third parameter is a hash of { "event:name": "eventHandler" }
+  // configuration. Multiple handlers can be separated by a space. A
+  // function can be supplied instead of a string handler name.
+
+  (function(Marionette) {
+    'use strict';
 
-    // Controller
-    // ----------
+    // Bind the event to handlers specified as a string of
+    // handler names on the target object
+    function bindFromStrings(target, entity, evt, methods) {
+      var methodNames = methods.split(/\s+/);
 
-    // A multi-purpose object to use as a controller for
-    // modules and routers, and as a mediator for workflow
-    // and coordination of other objects, views, and more.
-    Marionette.Controller = function(options) {
-        this.options = options || {};
+      _.each(methodNames, function(methodName) {
 
-        if (_.isFunction(this.initialize)) {
-            this.initialize(this.options);
+        var method = target[methodName];
+        if (!method) {
+          throw new Marionette.Error('Method "' + methodName +
+            '" was configured as an event handler, but does not exist.');
         }
-    };
 
-    Marionette.Controller.extend = Marionette.extend;
-
-    // Controller Methods
-    // --------------
+        target.listenTo(entity, evt, method);
+      });
+    }
 
-    // Ensure it can trigger events with Backbone.Events
-    _.extend(Marionette.Controller.prototype, Backbone.Events, {
-        destroy: function() {
-            Marionette._triggerMethod(this, 'before:destroy', arguments);
-            Marionette._triggerMethod(this, 'destroy', arguments);
+    // Bind the event to a supplied callback function
+    function bindToFunction(target, entity, evt, method) {
+      target.listenTo(entity, evt, method);
+    }
 
-            this.stopListening();
-            this.off();
-            return this;
-        },
+    // Bind the event to handlers specified as a string of
+    // handler names on the target object
+    function unbindFromStrings(target, entity, evt, methods) {
+      var methodNames = methods.split(/\s+/);
 
-        // import the `triggerMethod` to trigger events with corresponding
-        // methods if the method exists
-        triggerMethod: Marionette.triggerMethod,
+      _.each(methodNames, function(methodName) {
+        var method = target[methodName];
+        target.stopListening(entity, evt, method);
+      });
+    }
 
-        // A handy way to merge options onto the instance
-        mergeOptions: Marionette.mergeOptions,
+    // Bind the event to a supplied callback function
+    function unbindToFunction(target, entity, evt, method) {
+      target.stopListening(entity, evt, method);
+    }
 
-        // Proxy `getOption` to enable getting options from this or this.options by name.
-        getOption: Marionette.proxyGetOption
+    // generic looping function
+    function iterateEvents(target, entity, bindings, functionCallback, stringCallback) {
+      if (!entity || !bindings) { return; }
 
-    });
+      // type-check bindings
+      if (!_.isObject(bindings)) {
+        throw new Marionette.Error({
+          message: 'Bindings must be an object or function.',
+          url: 'marionette.functions.html#marionettebindentityevents'
+        });
+      }
 
-    // Object
-    // ------
+      // allow the bindings to be a function
+      bindings = Marionette._getValue(bindings, target);
 
-    // A Base Class that other Classes should descend from.
-    // Object borrows many conventions and utilities from Backbone.
-    Marionette.Object = function(options) {
-        this.options = _.extend({}, _.result(this, 'options'), options);
+      // iterate the bindings and bind them
+      _.each(bindings, function(methods, evt) {
 
-        this.initialize.apply(this, arguments);
-    };
+        // allow for a function as the handler,
+        // or a list of event names as a string
+        if (_.isFunction(methods)) {
+          functionCallback(target, entity, evt, methods);
+        } else {
+          stringCallback(target, entity, evt, methods);
+        }
 
-    Marionette.Object.extend = Marionette.extend;
+      });
+    }
 
-    // Object Methods
-    // --------------
+    // Export Public API
+    Marionette.bindEntityEvents = function(target, entity, bindings) {
+      iterateEvents(target, entity, bindings, bindToFunction, bindFromStrings);
+    };
 
-    // Ensure it can trigger events with Backbone.Events
-    _.extend(Marionette.Object.prototype, Backbone.Events, {
+    Marionette.unbindEntityEvents = function(target, entity, bindings) {
+      iterateEvents(target, entity, bindings, unbindToFunction, unbindFromStrings);
+    };
 
-        //this is a noop method intended to be overridden by classes that extend from this base
-        initialize: function() { },
+    // Proxy `bindEntityEvents`
+    Marionette.proxyBindEntityEvents = function(entity, bindings) {
+      return Marionette.bindEntityEvents(this, entity, bindings);
+    };
 
-        destroy: function() {
-            this.triggerMethod('before:destroy');
-            this.triggerMethod('destroy');
-            this.stopListening();
+    // Proxy `unbindEntityEvents`
+    Marionette.proxyUnbindEntityEvents = function(entity, bindings) {
+      return Marionette.unbindEntityEvents(this, entity, bindings);
+    };
+  })(Marionette);
 
-            return this;
-        },
 
-        // Import the `triggerMethod` to trigger events with corresponding
-        // methods if the method exists
-        triggerMethod: Marionette.triggerMethod,
+  // Error
+  // -----
 
-        // A handy way to merge options onto the instance
-        mergeOptions: Marionette.mergeOptions,
+  var errorProps = ['description', 'fileName', 'lineNumber', 'name', 'message', 'number'];
 
-        // Proxy `getOption` to enable getting options from this or this.options by name.
-        getOption: Marionette.proxyGetOption,
+  Marionette.Error = Marionette.extend.call(Error, {
+    urlRoot: 'http://marionettejs.com/docs/v' + Marionette.VERSION + '/',
 
-        // Proxy `bindEntityEvents` to enable binding view's events from another entity.
-        bindEntityEvents: Marionette.proxyBindEntityEvents,
+    constructor: function(message, options) {
+      if (_.isObject(message)) {
+        options = message;
+        message = options.message;
+      } else if (!options) {
+        options = {};
+      }
 
-        // Proxy `unbindEntityEvents` to enable unbinding view's events from another entity.
-        unbindEntityEvents: Marionette.proxyUnbindEntityEvents
-    });
+      var error = Error.call(this, message);
+      _.extend(this, _.pick(error, errorProps), _.pick(options, errorProps));
 
-    /* jshint maxcomplexity: 16, maxstatements: 45, maxlen: 120 */
+      this.captureStackTrace();
 
-    // Region
-    // ------
+      if (options.url) {
+        this.url = this.urlRoot + options.url;
+      }
+    },
 
-    // Manage the visual regions of your composite application. See
-    // http://lostechies.com/derickbailey/2011/12/12/composite-js-apps-regions-and-region-managers/
+    captureStackTrace: function() {
+      if (Error.captureStackTrace) {
+        Error.captureStackTrace(this, Marionette.Error);
+      }
+    },
 
-    Marionette.Region = Marionette.Object.extend({
-        constructor: function(options) {
+    toString: function() {
+      return this.name + ': ' + this.message + (this.url ? ' See: ' + this.url : '');
+    }
+  });
 
-            // set options temporarily so that we can get `el`.
-            // options will be overriden by Object.constructor
-            this.options = options || {};
-            this.el = this.getOption('el');
+  Marionette.Error.extend = Marionette.extend;
 
-            // Handle when this.el is passed in as a $ wrapped element.
-            this.el = this.el instanceof Backbone.$ ? this.el[0] : this.el;
+  // Callbacks
+  // ---------
 
-            if (!this.el) {
-                throw new Marionette.Error({
-                    name: 'NoElError',
-                    message: 'An "el" must be specified for a region.'
-                });
-            }
+  // A simple way of managing a collection of callbacks
+  // and executing them at a later point in time, using jQuery's
+  // `Deferred` object.
+  Marionette.Callbacks = function() {
+    this._deferred = Marionette.Deferred();
+    this._callbacks = [];
+  };
 
-            this.$el = this.getEl(this.el);
-            Marionette.Object.call(this, options);
-        },
+  _.extend(Marionette.Callbacks.prototype, {
 
-        // Displays a backbone view instance inside of the region.
-        // Handles calling the `render` method for you. Reads content
-        // directly from the `el` attribute. Also calls an optional
-        // `onShow` and `onDestroy` method on your view, just after showing
-        // or just before destroying the view, respectively.
-        // The `preventDestroy` option can be used to prevent a view from
-        // the old view being destroyed on show.
-        // The `forceShow` option can be used to force a view to be
-        // re-rendered if it's already shown in the region.
-        show: function(view, options) {
-            if (!this._ensureElement()) {
-                return;
-            }
+    // Add a callback to be executed. Callbacks added here are
+    // guaranteed to execute, even if they are added after the
+    // `run` method is called.
+    add: function(callback, contextOverride) {
+      var promise = _.result(this._deferred, 'promise');
 
-            this._ensureViewIsIntact(view);
+      this._callbacks.push({ cb: callback, ctx: contextOverride });
 
-            var showOptions = options || {};
-            var isDifferentView = view !== this.currentView;
-            var preventDestroy = !!showOptions.preventDestroy;
-            var forceShow = !!showOptions.forceShow;
+      promise.then(function(args) {
+        if (contextOverride) { args.context = contextOverride; }
+        callback.call(args.context, args.options);
+      });
+    },
 
-            // We are only changing the view if there is a current view to change to begin with
-            var isChangingView = !!this.currentView;
+    // Run all registered callbacks with the context specified.
+    // Additional callbacks can be added after this has been run
+    // and they will still be executed.
+    run: function(options, context) {
+      this._deferred.resolve({
+        options: options,
+        context: context
+      });
+    },
 
-            // Only destroy the current view if we don't want to `preventDestroy` and if
-            // the view given in the first argument is different than `currentView`
-            var _shouldDestroyView = isDifferentView && !preventDestroy;
+    // Resets the list of callbacks to be run, allowing the same list
+    // to be run multiple times - whenever the `run` method is called.
+    reset: function() {
+      var callbacks = this._callbacks;
+      this._deferred = Marionette.Deferred();
+      this._callbacks = [];
 
-            // Only show the view given in the first argument if it is different than
-            // the current view or if we want to re-show the view. Note that if
-            // `_shouldDestroyView` is true, then `_shouldShowView` is also necessarily true.
-            var _shouldShowView = isDifferentView || forceShow;
+      _.each(callbacks, function(cb) {
+        this.add(cb.cb, cb.ctx);
+      }, this);
+    }
+  });
 
-            if (isChangingView) {
-                this.triggerMethod('before:swapOut', this.currentView, this, options);
-            }
+  // Controller
+  // ----------
 
-            if (this.currentView) {
-                delete this.currentView._parent;
-            }
+  // A multi-purpose object to use as a controller for
+  // modules and routers, and as a mediator for workflow
+  // and coordination of other objects, views, and more.
+  Marionette.Controller = function(options) {
+    this.options = options || {};
 
-            if (_shouldDestroyView) {
-                this.empty();
+    if (_.isFunction(this.initialize)) {
+      this.initialize(this.options);
+    }
+  };
 
-                // A `destroy` event is attached to the clean up manually removed views.
-                // We need to detach this event when a new view is going to be shown as it
-                // is no longer relevant.
-            } else if (isChangingView && _shouldShowView) {
-                this.currentView.off('destroy', this.empty, this);
-            }
+  Marionette.Controller.extend = Marionette.extend;
 
-            if (_shouldShowView) {
+  // Controller Methods
+  // --------------
 
-                // We need to listen for if a view is destroyed
-                // in a way other than through the region.
-                // If this happens we need to remove the reference
-                // to the currentView since once a view has been destroyed
-                // we can not reuse it.
-                view.once('destroy', this.empty, this);
-                view.render();
+  // Ensure it can trigger events with Backbone.Events
+  _.extend(Marionette.Controller.prototype, Backbone.Events, {
+    destroy: function() {
+      Marionette._triggerMethod(this, 'before:destroy', arguments);
+      Marionette._triggerMethod(this, 'destroy', arguments);
 
-                view._parent = this;
+      this.stopListening();
+      this.off();
+      return this;
+    },
 
-                if (isChangingView) {
-                    this.triggerMethod('before:swap', view, this, options);
-                }
+    // import the `triggerMethod` to trigger events with corresponding
+    // methods if the method exists
+    triggerMethod: Marionette.triggerMethod,
 
-                this.triggerMethod('before:show', view, this, options);
-                Marionette.triggerMethodOn(view, 'before:show', view, this, options);
+    // A handy way to merge options onto the instance
+    mergeOptions: Marionette.mergeOptions,
 
-                if (isChangingView) {
-                    this.triggerMethod('swapOut', this.currentView, this, options);
-                }
+    // Proxy `getOption` to enable getting options from this or this.options by name.
+    getOption: Marionette.proxyGetOption
 
-                // An array of views that we're about to display
-                var attachedRegion = Marionette.isNodeAttached(this.el);
+  });
 
-                // The views that we're about to attach to the document
-                // It's important that we prevent _getNestedViews from being executed unnecessarily
-                // as it's a potentially-slow method
-                var displayedViews = [];
+  // Object
+  // ------
 
-                var triggerBeforeAttach = showOptions.triggerBeforeAttach || this.triggerBeforeAttach;
-                var triggerAttach = showOptions.triggerAttach || this.triggerAttach;
+  // A Base Class that other Classes should descend from.
+  // Object borrows many conventions and utilities from Backbone.
+  Marionette.Object = function(options) {
+    this.options = _.extend({}, _.result(this, 'options'), options);
 
-                if (attachedRegion && triggerBeforeAttach) {
-                    displayedViews = this._displayedViews(view);
-                    this._triggerAttach(displayedViews, 'before:');
-                }
+    this.initialize.apply(this, arguments);
+  };
 
-                this.attachHtml(view);
-                this.currentView = view;
+  Marionette.Object.extend = Marionette.extend;
 
-                if (attachedRegion && triggerAttach) {
-                    displayedViews = this._displayedViews(view);
-                    this._triggerAttach(displayedViews);
-                }
+  // Object Methods
+  // --------------
 
-                if (isChangingView) {
-                    this.triggerMethod('swap', view, this, options);
-                }
+  // Ensure it can trigger events with Backbone.Events
+  _.extend(Marionette.Object.prototype, Backbone.Events, {
 
-                this.triggerMethod('show', view, this, options);
-                Marionette.triggerMethodOn(view, 'show', view, this, options);
+    //this is a noop method intended to be overridden by classes that extend from this base
+    initialize: function() { },
 
-                return this;
-            }
+    destroy: function() {
+      this.triggerMethod('before:destroy');
+      this.triggerMethod('destroy');
+      this.stopListening();
 
-            return this;
-        },
+      return this;
+    },
 
-        triggerBeforeAttach: true,
-        triggerAttach: true,
+    // Import the `triggerMethod` to trigger events with corresponding
+    // methods if the method exists
+    triggerMethod: Marionette.triggerMethod,
 
-        _triggerAttach: function(views, prefix) {
-            var eventName = (prefix || '') + 'attach';
-            _.each(views, function(view) {
-                Marionette.triggerMethodOn(view, eventName, view, this);
-            }, this);
-        },
+    // A handy way to merge options onto the instance
+    mergeOptions: Marionette.mergeOptions,
 
-        _displayedViews: function(view) {
-            return _.union([view], _.result(view, '_getNestedViews') || []);
-        },
+    // Proxy `getOption` to enable getting options from this or this.options by name.
+    getOption: Marionette.proxyGetOption,
 
-        _ensureElement: function() {
-            if (!_.isObject(this.el)) {
-                this.$el = this.getEl(this.el);
-                this.el = this.$el[0];
-            }
+    // Proxy `bindEntityEvents` to enable binding view's events from another entity.
+    bindEntityEvents: Marionette.proxyBindEntityEvents,
 
-            if (!this.$el || this.$el.length === 0) {
-                if (this.getOption('allowMissingEl')) {
-                    return false;
-                } else {
-                    throw new Marionette.Error('An "el" ' + this.$el.selector + ' must exist in DOM');
-                }
-            }
-            return true;
-        },
+    // Proxy `unbindEntityEvents` to enable unbinding view's events from another entity.
+    unbindEntityEvents: Marionette.proxyUnbindEntityEvents
+  });
 
-        _ensureViewIsIntact: function(view) {
-            if (!view) {
-                throw new Marionette.Error({
-                    name: 'ViewNotValid',
-                    message: 'The view passed is undefined and therefore invalid. You must pass a view instance to show.'
-                });
-            }
+  /* jshint maxcomplexity: 16, maxstatements: 45, maxlen: 120 */
 
-            if (view.isDestroyed) {
-                throw new Marionette.Error({
-                    name: 'ViewDestroyedError',
-                    message: 'View (cid: "' + view.cid + '") has already been destroyed and cannot be used.'
-                });
-            }
-        },
+  // Region
+  // ------
 
-        // Override this method to change how the region finds the DOM
-        // element that it manages. Return a jQuery selector object scoped
-        // to a provided parent el or the document if none exists.
-        getEl: function(el) {
-            return Backbone.$(el, Marionette._getValue(this.options.parentEl, this));
-        },
+  // Manage the visual regions of your composite application. See
+  // http://lostechies.com/derickbailey/2011/12/12/composite-js-apps-regions-and-region-managers/
 
-        // Override this method to change how the new view is
-        // appended to the `$el` that the region is managing
-        attachHtml: function(view) {
-            this.$el.contents().detach();
+  Marionette.Region = Marionette.Object.extend({
+    constructor: function(options) {
 
-            this.el.appendChild(view.el);
-        },
+      // set options temporarily so that we can get `el`.
+      // options will be overriden by Object.constructor
+      this.options = options || {};
+      this.el = this.getOption('el');
 
-        // Destroy the current view, if there is one. If there is no
-        // current view, it does nothing and returns immediately.
-        empty: function(options) {
-            var view = this.currentView;
+      // Handle when this.el is passed in as a $ wrapped element.
+      this.el = this.el instanceof Backbone.$ ? this.el[0] : this.el;
 
-            var preventDestroy = Marionette._getValue(options, 'preventDestroy', this);
-            // If there is no view in the region
-            // we should not remove anything
-            if (!view) { return; }
+      if (!this.el) {
+        throw new Marionette.Error({
+          name: 'NoElError',
+          message: 'An "el" must be specified for a region.'
+        });
+      }
 
-            view.off('destroy', this.empty, this);
-            this.triggerMethod('before:empty', view);
-            if (!preventDestroy) {
-                this._destroyView();
-            }
-            this.triggerMethod('empty', view);
+      this.$el = this.getEl(this.el);
+      Marionette.Object.call(this, options);
+    },
 
-            // Remove region pointer to the currentView
-            delete this.currentView;
+    // Displays a backbone view instance inside of the region.
+    // Handles calling the `render` method for you. Reads content
+    // directly from the `el` attribute. Also calls an optional
+    // `onShow` and `onDestroy` method on your view, just after showing
+    // or just before destroying the view, respectively.
+    // The `preventDestroy` option can be used to prevent a view from
+    // the old view being destroyed on show.
+    // The `forceShow` option can be used to force a view to be
+    // re-rendered if it's already shown in the region.
+    show: function(view, options) {
+      if (!this._ensureElement()) {
+        return;
+      }
+
+      this._ensureViewIsIntact(view);
+
+      var showOptions = options || {};
+      var isDifferentView = view !== this.currentView;
+      var preventDestroy = !!showOptions.preventDestroy;
+      var forceShow = !!showOptions.forceShow;
+
+      // We are only changing the view if there is a current view to change to begin with
+      var isChangingView = !!this.currentView;
+
+      // Only destroy the current view if we don't want to `preventDestroy` and if
+      // the view given in the first argument is different than `currentView`
+      var _shouldDestroyView = isDifferentView && !preventDestroy;
+
+      // Only show the view given in the first argument if it is different than
+      // the current view or if we want to re-show the view. Note that if
+      // `_shouldDestroyView` is true, then `_shouldShowView` is also necessarily true.
+      var _shouldShowView = isDifferentView || forceShow;
+
+      if (isChangingView) {
+        this.triggerMethod('before:swapOut', this.currentView, this, options);
+      }
+
+      if (this.currentView) {
+        delete this.currentView._parent;
+      }
+
+      if (_shouldDestroyView) {
+        this.empty();
+
+        // A `destroy` event is attached to the clean up manually removed views.
+        // We need to detach this event when a new view is going to be shown as it
+        // is no longer relevant.
+      } else if (isChangingView && _shouldShowView) {
+        this.currentView.off('destroy', this.empty, this);
+      }
+
+      if (_shouldShowView) {
+
+        // We need to listen for if a view is destroyed
+        // in a way other than through the region.
+        // If this happens we need to remove the reference
+        // to the currentView since once a view has been destroyed
+        // we can not reuse it.
+        view.once('destroy', this.empty, this);
+        view.render();
+
+        view._parent = this;
+
+        if (isChangingView) {
+          this.triggerMethod('before:swap', view, this, options);
+        }
 
-            if (preventDestroy) {
-                this.$el.contents().detach();
-            }
+        this.triggerMethod('before:show', view, this, options);
+        Marionette.triggerMethodOn(view, 'before:show', view, this, options);
 
-            return this;
-        },
+        if (isChangingView) {
+          this.triggerMethod('swapOut', this.currentView, this, options);
+        }
 
-        // call 'destroy' or 'remove', depending on which is found
-        // on the view (if showing a raw Backbone view or a Marionette View)
-        _destroyView: function() {
-            var view = this.currentView;
-
-            if (view.destroy && !view.isDestroyed) {
-                view.destroy();
-            } else if (view.remove) {
-                view.remove();
-
-                // appending isDestroyed to raw Backbone View allows regions
-                // to throw a ViewDestroyedError for this view
-                view.isDestroyed = true;
-            }
-        },
+        // An array of views that we're about to display
+        var attachedRegion = Marionette.isNodeAttached(this.el);
 
-        // Attach an existing view to the region. This
-        // will not call `render` or `onShow` for the new view,
-        // and will not replace the current HTML for the `el`
-        // of the region.
-        attachView: function(view) {
-            this.currentView = view;
-            return this;
-        },
+        // The views that we're about to attach to the document
+        // It's important that we prevent _getNestedViews from being executed unnecessarily
+        // as it's a potentially-slow method
+        var displayedViews = [];
 
-        // Checks whether a view is currently present within
-        // the region. Returns `true` if there is and `false` if
-        // no view is present.
-        hasView: function() {
-            return !!this.currentView;
-        },
+        var attachOptions = _.extend({
+          triggerBeforeAttach: this.triggerBeforeAttach,
+          triggerAttach: this.triggerAttach
+        }, showOptions);
 
-        // Reset the region by destroying any existing view and
-        // clearing out the cached `$el`. The next time a view
-        // is shown via this region, the region will re-query the
-        // DOM for the region's `el`.
-        reset: function() {
-            this.empty();
+        if (attachedRegion && attachOptions.triggerBeforeAttach) {
+          displayedViews = this._displayedViews(view);
+          this._triggerAttach(displayedViews, 'before:');
+        }
 
-            if (this.$el) {
-                this.el = this.$el.selector;
-            }
+        this.attachHtml(view);
+        this.currentView = view;
 
-            delete this.$el;
-            return this;
+        if (attachedRegion && attachOptions.triggerAttach) {
+          displayedViews = this._displayedViews(view);
+          this._triggerAttach(displayedViews);
         }
 
-    },
-
-    // Static Methods
-    {
-
-        // Build an instance of a region by passing in a configuration object
-        // and a default region class to use if none is specified in the config.
-        //
-        // The config object should either be a string as a jQuery DOM selector,
-        // a Region class directly, or an object literal that specifies a selector,
-        // a custom regionClass, and any options to be supplied to the region:
-        //
-        // ```js
-        // {
-        //   selector: "#foo",
-        //   regionClass: MyCustomRegion,
-        //   allowMissingEl: false
-        // }
-        // ```
-        //
-        buildRegion: function(regionConfig, DefaultRegionClass) {
-            if (_.isString(regionConfig)) {
-                return this._buildRegionFromSelector(regionConfig, DefaultRegionClass);
-            }
+        if (isChangingView) {
+          this.triggerMethod('swap', view, this, options);
+        }
 
-            if (regionConfig.selector || regionConfig.el || regionConfig.regionClass) {
-                return this._buildRegionFromObject(regionConfig, DefaultRegionClass);
-            }
+        this.triggerMethod('show', view, this, options);
+        Marionette.triggerMethodOn(view, 'show', view, this, options);
 
-            if (_.isFunction(regionConfig)) {
-                return this._buildRegionFromRegionClass(regionConfig);
-            }
+        return this;
+      }
 
-            throw new Marionette.Error({
-                message: 'Improper region configuration type.',
-                url: 'marionette.region.html#region-configuration-types'
-            });
-        },
+      return this;
+    },
 
-        // Build the region from a string selector like '#foo-region'
-        _buildRegionFromSelector: function(selector, DefaultRegionClass) {
-            return new DefaultRegionClass({ el: selector });
-        },
+    triggerBeforeAttach: true,
+    triggerAttach: true,
 
-        // Build the region from a configuration object
-        // ```js
-        // { selector: '#foo', regionClass: FooRegion, allowMissingEl: false }
-        // ```
-        _buildRegionFromObject: function(regionConfig, DefaultRegionClass) {
-            var RegionClass = regionConfig.regionClass || DefaultRegionClass;
-            var options = _.omit(regionConfig, 'selector', 'regionClass');
+    _triggerAttach: function(views, prefix) {
+      var eventName = (prefix || '') + 'attach';
+      _.each(views, function(view) {
+        Marionette.triggerMethodOn(view, eventName, view, this);
+      }, this);
+    },
 
-            if (regionConfig.selector && !options.el) {
-                options.el = regionConfig.selector;
-            }
+    _displayedViews: function(view) {
+      return _.union([view], _.result(view, '_getNestedViews') || []);
+    },
 
-            return new RegionClass(options);
-        },
+    _ensureElement: function() {
+      if (!_.isObject(this.el)) {
+        this.$el = this.getEl(this.el);
+        this.el = this.$el[0];
+      }
 
-        // Build the region directly from a given `RegionClass`
-        _buildRegionFromRegionClass: function(RegionClass) {
-            return new RegionClass();
+      if (!this.$el || this.$el.length === 0) {
+        if (this.getOption('allowMissingEl')) {
+          return false;
+        } else {
+          throw new Marionette.Error('An "el" ' + this.$el.selector + ' must exist in DOM');
         }
-    });
-
-    // Region Manager
-    // --------------
+      }
+      return true;
+    },
 
-    // Manage one or more related `Marionette.Region` objects.
-    Marionette.RegionManager = Marionette.Controller.extend({
-        constructor: function(options) {
-            this._regions = {};
-            this.length = 0;
+    _ensureViewIsIntact: function(view) {
+      if (!view) {
+        throw new Marionette.Error({
+          name: 'ViewNotValid',
+          message: 'The view passed is undefined and therefore invalid. You must pass a view instance to show.'
+        });
+      }
 
-            Marionette.Controller.call(this, options);
+      if (view.isDestroyed) {
+        throw new Marionette.Error({
+          name: 'ViewDestroyedError',
+          message: 'View (cid: "' + view.cid + '") has already been destroyed and cannot be used.'
+        });
+      }
+    },
 
-            this.addRegions(this.getOption('regions'));
-        },
+    // Override this method to change how the region finds the DOM
+    // element that it manages. Return a jQuery selector object scoped
+    // to a provided parent el or the document if none exists.
+    getEl: function(el) {
+      return Backbone.$(el, Marionette._getValue(this.options.parentEl, this));
+    },
 
-        // Add multiple regions using an object literal or a
-        // function that returns an object literal, where
-        // each key becomes the region name, and each value is
-        // the region definition.
-        addRegions: function(regionDefinitions, defaults) {
-            regionDefinitions = Marionette._getValue(regionDefinitions, this, arguments);
-
-            return _.reduce(regionDefinitions, function(regions, definition, name) {
-                if (_.isString(definition)) {
-                    definition = { selector: definition };
-                }
-                if (definition.selector) {
-                    definition = _.defaults({}, definition, defaults);
-                }
-
-                regions[name] = this.addRegion(name, definition);
-                return regions;
-            }, {}, this);
-        },
+    // Override this method to change how the new view is
+    // appended to the `$el` that the region is managing
+    attachHtml: function(view) {
+      this.$el.contents().detach();
 
-        // Add an individual region to the region manager,
-        // and return the region instance
-        addRegion: function(name, definition) {
-            var region;
+      this.el.appendChild(view.el);
+    },
 
-            if (definition instanceof Marionette.Region) {
-                region = definition;
-            } else {
-                region = Marionette.Region.buildRegion(definition, Marionette.Region);
-            }
+    // Destroy the current view, if there is one. If there is no
+    // current view, it does nothing and returns immediately.
+    empty: function(options) {
+      var view = this.currentView;
 
-            this.triggerMethod('before:add:region', name, region);
+      var preventDestroy = Marionette._getValue(options, 'preventDestroy', this);
+      // If there is no view in the region
+      // we should not remove anything
+      if (!view) { return; }
 
-            region._parent = this;
-            this._store(name, region);
+      view.off('destroy', this.empty, this);
+      this.triggerMethod('before:empty', view);
+      if (!preventDestroy) {
+        this._destroyView();
+      }
+      this.triggerMethod('empty', view);
 
-            this.triggerMethod('add:region', name, region);
-            return region;
-        },
+      // Remove region pointer to the currentView
+      delete this.currentView;
 
-        // Get a region by name
-        get: function(name) {
-            return this._regions[name];
-        },
+      if (preventDestroy) {
+        this.$el.contents().detach();
+      }
 
-        // Gets all the regions contained within
-        // the `regionManager` instance.
-        getRegions: function() {
-            return _.clone(this._regions);
-        },
+      return this;
+    },
 
-        // Remove a region by name
-        removeRegion: function(name) {
-            var region = this._regions[name];
-            this._remove(name, region);
+    // call 'destroy' or 'remove', depending on which is found
+    // on the view (if showing a raw Backbone view or a Marionette View)
+    _destroyView: function() {
+      var view = this.currentView;
 
-            return region;
-        },
+      if (view.destroy && !view.isDestroyed) {
+        view.destroy();
+      } else if (view.remove) {
+        view.remove();
 
-        // Empty all regions in the region manager, and
-        // remove them
-        removeRegions: function() {
-            var regions = this.getRegions();
-            _.each(this._regions, function(region, name) {
-                this._remove(name, region);
-            }, this);
+        // appending isDestroyed to raw Backbone View allows regions
+        // to throw a ViewDestroyedError for this view
+        view.isDestroyed = true;
+      }
+    },
 
-            return regions;
-        },
+    // Attach an existing view to the region. This
+    // will not call `render` or `onShow` for the new view,
+    // and will not replace the current HTML for the `el`
+    // of the region.
+    attachView: function(view) {
+      this.currentView = view;
+      return this;
+    },
 
-        // Empty all regions in the region manager, but
-        // leave them attached
-        emptyRegions: function() {
-            var regions = this.getRegions();
-            _.invoke(regions, 'empty');
-            return regions;
-        },
+    // Checks whether a view is currently present within
+    // the region. Returns `true` if there is and `false` if
+    // no view is present.
+    hasView: function() {
+      return !!this.currentView;
+    },
 
-        // Destroy all regions and shut down the region
-        // manager entirely
-        destroy: function() {
-            this.removeRegions();
-            return Marionette.Controller.prototype.destroy.apply(this, arguments);
-        },
+    // Reset the region by destroying any existing view and
+    // clearing out the cached `$el`. The next time a view
+    // is shown via this region, the region will re-query the
+    // DOM for the region's `el`.
+    reset: function() {
+      this.empty();
 
-        // internal method to store regions
-        _store: function(name, region) {
-            if (!this._regions[name]) {
-                this.length++;
-            }
+      if (this.$el) {
+        this.el = this.$el.selector;
+      }
 
-            this._regions[name] = region;
-        },
+      delete this.$el;
+      return this;
+    }
 
-        // internal method to remove a region
-        _remove: function(name, region) {
-            this.triggerMethod('before:remove:region', name, region);
-            region.empty();
-            region.stopListening();
+  },
 
-            delete region._parent;
-            delete this._regions[name];
-            this.length--;
-            this.triggerMethod('remove:region', name, region);
-        }
-    });
+  // Static Methods
+  {
 
-    Marionette.actAsCollection(Marionette.RegionManager.prototype, '_regions');
+    // Build an instance of a region by passing in a configuration object
+    // and a default region class to use if none is specified in the config.
+    //
+    // The config object should either be a string as a jQuery DOM selector,
+    // a Region class directly, or an object literal that specifies a selector,
+    // a custom regionClass, and any options to be supplied to the region:
+    //
+    // ```js
+    // {
+    //   selector: "#foo",
+    //   regionClass: MyCustomRegion,
+    //   allowMissingEl: false
+    // }
+    // ```
+    //
+    buildRegion: function(regionConfig, DefaultRegionClass) {
+      if (_.isString(regionConfig)) {
+        return this._buildRegionFromSelector(regionConfig, DefaultRegionClass);
+      }
+
+      if (regionConfig.selector || regionConfig.el || regionConfig.regionClass) {
+        return this._buildRegionFromObject(regionConfig, DefaultRegionClass);
+      }
+
+      if (_.isFunction(regionConfig)) {
+        return this._buildRegionFromRegionClass(regionConfig);
+      }
+
+      throw new Marionette.Error({
+        message: 'Improper region configuration type.',
+        url: 'marionette.region.html#region-configuration-types'
+      });
+    },
 
+    // Build the region from a string selector like '#foo-region'
+    _buildRegionFromSelector: function(selector, DefaultRegionClass) {
+      return new DefaultRegionClass({ el: selector });
+    },
 
-    // Template Cache
-    // --------------
+    // Build the region from a configuration object
+    // ```js
+    // { selector: '#foo', regionClass: FooRegion, allowMissingEl: false }
+    // ```
+    _buildRegionFromObject: function(regionConfig, DefaultRegionClass) {
+      var RegionClass = regionConfig.regionClass || DefaultRegionClass;
+      var options = _.omit(regionConfig, 'selector', 'regionClass');
 
-    // Manage templates stored in `<script>` blocks,
-    // caching them for faster access.
-    Marionette.TemplateCache = function(templateId) {
-        this.templateId = templateId;
-    };
+      if (regionConfig.selector && !options.el) {
+        options.el = regionConfig.selector;
+      }
 
-    // TemplateCache object-level methods. Manage the template
-    // caches from these method calls instead of creating
-    // your own TemplateCache instances
-    _.extend(Marionette.TemplateCache, {
-        templateCaches: {},
-
-        // Get the specified template by id. Either
-        // retrieves the cached version, or loads it
-        // from the DOM.
-        get: function(templateId, options) {
-            var cachedTemplate = this.templateCaches[templateId];
-
-            if (!cachedTemplate) {
-                cachedTemplate = new Marionette.TemplateCache(templateId);
-                this.templateCaches[templateId] = cachedTemplate;
-            }
+      return new RegionClass(options);
+    },
 
-            return cachedTemplate.load(options);
-        },
+    // Build the region directly from a given `RegionClass`
+    _buildRegionFromRegionClass: function(RegionClass) {
+      return new RegionClass();
+    }
+  });
 
-        // Clear templates from the cache. If no arguments
-        // are specified, clears all templates:
-        // `clear()`
-        //
-        // If arguments are specified, clears each of the
-        // specified templates from the cache:
-        // `clear("#t1", "#t2", "...")`
-        clear: function() {
-            var i;
-            var args = _.toArray(arguments);
-            var length = args.length;
-
-            if (length > 0) {
-                for (i = 0; i < length; i++) {
-                    delete this.templateCaches[args[i]];
-                }
-            } else {
-                this.templateCaches = {};
-            }
-        }
-    });
+  // Region Manager
+  // --------------
 
-    // TemplateCache instance methods, allowing each
-    // template cache object to manage its own state
-    // and know whether or not it has been loaded
-    _.extend(Marionette.TemplateCache.prototype, {
+  // Manage one or more related `Marionette.Region` objects.
+  Marionette.RegionManager = Marionette.Controller.extend({
+    constructor: function(options) {
+      this._regions = {};
+      this.length = 0;
 
-        // Internal method to load the template
-        load: function(options) {
-            // Guard clause to prevent loading this template more than once
-            if (this.compiledTemplate) {
-                return this.compiledTemplate;
-            }
+      Marionette.Controller.call(this, options);
 
-            // Load the template and compile it
-            var template = this.loadTemplate(this.templateId, options);
-            this.compiledTemplate = this.compileTemplate(template, options);
+      this.addRegions(this.getOption('regions'));
+    },
 
-            return this.compiledTemplate;
-        },
+    // Add multiple regions using an object literal or a
+    // function that returns an object literal, where
+    // each key becomes the region name, and each value is
+    // the region definition.
+    addRegions: function(regionDefinitions, defaults) {
+      regionDefinitions = Marionette._getValue(regionDefinitions, this, arguments);
 
-        // Load a template from the DOM, by default. Override
-        // this method to provide your own template retrieval
-        // For asynchronous loading with AMD/RequireJS, consider
-        // using a template-loader plugin as described here:
-        // https://github.com/marionettejs/backbone.marionette/wiki/Using-marionette-with-requirejs
-        loadTemplate: function(templateId, options) {
-            var template = Backbone.$(templateId).html();
-
-            if (!template || template.length === 0) {
-                throw new Marionette.Error({
-                    name: 'NoTemplateError',
-                    message: 'Could not find template: "' + templateId + '"'
-                });
-            }
+      return _.reduce(regionDefinitions, function(regions, definition, name) {
+        if (_.isString(definition)) {
+          definition = { selector: definition };
+        }
+        if (definition.selector) {
+          definition = _.defaults({}, definition, defaults);
+        }
 
-            return template;
-        },
+        regions[name] = this.addRegion(name, definition);
+        return regions;
+      }, {}, this);
+    },
 
-        // Pre-compile the template before caching it. Override
-        // this method if you do not need to pre-compile a template
-        // (JST / RequireJS for example) or if you want to change
-        // the template engine used (Handebars, etc).
-        compileTemplate: function(rawTemplate, options) {
-            return _.template(rawTemplate, options);
-        }
-    });
+    // Add an individual region to the region manager,
+    // and return the region instance
+    addRegion: function(name, definition) {
+      var region;
 
-    // Renderer
-    // --------
+      if (definition instanceof Marionette.Region) {
+        region = definition;
+      } else {
+        region = Marionette.Region.buildRegion(definition, Marionette.Region);
+      }
 
-    // Render a template with data by passing in the template
-    // selector and the data to render.
-    Marionette.Renderer = {
-
-        // Render a template with data. The `template` parameter is
-        // passed to the `TemplateCache` object to retrieve the
-        // template function. Override this method to provide your own
-        // custom rendering and template handling for all of Marionette.
-        render: function(template, data) {
-            if (!template) {
-                throw new Marionette.Error({
-                    name: 'TemplateNotFoundError',
-                    message: 'Cannot render the template since its false, null or undefined.'
-                });
-            }
+      this.triggerMethod('before:add:region', name, region);
 
-            var templateFunc = _.isFunction(template) ? template : Marionette.TemplateCache.get(template);
+      region._parent = this;
+      this._store(name, region);
 
-            return templateFunc(data);
-        }
-    };
+      this.triggerMethod('add:region', name, region);
+      return region;
+    },
 
+    // Get a region by name
+    get: function(name) {
+      return this._regions[name];
+    },
 
-    /* jshint maxlen: 114, nonew: false */
-    // View
-    // ----
+    // Gets all the regions contained within
+    // the `regionManager` instance.
+    getRegions: function() {
+      return _.clone(this._regions);
+    },
 
-    // The core view class that other Marionette views extend from.
-    Marionette.View = Backbone.View.extend({
-        isDestroyed: false,
+    // Remove a region by name
+    removeRegion: function(name) {
+      var region = this._regions[name];
+      this._remove(name, region);
 
-        constructor: function(options) {
-            _.bindAll(this, 'render');
+      return region;
+    },
 
-            options = Marionette._getValue(options, this);
+    // Empty all regions in the region manager, and
+    // remove them
+    removeRegions: function() {
+      var regions = this.getRegions();
+      _.each(this._regions, function(region, name) {
+        this._remove(name, region);
+      }, this);
 
-            // this exposes view options to the view initializer
-            // this is a backfill since backbone removed the assignment
-            // of this.options
-            // at some point however this may be removed
-            this.options = _.extend({}, _.result(this, 'options'), options);
+      return regions;
+    },
 
-            this._behaviors = Marionette.Behaviors(this);
+    // Empty all regions in the region manager, but
+    // leave them attached
+    emptyRegions: function() {
+      var regions = this.getRegions();
+      _.invoke(regions, 'empty');
+      return regions;
+    },
 
-            Backbone.View.call(this, this.options);
+    // Destroy all regions and shut down the region
+    // manager entirely
+    destroy: function() {
+      this.removeRegions();
+      return Marionette.Controller.prototype.destroy.apply(this, arguments);
+    },
 
-            Marionette.MonitorDOMRefresh(this);
-        },
+    // internal method to store regions
+    _store: function(name, region) {
+      if (!this._regions[name]) {
+        this.length++;
+      }
 
-        // Get the template for this view
-        // instance. You can set a `template` attribute in the view
-        // definition or pass a `template: "whatever"` parameter in
-        // to the constructor options.
-        getTemplate: function() {
-            return this.getOption('template');
-        },
+      this._regions[name] = region;
+    },
 
-        // Serialize a model by returning its attributes. Clones
-        // the attributes to allow modification.
-        serializeModel: function(model) {
-            return model.toJSON.apply(model, _.rest(arguments));
-        },
+    // internal method to remove a region
+    _remove: function(name, region) {
+      this.triggerMethod('before:remove:region', name, region);
+      region.empty();
+      region.stopListening();
 
-        // Mix in template helper methods. Looks for a
-        // `templateHelpers` attribute, which can either be an
-        // object literal, or a function that returns an object
-        // literal. All methods and attributes from this object
-        // are copies to the object passed in.
-        mixinTemplateHelpers: function(target) {
-            target = target || {};
-            var templateHelpers = this.getOption('templateHelpers');
-            templateHelpers = Marionette._getValue(templateHelpers, this);
-            return _.extend(target, templateHelpers);
-        },
+      delete region._parent;
+      delete this._regions[name];
+      this.length--;
+      this.triggerMethod('remove:region', name, region);
+    }
+  });
 
-        // normalize the keys of passed hash with the views `ui` selectors.
-        // `{"@ui.foo": "bar"}`
-        normalizeUIKeys: function(hash) {
-            var uiBindings = _.result(this, '_uiBindings');
-            return Marionette.normalizeUIKeys(hash, uiBindings || _.result(this, 'ui'));
-        },
+  Marionette.actAsCollection(Marionette.RegionManager.prototype, '_regions');
 
-        // normalize the values of passed hash with the views `ui` selectors.
-        // `{foo: "@ui.bar"}`
-        normalizeUIValues: function(hash, properties) {
-            var ui = _.result(this, 'ui');
-            var uiBindings = _.result(this, '_uiBindings');
-            return Marionette.normalizeUIValues(hash, uiBindings || ui, properties);
-        },
 
-        // Configure `triggers` to forward DOM events to view
-        // events. `triggers: {"click .foo": "do:foo"}`
-        configureTriggers: function() {
-            if (!this.triggers) { return; }
+  // Template Cache
+  // --------------
 
-            // Allow `triggers` to be configured as a function
-            var triggers = this.normalizeUIKeys(_.result(this, 'triggers'));
+  // Manage templates stored in `<script>` blocks,
+  // caching them for faster access.
+  Marionette.TemplateCache = function(templateId) {
+    this.templateId = templateId;
+  };
 
-            // Configure the triggers, prevent default
-            // action and stop propagation of DOM events
-            return _.reduce(triggers, function(events, value, key) {
-                events[key] = this._buildViewTrigger(value);
-                return events;
-            }, {}, this);
-        },
+  // TemplateCache object-level methods. Manage the template
+  // caches from these method calls instead of creating
+  // your own TemplateCache instances
+  _.extend(Marionette.TemplateCache, {
+    templateCaches: {},
 
-        // Overriding Backbone.View's delegateEvents to handle
-        // the `triggers`, `modelEvents`, and `collectionEvents` configuration
-        delegateEvents: function(events) {
-            this._delegateDOMEvents(events);
-            this.bindEntityEvents(this.model, this.getOption('modelEvents'));
-            this.bindEntityEvents(this.collection, this.getOption('collectionEvents'));
+    // Get the specified template by id. Either
+    // retrieves the cached version, or loads it
+    // from the DOM.
+    get: function(templateId, options) {
+      var cachedTemplate = this.templateCaches[templateId];
 
-            _.each(this._behaviors, function(behavior) {
-                behavior.bindEntityEvents(this.model, behavior.getOption('modelEvents'));
-                behavior.bindEntityEvents(this.collection, behavior.getOption('collectionEvents'));
-            }, this);
+      if (!cachedTemplate) {
+        cachedTemplate = new Marionette.TemplateCache(templateId);
+        this.templateCaches[templateId] = cachedTemplate;
+      }
 
-            return this;
-        },
+      return cachedTemplate.load(options);
+    },
 
-        // internal method to delegate DOM events and triggers
-        _delegateDOMEvents: function(eventsArg) {
-            var events = Marionette._getValue(eventsArg || this.events, this);
+    // Clear templates from the cache. If no arguments
+    // are specified, clears all templates:
+    // `clear()`
+    //
+    // If arguments are specified, clears each of the
+    // specified templates from the cache:
+    // `clear("#t1", "#t2", "...")`
+    clear: function() {
+      var i;
+      var args = _.toArray(arguments);
+      var length = args.length;
+
+      if (length > 0) {
+        for (i = 0; i < length; i++) {
+          delete this.templateCaches[args[i]];
+        }
+      } else {
+        this.templateCaches = {};
+      }
+    }
+  });
 
-            // normalize ui keys
-            events = this.normalizeUIKeys(events);
-            if (_.isUndefined(eventsArg)) { this.events = events; }
+  // TemplateCache instance methods, allowing each
+  // template cache object to manage its own state
+  // and know whether or not it has been loaded
+  _.extend(Marionette.TemplateCache.prototype, {
 
-            var combinedEvents = {};
+    // Internal method to load the template
+    load: function(options) {
+      // Guard clause to prevent loading this template more than once
+      if (this.compiledTemplate) {
+        return this.compiledTemplate;
+      }
 
-            // look up if this view has behavior events
-            var behaviorEvents = _.result(this, 'behaviorEvents') || {};
-            var triggers = this.configureTriggers();
-            var behaviorTriggers = _.result(this, 'behaviorTriggers') || {};
+      // Load the template and compile it
+      var template = this.loadTemplate(this.templateId, options);
+      this.compiledTemplate = this.compileTemplate(template, options);
 
-            // behavior events will be overriden by view events and or triggers
-            _.extend(combinedEvents, behaviorEvents, events, triggers, behaviorTriggers);
+      return this.compiledTemplate;
+    },
 
-            Backbone.View.prototype.delegateEvents.call(this, combinedEvents);
-        },
+    // Load a template from the DOM, by default. Override
+    // this method to provide your own template retrieval
+    // For asynchronous loading with AMD/RequireJS, consider
+    // using a template-loader plugin as described here:
+    // https://github.com/marionettejs/backbone.marionette/wiki/Using-marionette-with-requirejs
+    loadTemplate: function(templateId, options) {
+      var template = Backbone.$(templateId).html();
+
+      if (!template || template.length === 0) {
+        throw new Marionette.Error({
+          name: 'NoTemplateError',
+          message: 'Could not find template: "' + templateId + '"'
+        });
+      }
 
-        // Overriding Backbone.View's undelegateEvents to handle unbinding
-        // the `triggers`, `modelEvents`, and `collectionEvents` config
-        undelegateEvents: function() {
-            Backbone.View.prototype.undelegateEvents.apply(this, arguments);
+      return template;
+    },
 
-            this.unbindEntityEvents(this.model, this.getOption('modelEvents'));
-            this.unbindEntityEvents(this.collection, this.getOption('collectionEvents'));
+    // Pre-compile the template before caching it. Override
+    // this method if you do not need to pre-compile a template
+    // (JST / RequireJS for example) or if you want to change
+    // the template engine used (Handebars, etc).
+    compileTemplate: function(rawTemplate, options) {
+      return _.template(rawTemplate, options);
+    }
+  });
+
+  // Renderer
+  // --------
+
+  // Render a template with data by passing in the template
+  // selector and the data to render.
+  Marionette.Renderer = {
+
+    // Render a template with data. The `template` parameter is
+    // passed to the `TemplateCache` object to retrieve the
+    // template function. Override this method to provide your own
+    // custom rendering and template handling for all of Marionette.
+    render: function(template, data) {
+      if (!template) {
+        throw new Marionette.Error({
+          name: 'TemplateNotFoundError',
+          message: 'Cannot render the template since its false, null or undefined.'
+        });
+      }
 
-            _.each(this._behaviors, function(behavior) {
-                behavior.unbindEntityEvents(this.model, behavior.getOption('modelEvents'));
-                behavior.unbindEntityEvents(this.collection, behavior.getOption('collectionEvents'));
-            }, this);
+      var templateFunc = _.isFunction(template) ? template : Marionette.TemplateCache.get(template);
 
-            return this;
-        },
+      return templateFunc(data);
+    }
+  };
 
-        // Internal helper method to verify whether the view hasn't been destroyed
-        _ensureViewIsIntact: function() {
-            if (this.isDestroyed) {
-                throw new Marionette.Error({
-                    name: 'ViewDestroyedError',
-                    message: 'View (cid: "' + this.cid + '") has already been destroyed and cannot be used.'
-                });
-            }
-        },
 
-        // Default `destroy` implementation, for removing a view from the
-        // DOM and unbinding it. Regions will call this method
-        // for you. You can specify an `onDestroy` method in your view to
-        // add custom code that is called after the view is destroyed.
-        destroy: function() {
-            if (this.isDestroyed) { return this; }
+  /* jshint maxlen: 114, nonew: false */
+  // View
+  // ----
 
-            var args = _.toArray(arguments);
+  // The core view class that other Marionette views extend from.
+  Marionette.View = Backbone.View.extend({
+    isDestroyed: false,
 
-            this.triggerMethod.apply(this, ['before:destroy'].concat(args));
+    constructor: function(options) {
+      _.bindAll(this, 'render');
 
-            // mark as destroyed before doing the actual destroy, to
-            // prevent infinite loops within "destroy" event handlers
-            // that are trying to destroy other views
-            this.isDestroyed = true;
-            this.triggerMethod.apply(this, ['destroy'].concat(args));
+      options = Marionette._getValue(options, this);
 
-            // unbind UI elements
-            this.unbindUIElements();
+      // this exposes view options to the view initializer
+      // this is a backfill since backbone removed the assignment
+      // of this.options
+      // at some point however this may be removed
+      this.options = _.extend({}, _.result(this, 'options'), options);
 
-            this.isRendered = false;
+      this._behaviors = Marionette.Behaviors(this);
 
-            // remove the view from the DOM
-            this.remove();
+      Backbone.View.call(this, this.options);
 
-            // Call destroy on each behavior after
-            // destroying the view.
-            // This unbinds event listeners
-            // that behaviors have registered for.
-            _.invoke(this._behaviors, 'destroy', args);
+      Marionette.MonitorDOMRefresh(this);
+    },
 
-            return this;
-        },
+    // Get the template for this view
+    // instance. You can set a `template` attribute in the view
+    // definition or pass a `template: "whatever"` parameter in
+    // to the constructor options.
+    getTemplate: function() {
+      return this.getOption('template');
+    },
 
-        bindUIElements: function() {
-            this._bindUIElements();
-            _.invoke(this._behaviors, this._bindUIElements);
-        },
+    // Serialize a model by returning its attributes. Clones
+    // the attributes to allow modification.
+    serializeModel: function(model) {
+      return model.toJSON.apply(model, _.rest(arguments));
+    },
 
-        // This method binds the elements specified in the "ui" hash inside the view's code with
-        // the associated jQuery selectors.
-        _bindUIElements: function() {
-            if (!this.ui) { return; }
+    // Mix in template helper methods. Looks for a
+    // `templateHelpers` attribute, which can either be an
+    // object literal, or a function that returns an object
+    // literal. All methods and attributes from this object
+    // are copies to the object passed in.
+    mixinTemplateHelpers: function(target) {
+      target = target || {};
+      var templateHelpers = this.getOption('templateHelpers');
+      templateHelpers = Marionette._getValue(templateHelpers, this);
+      return _.extend(target, templateHelpers);
+    },
 
-            // store the ui hash in _uiBindings so they can be reset later
-            // and so re-rendering the view will be able to find the bindings
-            if (!this._uiBindings) {
-                this._uiBindings = this.ui;
-            }
+    // normalize the keys of passed hash with the views `ui` selectors.
+    // `{"@ui.foo": "bar"}`
+    normalizeUIKeys: function(hash) {
+      var uiBindings = _.result(this, '_uiBindings');
+      return Marionette.normalizeUIKeys(hash, uiBindings || _.result(this, 'ui'));
+    },
 
-            // get the bindings result, as a function or otherwise
-            var bindings = _.result(this, '_uiBindings');
+    // normalize the values of passed hash with the views `ui` selectors.
+    // `{foo: "@ui.bar"}`
+    normalizeUIValues: function(hash, properties) {
+      var ui = _.result(this, 'ui');
+      var uiBindings = _.result(this, '_uiBindings');
+      return Marionette.normalizeUIValues(hash, uiBindings || ui, properties);
+    },
 
-            // empty the ui so we don't have anything to start with
-            this.ui = {};
+    // Configure `triggers` to forward DOM events to view
+    // events. `triggers: {"click .foo": "do:foo"}`
+    configureTriggers: function() {
+      if (!this.triggers) { return; }
 
-            // bind each of the selectors
-            _.each(bindings, function(selector, key) {
-                this.ui[key] = this.$(selector);
-            }, this);
-        },
+      // Allow `triggers` to be configured as a function
+      var triggers = this.normalizeUIKeys(_.result(this, 'triggers'));
 
-        // This method unbinds the elements specified in the "ui" hash
-        unbindUIElements: function() {
-            this._unbindUIElements();
-            _.invoke(this._behaviors, this._unbindUIElements);
-        },
+      // Configure the triggers, prevent default
+      // action and stop propagation of DOM events
+      return _.reduce(triggers, function(events, value, key) {
+        events[key] = this._buildViewTrigger(value);
+        return events;
+      }, {}, this);
+    },
 
-        _unbindUIElements: function() {
-            if (!this.ui || !this._uiBindings) { return; }
+    // Overriding Backbone.View's delegateEvents to handle
+    // the `triggers`, `modelEvents`, and `collectionEvents` configuration
+    delegateEvents: function(events) {
+      this._delegateDOMEvents(events);
+      this.bindEntityEvents(this.model, this.getOption('modelEvents'));
+      this.bindEntityEvents(this.collection, this.getOption('collectionEvents'));
 
-            // delete all of the existing ui bindings
-            _.each(this.ui, function($el, name) {
-                delete this.ui[name];
-            }, this);
+      _.each(this._behaviors, function(behavior) {
+        behavior.bindEntityEvents(this.model, behavior.getOption('modelEvents'));
+        behavior.bindEntityEvents(this.collection, behavior.getOption('collectionEvents'));
+      }, this);
 
-            // reset the ui element to the original bindings configuration
-            this.ui = this._uiBindings;
-            delete this._uiBindings;
-        },
+      return this;
+    },
 
-        // Internal method to create an event handler for a given `triggerDef` like
-        // 'click:foo'
-        _buildViewTrigger: function(triggerDef) {
-            var hasOptions = _.isObject(triggerDef);
+    // internal method to delegate DOM events and triggers
+    _delegateDOMEvents: function(eventsArg) {
+      var events = Marionette._getValue(eventsArg || this.events, this);
 
-            var options = _.defaults({}, (hasOptions ? triggerDef : {}), {
-                preventDefault: true,
-                stopPropagation: true
-            });
+      // normalize ui keys
+      events = this.normalizeUIKeys(events);
+      if (_.isUndefined(eventsArg)) { this.events = events; }
 
-            var eventName = hasOptions ? options.event : triggerDef;
+      var combinedEvents = {};
 
-            return function(e) {
-                if (e) {
-                    if (e.preventDefault && options.preventDefault) {
-                        e.preventDefault();
-                    }
+      // look up if this view has behavior events
+      var behaviorEvents = _.result(this, 'behaviorEvents') || {};
+      var triggers = this.configureTriggers();
+      var behaviorTriggers = _.result(this, 'behaviorTriggers') || {};
 
-                    if (e.stopPropagation && options.stopPropagation) {
-                        e.stopPropagation();
-                    }
-                }
+      // behavior events will be overriden by view events and or triggers
+      _.extend(combinedEvents, behaviorEvents, events, triggers, behaviorTriggers);
 
-                var args = {
-                    view: this,
-                    model: this.model,
-                    collection: this.collection
-                };
+      Backbone.View.prototype.delegateEvents.call(this, combinedEvents);
+    },
 
-                this.triggerMethod(eventName, args);
-            };
-        },
+    // Overriding Backbone.View's undelegateEvents to handle unbinding
+    // the `triggers`, `modelEvents`, and `collectionEvents` config
+    undelegateEvents: function() {
+      Backbone.View.prototype.undelegateEvents.apply(this, arguments);
 
-        setElement: function() {
-            var ret = Backbone.View.prototype.setElement.apply(this, arguments);
+      this.unbindEntityEvents(this.model, this.getOption('modelEvents'));
+      this.unbindEntityEvents(this.collection, this.getOption('collectionEvents'));
 
-            // proxy behavior $el to the view's $el.
-            // This is needed because a view's $el proxy
-            // is not set until after setElement is called.
-            _.invoke(this._behaviors, 'proxyViewProperties', this);
+      _.each(this._behaviors, function(behavior) {
+        behavior.unbindEntityEvents(this.model, behavior.getOption('modelEvents'));
+        behavior.unbindEntityEvents(this.collection, behavior.getOption('collectionEvents'));
+      }, this);
 
-            return ret;
-        },
+      return this;
+    },
 
-        // import the `triggerMethod` to trigger events with corresponding
-        // methods if the method exists
-        triggerMethod: function() {
-            var ret = Marionette._triggerMethod(this, arguments);
+    // Internal helper method to verify whether the view hasn't been destroyed
+    _ensureViewIsIntact: function() {
+      if (this.isDestroyed) {
+        throw new Marionette.Error({
+          name: 'ViewDestroyedError',
+          message: 'View (cid: "' + this.cid + '") has already been destroyed and cannot be used.'
+        });
+      }
+    },
 
-            this._triggerEventOnBehaviors(arguments);
-            this._triggerEventOnParentLayout(arguments[0], _.rest(arguments));
+    // Default `destroy` implementation, for removing a view from the
+    // DOM and unbinding it. Regions will call this method
+    // for you. You can specify an `onDestroy` method in your view to
+    // add custom code that is called after the view is destroyed.
+    destroy: function() {
+      if (this.isDestroyed) { return this; }
 
-            return ret;
-        },
+      var args = _.toArray(arguments);
 
-        _triggerEventOnBehaviors: function(args) {
-            var triggerMethod = Marionette._triggerMethod;
-            var behaviors = this._behaviors;
-            // Use good ol' for as this is a very hot function
-            for (var i = 0, length = behaviors && behaviors.length; i < length; i++) {
-                triggerMethod(behaviors[i], args);
-            }
-        },
+      this.triggerMethod.apply(this, ['before:destroy'].concat(args));
 
-        _triggerEventOnParentLayout: function(eventName, args) {
-            var layoutView = this._parentLayoutView();
-            if (!layoutView) {
-                return;
-            }
+      // mark as destroyed before doing the actual destroy, to
+      // prevent infinite loops within "destroy" event handlers
+      // that are trying to destroy other views
+      this.isDestroyed = true;
+      this.triggerMethod.apply(this, ['destroy'].concat(args));
 
-            // invoke triggerMethod on parent view
-            var eventPrefix = Marionette.getOption(layoutView, 'childViewEventPrefix');
-            var prefixedEventName = eventPrefix + ':' + eventName;
+      // unbind UI elements
+      this.unbindUIElements();
 
-            Marionette._triggerMethod(layoutView, [prefixedEventName, this].concat(args));
+      this.isRendered = false;
 
-            // call the parent view's childEvents handler
-            var childEvents = Marionette.getOption(layoutView, 'childEvents');
-            var normalizedChildEvents = layoutView.normalizeMethods(childEvents);
+      // remove the view from the DOM
+      this.remove();
 
-            if (!!normalizedChildEvents && _.isFunction(normalizedChildEvents[eventName])) {
-                normalizedChildEvents[eventName].apply(layoutView, [this].concat(args));
-            }
-        },
+      // Call destroy on each behavior after
+      // destroying the view.
+      // This unbinds event listeners
+      // that behaviors have registered for.
+      _.invoke(this._behaviors, 'destroy', args);
 
-        // This method returns any views that are immediate
-        // children of this view
-        _getImmediateChildren: function() {
-            return [];
-        },
+      return this;
+    },
 
-        // Returns an array of every nested view within this view
-        _getNestedViews: function() {
-            var children = this._getImmediateChildren();
+    bindUIElements: function() {
+      this._bindUIElements();
+      _.invoke(this._behaviors, this._bindUIElements);
+    },
 
-            if (!children.length) { return children; }
+    // This method binds the elements specified in the "ui" hash inside the view's code with
+    // the associated jQuery selectors.
+    _bindUIElements: function() {
+      if (!this.ui) { return; }
 
-            return _.reduce(children, function(memo, view) {
-                if (!view._getNestedViews) { return memo; }
-                return memo.concat(view._getNestedViews());
-            }, children);
-        },
+      // store the ui hash in _uiBindings so they can be reset later
+      // and so re-rendering the view will be able to find the bindings
+      if (!this._uiBindings) {
+        this._uiBindings = this.ui;
+      }
 
-        // Internal utility for building an ancestor
-        // view tree list.
-        _getAncestors: function() {
-            var ancestors = [];
-            var parent = this._parent;
+      // get the bindings result, as a function or otherwise
+      var bindings = _.result(this, '_uiBindings');
 
-            while (parent) {
-                ancestors.push(parent);
-                parent = parent._parent;
-            }
+      // empty the ui so we don't have anything to start with
+      this.ui = {};
 
-            return ancestors;
-        },
+      // bind each of the selectors
+      _.each(bindings, function(selector, key) {
+        this.ui[key] = this.$(selector);
+      }, this);
+    },
 
-        // Returns the containing parent view.
-        _parentLayoutView: function() {
-            var ancestors = this._getAncestors();
-            return _.find(ancestors, function(parent) {
-                return parent instanceof Marionette.LayoutView;
-            });
-        },
+    // This method unbinds the elements specified in the "ui" hash
+    unbindUIElements: function() {
+      this._unbindUIElements();
+      _.invoke(this._behaviors, this._unbindUIElements);
+    },
 
-        // Imports the "normalizeMethods" to transform hashes of
-        // events=>function references/names to a hash of events=>function references
-        normalizeMethods: Marionette.normalizeMethods,
+    _unbindUIElements: function() {
+      if (!this.ui || !this._uiBindings) { return; }
 
-        // A handy way to merge passed-in options onto the instance
-        mergeOptions: Marionette.mergeOptions,
+      // delete all of the existing ui bindings
+      _.each(this.ui, function($el, name) {
+        delete this.ui[name];
+      }, this);
 
-        // Proxy `getOption` to enable getting options from this or this.options by name.
-        getOption: Marionette.proxyGetOption,
+      // reset the ui element to the original bindings configuration
+      this.ui = this._uiBindings;
+      delete this._uiBindings;
+    },
 
-        // Proxy `bindEntityEvents` to enable binding view's events from another entity.
-        bindEntityEvents: Marionette.proxyBindEntityEvents,
+    // Internal method to create an event handler for a given `triggerDef` like
+    // 'click:foo'
+    _buildViewTrigger: function(triggerDef) {
+      var hasOptions = _.isObject(triggerDef);
 
-        // Proxy `unbindEntityEvents` to enable unbinding view's events from another entity.
-        unbindEntityEvents: Marionette.proxyUnbindEntityEvents
-    });
+      var options = _.defaults({}, (hasOptions ? triggerDef : {}), {
+        preventDefault: true,
+        stopPropagation: true
+      });
 
-    // Item View
-    // ---------
+      var eventName = hasOptions ? options.event : triggerDef;
 
-    // A single item view implementation that contains code for rendering
-    // with underscore.js templates, serializing the view's model or collection,
-    // and calling several methods on extended views, such as `onRender`.
-    Marionette.ItemView = Marionette.View.extend({
+      return function(e) {
+        if (e) {
+          if (e.preventDefault && options.preventDefault) {
+            e.preventDefault();
+          }
 
-        // Setting up the inheritance chain which allows changes to
-        // Marionette.View.prototype.constructor which allows overriding
-        constructor: function() {
-            Marionette.View.apply(this, arguments);
-        },
+          if (e.stopPropagation && options.stopPropagation) {
+            e.stopPropagation();
+          }
+        }
 
-        // Serialize the model or collection for the view. If a model is
-        // found, the view's `serializeModel` is called. If a collection is found,
-        // each model in the collection is serialized by calling
-        // the view's `serializeCollection` and put into an `items` array in
-        // the resulting data. If both are found, defaults to the model.
-        // You can override the `serializeData` method in your own view definition,
-        // to provide custom serialization for your view's data.
-        serializeData: function() {
-            if (!this.model && !this.collection) {
-                return {};
-            }
+        var args = {
+          view: this,
+          model: this.model,
+          collection: this.collection
+        };
 
-            var args = [this.model || this.collection];
-            if (arguments.length) {
-                args.push.apply(args, arguments);
-            }
+        this.triggerMethod(eventName, args);
+      };
+    },
 
-            if (this.model) {
-                return this.serializeModel.apply(this, args);
-            } else {
-                return {
-                    items: this.serializeCollection.apply(this, args)
-                };
-            }
-        },
+    setElement: function() {
+      var ret = Backbone.View.prototype.setElement.apply(this, arguments);
 
-        // Serialize a collection by serializing each of its models.
-        serializeCollection: function(collection) {
-            return collection.toJSON.apply(collection, _.rest(arguments));
-        },
+      // proxy behavior $el to the view's $el.
+      // This is needed because a view's $el proxy
+      // is not set until after setElement is called.
+      _.invoke(this._behaviors, 'proxyViewProperties', this);
 
-        // Render the view, defaulting to underscore.js templates.
-        // You can override this in your view definition to provide
-        // a very specific rendering for your view. In general, though,
-        // you should override the `Marionette.Renderer` object to
-        // change how Marionette renders views.
-        render: function() {
-            this._ensureViewIsIntact();
+      return ret;
+    },
 
-            this.triggerMethod('before:render', this);
+    // import the `triggerMethod` to trigger events with corresponding
+    // methods if the method exists
+    triggerMethod: function() {
+      var ret = Marionette._triggerMethod(this, arguments);
 
-            this._renderTemplate();
-            this.isRendered = true;
-            this.bindUIElements();
+      this._triggerEventOnBehaviors(arguments);
+      this._triggerEventOnParentLayout(arguments[0], _.rest(arguments));
 
-            this.triggerMethod('render', this);
+      return ret;
+    },
 
-            return this;
-        },
+    _triggerEventOnBehaviors: function(args) {
+      var triggerMethod = Marionette._triggerMethod;
+      var behaviors = this._behaviors;
+      // Use good ol' for as this is a very hot function
+      for (var i = 0, length = behaviors && behaviors.length; i < length; i++) {
+        triggerMethod(behaviors[i], args);
+      }
+    },
 
-        // Internal method to render the template with the serialized data
-        // and template helpers via the `Marionette.Renderer` object.
-        // Throws an `UndefinedTemplateError` error if the template is
-        // any falsely value but literal `false`.
-        _renderTemplate: function() {
-            var template = this.getTemplate();
+    _triggerEventOnParentLayout: function(eventName, args) {
+      var layoutView = this._parentLayoutView();
+      if (!layoutView) {
+        return;
+      }
 
-            // Allow template-less item views
-            if (template === false) {
-                return;
-            }
+      // invoke triggerMethod on parent view
+      var eventPrefix = Marionette.getOption(layoutView, 'childViewEventPrefix');
+      var prefixedEventName = eventPrefix + ':' + eventName;
 
-            if (!template) {
-                throw new Marionette.Error({
-                    name: 'UndefinedTemplateError',
-                    message: 'Cannot render the template since it is null or undefined.'
-                });
-            }
+      Marionette._triggerMethod(layoutView, [prefixedEventName, this].concat(args));
 
-            // Add in entity data and template helpers
-            var data = this.mixinTemplateHelpers(this.serializeData());
+      // call the parent view's childEvents handler
+      var childEvents = Marionette.getOption(layoutView, 'childEvents');
+      var normalizedChildEvents = layoutView.normalizeMethods(childEvents);
 
-            // Render and add to el
-            var html = Marionette.Renderer.render(template, data, this);
-            this.attachElContent(html);
+      if (!!normalizedChildEvents && _.isFunction(normalizedChildEvents[eventName])) {
+        normalizedChildEvents[eventName].apply(layoutView, [this].concat(args));
+      }
+    },
 
-            return this;
-        },
+    // This method returns any views that are immediate
+    // children of this view
+    _getImmediateChildren: function() {
+      return [];
+    },
 
-        // Attaches the content of a given view.
-        // This method can be overridden to optimize rendering,
-        // or to render in a non standard way.
-        //
-        // For example, using `innerHTML` instead of `$el.html`
-        //
-        // ```js
-        // attachElContent: function(html) {
-        //   this.el.innerHTML = html;
-        //   return this;
-        // }
-        // ```
-        attachElContent: function(html) {
-            this.$el.html(html);
-
-            return this;
-        }
-    });
+    // Returns an array of every nested view within this view
+    _getNestedViews: function() {
+      var children = this._getImmediateChildren();
 
-    /* jshint maxstatements: 14 */
+      if (!children.length) { return children; }
 
-    // Collection View
-    // ---------------
+      return _.reduce(children, function(memo, view) {
+        if (!view._getNestedViews) { return memo; }
+        return memo.concat(view._getNestedViews());
+      }, children);
+    },
 
-    // A view that iterates over a Backbone.Collection
-    // and renders an individual child view for each model.
-    Marionette.CollectionView = Marionette.View.extend({
+    // Internal utility for building an ancestor
+    // view tree list.
+    _getAncestors: function() {
+      var ancestors = [];
+      var parent = this._parent;
 
-        // used as the prefix for child view events
-        // that are forwarded through the collectionview
-        childViewEventPrefix: 'childview',
+      while (parent) {
+        ancestors.push(parent);
+        parent = parent._parent;
+      }
 
-        // flag for maintaining the sorted order of the collection
-        sort: true,
+      return ancestors;
+    },
 
-        // constructor
-        // option to pass `{sort: false}` to prevent the `CollectionView` from
-        // maintaining the sorted order of the collection.
-        // This will fallback onto appending childView's to the end.
-        //
-        // option to pass `{comparator: compFunction()}` to allow the `CollectionView`
-        // to use a custom sort order for the collection.
-        constructor: function(options) {
+    // Returns the containing parent view.
+    _parentLayoutView: function() {
+      var ancestors = this._getAncestors();
+      return _.find(ancestors, function(parent) {
+        return parent instanceof Marionette.LayoutView;
+      });
+    },
 
-            this.once('render', this._initialEvents);
-            this._initChildViewStorage();
+    // Imports the "normalizeMethods" to transform hashes of
+    // events=>function references/names to a hash of events=>function references
+    normalizeMethods: Marionette.normalizeMethods,
 
-            Marionette.View.apply(this, arguments);
+    // A handy way to merge passed-in options onto the instance
+    mergeOptions: Marionette.mergeOptions,
 
-            this.on('show', this._onShowCalled);
+    // Proxy `getOption` to enable getting options from this or this.options by name.
+    getOption: Marionette.proxyGetOption,
 
-            this.initRenderBuffer();
-        },
+    // Proxy `bindEntityEvents` to enable binding view's events from another entity.
+    bindEntityEvents: Marionette.proxyBindEntityEvents,
 
-        // Instead of inserting elements one by one into the page,
-        // it's much more performant to insert elements into a document
-        // fragment and then insert that document fragment into the page
-        initRenderBuffer: function() {
-            this._bufferedChildren = [];
-        },
+    // Proxy `unbindEntityEvents` to enable unbinding view's events from another entity.
+    unbindEntityEvents: Marionette.proxyUnbindEntityEvents
+  });
 
-        startBuffering: function() {
-            this.initRenderBuffer();
-            this.isBuffering = true;
-        },
+  // Item View
+  // ---------
 
-        endBuffering: function() {
-            this.isBuffering = false;
-            this._triggerBeforeShowBufferedChildren();
+  // A single item view implementation that contains code for rendering
+  // with underscore.js templates, serializing the view's model or collection,
+  // and calling several methods on extended views, such as `onRender`.
+  Marionette.ItemView = Marionette.View.extend({
 
-            this.attachBuffer(this);
+    // Setting up the inheritance chain which allows changes to
+    // Marionette.View.prototype.constructor which allows overriding
+    constructor: function() {
+      Marionette.View.apply(this, arguments);
+    },
 
-            this._triggerShowBufferedChildren();
-            this.initRenderBuffer();
-        },
+    // Serialize the model or collection for the view. If a model is
+    // found, the view's `serializeModel` is called. If a collection is found,
+    // each model in the collection is serialized by calling
+    // the view's `serializeCollection` and put into an `items` array in
+    // the resulting data. If both are found, defaults to the model.
+    // You can override the `serializeData` method in your own view definition,
+    // to provide custom serialization for your view's data.
+    serializeData: function() {
+      if (!this.model && !this.collection) {
+        return {};
+      }
+
+      var args = [this.model || this.collection];
+      if (arguments.length) {
+        args.push.apply(args, arguments);
+      }
+
+      if (this.model) {
+        return this.serializeModel.apply(this, args);
+      } else {
+        return {
+          items: this.serializeCollection.apply(this, args)
+        };
+      }
+    },
 
-        _triggerBeforeShowBufferedChildren: function() {
-            if (this._isShown) {
-                _.each(this._bufferedChildren, _.partial(this._triggerMethodOnChild, 'before:show'));
-            }
-        },
+    // Serialize a collection by serializing each of its models.
+    serializeCollection: function(collection) {
+      return collection.toJSON.apply(collection, _.rest(arguments));
+    },
 
-        _triggerShowBufferedChildren: function() {
-            if (this._isShown) {
-                _.each(this._bufferedChildren, _.partial(this._triggerMethodOnChild, 'show'));
+    // Render the view, defaulting to underscore.js templates.
+    // You can override this in your view definition to provide
+    // a very specific rendering for your view. In general, though,
+    // you should override the `Marionette.Renderer` object to
+    // change how Marionette renders views.
+    render: function() {
+      this._ensureViewIsIntact();
 
-                this._bufferedChildren = [];
-            }
-        },
+      this.triggerMethod('before:render', this);
 
-        // Internal method for _.each loops to call `Marionette.triggerMethodOn` on
-        // a child view
-        _triggerMethodOnChild: function(event, childView) {
-            Marionette.triggerMethodOn(childView, event);
-        },
+      this._renderTemplate();
+      this.isRendered = true;
+      this.bindUIElements();
 
-        // Configured the initial events that the collection view
-        // binds to.
-        _initialEvents: function() {
-            if (this.collection) {
-                this.listenTo(this.collection, 'add', this._onCollectionAdd);
-                this.listenTo(this.collection, 'remove', this._onCollectionRemove);
-                this.listenTo(this.collection, 'reset', this.render);
-
-                if (this.getOption('sort')) {
-                    this.listenTo(this.collection, 'sort', this._sortViews);
-                }
-            }
-        },
+      this.triggerMethod('render', this);
 
-        // Handle a child added to the collection
-        _onCollectionAdd: function(child, collection, opts) {
-            var index;
-            if (opts.at !== undefined) {
-                index = opts.at;
-            } else {
-                index = _.indexOf(this._filteredSortedModels(), child);
-            }
+      return this;
+    },
 
-            if (this._shouldAddChild(child, index)) {
-                this.destroyEmptyView();
-                var ChildView = this.getChildView(child);
-                this.addChild(child, ChildView, index);
-            }
-        },
+    // Internal method to render the template with the serialized data
+    // and template helpers via the `Marionette.Renderer` object.
+    // Throws an `UndefinedTemplateError` error if the template is
+    // any falsely value but literal `false`.
+    _renderTemplate: function() {
+      var template = this.getTemplate();
+
+      // Allow template-less item views
+      if (template === false) {
+        return;
+      }
+
+      if (!template) {
+        throw new Marionette.Error({
+          name: 'UndefinedTemplateError',
+          message: 'Cannot render the template since it is null or undefined.'
+        });
+      }
 
-        // get the child view by model it holds, and remove it
-        _onCollectionRemove: function(model) {
-            var view = this.children.findByModel(model);
-            this.removeChildView(view);
-            this.checkEmpty();
-        },
+      // Add in entity data and template helpers
+      var data = this.mixinTemplateHelpers(this.serializeData());
 
-        _onShowCalled: function() {
-            this.children.each(_.partial(this._triggerMethodOnChild, 'show'));
-        },
+      // Render and add to el
+      var html = Marionette.Renderer.render(template, data, this);
+      this.attachElContent(html);
 
-        // Render children views. Override this method to
-        // provide your own implementation of a render function for
-        // the collection view.
-        render: function() {
-            this._ensureViewIsIntact();
-            this.triggerMethod('before:render', this);
-            this._renderChildren();
-            this.isRendered = true;
-            this.triggerMethod('render', this);
-            return this;
-        },
+      return this;
+    },
 
-        // Reorder DOM after sorting. When your element's rendering
-        // do not use their index, you can pass reorderOnSort: true
-        // to only reorder the DOM after a sort instead of rendering
-        // all the collectionView
-        reorder: function() {
-            var children = this.children;
-            var models = this._filteredSortedModels();
-            var modelsChanged = _.find(models, function(model) {
-                return !children.findByModel(model);
-            });
-
-            // If the models we're displaying have changed due to filtering
-            // We need to add and/or remove child views
-            // So render as normal
-            if (modelsChanged) {
-                this.render();
-            } else {
-                // get the DOM nodes in the same order as the models
-                var els = _.map(models, function(model) {
-                    return children.findByModel(model).el;
-                });
-
-                // since append moves elements that are already in the DOM,
-                // appending the elements will effectively reorder them
-                this.triggerMethod('before:reorder');
-                this._appendReorderedChildren(els);
-                this.triggerMethod('reorder');
-            }
-        },
+    // Attaches the content of a given view.
+    // This method can be overridden to optimize rendering,
+    // or to render in a non standard way.
+    //
+    // For example, using `innerHTML` instead of `$el.html`
+    //
+    // ```js
+    // attachElContent: function(html) {
+    //   this.el.innerHTML = html;
+    //   return this;
+    // }
+    // ```
+    attachElContent: function(html) {
+      this.$el.html(html);
+
+      return this;
+    }
+  });
 
-        // Render view after sorting. Override this method to
-        // change how the view renders after a `sort` on the collection.
-        // An example of this would be to only `renderChildren` in a `CompositeView`
-        // rather than the full view.
-        resortView: function() {
-            if (Marionette.getOption(this, 'reorderOnSort')) {
-                this.reorder();
-            } else {
-                this.render();
-            }
-        },
+  /* jshint maxstatements: 20, maxcomplexity: 7 */
 
-        // Internal method. This checks for any changes in the order of the collection.
-        // If the index of any view doesn't match, it will render.
-        _sortViews: function() {
-            var models = this._filteredSortedModels();
+  // Collection View
+  // ---------------
 
-            // check for any changes in sort order of views
-            var orderChanged = _.find(models, function(item, index) {
-                var view = this.children.findByModel(item);
-                return !view || view._index !== index;
-            }, this);
+  // A view that iterates over a Backbone.Collection
+  // and renders an individual child view for each model.
+  Marionette.CollectionView = Marionette.View.extend({
 
-            if (orderChanged) {
-                this.resortView();
-            }
-        },
+    // used as the prefix for child view events
+    // that are forwarded through the collectionview
+    childViewEventPrefix: 'childview',
 
-        // Internal reference to what index a `emptyView` is.
-        _emptyViewIndex: -1,
+    // flag for maintaining the sorted order of the collection
+    sort: true,
 
-        // Internal method. Separated so that CompositeView can append to the childViewContainer
-        // if necessary
-        _appendReorderedChildren: function(children) {
-            this.$el.append(children);
-        },
+    // constructor
+    // option to pass `{sort: false}` to prevent the `CollectionView` from
+    // maintaining the sorted order of the collection.
+    // This will fallback onto appending childView's to the end.
+    //
+    // option to pass `{comparator: compFunction()}` to allow the `CollectionView`
+    // to use a custom sort order for the collection.
+    constructor: function(options) {
+      this.once('render', this._initialEvents);
+      this._initChildViewStorage();
+
+      Marionette.View.apply(this, arguments);
+
+      this.on({
+        'before:show': this._onBeforeShowCalled,
+        'show': this._onShowCalled,
+        'before:attach': this._onBeforeAttachCalled,
+        'attach': this._onAttachCalled
+      });
+      this.initRenderBuffer();
+    },
 
-        // Internal method. Separated so that CompositeView can have
-        // more control over events being triggered, around the rendering
-        // process
-        _renderChildren: function() {
-            this.destroyEmptyView();
-            this.destroyChildren();
-
-            if (this.isEmpty(this.collection)) {
-                this.showEmptyView();
-            } else {
-                this.triggerMethod('before:render:collection', this);
-                this.startBuffering();
-                this.showCollection();
-                this.endBuffering();
-                this.triggerMethod('render:collection', this);
-
-                // If we have shown children and none have passed the filter, show the empty view
-                if (this.children.isEmpty()) {
-                    this.showEmptyView();
-                }
-            }
-        },
+    // Instead of inserting elements one by one into the page,
+    // it's much more performant to insert elements into a document
+    // fragment and then insert that document fragment into the page
+    initRenderBuffer: function() {
+      this._bufferedChildren = [];
+    },
 
-        // Internal method to loop through collection and show each child view.
-        showCollection: function() {
-            var ChildView;
+    startBuffering: function() {
+      this.initRenderBuffer();
+      this.isBuffering = true;
+    },
 
-            var models = this._filteredSortedModels();
+    endBuffering: function() {
+      // Only trigger attach if already shown and attached, otherwise Region#show() handles this.
+      var canTriggerAttach = this._isShown && Marionette.isNodeAttached(this.el);
+      var nestedViews;
+
+      this.isBuffering = false;
+
+      if (this._isShown) {
+        this._triggerMethodMany(this._bufferedChildren, this, 'before:show');
+      }
+      if (canTriggerAttach && this._triggerBeforeAttach) {
+        nestedViews = this._getNestedViews();
+        this._triggerMethodMany(nestedViews, this, 'before:attach');
+      }
+
+      this.attachBuffer(this, this._createBuffer());
+
+      if (canTriggerAttach && this._triggerAttach) {
+        nestedViews = this._getNestedViews();
+        this._triggerMethodMany(nestedViews, this, 'attach');
+      }
+      if (this._isShown) {
+        this._triggerMethodMany(this._bufferedChildren, this, 'show');
+      }
+      this.initRenderBuffer();
+    },
 
-            _.each(models, function(child, index) {
-                ChildView = this.getChildView(child);
-                this.addChild(child, ChildView, index);
-            }, this);
-        },
+    _triggerMethodMany: function(targets, source, eventName) {
+      var args = _.drop(arguments, 3);
 
-        // Allow the collection to be sorted by a custom view comparator
-        _filteredSortedModels: function() {
-            var models;
-            var viewComparator = this.getViewComparator();
-
-            if (viewComparator) {
-                if (_.isString(viewComparator) || viewComparator.length === 1) {
-                    models = this.collection.sortBy(viewComparator, this);
-                } else {
-                    models = _.clone(this.collection.models).sort(_.bind(viewComparator, this));
-                }
-            } else {
-                models = this.collection.models;
-            }
+      _.each(targets, function(target) {
+        Marionette.triggerMethodOn.apply(target, [target, eventName, target, source].concat(args));
+      });
+    },
 
-            // Filter after sorting in case the filter uses the index
-            if (this.getOption('filter')) {
-                models = _.filter(models, function(model, index) {
-                    return this._shouldAddChild(model, index);
-                }, this);
-            }
+    // Configured the initial events that the collection view
+    // binds to.
+    _initialEvents: function() {
+      if (this.collection) {
+        this.listenTo(this.collection, 'add', this._onCollectionAdd);
+        this.listenTo(this.collection, 'remove', this._onCollectionRemove);
+        this.listenTo(this.collection, 'reset', this.render);
 
-            return models;
-        },
+        if (this.getOption('sort')) {
+          this.listenTo(this.collection, 'sort', this._sortViews);
+        }
+      }
+    },
 
-        // Internal method to show an empty view in place of
-        // a collection of child views, when the collection is empty
-        showEmptyView: function() {
-            var EmptyView = this.getEmptyView();
+    // Handle a child added to the collection
+    _onCollectionAdd: function(child, collection, opts) {
+      var index;
+      if (opts.at !== undefined) {
+        index = opts.at;
+      } else {
+        index = _.indexOf(this._filteredSortedModels(), child);
+      }
+
+      if (this._shouldAddChild(child, index)) {
+        this.destroyEmptyView();
+        var ChildView = this.getChildView(child);
+        this.addChild(child, ChildView, index);
+      }
+    },
 
-            if (EmptyView && !this._showingEmptyView) {
-                this.triggerMethod('before:render:empty');
+    // get the child view by model it holds, and remove it
+    _onCollectionRemove: function(model) {
+      var view = this.children.findByModel(model);
+      this.removeChildView(view);
+      this.checkEmpty();
+    },
 
-                this._showingEmptyView = true;
-                var model = new Backbone.Model();
-                this.addEmptyView(model, EmptyView);
+    _onBeforeShowCalled: function() {
+      // Reset attach event flags at the top of the Region#show() event lifecycle; if the Region's
+      // show() options permit onBeforeAttach/onAttach events, these flags will be set true again.
+      this._triggerBeforeAttach = this._triggerAttach = false;
+      this.children.each(function(childView) {
+        Marionette.triggerMethodOn(childView, 'before:show', childView);
+      });
+    },
 
-                this.triggerMethod('render:empty');
-            }
-        },
+    _onShowCalled: function() {
+      this.children.each(function(childView) {
+        Marionette.triggerMethodOn(childView, 'show', childView);
+      });
+    },
 
-        // Internal method to destroy an existing emptyView instance
-        // if one exists. Called when a collection view has been
-        // rendered empty, and then a child is added to the collection.
-        destroyEmptyView: function() {
-            if (this._showingEmptyView) {
-                this.triggerMethod('before:remove:empty');
+    // If during Region#show() onBeforeAttach was fired, continue firing it for child views
+    _onBeforeAttachCalled: function() {
+      this._triggerBeforeAttach = true;
+    },
 
-                this.destroyChildren();
-                delete this._showingEmptyView;
+    // If during Region#show() onAttach was fired, continue firing it for child views
+    _onAttachCalled: function() {
+      this._triggerAttach = true;
+    },
 
-                this.triggerMethod('remove:empty');
-            }
-        },
+    // Render children views. Override this method to
+    // provide your own implementation of a render function for
+    // the collection view.
+    render: function() {
+      this._ensureViewIsIntact();
+      this.triggerMethod('before:render', this);
+      this._renderChildren();
+      this.isRendered = true;
+      this.triggerMethod('render', this);
+      return this;
+    },
 
-        // Retrieve the empty view class
-        getEmptyView: function() {
-            return this.getOption('emptyView');
-        },
+    // Reorder DOM after sorting. When your element's rendering
+    // do not use their index, you can pass reorderOnSort: true
+    // to only reorder the DOM after a sort instead of rendering
+    // all the collectionView
+    reorder: function() {
+      var children = this.children;
+      var models = this._filteredSortedModels();
+      var modelsChanged = _.find(models, function(model) {
+        return !children.findByModel(model);
+      });
+
+      // If the models we're displaying have changed due to filtering
+      // We need to add and/or remove child views
+      // So render as normal
+      if (modelsChanged) {
+        this.render();
+      } else {
+        // get the DOM nodes in the same order as the models
+        var els = _.map(models, function(model, index) {
+          var view = children.findByModel(model);
+          view._index = index;
+          return view.el;
+        });
 
-        // Render and show the emptyView. Similar to addChild method
-        // but "add:child" events are not fired, and the event from
-        // emptyView are not forwarded
-        addEmptyView: function(child, EmptyView) {
+        // since append moves elements that are already in the DOM,
+        // appending the elements will effectively reorder them
+        this.triggerMethod('before:reorder');
+        this._appendReorderedChildren(els);
+        this.triggerMethod('reorder');
+      }
+    },
 
-            // get the emptyViewOptions, falling back to childViewOptions
-            var emptyViewOptions = this.getOption('emptyViewOptions') ||
-                                  this.getOption('childViewOptions');
+    // Render view after sorting. Override this method to
+    // change how the view renders after a `sort` on the collection.
+    // An example of this would be to only `renderChildren` in a `CompositeView`
+    // rather than the full view.
+    resortView: function() {
+      if (Marionette.getOption(this, 'reorderOnSort')) {
+        this.reorder();
+      } else {
+        this.render();
+      }
+    },
 
-            if (_.isFunction(emptyViewOptions)) {
-                emptyViewOptions = emptyViewOptions.call(this, child, this._emptyViewIndex);
-            }
+    // Internal method. This checks for any changes in the order of the collection.
+    // If the index of any view doesn't match, it will render.
+    _sortViews: function() {
+      var models = this._filteredSortedModels();
 
-            // build the empty view
-            var view = this.buildChildView(child, EmptyView, emptyViewOptions);
+      // check for any changes in sort order of views
+      var orderChanged = _.find(models, function(item, index) {
+        var view = this.children.findByModel(item);
+        return !view || view._index !== index;
+      }, this);
 
-            view._parent = this;
+      if (orderChanged) {
+        this.resortView();
+      }
+    },
 
-            // Proxy emptyView events
-            this.proxyChildEvents(view);
+    // Internal reference to what index a `emptyView` is.
+    _emptyViewIndex: -1,
 
-            // trigger the 'before:show' event on `view` if the collection view
-            // has already been shown
-            if (this._isShown) {
-                Marionette.triggerMethodOn(view, 'before:show');
-            }
+    // Internal method. Separated so that CompositeView can append to the childViewContainer
+    // if necessary
+    _appendReorderedChildren: function(children) {
+      this.$el.append(children);
+    },
 
-            // Store the `emptyView` like a `childView` so we can properly
-            // remove and/or close it later
-            this.children.add(view);
+    // Internal method. Separated so that CompositeView can have
+    // more control over events being triggered, around the rendering
+    // process
+    _renderChildren: function() {
+      this.destroyEmptyView();
+      this.destroyChildren({ checkEmpty: false });
+
+      if (this.isEmpty(this.collection)) {
+        this.showEmptyView();
+      } else {
+        this.triggerMethod('before:render:collection', this);
+        this.startBuffering();
+        this.showCollection();
+        this.endBuffering();
+        this.triggerMethod('render:collection', this);
+
+        // If we have shown children and none have passed the filter, show the empty view
+        if (this.children.isEmpty()) {
+          this.showEmptyView();
+        }
+      }
+    },
 
-            // Render it and show it
-            this.renderChildView(view, this._emptyViewIndex);
+    // Internal method to loop through collection and show each child view.
+    showCollection: function() {
+      var ChildView;
 
-            // call the 'show' method if the collection view
-            // has already been shown
-            if (this._isShown) {
-                Marionette.triggerMethodOn(view, 'show');
-            }
-        },
+      var models = this._filteredSortedModels();
 
-        // Retrieve the `childView` class, either from `this.options.childView`
-        // or from the `childView` in the object definition. The "options"
-        // takes precedence.
-        // This method receives the model that will be passed to the instance
-        // created from this `childView`. Overriding methods may use the child
-        // to determine what `childView` class to return.
-        getChildView: function(child) {
-            var childView = this.getOption('childView');
-
-            if (!childView) {
-                throw new Marionette.Error({
-                    name: 'NoChildViewError',
-                    message: 'A "childView" must be specified'
-                });
-            }
+      _.each(models, function(child, index) {
+        ChildView = this.getChildView(child);
+        this.addChild(child, ChildView, index);
+      }, this);
+    },
 
-            return childView;
-        },
+    // Allow the collection to be sorted by a custom view comparator
+    _filteredSortedModels: function() {
+      var models;
+      var viewComparator = this.getViewComparator();
 
-        // Render the child's view and add it to the
-        // HTML for the collection view at a given index.
-        // This will also update the indices of later views in the collection
-        // in order to keep the children in sync with the collection.
-        addChild: function(child, ChildView, index) {
-            var childViewOptions = this.getOption('childViewOptions');
-            childViewOptions = Marionette._getValue(childViewOptions, this, [child, index]);
+      if (viewComparator) {
+        if (_.isString(viewComparator) || viewComparator.length === 1) {
+          models = this.collection.sortBy(viewComparator, this);
+        } else {
+          models = _.clone(this.collection.models).sort(_.bind(viewComparator, this));
+        }
+      } else {
+        models = this.collection.models;
+      }
+
+      // Filter after sorting in case the filter uses the index
+      if (this.getOption('filter')) {
+        models = _.filter(models, function(model, index) {
+          return this._shouldAddChild(model, index);
+        }, this);
+      }
+
+      return models;
+    },
 
-            var view = this.buildChildView(child, ChildView, childViewOptions);
+    // Internal method to show an empty view in place of
+    // a collection of child views, when the collection is empty
+    showEmptyView: function() {
+      var EmptyView = this.getEmptyView();
 
-            // increment indices of views after this one
-            this._updateIndices(view, true, index);
+      if (EmptyView && !this._showingEmptyView) {
+        this.triggerMethod('before:render:empty');
 
-            this._addChildView(view, index);
+        this._showingEmptyView = true;
+        var model = new Backbone.Model();
+        this.addEmptyView(model, EmptyView);
 
-            view._parent = this;
+        this.triggerMethod('render:empty');
+      }
+    },
 
-            return view;
-        },
+    // Internal method to destroy an existing emptyView instance
+    // if one exists. Called when a collection view has been
+    // rendered empty, and then a child is added to the collection.
+    destroyEmptyView: function() {
+      if (this._showingEmptyView) {
+        this.triggerMethod('before:remove:empty');
 
-        // Internal method. This decrements or increments the indices of views after the
-        // added/removed view to keep in sync with the collection.
-        _updateIndices: function(view, increment, index) {
-            if (!this.getOption('sort')) {
-                return;
-            }
+        this.destroyChildren();
+        delete this._showingEmptyView;
 
-            if (increment) {
-                // assign the index to the view
-                view._index = index;
-            }
+        this.triggerMethod('remove:empty');
+      }
+    },
 
-            // update the indexes of views after this one
-            this.children.each(function(laterView) {
-                if (laterView._index >= view._index) {
-                    laterView._index += increment ? 1 : -1;
-                }
-            });
-        },
+    // Retrieve the empty view class
+    getEmptyView: function() {
+      return this.getOption('emptyView');
+    },
 
-        // Internal Method. Add the view to children and render it at
-        // the given index.
-        _addChildView: function(view, index) {
-            // set up the child view event forwarding
-            this.proxyChildEvents(view);
+    // Render and show the emptyView. Similar to addChild method
+    // but "add:child" events are not fired, and the event from
+    // emptyView are not forwarded
+    addEmptyView: function(child, EmptyView) {
+      // Only trigger attach if already shown, attached, and not buffering, otherwise endBuffer() or
+      // Region#show() handles this.
+      var canTriggerAttach = this._isShown && !this.isBuffering && Marionette.isNodeAttached(this.el);
+      var nestedViews;
+
+      // get the emptyViewOptions, falling back to childViewOptions
+      var emptyViewOptions = this.getOption('emptyViewOptions') ||
+                            this.getOption('childViewOptions');
+
+      if (_.isFunction(emptyViewOptions)) {
+        emptyViewOptions = emptyViewOptions.call(this, child, this._emptyViewIndex);
+      }
+
+      // build the empty view
+      var view = this.buildChildView(child, EmptyView, emptyViewOptions);
+
+      view._parent = this;
+
+      // Proxy emptyView events
+      this.proxyChildEvents(view);
+
+      // trigger the 'before:show' event on `view` if the collection view has already been shown
+      if (this._isShown) {
+        Marionette.triggerMethodOn(view, 'before:show', view);
+      }
+
+      // Store the `emptyView` like a `childView` so we can properly
+      // remove and/or close it later
+      this.children.add(view);
+
+      // Trigger `before:attach` following `render` to avoid adding logic and event triggers
+      // to public method `renderChildView()`.
+      if (canTriggerAttach && this._triggerBeforeAttach) {
+        nestedViews = [view].concat(view._getNestedViews());
+        view.once('render', function() {
+          this._triggerMethodMany(nestedViews, this, 'before:attach');
+        }, this);
+      }
+
+      // Render it and show it
+      this.renderChildView(view, this._emptyViewIndex);
+
+      // Trigger `attach`
+      if (canTriggerAttach && this._triggerAttach) {
+        nestedViews = [view].concat(view._getNestedViews());
+        this._triggerMethodMany(nestedViews, this, 'attach');
+      }
+      // call the 'show' method if the collection view has already been shown
+      if (this._isShown) {
+        Marionette.triggerMethodOn(view, 'show', view);
+      }
+    },
 
-            this.triggerMethod('before:add:child', view);
+    // Retrieve the `childView` class, either from `this.options.childView`
+    // or from the `childView` in the object definition. The "options"
+    // takes precedence.
+    // This method receives the model that will be passed to the instance
+    // created from this `childView`. Overriding methods may use the child
+    // to determine what `childView` class to return.
+    getChildView: function(child) {
+      var childView = this.getOption('childView');
+
+      if (!childView) {
+        throw new Marionette.Error({
+          name: 'NoChildViewError',
+          message: 'A "childView" must be specified'
+        });
+      }
 
-            // trigger the 'before:show' event on `view` if the collection view
-            // has already been shown
-            if (this._isShown && !this.isBuffering) {
-                Marionette.triggerMethodOn(view, 'before:show');
-            }
+      return childView;
+    },
 
-            // Store the child view itself so we can properly
-            // remove and/or destroy it later
-            this.children.add(view);
-            this.renderChildView(view, index);
+    // Render the child's view and add it to the
+    // HTML for the collection view at a given index.
+    // This will also update the indices of later views in the collection
+    // in order to keep the children in sync with the collection.
+    addChild: function(child, ChildView, index) {
+      var childViewOptions = this.getOption('childViewOptions');
+      childViewOptions = Marionette._getValue(childViewOptions, this, [child, index]);
 
-            if (this._isShown && !this.isBuffering) {
-                Marionette.triggerMethodOn(view, 'show');
-            }
+      var view = this.buildChildView(child, ChildView, childViewOptions);
 
-            this.triggerMethod('add:child', view);
-        },
+      // increment indices of views after this one
+      this._updateIndices(view, true, index);
 
-        // render the child view
-        renderChildView: function(view, index) {
-            view.render();
-            this.attachHtml(this, view, index);
-            return view;
-        },
+      this.triggerMethod('before:add:child', view);
+      this._addChildView(view, index);
+      this.triggerMethod('add:child', view);
 
-        // Build a `childView` for a model in the collection.
-        buildChildView: function(child, ChildViewClass, childViewOptions) {
-            var options = _.extend({ model: child }, childViewOptions);
-            return new ChildViewClass(options);
-        },
+      view._parent = this;
 
-        // Remove the child view and destroy it.
-        // This function also updates the indices of
-        // later views in the collection in order to keep
-        // the children in sync with the collection.
-        removeChildView: function(view) {
-
-            if (view) {
-                this.triggerMethod('before:remove:child', view);
-
-                // call 'destroy' or 'remove', depending on which is found
-                if (view.destroy) {
-                    view.destroy();
-                } else if (view.remove) {
-                    view.remove();
-                }
-
-                delete view._parent;
-                this.stopListening(view);
-                this.children.remove(view);
-                this.triggerMethod('remove:child', view);
-
-                // decrement the index of views after this one
-                this._updateIndices(view, false);
-            }
+      return view;
+    },
 
-            return view;
-        },
+    // Internal method. This decrements or increments the indices of views after the
+    // added/removed view to keep in sync with the collection.
+    _updateIndices: function(view, increment, index) {
+      if (!this.getOption('sort')) {
+        return;
+      }
+
+      if (increment) {
+        // assign the index to the view
+        view._index = index;
+      }
+
+      // update the indexes of views after this one
+      this.children.each(function(laterView) {
+        if (laterView._index >= view._index) {
+          laterView._index += increment ? 1 : -1;
+        }
+      });
+    },
 
-        // check if the collection is empty
-        isEmpty: function() {
-            return !this.collection || this.collection.length === 0;
-        },
+    // Internal Method. Add the view to children and render it at
+    // the given index.
+    _addChildView: function(view, index) {
+      // Only trigger attach if already shown, attached, and not buffering, otherwise endBuffer() or
+      // Region#show() handles this.
+      var canTriggerAttach = this._isShown && !this.isBuffering && Marionette.isNodeAttached(this.el);
+      var nestedViews;
+
+      // set up the child view event forwarding
+      this.proxyChildEvents(view);
+
+      // trigger the 'before:show' event on `view` if the collection view has already been shown
+      if (this._isShown && !this.isBuffering) {
+        Marionette.triggerMethodOn(view, 'before:show', view);
+      }
+
+      // Store the child view itself so we can properly remove and/or destroy it later
+      this.children.add(view);
+
+      // Trigger `before:attach` following `render` to avoid adding logic and event triggers
+      // to public method `renderChildView()`.
+      if (canTriggerAttach && this._triggerBeforeAttach) {
+        nestedViews = [view].concat(view._getNestedViews());
+        view.once('render', function() {
+          this._triggerMethodMany(nestedViews, this, 'before:attach');
+        }, this);
+      }
+
+      this.renderChildView(view, index);
+
+      // Trigger `attach`
+      if (canTriggerAttach && this._triggerAttach) {
+        nestedViews = [view].concat(view._getNestedViews());
+        this._triggerMethodMany(nestedViews, this, 'attach');
+      }
+      // Trigger `show`
+      if (this._isShown && !this.isBuffering) {
+        Marionette.triggerMethodOn(view, 'show', view);
+      }
+    },
 
-        // If empty, show the empty view
-        checkEmpty: function() {
-            if (this.isEmpty(this.collection)) {
-                this.showEmptyView();
-            }
-        },
+    // render the child view
+    renderChildView: function(view, index) {
+      view.render();
+      this.attachHtml(this, view, index);
+      return view;
+    },
 
-        // You might need to override this if you've overridden attachHtml
-        attachBuffer: function(collectionView) {
-            collectionView.$el.append(this._createBuffer(collectionView));
-        },
+    // Build a `childView` for a model in the collection.
+    buildChildView: function(child, ChildViewClass, childViewOptions) {
+      var options = _.extend({ model: child }, childViewOptions);
+      return new ChildViewClass(options);
+    },
 
-        // Create a fragment buffer from the currently buffered children
-        _createBuffer: function(collectionView) {
-            var elBuffer = document.createDocumentFragment();
-            _.each(collectionView._bufferedChildren, function(b) {
-                elBuffer.appendChild(b.el);
-            });
-            return elBuffer;
-        },
+    // Remove the child view and destroy it.
+    // This function also updates the indices of
+    // later views in the collection in order to keep
+    // the children in sync with the collection.
+    removeChildView: function(view) {
 
-        // Append the HTML to the collection's `el`.
-        // Override this method to do something other
-        // than `.append`.
-        attachHtml: function(collectionView, childView, index) {
-            if (collectionView.isBuffering) {
-                // buffering happens on reset events and initial renders
-                // in order to reduce the number of inserts into the
-                // document, which are expensive.
-                collectionView._bufferedChildren.splice(index, 0, childView);
-            } else {
-                // If we've already rendered the main collection, append
-                // the new child into the correct order if we need to. Otherwise
-                // append to the end.
-                if (!collectionView._insertBefore(childView, index)) {
-                    collectionView._insertAfter(childView);
-                }
-            }
-        },
+      if (view) {
+        this.triggerMethod('before:remove:child', view);
 
-        // Internal method. Check whether we need to insert the view into
-        // the correct position.
-        _insertBefore: function(childView, index) {
-            var currentView;
-            var findPosition = this.getOption('sort') && (index < this.children.length - 1);
-            if (findPosition) {
-                // Find the view after this one
-                currentView = this.children.find(function(view) {
-                    return view._index === index + 1;
-                });
-            }
+        // call 'destroy' or 'remove', depending on which is found
+        if (view.destroy) {
+          view.destroy();
+        } else if (view.remove) {
+          view.remove();
+        }
 
-            if (currentView) {
-                currentView.$el.before(childView.el);
-                return true;
-            }
+        delete view._parent;
+        this.stopListening(view);
+        this.children.remove(view);
+        this.triggerMethod('remove:child', view);
 
-            return false;
-        },
+        // decrement the index of views after this one
+        this._updateIndices(view, false);
+      }
 
-        // Internal method. Append a view to the end of the $el
-        _insertAfter: function(childView) {
-            this.$el.append(childView.el);
-        },
+      return view;
+    },
 
-        // Internal method to set up the `children` object for
-        // storing all of the child views
-        _initChildViewStorage: function() {
-            this.children = new Backbone.ChildViewContainer();
-        },
+    // check if the collection is empty
+    isEmpty: function() {
+      return !this.collection || this.collection.length === 0;
+    },
 
-        // Handle cleanup and other destroying needs for the collection of views
-        destroy: function() {
-            if (this.isDestroyed) { return this; }
+    // If empty, show the empty view
+    checkEmpty: function() {
+      if (this.isEmpty(this.collection)) {
+        this.showEmptyView();
+      }
+    },
 
-            this.triggerMethod('before:destroy:collection');
-            this.destroyChildren();
-            this.triggerMethod('destroy:collection');
+    // You might need to override this if you've overridden attachHtml
+    attachBuffer: function(collectionView, buffer) {
+      collectionView.$el.append(buffer);
+    },
 
-            return Marionette.View.prototype.destroy.apply(this, arguments);
-        },
+    // Create a fragment buffer from the currently buffered children
+    _createBuffer: function() {
+      var elBuffer = document.createDocumentFragment();
+      _.each(this._bufferedChildren, function(b) {
+        elBuffer.appendChild(b.el);
+      });
+      return elBuffer;
+    },
 
-        // Destroy the child views that this collection view
-        // is holding on to, if any
-        destroyChildren: function() {
-            var childViews = this.children.map(_.identity);
-            this.children.each(this.removeChildView, this);
-            this.checkEmpty();
-            return childViews;
-        },
+    // Append the HTML to the collection's `el`.
+    // Override this method to do something other
+    // than `.append`.
+    attachHtml: function(collectionView, childView, index) {
+      if (collectionView.isBuffering) {
+        // buffering happens on reset events and initial renders
+        // in order to reduce the number of inserts into the
+        // document, which are expensive.
+        collectionView._bufferedChildren.splice(index, 0, childView);
+      } else {
+        // If we've already rendered the main collection, append
+        // the new child into the correct order if we need to. Otherwise
+        // append to the end.
+        if (!collectionView._insertBefore(childView, index)) {
+          collectionView._insertAfter(childView);
+        }
+      }
+    },
 
-        // Return true if the given child should be shown
-        // Return false otherwise
-        // The filter will be passed (child, index, collection)
-        // Where
-        //  'child' is the given model
-        //  'index' is the index of that model in the collection
-        //  'collection' is the collection referenced by this CollectionView
-        _shouldAddChild: function(child, index) {
-            var filter = this.getOption('filter');
-            return !_.isFunction(filter) || filter.call(this, child, index, this.collection);
-        },
+    // Internal method. Check whether we need to insert the view into
+    // the correct position.
+    _insertBefore: function(childView, index) {
+      var currentView;
+      var findPosition = this.getOption('sort') && (index < this.children.length - 1);
+      if (findPosition) {
+        // Find the view after this one
+        currentView = this.children.find(function(view) {
+          return view._index === index + 1;
+        });
+      }
 
-        // Set up the child view event forwarding. Uses a "childview:"
-        // prefix in front of all forwarded events.
-        proxyChildEvents: function(view) {
-            var prefix = this.getOption('childViewEventPrefix');
+      if (currentView) {
+        currentView.$el.before(childView.el);
+        return true;
+      }
 
-            // Forward all child view events through the parent,
-            // prepending "childview:" to the event name
-            this.listenTo(view, 'all', function() {
-                var args = _.toArray(arguments);
-                var rootEvent = args[0];
-                var childEvents = this.normalizeMethods(_.result(this, 'childEvents'));
+      return false;
+    },
 
-                args[0] = prefix + ':' + rootEvent;
-                args.splice(1, 0, view);
+    // Internal method. Append a view to the end of the $el
+    _insertAfter: function(childView) {
+      this.$el.append(childView.el);
+    },
 
-                // call collectionView childEvent if defined
-                if (typeof childEvents !== 'undefined' && _.isFunction(childEvents[rootEvent])) {
-                    childEvents[rootEvent].apply(this, args.slice(1));
-                }
+    // Internal method to set up the `children` object for
+    // storing all of the child views
+    _initChildViewStorage: function() {
+      this.children = new Backbone.ChildViewContainer();
+    },
 
-                this.triggerMethod.apply(this, args);
-            });
-        },
+    // Handle cleanup and other destroying needs for the collection of views
+    destroy: function() {
+      if (this.isDestroyed) { return this; }
 
-        _getImmediateChildren: function() {
-            return _.values(this.children._views);
-        },
+      this.triggerMethod('before:destroy:collection');
+      this.destroyChildren({ checkEmpty: false });
+      this.triggerMethod('destroy:collection');
 
-        getViewComparator: function() {
-            return this.getOption('viewComparator');
-        }
-    });
+      return Marionette.View.prototype.destroy.apply(this, arguments);
+    },
 
-    /* jshint maxstatements: 17, maxlen: 117 */
+    // Destroy the child views that this collection view
+    // is holding on to, if any
+    destroyChildren: function(options) {
+      var destroyOptions = options || {};
+      var shouldCheckEmpty = true;
+      var childViews = this.children.map(_.identity);
 
-    // Composite View
-    // --------------
+      if (!_.isUndefined(destroyOptions.checkEmpty)) {
+        shouldCheckEmpty = destroyOptions.checkEmpty;
+      }
 
-    // Used for rendering a branch-leaf, hierarchical structure.
-    // Extends directly from CollectionView and also renders an
-    // a child view as `modelView`, for the top leaf
-    Marionette.CompositeView = Marionette.CollectionView.extend({
-
-        // Setting up the inheritance chain which allows changes to
-        // Marionette.CollectionView.prototype.constructor which allows overriding
-        // option to pass '{sort: false}' to prevent the CompositeView from
-        // maintaining the sorted order of the collection.
-        // This will fallback onto appending childView's to the end.
-        constructor: function() {
-            Marionette.CollectionView.apply(this, arguments);
-        },
+      this.children.each(this.removeChildView, this);
 
-        // Configured the initial events that the composite view
-        // binds to. Override this method to prevent the initial
-        // events, or to add your own initial events.
-        _initialEvents: function() {
+      if (shouldCheckEmpty) {
+        this.checkEmpty();
+      }
+      return childViews;
+    },
 
-            // Bind only after composite view is rendered to avoid adding child views
-            // to nonexistent childViewContainer
+    // Return true if the given child should be shown
+    // Return false otherwise
+    // The filter will be passed (child, index, collection)
+    // Where
+    //  'child' is the given model
+    //  'index' is the index of that model in the collection
+    //  'collection' is the collection referenced by this CollectionView
+    _shouldAddChild: function(child, index) {
+      var filter = this.getOption('filter');
+      return !_.isFunction(filter) || filter.call(this, child, index, this.collection);
+    },
 
-            if (this.collection) {
-                this.listenTo(this.collection, 'add', this._onCollectionAdd);
-                this.listenTo(this.collection, 'remove', this._onCollectionRemove);
-                this.listenTo(this.collection, 'reset', this._renderChildren);
+    // Set up the child view event forwarding. Uses a "childview:"
+    // prefix in front of all forwarded events.
+    proxyChildEvents: function(view) {
+      var prefix = this.getOption('childViewEventPrefix');
 
-                if (this.getOption('sort')) {
-                    this.listenTo(this.collection, 'sort', this._sortViews);
-                }
-            }
-        },
+      // Forward all child view events through the parent,
+      // prepending "childview:" to the event name
+      this.listenTo(view, 'all', function() {
+        var args = _.toArray(arguments);
+        var rootEvent = args[0];
+        var childEvents = this.normalizeMethods(_.result(this, 'childEvents'));
 
-        // Retrieve the `childView` to be used when rendering each of
-        // the items in the collection. The default is to return
-        // `this.childView` or Marionette.CompositeView if no `childView`
-        // has been defined
-        getChildView: function(child) {
-            var childView = this.getOption('childView') || this.constructor;
+        args[0] = prefix + ':' + rootEvent;
+        args.splice(1, 0, view);
 
-            return childView;
-        },
+        // call collectionView childEvent if defined
+        if (typeof childEvents !== 'undefined' && _.isFunction(childEvents[rootEvent])) {
+          childEvents[rootEvent].apply(this, args.slice(1));
+        }
 
-        // Serialize the model for the view.
-        // You can override the `serializeData` method in your own view
-        // definition, to provide custom serialization for your view's data.
-        serializeData: function() {
-            var data = {};
+        this.triggerMethod.apply(this, args);
+      });
+    },
 
-            if (this.model) {
-                data = _.partial(this.serializeModel, this.model).apply(this, arguments);
-            }
+    _getImmediateChildren: function() {
+      return _.values(this.children._views);
+    },
 
-            return data;
-        },
+    getViewComparator: function() {
+      return this.getOption('viewComparator');
+    }
+  });
 
-        // Renders the model and the collection.
-        render: function() {
-            this._ensureViewIsIntact();
-            this._isRendering = true;
-            this.resetChildViewContainer();
+  /* jshint maxstatements: 17, maxlen: 117 */
 
-            this.triggerMethod('before:render', this);
+  // Composite View
+  // --------------
 
-            this._renderTemplate();
-            this._renderChildren();
+  // Used for rendering a branch-leaf, hierarchical structure.
+  // Extends directly from CollectionView and also renders an
+  // a child view as `modelView`, for the top leaf
+  Marionette.CompositeView = Marionette.CollectionView.extend({
 
-            this._isRendering = false;
-            this.isRendered = true;
-            this.triggerMethod('render', this);
-            return this;
-        },
+    // Setting up the inheritance chain which allows changes to
+    // Marionette.CollectionView.prototype.constructor which allows overriding
+    // option to pass '{sort: false}' to prevent the CompositeView from
+    // maintaining the sorted order of the collection.
+    // This will fallback onto appending childView's to the end.
+    constructor: function() {
+      Marionette.CollectionView.apply(this, arguments);
+    },
 
-        _renderChildren: function() {
-            if (this.isRendered || this._isRendering) {
-                Marionette.CollectionView.prototype._renderChildren.call(this);
-            }
-        },
+    // Configured the initial events that the composite view
+    // binds to. Override this method to prevent the initial
+    // events, or to add your own initial events.
+    _initialEvents: function() {
 
-        // Render the root template that the children
-        // views are appended to
-        _renderTemplate: function() {
-            var data = {};
-            data = this.serializeData();
-            data = this.mixinTemplateHelpers(data);
+      // Bind only after composite view is rendered to avoid adding child views
+      // to nonexistent childViewContainer
 
-            this.triggerMethod('before:render:template');
+      if (this.collection) {
+        this.listenTo(this.collection, 'add', this._onCollectionAdd);
+        this.listenTo(this.collection, 'remove', this._onCollectionRemove);
+        this.listenTo(this.collection, 'reset', this._renderChildren);
 
-            var template = this.getTemplate();
-            var html = Marionette.Renderer.render(template, data, this);
-            this.attachElContent(html);
+        if (this.getOption('sort')) {
+          this.listenTo(this.collection, 'sort', this._sortViews);
+        }
+      }
+    },
 
-            // the ui bindings is done here and not at the end of render since they
-            // will not be available until after the model is rendered, but should be
-            // available before the collection is rendered.
-            this.bindUIElements();
-            this.triggerMethod('render:template');
-        },
+    // Retrieve the `childView` to be used when rendering each of
+    // the items in the collection. The default is to return
+    // `this.childView` or Marionette.CompositeView if no `childView`
+    // has been defined
+    getChildView: function(child) {
+      var childView = this.getOption('childView') || this.constructor;
 
-        // Attaches the content of the root.
-        // This method can be overridden to optimize rendering,
-        // or to render in a non standard way.
-        //
-        // For example, using `innerHTML` instead of `$el.html`
-        //
-        // ```js
-        // attachElContent: function(html) {
-        //   this.el.innerHTML = html;
-        //   return this;
-        // }
-        // ```
-        attachElContent: function(html) {
-            this.$el.html(html);
-
-            return this;
-        },
+      return childView;
+    },
 
-        // You might need to override this if you've overridden attachHtml
-        attachBuffer: function(compositeView) {
-            var $container = this.getChildViewContainer(compositeView);
-            $container.append(this._createBuffer(compositeView));
-        },
+    // Serialize the model for the view.
+    // You can override the `serializeData` method in your own view
+    // definition, to provide custom serialization for your view's data.
+    serializeData: function() {
+      var data = {};
 
-        // Internal method. Append a view to the end of the $el.
-        // Overidden from CollectionView to ensure view is appended to
-        // childViewContainer
-        _insertAfter: function(childView) {
-            var $container = this.getChildViewContainer(this, childView);
-            $container.append(childView.el);
-        },
+      if (this.model) {
+        data = _.partial(this.serializeModel, this.model).apply(this, arguments);
+      }
 
-        // Internal method. Append reordered childView'.
-        // Overidden from CollectionView to ensure reordered views
-        // are appended to childViewContainer
-        _appendReorderedChildren: function(children) {
-            var $container = this.getChildViewContainer(this);
-            $container.append(children);
-        },
+      return data;
+    },
 
-        // Internal method to ensure an `$childViewContainer` exists, for the
-        // `attachHtml` method to use.
-        getChildViewContainer: function(containerView, childView) {
-            if ('$childViewContainer' in containerView) {
-                return containerView.$childViewContainer;
-            }
+    // Renders the model and the collection.
+    render: function() {
+      this._ensureViewIsIntact();
+      this._isRendering = true;
+      this.resetChildViewContainer();
 
-            var container;
-            var childViewContainer = Marionette.getOption(containerView, 'childViewContainer');
-            if (childViewContainer) {
+      this.triggerMethod('before:render', this);
 
-                var selector = Marionette._getValue(childViewContainer, containerView);
+      this._renderTemplate();
+      this._renderChildren();
 
-                if (selector.charAt(0) === '@' && containerView.ui) {
-                    container = containerView.ui[selector.substr(4)];
-                } else {
-                    container = containerView.$(selector);
-                }
+      this._isRendering = false;
+      this.isRendered = true;
+      this.triggerMethod('render', this);
+      return this;
+    },
 
-                if (container.length <= 0) {
-                    throw new Marionette.Error({
-                        name: 'ChildViewContainerMissingError',
-                        message: 'The specified "childViewContainer" was not found: ' + containerView.childViewContainer
-                    });
-                }
+    _renderChildren: function() {
+      if (this.isRendered || this._isRendering) {
+        Marionette.CollectionView.prototype._renderChildren.call(this);
+      }
+    },
 
-            } else {
-                container = containerView.$el;
-            }
+    // Render the root template that the children
+    // views are appended to
+    _renderTemplate: function() {
+      var data = {};
+      data = this.serializeData();
+      data = this.mixinTemplateHelpers(data);
 
-            containerView.$childViewContainer = container;
-            return container;
-        },
+      this.triggerMethod('before:render:template');
 
-        // Internal method to reset the `$childViewContainer` on render
-        resetChildViewContainer: function() {
-            if (this.$childViewContainer) {
-                delete this.$childViewContainer;
-            }
-        }
-    });
+      var template = this.getTemplate();
+      var html = Marionette.Renderer.render(template, data, this);
+      this.attachElContent(html);
 
-    // Layout View
-    // -----------
+      // the ui bindings is done here and not at the end of render since they
+      // will not be available until after the model is rendered, but should be
+      // available before the collection is rendered.
+      this.bindUIElements();
+      this.triggerMethod('render:template');
+    },
 
-    // Used for managing application layoutViews, nested layoutViews and
-    // multiple regions within an application or sub-application.
+    // Attaches the content of the root.
+    // This method can be overridden to optimize rendering,
+    // or to render in a non standard way.
     //
-    // A specialized view class that renders an area of HTML and then
-    // attaches `Region` instances to the specified `regions`.
-    // Used for composite view management and sub-application areas.
-    Marionette.LayoutView = Marionette.ItemView.extend({
-        regionClass: Marionette.Region,
-
-        options: {
-            destroyImmediate: false
-        },
+    // For example, using `innerHTML` instead of `$el.html`
+    //
+    // ```js
+    // attachElContent: function(html) {
+    //   this.el.innerHTML = html;
+    //   return this;
+    // }
+    // ```
+    attachElContent: function(html) {
+      this.$el.html(html);
+
+      return this;
+    },
 
-        // used as the prefix for child view events
-        // that are forwarded through the layoutview
-        childViewEventPrefix: 'childview',
+    // You might need to override this if you've overridden attachHtml
+    attachBuffer: function(compositeView, buffer) {
+      var $container = this.getChildViewContainer(compositeView);
+      $container.append(buffer);
+    },
 
-        // Ensure the regions are available when the `initialize` method
-        // is called.
-        constructor: function(options) {
-            options = options || {};
+    // Internal method. Append a view to the end of the $el.
+    // Overidden from CollectionView to ensure view is appended to
+    // childViewContainer
+    _insertAfter: function(childView) {
+      var $container = this.getChildViewContainer(this, childView);
+      $container.append(childView.el);
+    },
 
-            this._firstRender = true;
-            this._initializeRegions(options);
+    // Internal method. Append reordered childView'.
+    // Overidden from CollectionView to ensure reordered views
+    // are appended to childViewContainer
+    _appendReorderedChildren: function(children) {
+      var $container = this.getChildViewContainer(this);
+      $container.append(children);
+    },
 
-            Marionette.ItemView.call(this, options);
-        },
+    // Internal method to ensure an `$childViewContainer` exists, for the
+    // `attachHtml` method to use.
+    getChildViewContainer: function(containerView, childView) {
+      if (!!containerView.$childViewContainer) {
+        return containerView.$childViewContainer;
+      }
 
-        // LayoutView's render will use the existing region objects the
-        // first time it is called. Subsequent calls will destroy the
-        // views that the regions are showing and then reset the `el`
-        // for the regions to the newly rendered DOM elements.
-        render: function() {
-            this._ensureViewIsIntact();
-
-            if (this._firstRender) {
-                // if this is the first render, don't do anything to
-                // reset the regions
-                this._firstRender = false;
-            } else {
-                // If this is not the first render call, then we need to
-                // re-initialize the `el` for each region
-                this._reInitializeRegions();
-            }
+      var container;
+      var childViewContainer = Marionette.getOption(containerView, 'childViewContainer');
+      if (childViewContainer) {
 
-            return Marionette.ItemView.prototype.render.apply(this, arguments);
-        },
+        var selector = Marionette._getValue(childViewContainer, containerView);
 
-        // Handle destroying regions, and then destroy the view itself.
-        destroy: function() {
-            if (this.isDestroyed) { return this; }
-            // #2134: remove parent element before destroying the child views, so
-            // removing the child views doesn't retrigger repaints
-            if (this.getOption('destroyImmediate') === true) {
-                this.$el.remove();
-            }
-            this.regionManager.destroy();
-            return Marionette.ItemView.prototype.destroy.apply(this, arguments);
-        },
+        if (selector.charAt(0) === '@' && containerView.ui) {
+          container = containerView.ui[selector.substr(4)];
+        } else {
+          container = containerView.$(selector);
+        }
 
-        showChildView: function(regionName, view) {
-            return this.getRegion(regionName).show(view);
-        },
+        if (container.length <= 0) {
+          throw new Marionette.Error({
+            name: 'ChildViewContainerMissingError',
+            message: 'The specified "childViewContainer" was not found: ' + containerView.childViewContainer
+          });
+        }
 
-        getChildView: function(regionName) {
-            return this.getRegion(regionName).currentView;
-        },
+      } else {
+        container = containerView.$el;
+      }
 
-        // Add a single region, by name, to the layoutView
-        addRegion: function(name, definition) {
-            var regions = {};
-            regions[name] = definition;
-            return this._buildRegions(regions)[name];
-        },
+      containerView.$childViewContainer = container;
+      return container;
+    },
 
-        // Add multiple regions as a {name: definition, name2: def2} object literal
-        addRegions: function(regions) {
-            this.regions = _.extend({}, this.regions, regions);
-            return this._buildRegions(regions);
-        },
+    // Internal method to reset the `$childViewContainer` on render
+    resetChildViewContainer: function() {
+      if (this.$childViewContainer) {
+        this.$childViewContainer = undefined;
+      }
+    }
+  });
+
+  // Layout View
+  // -----------
+
+  // Used for managing application layoutViews, nested layoutViews and
+  // multiple regions within an application or sub-application.
+  //
+  // A specialized view class that renders an area of HTML and then
+  // attaches `Region` instances to the specified `regions`.
+  // Used for composite view management and sub-application areas.
+  Marionette.LayoutView = Marionette.ItemView.extend({
+    regionClass: Marionette.Region,
+
+    options: {
+      destroyImmediate: false
+    },
 
-        // Remove a single region from the LayoutView, by name
-        removeRegion: function(name) {
-            delete this.regions[name];
-            return this.regionManager.removeRegion(name);
-        },
+    // used as the prefix for child view events
+    // that are forwarded through the layoutview
+    childViewEventPrefix: 'childview',
 
-        // Provides alternative access to regions
-        // Accepts the region name
-        // getRegion('main')
-        getRegion: function(region) {
-            return this.regionManager.get(region);
-        },
+    // Ensure the regions are available when the `initialize` method
+    // is called.
+    constructor: function(options) {
+      options = options || {};
 
-        // Get all regions
-        getRegions: function() {
-            return this.regionManager.getRegions();
-        },
+      this._firstRender = true;
+      this._initializeRegions(options);
 
-        // internal method to build regions
-        _buildRegions: function(regions) {
-            var defaults = {
-                regionClass: this.getOption('regionClass'),
-                parentEl: _.partial(_.result, this, 'el')
-            };
+      Marionette.ItemView.call(this, options);
+    },
 
-            return this.regionManager.addRegions(regions, defaults);
-        },
+    // LayoutView's render will use the existing region objects the
+    // first time it is called. Subsequent calls will destroy the
+    // views that the regions are showing and then reset the `el`
+    // for the regions to the newly rendered DOM elements.
+    render: function() {
+      this._ensureViewIsIntact();
+
+      if (this._firstRender) {
+        // if this is the first render, don't do anything to
+        // reset the regions
+        this._firstRender = false;
+      } else {
+        // If this is not the first render call, then we need to
+        // re-initialize the `el` for each region
+        this._reInitializeRegions();
+      }
+
+      return Marionette.ItemView.prototype.render.apply(this, arguments);
+    },
 
-        // Internal method to initialize the regions that have been defined in a
-        // `regions` attribute on this layoutView.
-        _initializeRegions: function(options) {
-            var regions;
-            this._initRegionManager();
+    // Handle destroying regions, and then destroy the view itself.
+    destroy: function() {
+      if (this.isDestroyed) { return this; }
+      // #2134: remove parent element before destroying the child views, so
+      // removing the child views doesn't retrigger repaints
+      if (this.getOption('destroyImmediate') === true) {
+        this.$el.remove();
+      }
+      this.regionManager.destroy();
+      return Marionette.ItemView.prototype.destroy.apply(this, arguments);
+    },
 
-            regions = Marionette._getValue(this.regions, this, [options]) || {};
+    showChildView: function(regionName, view) {
+      return this.getRegion(regionName).show(view);
+    },
 
-            // Enable users to define `regions` as instance options.
-            var regionOptions = this.getOption.call(options, 'regions');
+    getChildView: function(regionName) {
+      return this.getRegion(regionName).currentView;
+    },
 
-            // enable region options to be a function
-            regionOptions = Marionette._getValue(regionOptions, this, [options]);
+    // Add a single region, by name, to the layoutView
+    addRegion: function(name, definition) {
+      var regions = {};
+      regions[name] = definition;
+      return this._buildRegions(regions)[name];
+    },
 
-            _.extend(regions, regionOptions);
+    // Add multiple regions as a {name: definition, name2: def2} object literal
+    addRegions: function(regions) {
+      this.regions = _.extend({}, this.regions, regions);
+      return this._buildRegions(regions);
+    },
 
-            // Normalize region selectors hash to allow
-            // a user to use the @ui. syntax.
-            regions = this.normalizeUIValues(regions, ['selector', 'el']);
+    // Remove a single region from the LayoutView, by name
+    removeRegion: function(name) {
+      delete this.regions[name];
+      return this.regionManager.removeRegion(name);
+    },
 
-            this.addRegions(regions);
-        },
+    // Provides alternative access to regions
+    // Accepts the region name
+    // getRegion('main')
+    getRegion: function(region) {
+      return this.regionManager.get(region);
+    },
 
-        // Internal method to re-initialize all of the regions by updating the `el` that
-        // they point to
-        _reInitializeRegions: function() {
-            this.regionManager.invoke('reset');
-        },
+    // Get all regions
+    getRegions: function() {
+      return this.regionManager.getRegions();
+    },
 
-        // Enable easy overriding of the default `RegionManager`
-        // for customized region interactions and business specific
-        // view logic for better control over single regions.
-        getRegionManager: function() {
-            return new Marionette.RegionManager();
-        },
+    // internal method to build regions
+    _buildRegions: function(regions) {
+      var defaults = {
+        regionClass: this.getOption('regionClass'),
+        parentEl: _.partial(_.result, this, 'el')
+      };
 
-        // Internal method to initialize the region manager
-        // and all regions in it
-        _initRegionManager: function() {
-            this.regionManager = this.getRegionManager();
-            this.regionManager._parent = this;
-
-            this.listenTo(this.regionManager, 'before:add:region', function(name) {
-                this.triggerMethod('before:add:region', name);
-            });
-
-            this.listenTo(this.regionManager, 'add:region', function(name, region) {
-                this[name] = region;
-                this.triggerMethod('add:region', name, region);
-            });
-
-            this.listenTo(this.regionManager, 'before:remove:region', function(name) {
-                this.triggerMethod('before:remove:region', name);
-            });
-
-            this.listenTo(this.regionManager, 'remove:region', function(name, region) {
-                delete this[name];
-                this.triggerMethod('remove:region', name, region);
-            });
-        },
+      return this.regionManager.addRegions(regions, defaults);
+    },
 
-        _getImmediateChildren: function() {
-            return _.chain(this.regionManager.getRegions())
-              .pluck('currentView')
-              .compact()
-              .value();
-        }
-    });
+    // Internal method to initialize the regions that have been defined in a
+    // `regions` attribute on this layoutView.
+    _initializeRegions: function(options) {
+      var regions;
+      this._initRegionManager();
 
+      regions = Marionette._getValue(this.regions, this, [options]) || {};
 
-    // Behavior
-    // --------
+      // Enable users to define `regions` as instance options.
+      var regionOptions = this.getOption.call(options, 'regions');
 
-    // A Behavior is an isolated set of DOM /
-    // user interactions that can be mixed into any View.
-    // Behaviors allow you to blackbox View specific interactions
-    // into portable logical chunks, keeping your views simple and your code DRY.
-
-    Marionette.Behavior = Marionette.Object.extend({
-        constructor: function(options, view) {
-            // Setup reference to the view.
-            // this comes in handle when a behavior
-            // wants to directly talk up the chain
-            // to the view.
-            this.view = view;
-            this.defaults = _.result(this, 'defaults') || {};
-            this.options = _.extend({}, this.defaults, options);
-            // Construct an internal UI hash using
-            // the views UI hash and then the behaviors UI hash.
-            // This allows the user to use UI hash elements
-            // defined in the parent view as well as those
-            // defined in the given behavior.
-            this.ui = _.extend({}, _.result(view, 'ui'), _.result(this, 'ui'));
-
-            Marionette.Object.apply(this, arguments);
-        },
+      // enable region options to be a function
+      regionOptions = Marionette._getValue(regionOptions, this, [options]);
 
-        // proxy behavior $ method to the view
-        // this is useful for doing jquery DOM lookups
-        // scoped to behaviors view.
-        $: function() {
-            return this.view.$.apply(this.view, arguments);
-        },
+      _.extend(regions, regionOptions);
 
-        // Stops the behavior from listening to events.
-        // Overrides Object#destroy to prevent additional events from being triggered.
-        destroy: function() {
-            this.stopListening();
+      // Normalize region selectors hash to allow
+      // a user to use the @ui. syntax.
+      regions = this.normalizeUIValues(regions, ['selector', 'el']);
 
-            return this;
-        },
+      this.addRegions(regions);
+    },
 
-        proxyViewProperties: function(view) {
-            this.$el = view.$el;
-            this.el = view.el;
-        }
-    });
+    // Internal method to re-initialize all of the regions by updating the `el` that
+    // they point to
+    _reInitializeRegions: function() {
+      this.regionManager.invoke('reset');
+    },
 
-    /* jshint maxlen: 143 */
-    // Behaviors
-    // ---------
+    // Enable easy overriding of the default `RegionManager`
+    // for customized region interactions and business specific
+    // view logic for better control over single regions.
+    getRegionManager: function() {
+      return new Marionette.RegionManager();
+    },
 
-    // Behaviors is a utility class that takes care of
-    // gluing your behavior instances to their given View.
-    // The most important part of this class is that you
-    // **MUST** override the class level behaviorsLookup
-    // method for things to work properly.
+    // Internal method to initialize the region manager
+    // and all regions in it
+    _initRegionManager: function() {
+      this.regionManager = this.getRegionManager();
+      this.regionManager._parent = this;
+
+      this.listenTo(this.regionManager, 'before:add:region', function(name) {
+        this.triggerMethod('before:add:region', name);
+      });
+
+      this.listenTo(this.regionManager, 'add:region', function(name, region) {
+        this[name] = region;
+        this.triggerMethod('add:region', name, region);
+      });
+
+      this.listenTo(this.regionManager, 'before:remove:region', function(name) {
+        this.triggerMethod('before:remove:region', name);
+      });
+
+      this.listenTo(this.regionManager, 'remove:region', function(name, region) {
+        delete this[name];
+        this.triggerMethod('remove:region', name, region);
+      });
+    },
 
-    Marionette.Behaviors = (function(Marionette, _) {
-        // Borrow event splitter from Backbone
-        var delegateEventSplitter = /^(\S+)\s*(.*)$/;
+    _getImmediateChildren: function() {
+      return _.chain(this.regionManager.getRegions())
+        .pluck('currentView')
+        .compact()
+        .value();
+    }
+  });
+
+
+  // Behavior
+  // --------
+
+  // A Behavior is an isolated set of DOM /
+  // user interactions that can be mixed into any View.
+  // Behaviors allow you to blackbox View specific interactions
+  // into portable logical chunks, keeping your views simple and your code DRY.
+
+  Marionette.Behavior = Marionette.Object.extend({
+    constructor: function(options, view) {
+      // Setup reference to the view.
+      // this comes in handle when a behavior
+      // wants to directly talk up the chain
+      // to the view.
+      this.view = view;
+      this.defaults = _.result(this, 'defaults') || {};
+      this.options = _.extend({}, this.defaults, options);
+      // Construct an internal UI hash using
+      // the views UI hash and then the behaviors UI hash.
+      // This allows the user to use UI hash elements
+      // defined in the parent view as well as those
+      // defined in the given behavior.
+      this.ui = _.extend({}, _.result(view, 'ui'), _.result(this, 'ui'));
+
+      Marionette.Object.apply(this, arguments);
+    },
 
-        function Behaviors(view, behaviors) {
+    // proxy behavior $ method to the view
+    // this is useful for doing jquery DOM lookups
+    // scoped to behaviors view.
+    $: function() {
+      return this.view.$.apply(this.view, arguments);
+    },
 
-            if (!_.isObject(view.behaviors)) {
-                return {};
-            }
+    // Stops the behavior from listening to events.
+    // Overrides Object#destroy to prevent additional events from being triggered.
+    destroy: function() {
+      this.stopListening();
 
-            // Behaviors defined on a view can be a flat object literal
-            // or it can be a function that returns an object.
-            behaviors = Behaviors.parseBehaviors(view, behaviors || _.result(view, 'behaviors'));
+      return this;
+    },
 
-            // Wraps several of the view's methods
-            // calling the methods first on each behavior
-            // and then eventually calling the method on the view.
-            Behaviors.wrap(view, behaviors, _.keys(methods));
-            return behaviors;
-        }
+    proxyViewProperties: function(view) {
+      this.$el = view.$el;
+      this.el = view.el;
+    }
+  });
 
-        var methods = {
-            behaviorTriggers: function(behaviorTriggers, behaviors) {
-                var triggerBuilder = new BehaviorTriggersBuilder(this, behaviors);
-                return triggerBuilder.buildBehaviorTriggers();
-            },
+  /* jshint maxlen: 143 */
+  // Behaviors
+  // ---------
 
-            behaviorEvents: function(behaviorEvents, behaviors) {
-                var _behaviorsEvents = {};
+  // Behaviors is a utility class that takes care of
+  // gluing your behavior instances to their given View.
+  // The most important part of this class is that you
+  // **MUST** override the class level behaviorsLookup
+  // method for things to work properly.
 
-                _.each(behaviors, function(b, i) {
-                    var _events = {};
-                    var behaviorEvents = _.clone(_.result(b, 'events')) || {};
+  Marionette.Behaviors = (function(Marionette, _) {
+    // Borrow event splitter from Backbone
+    var delegateEventSplitter = /^(\S+)\s*(.*)$/;
 
-                    // Normalize behavior events hash to allow
-                    // a user to use the @ui. syntax.
-                    behaviorEvents = Marionette.normalizeUIKeys(behaviorEvents, getBehaviorsUI(b));
+    function Behaviors(view, behaviors) {
 
-                    var j = 0;
-                    _.each(behaviorEvents, function(behaviour, key) {
-                        var match = key.match(delegateEventSplitter);
+      if (!_.isObject(view.behaviors)) {
+        return {};
+      }
 
-                        // Set event name to be namespaced using the view cid,
-                        // the behavior index, and the behavior event index
-                        // to generate a non colliding event namespace
-                        // http://api.jquery.com/event.namespace/
-                        var eventName = match[1] + '.' + [this.cid, i, j++, ' '].join('');
-                        var selector = match[2];
+      // Behaviors defined on a view can be a flat object literal
+      // or it can be a function that returns an object.
+      behaviors = Behaviors.parseBehaviors(view, behaviors || _.result(view, 'behaviors'));
 
-                        var eventKey = eventName + selector;
-                        var handler = _.isFunction(behaviour) ? behaviour : b[behaviour];
+      // Wraps several of the view's methods
+      // calling the methods first on each behavior
+      // and then eventually calling the method on the view.
+      Behaviors.wrap(view, behaviors, _.keys(methods));
+      return behaviors;
+    }
 
-                        _events[eventKey] = _.bind(handler, b);
-                    }, this);
+    var methods = {
+      behaviorTriggers: function(behaviorTriggers, behaviors) {
+        var triggerBuilder = new BehaviorTriggersBuilder(this, behaviors);
+        return triggerBuilder.buildBehaviorTriggers();
+      },
 
-                    _behaviorsEvents = _.extend(_behaviorsEvents, _events);
-                }, this);
+      behaviorEvents: function(behaviorEvents, behaviors) {
+        var _behaviorsEvents = {};
 
-                return _behaviorsEvents;
-            }
-        };
+        _.each(behaviors, function(b, i) {
+          var _events = {};
+          var behaviorEvents = _.clone(_.result(b, 'events')) || {};
 
-        _.extend(Behaviors, {
-
-            // Placeholder method to be extended by the user.
-            // The method should define the object that stores the behaviors.
-            // i.e.
-            //
-            // ```js
-            // Marionette.Behaviors.behaviorsLookup: function() {
-            //   return App.Behaviors
-            // }
-            // ```
-            behaviorsLookup: function() {
-                throw new Marionette.Error({
-                    message: 'You must define where your behaviors are stored.',
-                    url: 'marionette.behaviors.html#behaviorslookup'
-                });
-            },
-
-            // Takes care of getting the behavior class
-            // given options and a key.
-            // If a user passes in options.behaviorClass
-            // default to using that. Otherwise delegate
-            // the lookup to the users `behaviorsLookup` implementation.
-            getBehaviorClass: function(options, key) {
-                if (options.behaviorClass) {
-                    return options.behaviorClass;
-                }
-
-                // Get behavior class can be either a flat object or a method
-                return Marionette._getValue(Behaviors.behaviorsLookup, this, [options, key])[key];
-            },
-
-            // Iterate over the behaviors object, for each behavior
-            // instantiate it and get its grouped behaviors.
-            parseBehaviors: function(view, behaviors) {
-                return _.chain(behaviors).map(function(options, key) {
-                    var BehaviorClass = Behaviors.getBehaviorClass(options, key);
-
-                    var behavior = new BehaviorClass(options, view);
-                    var nestedBehaviors = Behaviors.parseBehaviors(view, _.result(behavior, 'behaviors'));
-
-                    return [behavior].concat(nestedBehaviors);
-                }).flatten().value();
-            },
-
-            // Wrap view internal methods so that they delegate to behaviors. For example,
-            // `onDestroy` should trigger destroy on all of the behaviors and then destroy itself.
-            // i.e.
-            //
-            // `view.delegateEvents = _.partial(methods.delegateEvents, view.delegateEvents, behaviors);`
-            wrap: function(view, behaviors, methodNames) {
-                _.each(methodNames, function(methodName) {
-                    view[methodName] = _.partial(methods[methodName], view[methodName], behaviors);
-                });
-            }
-        });
+          // Normalize behavior events hash to allow
+          // a user to use the @ui. syntax.
+          behaviorEvents = Marionette.normalizeUIKeys(behaviorEvents, getBehaviorsUI(b));
 
-        // Class to build handlers for `triggers` on behaviors
-        // for views
-        function BehaviorTriggersBuilder(view, behaviors) {
-            this._view = view;
-            this._behaviors = behaviors;
-            this._triggers = {};
-        }
+          var j = 0;
+          _.each(behaviorEvents, function(behaviour, key) {
+            var match = key.match(delegateEventSplitter);
 
-        _.extend(BehaviorTriggersBuilder.prototype, {
-            // Main method to build the triggers hash with event keys and handlers
-            buildBehaviorTriggers: function() {
-                _.each(this._behaviors, this._buildTriggerHandlersForBehavior, this);
-                return this._triggers;
-            },
+            // Set event name to be namespaced using the view cid,
+            // the behavior index, and the behavior event index
+            // to generate a non colliding event namespace
+            // http://api.jquery.com/event.namespace/
+            var eventName = match[1] + '.' + [this.cid, i, j++, ' '].join('');
+            var selector = match[2];
 
-            // Internal method to build all trigger handlers for a given behavior
-            _buildTriggerHandlersForBehavior: function(behavior, i) {
-                var triggersHash = _.clone(_.result(behavior, 'triggers')) || {};
+            var eventKey = eventName + selector;
+            var handler = _.isFunction(behaviour) ? behaviour : b[behaviour];
 
-                triggersHash = Marionette.normalizeUIKeys(triggersHash, getBehaviorsUI(behavior));
+            _events[eventKey] = _.bind(handler, b);
+          }, this);
 
-                _.each(triggersHash, _.bind(this._setHandlerForBehavior, this, behavior, i));
-            },
+          _behaviorsEvents = _.extend(_behaviorsEvents, _events);
+        }, this);
 
-            // Internal method to create and assign the trigger handler for a given
-            // behavior
-            _setHandlerForBehavior: function(behavior, i, eventName, trigger) {
-                // Unique identifier for the `this._triggers` hash
-                var triggerKey = trigger.replace(/^\S+/, function(triggerName) {
-                    return triggerName + '.' + 'behaviortriggers' + i;
-                });
+        return _behaviorsEvents;
+      }
+    };
 
-                this._triggers[triggerKey] = this._view._buildViewTrigger(eventName);
-            }
+    _.extend(Behaviors, {
+
+      // Placeholder method to be extended by the user.
+      // The method should define the object that stores the behaviors.
+      // i.e.
+      //
+      // ```js
+      // Marionette.Behaviors.behaviorsLookup: function() {
+      //   return App.Behaviors
+      // }
+      // ```
+      behaviorsLookup: function() {
+        throw new Marionette.Error({
+          message: 'You must define where your behaviors are stored.',
+          url: 'marionette.behaviors.html#behaviorslookup'
         });
-
-        function getBehaviorsUI(behavior) {
-            return behavior._uiBindings || behavior.ui;
+      },
+
+      // Takes care of getting the behavior class
+      // given options and a key.
+      // If a user passes in options.behaviorClass
+      // default to using that. Otherwise delegate
+      // the lookup to the users `behaviorsLookup` implementation.
+      getBehaviorClass: function(options, key) {
+        if (options.behaviorClass) {
+          return options.behaviorClass;
         }
 
-        return Behaviors;
+        // Get behavior class can be either a flat object or a method
+        return Marionette._getValue(Behaviors.behaviorsLookup, this, [options, key])[key];
+      },
+
+      // Iterate over the behaviors object, for each behavior
+      // instantiate it and get its grouped behaviors.
+      parseBehaviors: function(view, behaviors) {
+        return _.chain(behaviors).map(function(options, key) {
+          var BehaviorClass = Behaviors.getBehaviorClass(options, key);
+
+          var behavior = new BehaviorClass(options, view);
+          var nestedBehaviors = Behaviors.parseBehaviors(view, _.result(behavior, 'behaviors'));
+
+          return [behavior].concat(nestedBehaviors);
+        }).flatten().value();
+      },
+
+      // Wrap view internal methods so that they delegate to behaviors. For example,
+      // `onDestroy` should trigger destroy on all of the behaviors and then destroy itself.
+      // i.e.
+      //
+      // `view.delegateEvents = _.partial(methods.delegateEvents, view.delegateEvents, behaviors);`
+      wrap: function(view, behaviors, methodNames) {
+        _.each(methodNames, function(methodName) {
+          view[methodName] = _.partial(methods[methodName], view[methodName], behaviors);
+        });
+      }
+    });
 
-    })(Marionette, _);
+    // Class to build handlers for `triggers` on behaviors
+    // for views
+    function BehaviorTriggersBuilder(view, behaviors) {
+      this._view = view;
+      this._behaviors = behaviors;
+      this._triggers = {};
+    }
 
+    _.extend(BehaviorTriggersBuilder.prototype, {
+      // Main method to build the triggers hash with event keys and handlers
+      buildBehaviorTriggers: function() {
+        _.each(this._behaviors, this._buildTriggerHandlersForBehavior, this);
+        return this._triggers;
+      },
 
-    // App Router
-    // ----------
+      // Internal method to build all trigger handlers for a given behavior
+      _buildTriggerHandlersForBehavior: function(behavior, i) {
+        var triggersHash = _.clone(_.result(behavior, 'triggers')) || {};
 
-    // Reduce the boilerplate code of handling route events
-    // and then calling a single method on another object.
-    // Have your routers configured to call the method on
-    // your object, directly.
-    //
-    // Configure an AppRouter with `appRoutes`.
-    //
-    // App routers can only take one `controller` object.
-    // It is recommended that you divide your controller
-    // objects in to smaller pieces of related functionality
-    // and have multiple routers / controllers, instead of
-    // just one giant router and controller.
-    //
-    // You can also add standard routes to an AppRouter.
+        triggersHash = Marionette.normalizeUIKeys(triggersHash, getBehaviorsUI(behavior));
 
-    Marionette.AppRouter = Backbone.Router.extend({
+        _.each(triggersHash, _.bind(this._setHandlerForBehavior, this, behavior, i));
+      },
 
-        constructor: function(options) {
-            this.options = options || {};
+      // Internal method to create and assign the trigger handler for a given
+      // behavior
+      _setHandlerForBehavior: function(behavior, i, eventName, trigger) {
+        // Unique identifier for the `this._triggers` hash
+        var triggerKey = trigger.replace(/^\S+/, function(triggerName) {
+          return triggerName + '.' + 'behaviortriggers' + i;
+        });
 
-            Backbone.Router.apply(this, arguments);
+        this._triggers[triggerKey] = this._view._buildViewTrigger(eventName);
+      }
+    });
 
-            var appRoutes = this.getOption('appRoutes');
-            var controller = this._getController();
-            this.processAppRoutes(controller, appRoutes);
-            this.on('route', this._processOnRoute, this);
-        },
+    function getBehaviorsUI(behavior) {
+      return behavior._uiBindings || behavior.ui;
+    }
 
-        // Similar to route method on a Backbone Router but
-        // method is called on the controller
-        appRoute: function(route, methodName) {
-            var controller = this._getController();
-            this._addAppRoute(controller, route, methodName);
-        },
+    return Behaviors;
 
-        // process the route event and trigger the onRoute
-        // method call, if it exists
-        _processOnRoute: function(routeName, routeArgs) {
-            // make sure an onRoute before trying to call it
-            if (_.isFunction(this.onRoute)) {
-                // find the path that matches the current route
-                var routePath = _.invert(this.getOption('appRoutes'))[routeName];
-                this.onRoute(routeName, routePath, routeArgs);
-            }
-        },
+  })(Marionette, _);
 
-        // Internal method to process the `appRoutes` for the
-        // router, and turn them in to routes that trigger the
-        // specified method on the specified `controller`.
-        processAppRoutes: function(controller, appRoutes) {
-            if (!appRoutes) { return; }
 
-            var routeNames = _.keys(appRoutes).reverse(); // Backbone requires reverted order of routes
+  // App Router
+  // ----------
 
-            _.each(routeNames, function(route) {
-                this._addAppRoute(controller, route, appRoutes[route]);
-            }, this);
-        },
+  // Reduce the boilerplate code of handling route events
+  // and then calling a single method on another object.
+  // Have your routers configured to call the method on
+  // your object, directly.
+  //
+  // Configure an AppRouter with `appRoutes`.
+  //
+  // App routers can only take one `controller` object.
+  // It is recommended that you divide your controller
+  // objects in to smaller pieces of related functionality
+  // and have multiple routers / controllers, instead of
+  // just one giant router and controller.
+  //
+  // You can also add standard routes to an AppRouter.
 
-        _getController: function() {
-            return this.getOption('controller');
-        },
+  Marionette.AppRouter = Backbone.Router.extend({
 
-        _addAppRoute: function(controller, route, methodName) {
-            var method = controller[methodName];
+    constructor: function(options) {
+      this.options = options || {};
 
-            if (!method) {
-                throw new Marionette.Error('Method "' + methodName + '" was not found on the controller');
-            }
+      Backbone.Router.apply(this, arguments);
 
-            this.route(route, methodName, _.bind(method, controller));
-        },
+      var appRoutes = this.getOption('appRoutes');
+      var controller = this._getController();
+      this.processAppRoutes(controller, appRoutes);
+      this.on('route', this._processOnRoute, this);
+    },
 
-        mergeOptions: Marionette.mergeOptions,
+    // Similar to route method on a Backbone Router but
+    // method is called on the controller
+    appRoute: function(route, methodName) {
+      var controller = this._getController();
+      this._addAppRoute(controller, route, methodName);
+    },
 
-        // Proxy `getOption` to enable getting options from this or this.options by name.
-        getOption: Marionette.proxyGetOption,
+    // process the route event and trigger the onRoute
+    // method call, if it exists
+    _processOnRoute: function(routeName, routeArgs) {
+      // make sure an onRoute before trying to call it
+      if (_.isFunction(this.onRoute)) {
+        // find the path that matches the current route
+        var routePath = _.invert(this.getOption('appRoutes'))[routeName];
+        this.onRoute(routeName, routePath, routeArgs);
+      }
+    },
 
-        triggerMethod: Marionette.triggerMethod,
+    // Internal method to process the `appRoutes` for the
+    // router, and turn them in to routes that trigger the
+    // specified method on the specified `controller`.
+    processAppRoutes: function(controller, appRoutes) {
+      if (!appRoutes) { return; }
 
-        bindEntityEvents: Marionette.proxyBindEntityEvents,
+      var routeNames = _.keys(appRoutes).reverse(); // Backbone requires reverted order of routes
 
-        unbindEntityEvents: Marionette.proxyUnbindEntityEvents
-    });
+      _.each(routeNames, function(route) {
+        this._addAppRoute(controller, route, appRoutes[route]);
+      }, this);
+    },
 
-    // Application
-    // -----------
+    _getController: function() {
+      return this.getOption('controller');
+    },
 
-    // Contain and manage the composite application as a whole.
-    // Stores and starts up `Region` objects, includes an
-    // event aggregator as `app.vent`
-    Marionette.Application = Marionette.Object.extend({
-        constructor: function(options) {
-            this._initializeRegions(options);
-            this._initCallbacks = new Marionette.Callbacks();
-            this.submodules = {};
-            _.extend(this, options);
-            this._initChannel();
-            Marionette.Object.call(this, options);
-        },
+    _addAppRoute: function(controller, route, methodName) {
+      var method = controller[methodName];
 
-        // Command execution, facilitated by Backbone.Wreqr.Commands
-        execute: function() {
-            this.commands.execute.apply(this.commands, arguments);
-        },
+      if (!method) {
+        throw new Marionette.Error('Method "' + methodName + '" was not found on the controller');
+      }
 
-        // Request/response, facilitated by Backbone.Wreqr.RequestResponse
-        request: function() {
-            return this.reqres.request.apply(this.reqres, arguments);
-        },
+      this.route(route, methodName, _.bind(method, controller));
+    },
 
-        // Add an initializer that is either run at when the `start`
-        // method is called, or run immediately if added after `start`
-        // has already been called.
-        addInitializer: function(initializer) {
-            this._initCallbacks.add(initializer);
-        },
+    mergeOptions: Marionette.mergeOptions,
 
-        // kick off all of the application's processes.
-        // initializes all of the regions that have been added
-        // to the app, and runs all of the initializer functions
-        start: function(options) {
-            this.triggerMethod('before:start', options);
-            this._initCallbacks.run(options, this);
-            this.triggerMethod('start', options);
-        },
+    // Proxy `getOption` to enable getting options from this or this.options by name.
+    getOption: Marionette.proxyGetOption,
 
-        // Add regions to your app.
-        // Accepts a hash of named strings or Region objects
-        // addRegions({something: "#someRegion"})
-        // addRegions({something: Region.extend({el: "#someRegion"}) });
-        addRegions: function(regions) {
-            return this._regionManager.addRegions(regions);
-        },
+    triggerMethod: Marionette.triggerMethod,
 
-        // Empty all regions in the app, without removing them
-        emptyRegions: function() {
-            return this._regionManager.emptyRegions();
-        },
+    bindEntityEvents: Marionette.proxyBindEntityEvents,
 
-        // Removes a region from your app, by name
-        // Accepts the regions name
-        // removeRegion('myRegion')
-        removeRegion: function(region) {
-            return this._regionManager.removeRegion(region);
-        },
+    unbindEntityEvents: Marionette.proxyUnbindEntityEvents
+  });
 
-        // Provides alternative access to regions
-        // Accepts the region name
-        // getRegion('main')
-        getRegion: function(region) {
-            return this._regionManager.get(region);
-        },
+  // Application
+  // -----------
 
-        // Get all the regions from the region manager
-        getRegions: function() {
-            return this._regionManager.getRegions();
-        },
+  // Contain and manage the composite application as a whole.
+  // Stores and starts up `Region` objects, includes an
+  // event aggregator as `app.vent`
+  Marionette.Application = Marionette.Object.extend({
+    constructor: function(options) {
+      this._initializeRegions(options);
+      this._initCallbacks = new Marionette.Callbacks();
+      this.submodules = {};
+      _.extend(this, options);
+      this._initChannel();
+      Marionette.Object.call(this, options);
+    },
 
-        // Create a module, attached to the application
-        module: function(moduleNames, moduleDefinition) {
+    // Command execution, facilitated by Backbone.Wreqr.Commands
+    execute: function() {
+      this.commands.execute.apply(this.commands, arguments);
+    },
 
-            // Overwrite the module class if the user specifies one
-            var ModuleClass = Marionette.Module.getClass(moduleDefinition);
+    // Request/response, facilitated by Backbone.Wreqr.RequestResponse
+    request: function() {
+      return this.reqres.request.apply(this.reqres, arguments);
+    },
 
-            var args = _.toArray(arguments);
-            args.unshift(this);
+    // Add an initializer that is either run at when the `start`
+    // method is called, or run immediately if added after `start`
+    // has already been called.
+    addInitializer: function(initializer) {
+      this._initCallbacks.add(initializer);
+    },
 
-            // see the Marionette.Module object for more information
-            return ModuleClass.create.apply(ModuleClass, args);
-        },
+    // kick off all of the application's processes.
+    // initializes all of the regions that have been added
+    // to the app, and runs all of the initializer functions
+    start: function(options) {
+      this.triggerMethod('before:start', options);
+      this._initCallbacks.run(options, this);
+      this.triggerMethod('start', options);
+    },
 
-        // Enable easy overriding of the default `RegionManager`
-        // for customized region interactions and business-specific
-        // view logic for better control over single regions.
-        getRegionManager: function() {
-            return new Marionette.RegionManager();
-        },
+    // Add regions to your app.
+    // Accepts a hash of named strings or Region objects
+    // addRegions({something: "#someRegion"})
+    // addRegions({something: Region.extend({el: "#someRegion"}) });
+    addRegions: function(regions) {
+      return this._regionManager.addRegions(regions);
+    },
 
-        // Internal method to initialize the regions that have been defined in a
-        // `regions` attribute on the application instance
-        _initializeRegions: function(options) {
-            var regions = _.isFunction(this.regions) ? this.regions(options) : this.regions || {};
+    // Empty all regions in the app, without removing them
+    emptyRegions: function() {
+      return this._regionManager.emptyRegions();
+    },
 
-            this._initRegionManager();
+    // Removes a region from your app, by name
+    // Accepts the regions name
+    // removeRegion('myRegion')
+    removeRegion: function(region) {
+      return this._regionManager.removeRegion(region);
+    },
 
-            // Enable users to define `regions` in instance options.
-            var optionRegions = Marionette.getOption(options, 'regions');
+    // Provides alternative access to regions
+    // Accepts the region name
+    // getRegion('main')
+    getRegion: function(region) {
+      return this._regionManager.get(region);
+    },
 
-            // Enable region options to be a function
-            if (_.isFunction(optionRegions)) {
-                optionRegions = optionRegions.call(this, options);
-            }
+    // Get all the regions from the region manager
+    getRegions: function() {
+      return this._regionManager.getRegions();
+    },
 
-            // Overwrite current regions with those passed in options
-            _.extend(regions, optionRegions);
+    // Create a module, attached to the application
+    module: function(moduleNames, moduleDefinition) {
 
-            this.addRegions(regions);
+      // Overwrite the module class if the user specifies one
+      var ModuleClass = Marionette.Module.getClass(moduleDefinition);
 
-            return this;
-        },
+      var args = _.toArray(arguments);
+      args.unshift(this);
 
-        // Internal method to set up the region manager
-        _initRegionManager: function() {
-            this._regionManager = this.getRegionManager();
-            this._regionManager._parent = this;
+      // see the Marionette.Module object for more information
+      return ModuleClass.create.apply(ModuleClass, args);
+    },
 
-            this.listenTo(this._regionManager, 'before:add:region', function() {
-                Marionette._triggerMethod(this, 'before:add:region', arguments);
-            });
+    // Enable easy overriding of the default `RegionManager`
+    // for customized region interactions and business-specific
+    // view logic for better control over single regions.
+    getRegionManager: function() {
+      return new Marionette.RegionManager();
+    },
 
-            this.listenTo(this._regionManager, 'add:region', function(name, region) {
-                this[name] = region;
-                Marionette._triggerMethod(this, 'add:region', arguments);
-            });
+    // Internal method to initialize the regions that have been defined in a
+    // `regions` attribute on the application instance
+    _initializeRegions: function(options) {
+      var regions = _.isFunction(this.regions) ? this.regions(options) : this.regions || {};
 
-            this.listenTo(this._regionManager, 'before:remove:region', function() {
-                Marionette._triggerMethod(this, 'before:remove:region', arguments);
-            });
+      this._initRegionManager();
 
-            this.listenTo(this._regionManager, 'remove:region', function(name) {
-                delete this[name];
-                Marionette._triggerMethod(this, 'remove:region', arguments);
-            });
-        },
+      // Enable users to define `regions` in instance options.
+      var optionRegions = Marionette.getOption(options, 'regions');
 
-        // Internal method to setup the Wreqr.radio channel
-        _initChannel: function() {
-            this.channelName = _.result(this, 'channelName') || 'global';
-            this.channel = _.result(this, 'channel') || Backbone.Wreqr.radio.channel(this.channelName);
-            this.vent = _.result(this, 'vent') || this.channel.vent;
-            this.commands = _.result(this, 'commands') || this.channel.commands;
-            this.reqres = _.result(this, 'reqres') || this.channel.reqres;
-        }
-    });
+      // Enable region options to be a function
+      if (_.isFunction(optionRegions)) {
+        optionRegions = optionRegions.call(this, options);
+      }
 
-    /* jshint maxparams: 9 */
+      // Overwrite current regions with those passed in options
+      _.extend(regions, optionRegions);
 
-    // Module
-    // ------
+      this.addRegions(regions);
 
-    // A simple module system, used to create privacy and encapsulation in
-    // Marionette applications
-    Marionette.Module = function(moduleName, app, options) {
-        this.moduleName = moduleName;
-        this.options = _.extend({}, this.options, options);
-        // Allow for a user to overide the initialize
-        // for a given module instance.
-        this.initialize = options.initialize || this.initialize;
+      return this;
+    },
 
-        // Set up an internal store for sub-modules.
-        this.submodules = {};
+    // Internal method to set up the region manager
+    _initRegionManager: function() {
+      this._regionManager = this.getRegionManager();
+      this._regionManager._parent = this;
 
-        this._setupInitializersAndFinalizers();
+      this.listenTo(this._regionManager, 'before:add:region', function() {
+        Marionette._triggerMethod(this, 'before:add:region', arguments);
+      });
 
-        // Set an internal reference to the app
-        // within a module.
-        this.app = app;
+      this.listenTo(this._regionManager, 'add:region', function(name, region) {
+        this[name] = region;
+        Marionette._triggerMethod(this, 'add:region', arguments);
+      });
 
-        if (_.isFunction(this.initialize)) {
-            this.initialize(moduleName, app, this.options);
-        }
-    };
+      this.listenTo(this._regionManager, 'before:remove:region', function() {
+        Marionette._triggerMethod(this, 'before:remove:region', arguments);
+      });
 
-    Marionette.Module.extend = Marionette.extend;
+      this.listenTo(this._regionManager, 'remove:region', function(name) {
+        delete this[name];
+        Marionette._triggerMethod(this, 'remove:region', arguments);
+      });
+    },
 
-    // Extend the Module prototype with events / listenTo, so that the module
-    // can be used as an event aggregator or pub/sub.
-    _.extend(Marionette.Module.prototype, Backbone.Events, {
+    // Internal method to setup the Wreqr.radio channel
+    _initChannel: function() {
+      this.channelName = _.result(this, 'channelName') || 'global';
+      this.channel = _.result(this, 'channel') || Backbone.Wreqr.radio.channel(this.channelName);
+      this.vent = _.result(this, 'vent') || this.channel.vent;
+      this.commands = _.result(this, 'commands') || this.channel.commands;
+      this.reqres = _.result(this, 'reqres') || this.channel.reqres;
+    }
+  });
 
-        // By default modules start with their parents.
-        startWithParent: true,
+  /* jshint maxparams: 9 */
 
-        // Initialize is an empty function by default. Override it with your own
-        // initialization logic when extending Marionette.Module.
-        initialize: function() { },
+  // Module
+  // ------
 
-        // Initializer for a specific module. Initializers are run when the
-        // module's `start` method is called.
-        addInitializer: function(callback) {
-            this._initializerCallbacks.add(callback);
-        },
+  // A simple module system, used to create privacy and encapsulation in
+  // Marionette applications
+  Marionette.Module = function(moduleName, app, options) {
+    this.moduleName = moduleName;
+    this.options = _.extend({}, this.options, options);
+    // Allow for a user to overide the initialize
+    // for a given module instance.
+    this.initialize = options.initialize || this.initialize;
 
-        // Finalizers are run when a module is stopped. They are used to teardown
-        // and finalize any variables, references, events and other code that the
-        // module had set up.
-        addFinalizer: function(callback) {
-            this._finalizerCallbacks.add(callback);
-        },
+    // Set up an internal store for sub-modules.
+    this.submodules = {};
 
-        // Start the module, and run all of its initializers
-        start: function(options) {
-            // Prevent re-starting a module that is already started
-            if (this._isInitialized) { return; }
+    this._setupInitializersAndFinalizers();
 
-            // start the sub-modules (depth-first hierarchy)
-            _.each(this.submodules, function(mod) {
-                // check to see if we should start the sub-module with this parent
-                if (mod.startWithParent) {
-                    mod.start(options);
-                }
-            });
+    // Set an internal reference to the app
+    // within a module.
+    this.app = app;
 
-            // run the callbacks to "start" the current module
-            this.triggerMethod('before:start', options);
+    if (_.isFunction(this.initialize)) {
+      this.initialize(moduleName, app, this.options);
+    }
+  };
 
-            this._initializerCallbacks.run(options, this);
-            this._isInitialized = true;
+  Marionette.Module.extend = Marionette.extend;
 
-            this.triggerMethod('start', options);
-        },
+  // Extend the Module prototype with events / listenTo, so that the module
+  // can be used as an event aggregator or pub/sub.
+  _.extend(Marionette.Module.prototype, Backbone.Events, {
 
-        // Stop this module by running its finalizers and then stop all of
-        // the sub-modules for this module
-        stop: function() {
-            // if we are not initialized, don't bother finalizing
-            if (!this._isInitialized) { return; }
-            this._isInitialized = false;
+    // By default modules start with their parents.
+    startWithParent: true,
 
-            this.triggerMethod('before:stop');
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic when extending Marionette.Module.
+    initialize: function() { },
 
-            // stop the sub-modules; depth-first, to make sure the
-            // sub-modules are stopped / finalized before parents
-            _.invoke(this.submodules, 'stop');
+    // Initializer for a specific module. Initializers are run when the
+    // module's `start` method is called.
+    addInitializer: function(callback) {
+      this._initializerCallbacks.add(callback);
+    },
 
-            // run the finalizers
-            this._finalizerCallbacks.run(undefined, this);
+    // Finalizers are run when a module is stopped. They are used to teardown
+    // and finalize any variables, references, events and other code that the
+    // module had set up.
+    addFinalizer: function(callback) {
+      this._finalizerCallbacks.add(callback);
+    },
 
-            // reset the initializers and finalizers
-            this._initializerCallbacks.reset();
-            this._finalizerCallbacks.reset();
+    // Start the module, and run all of its initializers
+    start: function(options) {
+      // Prevent re-starting a module that is already started
+      if (this._isInitialized) { return; }
 
-            this.triggerMethod('stop');
-        },
+      // start the sub-modules (depth-first hierarchy)
+      _.each(this.submodules, function(mod) {
+        // check to see if we should start the sub-module with this parent
+        if (mod.startWithParent) {
+          mod.start(options);
+        }
+      });
 
-        // Configure the module with a definition function and any custom args
-        // that are to be passed in to the definition function
-        addDefinition: function(moduleDefinition, customArgs) {
-            this._runModuleDefinition(moduleDefinition, customArgs);
-        },
+      // run the callbacks to "start" the current module
+      this.triggerMethod('before:start', options);
 
-        // Internal method: run the module definition function with the correct
-        // arguments
-        _runModuleDefinition: function(definition, customArgs) {
-            // If there is no definition short circut the method.
-            if (!definition) { return; }
-
-            // build the correct list of arguments for the module definition
-            var args = _.flatten([
-              this,
-              this.app,
-              Backbone,
-              Marionette,
-              Backbone.$, _,
-              customArgs
-            ]);
-
-            definition.apply(this, args);
-        },
+      this._initializerCallbacks.run(options, this);
+      this._isInitialized = true;
 
-        // Internal method: set up new copies of initializers and finalizers.
-        // Calling this method will wipe out all existing initializers and
-        // finalizers.
-        _setupInitializersAndFinalizers: function() {
-            this._initializerCallbacks = new Marionette.Callbacks();
-            this._finalizerCallbacks = new Marionette.Callbacks();
-        },
+      this.triggerMethod('start', options);
+    },
 
-        // import the `triggerMethod` to trigger events with corresponding
-        // methods if the method exists
-        triggerMethod: Marionette.triggerMethod
-    });
+    // Stop this module by running its finalizers and then stop all of
+    // the sub-modules for this module
+    stop: function() {
+      // if we are not initialized, don't bother finalizing
+      if (!this._isInitialized) { return; }
+      this._isInitialized = false;
 
-    // Class methods to create modules
-    _.extend(Marionette.Module, {
+      this.triggerMethod('before:stop');
 
-        // Create a module, hanging off the app parameter as the parent object.
-        create: function(app, moduleNames, moduleDefinition) {
-            var module = app;
+      // stop the sub-modules; depth-first, to make sure the
+      // sub-modules are stopped / finalized before parents
+      _.invoke(this.submodules, 'stop');
 
-            // get the custom args passed in after the module definition and
-            // get rid of the module name and definition function
-            var customArgs = _.drop(arguments, 3);
+      // run the finalizers
+      this._finalizerCallbacks.run(undefined, this);
 
-            // Split the module names and get the number of submodules.
-            // i.e. an example module name of `Doge.Wow.Amaze` would
-            // then have the potential for 3 module definitions.
-            moduleNames = moduleNames.split('.');
-            var length = moduleNames.length;
+      // reset the initializers and finalizers
+      this._initializerCallbacks.reset();
+      this._finalizerCallbacks.reset();
 
-            // store the module definition for the last module in the chain
-            var moduleDefinitions = [];
-            moduleDefinitions[length - 1] = moduleDefinition;
+      this.triggerMethod('stop');
+    },
 
-            // Loop through all the parts of the module definition
-            _.each(moduleNames, function(moduleName, i) {
-                var parentModule = module;
-                module = this._getModule(parentModule, moduleName, app, moduleDefinition);
-                this._addModuleDefinition(parentModule, module, moduleDefinitions[i], customArgs);
-            }, this);
+    // Configure the module with a definition function and any custom args
+    // that are to be passed in to the definition function
+    addDefinition: function(moduleDefinition, customArgs) {
+      this._runModuleDefinition(moduleDefinition, customArgs);
+    },
 
-            // Return the last module in the definition chain
-            return module;
-        },
+    // Internal method: run the module definition function with the correct
+    // arguments
+    _runModuleDefinition: function(definition, customArgs) {
+      // If there is no definition short circut the method.
+      if (!definition) { return; }
+
+      // build the correct list of arguments for the module definition
+      var args = _.flatten([
+        this,
+        this.app,
+        Backbone,
+        Marionette,
+        Backbone.$, _,
+        customArgs
+      ]);
+
+      definition.apply(this, args);
+    },
 
-        _getModule: function(parentModule, moduleName, app, def, args) {
-            var options = _.extend({}, def);
-            var ModuleClass = this.getClass(def);
+    // Internal method: set up new copies of initializers and finalizers.
+    // Calling this method will wipe out all existing initializers and
+    // finalizers.
+    _setupInitializersAndFinalizers: function() {
+      this._initializerCallbacks = new Marionette.Callbacks();
+      this._finalizerCallbacks = new Marionette.Callbacks();
+    },
 
-            // Get an existing module of this name if we have one
-            var module = parentModule[moduleName];
+    // import the `triggerMethod` to trigger events with corresponding
+    // methods if the method exists
+    triggerMethod: Marionette.triggerMethod
+  });
+
+  // Class methods to create modules
+  _.extend(Marionette.Module, {
+
+    // Create a module, hanging off the app parameter as the parent object.
+    create: function(app, moduleNames, moduleDefinition) {
+      var module = app;
+
+      // get the custom args passed in after the module definition and
+      // get rid of the module name and definition function
+      var customArgs = _.drop(arguments, 3);
+
+      // Split the module names and get the number of submodules.
+      // i.e. an example module name of `Doge.Wow.Amaze` would
+      // then have the potential for 3 module definitions.
+      moduleNames = moduleNames.split('.');
+      var length = moduleNames.length;
+
+      // store the module definition for the last module in the chain
+      var moduleDefinitions = [];
+      moduleDefinitions[length - 1] = moduleDefinition;
+
+      // Loop through all the parts of the module definition
+      _.each(moduleNames, function(moduleName, i) {
+        var parentModule = module;
+        module = this._getModule(parentModule, moduleName, app, moduleDefinition);
+        this._addModuleDefinition(parentModule, module, moduleDefinitions[i], customArgs);
+      }, this);
+
+      // Return the last module in the definition chain
+      return module;
+    },
 
-            if (!module) {
-                // Create a new module if we don't have one
-                module = new ModuleClass(moduleName, app, options);
-                parentModule[moduleName] = module;
-                // store the module on the parent
-                parentModule.submodules[moduleName] = module;
-            }
+    _getModule: function(parentModule, moduleName, app, def, args) {
+      var options = _.extend({}, def);
+      var ModuleClass = this.getClass(def);
 
-            return module;
-        },
+      // Get an existing module of this name if we have one
+      var module = parentModule[moduleName];
 
-        // ## Module Classes
-        //
-        // Module classes can be used as an alternative to the define pattern.
-        // The extend function of a Module is identical to the extend functions
-        // on other Backbone and Marionette classes.
-        // This allows module lifecyle events like `onStart` and `onStop` to be called directly.
-        getClass: function(moduleDefinition) {
-            var ModuleClass = Marionette.Module;
-
-            if (!moduleDefinition) {
-                return ModuleClass;
-            }
+      if (!module) {
+        // Create a new module if we don't have one
+        module = new ModuleClass(moduleName, app, options);
+        parentModule[moduleName] = module;
+        // store the module on the parent
+        parentModule.submodules[moduleName] = module;
+      }
 
-            // If all of the module's functionality is defined inside its class,
-            // then the class can be passed in directly. `MyApp.module("Foo", FooModule)`.
-            if (moduleDefinition.prototype instanceof ModuleClass) {
-                return moduleDefinition;
-            }
+      return module;
+    },
 
-            return moduleDefinition.moduleClass || ModuleClass;
-        },
+    // ## Module Classes
+    //
+    // Module classes can be used as an alternative to the define pattern.
+    // The extend function of a Module is identical to the extend functions
+    // on other Backbone and Marionette classes.
+    // This allows module lifecyle events like `onStart` and `onStop` to be called directly.
+    getClass: function(moduleDefinition) {
+      var ModuleClass = Marionette.Module;
+
+      if (!moduleDefinition) {
+        return ModuleClass;
+      }
+
+      // If all of the module's functionality is defined inside its class,
+      // then the class can be passed in directly. `MyApp.module("Foo", FooModule)`.
+      if (moduleDefinition.prototype instanceof ModuleClass) {
+        return moduleDefinition;
+      }
+
+      return moduleDefinition.moduleClass || ModuleClass;
+    },
 
-        // Add the module definition and add a startWithParent initializer function.
-        // This is complicated because module definitions are heavily overloaded
-        // and support an anonymous function, module class, or options object
-        _addModuleDefinition: function(parentModule, module, def, args) {
-            var fn = this._getDefine(def);
-            var startWithParent = this._getStartWithParent(def, module);
+    // Add the module definition and add a startWithParent initializer function.
+    // This is complicated because module definitions are heavily overloaded
+    // and support an anonymous function, module class, or options object
+    _addModuleDefinition: function(parentModule, module, def, args) {
+      var fn = this._getDefine(def);
+      var startWithParent = this._getStartWithParent(def, module);
 
-            if (fn) {
-                module.addDefinition(fn, args);
-            }
+      if (fn) {
+        module.addDefinition(fn, args);
+      }
 
-            this._addStartWithParent(parentModule, module, startWithParent);
-        },
+      this._addStartWithParent(parentModule, module, startWithParent);
+    },
 
-        _getStartWithParent: function(def, module) {
-            var swp;
+    _getStartWithParent: function(def, module) {
+      var swp;
 
-            if (_.isFunction(def) && (def.prototype instanceof Marionette.Module)) {
-                swp = module.constructor.prototype.startWithParent;
-                return _.isUndefined(swp) ? true : swp;
-            }
+      if (_.isFunction(def) && (def.prototype instanceof Marionette.Module)) {
+        swp = module.constructor.prototype.startWithParent;
+        return _.isUndefined(swp) ? true : swp;
+      }
 
-            if (_.isObject(def)) {
-                swp = def.startWithParent;
-                return _.isUndefined(swp) ? true : swp;
-            }
+      if (_.isObject(def)) {
+        swp = def.startWithParent;
+        return _.isUndefined(swp) ? true : swp;
+      }
 
-            return true;
-        },
+      return true;
+    },
 
-        _getDefine: function(def) {
-            if (_.isFunction(def) && !(def.prototype instanceof Marionette.Module)) {
-                return def;
-            }
+    _getDefine: function(def) {
+      if (_.isFunction(def) && !(def.prototype instanceof Marionette.Module)) {
+        return def;
+      }
 
-            if (_.isObject(def)) {
-                return def.define;
-            }
+      if (_.isObject(def)) {
+        return def.define;
+      }
 
-            return null;
-        },
+      return null;
+    },
 
-        _addStartWithParent: function(parentModule, module, startWithParent) {
-            module.startWithParent = module.startWithParent && startWithParent;
+    _addStartWithParent: function(parentModule, module, startWithParent) {
+      module.startWithParent = module.startWithParent && startWithParent;
 
-            if (!module.startWithParent || !!module.startWithParentIsConfigured) {
-                return;
-            }
+      if (!module.startWithParent || !!module.startWithParentIsConfigured) {
+        return;
+      }
 
-            module.startWithParentIsConfigured = true;
+      module.startWithParentIsConfigured = true;
 
-            parentModule.addInitializer(function(options) {
-                if (module.startWithParent) {
-                    module.start(options);
-                }
-            });
+      parentModule.addInitializer(function(options) {
+        if (module.startWithParent) {
+          module.start(options);
         }
-    });
+      });
+    }
+  });
 
 
-    return Marionette;
+  return Marionette;
 }));
\ No newline at end of file
diff --git a/src/less/activePane.less b/src/less/activePane.less
new file mode 100644
index 00000000..a7dae40f
--- /dev/null
+++ b/src/less/activePane.less
@@ -0,0 +1,5 @@
+@import "utility";
+
+.activePane:not(:first-child){
+    .u-bordered--left;
+}
\ No newline at end of file
diff --git a/src/less/dialog.less b/src/less/dialog.less
index b3eff47e..e63c844b 100644
--- a/src/less/dialog.less
+++ b/src/less/dialog.less
@@ -67,4 +67,4 @@
         font-weight: 600;
         text-transform: uppercase;
     }
-}
\ No newline at end of file
+}
diff --git a/src/less/foreground.less b/src/less/foreground.less
index 3007bbb0..b4d484f9 100644
--- a/src/less/foreground.less
+++ b/src/less/foreground.less
@@ -1,4 +1,5 @@
 @import "reset";
+@import "activePane";
 @import "activePaneFilter";
 @import "adminMenuArea";
 @import "appBar";
@@ -21,6 +22,7 @@
 @import "radio";
 @import "rangeInput";
 @import "scrollbar";
+@import "searchArea";
 @import "searchInputArea";
 @import "selectionBar";
 @import "sortable";
@@ -65,6 +67,10 @@
 
 .playlistsArea,
 .searchArea {
-    top: 56px !important;
     height: calc(100% - 56px) !important;
+}
+
+.playlistsArea,
+.searchArea.is-visible {
+    top: 56px !important;
 }
\ No newline at end of file
diff --git a/src/less/searchArea.less b/src/less/searchArea.less
new file mode 100644
index 00000000..888212a0
--- /dev/null
+++ b/src/less/searchArea.less
@@ -0,0 +1,9 @@
+.searchArea {
+    &.is-fullWidth {
+        width: 100%;
+    }
+
+    &.is-halfWidth {
+        width: 50%;
+    }
+}
\ No newline at end of file
diff --git a/src/manifest.json b/src/manifest.json
index fceae5ec..923aa555 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "__MSG_extensionName__",
     "short_name": "Streamus",
-    "version": "0.177.0",
+    "version": "0.178.0",
 
     "default_locale": "en",
     "description": "__MSG_extensionDescription__",
diff --git a/src/template/activePane/activePane.html b/src/template/activePane/activePane.html
index 584072b5..5a85f9a7 100644
--- a/src/template/activePane/activePane.html
+++ b/src/template/activePane/activePane.html
@@ -1,2 +1 @@
-<div data-region='stream' data-ui='streamRegion' class='flexColumn'></div>
-<div data-region='activePlaylistArea' data-ui='activePlaylistAreaRegion' class='flexColumn'></div>
\ No newline at end of file
+<div data-region='content' class='flexColumn'></div>
\ No newline at end of file
diff --git a/src/template/activePane/activePanes.html b/src/template/activePane/activePanes.html
new file mode 100644
index 00000000..584072b5
--- /dev/null
+++ b/src/template/activePane/activePanes.html
@@ -0,0 +1,2 @@
+<div data-region='stream' data-ui='streamRegion' class='flexColumn'></div>
+<div data-region='activePlaylistArea' data-ui='activePlaylistAreaRegion' class='flexColumn'></div>
\ No newline at end of file
diff --git a/src/template/appBar/adminMenuArea.html b/src/template/appBar/adminMenuArea.html
index bb20b04f..e069aee6 100644
--- a/src/template/appBar/adminMenuArea.html
+++ b/src/template/appBar/adminMenuArea.html
@@ -13,13 +13,6 @@
         </div>
       </div>
     </li>
-    <li data-ui='browserSettings' class='listItem listItem--small listItem--clickable'>
-      <div class='listItem-content'>
-        <div class='listItem-title'>
-          <%= browserSettingsMessage %>
-        </div>
-      </div>
-    </li>
     <li data-ui='keyboardShortcuts' class='listItem listItem--small listItem--clickable'>
       <div class='listItem-content'>
         <div class='listItem-title'>
@@ -49,4 +42,4 @@
       </div>
     </li>
   </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/template/dialog/browserSettings.html b/src/template/dialog/browserSettings.html
deleted file mode 100644
index 83644937..00000000
--- a/src/template/dialog/browserSettings.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<section class='grouping'>
-  <div class='grouping-header'>
-    <%= contextMenusMessage %>
-  </div>
-
-  <div class='grouping-content'>
-    <ul>
-      <li data-region='showTextSelectionContextMenu' class='grouping-item listItem listItem--small'></li>
-      <li data-region='showYouTubeLinkContextMenu' class='grouping-item listItem listItem--small'></li>
-      <li data-region='showYouTubePageContextMenu' class='grouping-item listItem listItem--small'></li>
-    </ul>
-  </div>
-</section>
-
-<section class='grouping'>
-  <div class='grouping-header'>
-    <%= websiteEnhancementsMessage %>
-  </div>
-
-  <div class='grouping-content'>
-    <ul>
-      <li data-region='enhanceYouTube' class='grouping-item listItem listItem--small'></li>
-      <li data-region='enhanceBeatport' class='grouping-item listItem listItem--small'></li>
-    </ul>
-  </div>
-</section>
\ No newline at end of file
diff --git a/src/template/dialog/dialog.html b/src/template/dialog/dialog.html
index 6c8e6068..0503690c 100644
--- a/src/template/dialog/dialog.html
+++ b/src/template/dialog/dialog.html
@@ -2,7 +2,7 @@
   <div class='dialog-panel-content panel-content panel-content--uncolored'>
     <div data-region='content' class='dialog-contentRegion'></div>
 
-    <div class='dialog-contentBar--bottom contentBar contentBar--bottom'>
+    <div class='dialog-contentBar--bottom contentBar contentBar--bottom flexColumn-bugFix'>
       <div data-region='reminder' class='u-flex--full'></div>
 
       <div data-ui='cancelButton' class='button button--flat <%= showCancelButton ? "" : "is-hidden" %>'>
diff --git a/src/template/dialog/settings.html b/src/template/dialog/settings.html
index 73240cb5..032c6886 100644
--- a/src/template/dialog/settings.html
+++ b/src/template/dialog/settings.html
@@ -7,6 +7,7 @@
     <ul>
       <li data-region='openInTab' class='grouping-item listItem listItem--small listItem--clickable'></li>
       <li data-region='songQuality' class='grouping-item'></li>
+      <li data-region='layoutType' class='grouping-item'></li>
     </ul>
   </div>
 </section>
@@ -35,4 +36,31 @@
       <li data-region='remindGoogleSignIn' class='grouping-item listItem listItem--small listItem--clickable'></li>
     </ul>
   </div>
-</section>
\ No newline at end of file
+</section>
+
+<section class='grouping'>
+  <div class='grouping-header'>
+    <%= contextMenusMessage %>
+  </div>
+
+  <div class='grouping-content'>
+    <ul>
+      <li data-region='showTextSelectionContextMenu' class='grouping-item listItem listItem--small'></li>
+      <li data-region='showYouTubeLinkContextMenu' class='grouping-item listItem listItem--small'></li>
+      <li data-region='showYouTubePageContextMenu' class='grouping-item listItem listItem--small'></li>
+    </ul>
+  </div>
+</section>
+
+<section class='grouping'>
+  <div class='grouping-header'>
+    <%= websiteEnhancementsMessage %>
+  </div>
+
+  <div class='grouping-content'>
+    <ul>
+      <li data-region='enhanceYouTube' class='grouping-item listItem listItem--small listItem--clickable'></li>
+      <li data-region='enhanceBeatport' class='grouping-item listItem listItem--small listItem--clickable'></li>
+    </ul>
+  </div>
+</section>
diff --git a/src/template/foregroundArea.html b/src/template/foregroundArea.html
index 1f98b4d7..4b9de792 100644
--- a/src/template/foregroundArea.html
+++ b/src/template/foregroundArea.html
@@ -27,11 +27,11 @@
 </div>
 
 <div data-region='appBar' class='u-elevated u-shadowed--low spinner--faded spinner--unclickable'></div>
-<div data-region='search' class='searchArea panel panel--top u-transitionable transition--fast flexColumn u-fullWidth u-fullHeight'></div>
+<div data-region='search' class='searchArea panel panel--top u-transitionable transition--fast flexColumn u-fullHeight'></div>
 <div data-region='streamControlBar' class='flexColumn-bugFix u-zIndex--1 spinner--faded spinner--unclickable'></div>
 <div data-region='playlistsArea' class='playlistsArea flexColumn overlay u-zIndex--3'></div>
 <div class='flexRow u-relative spinner--faded spinner--unclickable'>
-  <div data-region='activePane' class='flexColumn'></div>
+  <div data-region='activePanes' class='flexColumn'></div>
   <div data-region='video' class='videoArea'></div>
 </div>
 
diff --git a/src/template/stream/clearStreamButton.html b/src/template/stream/clearStreamButton.html
index 93d09455..064ee908 100644
--- a/src/template/stream/clearStreamButton.html
+++ b/src/template/stream/clearStreamButton.html
@@ -1 +1 @@
-<%= clearStreamMessage %>
\ No newline at end of file
+<%= clearMessage %>
\ No newline at end of file
diff --git a/src/template/stream/saveStreamButton.html b/src/template/stream/saveStreamButton.html
index f93a71a7..f0bfff13 100644
--- a/src/template/stream/saveStreamButton.html
+++ b/src/template/stream/saveStreamButton.html
@@ -1 +1 @@
-<%= saveStreamMessage %>
\ No newline at end of file
+<%= saveAllMessage %>
\ No newline at end of file