diff --git a/static/js/peersPanel.js b/static/js/peersPanel.js
index fca8844..115118b 100644
--- a/static/js/peersPanel.js
+++ b/static/js/peersPanel.js
@@ -1,79 +1,10 @@
 'use strict';
 
-oml.ui.usersDialog = function() {
+oml.ui.peersPanel = function() {
 
-    var preferences = oml.user.preferences,
-        ui = oml.user.ui,
+    var ui = oml.user.ui,
 
-        that = Ox.Dialog({
-            buttons: [
-                Ox.Button({
-                    id: 'preferences',
-                    title: Ox._('Peering Preferences...')
-                })
-                .bindEvent({
-                    click: function() {
-                        oml.UI.set({
-                            page: 'preferences',
-                            'part.preferences': 'peering'
-                        });
-                    }
-                }),
-                {},
-                Ox.Button({
-                    id: 'done',
-                    title: Ox._('Done')
-                })
-                .bindEvent({
-                    click: function() {
-                        that.close();
-                    }
-                })
-            ],
-            closeButton: true,
-            content: Ox.Element(),
-            fixedSize: true,
-            height: 384,
-            title: Ox._('Users'),
-            width: 768
-        })
-        .bindEvent({
-            open: function() {
-                oml.bindEvent({
-                    peering: peering,
-                });
-            },
-            close: function() {
-                oml.unbindEvent({
-                    peering: peering,
-                });
-                if (ui.page == 'users') {
-                    oml.UI.set({page: ''});
-                }
-            },
-            oml_page: function() {
-                // ...
-            }
-        }),
-
-        // FIXME: WRONG!
-        $users = Ox.Element().css({
-            background: 'rgb(240, 240, 240)',
-            overflowX: 'hidden'
-        }),
-
-        $user = Ox.Element(),
-
-        $panel = Ox.SplitPanel({
-            elements: [
-                {element: $users, size: 256},
-                {element: $user}
-            ],
-            orientation: 'horizontal'
-        }),
-
-        users,
-        peerIds = [],
+        preferences = oml.user.preferences,
 
         buttons = [
             {id: 'send', title: Ox._('Send')},
@@ -110,9 +41,15 @@ oml.ui.usersDialog = function() {
             }
         ],
 
-        $lists = [
-            renderSectionList({id: 'invitations'}).appendTo($users)
-        ],
+        peerIds = [],
+
+        users,
+
+        // FIXME: WRONG!
+        $users = Ox.Element().css({
+            background: 'rgb(240, 240, 240)',
+            overflowX: 'hidden'
+        }),
 
         $folders = folders.map(function(folder) {
             return Ox.CollapsePanel({
@@ -121,6 +58,29 @@ oml.ui.usersDialog = function() {
                 })
                 .css({width: '256px'})
                 .appendTo($users);
+        }),
+
+        $lists = [
+            renderSectionList({id: 'invitations'}).appendTo($users)
+        ],
+
+        $user = Ox.Element(),
+
+        that = Ox.SplitPanel({
+            elements: [
+                {element: $users, size: 256},
+                {element: $user}
+            ],
+            orientation: 'horizontal'
+        })
+        .bindEvent({
+            oml_page: function(data) {
+                if (data.value == 'peers') {
+                    oml.bindEvent({peering: peering});
+                } else if (data.previousValue == 'peers') {
+                    oml.unbindEvent({peering: peering});
+                }
+            }
         });
 
     var peering = Ox.throttle(function() {
@@ -466,7 +426,7 @@ oml.ui.usersDialog = function() {
 
         }
 
-        $panel.replaceElement(1, $user);
+        that.replaceElement(1, $user);
 
     }
 
@@ -610,7 +570,6 @@ oml.ui.usersDialog = function() {
                 })
             });
 
-            that.options({content: $panel});
             callback && callback();
 
         });
@@ -618,9 +577,6 @@ oml.ui.usersDialog = function() {
     }
 
     that.updateElement = function() {
-        that.options({
-            content: Ox.LoadingScreen().start()
-        });
         updateUsers();
         return that;
     };
diff --git a/static/js/preferencesPanel.js b/static/js/preferencesPanel.js
index 0937e50..0b49002 100644
--- a/static/js/preferencesPanel.js
+++ b/static/js/preferencesPanel.js
@@ -1,9 +1,10 @@
 'use strict';
 
-oml.ui.preferencesDialog = function() {
+oml.ui.preferencesPanel = function() {
 
-    var preferences = oml.user.preferences,
-        ui = oml.user.ui,
+    var ui = oml.user.ui,
+
+        preferences = oml.user.preferences,
 
         items = {
             account: [
@@ -237,81 +238,14 @@ oml.ui.preferencesDialog = function() {
             })
             .appendTo($helpElement),
 
-        $panel = Ox.SplitPanel({
+        that = Ox.SplitPanel({
             elements: [
                 {element: $list, size: 128},
                 {element: $main}
             ],
             orientation: 'horizontal'
-        }),
-    
-        $usersButton = Ox.Button({
-                id: 'users',
-                style: 'squared',
-                title: Ox._('Users...')
-            })
-            .bindEvent({
-                click: function() {
-                    oml.UI.set({page: 'users'});
-                }
-            }),
-
-        $notificationsButton = Ox.Button({
-                id: 'notifications',
-                style: 'squared',
-                title: Ox._('Notifications...')
-            })
-            .bindEvent({
-                click: function() {
-                    oml.UI.set({page: 'notifications'});
-                }
-            }),
-
-        $transfersButton = Ox.Button({
-                id: 'transfers',
-                title: Ox._('Transfers...')
-            })
-            .bindEvent({
-                click: function() {
-                    oml.UI.set({page: 'transfers'});
-                }
-            }),
-
-        that = Ox.Dialog({
-            buttons: [
-                $usersButton,
-                $notificationsButton,
-                $transfersButton,
-                {},
-                Ox.Button({
-                    id: 'done',
-                    style: 'squared',
-                    title: Ox._('Done')
-                })
-                .bindEvent({
-                    click: function() {
-                        that.close();
-                    }
-                })
-            ],
-            closeButton: true,
-            content: $panel,
-            fixedSize: true,
-            height: 384,
-            keys: {escape: 'close'},
-            removeOnClose: true,
-            title: Ox._('Preferences'),
-            width: 768
         })
         .bindEvent({
-            open: function() {
-                $list.gainFocus();
-            },
-            close: function() {
-                if (ui.page == 'preferences') {
-                    oml.UI.set({page: ''});
-                }
-            },
             'oml_part.preferences': function() {
                 if (ui.page == 'preferences') {
                     that.updateElement();
@@ -319,6 +253,7 @@ oml.ui.preferencesDialog = function() {
             }
         });
 
+
     function displayHelp(item) {
         $helpLabel.options({title: item.title});
         $help.html(Ox._(item.help));
@@ -467,10 +402,6 @@ oml.ui.preferencesDialog = function() {
         $formElement.append($form);
         $helpElement.hide();
 
-        $usersButton[part == 'peering' ? 'show' : 'hide']();
-        $notificationsButton[part == 'peering' ? 'show' : 'hide']();
-        $transfersButton[part == 'network' ? 'show' : 'hide']();
-
         return that;
 
     };
diff --git a/static/js/transfersPanel.js b/static/js/transfersPanel.js
index 5fe6789..eae6c25 100644
--- a/static/js/transfersPanel.js
+++ b/static/js/transfersPanel.js
@@ -1,6 +1,6 @@
 'use strict';
 
-oml.ui.transfersDialog = function() {
+oml.ui.transfersPanel = function() {
 
     var ui = oml.user.ui,
 
@@ -45,16 +45,6 @@ oml.ui.transfersDialog = function() {
             unique: 'id'
         }),
 
-        $statusbar = Ox.Bar({size: 16}),
-
-        $panel = Ox.SplitPanel({
-            elements: [
-                {element: $list},
-                {element: $statusbar, size: 16}
-            ],
-            orientation: 'vertical'
-        }),
-
         $item = Ox.Element(),
 
         $cancelButton = Ox.Button({
@@ -76,54 +66,21 @@ oml.ui.transfersDialog = function() {
             })
             .appendTo($item),
 
-        $content = Ox.SplitPanel({
+        that = Ox.SplitPanel({
             elements: [
-                {element: $panel},
+                {element: $list},
                 {element: $item, size: 160}
             ],
             orientation: 'horizontal'
-        }),
-
-        that = Ox.Dialog({
-                buttons: [
-                    Ox.Button({
-                        id: 'preferences',
-                        title: Ox._('Network Preferences...')
-                    })
-                    .bindEvent({
-                        click: function() {
-                            oml.UI.set({page: 'transfers'});
-                        }
-                    }),
-                    {},
-                    Ox.Button({
-                        id: 'done',
-                        title: Ox._('Done')
-                    })
-                    .bindEvent({
-                        click: function() {
-                            that.close();
-                        }
-                    })
-                ],
-                closeButton: true,
-                content: $content,
-                height: 384,
-                title: Ox._('Transfers'),
-                width: 768
-            })
-            .bindEvent({
-                close: function() {
-                    if (ui.page == 'transfers') {
-                        oml.UI.set({page: ''});
-                    }
-                }
-            });
+        });
 
     oml.bindEvent({
         transfer: Ox.throttle(function(data) {
             var current = $list.value(data.id);
-            if (!Ox.isEmpty(current)  && current.transferprogress != data.progress) {
+            if (
+                !Ox.isEmpty(current) 
+                && current.transferprogress != data.progress
+            ) {
                 $list.value(data.id, 'transferprogress', data.progress);
             }
         }, 1000)
diff --git a/static/json/js.json b/static/json/js.json
index 0c15822..c55b3c8 100644
--- a/static/json/js.json
+++ b/static/json/js.json
@@ -49,7 +49,8 @@
     "namesDialog.js",
     "notificationsButton.js",
     "openButton.js",
-    "preferencesDialog.js",
+    "peersPanel.js",
+    "preferencesPanel.js",
     "previewButton.js",
     "previewDialog.js",
     "resetUIDialog.js",
@@ -61,11 +62,11 @@
     "statusbar.js",
     "titlesDialog.js",
     "toolbar.js",
-    "transfersDialog.js",
+    "transfersPanel.js",
     "updateButton.js",
     "updateDialog.js",
     "userButton.js",
-    "usersDialog.js",
+    "userDialog.js",
     "utils.js",
     "viewPanel.js",
     "viewer.js",