diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite.js
index 98e74418..347be311 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite.js
@@ -256,7 +256,7 @@ for ${session_data.getSessionData("subscriber_username") || "You"}
 </td></tr></table>
 </td></tr></table>
 <table cellspacing="0" cellpadding="0">
-<tr><td width="451" height="2" background="ROMCache/FoldersCoverBorder.gif"><img src="wtv-home:/ROMCache/Spacer.gif" width="1" height="1">
+<tr><img src="wtv-home:/ROMCache/Spacer.gif" width="1" height="1">
 </td></tr></table>
 
 
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-shortcut-list.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-shortcut-list.js
index e2144a67..200c0d19 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-shortcut-list.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-shortcut-list.js
@@ -112,11 +112,11 @@ data += `
 <font size="-1" color="#42BC52">
 ${fav.title}
 </font>
-
+</td><td>
 <table absheight="38" width="53" cellspacing="0" cellpadding="0">
 <tbody><tr><td valign="middle" background="images/FKey.gif" absheight=38 align="center">
 <font size="-2" color="#F1F1F1">
-${key}
+&nbsp;${key}
 </font>
 </td></tr></tbody></table>
 </td></tr></tbody></table>
diff --git a/zefie_wtvp_minisrv/includes/classes/WTVFavorites.js b/zefie_wtvp_minisrv/includes/classes/WTVFavorites.js
index 5be2ca39..7daf9e43 100644
--- a/zefie_wtvp_minisrv/includes/classes/WTVFavorites.js
+++ b/zefie_wtvp_minisrv/includes/classes/WTVFavorites.js
@@ -61,7 +61,14 @@ class WTVFavorites {
             var folder_dir = foldername + this.path.sep;
             var store_dir = this.favstore_dir + folder_dir;
         }
-        return (store_dir !== null) ? this.fs.existsSync(store_dir) : false;
+		if (store_dir) {
+			if (this.fs.existsSync(store_dir)) {
+				if (this.fs.statSync(store_dir).isDirectory()) {
+					return store_dir;
+				}
+			}
+		}
+        return false;
     }
 	
 	getFolderDir(foldername) {
@@ -125,8 +132,11 @@ class WTVFavorites {
         var path = this.favstore_dir;
 		var self = this;
 		return this.fs.readdirSync(path).filter(function (file) {
-			self.folderArr.push(file);
-			return self.folderArr;
+			if (self.folderExists(file)) {
+				self.folderArr.push(file);
+				return self.folderArr;
+			}
+			return false;
 		});
     }