diff --git a/admin/action/create_page.php b/admin/action/create_page.php
index f9d7bda..dabd686 100644
--- a/admin/action/create_page.php
+++ b/admin/action/create_page.php
@@ -6,11 +6,12 @@
 	include '../includes/session.php';
 
 	if(isset($_POST['submit'])) {
+		$post_title = $_POST['title'];
 		$post_url = preg_replace('/[^A-Za-z0-9,.-]/u', '', $_POST['url']);
 		$post_url = rtrim($post_url, ',\.\-');
-		$post_content = $_POST['content'];
+		$post_content = '<!--t ' . $post_title . ' t-->' . "\n\n" . $_POST['content'];
 	}
-	if(!empty($post_url) && !empty($post_content)) {
+	if(!empty($post_title) && !empty($post_url) && !empty($post_content)) {
 		if(get_magic_quotes_gpc()) {
 			$post_content = stripslashes($post_content);
 		}
@@ -53,6 +54,7 @@
 	</div>
 	<div class="wmd-panel">
 		<form method="POST">
+			Title: <br><input type="text" size="60" maxlength="60" name="title"/><br><br>
 			Url: <br><input type="text" size="60" maxlength="60" name="url"/><br><br>
 			<div id="wmd-button-bar" class="wmd-button-bar"></div>
 			<textarea id="wmd-input" class="wmd-input" name="content" cols="20" rows="10"></textarea><br/>
diff --git a/admin/action/create_post.php b/admin/action/create_post.php
index 004cd91..8457a2a 100644
--- a/admin/action/create_post.php
+++ b/admin/action/create_post.php
@@ -7,13 +7,14 @@
 
 	if(isset($_POST['submit'])) {
 		$post_date = date('Y-m-d-H-i');
+		$post_title = $_POST['title'];
 		$post_tag = preg_replace('/[^A-Za-z0-9,.-]/u', '', $_POST['tag']);
 		$post_tag = rtrim($post_tag, ',\.\-');
 		$post_url = preg_replace('/[^A-Za-z0-9,.-]/u', '', $_POST['url']);
 		$post_url = rtrim($post_url, ',\.\-');
-		$post_content = $_POST['content'];
+		$post_content = '<!--t ' . $post_title . ' t-->' . "\n\n" . $_POST['content'];
 	}
-	if(!empty($post_tag) && !empty($post_url) && !empty($post_content)) {
+	if(!empty($post_title) && !empty($post_tag) && !empty($post_url) && !empty($post_content)) {
 		if(get_magic_quotes_gpc()) {
 			$post_content = stripslashes($post_content);
 		}
@@ -57,6 +58,7 @@
 	</div>
 	<div class="wmd-panel">
 		<form method="POST">
+			Title: <br><input type="text" size="60" maxlength="60" name="title"/><br><br>
 			Tag: <br><input type="text" size="60" maxlength="60" name="tag"/><br><br>
 			Url: <br><input type="text" size="60" maxlength="60" name="url"/><br><br>
 			<div id="wmd-button-bar" class="wmd-button-bar"></div>
diff --git a/admin/action/edit_bio.php b/admin/action/edit_bio.php
index 9d7f715..688442f 100644
--- a/admin/action/edit_bio.php
+++ b/admin/action/edit_bio.php
@@ -14,10 +14,22 @@
 	
 	$filename = '../../content/' . $user . '/author.md';
 	
+	$content = file_get_contents($filename);
+	$arr = explode('t-->', $content);
+	if(isset($arr[1])) {
+		$oldtitle = ltrim(rtrim(str_replace('<!--t','',$arr[0]), ' '));
+		$oldcontent = ltrim($arr[1]);
+	}
+	else {
+		$oldtitle = 'Untitled';
+		$oldcontent = ltrim($arr[0]);
+	}
+	
 	if(isset($_POST['submit'])) {
-		$bio_content = $_POST['content'];
+		$bio_title = $_POST['title'];
+		$bio_content = '<!--t ' . $bio_title . ' t-->' . "\n\n" . $_POST['content'];
 	}
-	if(!empty($bio_content)) {
+	if(!empty($bio_title) && !empty($bio_content)) {
 		if(get_magic_quotes_gpc()) {
 			$bio_content = stripslashes($bio_content);
 		}
@@ -60,8 +72,9 @@
 		</div>
 		<div class="wmd-panel">
 		<form method="POST">
+			Title: <br><input type="text" name="title" size="60" maxlength="60" value="<?php echo $oldtitle?>"/><br><br>
 			<div id="wmd-button-bar" class="wmd-button-bar"></div>
-			<textarea id="wmd-input" class="wmd-input" name="content" cols="20" rows="10"><?php if(file_exists($filename)) { echo file_get_contents($filename);} ?></textarea><br>
+			<textarea id="wmd-input" class="wmd-input" name="content" cols="20" rows="10"><?php if(file_exists($filename)) { echo $oldcontent;} ?></textarea><br>
 			<input type="submit" name="submit" value="Submit"/>
 		</form>
 		</div>
diff --git a/admin/action/edit_page.php b/admin/action/edit_page.php
index e1a1e23..4145bc7 100644
--- a/admin/action/edit_page.php
+++ b/admin/action/edit_page.php
@@ -12,16 +12,28 @@
 		header('location: ../index.php');
 	}
 	
+	$content = file_get_contents($url);
+	$arr = explode('t-->', $content);
+	if(isset($arr[1])) {
+		$oldtitle = ltrim(rtrim(str_replace('<!--t','',$arr[0]), ' '));
+		$oldcontent = ltrim($arr[1]);
+	}
+	else {
+		$oldtitle = 'Untitled';
+		$oldcontent = ltrim($arr[0]);
+	}
+	
 	$dir = substr($url, 0, strrpos($url, '/'));
 	$oldurl = str_replace($dir . '/','',$url);
 	$oldmd = str_replace('.md','',$oldurl);
 	
 	if(isset($_POST['submit'])) {
+		$post_title = $_POST['title'];
 		$post_url = preg_replace('/[^A-Za-z0-9,.-]/u', '', $_POST['url']);
 		$post_url = rtrim($post_url, ',\.\-');
-		$post_content = $_POST['content'];
+		$post_content = '<!--t ' . $post_title . ' t-->' . "\n\n" . $_POST['content'];
 	}
-	if(!empty($post_url) && !empty($post_content)) {
+	if(!empty($post_title) && !empty($post_url) && !empty($post_content)) {
 		if(get_magic_quotes_gpc()) {
 			$post_content = stripslashes($post_content);
 		}
@@ -65,9 +77,10 @@
 		</div>
 		<div class="wmd-panel">
 		<form method="POST">
+			Title: <br><input type="text" name="title" size="60" maxlength="60" value="<?php echo $oldtitle?>"/><br><br>
 			Url: <br><input type="text" name="url" size="60" maxlength="60" value="<?php echo $oldmd ?>"/><br><br>
 			<div id="wmd-button-bar" class="wmd-button-bar"></div>
-			<textarea id="wmd-input" class="wmd-input" name="content" cols="20" rows="10"><?php echo file_get_contents($url)?></textarea><br>
+			<textarea id="wmd-input" class="wmd-input" name="content" cols="20" rows="10"><?php echo $oldcontent ?></textarea><br>
 			<input type="submit" name="submit" value="Submit"/>
 		</form>
 		</div>
diff --git a/admin/action/edit_post.php b/admin/action/edit_post.php
index 7874b7d..812121a 100644
--- a/admin/action/edit_post.php
+++ b/admin/action/edit_post.php
@@ -12,6 +12,17 @@
 		header('location: ../index.php');
 	}
 	
+	$content = file_get_contents($url);
+	$arr = explode('t-->', $content);
+	if(isset($arr[1])) {
+		$oldtitle = ltrim(rtrim(str_replace('<!--t','',$arr[0]), ' '));
+		$oldcontent = ltrim($arr[1]);
+	}
+	else {
+		$oldtitle = 'Untitled';
+		$oldcontent = ltrim($arr[0]);
+	}
+	
 	$dir = substr($url, 0, strrpos($url, '/'));
 	
 	$oldurl = explode('_', $url);
@@ -21,13 +32,14 @@
 	$oldmd = str_replace('.md','',$oldurl[2]);
 	
 	if(isset($_POST['submit'])) {
+		$post_title = $_POST['title'];
 		$post_tag = preg_replace('/[^A-Za-z0-9,.-]/u', '', $_POST['tag']);
 		$post_tag = rtrim($post_tag, ',\.\-');
 		$post_url = preg_replace('/[^A-Za-z0-9,.-]/u', '', $_POST['url']);
 		$post_url = rtrim($post_url, ',\.\-');
-		$post_content = $_POST['content'];
+		$post_content = '<!--t ' . $post_title . ' t-->' . "\n\n" . $_POST['content'];
 	}
-	if(!empty($post_tag) && !empty($post_url) && !empty($post_content)) {
+	if(!empty($post_title) && !empty($post_tag) && !empty($post_url) && !empty($post_content)) {
 		if(get_magic_quotes_gpc()) {
 			$post_content = stripslashes($post_content);
 		}
@@ -71,10 +83,11 @@
 		</div>
 		<div class="wmd-panel">
 		<form method="POST">
+			Title: <br><input type="text" name="title" size="60" maxlength="60" value="<?php echo $oldtitle?>"/><br><br>
 			Tag: <br><input type="text" name="tag" size="60" maxlength="60" value="<?php echo $oldtag?>"/><br><br>
 			Url: <br><input type="text" name="url" size="60" maxlength="60" value="<?php echo $oldmd ?>"/><br><br>
 			<div id="wmd-button-bar" class="wmd-button-bar"></div>
-			<textarea id="wmd-input" class="wmd-input" name="content" cols="20" rows="10"><?php echo file_get_contents($url)?></textarea><br>
+			<textarea id="wmd-input" class="wmd-input" name="content" cols="20" rows="10"><?php echo $oldcontent ?></textarea><br>
 			<input type="submit" name="submit" value="Submit"/>
 		</form>
 		</div>
diff --git a/system/includes/functions.php b/system/includes/functions.php
index 3f348b5..829569e 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -156,13 +156,13 @@ function get_posts($posts, $page = 1, $perpage = 0){
 		$content = MarkdownExtra::defaultTransform(file_get_contents($filepath));
 
 		// Extract the title and body
-		$arr = explode('</h1>', $content);
+		$arr = explode('t-->', $content);
 		if(isset($arr[1])) {
-			$post->title = str_replace('<h1>','',$arr[0]);
+			$post->title = str_replace('<!--t','',$arr[0]);
 			$post->body = $arr[1];
 		}
 		else {
-			$post->title = 'Untitled: ' . date('l jS \of F Y', $post->date);
+			$post->title = ' Untitled: ' . date('l jS \of F Y', $post->date);
 			$post->body = $arr[0];
 		}
 
@@ -322,9 +322,9 @@ function get_bio($author){
 			$content = MarkdownExtra::defaultTransform(file_get_contents($v));
 
 			// Extract the title and body
-			$arr = explode('</h1>', $content);
+			$arr = explode('t-->', $content);
 			if(isset($arr[1])) {
-				$post->title = str_replace('<h1>','',$arr[0]);
+				$post->title = str_replace('<!--t','',$arr[0]);
 				$post->body = $arr[1];
 			}
 			else {
@@ -374,9 +374,9 @@ function get_static_post($static){
 			$content = MarkdownExtra::defaultTransform(file_get_contents($v));
 
 			// Extract the title and body
-			$arr = explode('</h1>', $content);
+			$arr = explode('t-->', $content);
 			if(isset($arr[1])) {
-				$post->title = str_replace('<h1>','',$arr[0]);
+				$post->title = str_replace('<!--t','',$arr[0]);
 				$post->body = $arr[1];
 			}
 			else {
@@ -452,13 +452,13 @@ function get_keyword($keyword){
 				$post->tagb = implode(' » ', $bc);
 
 				// Extract the title and body
-				$arr = explode('</h1>', $content);
+				$arr = explode('t-->', $content);
 				if(isset($arr[1])) {
-					$post->title = str_replace('<h1>','',$arr[0]);
+					$post->title = str_replace('<!--t','',$arr[0]);
 					$post->body = $arr[1];
 				}
 				else {
-					$post->title = 'Untitled: ' . date('l jS \of F Y', $post->date);
+					$post->title = ' Untitled: ' . date('l jS \of F Y', $post->date);
 					$post->body = $arr[0];
 				}