diff --git a/gui/griffon-app/models/com/muwire/gui/AdvancedSharingModel.groovy b/gui/griffon-app/models/com/muwire/gui/AdvancedSharingModel.groovy
index 4006892b..f0b8bf46 100644
--- a/gui/griffon-app/models/com/muwire/gui/AdvancedSharingModel.groovy
+++ b/gui/griffon-app/models/com/muwire/gui/AdvancedSharingModel.groovy
@@ -20,7 +20,7 @@ class AdvancedSharingModel {
     Core core
     
     void mvcGroupInit(Map<String,String> args) {
-        watchedDirectories.addAll(core.muOptions.watchedDirectories)
+        watchedDirectories.addAll(core.watchedDirectoryManager.watchedDirs.values())
         
         treeRoot = new DefaultMutableTreeNode()
         negativeTree = new DefaultTreeModel(treeRoot)
diff --git a/gui/griffon-app/views/com/muwire/gui/AdvancedSharingView.groovy b/gui/griffon-app/views/com/muwire/gui/AdvancedSharingView.groovy
index 132eb2b0..2179d006 100644
--- a/gui/griffon-app/views/com/muwire/gui/AdvancedSharingView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/AdvancedSharingView.groovy
@@ -43,7 +43,9 @@ class AdvancedSharingView {
             scrollPane( constraints : BorderLayout.CENTER ) {
                 watchedDirsTable = table(autoCreateRowSorter : true, rowHeight : rowHeight) {
                     tableModel(list : model.watchedDirectories) {
-                        closureColumn(header : "Directory", type : String, read : {it})
+                        closureColumn(header : "Directory", type : String, read : {it.directory.toString()})
+                        closureColumn(header : "Automatic", type : Boolean, read : {it.autoWatch})
+                        closureColumn(header : "Sync Interval", type : Integer, read : {it.syncInterval})
                     }
                 }
             }