--- a/deviceupdatesui/deviceupdates/resources/serversview.docml	Wed Aug 18 09:39:31 2010 +0300
+++ b/deviceupdatesui/deviceupdates/resources/serversview.docml	Thu Sep 02 20:16:47 2010 +0300
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="0.9">
+<hbdocument version="1.1">
     <widget name="view" type="HbView">
         <widget name="content" role="HbView:widget" type="HbWidget">
             <widget name="label" type="HbLabel">
@@ -11,34 +11,29 @@
                 <widget name="groupBox" type="HbGroupBox">
                     <widget name="container_1" role="HbGroupBox:contentWidget" type="HbWidget">
                         <widget name="listView" type="HbListView">
-                            <widget name="listItemPrototype" role="HbListView:prototype" type="HbListViewItem">
+                            <widget name="listItemPrototype" role="HbAbstractView:prototype" type="HbListViewItem">
                                 <string name="state" value="normal"/>
                             </widget>
                             <real name="z" value="2"/>
                         </widget>
-                        <widget name="pushButton" type="HbPushButton">
-                            <string name="text" value="Push Button"/>
-                            <string name="state" value="normal"/>
-                        </widget>
                         <real name="z" value="3"/>
                         <layout orientation="Vertical" type="linear">
                             <linearitem itemname="listView"/>
-                            <linearitem itemname="pushButton"/>
                         </layout>
                     </widget>
-                    <string name="titleText" value="Group Box"/>
                     <bool name="collapsable" value="FALSE"/>
+                    <string name="heading" value="Group Box"/>
                 </widget>
                 <widget name="groupBox_1" type="HbGroupBox">
                     <widget name="listView_1" role="HbGroupBox:contentWidget" type="HbListView">
-                        <widget name="listItemPrototype_1" role="HbListView:prototype" type="HbListViewItem">
+                        <widget name="listItemPrototype_1" role="HbAbstractView:prototype" type="HbListViewItem">
                             <string name="state" value="normal"/>
                         </widget>
                         <real name="z" value="1"/>
                     </widget>
-                    <string name="titleText" value="Group Box"/>
                     <real name="z" value="1"/>
                     <bool name="collapsable" value="FALSE"/>
+                    <string name="heading" value="Group Box"/>
                 </widget>
                 <real name="z" value="2"/>
                 <sizehint height="81.9403un" type="PREFERRED" width="53.28358un"/>
@@ -58,6 +53,11 @@
         <string name="title" value="View"/>
     </widget>
     <section name="landscape">
+        <widget name="container_1" role="HbGroupBox:contentWidget" type="HbWidget">
+            <layout orientation="Vertical" type="linear">
+                <linearitem itemname="listView"/>
+            </layout>
+        </widget>
         <widget name="content" role="HbView:widget" type="HbWidget">
             <layout type="anchor">
                 <anchoritem dst="label" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
@@ -68,15 +68,15 @@
                 <anchoritem dst="container" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
             </layout>
         </widget>
+    </section>
+    <section name="portrait">
         <widget name="container_1" role="HbGroupBox:contentWidget" type="HbWidget">
             <layout orientation="Vertical" type="linear">
                 <linearitem itemname="listView"/>
-                <linearitem itemname="pushButton"/>
             </layout>
         </widget>
     </section>
-    <section name="portrait"/>
-    <metadata activeUIState="portrait" display="NHD portrait" unit="un">
+    <metadata activeUIState="portrait" display="NHD-3.2-inch_portrait" unit="un">
         <uistate name="Common ui state" sections="#common"/>
         <uistate name="landscape" sections="#common landscape"/>
         <uistate name="portrait" sections="#common portrait"/>