diff --git a/tw5dropbox/mainwiki/plugins/dropbox-main.js b/tw5dropbox/mainwiki/plugins/dropbox-main.js
index 9c73faa1a..1e134f38a 100644
--- a/tw5dropbox/mainwiki/plugins/dropbox-main.js
+++ b/tw5dropbox/mainwiki/plugins/dropbox-main.js
@@ -12,9 +12,13 @@ Startup the Dropbox main app
 /*global $tw: false */
 "use strict";
 
+var titleLoadedWikis = "$:/plugins/dropbox/LoadedWikis";
+
 exports.startup = function() {
+	$tw.wiki.addTiddler({title: titleLoadedWikis, text: "no"},true);
 	// Load tiddlers
 	$tw.plugins.dropbox.loadWikiFiles("/",function() {
+		$tw.wiki.addTiddler({title: titleLoadedWikis, text: "yes"},true);
 		console.log("Loaded all wikis",$tw.wiki.tiddlers);
 	});
 };
diff --git a/tw5dropbox/mainwiki/tiddlers/TiddlyWiki5 in the Sky with Dropbox.tid b/tw5dropbox/mainwiki/tiddlers/TiddlyWiki5 in the Sky with Dropbox.tid
index 493ad15e6..b61968302 100644
--- a/tw5dropbox/mainwiki/tiddlers/TiddlyWiki5 in the Sky with Dropbox.tid	
+++ b/tw5dropbox/mainwiki/tiddlers/TiddlyWiki5 in the Sky with Dropbox.tid	
@@ -2,9 +2,15 @@ title: TiddlyWiki5 in the Sky with Dropbox
 
 Welcome to TiddlyWiki5 in the Sky with Dropbox.
 
+<<reveal state:[[$:/plugins/dropbox/LoadedWikis]] type:nomatch text:yes><
+Loading your wikis from Dropbox
+>>
+
+<<reveal state:[[$:/plugins/dropbox/LoadedWikis]] type:match text:yes><
 ! Your ~TiddlyWikis
 
-((( [tag[wiki]] ))(WikiTemplate))
+<<transclude filter:[tag[wiki]] templateTitle:WikiTemplate emptyMessage:"You haven't created any wikis yet">>
+>>
 
 ! Create new ~TiddlyWiki
 
diff --git a/tw5dropbox/mainwiki/tiddlers/WikiTemplate.tid b/tw5dropbox/mainwiki/tiddlers/WikiTemplate.tid
index 641be1e10..2bcbaf1df 100644
--- a/tw5dropbox/mainwiki/tiddlers/WikiTemplate.tid
+++ b/tw5dropbox/mainwiki/tiddlers/WikiTemplate.tid
@@ -1,10 +1,4 @@
 title: WikiTemplate
 
-<div class="alert">
-<div>
-<<view title>>
-</div>
-<div>
-<<view url link>>
-</div>
+<div class="alert"><<view title>> - <<link throughField:urlView><View>> <<link throughField:urlEdit><Edit>>
 </div>
diff --git a/tw5dropbox/plugins/dropbox.js b/tw5dropbox/plugins/dropbox.js
index b02870634..f94bc3d70 100644
--- a/tw5dropbox/plugins/dropbox.js
+++ b/tw5dropbox/plugins/dropbox.js
@@ -86,7 +86,8 @@ $tw.plugins.dropbox.loadWikiFiles = function(path,callback) {
 		for(var s=0; s<stats.length; s++) {
 			var stat = stats[s];
 			if(!stat.isFile && stat.isFolder) {
-				$tw.wiki.addTiddler({title: stat.name, text: "wiki", tags: ["wiki"], url: $tw.plugins.dropbox.userInfo.publicAppUrl + stat.path + "/index.html"});
+				var url = $tw.plugins.dropbox.userInfo.publicAppUrl + stat.path + "/index.html";
+				$tw.wiki.addTiddler({title: stat.name, text: "wiki", tags: ["wiki"], urlView: url, urlEdit: url + "?edit=true"});
 			}
 		}
 		callback();