--- a/idlehomescreen/widgetmanager/data/widgetmanagerview.rss	Wed Sep 15 12:00:00 2010 +0300
+++ b/idlehomescreen/widgetmanager/data/widgetmanagerview.rss	Wed Oct 13 14:18:30 2010 +0300
@@ -41,7 +41,7 @@
 
 RESOURCE AVKON_VIEW r_wm_main_container_view
     {
-    cba = r_wm_softkeys_options_back__store;
+    cba = R_AVKON_SOFTKEYS_OPTIONS_BACK;
     menubar = r_wm_main_container_options_menu;
     toolbar = 0;
     }
@@ -51,28 +51,6 @@
     txt = qtn_wm_title_text;
     }
 
-RESOURCE CBA r_wm_softkeys_options_back__store
-    {
-    flags = EEikButtonGroupAddToStack | EEikCbaFlagAppMskIcon;    
-    buttons =
-        {
-        CBA_BUTTON {id=EAknSoftkeyOptions; txt = text_softkey_option;},
-        CBA_BUTTON {id=EAknSoftkeyBack; txt = text_softkey_back; },                
-        AVKON_CBA_BUTTON{id=EWmStoreCommand; longpressid=0; txt= ""; }
-        };
-    }
-
-RESOURCE CBA r_wm_softkeys_options_cancel__store
-    {
-    flags = EEikButtonGroupAddToStack | EEikCbaFlagAppMskIcon;
-    buttons =
-        {
-        CBA_BUTTON {id=EAknSoftkeyOptions; txt = text_softkey_option;},
-        CBA_BUTTON {id=EAknSoftkeyCancel; txt = text_softkey_cancel; },
-        AVKON_CBA_BUTTON{id=EWmStoreCommand; longpressid=0; txt= ""; }
-        };
-    }
-
 // ----------------------------------------------------
 // MENU
 // ----------------------------------------------------
@@ -94,6 +72,12 @@
         {
         MENU_ITEM
             {
+            command = EWmMainContainerViewOpenPortalMenuItemCommand;
+            txt = qtn_options_wm_open;
+            flags = EEikMenuItemAction;
+            },
+        MENU_ITEM
+            {
             command = EWmMainContainerViewAddMenuItemCommand;
             txt = qtn_options_wm_add;
             flags = EEikMenuItemAction;
@@ -140,21 +124,25 @@
     }
 
 // ----------------------------------------------------
-// Ovi store related
+// OVI STORE BUTTON
 // ----------------------------------------------------
-RESOURCE TBUF r_qtn_wm_ovi_store_title
+
+RESOURCE AVKON_BUTTON r_wm_portal_button
     {
-    buf = qtn_wm_ovi_store_title;
+    flags = 0;
+    states =
+        {
+        AVKON_BUTTON_STATE
+            {
+            flags = 0;
+            txt = qtn_wm_ovi_store_title;
+            }
+        };
     }
 
-RESOURCE TBUF r_qtn_wm_ovi_store_desc
+RESOURCE TBUF r_qtn_wm_go_to_ovi_store
     {
-    buf = qtn_wm_ovi_store_desc;
-    }
-
-RESOURCE TBUF r_qtn_wm_storelist_title
-    {
-    buf = qtn_wm_storelist_title;
+    buf = qtn_wm_ovi_store_title;
     }
 
 // ----------------------------------------------------