diff --git a/app/app/components/folder/start-document.js b/app/app/components/folder/start-document.js
index 57ee1c1e..7d4b4446 100644
--- a/app/app/components/folder/start-document.js
+++ b/app/app/components/folder/start-document.js
@@ -74,7 +74,7 @@ export default Ember.Component.extend(NotifierMixin, {
 			url: importUrl,
 			method: "post",
 			paramName: 'attachment',
-			acceptedFiles: ".doc,.docx,.txt,.md,.markdown",
+			acceptedFiles: ".doc,.docx,.md,.markdown,.htm,.html",
 			clickable: true,
 			maxFilesize: 10,
 			parallelUploads: 3,
diff --git a/app/app/pods/customize/folders/route.js b/app/app/pods/customize/folders/route.js
index 445d4b89..261e6d71 100644
--- a/app/app/pods/customize/folders/route.js
+++ b/app/app/pods/customize/folders/route.js
@@ -27,6 +27,9 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 
 	setupController(controller, model) {
 		let nonPrivateFolders = model.rejectBy('folderType', 2);
+		if (is.empty(nonPrivateFolders) || is.null(model) || is.undefined(model)) {
+			nonPrivateFolders = [];
+		}
 		controller.set('folders', nonPrivateFolders);
 
 		this.get('folderService').getProtectedFolderInfo().then((people) => {
@@ -48,7 +51,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 	},
 
 	activate() {
-		document.title = "Folders | Documize";
+		document.title = "Spaces | Documize";
 	},
 
 	actions: {
diff --git a/app/app/pods/customize/folders/template.hbs b/app/app/pods/customize/folders/template.hbs
index 44ec0bd9..2667827f 100644
--- a/app/app/pods/customize/folders/template.hbs
+++ b/app/app/pods/customize/folders/template.hbs
@@ -1,41 +1,50 @@
-<div class="global-folder-settings">
-    <div class="form-header">
-        <div class="title">{{folders.length}} shared {{label}}</div>
-        <div class="tip">View and change shared space ownership</div>
-    </div>
-    <div class="input-control">
-        <table class="basic-table">
-            <thead>
-                <tr>
-                    <th class="bordered">Space</th>
-                    <th class="bordered">Participants</th>
-                </tr>
-            </thead>
-            <tbody>
-                {{#each folders as |folder|}}
-                    <tr>
-                        <td class="bordered">
-                            {{#link-to 'folder' folder.id folder.slug class="alt"}}{{folder.name}}{{/link-to}}
-                        </td>
-                        <td class="bordered">
-                            {{#each folder.sharedWith as |person|}}
-                                {{#if person.isEveryone}}
-                                    Everyone
-                                {{else}}
+{{#if folders}}
+	<div class="global-folder-settings">
+		<div class="form-header">
+			<div class="title">{{folders.length}} shared {{label}}</div>
+			<div class="tip">View and change shared space ownership</div>
+		</div>
+		<div class="input-control">
+			<table class="basic-table">
+				<thead>
+					<tr>
+						<th class="bordered">Space</th>
+						<th class="bordered">Participants</th>
+					</tr>
+				</thead>
+				<tbody>
+					{{#each folders as |folder|}}
+						<tr>
+							<td class="bordered">
+								{{#link-to 'folder' folder.id folder.slug class="alt"}}{{folder.name}}{{/link-to}}
+							</td>
+							<td class="bordered">
+								{{#each folder.sharedWith as |person|}}
+									{{#if person.isEveryone}}
+										Everyone
+									{{else}}
 
-                                    {{#if person.isOwner}}
-                                        <span class="bold">{{person.firstname}} {{person.lastname}} (owner)</span>
-                                    {{else}}
-                                        {{person.firstname}} {{person.lastname}}
-                                        <a class="action-link" {{action "changeOwner" folder.id person.userId}}>make owner</a>
-                                    {{/if}}
-                                {{/if}}
-                                <br/>
-                            {{/each}}
-                        </td>
-                    </tr>
-                {{/each}}
-            </tbody>
-        </table>
-    </div>
-</div>
+										{{#if person.isOwner}}
+											<span class="bold">{{person.firstname}} {{person.lastname}} (owner)</span>
+										{{else}}
+											{{person.firstname}} {{person.lastname}}
+											<a class="action-link" {{action "changeOwner" folder.id person.userId}}>make owner</a>
+										{{/if}}
+									{{/if}}
+									<br/>
+								{{/each}}
+							</td>
+						</tr>
+					{{/each}}
+				</tbody>
+			</table>
+		</div>
+	</div>
+{{else}}
+	<div class="global-folder-settings">
+		<div class="form-header">
+			<div class="title">{{folders.length}} shared {{label}}</div>
+			<div class="tip">There are no spaces to maintain</div>
+		</div>
+	</div>
+{{/if}}
\ No newline at end of file
diff --git a/app/app/templates/components/folder/start-document.hbs b/app/app/templates/components/folder/start-document.hbs
index 2b874f3c..f9bcf113 100644
--- a/app/app/templates/components/folder/start-document.hbs
+++ b/app/app/templates/components/folder/start-document.hbs
@@ -9,7 +9,7 @@
 	<div class="clearfix" />
 
 	<div id="import-document-button" class="import-document-button">
-		Drag-drop or click to select .doc, .docx, .txt, .md, .markdown files
+		Drag-drop or click to select .doc, .docx, .md, .markdown files
 	</div>
 
 	<div class="list-wrapper">
diff --git a/core/api/plugins/glick.go b/core/api/plugins/glick.go
index 18274314..1dd64183 100644
--- a/core/api/plugins/glick.go
+++ b/core/api/plugins/glick.go
@@ -81,7 +81,7 @@ func LibSetup() error {
 		}
 	}
 
-	for _, xtn := range []string{"md"} {
+	for _, xtn := range []string{"md", "markdown"} {
 		err = Lib.RegPlugin("Convert", xtn, md.Convert, nil)
 		if err != nil {
 			return err