diff --git a/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox b/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox
index fd9f6e53b..c7047832a 100644
--- a/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox
+++ b/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox
@@ -3,6 +3,7 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:var="http://www.skyrix.com/od/binding"
     xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:label="OGo:label"
     >
     <div class="menu" id="searchMenu">
       <ul id="searchOptions">
@@ -13,16 +14,13 @@
     </div>
 
     <div id="filterPanel">
-      <var:if condition="hideFrame" const:negate="YES"
-        ><span class="searchBox" style="float: right">
-          <input id="searchCriteria" name="criteria" type="hidden" var:value="searchCriteria" />
-          <input id="searchValue" onmousedown="onSearchMouseDown(event);" onclick="popupSearchMenu(event, 'searchMenu');" autocomplete="off" name="search" type="text" var:value="searchText" onchange="onSearchChange();" onblur="onSearchBlur();" onfocus="onSearchFocus(event);" />
-        </span>
+      <span class="searchBox" style="float: right">
+        <input id="searchCriteria" name="criteria" type="hidden" var:value="searchCriteria" />
+        <input id="searchValue" autocomplete="off" name="search" type="text" var:value="searchText" onmousedown="onSearchMouseDown(event, this);" onclick="popupSearchMenu(event, 'searchMenu');" onblur="onSearchBlur(this);" onfocus="onSearchFocus(this);" onkeydown="onSearchKeyDown(this);" />
+      </span>
 
-        <script type="text/javascript">
-          initCriteria();
-          document.searchform.search.focus();
-        </script>
-      </var:if>
+      <script type="text/javascript">
+        initCriteria();
+      </script>
     </div>
   </container>
diff --git a/UI/Templates/ContactsUI/UIxContactsListView.wox b/UI/Templates/ContactsUI/UIxContactsListView.wox
index 2c21bd28e..3c503b2d3 100644
--- a/UI/Templates/ContactsUI/UIxContactsListView.wox
+++ b/UI/Templates/ContactsUI/UIxContactsListView.wox
@@ -19,15 +19,7 @@
           <td class="tbtv_headercell">
             <var:component className="UIxSortableTableHeader"
               label:label="Lastname"
-              const:sortKey="sn"
-              const:href="view"
-              var:queryDictionary="context.request.formValues"
-              />
-          </td>
-          <td class="tbtv_headercell">
-            <var:component className="UIxSortableTableHeader"
-              label:label="Firstname"
-              const:sortKey="givenname"
+              const:sortKey="cn"
               const:href="view"
               var:queryDictionary="context.request.formValues"
               />
@@ -48,17 +40,16 @@
           </td>
         </tr>
 
-        <var:foreach list="contactInfos" item="contact">
+        <var:foreach list="contactInfos" item="currentContact">
           <tr class="tableview"
-            var:id="contact.c_name"
+            var:id="currentContact.c_name"
             onclick="return onRowClick(event);"
             ondblclick="return onContactRowDblClick(event, this);"
             oncontextmenu="return onContactContextMenu(event, this);">
-            <td onmousedown="return false;"><var:string value="contact.sn" /></td>
-            <td onmousedown="return false;"><var:string value="contact.givenname"       /></td>
-            <td onmousedown="return false;"><var:string value="contact.mail"            /></td>
-            <td onmousedown="return false;"><var:string value="contact.telephonenumber" /></td>
-            <td onmousedown="return false;"><var:string value="contact.l"               /></td>
+            <td onmousedown="return false;"><img rsrc:src="abcard.gif" /><var:string value="currentContact.cn" /></td>
+            <td onmousedown="return false;"><var:string value="currentContact.mail"            /></td>
+            <td onmousedown="return false;"><var:string value="currentContact.telephonenumber" /></td>
+            <td onmousedown="return false;"><var:string value="currentContact.l"               /></td>
           </tr>
         </var:foreach>
       </tbody>
diff --git a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
index c64925d67..1d8e02457 100644
--- a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
+++ b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
@@ -48,12 +48,34 @@
         </ul>
       </div>
 
-        <form name="searchform" var:href="view" var:_sort="sortKey"
-          method="GET">
+      <form name="searchform" var:href="view" var:_sort="sortKey"
+        onsubmit="return onSearchFormSubmit();" method="GET">
 	<var:if condition="isPopup" const:negate="YES">
           <var:if condition="hideFolderTree" const:negate="YES">
             <div class="contactFoldersList" id="contactFoldersList">
               <div class="titlediv"><var:string label:value="Addressbook" /></div>
+
+              <ul id="contactFolders" onselectionchange="onFolderSelectionChange();">
+                <var:foreach list="contactFolders" item="currentFolder">
+                  <var:if condition="isFolderCurrent"
+                    ><li var:id="currentContactFolderId"
+                      class="_selected"
+                      onmousedown="return false;"
+                      onclick="return onRowClick(event);"
+                      oncontextmenu="return onContactFolderContextMenu(event);"
+                      ><var:string value="currentContactFolderName" /></li
+                      ></var:if
+                    ><var:if condition="isFolderCurrent"
+                    const:negate="YES"
+                    ><li var:id="currentContactFolderId"
+                      onmousedown="return false;"
+                      onclick="return onRowClick(event);"
+                      oncontextmenu="return onContactFolderContextMenu(event);"
+                      ><var:string value="currentContactFolderName" /></li
+                      ></var:if>
+                </var:foreach>
+              </ul>
+
             </div>
 
             <div class="dragHandle" id="dragHandle"
@@ -83,6 +105,6 @@
     </var:if>
 
     <script type="text/javascript">
-      currentContactFolder = '<var:string value="contactFolderName" />';
+      currentContactFolder = '<var:string value="contactFolderId" />';
     </script>
   </var:component>