--- a/application/data/PodcastQueueView.ra	Sat Jul 10 13:35:21 2010 +0100
+++ b/application/data/PodcastQueueView.ra	Sun Jul 11 11:36:24 2010 +0100
@@ -36,121 +36,51 @@
         {
  		MENU_ITEM
 			{
-			command = EPodcastAbout;
-			txt = STRING_r_view_about_cmd;
+			command = EPodcastSuspendDownloads;
+			txt = STRING_r_view_stop_downloads_cmd;
 			}, 
 		MENU_ITEM
 			{
+			command = EPodcastResumeDownloads;
+			txt = STRING_r_view_resume_downloads_cmd;
+			},
+		MENU_ITEM
+			{
+			command = EPodcastQueueShowMenu;
+			txt = STRING_r_view_queue_show_menu;
+			cascade = r_queue_show_menu;
+			},
+		MENU_ITEM
+			{
+			command = EPodcastRemoveAllDownloads;
+			txt = STRING_r_view_remove_all_downloads_cmd;
+			},
+		MENU_ITEM
+			{
 			command = EPodcastHelp;
 			txt = STRING_r_view_help;
-			},
-		MENU_ITEM
-			{
-			command = EAknSoftkeyExit;
-			txt = STRING_r_exit_cmd;
 			}
         };
     }
 
-//RESOURCE AVKON_TOOLBAR r_queueview_toolbar
-//    {
-//    flags = KAknToolbarFixed;
-//    items =
-//        {
-//
-//		TBAR_CTRL
-//			{
-//			type = EAknCtButton;
-//			id =EPodcastSuspendDownloads;
-//			control = AVKON_BUTTON
-//				{
-//				states =
-//					{
-//					AVKON_BUTTON_STATE
-//						{
-//						//bmpfile = AVKON_BITMAP_FILE;
-//						//bmpid = EMbmAvkonQgn_indi_find_goto;
-//						txt = STRING_r_suspend_download_cmd;
-//						helptxt = STRING_r_view_stop_downloads_cmd;
-//						}  
-//					};
-//				};
-//			},
-//		TBAR_CTRL
-//			{
-//			type = EAknCtButton;
-//			id =EPodcastResumeDownloads;
-//			control = AVKON_BUTTON
-//				{
-//				states =
-//					{
-//					AVKON_BUTTON_STATE
-//						{
-//						//bmpfile = AVKON_BITMAP_FILE;
-//						//bmpid = EMbmAvkonQgn_indi_find_goto;
-//						txt = STRING_r_view_resume_short_dls_cmd;
-//						helptxt = STRING_r_view_resume_downloads_cmd;
-//						}  
-//					};
-//				};
-//			},
-//		TBAR_CTRL
-//			{
-//			type = EAknCtButton;
-//			id = EPodcastRemoveDownload;
-//			control = AVKON_BUTTON
-//				{
-//				states =
-//					{
-//					AVKON_BUTTON_STATE
-//						{
-//						//bmpfile = AVKON_BITMAP_FILE;
-//						//bmpid = EMbmAvkonQgn_indi_find_goto;
-//						txt = STRING_r_view_remove_download_short_cmd;
-//						helptxt = STRING_r_view_remove_download_cmd;
-//						}  
-//					};
-//				};
-//			},
-//		TBAR_CTRL
-//			{
-//			type = EAknCtButton;
-//			id =EPodcastRemoveAllDownloads;
-//			control = AVKON_BUTTON
-//				{
-//				states =
-//					{
-//					AVKON_BUTTON_STATE
-//						{
-//						//bmpfile = AVKON_BITMAP_FILE;
-//						//bmpid = EMbmAvkonQgn_indi_find_goto;
-//						txt = STRING_r_view_remove_all_downloads_cmd_short;
-//						helptxt = STRING_r_view_remove_all_downloads_cmd;
-//						}  
-//					};
-//				};
-//			}
-//        };
-//    }
+RESOURCE MENU_PANE r_queue_show_menu
+	{
+	items =	{
+		MENU_ITEM
+			{
+				txt = STRING_r_view_remove_download_short_cmd;
+				command = EPodcastRemoveDownload;
+			},
+		MENU_ITEM
+			{
+				txt = STRING_r_view_move_up_short_cmd;
+				command = EPodcastMoveDownloadUp;
+			},
+		MENU_ITEM
+			{
+				txt = STRING_r_view_move_down_short_cmd;
+				command = EPodcastMoveDownloadDown;
+			}
+	};
+	}
 
-RESOURCE STYLUS_POPUP_MENU r_queueview_popup_menu
-	{
-		items =
-		{
-			STYLUS_POPUP_MENU_ITEM
-				{
-					txt = STRING_r_view_remove_download_short_cmd;
-					command = EPodcastRemoveDownload;
-				},
-			STYLUS_POPUP_MENU_ITEM
-				{
-					txt = STRING_r_view_move_up_short_cmd;
-					command = EPodcastMoveDownloadUp;
-				},
-			STYLUS_POPUP_MENU_ITEM
-				{
-					txt = STRING_r_view_move_down_short_cmd;
-					command = EPodcastMoveDownloadDown;
-				}
-		};
-	}