--- mythvideo/mythvideo/videogallery.cpp	2008-04-25 19:19:46.000000000 -0600
+++ mythvideo/mythvideo/videogallery.cpp.orig	2008-04-25 19:19:55.000000000 -0600
@@ -61,25 +61,32 @@
 
         if (action == "SELECT")
             handled = handleSelect();
+	/*
         else if (action == "INFO") {
             if (where_we_are->getInt() > kSubFolder)
                 doMenu(true);
-        } else if (action == "UP" || action == "DOWN" ||
-                 action == "LEFT" || action == "RIGHT" ||
-                 action == "PAGEUP" || action == "PAGEDOWN" ||
-                 action == "HOME" || action == "END")
+        } */
+	else if (action == "3" || action == "PAGEUP")
+	    moveCursor("PAGEUP");
+	else if (action == "9" || action == "PAGEDOWN")
+	    moveCursor("PAGEDOWN");
+	else if (action == "UP" || action == "DOWN" ||
+                 action == "LEFT" || action == "RIGHT")
             moveCursor(action);
+	else if (action == "1" || action == "HOME")
+	    moveCursor("HOME");
+	else if (action == "7" || action == "END")
+	    moveCursor("END");
         else if (action == "INCPARENT")
             shiftParental(1);
         else if (action == "DECPARENT")
             shiftParental(-1);
-        else if (action == "1" || action == "2" ||
-                 action == "3" || action == "4")
-            setParentalLevel(action.toInt());
+	/*
         else if (action == "FILTER")
             slotDoFilter();
         else if (action == "MENU")
             doMenu(false);
+	*/
         else if (action == "ESCAPE")
         {
             GenericTree *lparent = where_we_are->getParent();
@@ -227,10 +234,17 @@
     LayerSet *container = theme->GetSet("text");
     if (container)
     {
+
+	QString title = where_we_are->getString();
+	if(title == "videos")
+		title = "";
+	else
+		title.replace('_',' ');
+
         Metadata *meta =
                 m_video_list->getVideoListMetadata(where_we_are->getInt());
         checkedSetText((UITextType*)container->GetType("text"),
-                       meta ? meta->Title() : where_we_are->getString());
+                       meta ? meta->Title() : title);
 
         container->Draw(&tmp, 0, 0);
     }
@@ -459,7 +473,10 @@
             area.setHeight(bh-2*sh-yoffset);
             itype->SetDisplayArea(area);
             itype->calculateScreenArea();
-            itype->SetText(meta ? meta->Title() : curTreePos->getString());
+            //itype->SetText(meta ? meta->Title() : curTreePos->getString());
+
+	    QString tmp = meta ? meta->Title() : curTreePos->getString();
+	    itype->SetText(tmp.replace('_',' '));
 
             for (int i = 0; i < 4; ++i)
                 itype->Draw(p, i, 0);
@@ -477,7 +494,9 @@
         area.setHeight(spaceH);
         ttype->SetDisplayArea(area);
         ttype->calculateScreenArea();
-        ttype->SetText(meta ? meta->Title() : curTreePos->getString());
+        //ttype->SetText(meta ? meta->Title() : curTreePos->getString());
+	    QString tmp = meta ? meta->Title() : curTreePos->getString();
+	    ttype->SetText(tmp.replace('_',' '));
 
         for (int i = 0; i < 4; ++i)
             ttype->Draw(p, i, 0);
@@ -853,7 +872,8 @@
                 handleUpDirSelect();
                 break;
             default:
-                handleVideoSelect();
+                // handleVideoSelect();
+                slotWatchVideo();
         };
 
         update(); // renew the screen