diff -r 4545c04e61e1 -r bcf742120177 bluetoothengine/btui/btcpplugin/docml/bt-search-view.docml
--- a/bluetoothengine/btui/btcpplugin/docml/bt-search-view.docml	Wed Aug 18 09:59:05 2010 +0300
+++ b/bluetoothengine/btui/btcpplugin/docml/bt-search-view.docml	Fri Sep 17 08:30:56 2010 +0300
@@ -19,7 +19,7 @@
     <widget name="bt_search_view" type="HbView">
         <widget name="search_view_content" role="HbView:widget" type="HbWidget">
             <widget name="search_container" type="HbWidget">
-                <widget name="icon" type="HbLabel">
+                <widget name="searchIcon" type="HbLabel">
                     <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
                     <icon iconName="qtg_anim_small_loading.axml" name="icon"/>
                     <real name="z" value="2"/>
@@ -27,35 +27,34 @@
                     <sizehint height="var(hb-param-graphic-size-primary-large)" type="MAXIMUM" width="var(hb-param-graphic-size-primary-large)"/>
                     <bool name="visible" value="TRUE"/>
                 </widget>
-                <widget name="label_searching" type="HbLabel">
+                <widget name="searchStatus" type="HbLabel">
                     <real name="z" value="3"/>
                     <sizehint height="var(hb-param-graphic-size-primary-large)" type="PREFERRED" width="38.20896un"/>
                     <bool name="visible" value="TRUE"/>
                     <string locid="txt_bt_subhead_searching" name="plainText" value="Searching..."/>
                 </widget>
-                <widget name="dataForm" type="HbDataForm">
+                <widget name="searchHeading" type="HbDataForm">
                     <widget name="dataformviewItemPrototype" role="HbAbstractView:prototype" type="HbDataFormViewItem"/>
                     <real name="z" value="4"/>
-                    <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
-                    <sizehint type="PREFERRED" width="25un"/>
+                    <sizehint height="7.8806un" type="MINIMUM"/>
                     <string locid="txt_bt_subhead_bluetooth_found_devices" name="heading" value="Found devices"/>
                 </widget>
                 <real name="z" value="0"/>
-                <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
+                <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
                 <sizehint height="12.784un" type="PREFERRED" width="51.19403un"/>
                 <sizehint height="14.784un" type="MAXIMUM"/>
                 <bool name="visible" value="TRUE"/>
                 <layout type="anchor">
-                    <anchoritem dst="dataForm" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
-                    <anchoritem dst="dataForm" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
-                    <anchoritem dst="dataForm" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
-                    <anchoritem dst="label_searching" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="icon" srcEdge="RIGHT"/>
-                    <anchoritem dst="label_searching" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-middle-vertical) )" src="dataForm" srcEdge="BOTTOM"/>
-                    <anchoritem dst="label_searching" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-right)" src="" srcEdge="RIGHT"/>
-                    <anchoritem dst="label_searching" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
-                    <anchoritem dst="icon" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="" srcEdge="LEFT"/>
-                    <anchoritem dst="icon" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-top) )" src="dataForm" srcEdge="BOTTOM"/>
-                    <anchoritem dst="icon" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+                    <anchoritem dst="searchHeading" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+                    <anchoritem dst="searchHeading" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
+                    <anchoritem dst="searchHeading" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+                    <anchoritem dst="searchStatus" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="searchIcon" srcEdge="RIGHT"/>
+                    <anchoritem dst="searchStatus" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-middle-vertical) )" src="searchHeading" srcEdge="BOTTOM"/>
+                    <anchoritem dst="searchStatus" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-right)" src="" srcEdge="RIGHT"/>
+                    <anchoritem dst="searchStatus" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+                    <anchoritem dst="searchIcon" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="" srcEdge="LEFT"/>
+                    <anchoritem dst="searchIcon" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-top) )" src="searchHeading" srcEdge="BOTTOM"/>
+                    <anchoritem dst="searchIcon" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
                 </layout>
             </widget>
             <widget name="toolBar" type="HbToolBar">
@@ -80,41 +79,48 @@
         <string locid="txt_cp_title_control_panel" name="title" value="Control Panel"/>
         <real name="z" value="1"/>
     </widget>
+    <section name="portrait">
+        <widget name="search_container" type="HbWidget">
+            <layout type="anchor">
+                <anchoritem dst="searchHeading" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+                <anchoritem dst="searchHeading" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
+                <anchoritem dst="searchHeading" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+                <anchoritem dst="searchStatus" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="searchIcon" srcEdge="RIGHT"/>
+                <anchoritem dst="searchStatus" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-middle-vertical) )" src="searchHeading" srcEdge="BOTTOM"/>
+                <anchoritem dst="searchStatus" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-right)" src="" srcEdge="RIGHT"/>
+                <anchoritem dst="searchStatus" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+                <anchoritem dst="searchIcon" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="" srcEdge="LEFT"/>
+                <anchoritem dst="searchIcon" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-top) )" src="searchHeading" srcEdge="BOTTOM"/>
+                <anchoritem dst="searchIcon" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+            </layout>
+    
+    	</widget>
+    </section>
     <section name="landscape">
-        <widget name="icon" type="HbLabel">
-            <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
-        </widget>
-        <widget name="dataForm" type="HbDataForm">
-            <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
-            <sizehint type="PREFERRED" width="51.19403un"/>
-        </widget>
-        <widget name="label_searching" type="HbLabel">
-            <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
-        </widget>
         <widget name="search_container" type="HbWidget">
             <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Ignored" verticalStretch="0"/>
             <sizehint height="12un" type="PREFERRED" width="51.19403un"/>
             <sizehint height="12.75un" type="MAXIMUM"/>
             <layout type="anchor">
-                <anchoritem dst="icon" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
-                <anchoritem dst="icon" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
-                <anchoritem dst="label_searching" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-bottom)" src="" srcEdge="BOTTOM"/>
-                <anchoritem dst="label_searching" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-right)" src="" srcEdge="RIGHT"/>
-                <anchoritem dst="label_searching" dstEdge="TOP" spacing="var(hb-param-margin-gene-top)" src="" srcEdge="TOP"/>
-                <anchoritem dst="label_searching" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="icon" srcEdge="RIGHT"/>
-                <anchoritem dst="icon" dstEdge="LEFT" spacing="0un" src="dataForm" srcEdge="RIGHT"/>
-                <anchoritem dst="icon" dstEdge="RIGHT" spacing="0un" src="label_searching" srcEdge="LEFT"/>
-                <anchoritem dst="dataForm" dstEdge="RIGHT" spacing="0un" src="icon" srcEdge="LEFT"/>
-                <anchoritem dst="dataForm" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
-                <anchoritem dst="dataForm" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
-                <anchoritem dst="dataForm" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+                <anchoritem dst="searchIcon" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
+                <anchoritem dst="searchIcon" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+                <anchoritem dst="searchStatus" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-bottom)" src="" srcEdge="BOTTOM"/>
+                <anchoritem dst="searchStatus" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-right)" src="" srcEdge="RIGHT"/>
+                <anchoritem dst="searchStatus" dstEdge="TOP" spacing="var(hb-param-margin-gene-top)" src="" srcEdge="TOP"/>
+                <anchoritem dst="searchStatus" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="searchIcon" srcEdge="RIGHT"/>
+                <anchoritem dst="searchIcon" dstEdge="LEFT" spacing="0un" src="searchHeading" srcEdge="RIGHT"/>
+                <anchoritem dst="searchIcon" dstEdge="RIGHT" spacing="0un" src="searchStatus" srcEdge="LEFT"/>
+                <anchoritem dst="searchHeading" dstEdge="RIGHT" spacing="0un" src="searchIcon" srcEdge="LEFT"/>
+                <anchoritem dst="searchHeading" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+                <anchoritem dst="searchHeading" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
+                <anchoritem dst="searchHeading" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
             </layout>
         </widget>
     </section>
     <metadata activeUIState="landscape_ui" display="NHD-3.2-inch_landscape" unit="un">
         <uistate name="Common ui state" sections="#common"/>
         <uistate name="landscape_ui" sections="#common landscape"/>
-        <uistate name="portrait_ui" sections="#common"/>
+        <uistate name="portrait_ui" sections="#common portrait"/>
         <uistate name="landscape" sections="#common landscape"/>
         <dummydata objectName="deviceList" section="#common" value="0"/>
     </metadata>