diff --git a/module/my/css/managecontacts.ui.css b/module/my/css/managecontacts.ui.css
index 0b6455e1bf..61e143f619 100644
--- a/module/my/css/managecontacts.ui.css
+++ b/module/my/css/managecontacts.ui.css
@@ -1,9 +1,6 @@
-#mainContent .tab-pane li {height: 2rem; line-height: 2rem; cursor: pointer;}
-#mainContent .tab-pane li.active {background-color: var(--color-gray-100);}
-#mainContent .tab-pane li {color: rgba(var(--color-black-rgb),var(--tw-text-opacity));}
-#mainContent .tab-pane li.active {font-weight: 600; color: rgba(var(--color-primary-500-rgb),var(--tw-text-opacity));}
-#mainContent .tab-pane li:hover {color: rgba(var(--color-primary-500-rgb),var(--tw-text-opacity));}
-#manageContacts .tabs > .nav-tabs {margin-top: 1rem;}
+#contactTab .listitem {color: inherit}
+#contactTab .listitem.selected {color: var(--color-primary-500); font-weight: bold;}
+
 #contactPanel .form-row .form-group {padding-left: 70px;}
 #contactPanel .form-row .form-group .form-label {padding-left: 0; justify-content: start; width: 80px;}
 #contactPanel .form-actions {margin-top: 0;}
diff --git a/module/my/js/managecontacts.ui.js b/module/my/js/managecontacts.ui.js
deleted file mode 100644
index b33dfa63d9..0000000000
--- a/module/my/js/managecontacts.ui.js
+++ /dev/null
@@ -1,15 +0,0 @@
-function createContact()
-{
-    $('#contactTab').find('.contact').removeClass('active');
-    const url    = $.createLink('my', 'manageContacts');
-    loadPage(url, '#contactPanel');
-}
-
-function getContact(event)
-{
-    $('#contactTab').find('.contact').removeClass('active');
-    const $li    = $(event.target).addClass('active');
-    const listID = $li.data('id');
-    const url    = $.createLink('my', 'manageContacts', 'listID=' + listID);
-    loadPage(url, '#contactPanel');
-}
diff --git a/module/my/ui/managecontacts.html.php b/module/my/ui/managecontacts.html.php
index cf35257ec9..84b7c22b65 100644
--- a/module/my/ui/managecontacts.html.php
+++ b/module/my/ui/managecontacts.html.php
@@ -12,27 +12,20 @@ namespace zin;
 
 $listID = isset($list->id) ? $list->id : 0;
 
-$myContactList     = array();
-$publicContactList = array();
+$myContactList      = array();
+$publicContactList  = array();
+$isActivePublicList = false;
 foreach($lists as $contactList)
 {
+    $selected = $listID == $contactList->id;
     if($contactList->account == $app->user->account)
     {
-        $myContactList[] = li
-        (
-            setClass('contact ellipsis pl-2 ' . ($listID == $contactList->id ? 'active' : '')),
-            set('data-id', $contactList->id),
-            $contactList->listName
-        );
+        $myContactList[] = array('text' => $contactList->listName, 'url' => createLink('my', 'manageContacts', "listID=$contactList->id"), 'selected' => $selected);
     }
     else if($contactList->public)
     {
-        $publicContactList[] = li
-        (
-            setClass('contact ellipsis pl-2'),
-            set('data-id', $contactList->id),
-            $contactList->listName
-        );
+        $publicContactList[] = array('text' => $contactList->listName, 'url' => createLink('my', 'manageContacts', "listID=$contactList->id"), 'selected' => $selected);
+        if($selected) $isActivePublicList = true;
     }
 }
 
@@ -42,63 +35,49 @@ if(!empty($list->userList))
     foreach(explode(',', $list->userList) as $account) $userList[] = zget($users, $account);
 }
 
-panel
+div
 (
-    set::shadow(false),
-    setClass('panel-form px-4 mx-auto size-lg'),
-    on::click('#createContact', 'createContact'),
-    on::click('.contact', 'getContact'),
+    setClass('canvas shadow ring rounded mx-auto'),
+    style::maxWidth(1200),
     div
     (
         setID('manageContacts'),
-        setClass('w-full flex'),
+        setClass('row'),
         cell
         (
-            set::width('180px'),
-            setClass('border-r overflow-hidden'),
-            div
+            setClass('col flex-none p-4 gap-3 w-48 items-stretch'),
+            div(setClass('text-gray'), $lang->my->contactList),
+            btn
             (
-                setClass('border-b py-3 pr-4'),
-                div(span(setClass('text-gray'), $lang->my->contactList)),
-                div
-                (
-                    setClass('pt-3'),
-                    a
-                    (
-                        setID('createContact'),
-                        setClass('btn primary-pale bd-primary w-full'),
-                        icon('plus'),
-                        $lang->my->createContacts
-                    )
-                )
+                set::type('primary-pale'),
+                set::icon('plus'),
+                set::url('my', 'manageContacts'),
+                setData('load', '#contactPanel'),
+                setClass('w-full'),
+                $lang->my->createContacts
             ),
             tabs
             (
                 setID('contactTab'),
-                setClass('pr-4'),
                 tabPane
                 (
-                    set::key('my'),
                     set::title($lang->my->myContact),
-                    set::active(true),
-                    ul
-                    (
-                        setClass('pl-0'),
-                        $myContactList
-                    )
+                    set::active(!$isActivePublicList),
+                    simpleList(set::items($myContactList)),
                 ),
                 tabPane
                 (
-                    set::key('public'),
                     set::title($lang->my->publicContact),
-                    ul($publicContactList)
+                    set::active($isActivePublicList),
+                    simpleList(set::items($publicContactList)),
                 )
             )
         ),
+        divider(),
         cell
         (
             setID('contactPanel'),
-            setClass('flex-1 px-8'),
+            setClass('flex-1 px-8 pb-8'),
             div
             (
                 set('class', 'panel-title text-lg flex w-full py-6'),
@@ -120,6 +99,7 @@ panel
             ($mode == 'create' || $mode == 'edit') ? form
             (
                 set::actions(array()),
+                $listID ? null : on::init()->removeClass('#contactTab .selected', 'selected'),
                 formRow
                 (
                     formGroup
@@ -196,5 +176,3 @@ panel
         )
     )
 );
-
-render();