diff --git a/bookmark_new.php b/bookmark_new.php
index e042326..8bfd648 100644
--- a/bookmark_new.php
+++ b/bookmark_new.php
@@ -46,7 +46,7 @@ if ($post_title == '' || $post_url == '') {
 	<form action="<?php echo $_SERVER['SCRIPT_NAME'] . "?folderid=" . $folderid; ?>" id="bmnew" method="POST">
 	<p>Title<br>
 	<input type=text name="title" size="50" value="<?php echo $title; ?>"></p>
-	<p>Homepage<br>
+	<p>URL<br>
 	<input type=text name="url" size="50" value="<?php echo $url; ?>"></p>
 	<p>Description<br>
 	<textarea name="description" cols="50" rows="8"><?php echo $post_description; ?></textarea></p>
@@ -119,4 +119,4 @@ else {
 	}
 }
 require_once (ABSOLUTE_PATH . "footer.php");
-?>
\ No newline at end of file
+?>
diff --git a/index.php b/index.php
index ea4623c..ec59f15 100644
--- a/index.php
+++ b/index.php
@@ -133,34 +133,17 @@ else {
 	<!-- Bookmarks starts here. -->
 	<div class="bookmarks" style="height: <?php echo $table_height; ?>;">
 
-	<div class="bookmarkcaption" style="background-color: #bbb;">
-	<div class="bmleft">
-		<input type="checkbox" name="CheckAll" onClick="selectthem('checkall', this.checked)">
-		<img src="./images/bookmark_image.gif" alt="" class="invisible">
-	</div>
-	<div class="bmright">
-		<span class="date">
-			<a href="./index.php?expand=<?php echo implode(",", $expand); ?>&folderid=<?php echo $folderid; ?>&order=date" class="f">Date <img src="./images/ascending.gif" alt="">
-		</span>
-
-		<img src="./images/edit.gif"   alt="" class="invisible">
-		<img src="./images/move.gif"   alt="" class="invisible">
-		<img src="./images/delete.gif" alt="" class="invisible">
-	</div>
-	<div class="link">
-		<a href="./index.php?expand=<?php echo implode(",", $expand); ?>&folderid=<?php echo $folderid; ?>" class="f">Name <img src="./images/ascending.gif" alt=""></a>
-	</div>
-</div>
-
 	<?php
 
+	display_bookmark_header ();
+
 	require_once (ABSOLUTE_PATH . "bookmarks.php");
 	$query = sprintf ("SELECT title, url, description, UNIX_TIMESTAMP(date) AS timestamp, id, favicon, public
 		FROM bookmark 
 		WHERE user='%s'
 		AND childof='%d'
 		AND deleted!='1'
-		ORDER BY $order",
+		ORDER BY $order[1]",
 		$mysql->escape ($username),
 		$mysql->escape ($folderid));
 
diff --git a/lib/lib.php b/lib/lib.php
index b01f89d..7a5b6f6 100644
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -174,16 +174,22 @@ function set_get_noconfirm () {
 
 function set_get_order () {
 	if (!isset ($_GET['order']) || $_GET['order'] == '') {
-		$return = "title";
+		$return = array ("titleasc", "title ASC");
 	}
-	else if ($_GET['order'] == 'date') {
-		$return = 'date';
+	else if ($_GET['order'] == 'datedesc') {
+		$return = array ("datedesc", "date DESC");
 	}
-	else if ($_GET['order'] == 'title') {
-		$return = 'title';
+	else if ($_GET['order'] == 'dateasc') {
+		$return = array ("dateasc", "date ASC");
+	}
+	else if ($_GET['order'] == 'titledesc') {
+		$return = array ("titledesc", "title DESC");
+	}
+	else if ($_GET['order'] == 'titleasc') {
+		$return = array ("titleasc", "title ASC");
 	}
 	else {
-		$return = 'title';
+		$return = array ("titleasc", "title ASC");
 	}
 	return $return;
 }
@@ -456,4 +462,44 @@ function object_count () {
 	echo $return;
 }
 
+function display_bookmark_header () {
+	global $expand, $folderid, $order, $settings;
+
+	if ($order[0] == 'titleasc')	{
+		$sort_t = 'titledesc';
+	}
+	else {
+		$sort_t = 'titleasc';
+	}
+	if ($order[0] == 'dateasc')	{
+		$sort_d = 'datedesc';
+	}
+	else {
+		$sort_d = 'dateasc';
+	}
+
+	?>
+	<div class="bookmarkcaption">
+		<div class="bmleft">
+			<input type="checkbox" name="CheckAll" onClick="selectthem('checkall', this.checked)">
+		</div>
+		<?php if ($settings['show_column_date']) : ?>
+		<div class="bmright">
+			<span class="date">
+				<a href="./index.php?expand=<?php echo implode(",", $expand); ?>&folderid=<?php echo $folderid; ?>&order=<?php echo $sort_d; ?>" class="f">Date <img src="./images/ascending.gif" alt="">
+			</span>
+	
+			<img src="./images/edit.gif"   alt="" class="invisible">
+			<img src="./images/move.gif"   alt="" class="invisible">
+			<img src="./images/delete.gif" alt="" class="invisible">
+		</div>
+		<?php endif; ?>
+		<div class="link">
+			<img src="./images/bookmark_image.gif" alt="" class="invisible">
+			<a href="./index.php?expand=<?php echo implode(",", $expand); ?>&folderid=<?php echo $folderid; ?>&order=<?php echo $sort_t; ?>" class="f">Title <img src="./images/ascending.gif" alt=""></a>
+		</div>
+	</div>
+	<?php
+}
+
 ?>
\ No newline at end of file
diff --git a/shared.php b/shared.php
index c17fe9e..8c6d773 100644
--- a/shared.php
+++ b/shared.php
@@ -73,39 +73,41 @@ if (isset ($_GET['user']) && check_username ($user)) {
 	<!-- Bookmarks starts here. -->
 	<div class="bookmarks" style="height: <?php echo $table_height; ?>;">
 
-	    <?php
-	    require_once (ABSOLUTE_PATH . "bookmarks.php");
-	    $query = sprintf ("SELECT title, url, description, UNIX_TIMESTAMP(date) AS timestamp, id, favicon
-	            FROM bookmark
-	            WHERE user='%s'
-	            AND childof='%d'
-	            AND deleted!='1'
-	            AND public='1'
-	            ORDER BY title",
-	            $mysql->escape ($user),
-	            $mysql->escape ($folderid));
-	
-	    if ($mysql->query ($query)) {
-	            $bookmarks = array ();
-	            while ($row = mysql_fetch_assoc ($mysql->result)) {
-	                    array_push ($bookmarks, $row);
-	            }
-	            list_bookmarks ($bookmarks,
-	                    false,
-	                    false,
-	                    $settings['show_bookmark_icon'],
-	                    true,
-	                    $settings['show_bookmark_description'],
-	                    $settings['show_column_date'],
-	                    false,
-	                    false,
-	                    false,
-	                    false);
-	    }
-	    else {
-	            message ($mysql->error);
-	    }
-	    ?>
+    <?php
+
+    require_once (ABSOLUTE_PATH . "bookmarks.php");
+    $query = sprintf ("SELECT title, url, description, UNIX_TIMESTAMP(date) AS timestamp, id, favicon
+            FROM bookmark
+            WHERE user='%s'
+            AND childof='%d'
+            AND deleted!='1'
+            AND public='1'
+            ORDER BY title",
+            $mysql->escape ($user),
+            $mysql->escape ($folderid));
+
+    if ($mysql->query ($query)) {
+            $bookmarks = array ();
+            while ($row = mysql_fetch_assoc ($mysql->result)) {
+                    array_push ($bookmarks, $row);
+            }
+            list_bookmarks ($bookmarks,
+                    false,
+                    false,
+                    $settings['show_bookmark_icon'],
+                    true,
+                    $settings['show_bookmark_description'],
+                    $settings['show_column_date'],
+                    false,
+                    false,
+                    false,
+                    false);
+    }
+    else {
+            message ($mysql->error);
+    }
+
+    ?>
 	
 	<!-- Bookmarks ends here. -->
 	</div>
diff --git a/style.css b/style.css
index c29b568..ba463d5 100644
--- a/style.css
+++ b/style.css
@@ -134,6 +134,7 @@ div.bookmark {
 }
 div.bookmarkcaption {
 	padding: 2px 2px 2px 4px;
+	background-color: #bbb;
 }
 div.bookmark:hover {
 	background-color: #eee;