diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index 511ab92e3..40c8e3ec6 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -52,24 +52,28 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 	protected function _initHeadLink()
 	{
 		$view = $this->getResource('view');
-		$view->headLink()->appendStylesheet('/css/redmond/jquery-ui-1.8.8.custom.css');
-        $this->view->headLink()->appendStylesheet('/css/pro_dropdown_3.css');
-		$this->view->headLink()->appendStylesheet('/css/styles.css');
+        $baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl();
+
+		$view->headLink()->appendStylesheet($baseUrl.'/css/redmond/jquery-ui-1.8.8.custom.css');
+        $view->headLink()->appendStylesheet($baseUrl.'/css/pro_dropdown_3.css');
+		$view->headLink()->appendStylesheet($baseUrl.'/css/styles.css');
 	}
 
 	protected function _initHeadScript()
 	{
 		$view = $this->getResource('view');
-        $view->headScript()->appendFile('/js/libs/jquery-1.5.2.min.js','text/javascript');
-		$view->headScript()->appendFile('/js/libs/jquery-ui-1.8.11.custom.min.js','text/javascript');
-        $view->headScript()->appendFile('/js/libs/jquery.stickyPanel.js','text/javascript');
-        $view->headScript()->appendFile('/js/qtip/jquery.qtip-1.0.0.min.js','text/javascript');
+        $baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl();
+
+        $view->headScript()->appendFile($baseUrl.'/js/libs/jquery-1.5.2.min.js','text/javascript');
+		$view->headScript()->appendFile($baseUrl.'/js/libs/jquery-ui-1.8.11.custom.min.js','text/javascript');
+        $view->headScript()->appendFile($baseUrl.'/js/libs/jquery.stickyPanel.js','text/javascript');
+        $view->headScript()->appendFile($baseUrl.'/js/qtip/jquery.qtip-1.0.0.min.js','text/javascript');
 
         //scripts for now playing bar
-        $this->view->headScript()->appendFile('/js/playlist/helperfunctions.js','text/javascript');
-		$this->view->headScript()->appendFile('/js/playlist/playlist.js','text/javascript');
+        $view->headScript()->appendFile($baseUrl.'/js/playlist/helperfunctions.js','text/javascript');
+		$view->headScript()->appendFile($baseUrl.'/js/playlist/playlist.js','text/javascript');
 
-        $view->headScript()->appendFile('/js/airtime/common/common.js','text/javascript');
+        $view->headScript()->appendFile($baseUrl.'/js/airtime/common/common.js','text/javascript');
     }
 
     protected function _initViewHelpers()
diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php
index 3c4f758f2..e8917724f 100644
--- a/airtime_mvc/application/configs/navigation.php
+++ b/airtime_mvc/application/configs/navigation.php
@@ -19,7 +19,7 @@ $pages = array(
 		'label'      => 'Add Media',
 		'module'     => 'default',
 		'controller' => 'Plupload',
-		'action'     => 'plupload',
+		'action'     => 'index',
 		'resource'	=>	'plupload'
 	),
 	array(
diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index 51c17c828..bd10c63b3 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -21,14 +21,17 @@ class LibraryController extends Zend_Controller_Action
 
     public function indexAction()
     {
-        $this->view->headScript()->appendFile('/js/contextmenu/jjmenu.js','text/javascript');
-        $this->view->headScript()->appendFile('/js/jplayer/jquery.jplayer.min.js');
-        $this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.js','text/javascript');
-        $this->view->headScript()->appendFile('/js/airtime/library/library.js','text/javascript');
-        $this->view->headScript()->appendFile('/js/airtime/library/advancedsearch.js','text/javascript');
+        $request = $this->getRequest();
+        $baseUrl = $request->getBaseUrl();
 
-		$this->view->headLink()->appendStylesheet('/css/media_library.css'); 
-		$this->view->headLink()->appendStylesheet('/css/contextmenu.css');
+        $this->view->headScript()->appendFile($baseUrl.'/js/contextmenu/jjmenu.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/jplayer/jquery.jplayer.min.js');
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/library.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/advancedsearch.js','text/javascript');
+
+		$this->view->headLink()->appendStylesheet($baseUrl.'/css/media_library.css'); 
+		$this->view->headLink()->appendStylesheet($baseUrl.'/css/contextmenu.css');
 	
 		$this->_helper->layout->setLayout('library');
         $this->_helper->viewRenderer->setResponseSegment('library');
diff --git a/airtime_mvc/application/controllers/NowplayingController.php b/airtime_mvc/application/controllers/NowplayingController.php
index 2e9d03a03..742cd1db3 100644
--- a/airtime_mvc/application/controllers/NowplayingController.php
+++ b/airtime_mvc/application/controllers/NowplayingController.php
@@ -12,9 +12,12 @@ class NowplayingController extends Zend_Controller_Action
 
     public function indexAction()
     {
-        $this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.min.js','text/javascript');
-        $this->view->headScript()->appendFile('/js/playlist/nowplayingdatagrid.js','text/javascript');
-        $this->view->headScript()->appendFile('/js/playlist/nowview.js','text/javascript');
+        $request = $this->getRequest();
+        $baseUrl = $request->getBaseUrl();
+
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.min.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/playlist/nowplayingdatagrid.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/playlist/nowview.js','text/javascript');
     }
 
     public function getDataGridDataAction()
@@ -27,14 +30,17 @@ class NowplayingController extends Zend_Controller_Action
     public function livestreamAction()
     {
         //use bare bones layout (no header bar or menu)
-                $this->_helper->layout->setLayout('bare');
+        $this->_helper->layout->setLayout('bare');
     }
 
     public function dayViewAction()
     {
-        $this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.min.js','text/javascript');
-        $this->view->headScript()->appendFile('/js/playlist/nowplayingdatagrid.js','text/javascript');
-        $this->view->headScript()->appendFile('/js/playlist/dayview.js','text/javascript');
+        $request = $this->getRequest();
+        $baseUrl = $request->getBaseUrl();
+
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.min.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/playlist/nowplayingdatagrid.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/playlist/dayview.js','text/javascript');
     }
 }
 
diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php
index 1540f0259..bfaf938de 100644
--- a/airtime_mvc/application/controllers/PlaylistController.php
+++ b/airtime_mvc/application/controllers/PlaylistController.php
@@ -75,8 +75,11 @@ class PlaylistController extends Zend_Controller_Action
 
     public function indexAction()
     {
-        $this->view->headScript()->appendFile('/js/airtime/library/spl.js','text/javascript');
-		$this->view->headLink()->appendStylesheet('/css/playlist_builder.css');
+        $request = $this->getRequest();
+        $baseUrl = $request->getBaseUrl();
+
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/spl.js','text/javascript');
+		$this->view->headLink()->appendStylesheet($baseUrl.'/css/playlist_builder.css');
 
 		$this->_helper->viewRenderer->setResponseSegment('spl');
 		$this->view->pl = $this->getPlaylist();
diff --git a/airtime_mvc/application/controllers/PluploadController.php b/airtime_mvc/application/controllers/PluploadController.php
index 90687f477..56c07bc23 100644
--- a/airtime_mvc/application/controllers/PluploadController.php
+++ b/airtime_mvc/application/controllers/PluploadController.php
@@ -7,14 +7,19 @@ class PluploadController extends Zend_Controller_Action
     {
 		$ajaxContext = $this->_helper->getHelper('AjaxContext');
 		$ajaxContext->addActionContext('upload', 'json')
-                    ->addActionContext('upload-recorded', 'json')
 				    ->initContext();
     }
 
-
     public function indexAction()
     {
-        // action body
+        $request = $this->getRequest();
+        $baseUrl = $request->getBaseUrl();
+
+        $this->view->headScript()->appendFile($baseUrl.'/js/plupload/plupload.full.min.js','text/javascript');
+		$this->view->headScript()->appendFile($baseUrl.'/js/plupload/jquery.plupload.queue.min.js','text/javascript');
+		$this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/plupload.js','text/javascript');
+
+		$this->view->headLink()->appendStylesheet($baseUrl.'/css/plupload.queue.css');
     }
 
     public function uploadAction()
@@ -24,18 +29,6 @@ class PluploadController extends Zend_Controller_Action
 
 		die('{"jsonrpc" : "2.0", "id" : '.$file->getId().' }');
     }
-
-    public function pluploadAction()
-    {
-        $this->view->headScript()->appendFile('/js/plupload/plupload.full.min.js','text/javascript');
-		$this->view->headScript()->appendFile('/js/plupload/jquery.plupload.queue.min.js','text/javascript');
-		$this->view->headScript()->appendFile('/js/airtime/library/plupload.js','text/javascript');
-
-		$this->view->headLink()->appendStylesheet('/css/plupload.queue.css');
-
-    }
-
-
 }
 
 
diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index d1fd4c3e6..23727b9f1 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -10,9 +10,10 @@ class PreferenceController extends Zend_Controller_Action
 
     public function indexAction()
     {
-        $this->view->headScript()->appendFile('/js/airtime/preferences/preferences.js','text/javascript');
-
         $request = $this->getRequest();
+        $baseUrl = $request->getBaseUrl();
+
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/preferences.js','text/javascript');
         $this->view->statusMsg = "";
         
         $form = new Application_Form_Preferences();
diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index d3fab07b8..774a73aac 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -34,20 +34,23 @@ class ScheduleController extends Zend_Controller_Action
 
     public function indexAction()
     {
-        $this->view->headScript()->appendFile('/js/contextmenu/jjmenu.js','text/javascript');
-		$this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.js','text/javascript');
-        $this->view->headScript()->appendFile('/js/fullcalendar/fullcalendar.js','text/javascript');
-        $this->view->headScript()->appendFile('/js/timepicker/jquery.ui.timepicker-0.0.6.js','text/javascript');
-		$this->view->headScript()->appendFile('/js/colorpicker/js/colorpicker.js','text/javascript');
-    	$this->view->headScript()->appendFile('/js/airtime/schedule/full-calendar-functions.js','text/javascript');
-		$this->view->headScript()->appendFile('/js/airtime/schedule/add-show.js','text/javascript');
-    	$this->view->headScript()->appendFile('/js/airtime/schedule/schedule.js','text/javascript');
+        $request = $this->getRequest();
+        $baseUrl = $request->getBaseUrl();
 
-		$this->view->headLink()->appendStylesheet('/css/jquery-ui-timepicker.css');
-        $this->view->headLink()->appendStylesheet('/css/fullcalendar.css');
-		$this->view->headLink()->appendStylesheet('/css/colorpicker/css/colorpicker.css');
-		$this->view->headLink()->appendStylesheet('/css/add-show.css');
-        $this->view->headLink()->appendStylesheet('/css/contextmenu.css');
+        $this->view->headScript()->appendFile($baseUrl.'/js/contextmenu/jjmenu.js','text/javascript');
+		$this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/fullcalendar/fullcalendar.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/timepicker/jquery.ui.timepicker-0.0.6.js','text/javascript');
+		$this->view->headScript()->appendFile($baseUrl.'/js/colorpicker/js/colorpicker.js','text/javascript');
+    	$this->view->headScript()->appendFile($baseUrl.'/js/airtime/schedule/full-calendar-functions.js','text/javascript');
+		$this->view->headScript()->appendFile($baseUrl.'/js/airtime/schedule/add-show.js','text/javascript');
+    	$this->view->headScript()->appendFile($baseUrl.'/js/airtime/schedule/schedule.js','text/javascript');
+
+		$this->view->headLink()->appendStylesheet($baseUrl.'/css/jquery-ui-timepicker.css');
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/fullcalendar.css');
+		$this->view->headLink()->appendStylesheet($baseUrl.'/css/colorpicker/css/colorpicker.css');
+		$this->view->headLink()->appendStylesheet($baseUrl.'/css/add-show.css');
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/contextmenu.css');
 
         $formWhat = new Application_Form_AddShowWhat();
 		$formWho = new Application_Form_AddShowWho();
diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php
index 081c32b70..77740d7ba 100644
--- a/airtime_mvc/application/controllers/UserController.php
+++ b/airtime_mvc/application/controllers/UserController.php
@@ -19,9 +19,11 @@ class UserController extends Zend_Controller_Action
 
     public function addUserAction()
     {
-        $this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.js','text/javascript');
-        $this->view->headScript()->appendFile('/js/airtime/user/user.js','text/javascript');
         $request = $this->getRequest();
+        $baseUrl = $request->getBaseUrl();
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/user/user.js','text/javascript');    
+
         $form = new Application_Form_AddUser();
 
         $this->view->successMessage = "";
diff --git a/airtime_mvc/application/views/scripts/plupload/index.phtml b/airtime_mvc/application/views/scripts/plupload/index.phtml
index ced9919a1..92c98cc93 100644
--- a/airtime_mvc/application/views/scripts/plupload/index.phtml
+++ b/airtime_mvc/application/views/scripts/plupload/index.phtml
@@ -1 +1,6 @@
-<br /><br /><center>View script for controller <b>Plupload</b> and script/action name <b>index</b></center>
\ No newline at end of file
+<form id="plupload_form">
+	<div id="plupload_files"></div>	
+</form>
+<div id="plupload_error">
+	<table></table>
+</div>
diff --git a/airtime_mvc/application/views/scripts/plupload/plupload.phtml b/airtime_mvc/application/views/scripts/plupload/plupload.phtml
deleted file mode 100644
index 92c98cc93..000000000
--- a/airtime_mvc/application/views/scripts/plupload/plupload.phtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<form id="plupload_form">
-	<div id="plupload_files"></div>	
-</form>
-<div id="plupload_error">
-	<table></table>
-</div>
diff --git a/airtime_mvc/application/views/scripts/user/add-user.phtml b/airtime_mvc/application/views/scripts/user/add-user.phtml
index 4f836e0fa..a0d71ad5e 100644
--- a/airtime_mvc/application/views/scripts/user/add-user.phtml
+++ b/airtime_mvc/application/views/scripts/user/add-user.phtml
@@ -1,36 +1,34 @@
-    <div class=
-    "ui-widget ui-widget-content block-shadow clearfix padded-strong user-management">
-    <h2>
-        Manage Users
-      </h2>
-      <div class="user-list-wrapper">
+<div class="ui-widget ui-widget-content block-shadow clearfix padded-strong user-management">
+    <h2>Manage Users</h2>
+    <div class="user-list-wrapper">
         <div id="users_wrapper" class="dataTables_wrapper">
-          
-        <div class="button-holder">
-         <button type="button" id="add_user_button" name="search_add_group" class="ui-button ui-widget ui-state-default ui-button-text-icon-primary">
-            <span class="ui-icon ui-icon-plusthick"></span>
-            <span class="ui-button-text">New User</span></button>
+
+            <div class="button-holder">
+                <button type="button" id="add_user_button" name="search_add_group" class="ui-button ui-widget ui-state-default ui-button-text-icon-primary">
+                    <span class="ui-icon ui-icon-plusthick"></span>
+                    <span class="ui-button-text">New User</span>
+                </button>
+            </div>
+
+            <table cellspacing="0" cellpadding="0" style="" id="users_datatable" class="datatable">
+                <thead>
+                    <tr>
+                        <th>id</th>
+                        <th>Username</th>
+                        <th>First Name</th>
+                        <th>Last Name</th>
+                        <th>Role</th>
+                        <th>&nbsp;</th>
+                    </tr>
+                </thead>
+                <tbody></tbody>
+            </table>
         </div>
-          
-          <table cellspacing="0" cellpadding="0" style="" id="users_datatable" class="datatable">
-            <thead>
-              <tr>
-                <th>id</th>
-                <th>Username</th>
-                <th>First Name</th>
-                <th>Last Name</th>
-                <th>Role</th>
-                <th>&nbsp;</th>
-              </tr>
-            </thead>
-            <tbody></tbody>
-          </table>
-        </div>
-      </div>
-      <div class="user-data simple-formblock" id="user_details">
-      <?php echo $this->successMessage ?>
-	  <fieldset class="padded">
-      <?php echo $this->form ?>
-      </fieldset>
-      </div>
     </div>
+    <div class="user-data simple-formblock" id="user_details">
+        <?php echo $this->successMessage ?>
+        <fieldset class="padded">
+            <?php echo $this->form ?>
+        </fieldset>
+    </div>
+</div>