--- a/wlanutilities/testwizard/resources/mainview.docml	Fri Aug 06 18:38:57 2010 +0300
+++ b/wlanutilities/testwizard/resources/mainview.docml	Mon Aug 23 13:30:09 2010 +0300
@@ -1,25 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="0.9">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<hbdocument version="1.0">
     <widget name="view" type="HbView">
         <widget name="content" role="HbView:widget" type="HbWidget">
             <widget name="container" type="HbWidget">
                 <widget name="startWizard" type="HbPushButton">
+                    <string name="text" value="Start wizard"/>
                     <real name="z" value="1"/>
-                    <string name="text" value="Start wizard"/>
                 </widget>
                 <widget name="useConf" type="HbCheckBox">
+                    <string name="text" value="Use configurations"/>
                     <real name="z" value="2"/>
-                    <string name="text" value="Use configurations"/>
                 </widget>
                 <widget name="networkMode" type="HbComboBox">
+                    <contentsmargins bottom="0un" left="5un" right="0un" top="0un"/>
                     <container name="items" type="stringlist">
                         <string value="Ad-hoc"/>
                         <string value="Public"/>
                         <string value="Invalid"/>
                     </container>
-                    <contentsmargins bottom="0un" left="5un" right="0un" top="0un"/>
                 </widget>
                 <widget name="securityMode" type="HbComboBox">
+                    <contentsmargins bottom="0un" left="5un" right="0un" top="0un"/>
                     <container name="items" type="stringlist">
                         <string value="Open"/>
                         <string value="WEP"/>
@@ -29,11 +30,10 @@
                         <string value="WAPI"/>
                         <string value="Invalid"/>
                     </container>
-                    <contentsmargins bottom="0un" left="5un" right="0un" top="0un"/>
                 </widget>
                 <widget name="useWps" type="HbCheckBox">
+                    <string name="text" value="Wireless Protected Setup"/>
                     <contentsmargins bottom="0un" left="5un" right="0un" top="0un"/>
-                    <string name="text" value="Wireless Protected Setup"/>
                 </widget>
                 <widget name="label_1" type="HbLabel">
                     <string name="plainText" value="Wizard status:"/>
@@ -43,23 +43,19 @@
                     <string name="plainText" value="NA"/>
                 </widget>
                 <widget name="useWpaPsk" type="HbCheckBox">
+                    <string name="text" value="WPA PSK"/>
                     <contentsmargins bottom="0un" left="5un" right="0un" top="0un"/>
-                    <string name="text" value="WPA PSK"/>
                 </widget>
                 <widget name="label" type="HbLabel">
                     <contentsmargins bottom="0un" left="5un" right="0un" top="0un"/>
                     <string name="plainText" value="SSID"/>
                 </widget>
                 <widget name="ssid" type="HbLineEdit">
-                    <contentsmargins bottom="0un" left="5un" right="0un" top="0un"/>
-                    <string name="text" value=""/>
-                </widget>
-                <widget name="isHidden" type="HbCheckBox">
-                    <string name="text" value="Hidden"/>
+                    <string name="text"/>
                     <contentsmargins bottom="0un" left="5un" right="0un" top="0un"/>
                 </widget>
+                <sizehint height="86.41791un" type="PREFERRED" width="53.73134un"/>
                 <real name="z" value="0"/>
-                <sizehint height="86.41791un" type="PREFERRED" width="53.73134un"/>
                 <layout orientation="Vertical" type="linear">
                     <linearitem itemname="startWizard"/>
                     <linearitem itemname="useConf"/>
@@ -67,7 +63,6 @@
                     <linearitem itemname="ssid"/>
                     <linearitem itemname="networkMode"/>
                     <linearitem itemname="securityMode"/>
-                    <linearitem itemname="isHidden"/>
                     <linearitem itemname="useWpaPsk"/>
                     <linearitem itemname="useWps"/>
                     <stretchitem stretchfactor="1"/>