diff --git a/airtime_mvc/application/controllers/EmbedController.php b/airtime_mvc/application/controllers/EmbedController.php
index 7e5500b75..61d88b4f7 100644
--- a/airtime_mvc/application/controllers/EmbedController.php
+++ b/airtime_mvc/application/controllers/EmbedController.php
@@ -78,17 +78,12 @@ class EmbedController extends Zend_Controller_Action
 
     public function weeklyProgramAction()
     {
+        $this->view->layout()->disableLayout();
 
         $CC_CONFIG = Config::getConfig();
 
         $request = $this->getRequest();
 
-        $useIframe = $request->getParam('useiframe');
-        if (!isset($useIframe)) {
-            $this->view->layout()->disableLayout();
-        } elseif ($useIframe == "1") {
-            $this->_helper->layout->setLayout('bare');
-        }
 
         $widgetStyle = $request->getParam('style');
         if ($widgetStyle == "premium") {
diff --git a/airtime_mvc/application/views/scripts/embed/weekly-program.phtml b/airtime_mvc/application/views/scripts/embed/weekly-program.phtml
index 6d36f2242..3420b7587 100644
--- a/airtime_mvc/application/views/scripts/embed/weekly-program.phtml
+++ b/airtime_mvc/application/views/scripts/embed/weekly-program.phtml
@@ -4,8 +4,6 @@
 <head>
     <link rel="stylesheet" href="<?php echo $this->css?>" type="text/css">
     <script src="<?php echo $this->jquery ?>" type="text/javascript"></script>
-    <script src="<?php echo $this->jquery_custom ?>" type="text/javascript"></script>
-    <script src="<?php echo $this->widget_js ?>" type="text/javascript"></script>
     <link href='https://fonts.googleapis.com/css?family=Roboto:400,100,300,700' rel='stylesheet' type='text/css'>
     <script type="text/javascript">
         $(document).ready(function() {
diff --git a/airtime_mvc/application/views/scripts/index/index.phtml b/airtime_mvc/application/views/scripts/index/index.phtml
index 6318fbc44..a8467757f 100644
--- a/airtime_mvc/application/views/scripts/index/index.phtml
+++ b/airtime_mvc/application/views/scripts/index/index.phtml
@@ -4,10 +4,11 @@ var newheight;
 var newwidth;
 
 if(document.getElementById){
-newheight=document.getElementById(id).contentWindow.document .body.scrollHeight;
-newwidth=document.getElementById(id).contentWindow.document .body.scrollWidth;
+    newheight=document.getElementById(id).contentWindow.document.body.scrollHeight;
+    // Hack to get height in Firefox
+    if (newheight == 0) newheight = newheight = document.getElementById(id).contentWindow.document.documentElement.scrollHeight;
+    newwidth=document.getElementById(id).contentWindow.document.body.scrollWidth;
 }
-
 document.getElementById(id).height= (newheight) + "px";
 document.getElementById(id).width= (newwidth) + "px";
 }
@@ -31,7 +32,6 @@ document.getElementById(id).width= (newwidth) + "px";
     </div>
 
     <div id="tab-1" class="schedule tab_content current">
-        <?php //echo $this->action('weekly-program','embed', 'default', array('style' => 'premium', 'useiframe' => '1')); ?>
         <iframe onLoad="autoResize('schedule_iframe');" id="schedule_iframe" height="300px" scrolling="yes" frameborder="0" src=<?php echo $this->stationUrl."embed/weekly-program?style=premium"?>></iframe>
     </div>
 
@@ -68,6 +68,7 @@ document.getElementById(id).width= (newwidth) + "px";
                 $("#player_iframe").contents().find('.bottom_bar .button').removeClass('current');
                 $('.tab_content').removeClass('current');
 
+                window.scrollTo(0,0);
                 $(this).addClass('current');
                 $("#"+tab_id).addClass('current');
             });
diff --git a/airtime_mvc/public/css/radio-page/radio-page.css b/airtime_mvc/public/css/radio-page/radio-page.css
index f23c530f1..bd1d8c2a6 100644
--- a/airtime_mvc/public/css/radio-page/radio-page.css
+++ b/airtime_mvc/public/css/radio-page/radio-page.css
@@ -59,13 +59,12 @@ span.login-img {
     text-align: center;
     width: 770px;
     max-width: 770px;
-    margin: 0 auto;
-    margin-bottom: 140px;
+    margin: 0 auto 0px -380px;
     padding: 10px;
     padding-left: 0px;
+    padding-bottom: 140px;
     position: absolute;
     left: 50%;
-    margin-left: -380px;
     /*	-webkit-transition-delay: 1s;
         transition-delay: 1s;*/
 }
@@ -87,7 +86,7 @@ span.login-img {
     opacity: 0;
 }
 
-.about_us.current, .login.current {
+.about_us.current, .login.current, .schedule.current {
     opacity: 1;
     -webkit-transition-delay: 0.4s;
     transition-delay: 0.4s;
