--- a/camerauis/cameraapp/generic/src/CamInfoListBoxContainer.cpp	Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamInfoListBoxContainer.cpp	Wed Oct 13 14:09:54 2010 +0300
@@ -153,7 +153,7 @@
     
     CCamAppUi* appUi = static_cast<CCamAppUi*>( iEikonEnv->AppUi() ); 
     TRect listboxRect; 
-    if ( AknLayoutUtils::PenEnabled() ) 
+    if ( CamUtility::IsNhdDevice() ) 
         {
         listboxRect = TouchLayout();
         }
@@ -329,7 +329,7 @@
 	PRINT(_L("Camera => CCamInfoListBoxContainer::Draw") )
 
 	CWindowGc& gc = SystemGc();
-    if ( AknLayoutUtils::PenEnabled() )
+    if ( CamUtility::IsNhdDevice() )
         {
         TRgb color;
         if( iSkinnedBackGround )
@@ -597,15 +597,7 @@
         case EEventItemSingleClicked:
             {
             TInt settingValue = CurrentSettingItemValue();
-
-            if ( iView.Id().iUid == ECamViewIdPhotoUserSceneSetup )
-                {                   
-                iController.PreviewSettingChangeL( ECamSettingItemUserSceneLightSensitivity, settingValue );
-                }
-     	    else
-       	        {
-		        iController.PreviewSettingChangeL( ECamSettingItemDynamicPhotoLightSensitivity, settingValue );
-          	    }
+            iController.PreviewSettingChangeL( ECamSettingItemDynamicPhotoLightSensitivity, settingValue );
             }
             break;
         default: