--- a/stateproviders/ftustateprovider/src/ftuwizardactivatedstate.cpp	Mon May 03 12:24:41 2010 +0300
+++ b/stateproviders/ftustateprovider/src/ftuwizardactivatedstate.cpp	Fri May 14 15:42:45 2010 +0300
@@ -92,7 +92,7 @@
 
     QString path = QDir::currentPath();
     
-    mBackAction = new HbAction(Hb::BackAction, this);
+    mBackAction = new HbAction(Hb::BackNaviAction, this);
     
 }
 
@@ -136,6 +136,11 @@
     setActiveWizardConnections();
 
     mActiveWizard->activateWizard();
+    
+    if (mActiveWizard->wizardSettings().mNoViews)
+    {
+        emit backEventTriggered();
+    }
 }
 
 // ---------------------------------------------------------------------------
@@ -394,7 +399,9 @@
         // check if other wizard than current is activated
         if (mActiveWizard != content()->wizard(wizardIndex))
         {
-            mMainWindow->currentView()->takeMenu();
+            int prevWizardIndex = content()->activeWizard();
+			mMainWindow->currentView()->takeMenu();
+            
             // first deactivate current active wizard
 		    if(mActiveWizard)
 		    {
@@ -408,6 +415,15 @@
             setActiveWizardConnections();
             // set new active wizard visible
             mActiveWizard->activateWizard();
+            
+            if (mActiveWizard->wizardSettings().mNoViews) 
+            {
+                mActiveWizard->deactivateWizard();
+                content()->setActiveWizard(prevWizardIndex);
+                mActiveWizard = content()->wizard(prevWizardIndex);
+                setActiveWizardConnections();
+                mActiveWizard->activateWizard();
+            }
         }
         
         // temp solution to skip edge indexes - start