diff --git a/schema/widget.json b/schema/widget.json
index 9928cb2..cd89b86 100644
--- a/schema/widget.json
+++ b/schema/widget.json
@@ -12,8 +12,7 @@
         "name": "drive",
         "command": "drives:open-drives-dialog",
         "rank": 35
-      },
-      { "name": "fileNameSearcher", "rank": 40 }
+      }
     ]
   },
   "title": "'@jupyter/drives",
diff --git a/src/index.ts b/src/index.ts
index 681f1db..b3b9309 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -5,31 +5,26 @@ import {
 } from '@jupyterlab/application';
 
 import { ITranslator } from '@jupyterlab/translation';
-import { addJupyterLabThemeChangeListener } from '@jupyter/web-components';
-import { Dialog, showDialog } from '@jupyterlab/apputils';
-import { DriveListModel, DriveListView } from './drivelistmanager';
 import { DriveIcon } from './icons';
 import { IDocumentManager } from '@jupyterlab/docmanager';
 import { Drive } from './contents';
-import { MultiDrivesFileBrowser } from './multidrivesbrowser';
-import { BreadCrumbs, FilterFileBrowserModel } from '@jupyterlab/filebrowser';
+import {
+  FileBrowser,
+  FilterFileBrowserModel,
+  IFileBrowserFactory
+} from '@jupyterlab/filebrowser';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import {
   createToolbarFactory,
   IToolbarWidgetRegistry,
   setToolbar
 } from '@jupyterlab/apputils';
-import { DriveBrowser } from './drivebrowser';
+
+import { SidePanel } from '@jupyterlab/ui-components';
 
 const FILE_BROWSER_FACTORY = 'FileBrowser';
 const FILE_BROWSER_PLUGIN_ID = '@jupyter/drives:widget';
 
-namespace CommandIDs {
-  export const openDrivesDialog = 'drives:open-drives-dialog';
-  export const openPath = 'filebrowser:open-path';
-}
-
-
 /**
  * Initialization data for the @jupyter/drives extension.
  */
@@ -61,164 +56,65 @@ export async function activateAddDrivesPlugin(
   toolbarRegistry: IToolbarWidgetRegistry,
   translator: ITranslator,
   restorer: ILayoutRestorer | null,
-  settingRegistry: ISettingRegistry
+  settingRegistry: ISettingRegistry,
+  factory: IFileBrowserFactory
 ) {
   console.log('AddDrives plugin is activated!');
-  const { commands } = app;
+  //const { commands } = app;
   const cocoDrive = new Drive(app.docRegistry);
   cocoDrive.name = 'coconutDrive';
   cocoDrive.baseUrl = '/coconut/url';
   cocoDrive.region = '';
   cocoDrive.status = 'active';
   cocoDrive.provider = '';
-  const peachDrive = new Drive(app.docRegistry);
-  peachDrive.baseUrl = '/peach/url';
-  peachDrive.name = 'peachDrive';
-  const mangoDrive = new Drive(app.docRegistry);
-  mangoDrive.baseUrl = '/mango/url';
-  mangoDrive.name = 'mangoDrive';
-  const kiwiDrive = new Drive(app.docRegistry);
-  kiwiDrive.baseUrl = '/kiwi/url';
-  kiwiDrive.name = 'kiwiDrive';
-  const pearDrive = new Drive(app.docRegistry);
-  pearDrive.baseUrl = '/pear/url';
-  pearDrive.name = 'pearDrive';
-  const customDrive = new Drive(app.docRegistry);
-  customDrive.baseUrl = '/customDrive/url';
-  const tomatoDrive = new Drive(app.docRegistry);
-  tomatoDrive.baseUrl = '/tomato/url';
-  tomatoDrive.name = 'tomatoDrive';
-  const avocadoDrive = new Drive(app.docRegistry);
-  avocadoDrive.baseUrl = '/avocado/url';
-  avocadoDrive.name = 'avocadoDrive';
-
-  const selectedList1: Drive[] = [];
-  const availableList1: Drive[] = [
-    avocadoDrive,
-    cocoDrive,
-    customDrive,
-    kiwiDrive,
-    mangoDrive,
-    peachDrive,
-    pearDrive,
-    tomatoDrive
-  ];
-
-  function createFilterFileBrowserModel(
-    manager: IDocumentManager,
-    drive?: Drive
-  ): FilterFileBrowserModel {
+  manager.services.contents.addDrive(cocoDrive);
+  const bananaDrive = new Drive(app.docRegistry);
+  bananaDrive.name = 'bananaDrive';
+  bananaDrive.baseUrl = '/banana/url';
+  bananaDrive.region = '';
+  bananaDrive.status = 'active';
+  bananaDrive.provider = '';
+  manager.services.contents.addDrive(bananaDrive);
+
+  const DriveList: Drive[] = [cocoDrive, bananaDrive];
+
+  function addNewDriveToPanel(drive: Drive) {
+    const panel = new SidePanel();
     const driveModel = new FilterFileBrowserModel({
       manager: manager,
-      driveName: drive?.name
+      driveName: drive.name
     });
 
-    return driveModel;
-  }
-  function buildInitialBrowserModelList(selectedDrives: Drive[]) {
-    const browserModelList: FilterFileBrowserModel[] = [];
-    const localDriveModel = createFilterFileBrowserModel(manager);
-    browserModelList.push(localDriveModel);
-    return browserModelList;
-  }
-  const browserModelList = buildInitialBrowserModelList(selectedList1);
-  const trans = translator.load('jupyter_drives');
-  const panel = new MultiDrivesFileBrowser({
-    modelList: browserModelList,
-    id: '',
-    manager
-  });
-  panel.title.icon = DriveIcon;
-  panel.title.iconClass = 'jp-SideBar-tabIcon';
-  panel.title.caption = 'Browse Drives';
-  panel.id = 'panel-file-browser';
-  if (restorer) {
-    restorer.add(panel, 'drive-browser');
-  }
-  app.shell.add(panel, 'left', { rank: 102 });
-
-  setToolbar(
-    panel,
-    createToolbarFactory(
-      toolbarRegistry,
-      settingRegistry,
-      FILE_BROWSER_FACTORY,
-      FILE_BROWSER_PLUGIN_ID,
-      translator
-    )
-  );
-  function addToBrowserModelList(
-    browserModelList: FilterFileBrowserModel[],
-    addedDrive: Drive
-  ) {
-    const addedDriveModel = createFilterFileBrowserModel(manager, addedDrive);
-    browserModelList.push(addedDriveModel);
-    return browserModelList;
-  }
-  function addDriveContentsToPanel(
-    browserModelList: FilterFileBrowserModel[],
-    addedDrive: Drive,
-    panel: MultiDrivesFileBrowser
-  ) {
-    const addedDriveModel = createFilterFileBrowserModel(manager, addedDrive);
-    browserModelList = addToBrowserModelList(browserModelList, addedDrive);
-    manager.services.contents.addDrive(addedDrive);
-    const AddedDriveBrowser = new DriveBrowser({
-      model: addedDriveModel,
-      breadCrumbs: new BreadCrumbs({ model: addedDriveModel }),
-      driveName: addedDrive.name
+    const driveBrowser = new FileBrowser({
+      id: drive.name + '-browser',
+      model: driveModel
     });
-    panel.addWidget(AddedDriveBrowser);
-  }
-
-  /* Dialog to select the drive */
-  addJupyterLabThemeChangeListener();
-  const selectedDrivesModelMap = new Map<Drive[], DriveListModel>();
-  let selectedDrives: Drive[] = selectedList1;
-  const availableDrives: Drive[] = availableList1;
-  let driveListModel = selectedDrivesModelMap.get(selectedDrives);
 
-  commands.addCommand(CommandIDs.openDrivesDialog, {
-    execute: async args => {
-      if (!driveListModel) {
-        driveListModel = new DriveListModel(availableDrives, selectedDrives);
-        selectedDrivesModelMap.set(selectedDrives, driveListModel);
-      } else {
-        selectedDrives = driveListModel.selectedDrives;
-        selectedDrivesModelMap.set(selectedDrives, driveListModel);
-      }
-      async function onDriveAdded(selectedDrives: Drive[]) {
-        if (driveListModel) {
-          const response = driveListModel.sendConnectionRequest(selectedDrives);
-          if ((await response) === true) {
-            addDriveContentsToPanel(
-              browserModelList,
-              selectedDrives[selectedDrives.length - 1],
-              panel
-            );
-          } else {
-            console.warn('Connection with the drive was not possible');
-          }
-        }
-      }
-
-      if (driveListModel) {
-        showDialog({
-          body: new DriveListView(driveListModel, app.docRegistry),
-          buttons: [Dialog.cancelButton()]
-        });
-      }
-
-      driveListModel.stateChanged.connect(async () => {
-        if (driveListModel) {
-          onDriveAdded(driveListModel.selectedDrives);
-        }
-      });
-    },
-
-    icon: DriveIcon.bindprops({ stylesheet: 'menuItem' }),
-    caption: trans.__('Add drives to filebrowser.'),
-    label: trans.__('Add Drives To Filebrowser')
+    panel.addWidget(driveBrowser);
+    panel.title.icon = DriveIcon;
+    panel.title.iconClass = 'jp-SideBar-tabIcon';
+    panel.title.caption = 'Browse Drives';
+
+    panel.id = drive.name + '-file-browser';
+
+    if (restorer) {
+      restorer.add(panel, drive.name + '-browser');
+    }
+    app.shell.add(panel, 'left', { rank: 102 });
+
+    setToolbar(
+      panel,
+      createToolbarFactory(
+        toolbarRegistry,
+        settingRegistry,
+        FILE_BROWSER_FACTORY,
+        FILE_BROWSER_PLUGIN_ID,
+        translator
+      )
+    );
+  }
+  DriveList.forEach(drive => {
+    addNewDriveToPanel(drive);
   });
 }