diff --git a/lib/WebGUI/Asset/Wobject/Folder.pm b/lib/WebGUI/Asset/Wobject/Folder.pm
index 00dd12340..8ec229e7b 100644
--- a/lib/WebGUI/Asset/Wobject/Folder.pm
+++ b/lib/WebGUI/Asset/Wobject/Folder.pm
@@ -91,8 +91,8 @@ sub getEditForm {
 	if ($self->get("assetId") eq "new") {
                	$tabform->getTab("properties")->whatNext(
                        	-options=>{
-                               	view=>WebGUI::International::get(823),
-                      	 	""=>WebGUI::International::get(847)
+                               	view=>WebGUI::International::get(823, "Folder"),
+                      	 	""=>WebGUI::International::get(847, "Folder")
                               	},
 			-value=>"view"
 			);
@@ -163,7 +163,7 @@ sub view {
 				type=>$child->getName,
 				url=>$child->getUrl,
 				isImage=>$isImage,
-				isImage=>$isFile,
+				isFile=>$isFile,
 				"thumbnail.url"=>$thumbnail,
 				"file.url"=>$file
 				});
diff --git a/lib/WebGUI/Help/Folder.pm b/lib/WebGUI/Help/Folder.pm
new file mode 100644
index 000000000..c703e252e
--- /dev/null
+++ b/lib/WebGUI/Help/Folder.pm
@@ -0,0 +1,41 @@
+package WebGUI::Help::Folder;
+
+our $HELP = {
+
+        'folder add/edit' => {
+		title => 'folder add/edit title',
+		body => 'folder add/edit body',
+		related => [
+			{
+				tag => 'asset fields',
+				namespace => 'Asset'
+			},
+			{
+				tag => 'wobject add/edit',
+				namespace => 'WebGUI'
+			},
+			{
+				tag => 'folder template',
+				namespace => 'Folder'
+			},
+		]
+	},
+
+        'folder template' => {
+		title => 'folder template title',
+		body => 'folder template body',
+		related => [
+			{
+				tag => 'folder add/edit',
+				namespace => 'Folder'
+			},
+			{
+				tag => 'template language',
+				namespace => 'Template'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/i18n/English/Folder.pm b/lib/WebGUI/i18n/English/Folder.pm
new file mode 100644
index 000000000..e83bc27cc
--- /dev/null
+++ b/lib/WebGUI/i18n/English/Folder.pm
@@ -0,0 +1,110 @@
+package WebGUI::i18n::English::Folder;
+
+our $I18N = {
+
+        '847' => {
+                   message => qq|Go back to the current page.|,
+                   lastUpdated => 1039587250,
+                 },
+
+        '823' => {
+                   message => qq|Go to the new page.|,
+                   lastUpdated => 1038706332,
+                 },
+
+	'folder add/edit title' => {
+		message => q|Folder, Add/Edit|,
+        	lastUpdated => 1106683494,
+	},
+
+	'folder add/edit body' => {
+		message => q|<p>Folder Assets are used to display lists of Assets and subfolders just like a file browserin an operating system.</p>
+<P>Folders are Wobjects, so they have all the same properties as Wobjects and Assets.  Folders also have these unique properties and functions:</p>
+
+<p><b>Template</b><br>
+This menu permits you to select a template to style the display of the Folder contents</p>
+
+<p><b>What Next?</b><br>
+After creating a new Folder, do you wish to go back to the original page where you created the Folder
+to do you want to go to the new Folder?</p>
+
+|,
+        	lastUpdated => 1109713278,
+	},
+
+	'folder template title' => {
+		message => q|Folder Template|,
+        	lastUpdated => 1106683494,
+	},
+
+	'folder template body' => {
+		message => q|The following variables are available in Folder Templates:
+<p><b>subfolder_loop</b><br>
+A loop containing all Folder assets which are children of the Folder.
+
+<blockquote>
+
+<p><b>id</b><br>
+The assetId of the Folder.
+
+<p><b>url</b><br>
+The url of the Folder.
+
+<p><b>title</b><br>
+The title of the Folder.
+
+</blockquote>
+
+<p><b>file_loop</b><br>
+A loop containing all non-Folder assets which are children of the Folder.
+
+<blockquote>
+
+<p><b>id</b><br>
+The assetId of the Asset.
+
+<p><b>title</b><br>
+The title of the Asset.
+
+<p><b>synopsis</b><br>
+The synopsis of the Asset.
+
+<p><b>size</b><br>
+The size of the Asset, formatted.
+
+<p><b>date.epoch</b><br>
+The date the Asset was last updated, relative to the epoch.
+
+<p><b>icon.small</b><br>
+A URL to a small icon that represents the Asset.
+
+<p><b>icon.big</b><br>
+A URL to an icon that represents the Asset.
+
+<p><b>type</b><br>
+The type of this Asset.
+
+<p><b>url</b><br>
+The URL of the Asset.
+
+<p><b>isImage</b><br>
+A conditional indicating if this Asset is an Image Asset.
+
+<p><b>thumbnail</b><br>
+If this Asset is an Image, the URL to the thumbnail for it.
+
+<p><b>isFile</b><br>
+A conditional indicating if this Asset is a File Asset.
+
+<p><b>file.url</b><br>
+If this Asset is a File, the URL to the actual file for downloading.
+
+</blockquote>
+		|,
+        	lastUpdated => 1106683494,
+	},
+
+
+};
+
+1;