diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php
index b58d56201..f49b55bac 100644
--- a/airtime_mvc/application/forms/EditAudioMD.php
+++ b/airtime_mvc/application/forms/EditAudioMD.php
@@ -172,7 +172,7 @@ class Application_Form_EditAudioMD extends Zend_Form
         // Add the submit button
         $this->addElement('button', 'editmdsave', array(
             'ignore'     => true,
-            'class'      => 'btn btn-small md-save',
+            'class'      => 'btn md-save right-floated',
             'label'      => _('Save'),
             'decorators' => array(
                 'ViewHelper'
@@ -182,7 +182,7 @@ class Application_Form_EditAudioMD extends Zend_Form
         // Add the submit button
         $this->addElement('button', 'editmdcancel', array(
             'ignore'   => true,
-            'class'    => 'btn btn-small md-cancel',
+            'class'    => 'btn md-cancel right-floated',
             'label'    => _('Cancel'),
             'decorators' => array(
                 'ViewHelper'
@@ -190,10 +190,10 @@ class Application_Form_EditAudioMD extends Zend_Form
         ));
 
         $this->addDisplayGroup(array('editmdsave', 'editmdcancel'), 'submitButtons', array(
-                'decorators' => array(
-                    'FormElements',
-                    'DtDdWrapper'
-                    )
+            'decorators' => array(
+                'FormElements',
+                'DtDdWrapper'
+                )
         ));
     }
 
diff --git a/airtime_mvc/application/views/scripts/form/daterange.phtml b/airtime_mvc/application/views/scripts/form/daterange.phtml
index b3435e284..284e3dd3d 100644
--- a/airtime_mvc/application/views/scripts/form/daterange.phtml
+++ b/airtime_mvc/application/views/scripts/form/daterange.phtml
@@ -3,7 +3,7 @@
     <?php echo $this->element->getElement('his_time_start') ?>
     <?php echo $this->element->getElement('his_date_end') ?>
     <?php echo $this->element->getElement('his_time_end') ?>
-    <div id="his_submit" class="ui-button ui-state-default" title="<?php echo _("Filter History")?>">
-        <span class="ui-icon ui-icon-search"></span>
+    <div id="his_submit" class=" btn btn-small" title="<?php echo _("Filter History")?>">
+        <i class="icon-white icon-search"></i><span><?php echo _("Filter History")?></span>
     </div>
 </div>
\ No newline at end of file
diff --git a/airtime_mvc/application/views/scripts/listenerstat/index.phtml b/airtime_mvc/application/views/scripts/listenerstat/index.phtml
index fba9380f9..1222d960a 100644
--- a/airtime_mvc/application/views/scripts/listenerstat/index.phtml
+++ b/airtime_mvc/application/views/scripts/listenerstat/index.phtml
@@ -1,13 +1,16 @@
 <div id="listenerstat_content" class="ui-widget ui-widget-content block-shadow alpha-block padded">
-    <?php echo _("Listener Count Over Time")?><br>
+    <H2><?php echo _("Listeners")?></H2>
     <div id="flot_placeholder" style="width:600px;height:300px;margin:0px 50px 0px 50px"></div>
     <div id="legend" style="width:600px;height:70px;margin:0px 50px 0px 50px"></div>
-    <div id="date_form" style="float:left; margin:0px 50px 0px 50px"><?php echo $this->date_form; ?></div>
+    <div id="date_form" style="float:left; margin:0px 0px">
+        <h3 style="padding-left: 0px">Date Range</h3>
+        <?php echo $this->date_form; ?>
+    </div>
     <div id="errorStatus" style="float:right; width: 400px">
+        <h3><?php echo _("Stream Data Collection Status")?></h3>
         <fieldset class="padded stream-setting-global">
-        <legend><?php echo _("Status")?></legend>
         <?php foreach ($this->errorStatus as $k=>$v) {?>
-        <div class='stream-status <?php echo ($v == 'OK')? 'status-good' : 'status-error' ?>'><h3><?php echo $k?>: <?php echo $v?></h3></div>
+        <div class='stream-status <?php echo ($v == 'OK')? 'status-good' : 'status-error' ?>'><p><?php echo $k?>: <?php echo $v?></p></div>
         <?php }?>
         </fieldset>
     </div>
diff --git a/airtime_mvc/application/views/scripts/partialviews/header.phtml b/airtime_mvc/application/views/scripts/partialviews/header.phtml
index 7cc96499e..879ec73ea 100644
--- a/airtime_mvc/application/views/scripts/partialviews/header.phtml
+++ b/airtime_mvc/application/views/scripts/partialviews/header.phtml
@@ -1,5 +1,5 @@
 <div id="master-panel">
-  <div class="logo"></div>
+  <img class="logo" src="/css/images/airtime_logo_med.png">
   <div class="now-playing-block">
     <div class="text-row"><strong><?php echo _("Previous:"); ?></strong> <span id='previous'></span> <span id='prev-length'></span></div>
     <div class="now-playing-info song">
diff --git a/airtime_mvc/application/views/scripts/playlist/_playlist.phtml b/airtime_mvc/application/views/scripts/playlist/_playlist.phtml
index ebaa94fc6..9eab3d802 100644
--- a/airtime_mvc/application/views/scripts/playlist/_playlist.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/_playlist.phtml
@@ -58,8 +58,11 @@ if (isset($this->obj)) {
             echo $this->render('playlist/update.phtml') ?>
     </ul>
     <div class="btn-toolbar spl-no-margin clearfix">
+        <div class="btn-group pull-right">
+            <button class="btn" type="button" id="cancel_button" name="submit"><?php echo _("Cancel") ?></button>
+        </div>
         <div class='btn-group pull-right'>
-            <button class="btn btn-inverse" title='<?php echo _("Save playlist") ?>' type="button" id="save_button"><?php echo _("Save") ?></button>
+            <button class="btn" title='<?php echo _("Save playlist") ?>' type="button" id="save_button"><?php echo _("Save") ?></button>
         </div>
     </div>
 
diff --git a/airtime_mvc/application/views/scripts/playlist/_smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/_smart-block.phtml
index 1a31f7784..017c2e656 100644
--- a/airtime_mvc/application/views/scripts/playlist/_smart-block.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/_smart-block.phtml
@@ -59,8 +59,11 @@ if (isset($this->obj)) {
             echo $this->render('playlist/update.phtml') ?>
     </ul>
     <div class="btn-toolbar spl-no-margin clearfix">
+        <div class="btn-group pull-right">
+            <button class="btn" type="button" id="cancel_button" name="submit"><?php echo _("Cancel") ?></button>
+        </div>
         <div class='btn-group pull-right'>
-            <button class="btn btn-inverse" title='Save smart block&#39s title, description, and criteria' type="button" id="save_button"><?php echo _("Save") ?></button>
+            <button class="btn" title='Save smart block&#39s title, description, and criteria' type="button" id="save_button"><?php echo _("Save") ?></button>
         </div>
     </div>
 
diff --git a/airtime_mvc/application/views/scripts/webstream/_webstream.phtml b/airtime_mvc/application/views/scripts/webstream/_webstream.phtml
index c84026040..0d4288668 100644
--- a/airtime_mvc/application/views/scripts/webstream/_webstream.phtml
+++ b/airtime_mvc/application/views/scripts/webstream/_webstream.phtml
@@ -35,7 +35,10 @@
 
     <div class="btn-toolbar spl-no-margin clearfix">
         <div class="btn-group pull-right">
-            <button class="btn btn-inverse" type="submit" id="webstream_save" name="submit"><?php echo _("Save") ?></button>
+            <button class="btn" type="button" id="webstream_cancel" name="submit"><?php echo _("Cancel") ?></button>
+        </div>
+        <div class="btn-group pull-right">
+            <button class="btn" type="submit" id="webstream_save" name="submit"><?php echo _("Save") ?></button>
         </div>
     </div>
 
diff --git a/airtime_mvc/public/css/_showbuilder.css b/airtime_mvc/public/css/_showbuilder.css
index 6dd184227..b62688186 100644
--- a/airtime_mvc/public/css/_showbuilder.css
+++ b/airtime_mvc/public/css/_showbuilder.css
@@ -567,23 +567,27 @@ li.ui-state-default {
     padding: 4px;
 }
 
-#save_button, #webstream_save {
-    background: #ff5d1a;
-    color: #fff;
-    border-radius: 4px;
-    font-size: 16px;
-    height: 38px;
-    width: 120px;
-}
+/*#save_button, #webstream_save {*/
+    /*background: #ff5d1a;*/
+    /*color: #fff;*/
+    /*border-radius: 4px;*/
+    /*font-size: 16px;*/
+    /*height: 38px;*/
+    /*width: 120px;*/
+/*}*/
 
-#save_button:active, #webstream_save {
-    color: #fff !important;
-}
+/*#save_button:active, #webstream_save {*/
+    /*color: #fff !important;*/
+/*}*/
 
 #save_button:focus, #webstream_save {
     outline-width: 0;
 }
 
+#edit-md-dialog .zend_form dd:last-child {
+    width: 160px;
+}
+
 /* Smart Block Editor */
 
 .btn-toolbar {
diff --git a/airtime_mvc/public/css/redmond/jquery-ui-1.8.8.custom.css b/airtime_mvc/public/css/redmond/jquery-ui-1.8.8.custom.css
index c91abd98b..8e5dfa25c 100644
--- a/airtime_mvc/public/css/redmond/jquery-ui-1.8.8.custom.css
+++ b/airtime_mvc/public/css/redmond/jquery-ui-1.8.8.custom.css
@@ -111,13 +111,13 @@
 	border: 1px solid #202020;
 	border-top: 1px solid #353535;
 	border-left: 1px solid #2a2a2a;
+	background-color: #242424;
+	color: #e2e2e2;
 
 	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.65);
 	-moz-box-shadow: inset 0 0 6px rgba(0,0,0,.65);
 	box-shadow: inset 0 0 6px rgba(0,0,0,.65);
 
-	background-color: #242424;
-	color: #e2e2e2;
 
 }
 .ui-widget-content a {
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index e35c83156..ca84a1238 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -47,8 +47,6 @@ h3 {
     color: #efefef;
     padding: 10px;
     margin:0;
-    background-color: #5E5E5E;
-    border-top:1px solid #9d9d9d;
 }
 a, a:focus {
     outline:none;
@@ -62,6 +60,8 @@ select {
     border:1px solid #9d9d9d;
 }
 
+
+
 /* Fix for Firefox */
 fieldset {
     clear: both;
@@ -70,8 +70,6 @@ fieldset {
 .logo {
     position: absolute;
     float: left;
-
-    background: transparent url(images/airtime_logo_med.png) no-repeat 0 0;
     height: 46px;
     width: 120px;
     left: 5px;
@@ -1078,7 +1076,6 @@ fieldset {
     border: 1px solid #222;
     margin: 0;
     padding: 0;
-    background-color: #333;
 
 }
 fieldset.plain {
@@ -1719,6 +1716,11 @@ h2#scheduled_playlist_name span {
     width: 100%;
 }
 
+#stream_form h3 {
+    background-color: #5E5E5E;
+    border-top:1px solid #9d9d9d;
+}
+
 .stream-setting-content dd.block-display {
     /*width: 60%;*/
 }
@@ -3533,7 +3535,6 @@ button.btn-icon-text > i.icon-white {
 .wrapper {
     position: absolute;
 
-    /*background: #242424;*/
     top: 102px;
     left: 130px;
     right: 0;
@@ -3541,8 +3542,6 @@ button.btn-icon-text > i.icon-white {
     padding: 5px 10px 40px;
     border: none;
 
-    background: #111;
-
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     box-sizing: border-box;
@@ -3621,6 +3620,16 @@ button.btn-icon-text > i.icon-white {
     width: 100%;
 }
 
+#listenerstat_content .legendLabel
+{
+    color: #d6d6d6;
+}
+
 .dashboard-btn {
     width: 50%;
 }
+
+#his_submit {
+    height: 19px;
+    margin-top: -2px;
+}
diff --git a/airtime_mvc/public/js/airtime/library/_spl.js b/airtime_mvc/public/js/airtime/library/_spl.js
index 47329dded..b39bb11a5 100644
--- a/airtime_mvc/public/js/airtime/library/_spl.js
+++ b/airtime_mvc/public/js/airtime/library/_spl.js
@@ -904,6 +904,11 @@ var AIRTIME = (function(AIRTIME){
 
         });
 
+        $pl.find("#webstream_cancel, #cancel_button").on("click", function() {
+            var tabId = $pl.attr("tab-id");
+            $("li[tab-id=" + tabId + "] .lib_pl_close").click();
+        });
+
         $lib.on("click", "#pl_edit", function() {
             openPlaylistPanel();
             $.ajax({
@@ -1154,7 +1159,7 @@ var AIRTIME = (function(AIRTIME){
 
 
     mod.fnDelete = function(plid, tabId) {
-        var url, id, lastMod, type, pl = (tabId === undefined) ? $pl : $('#pl-tab-content' + tabId);
+        var url, id, lastMod, type, pl = (tabId === undefined) ? $pl : $('#pl-tab-content-' + tabId);
 
         stopAudioPreview();
         id = (plid === undefined) ? getId() : plid;
diff --git a/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js b/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js
index dbc81b658..8507c876e 100644
--- a/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js
+++ b/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js
@@ -17,7 +17,6 @@ $(document).ready(function() {
     	var oRange = AIRTIME.utilities.fnGetScheduleRange(dateStartId, timeStartId, dateEndId, timeEndId);
    	 	var start = oRange.start;
         var end = oRange.end;
-
         getDataAndPlot(start, end);
     });
 });
@@ -90,11 +89,12 @@ function plot(datasets){
         tickSize = (lastTimestamp.getTime() - firstTimestamp.getTime())/1000/numOfTicks;
         
         plot = $.plot($("#flot_placeholder"), data, {
-            yaxis: { min: 0, tickDecimals: 0 },
-            xaxis: { mode: "time", timeformat:"%y/%m/%0d %H:%M", tickSize: [tickSize, "second"] },
+            yaxis: { min: 0, tickDecimals: 0, color: '#d6d6d6', tickColor: '#d6d6d6' },
+            xaxis: { mode: "time", timeformat:"%y/%m/%0d %H:%M", tickSize: [tickSize, "second"],
+                    color: '#d6d6d6', tickColor: '#d6d6d6' },
             grid: {
                 hoverable: true,
-                backgroundColor: { colors: ["#888888", "#999999"] }
+                backgroundColor: { colors: ["#333", "#555"] }
             },
             series: {
                 lines: {
@@ -106,6 +106,7 @@ function plot(datasets){
             legend: {
                 container: $('#legend'),
                 noColumns: 5,
+                color: '#c0c0c0',
                 labelFormatter: function (label, series) {
                     var cb = '<input style="float:left;" class="legendCB" type="checkbox" ';
                     if (series.data.length > 0){