diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs
index 218855e..f7fdfd4 100644
--- a/AssemblyVersion.cs
+++ b/AssemblyVersion.cs
@@ -16,5 +16,5 @@ using System.Reflection;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.0.341")]
-[assembly: AssemblyFileVersion("3.0.0.341")]
+[assembly: AssemblyVersion("3.0.0.342")]
+[assembly: AssemblyFileVersion("3.0.0.342")]
diff --git a/WebApplication/Edit.aspx b/WebApplication/Edit.aspx
index 6e9285d..d7d9bcb 100644
--- a/WebApplication/Edit.aspx
+++ b/WebApplication/Edit.aspx
@@ -11,13 +11,21 @@
 	
 		var submitted = false;
 		function __UnloadPage(e) {
-			if (!submitted) {
-				e.returnValue = " ";
+		    if (!submitted) {
+		        if (document.getElementById('EditorDiv').getElementsByTagName('textarea')[0].value.length != 0) {
+				    e.returnValue = " ";
+				}
 			}
 		}
 
 		function __SetSubmitted() {
 			submitted = true;
+        }
+		
+		function __RequestConfirmIfNotEmpty() {
+		    if (document.getElementById('EditorDiv').getElementsByTagName('textarea')[0].value.length != 0) {
+		      return(__RequestConfirm());
+		    }
 		}
 		
 	// -->
@@ -91,7 +99,7 @@
 			Display="Dynamic" ControlToValidate="txtTitle" ValidationGroup="nametitle" meta:resourcekey="rfvTitleResource1" />
 	</div>
 	
-	<div id="TemplatesDiv">
+	<div id="TemplatesDiv" runat="server">
 		<small>
 			<anthem:LinkButton ID="btnTemplates" runat="server" Text="Content Templates..." OnClick="btnTemplates_Click" 
 				AutoUpdateAfterCallBack="True" meta:resourcekey="btnTemplatesResource1" UpdateAfterCallBack="True" />
@@ -108,7 +116,7 @@
 				</div>
 				<small>
 					<anthem:LinkButton ID="btnUseTemplate" runat="server" Text="Use Template" ToolTip="Use this Template (replace current content)"
-						CausesValidation="False" AutoUpdateAfterCallBack="True" Visible="False" PreCallBackFunction="__RequestConfirm" OnClick="btnUseTemplate_Click" 
+						CausesValidation="False" AutoUpdateAfterCallBack="True" Visible="False" PreCallBackFunction="__RequestConfirmIfNotEmpty" OnClick="btnUseTemplate_Click" 
 						meta:resourcekey="btnUseTemplateResource1" UpdateAfterCallBack="True" />
 					&bull;
 					<anthem:LinkButton ID="btnCancelTemplate" runat="server" Text="Cancel" ToolTip="Close the Templates toolbar"
diff --git a/WebApplication/Edit.aspx.cs b/WebApplication/Edit.aspx.cs
index 17c262c..2e25d9b 100644
--- a/WebApplication/Edit.aspx.cs
+++ b/WebApplication/Edit.aspx.cs
@@ -216,9 +216,16 @@ namespace ScrewTurn.Wiki {
 			// Check and manage editing collisions
 			ManageEditingCollisions();
 
-			// Display draft status
 			if(!Page.IsPostBack) {
+
+				// Hide templates selection if there aren't any
+				if(Templates.GetTemplates().Count == 0)	{
+					TemplatesDiv.Visible = false;
+				}
+
+				// Display draft status
 				ManageDraft();
+
 			}
 
 			// Setup session refresh iframe
@@ -714,6 +721,9 @@ namespace ScrewTurn.Wiki {
 			foreach(ContentTemplate temp in Templates.GetTemplates()) {
 				lstTemplates.Items.Add(new ListItem(temp.Name, temp.Name));
 			}
+			// Hide select button and preview text because the user hasn't selected a template yet
+			btnUseTemplate.Visible = false;
+			lblTemplatePreview.Text = "";
 		}
 
 		protected void lstTemplates_SelectedIndexChanged(object sender, EventArgs e) {
@@ -734,6 +744,12 @@ namespace ScrewTurn.Wiki {
 
 			editor.SetContent(template.Content, Settings.UseVisualEditorAsDefault);
 			btnCancelTemplate_Click(sender, e);
+			// If there's a category matching the selected template name, select it automatically
+			for (int i = 0; i < lstCategories.Items.Count; i++)	{
+				if (lstCategories.Items[i].Value.ToLower().Trim() == lstTemplates.SelectedValue.ToLower().Trim()) {
+					lstCategories.Items[i].Selected = true;
+				}
+			}
 		}
 
 		protected void btnCancelTemplate_Click(object sender, EventArgs e) {
diff --git a/WebApplication/Edit.aspx.designer.cs b/WebApplication/Edit.aspx.designer.cs
index a43f73a..93d4e8c 100644
--- a/WebApplication/Edit.aspx.designer.cs
+++ b/WebApplication/Edit.aspx.designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
+//     Runtime Version:2.0.50727.3074
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -292,6 +292,15 @@ namespace ScrewTurn.Wiki {
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator rfvTitle;
         
+        /// <summary>
+        /// TemplatesDiv control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl TemplatesDiv;
+        
         /// <summary>
         /// btnTemplates control.
         /// </summary>