diff --git a/airtime_mvc/application/controllers/NowplayingController.php b/airtime_mvc/application/controllers/NowplayingController.php
index fec31924c..822fae229 100644
--- a/airtime_mvc/application/controllers/NowplayingController.php
+++ b/airtime_mvc/application/controllers/NowplayingController.php
@@ -21,7 +21,6 @@ class NowplayingController extends Zend_Controller_Action
         $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowplayingdatagrid.js','text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowview.js','text/javascript');
         
-        //popup if previous page was login
         $refer_sses = new Zend_Session_Namespace('referrer');
         $userInfo = Zend_Auth::getInstance()->getStorage()->read();
         $user = new User($userInfo->id);
@@ -56,6 +55,7 @@ class NowplayingController extends Zend_Controller_Action
                 $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/register.js','text/javascript');
             }
         }else{
+            //popup if previous page was login
             if($refer_sses->referrer == 'login' && Application_Model_Nowplaying::ShouldShowPopUp()
                 && !Application_Model_Preference::GetSupportFeedback() && $user->isAdmin()){
                 $logo = Application_Model_Preference::GetStationLogo();
@@ -91,43 +91,6 @@ class NowplayingController extends Zend_Controller_Action
         $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowplayingdatagrid.js','text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/dayview.js','text/javascript');
     }
-    
-    /*public function registerAction(){
-    	//$request = $this->getRequest();
-    	//$baseUrl = $request->getBaseUrl();
-        
-    	//$this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/preferences.js','text/javascript');
-
-        $form = new Application_Form_RegisterAirtime();
-
-        /*if ($request->isPost()) {
-            $values = $request->getPost();
-            if ($values["Publicise"] == '1' && $form->isValid($values)) {
-                Application_Model_Preference::SetHeadTitle($values["stnName"], $this->view);
-                Application_Model_Preference::SetPhone($values["Phone"]);
-                Application_Model_Preference::SetEmail($values["Email"]);
-                Application_Model_Preference::SetStationWebSite($values["StationWebSite"]);
-                Application_Model_Preference::SetPublicise($values["Publicise"]);
-                
-                $form->Logo->receive();
-                $imagePath = $form->Logo->getFileName();
-
-                Application_Model_Preference::SetStationCountry($values["Country"]);
-                Application_Model_Preference::SetStationCity($values["City"]);
-                Application_Model_Preference::SetStationDescription($values["Description"]);
-                Application_Model_Preference::SetStationLogo($imagePath);
-                Application_Model_Preference::SetSupportFeedback($values["SupportFeedback"]);
-                // unset session
-                Zend_Session::namespaceUnset('referrer');
-            }
-        }else
-            $logo = Application_Model_Preference::GetStationLogo();
-    		if($logo){
-    			$this->view->logoImg = $logo;
-    		}
-            $this->view->dialog = $form->render($this->view);
-        //}
-    }*/
 
     public function remindmeAction()
     {
diff --git a/airtime_mvc/public/js/airtime/nowplaying/nowplayingdatagrid.js b/airtime_mvc/public/js/airtime/nowplaying/nowplayingdatagrid.js
index 57f62ce2d..d56d5b33a 100644
--- a/airtime_mvc/public/js/airtime/nowplaying/nowplayingdatagrid.js
+++ b/airtime_mvc/public/js/airtime/nowplaying/nowplayingdatagrid.js
@@ -64,8 +64,8 @@ var columns = [{"sTitle": "type", "bVisible":false},
     {"sTitle":"Start"},
     {"sTitle":"End"},
     {"sTitle":"Duration"},
-    {"sTitle":"Song"},
-    {"sTitle":"Artist"},
+    {"sTitle":"Title"},
+    {"sTitle":"Creator"},
     {"sTitle":"Album"},
     {"sTitle":"Playlist"},
     {"sTitle":"Show"},