diff --git a/UI/Templates/ContactsUI/UIxContactsListView.wox b/UI/Templates/ContactsUI/UIxContactsListView.wox
index 6d924245b..8b99407fa 100644
--- a/UI/Templates/ContactsUI/UIxContactsListView.wox
+++ b/UI/Templates/ContactsUI/UIxContactsListView.wox
@@ -9,8 +9,7 @@
     className="UIxContactsListViewContainer"
     title="name"
     >
-    <!-- the content -->
-    <table border="0" width="100%" id="contactsList" multiselect="yes">
+    <table id="contactsList" multiselect="yes">
       <tbody>
         <tr class="tableview">
           <!-- localize -->
diff --git a/UI/Templates/ContactsUI/UIxContactsSelectionView.wox b/UI/Templates/ContactsUI/UIxContactsSelectionView.wox
index af7d1011c..1efd7e948 100644
--- a/UI/Templates/ContactsUI/UIxContactsSelectionView.wox
+++ b/UI/Templates/ContactsUI/UIxContactsSelectionView.wox
@@ -9,10 +9,6 @@
     className="UIxContactsSelectionViewContainer"
     title="name"
     >
-
-    <var:component className="UIxContactsFilterPanel" qualifier="qualifier" />
-
-    <!-- the content -->
     <table id="contactsList" multiselect="yes">
       <tbody>
         <tr class="tableview">
@@ -46,7 +42,7 @@
             var:id="currentContact.c_name"
             var:contactname="currentContact.cn"
             var:contactid="currentContact.c_uid"
-            onclick="return onRowClick(event);"
+            onclick="return onContactRowClick(event, this);"
             ondblclick="return onContactRowDblClick(event, this);"
             oncontextmenu="return onContactContextMenu(event, this);">
             <td onmousedown="return false;"><img rsrc:src="abcard.gif" /><var:string value="currentContact.cn" /></td>
diff --git a/UI/Templates/ContactsUI/UIxContactsSelectionViewContainer.wox b/UI/Templates/ContactsUI/UIxContactsSelectionViewContainer.wox
index 2702b2f97..d5661569b 100644
--- a/UI/Templates/ContactsUI/UIxContactsSelectionViewContainer.wox
+++ b/UI/Templates/ContactsUI/UIxContactsSelectionViewContainer.wox
@@ -52,7 +52,7 @@
       onsubmit="return onSearchFormSubmit();" method="GET">
       <div class="contactSelector">
         <div class="contactFoldersList" id="contactFoldersList">
-          <div class="titlediv"><var:string label:value="Addressbook" /></div>
+          <div class="titlediv"><var:string label:value="Address Books" /></div>
           
           <ul id="contactFolders" onselectionchange="onFolderSelectionChange();">
             <var:foreach list="contactFolders" item="currentFolder">
@@ -82,23 +82,27 @@
           onmousemove=""
           ondblclick="dragHandleDoubleClick(event);"
           leftblock="contactFoldersList"
-          rightblock="contactsListContent">
+          rightblock="rightPanel">
         </div>
 
-        <div id="contactsListContent">
-          <var:component-content />
-        </div>
+        <div id="rightPanel">
+          <var:component className="UIxContactsFilterPanel" qualifier="qualifier" />
 
-        <div id="rightDragHandle"
-          class="dragHandle"
-          onmousedown="startHandleDragging(event);"
-          onmousemove=""
-          upperblock="contactsListContent"
-          lowerblock="contactView">
-        </div>
+          <div id="contactsListContent">
+            <var:component-content />
+          </div>
 
-        <div id="contactView" onmousedown="return false;"
-          ></div>
+          <div id="rightDragHandle"
+            class="dragHandle"
+            onmousedown="startHandleDragging(event);"
+            onmousemove=""
+            upperblock="contactsListContent"
+            lowerblock="contactView">
+          </div>
+
+          <div id="contactView" onmousedown="return false;"
+            ></div>
+        </div>
       </div>
 
       <div class="contactSelection">
diff --git a/UI/WebServerResources/ContactsUI.css b/UI/WebServerResources/ContactsUI.css
index 7b29a2636..efe5721e2 100644
--- a/UI/WebServerResources/ContactsUI.css
+++ b/UI/WebServerResources/ContactsUI.css
@@ -137,7 +137,7 @@ table.titletable td.titlecell SELECT
 DIV.contactFoldersList
 {
   position: absolute;
-  top: 5.5em;
+  top: 6em;
   left: 0px;
   width: 14.7em;
   bottom: 0px;
@@ -159,6 +159,8 @@ DIV.contactFoldersList UL
   top: 2em;
   left: 0px;
   right: 0px;
+  margin: 0px;
+  padding: 0px;
   bottom: 0px;
   overflow: auto;
   padding-left: 0px;
@@ -275,15 +277,6 @@ TABLE#contactsList TR._deleted TD
   text-decoration: line-through;
 }
 
-DIV#rightDragHandle
-{
-  cursor: n-resize;
-  top: 17.7em;
-  left: 0px;
-  right: 0px;
-  height: 5px;
-}
-
 DIV#contactView
 { 
   position: absolute;
@@ -336,42 +329,45 @@ INPUT#searchValue:focus
 DIV#dragHandle
 { 
   cursor: e-resize;
-  top: 7.5em;
+  top: 6em;
   left: 14.6em;
   width: .4em;
   bottom: 0px;
 }
 
-DIV#mailboxDragHandle
-{ 
+DIV#rightDragHandle
+{
   cursor: n-resize;
-  top: 50%;
+  top: 17.7em;
   left: 0px;
   right: 0px;
-  height: .4em;
-}
-
-DIV#calendarView
-{ 
-  position: absolute;
-  background: #fff;
-  top: 18em;
-  bottom: 0px;
-  width: 100%;
-  overflow: hidden;
-  border-top: 1px solid #aaa;
-  border-left: 1px solid #aaa;
+  height: 5px;
 }
 
 DIV.contactSelector
 {
   position: absolute;
   top: 0px;
-  bottom: 3em;
+  bottom: 0px;
   right: 0px;
   left: 0px;
 }
 
+DIV.contactSelector DIV#rightPanel
+{ top: 4em; }
+
+DIV.contactSelector DIV#contactsListContent
+{ height: 8em; }
+
+DIV.contactSelector DIV.contactFoldersList
+{ top: 4em; }
+
+DIV.contactSelector DIV#rightDragHandle
+{ top: 10em; }
+
+DIV.contactSelector DIV#contactView
+{ top: 10.5em; }
+
 DIV.contactSelection
 {
   position: absolute;