diff --git a/zero.Web.UI/App/components/pickers/mediaPicker/mediapicker.vue b/zero.Web.UI/App/components/pickers/mediaPicker/mediapicker.vue
index 08fcd5b4..cca18194 100644
--- a/zero.Web.UI/App/components/pickers/mediaPicker/mediapicker.vue
+++ b/zero.Web.UI/App/components/pickers/mediaPicker/mediapicker.vue
@@ -223,6 +223,7 @@
           closeLabel: '@ui.close',
           component: PickMediaOverlay,
           model: this.value,
+          folderId: 'mediaFolders.97-A',
           theme: 'dark',
           width: 520
         }, typeof this.config === 'object' ? this.config : {});
diff --git a/zero.Web.UI/App/components/pickers/mediaPicker/overlay.vue b/zero.Web.UI/App/components/pickers/mediaPicker/overlay.vue
index 57cdacc1..580da582 100644
--- a/zero.Web.UI/App/components/pickers/mediaPicker/overlay.vue
+++ b/zero.Web.UI/App/components/pickers/mediaPicker/overlay.vue
@@ -5,6 +5,7 @@
     <ui-search class="ui-mediapicker-overlay-search" v-model="query" />
 
     <nav class="ui-mediapicker-overlay-hierarchy">
+      <button type="button" class="ui-mediapicker-overlay-hierarchy-item" @click="selectFolder(null)"><i class="fth-home"></i></button>
       <button type="button" v-for="item in hierarchy" class="ui-mediapicker-overlay-hierarchy-item" @click="selectFolder(item.id)">{{item.name}}</button>
       <button type="button" class="ui-mediapicker-overlay-hierarchy-item" @click="addFolder"><i class="fth-plus"></i></button>
     </nav>
@@ -22,7 +23,7 @@
         <span class="-preview" v-if="item.type !== 'image'"><i :class="item.type !== 'folder' ? 'fth-file' : 'fth-folder'"></i></span>
         <p class="ui-mediapicker-overlay-item-text">
           {{item.name}}
-          <span class="-minor" v-if="item.size"><br>{{item.size}}</span>
+          <span class="-minor" v-if="item.size"><br><span v-filesize="item.size"></span></span>
         </p>
       </button>
     </div>
@@ -36,6 +37,7 @@
 
 
 <script>
+  import MediaApi from 'zero/resources/media.js'
   import { debounce as _debounce, filter as _filter } from 'underscore';
 
   export default {
@@ -46,17 +48,18 @@
     },
 
     data: () => ({
+      folderId: null,
       icon: null,
       query: '',
       items: [],
-      hierarchy: [
-        { id: 0, name: 'Media' },
-        { id: 1, name: 'News' },
-        { id: 2, name: '2019' }
-      ]
+      hierarchy: []
     }),
 
     watch: {
+      'config.folderId': function (id)
+      {
+        this.folderId = id;
+      },
       model()
       {
         //this.init();
@@ -69,60 +72,100 @@
 
     created()
     {
+      this.folderId = this.config.folderId;
+
       this.debouncedSearch = _debounce(this.search, 100);
       //this.items = this.config.items;
       //this.init();
 
-      const sources = [
-        'http://nolbert.com/wp-content/uploads/2018/04/nolbert_logitech_thumb_s.jpg',
-        'http://nolbert.com/wp-content/uploads/2019/06/nolbert_orange_stack_01_thumb_sn.jpg',
-        'http://nolbert.com/wp-content/uploads/2019/04/nolbert_vyvyd_thumb_violet_n.jpg',
-        'http://nolbert.com/wp-content/uploads/2018/08/nolbert_oppo_r15_thumb_s.jpg'
-      ];
-
-      this.items.push({
-        name: 'Unfinished',
-        type: 'folder'
-      });
-
-      sources.forEach(source =>
-      {
-        this.items.push({
-          source: source,
-          name: source.split('/')[7],
-          size: '100 kB',
-          type: 'image'
-        });
-      });
-
-      this.items.push({
-        source: 'zeromagic-loop.webm',
-        name: 'zeromagic-loop-zeromagic-loop-zeromagic-loop-zeromagic-loop-zeromagic-loop.webm',
-        size: '2.3 MB',
-        type: 'video',
-        extension: '.webm'
-      });
-
-      this.items.push({
-        source: 'documentation.docx',
-        name: 'documentation.docx',
-        size: '723 kB',
-        type: 'file',
-        extension: '.docx'
-      });
+      //this.gridConfig = {
+      //  search: null,
+      //  width: 160,
+      //  component: MediaItem,
+      //  items: this.getItems
+      //};
     },
 
     mounted()
     {
-      
+      this.getItems();
     },
 
     methods: {
 
+      // get items (media + subfolders) in the current folder
+      getItems(query)
+      {
+        if (!query)
+        {
+          query = {};
+        }
+
+        query.folderId = this.folderId;
+
+        return MediaApi.getAll(query).then(response =>
+        {
+          this.current = response.folder;
+
+          this.items = [];
+
+          response.folders.forEach(item =>
+          {
+            this.items.push({
+              id: item.id,
+              name: item.name,
+              type: 'folder'
+            });
+          });
+
+          response.items.forEach(item =>
+          {
+            this.items.push({
+              id: item.id,
+              source: item.source,
+              name: item.name,
+              size: item.size,
+              type: item.type
+            });
+          });
+
+          this.buildHierarchy(response.folderHierarchy);
+
+          return Promise.resolve(response);
+        });
+      },
+
+      buildHierarchy(folders)
+      {
+        let items = [];
+
+        if (folders)
+        {
+          folders.forEach(item =>
+          {
+            items.push({
+              id: item.id,
+              name: item.name
+            });
+          });
+        }
+
+        if (this.current)
+        {
+          items.push({
+            id: this.current.id,
+            name: this.current.name
+          })
+        }
+
+        this.hierarchy = items;
+      },
+
       // switches view to the selected folder
       selectFolder(id)
       {
-
+        this.folderId = id;
+        this.getItems();
       },
 
       // adds a new folder within the current parent
diff --git a/zero.Web/Controllers/MediaController.cs b/zero.Web/Controllers/MediaController.cs
index 6355c155..0b1cce1a 100644
--- a/zero.Web/Controllers/MediaController.cs
+++ b/zero.Web/Controllers/MediaController.cs
@@ -54,6 +54,7 @@ namespace zero.Web.Controllers
     public async Task<IActionResult> GetAll([FromQuery] MediaListQuery query)
     {
       ListResult<MediaListModel> items = await Mapper.Map<Media, MediaListModel>(await Api.GetByQuery(query));
+      IList<MediaFolder> hierarchy = null;
       IEnumerable<MediaListModel> folders = new List<MediaListModel>();
       MediaFolder folder = null;
 
@@ -65,9 +66,10 @@ namespace zero.Web.Controllers
       if (!String.IsNullOrEmpty(query.FolderId))
       {
         folder = await MediaFolderApi.GetById(query.FolderId);
+        hierarchy = await MediaFolderApi.GetHierarchy(query.FolderId);
       }   
 
-      return Json(new MediaListResultModel(items, folders, folder));
+      return Json(new MediaListResultModel(items, folders, folder, hierarchy));
     }
 
 
diff --git a/zero.Web/Models/MediaListResultModel.cs b/zero.Web/Models/MediaListResultModel.cs
index 43b7df04..639a53e3 100644
--- a/zero.Web/Models/MediaListResultModel.cs
+++ b/zero.Web/Models/MediaListResultModel.cs
@@ -7,6 +7,8 @@ namespace zero.Web.Models
   {
     public IEnumerable<MediaListModel> Folders { get; private set; }
 
+    public IEnumerable<MediaFolder> FolderHierarchy { get; private set; }
+
     public MediaFolder Folder { get; private set; }
 
     public MediaListResultModel(ListResult<MediaListModel> items, IEnumerable<MediaListModel> folders) : base(items.Items, items.TotalItems, items.Page, items.PageSize)
@@ -15,9 +17,10 @@ namespace zero.Web.Models
       Statistics = items.Statistics;
     }
 
-    public MediaListResultModel(ListResult<MediaListModel> items, IEnumerable<MediaListModel> folders, MediaFolder currentFolder) : this(items, folders)
+    public MediaListResultModel(ListResult<MediaListModel> items, IEnumerable<MediaListModel> folders, MediaFolder currentFolder, IEnumerable<MediaFolder> hierarchy) : this(items, folders)
     {
       Folder = currentFolder;
+      FolderHierarchy = hierarchy;
     }
   }
 }