diff --git a/www/newimageid.php3 b/www/newimageid.php3
index 50013a8bb3874de03ad6900e01bf34471547157e..737c8d9d36a9bb1a88f67f182a401b08d709b025 100644
--- a/www/newimageid.php3
+++ b/www/newimageid.php3
@@ -715,13 +715,13 @@ $query_result =
     DBQueryFatal("INSERT INTO images ".
 		 "(imagename, imageid, description, loadpart, loadlength, ".
 		 " part1_osid, part2_osid, part3_osid, part4_osid, ".
-		 " default_osid, path, pid, shared) ".
+		 " default_osid, path, pid, shared, creator, created) ".
 		 "VALUES ".
 		 "  ('$imagename', '$imageid', '$description', $loadpart, ".
 		 "   $loadlength, ".
 		 "   $part1_osid, $part2_osid, $part3_osid, $part4_osid, ".
-		 "   '$default_osid', '$path', '$pid', $shared)");
-
+		 "   '$default_osid', '$path', '$pid', $shared, ".
+	         "   '$uid', now())");
 
 if (!$isadmin || $makedefault) {
     for ($i = 0; $i < count($mtypes_array); $i++) {
diff --git a/www/newimageid_ez.php3 b/www/newimageid_ez.php3
index bd5ffd1ab9894d0b90778e6a23515bf563271156..81c0b497013057b147626802b3152c8017cbdfca 100644
--- a/www/newimageid_ez.php3
+++ b/www/newimageid_ez.php3
@@ -571,17 +571,19 @@ if (TBValidImageID($imageid) || TBValidOSID($imageid)) {
 DBQueryFatal("INSERT INTO images ".
 	     "(imagename, imageid, ezid, description, loadpart, loadlength, ".
 	     " part" . "$loadpart" . "_osid, ".
-	     " default_osid, path, pid, shared) ".
+	     " default_osid, path, pid, shared, creator, created) ".
 	     "VALUES ".
 	     "  ('$imagename', '$imageid', 1, '$description', $loadpart, 1, ".
-	     "   '$imageid', '$imageid', '$path', '$pid', $shared)");
+	     "   '$imageid', '$imageid', '$path', '$pid', $shared, ".
+             "   '$uid', now())");
 
 DBQueryFatal("INSERT INTO os_info ".
 	     "(osname, osid, ezid, description, OS, version, path, magic, ".
-	     " osfeatures, pid) ".
+	     " osfeatures, pid, creator, created) ".
 	     "VALUES ".
 	     "  ('$imagename', '$imageid', 1, '$description', '$os_name', ".
-	     "   '$os_version', NULL, NULL, '$os_features', '$pid')");
+	     "   '$os_version', NULL, NULL, '$os_features', '$pid', ".
+             "   '$uid', now())");
 
 for ($i = 0; $i < count($mtypes_array); $i++) {
     DBQueryFatal("REPLACE INTO osidtoimageid ".
diff --git a/www/newosid.php3 b/www/newosid.php3
index 71433ea0526977b33dc080612891c9f04952ce8b..21e0e2ffeabe2d9352661a08096540e0f9585d12 100644
--- a/www/newosid.php3
+++ b/www/newosid.php3
@@ -169,10 +169,11 @@ if (TBValidOSID($osid)) {
 $query_result =
     DBQueryFatal("INSERT INTO os_info ".
 		 "(osname, osid, description, OS, version, path, magic, ".
-		 " osfeatures, pid, shared) ".
+		 " osfeatures, pid, shared, creator, created) ".
 		 "VALUES ('$osname', '$osid', '$description', '$OS', ".
 		 "        '$os_version', $os_path, '$os_magic', ".
-		 "        '$os_features', '$pid', $os_shared)");
+		 "        '$os_features', '$pid', $os_shared, ".
+	         "        '$uid', now())");
 
 DBQueryFatal("unlock tables");
 
diff --git a/www/showimageid_list.php3 b/www/showimageid_list.php3
index 408b029788c8fb87ad597a06060ba16decf65912..4fec1dda6f15148cf2b04b55ab184dee41eeda23 100644
--- a/www/showimageid_list.php3
+++ b/www/showimageid_list.php3
@@ -41,7 +41,18 @@ if (mysql_num_rows($query_result) == 0) {
 	}
 }
 
-echo "<table border=2 cellpadding=2 cellspacing=2
+SUBPAGESTART();
+SUBMENUSTART("More Options");
+WRITESUBMENUBUTTON("Create an Image Descriptor",
+		   "newimageid_explain.php3");
+WRITESUBMENUBUTTON("Create an OS Descriptor",
+		   "newosid_form.php3");
+WRITESUBMENUBUTTON("Back to OS Descriptor list",
+		   "showosid_list.php3");
+SUBMENUEND();
+SUBPAGEEND();
+
+echo "<table border=2 cellpadding=0 cellspacing=2
        align='center'>\n";
 
 echo "<tr>
@@ -66,13 +77,6 @@ while ($row = mysql_fetch_array($query_result)) {
 }
 echo "</table>\n";
 
-# Create option.
-echo "<br><center>
-       <A href='newimageid_explain.php3'>Create a new Image Descriptor?</a>
-      </center>\n";
-
-echo "<br><br>\n";
-
 #
 # Standard Testbed Footer
 # 
diff --git a/www/showosid_list.php3 b/www/showosid_list.php3
index 05b06c9daef5b7de2f2607575f531582bece718d..8a6b5d64dc0c7ce8490a3ba3a020ea4993a243eb 100644
--- a/www/showosid_list.php3
+++ b/www/showosid_list.php3
@@ -43,6 +43,17 @@ if (mysql_num_rows($query_result) == 0) {
 	}
 }
 
+SUBPAGESTART();
+SUBMENUSTART("More Options");
+WRITESUBMENUBUTTON("Create an Image Descriptor",
+		   "newimageid_explain.php3");
+WRITESUBMENUBUTTON("Create an OS Descriptor",
+		   "newosid_form.php3");
+WRITESUBMENUBUTTON("Back to Image Descriptor list",
+		   "showimageid_list.php3");
+SUBMENUEND();
+SUBPAGEEND();
+
 echo "<table border=2 cellpadding=0 cellspacing=2
        align='center'>\n";
 
@@ -66,10 +77,6 @@ while ($row = mysql_fetch_array($query_result)) {
 }
 echo "</table>\n";
 
-echo "<br><center>
-      <a href='newosid_form.php3'>Create a new OS Descriptor.</a>
-      </center>\n";
-
 #
 # Standard Testbed Footer
 # 
diff --git a/www/showstuff.php3 b/www/showstuff.php3
index 2078b4d5f2561ef1a4a253737d06cf1349812daa..b60aa2161c4666fbb027fb46695f2e55f90dfb77 100644
--- a/www/showstuff.php3
+++ b/www/showstuff.php3
@@ -683,6 +683,8 @@ function SHOWOSINFO($osid) {
     $os_pid         = $osrow[pid];
     $os_shared      = $osrow[shared];
     $os_osname      = $osrow[osname];
+    $creator        = $osrow[creator];
+    $created        = $osrow[created];
 
     if (!$os_description)
 	$os_description = "&nbsp";
@@ -694,6 +696,8 @@ function SHOWOSINFO($osid) {
 	$os_magic = "&nbsp";
     if (!$os_osfeatures)
 	$os_osfeatures = "&nbsp";
+    if (!$created)
+	$created = "N/A";
 
     #
     # Generate the table.
@@ -710,6 +714,16 @@ function SHOWOSINFO($osid) {
             <td class=\"left\">$os_pid</td>
           </tr>\n";
 
+    echo "<tr>
+            <td>Creator: </td>
+            <td class=left>$creator</td>
+ 	  </tr>\n";
+
+    echo "<tr>
+            <td>Created: </td>
+            <td class=left>$created</td>
+ 	  </tr>\n";
+
     echo "<tr>
             <td>Description: </td>
             <td class=\"left\">$os_description</td>
@@ -784,6 +798,8 @@ function SHOWIMAGEID($imageid, $edit) {
     $path 	 = $row[path];
     $loadaddr	 = $row[load_address];
     $shared	 = $row[shared];
+    $creator     = $row[creator];
+    $created     = $row[created];
 
     if ($edit) {
 	if (!$description)
@@ -800,6 +816,8 @@ function SHOWIMAGEID($imageid, $edit) {
 	    $path = "&nbsp";
 	if (!$loadaddr)
 	    $loadaddr = "&nbsp";
+	if (!$created)
+	    $created = "N/A";
     }
     
     #
@@ -824,6 +842,16 @@ function SHOWIMAGEID($imageid, $edit) {
             <td class=\"left\">$pid</td>
           </tr>\n";
 
+    echo "<tr>
+            <td>Creator: </td>
+            <td class=left>$creator</td>
+ 	  </tr>\n";
+
+    echo "<tr>
+            <td>Created: </td>
+            <td class=left>$created</td>
+ 	  </tr>\n";
+
     echo "<tr>
             <td>Description: </td>
             <td class=left>\n";