diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php
index d06c136b7..42de99fe8 100644
--- a/airtime_mvc/application/configs/navigation.php
+++ b/airtime_mvc/application/configs/navigation.php
@@ -8,27 +8,6 @@
 * the navigation container below.
 */
 $pages = array(
-    /*array(
-        'label'      => _('Now Playing'),
-        'module'     => 'default',
-        'controller' => 'Showbuilder',
-        'action'     => 'index',
-        'resource'   =>    'showbuilder'
-    ),*/
-    array(
-        'label'      => _('Add Media'),
-        'module'     => 'default',
-        'controller' => 'Plupload',
-        'action'     => 'index',
-        'resource'   => 'plupload'
-    ),/*
-    array(
-        'label'      => _('Library'),
-        'module'     => 'default',
-        'controller' => 'Library',
-        'action'     => 'index',
-        'resource'   =>    'playlist'
-    ),*/
     array(
         'label'      => _('Calendar'),
         'module'     => 'default',
@@ -44,10 +23,12 @@ $pages = array(
         )
     ),
     array(
-        'label'      => _('System'),
-        'uri'        => '#',
-        'resource'   => 'preference',
-        'pages'      => array(
+        'label' => _("Settings"),
+        'resource' => 'preference',
+        'action' => 'index',
+        'module' => 'default',
+        'controller' => 'preference',
+        'pages' => array(
             array(
                 'label'      => _('Preferences'),
                 'module'     => 'default',
@@ -60,26 +41,21 @@ $pages = array(
                 'action'     => 'add-user',
                 'resource'   =>    'user'
             ),
-            array(
-                'label'      => _('Media Folders'),
-                'module'     => 'default',
-                'controller' => 'Preference',
-                'action'     => 'directory-config',
-                'id'         => 'manage_folder'
-            ),
             array(
                 'label'      => _('Streams'),
                 'module'     => 'default',
                 'controller' => 'Preference',
                 'action'     => 'stream-setting'
-            ),
-            array(
-                'label'      => _('Status'),
-                'module'     => 'default',
-                'controller' => 'systemstatus',
-                'action'     => 'index',
-                'resource'   =>    'systemstatus'
-            ),
+            )
+        )
+    ),
+    array(
+        'label' => _("Analytics"),
+        'module'     => 'default',
+        'controller' => 'listenerstat',
+        'action'     => 'index',
+        'resource'   => 'listenerstat',
+        'pages' => array(
             array(
                 'label'      => _('Listener Stats'),
                 'module'     => 'default',
@@ -88,44 +64,33 @@ $pages = array(
                 'resource'   => 'listenerstat'
             ),
             array(
-                'label'      => _('Embeddable Widgets'),
+                'label'      => _('Playout History'),
                 'module'     => 'default',
-                'controller' => 'embeddablewidgets',
-                'action'     => 'index'
+                'controller' => 'playouthistory',
+                'action'     => 'index',
+                'resource'   => 'playouthistory'
+            ),
+            array(
+                'label'      => _('History Templates'),
+                'module'     => 'default',
+                'controller' => 'playouthistorytemplate',
+                'action'     => 'index',
+                'resource'   => 'playouthistorytemplate'
             )
         )
     ),
-	array(
-		'label' => _('History'),
-		'uri' => '#',
-		'resource'   => 'playouthistory',
-		'pages'      => array(
-			array(
-				'label'      => _('Playout History'),
-				'module'     => 'default',
-				'controller' => 'playouthistory',
-				'action'     => 'index',
-				'resource'   => 'playouthistory'
-			),
-			array(
-				'label'      => _('History Templates'),
-				'module'     => 'default',
-				'controller' => 'playouthistorytemplate',
-				'action'     => 'index',
-				'resource'   => 'playouthistorytemplate'
-			),
-		)
-	),
+    array(
+        'label'      => _('Widgets'),
+        'module'     => 'default',
+        'controller' => 'embeddablewidgets',
+        'action'     => 'index'
+    ),
     array(
         'label'      => _('Help'),
-        'uri'     => '#',
+        'controller' => 'dashboard',
+        'action'     => 'help',
         'resource'    =>    'dashboard',
         'pages'      => array(
-            array(
-                'label'      => _('Help Center'),
-                'uri'        => HELP_URL,
-                'target'     => "_blank"
-            ),
             array(
                 'label'      => _('Getting Started'),
                 'module'     => 'default',
@@ -133,6 +98,11 @@ $pages = array(
                 'action'     => 'help',
                 'resource'   =>    'dashboard'
             ),
+            array(
+                'label'      => _('Help Center'),
+                'uri'        => HELP_URL,
+                'target'     => "_blank"
+            ),
             array(
                 'label'      => _('FAQ'),
                 'uri'        => FAQ_URL,
@@ -159,7 +129,8 @@ $pages = array(
     ),
     array(
         'label' => _('Billing'),
-        'uri' => '#',
+        'controller' => 'billing',
+        'action' => 'client',
         'resource' => 'billing',
         'pages' => array(
             array(
diff --git a/airtime_mvc/application/controllers/BillingController.php b/airtime_mvc/application/controllers/BillingController.php
index fda5c881d..b2c5140a3 100644
--- a/airtime_mvc/application/controllers/BillingController.php
+++ b/airtime_mvc/application/controllers/BillingController.php
@@ -21,6 +21,10 @@ class BillingController extends Zend_Controller_Action {
 
     public function upgradeAction()
     {
+
+        $this->_helper->layout->setLayout("page-sub-menu");
+        Zend_Layout::getMvcInstance()->assign('parent_page', 'Billing');
+
         $CC_CONFIG = Config::getConfig();
         $baseUrl = Application_Common_OsPath::getBaseDir();
         $this->view->headLink()->appendStylesheet($baseUrl.'css/billing.css?'.$CC_CONFIG['airtime_version']);
@@ -207,6 +211,9 @@ class BillingController extends Zend_Controller_Action {
 
     public function clientAction()
     {
+        $this->_helper->layout->setLayout("page-sub-menu");
+        Zend_Layout::getMvcInstance()->assign('parent_page', 'Billing');
+
         $CC_CONFIG = Config::getConfig();
         $baseUrl = Application_Common_OsPath::getBaseDir();
         $this->view->headLink()->appendStylesheet($baseUrl.'css/billing.css?'.$CC_CONFIG['airtime_version']);
@@ -257,6 +264,9 @@ class BillingController extends Zend_Controller_Action {
 
     public function invoicesAction()
     {
+        $this->_helper->layout->setLayout("page-sub-menu");
+        Zend_Layout::getMvcInstance()->assign('parent_page', 'Billing');
+
         $CC_CONFIG = Config::getConfig();
         $baseUrl = Application_Common_OsPath::getBaseDir();
         $this->view->headLink()->appendStylesheet($baseUrl.'css/billing.css?'.$CC_CONFIG['airtime_version']);
diff --git a/airtime_mvc/application/controllers/DashboardController.php b/airtime_mvc/application/controllers/DashboardController.php
index 2dc134eec..a0c5a58d5 100644
--- a/airtime_mvc/application/controllers/DashboardController.php
+++ b/airtime_mvc/application/controllers/DashboardController.php
@@ -108,11 +108,14 @@ class DashboardController extends Zend_Controller_Action
 
     public function helpAction()
     {
-        // action body
+        $this->_helper->layout->setLayout("page-sub-menu");
+        Zend_Layout::getMvcInstance()->assign('parent_page', 'Help');
     }
 
     public function aboutAction()
     {
+        $this->_helper->layout->setLayout("page-sub-menu");
+        Zend_Layout::getMvcInstance()->assign('parent_page', 'Help');
         $this->view->airtime_version = Application_Model_Preference::GetAirtimeVersion();
     }
 
diff --git a/airtime_mvc/application/controllers/ListenerstatController.php b/airtime_mvc/application/controllers/ListenerstatController.php
index d8ac220b5..67ddd25f5 100644
--- a/airtime_mvc/application/controllers/ListenerstatController.php
+++ b/airtime_mvc/application/controllers/ListenerstatController.php
@@ -17,6 +17,9 @@ class ListenerstatController extends Zend_Controller_Action
         $request = $this->getRequest();
         $baseUrl = Application_Common_OsPath::getBaseDir();
 
+        $this->_helper->layout->setLayout("page-sub-menu");
+        Zend_Layout::getMvcInstance()->assign('parent_page', 'Analytics');
+
         $this->view->headScript()->appendFile($baseUrl.'js/flot/jquery.flot.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/flot/jquery.flot.crosshair.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/airtime/listenerstat/listenerstat.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
diff --git a/airtime_mvc/application/controllers/PlayouthistoryController.php b/airtime_mvc/application/controllers/PlayouthistoryController.php
index 533f41d76..da5e22fdd 100644
--- a/airtime_mvc/application/controllers/PlayouthistoryController.php
+++ b/airtime_mvc/application/controllers/PlayouthistoryController.php
@@ -24,6 +24,9 @@ class PlayouthistoryController extends Zend_Controller_Action
         $CC_CONFIG = Config::getConfig();
         $baseUrl = Application_Common_OsPath::getBaseDir();
 
+        $this->_helper->layout->setLayout("page-sub-menu");
+        Zend_Layout::getMvcInstance()->assign('parent_page', 'Analytics');
+
         list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($this->getRequest());
        
         $userTimezone = new DateTimeZone(Application_Model_Preference::GetUserTimezone());
diff --git a/airtime_mvc/application/controllers/PlayouthistorytemplateController.php b/airtime_mvc/application/controllers/PlayouthistorytemplateController.php
index c6651d8eb..885e9ccc6 100644
--- a/airtime_mvc/application/controllers/PlayouthistorytemplateController.php
+++ b/airtime_mvc/application/controllers/PlayouthistorytemplateController.php
@@ -17,6 +17,9 @@ class PlayouthistorytemplateController extends Zend_Controller_Action
 	{
 		$CC_CONFIG = Config::getConfig();
 		$baseUrl = Application_Common_OsPath::getBaseDir();
+
+		$this->_helper->layout->setLayout("page-sub-menu");
+		Zend_Layout::getMvcInstance()->assign('parent_page', 'Analytics');
 	
 		$this->view->headScript()->appendFile($baseUrl.'js/airtime/playouthistory/template.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
 		$this->view->headLink()->appendStylesheet($baseUrl.'css/history_styles.css?'.$CC_CONFIG['airtime_version']);
@@ -31,6 +34,9 @@ class PlayouthistorytemplateController extends Zend_Controller_Action
 	
 		$CC_CONFIG = Config::getConfig();
 		$baseUrl = Application_Common_OsPath::getBaseDir();
+
+		$this->_helper->layout->setLayout("page-sub-menu");
+		Zend_Layout::getMvcInstance()->assign('parent_page', 'Analytics');
 	
 		$this->view->headScript()->appendFile($baseUrl.'js/airtime/playouthistory/configuretemplate.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
 		$this->view->headLink()->appendStylesheet($baseUrl.'css/history_styles.css?'.$CC_CONFIG['airtime_version']);
diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 7eee7afbe..477ba67ea 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -23,6 +23,9 @@ class PreferenceController extends Zend_Controller_Action
     {
         $CC_CONFIG = Config::getConfig();
         $request = $this->getRequest();
+
+        $this->_helper->layout->setLayout("page-sub-menu");
+        Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings');
                 
         $baseUrl = Application_Common_OsPath::getBaseDir();
 
@@ -143,6 +146,9 @@ class PreferenceController extends Zend_Controller_Action
 
         $request = $this->getRequest();
 
+        $this->_helper->layout->setLayout("page-sub-menu");
+        Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings');
+
         $baseUrl = Application_Common_OsPath::getBaseDir();
 
         $this->view->headScript()->appendFile($baseUrl.'js/airtime/preferences/streamsetting.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php
index 264444562..8212a6efe 100644
--- a/airtime_mvc/application/controllers/UserController.php
+++ b/airtime_mvc/application/controllers/UserController.php
@@ -22,6 +22,10 @@ class UserController extends Zend_Controller_Action
         $CC_CONFIG = Config::getConfig();
 
         $request = $this->getRequest();
+
+        $this->_helper->layout->setLayout("page-sub-menu");
+        Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings');
+
         $baseUrl = Application_Common_OsPath::getBaseDir();
 
         $js_files = array(
diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml
index 2699018f6..5552d386a 100644
--- a/airtime_mvc/application/layouts/scripts/layout.phtml
+++ b/airtime_mvc/application/layouts/scripts/layout.phtml
@@ -79,7 +79,7 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
 
 <div id="media_type_nav"> <!-- class="content-pane" -->
     <div class="btn-group">
-        <button id="new_media_selector" class="btn btn-small dropdown-toggle" data-toggle="dropdown">
+        <button id="new_media_selector" class="btn btn-small dropdown-toggle dashboard-btn" data-toggle="dropdown">
             New <span class="caret"></span>
         </button>
         <ul class="dropdown-menu">
@@ -93,6 +93,9 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
                 <a href="#"><?php echo _("Webstream") ?></a>
             </li>
         </ul>
+        <a href="/Plupload">
+            <button id="add_media_btn" class="btn btn-small dashboard-btn">Upload</button>
+        </a>
     </div>
     <div class="media_type_selector" selection_id="1">
         <a href="/show-builder#"><?php echo _("Dashboard") ?></a></div>
@@ -106,7 +109,7 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
         <a href="/show-builder#webstreams"><?php echo _("Webstreams") ?></a></div>
     <hr style="margin-left: 5px; margin-right: 5px">
     <div id="nav">
-        <?php echo $this->navigation()->menu() ?>
+        <?php echo $this->navigation()->menu(); ?>
     </div>
 
 </div>
diff --git a/airtime_mvc/application/layouts/scripts/page-sub-menu.phtml b/airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
new file mode 100644
index 000000000..f28bcac3c
--- /dev/null
+++ b/airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
@@ -0,0 +1,178 @@
+<?php echo $this->doctype() ?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <?php echo $this->headTitle() ?>
+    <?php echo $this->headLink() ?>
+    <?php echo $this->headScript() ?>
+    <?php echo isset($this->google_analytics)?$this->google_analytics:"" ?>
+    <?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
+</head>
+<body>
+<!-- Google Tag Manager -->
+<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-55N6NH"
+                  height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+        new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+        j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+        '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+    })(window,document,'script','dataLayer','GTM-55N6NH');</script>
+<!-- End Google Tag Manager -->
+
+<?php echo $this->partial('partialviews/trialBox.phtml', array("is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining())) ?>
+
+<div id="Panel" class="sticky">
+    <?php if($this->suspended) : ?>
+        <?php echo $this->partial('partialviews/suspended.phtml'); ?>
+    <?php else : ?>
+
+        <?php echo $this->versionNotify();
+        $sss = $this->SourceSwitchStatus();
+        $scs = $this->SourceConnectionStatus();
+        ?>
+        <?php echo $this->partial('partialviews/header.phtml', array("live_dj_switch"=>$sss['live_dj'], "live_dj_connection"=>$scs['live_dj'], "master_dj_switch"=>$sss['master_dj'], "master_dj_connection"=>$scs['master_dj'],
+            "scheduled_play_switch"=>$sss['scheduled_play'])) ?>
+        <?php 	$partial = array('menu.phtml', 'default');
+        $this->navigation()->menu()->setPartial($partial); ?>
+
+
+        <script type="text/javascript">
+            var schedulePreLoaded = <?php
+        //Awful hack to speed up loading - Embed the schedule in the response so that the dashboard
+        //doesn't have to make a separate AJAX request to get this data.
+    require_once("ScheduleController.php");
+    ScheduleController::printCurrentPlaylistForEmbedding();
+ ?>;
+            //The DOM elements that these calls depend on exist by this point:
+            parseItems(schedulePreLoaded.entries);
+            parseSourceStatus(schedulePreLoaded.source_status);
+            parseSwitchStatus(schedulePreLoaded.switch_status);
+
+        </script>
+
+        <!--<div id="nav">
+        <div class="logo"></div>
+        <div class="personal-block solo">
+            <ol>
+                <li>
+                    <a id="current-user" href=<?php /*echo $baseUrl . "user/edit-user"*/?>><span class="name"><?php /*echo $this->escape($this->loggedInAs()); */?></span></a>
+                    | <a href=<?php /*echo $baseUrl . "login/logout"*/?>><?php /*echo _("Logout")*/?></a>
+                </li>
+            </ol>
+        </div>
+        <div id="mobile-nav">
+            <div class="menu-btn" id="menu-btn">
+                <div></div>
+                <span></span>
+                <span></span>
+                <span></span>
+            </div>
+        </div>
+        <div class="responsive-menu">
+            <?php /*echo $this->navigation()->menu() */?>
+        </div>
+
+        <div style="clear:both;"></div>
+    </div>-->
+    <?php endif; //suspended ?>
+</div>
+
+<div id="media_type_nav"> <!-- class="content-pane" -->
+    <div class="btn-group">
+        <button id="new_media_selector" class="btn btn-small dropdown-toggle" data-toggle="dropdown">
+            New <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu">
+            <li id="new-playlist">
+                <a href="#"><?php echo _("Playlist") ?></a>
+            </li>
+            <li id="new-smart-block">
+                <a href="#"><?php echo _("Smart Block") ?></a>
+            </li>
+            <li id="new-webstream">
+                <a href="#"><?php echo _("Webstream") ?></a>
+            </li>
+        </ul>
+        <a href="/Plupload">
+            <button id="add_media_btn" class="btn btn-small dashboard-btn">Upload</button>
+        </a>
+    </div>
+    <div class="media_type_selector" selection_id="1">
+        <a href="/show-builder"><?php echo _("Dashboard") ?></a></div>
+    <div class="media_type_selector dashboard_sub_nav" selection_id="1">
+        <a href="/show-builder#files"><?php echo _("Files") ?></a></div>
+    <div class="media_type_selector dashboard_sub_nav" selection_id="2">
+        <a href="/show-builder#playlists"><?php echo _("Playlists") ?></a></div>
+    <div class="media_type_selector dashboard_sub_nav" selection_id="3">
+        <a href="/show-builder#smart-blocks"><?php echo _("Smart Blocks") ?></a></div>
+    <div class="media_type_selector dashboard_sub_nav" selection_id="4">
+        <a href="/show-builder#webstreams"><?php echo _("Webstreams") ?></a></div>
+    <hr style="margin-left: 5px; margin-right: 5px">
+    <div id="nav">
+        <?php echo $this->navigation()->menu(); ?>
+    </div>
+
+</div>
+
+<?php $hint = Application_Common_UsabilityHints::getUsabilityHint(); ?>
+<div class="usability_hint" <?php if ($hint == "") { echo "style='display:none'"; } ?>><?php echo $hint; ?></div>
+
+
+<div class="wrapper" id="content">
+    <div id="sub-menu">
+        <?php echo $this->layout()->parent_page; ?>
+        <hr>
+        <?php
+        $page = $this->navigation()->findOneBy('label',$this->layout()->parent_page);
+        echo $this->navigation()->menu()->renderMenu($page);
+        ?>
+        </div>
+    <div style="width:87%">
+    <?php echo $this->layout()->content ?></div>
+</div>
+
+<script id="tmpl-pl-cues" type="text/template">
+    <div class="waveform-cues">
+        <div class="playlist-time-scale"></div>
+        <div class="playlist-tracks"></div>
+        <div class="playlist-controls">
+            <a class="btn btn-small btn_play"><i class="icon-play icon-white"></i><?php echo _("Play"); ?></a>
+            <a class="btn btn-small btn_stop"><i class="icon-stop icon-white"></i><?php echo _("Stop"); ?></a>
+            <label class="audio audio_pos">00:00:00.0</label>
+        </div>
+        <div class="set-cue">
+            <label for="editor-cue-in"><?php echo _("Cue In"); ?></label>
+            <input type="text" class="audio_start">
+            <input type="button" class="btn btn-small set-cue-in" value="<?php echo _("Set Cue In"); ?>">
+            <label class="audio editor-cue-in">00:00:00.0</label>
+            <span style="display:none" class="cue-in-error"></span>
+        </div>
+        <div class="set-cue">
+            <label for="editor-cue-out"><?php echo _("Cue Out"); ?></label>
+            <input type="text" class="audio_end">
+            <input type="button" class="btn btn-small set-cue-out" value="<?php echo _("Set Cue Out"); ?>">
+            <label class="audio editor-cue-out">00:00:00.0</label>
+            <span style="display:none" class="cue-out-error"></span>
+        </div>
+    </div>
+</script>
+
+<script id="tmpl-pl-fades" type="text/template">
+    <div class="waveform-fades">
+        <div class="playlist-time-scale"></div>
+        <div class="playlist-tracks"></div>
+        <div class="playlist-controls left-floated">
+            <a class="btn btn-small btn_play"><i class="icon-play icon-white"></i><?php echo _("Play"); ?></a>
+            <a class="btn btn-small btn_stop"><i class="icon-stop icon-white"></i><?php echo _("Stop"); ?></a>
+            <label class="audio audio_pos">00:00:00.0</label>
+        </div>
+        <div class="set-fade left-floated">
+            <a type="button" class="btn btn-small btn_cursor" data-state="cursor"><?php echo _("Cursor"); ?></a>
+            <a type="button" class="btn btn-small btn_fadein" data-state="fadein"><?php echo _("Fade In"); ?></a>
+            <a type="button" class="btn btn-small btn_fadeout" data-state="fadeout"><?php echo _("Fade Out"); ?></a>
+        </div>
+    </div>
+</script>
+</body>
+</html>
+
diff --git a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
index 04e6170f5..80956681c 100644
--- a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
+++ b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
@@ -6,7 +6,7 @@
     <?php echo $this->form->getElement('csrf') ?>
     <div style="clear:both"></div>
   <?php echo $this->statusMsg;?>
-  <div style="float: left; margin-right: 10px; width: 490px; overflow: auto;">
+  <div style="float: left; margin-right: 10px; width: 50%; overflow: auto;">
 
     <h3><?php echo _("Global") ?></h3>
     <fieldset class="padded stream-setting-global">
@@ -102,7 +102,7 @@
     </fieldset>
     <?php echo $this->form->getSubform('live_stream_subform'); ?>
   </div>
-  <div style="float: left; width: 600px;">
+  <div style="float: left; width: 48%;">
       <h3><?php echo _("Output Streams") ?></h3>
     <fieldset class="padded">
         <?php
diff --git a/airtime_mvc/public/css/pro_dropdown_3.css b/airtime_mvc/public/css/pro_dropdown_3.css
index afdfedcf8..80142956b 100644
--- a/airtime_mvc/public/css/pro_dropdown_3.css
+++ b/airtime_mvc/public/css/pro_dropdown_3.css
@@ -51,7 +51,9 @@ way to fit your requirements.
 	float:left;
 	display:block;
 	padding:0 28px 0 0px;
+	/* Hide the drop down sub menu
 	background:url(images/down_arrow.png) no-repeat right 50%;
+	*/
 
 }
 #nav li:hover a.top_link, #nav li.active a.top_link, #nav li.active:hover a.top_link {
@@ -64,9 +66,11 @@ way to fit your requirements.
 #nav li:hover a.top_link span {
 
 }
+/* Hide the drop down sub menu
 #nav li:hover a.top_link span.down {
 	background:url(images/down_arrow.png) no-repeat right 50%;
 }
+*/
 /* Default list styling */
 
 #nav li:hover {
@@ -86,6 +90,8 @@ way to fit your requirements.
 	-moz-border-radius: 3px;
 	-webkit-border-radius: 3px;
 	border-radius: 3px;
+	/* Hide the drop down sub menu */
+	display:none;
 
 }
 #nav li:hover ul.sub li {
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 7a4095d43..b9a9c4f24 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -2333,7 +2333,7 @@ span.errors.sp-errors{
 }
 
 .stream-config {
-    width: 1100px;
+    width: 85%;
 }
 
 #stream_save_bottom {
@@ -3485,7 +3485,6 @@ button.btn-icon-text > i.icon-white {
 }
 
 #new_media_selector {
-    width: 100%;
     font-size: 14px;
 }
 
@@ -3596,3 +3595,32 @@ button.btn-icon-text > i.icon-white {
     margin-bottom: 10px;
 }
 
+#sub-menu {
+    width: 10%;
+    border-right: 1px solid #5b5b5b;
+    font-size: 14px;
+    color: #cecece;
+    padding: 10px;
+}
+
+#sub-menu .navigation {
+    list-style: none;
+    padding-left: 0px;
+}
+
+#sub-menu .navigation li {
+    padding-bottom: 10px;
+}
+
+#sub-menu .navigation a {
+    color: #cecece;
+    text-decoration: none;
+}
+
+#listenerstat_content {
+    width: 100%;
+}
+
+.dashboard-btn {
+    width: 50%;
+}
diff --git a/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js b/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js
index 3c1cfc9df..dbc81b658 100644
--- a/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js
+++ b/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js
@@ -6,8 +6,8 @@ $(document).ready(function() {
     timeEndId = "#his_time_end";
     
     // set width dynamically
-    var width = $("#content").width();
-    width = width - 120;
+    var width = $("#listenerstat_content").width();
+    width = width * .91;
     $("#listenerstat_content").find("#flot_placeholder").width(width);
     $("#listenerstat_content").find("#legend").width(width);