diff -r e70b37c1a9d5 -r 3ae60d69bf22 userguide/resources/xml/keywordView.docml
--- a/userguide/resources/xml/keywordView.docml	Fri Jun 11 16:23:42 2010 +0100
+++ b/userguide/resources/xml/keywordView.docml	Thu Jul 22 16:30:58 2010 +0100
@@ -1,126 +1,99 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.0">
-  
+<hbdocument version="1.1">
   <widget name="view_help" type="HbView">
     <widget name="content" role="HbView:widget" type="HbWidget">
-      <widget name="no_match_label" type="HbLabel">
-        <rect height="83.33582un" name="geometry" width="51.04478un" x="1.34328un" y="1.34328un"/>
-        <string locid="txt_user_guide_list_no_match_found" name="plainText" value="Label"/>
-        <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
-        <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
-      </widget>
-      <widget name="groupBox" type="HbGroupBox">
-        <bool name="collapsable" value="FALSE"/>
-        <string locid="txt_user_guide_setlabel_search" name="heading" value="Group Box"/>
-      </widget>
       <widget name="list_search" type="HbListView">
         <widget name="listItemPrototype" role="HbAbstractView:prototype" type="HbListViewItem"/>
+        <sizehint height="85.52239un" type="PREFERRED" width="45.8209un"/>
+        <rect height="63.20149un" name="geometry" width="51.04478un" x="1.64179un" y="11.79105un"/>
+        <bool name="visible" value="FALSE"/>
       </widget>
-      <widget name="search_panel" type="HbSearchPanel"/>
+      <widget name="search_panel" type="HbSearchPanel">
+        <rect height="9.3806un" name="geometry" width="51.04478un" x="1.79104un" y="75.22388un"/>
+        <bool name="visible" value="FALSE"/>
+      </widget>
+      <widget name="no_match_label" type="HbLabel">
+        <real name="z" value="1"/>
+        <string locid="txt_user_guide_list_no_match_found" name="plainText" value="Label"/>
+        <enums name="alignment" value="AlignTop|AlignHCenter"/>
+        <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+        <bool name="visible" value="FALSE"/>
+      </widget>
     </widget>
     <string locid="txt_user_guide_title_user_guide" name="title" value="View"/>
   </widget>
-  
   <section name="layout_find">
-    <widget name="view_help" type="HbView">
-      <widget name="content" role="HbView:widget" type="HbWidget">
-        <widget name="groupBox" type="HbGroupBox">
-          <bool name="visible" value="TRUE"/>
-        </widget>
-        <widget name="no_match_label" type="HbLabel">
-          <bool name="visible" value="FALSE"/>
-        </widget>
-        <widget name="list_search" type="HbListView">
-          <bool name="visible" value="TRUE"/>
-        </widget>
-        <widget name="search_panel" type="HbSearchPanel">
-          <bool name="visible" value="TRUE"/>
-        </widget>
-        <real name="z" value="0"/>
-        <layout orientation="Vertical" type="linear">
-          <contentsmargins bottom="0px" left="0px" right="0px" top="0px"/>
-          <linearitem itemname="groupBox"/>
-          <linearitem itemname="list_search"/>
-          <linearitem itemname="search_panel"/>
-        </layout>
-      </widget>
+    <widget name="list_search" type="HbListView">
+      <bool name="visible" value="TRUE"/>
+    </widget>
+    <widget name="content" role="HbView:widget" type="HbWidget">
+      <layout orientation="Vertical" type="linear">
+        <linearitem itemname="list_search"/>
+        <linearitem itemname="search_panel"/>
+      </layout>
+    </widget>
+    <widget name="search_panel" type="HbSearchPanel">
+      <bool name="visible" value="TRUE"/>
+    </widget>
+    <widget name="no_match_label" type="HbLabel">
+      <bool name="visible" value="FALSE"/>
     </widget>
   </section>
-
   <section name="layout_find_no_searchpanel">
-    <widget name="view_help" type="HbView">
-      <widget name="content" role="HbView:widget" type="HbWidget">
-        <widget name="groupBox" type="HbGroupBox">
-          <bool name="visible" value="TRUE"/>
-        </widget>
-        <widget name="no_match_label" type="HbLabel">
-          <bool name="visible" value="FALSE"/>
-        </widget>
-        <widget name="list_search" type="HbListView">
-          <bool name="visible" value="TRUE"/>
-        </widget>
-        <widget name="search_panel" type="HbSearchPanel">
-          <bool name="visible" value="FALSE"/>
-        </widget>
-        <real name="z" value="0"/>
-        <layout orientation="Vertical" type="linear">
-          <contentsmargins bottom="0px" left="0px" right="0px" top="0px"/>
-          <linearitem itemname="groupBox"/>
-          <linearitem itemname="list_search"/>
-        </layout>
-      </widget>
+    <widget name="list_search" type="HbListView">
+      <bool name="visible" value="TRUE"/>
+    </widget>
+    <widget name="content" role="HbView:widget" type="HbWidget">
+      <layout orientation="Vertical" type="linear">
+        <linearitem itemname="list_search"/>
+      </layout>
+    </widget>
+    <widget name="search_panel" type="HbSearchPanel">
+      <bool name="visible" value="FALSE"/>
+    </widget>
+    <widget name="no_match_label" type="HbLabel">
+      <bool name="visible" value="FALSE"/>
     </widget>
   </section>
-
   <section name="layout_find_no_match">
-    <widget name="view_help" type="HbView">
-      <widget name="content" role="HbView:widget" type="HbWidget">
-        <widget name="groupBox" type="HbGroupBox">
-          <bool name="visible" value="TRUE"/>
-        </widget>
-        <widget name="no_match_label" type="HbLabel">
-          <bool name="visible" value="TRUE"/>
-        </widget>
-        <widget name="list_search" type="HbListView">
-          <bool name="visible" value="FALSE"/>
-        </widget>
-        <widget name="search_panel" type="HbSearchPanel">
-          <bool name="visible" value="TRUE"/>
-        </widget>
-        <real name="z" value="0"/>
-        <layout orientation="Vertical" type="linear">
-          <contentsmargins bottom="0px" left="0px" right="0px" top="0px"/>
-          <linearitem itemname="groupBox"/>
-          <linearitem itemname="no_match_label"/>
-          <linearitem itemname="search_panel"/>
-        </layout>
-      </widget>
+    <widget name="list_search" type="HbListView">
+      <bool name="visible" value="FALSE"/>
+    </widget>
+    <widget name="content" role="HbView:widget" type="HbWidget">
+      <layout orientation="Vertical" type="linear">
+        <linearitem itemname="no_match_label"/>
+        <linearitem itemname="search_panel"/>
+      </layout>
+    </widget>
+    <widget name="search_panel" type="HbSearchPanel">
+      <bool name="visible" value="TRUE"/>
+    </widget>
+    <widget name="no_match_label" type="HbLabel">
+      <bool name="visible" value="TRUE"/>
     </widget>
   </section>
-
   <section name="layout_find_no_searchpanel_no_match">
-    <widget name="view_help" type="HbView">
-      <widget name="content" role="HbView:widget" type="HbWidget">
-        <widget name="groupBox" type="HbGroupBox">
-          <bool name="visible" value="TRUE"/>
-        </widget>
-        <widget name="no_match_label" type="HbLabel">
-          <bool name="visible" value="TRUE"/>
-        </widget>
-        <widget name="list_search" type="HbListView">
-          <bool name="visible" value="FALSE"/>
-        </widget>
-        <widget name="search_panel" type="HbSearchPanel">
-          <bool name="visible" value="FALSE"/>
-        </widget>
-        <real name="z" value="0"/>
-        <layout orientation="Vertical" type="linear">
-          <contentsmargins bottom="0px" left="0px" right="0px" top="0px"/>
-          <linearitem itemname="groupBox"/>
-          <linearitem itemname="no_match_label"/>
-         </layout>
-      </widget>
+    <widget name="list_search" type="HbListView">
+      <bool name="visible" value="FALSE"/>
+    </widget>
+    <widget name="content" role="HbView:widget" type="HbWidget">
+      <layout orientation="Vertical" type="linear">
+        <linearitem itemname="no_match_label"/>
+      </layout>
+    </widget>
+    <widget name="search_panel" type="HbSearchPanel">
+      <bool name="visible" value="FALSE"/>
+    </widget>
+    <widget name="no_match_label" type="HbLabel">
+      <bool name="visible" value="TRUE"/>
     </widget>
   </section>
-  
+  <metadata activeUIState="search_no_match_no_panel" display="NHD-3.2-inch_portrait" unit="un">
+    <uistate name="Common ui state" sections="#common"/>
+    <uistate name="search" sections="#common layout_find"/>
+    <uistate name="search_no_panel" sections="#common layout_find_no_searchpanel"/>
+    <uistate name="search_no_match" sections="#common layout_find_no_match"/>
+    <uistate name="search_no_match_no_panel" sections="#common layout_find_no_searchpanel_no_match"/>
+    <dummydata objectName="list_search" section="#common" value="app_list_template5"/>
+  </metadata>
 </hbdocument>