--- a/application/data/PodcastShowsView.ra	Sat Jul 10 13:35:21 2010 +0100
+++ b/application/data/PodcastShowsView.ra	Sun Jul 11 11:36:24 2010 +0100
@@ -20,7 +20,6 @@
 {
 	menubar = r_podcast_showsview_menubar;
 	cba = R_AVKON_SOFTKEYS_OPTIONS_BACK;
-//	toolbar = r_showsview_toolbar;
 }
 
 RESOURCE MENU_BAR r_podcast_showsview_menubar
@@ -35,191 +34,61 @@
     {
     items =
         {
-        MENU_ITEM
+		MENU_ITEM
+			{
+			command = EPodcastUpdateFeed;
+			txt = STRING_r_update_feed_cmd;
+			},
+		MENU_ITEM
+			{
+			command = EPodcastCancelUpdateAllFeeds;
+			txt = STRING_r_cancel_update_all_feeds_cmd;
+			},
+		MENU_ITEM
+			{
+			command = EPodcastShowsShowMenu;
+			txt = STRING_r_view_shows_show_menu;
+			cascade = r_shows_show_menu;
+			},
+		MENU_ITEM
 			{
 			command = EPodcastMarkAllPlayed;
 			txt = STRING_r_view_mark_all_played_cmd;
 			},
-//		MENU_ITEM
-//			{
-//			command = EPodcastFilterShows;
-//			txt = STRING_r_view_filter_shows_cmd;
-//			cascade = r_filtershows_menu;
-//			},
-		MENU_ITEM
-			{
-			command = EPodcastAbout;
-			txt = STRING_r_view_about_cmd;
-			}, 
 		MENU_ITEM
 			{
 			command = EPodcastHelp;
 			txt = STRING_r_view_help;
-			},
-		MENU_ITEM
-			{
-			command = EAknSoftkeyExit;
-			txt = STRING_r_exit_cmd;
 			}
         };
     }
 
-RESOURCE MENU_PANE r_filtershows_menu
+RESOURCE MENU_PANE r_shows_show_menu
 	{
 	items =	{
-		MENU_ITEM
-			{
-			command = EPodcastFilterShowsAll;
-			txt = STRING_r_view_filter_all_shows_cmd;
-			},
-/*		MENU_ITEM
-			{
-			command = EPodcastFilterShowsNew;
-			txt = STRING_r_view_filter_new_shows_cmd;
-			},
-		MENU_ITEM
-			{
-			command = EPodcastFilterShowsDownloaded;
-			txt = STRING_r_view_filter_downloaded_shows_cmd;
-			},*/
-		MENU_ITEM
-			{
-			command = EPodcastFilterShowsNewAndDownloaded;
-			txt = STRING_r_view_filter_downloaded_new_shows_cmd;
-			}
-	};	
+	MENU_ITEM
+		{
+		command = EPodcastMarkAsPlayed;
+		txt = STRING_r_view_mark_as_played_cmd_short;
+		},
+	MENU_ITEM
+		{
+		command = EPodcastMarkAsUnplayed;
+		txt = STRING_r_view_mark_as_unplayed_cmd_short;
+		},
+	MENU_ITEM
+		{
+		command = EPodcastDeleteShow;
+		txt = STRING_r_view_delete_show_cmd;
+		},
+	MENU_ITEM
+		{
+			txt = STRING_r_view_show_info_cmd;
+			command = EPodcastShowInfo;
+		}
+	};
 	}
 
-//RESOURCE AVKON_TOOLBAR r_showsview_toolbar
-//    {
-//    flags = KAknToolbarFixed;
-//    items =
-//        {
-//        TBAR_CTRL
-//            {
-//            type = EAknCtButton;
-//            id = EPodcastUpdateFeed;
-//            control = AVKON_BUTTON
-//                {
-//                states =
-//                    {
-//                    AVKON_BUTTON_STATE
-//                        {
-//                        //bmpfile = AVKON_BITMAP_FILE;
-//                        //bmpid = EMbmAvkonQgn_indi_find_goto;
-//                        txt = STRING_r_update_feed_short_cmd;
-//                        helptxt = STRING_r_update_feed_cmd;
-//                        }  
-//                    };
-//                };
-//            },
-//            TBAR_CTRL
-//                {
-//                type = EAknCtButton;
-//                id = EPodcastCancelUpdateAllFeeds;
-//                control = AVKON_BUTTON
-//                    {
-//                    states =
-//                        {
-//                        AVKON_BUTTON_STATE
-//                            {
-//                            //bmpfile = AVKON_BITMAP_FILE;
-//                            //bmpid = EMbmAvkonQgn_indi_find_goto;
-//                            txt = STRING_r_cancel_update_all_feeds_short_cmd;
-//                            helptxt = STRING_r_cancel_update_all_feeds_cmd;
-//                           }  
-//                        };
-//                    };
-//                },
-//// we keep the download toolbar button in S^3, but always disable it
-//// because there are drawing issues with only one item in the toolbar
-//            TBAR_CTRL
-//			{
-//			type = EAknCtButton;
-//			id = EPodcastDownloadShow;
-//			control = AVKON_BUTTON
-//				{
-//				states =
-//					{
-//					AVKON_BUTTON_STATE
-//						{
-//						//bmpfile = AVKON_BITMAP_FILE;
-//						//bmpid = EMbmAvkonQgn_indi_find_goto;
-//						txt = STRING_r_view_download_show_cmd;
-//						helptxt = STRING_r_view_download_show_cmd;
-//						}  
-//					};
-//				};
-//			}
-//        ,		
-//		TBAR_CTRL
-//			{
-//			type = EAknCtButton;
-//			id =EPodcastDeleteShow;
-//			control = AVKON_BUTTON
-//				{
-//				states =
-//					{
-//					AVKON_BUTTON_STATE
-//						{
-//						//bmpfile = AVKON_BITMAP_FILE;
-//						//bmpid = EMbmAvkonQgn_indi_find_goto;
-//						txt = STRING_r_view_delete_show_cmd;
-//						helptxt = STRING_r_view_delete_show_cmd;
-//						}  
-//					};
-//				};
-//			},
-//		TBAR_CTRL
-//			{
-//			type = EAknCtButton;
-//			id = EPodcastMarkAsPlayed;
-//			control = AVKON_BUTTON
-//				{
-//				states =
-//					{
-//					AVKON_BUTTON_STATE
-//						{
-//						//bmpfile = AVKON_BITMAP_FILE;
-//						//bmpid = EMbmAvkonQgn_indi_find_goto;
-//						txt = STRING_r_view_mark_as_played_cmd_short;
-//						helptxt = STRING_r_view_mark_as_played_cmd_short;
-//						}  
-//					};
-//				};
-//			},
-//			TBAR_CTRL
-//				{
-//				type = EAknCtButton;
-//				id =EPodcastMarkAsUnplayed;
-//				control = AVKON_BUTTON
-//					{
-//					states =
-//						{
-//						AVKON_BUTTON_STATE
-//							{
-//							//bmpfile = AVKON_BITMAP_FILE;
-//							//bmpid = EMbmAvkonQgn_indi_find_goto;
-//							txt = STRING_r_view_mark_as_unplayed_cmd_short;
-//							helptxt = STRING_r_view_mark_as_unplayed_cmd_short;
-//							}  
-//						};
-//					};
-//				}
-//        };
-//    }
-
-RESOURCE STYLUS_POPUP_MENU r_showview_popup_menu
-	{
-		items =
-		{
-			STYLUS_POPUP_MENU_ITEM
-				{
-					txt = STRING_r_view_show_info_cmd;
-					command = EPodcastShowInfo;
-				}
-		};
-	}
 
 RESOURCE DIALOG r_show_info_note
 {