diff --git a/admin/addVendor.php b/admin/addVendor.php
deleted file mode 100644
index 51cfb64..0000000
--- a/admin/addVendor.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-include("path.php");
-require(BASE."include/incl.php");
-require(BASE."include/vendor.php");
-
-if(!$_SESSION['current']->hasPriv("admin"))
-{
-    errorpage();
-    exit;
-}
-$oVendor = new Vendor($_REQUEST['vendorId']);
-if($_REQUEST['submit'])
-{
-    $oVendor->update($_REQUEST['name'],$_REQUEST['webpage']);
-    redirect(apidb_fullurl("admin/adminVendors.php"));
-}
-else
-{
-apidb_header("Add Vendor");
-echo "<form method=\"post\" action=\"addVendor.php\">
-      <input type=\"hidden\" name=\"vendorId\" value=\"".$oVendor->iVendorId."\" /> 
-      <table border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"2\">
-        <tr>
-          <td width=\"15%\" class=\"box-label\"><b>Vendor name</b></td>
-          <td class=\"box-body\">
-            <input type=\"text\" size=\"50\" name=\"name\" value=\"".$oVendor->sName."\" /> 
-          </td>
-        </tr>
-        <tr>
-          <td width=\"15%\" class=\"box-label\"><b>Vendor URL</b></td>
-          <td class=\"box-body\">
-            <input type=\"text\" size=\"50\" name=\"webpage\" value=\"".$oVendor->sWebpage."\" /> 
-          </td>
-        </tr>
-        <tr>
-          <td colspan=\"2\" class=\"box-body\">
-            <input type=\"submit\" name=\"submit\" value=\"Submit\" />
-          </td>
-        </tr>
-      </table>
-      </form>";
-}
-apidb_footer();
-?>
diff --git a/admin/adminVendors.php b/admin/adminVendors.php
deleted file mode 100644
index 1010e33..0000000
--- a/admin/adminVendors.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/*************************************************************/
-/* code to view and maintain the list of application vendors */
-/*************************************************************/
-
-/*
- * application environment
- */ 
-include("path.php");
-require(BASE."include/incl.php");
-require_once(BASE."include/vendor.php");
-
-if(!$_SESSION['current']->hasPriv("admin"))
-{
-    errorpage("Insufficient privileges.");
-    exit;
-}
-if ($_REQUEST['sub'])
-{
-    if($_REQUEST['sub'] == 'delete')
-    {
-        $oVendor = new Vendor($_REQUEST['vendorId']);
-        $oVendor->delete();
-        redirect(apidb_fullurl("admin/adminVendors.php"));
-    }
-} else
-{
-    apidb_header("Admin Vendors");
-
-    //get available vendors
-    $sQuery = "SELECT vendorId FROM vendor ORDER BY vendorName, vendorId;";
-    $hResult = query_appdb($sQuery);
-
-    // show vendorlist
-    echo html_frame_start("","90%","",0);
-    echo "<table width='100%' border=0 cellpadding=3 cellspacing=0>\n\n";
-
-    echo "<tr class=color4>\n";
-    echo "    <td>Vendor name</td>\n";
-    echo "    <td>Vendor url</td>\n";
-    echo "    <td>Linked apps</td>\n";
-    echo "    <td align=\"center\">Action</td>\n";
-    echo "</tr>\n\n";
-        
-    $c = 1;
-    while($ob = mysql_fetch_object($hResult))
-    {
-        if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; }
-        $oVendor = new Vendor($ob->vendorId);
-        echo "<tr class=\"$bgcolor\">\n";
-        echo "    <td><a href=\"".BASE."vendorview.php?vendorId=".$oVendor->iVendorId."\">".$oVendor->sName."</a></td>\n";
-        echo "    <td><a href=\"".$oVendor->sWebpage."\">".$oVendor->sWebpage."</a></td>\n";
-        echo "    <td>".sizeof($oVendor->aApplicationsIds)."</td>\n";
-        echo "    <td align=\"center\">[<a href='addVendor.php?vendorId=".$oVendor->iVendorId."'>edit</a>] &nbsp; [<a href='adminVendors.php?sub=delete&vendorId=".$oVendor->iVendorId."'>delete</a>]";
-        echo "        </td>\n";
-        echo "</tr>\n\n";
-        $c++;
-    }
-    echo "</table>\n\n";
-    echo html_frame_end("&nbsp;");
-}
-
-apidb_footer();
-?>
diff --git a/admin/editVendor.php b/admin/editVendor.php
index c135e1c..716272e 100644
--- a/admin/editVendor.php
+++ b/admin/editVendor.php
@@ -1,44 +1,39 @@
 <?php
 include("path.php");
-require(BASE."include/incl.php");
-require(BASE."include/vendor.php");
+require_once(BASE."include/incl.php");
+require_once(BASE."include/vendor.php");
 
 if(!$_SESSION['current']->hasPriv("admin"))
 {
     errorpage();
     exit;
 }
-$oVendor = new Vendor($_REQUEST['vendorId']);
-if($_REQUEST['submit'])
+
+$oVendor = new Vendor($_REQUEST['iVendorId']);
+if($_REQUEST['Submit'])
 {
-    $oVendor->update($_REQUEST['name'],$_REQUEST['webpage']);
-    redirect(apidb_fullurl("admin/adminVendors.php"));
+    $oVendor->update($_REQUEST['sName'],$_REQUEST['sWebpage']);
+    redirect(apidb_fullurl("vendorview.php"));
 }
 else
 {
-    apidb_header("Edit Vendor");
-    echo "<form method=\"post\" action=\"addVendor.php\">
-          <input type=\"hidden\" name=\"vendorId\" value=\"".$oVendor->iVendorId."\" /> 
-          <table border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"2\">
-            <tr>
-              <td width=\"15%\" class=\"box-label\"><b>Vendor name</b></td>
-              <td class=\"box-body\">
-                <input type=\"text\" size=\"50\" name=\"name\" value=\"".$oVendor->sName."\" /> 
-              </td>
-            </tr>
-            <tr>
-              <td width=\"15%\" class=\"box-label\"><b>Vendor URL</b></td>
-              <td class=\"box-body\">
-                <input type=\"text\" size=\"50\" name=\"webpage\" value=\"".$oVendor->sWebpage."\" /> 
-              </td>
-            </tr>
-            <tr>
-              <td colspan=\"2\" class=\"box-body\">
-                <input type=\"submit\" name=\"submit\" value=\"Submit\" />
-              </td>
-            </tr>
-          </table>
-          </form>";
+    if($oVendor->iVendorId)
+        apidb_header("Edit Vendor");
+    else
+        apidb_header("Add Vendor");
+
+    // Show the form
+    echo '<form name="qform" action="'.$_SERVER['PHP_SELF'].'" method="post" enctype="multipart/form-data">',"\n";
+
+    $oVendor->OutputEditor();
+
+    echo '<tr valign=top><td class=color3 align=center colspan=2>',"\n";
+    echo '<input name="Submit" type="submit" value="Submit" class="button" >&nbsp',"\n";
+    echo '</td></tr>',"\n";
+
+    echo "</form>";
+    echo html_frame_end("&nbsp;");
     apidb_footer();
+
 }
 ?>
diff --git a/include/sidebar.php b/include/sidebar.php
index 6855813..35dd9e3 100644
--- a/include/sidebar.php
+++ b/include/sidebar.php
@@ -3,6 +3,7 @@
 /* SideBar */
 /***********/
 require_once(BASE."include/distributions.php");
+require_once(BASE."include/vendor.php");
   
 function global_sidebar_menu() {
   
@@ -19,6 +20,7 @@ function global_sidebar_menu() {
     $g->add("Help &amp; Documentation", BASE."help/");
     $g->add("AppDB Stats", BASE."appdbStats.php");
     $g->add("View Distributions (".getNumberOfDistributions().")", BASE."distributionView.php");
+    $g->add("View Vendors (".getNumberOfvendors().")", BASE."vendorview.php");
 
     $g->add("Email your suggestions for improving the AppDB", "mailto:appdb@winehq.org");
     $g->done();    
diff --git a/include/sidebar_admin.php b/include/sidebar_admin.php
index 7758eb4..7f3e9b3 100644
--- a/include/sidebar_admin.php
+++ b/include/sidebar_admin.php
@@ -10,7 +10,7 @@ function global_admin_menu() {
     $g = new htmlmenu("Global Admin");
     
     $g->add("Add Category", BASE."admin/addCategory.php");
-    $g->add("Add Vendor", BASE."admin/addVendor.php");
+    $g->add("Add Vendor", BASE."admin/editVendor.php");
     
     $g->addmisc("&nbsp;");
     $g->add("View App Queue (".$_SESSION['current']->getQueuedAppCount()."/".$_SESSION['current']->getQueuedVersionCount().")", BASE."admin/adminAppQueue.php");
diff --git a/include/vendor.php b/include/vendor.php
index 6bc03c6..420b9c8 100644
--- a/include/vendor.php
+++ b/include/vendor.php
@@ -115,5 +115,36 @@ class Vendor {
             addmsg("The vendor has been deleted.", "green");
         }
     }
+
+    function OutputEditor()
+    {
+        echo html_frame_start("Vendor Form", "90%", "", 0);
+        echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n";
+
+        // Name
+        echo '<tr valign=top><td class="color1" width="20%"><b>Vendor Name</b></td>',"\n";
+        echo '<td class="color0"><input type=text name="sName" value="'.$this->sName.'" size="50"></td></tr>',"\n";
+        // Url
+        echo '<tr valign=top><td class="color1"><b>Vendor Url</b></td>',"\n";
+        echo '<td class="color0"><input type=text name="sWebpage" value="'.$this->sWebpage.'" size="50"></td></tr>',"\n";
+
+        echo  '<input type="hidden" name="iVendorId" value="'.$this->iVendorId.'">',"\n";
+
+        echo "</table>\n";
+        echo html_frame_end();
+    }
+
+}
+
+/* Get the total number of Vendors in the database */
+function getNumberOfVendors()
+{
+    $hResult = query_appdb("SELECT count(*) as num_vendors FROM vendor");
+    if($hResult)
+    {
+      $row = mysql_fetch_object($hResult);
+      return $row->num_vendors;
+    }
+    return 0;
 }
 ?>
diff --git a/vendorview.php b/vendorview.php
index 20e3b7f..087f6ee 100644
--- a/vendorview.php
+++ b/vendorview.php
@@ -7,69 +7,105 @@
  * application environment
  */ 
 include("path.php");
-require(BASE."include/incl.php");
-require(BASE."include/application.php");
+require_once(BASE."include/incl.php");
+require_once(BASE."include/application.php");
+require_once(BASE."include/vendor.php");
 
-$vendorId = $_REQUEST['vendorId'];
+$oVendor = new Vendor($_REQUEST['vendorId']);
 
-//exit with error if no vendor
-if(!$vendorId) {
-    errorpage("No vendor ID specified!");
-    exit;
-}
-
-//get vendor, die with error if no match
-$result = query_appdb("SELECT * FROM vendor WHERE vendorId = $vendorId");
-if(!$result || mysql_num_rows($result) != 1) {
-    errorpage("Invalid vendor ID!");
-    exit;
-}
-
-//show admin sidebar if user is admin
-if($_SESSION['current']->hasPriv("admin")) {
-    apidb_sidebar_add("admin_menu");
-}
-
-//get data
-$vendor = mysql_fetch_object($result);
-
-//display page
-apidb_header("View Vendor");
-echo html_frame_start("Vendor Information",500);
-
-echo "Vendor Name: $vendor->vendorName <br />\n";
-
-if ($vendor->vendorURL) {
-	echo "Vendor URL:  <a href='$vendor->vendorURL'>$vendor->vendorURL</a> <br />\n";
-}
-
-$result = query_appdb("SELECT * FROM appFamily WHERE vendorId = $vendorId ORDER BY appName");
-if($result)
+if ($_REQUEST['sub'])
 {
-    echo "<br />Applications by $vendor->vendorName<br /><ol>\n";
-    while($app = mysql_fetch_object($result))
-	{
-	    echo "<li> <a href='appview.php?appId=$app->appId'> $app->appName </a> </li>\n";
-	}
-    echo "</ol>\n";
-}
+    if(!$_SESSION['current']->hasPriv("admin"))
+    {
+        errorpage("Insufficient privileges.");
+        exit;
+    }
 
-echo html_frame_end();
-echo html_back_link(1);
-apidb_footer();
+    if($_REQUEST['sub'] == 'delete')
+    {
+        $oVendor->delete();
+        redirect($_SERVER['PHP_SELF']);
+   }
+
+} 
 
 
-
-// SUBS //
-
-//admin menu for sidebar
-function admin_menu()
+if($oVendor->iVendorId)
 {
-    global $vendorId;
+    //display page
+    apidb_header("View Vendor");
+    echo html_frame_start("Vendor Information",500);
+
+    echo 'Vendor Name: '.$oVendor->sName.'<br />',"\n";
+
+    if ($oVendor->sWebpage)
+        echo 'Vendor URL:  <a href="'.$oVendor->sWebpage.'">'.$oVendor->vendorURL.'</a> <br />',"\n";
+
+
+    if($oVendor->aApplicationsIds)
+    {
+        echo '<br />Applications by '.$oVendor->sName.'<br /><ol>',"\n";
+        foreach($oVendor->aApplicationsIds as $iAppId)
+        {
+            $oApp  = new application($iAppId);
+            echo '<li> <a href="appview.php?appId='.$oApp->iAppId.'">'.$oApp->sName.'</a> </li>',"\n";
+        }
+        echo '.</ol>',"\n";
+    }
+
+
+    echo html_frame_end();
+    echo html_back_link(1);
+    apidb_footer();
+
+}
+else
+{
+    apidb_header("View Vendors");
+
+    //get available vendors
+    $sQuery = "SELECT vendorId FROM vendor ORDER BY vendorName, vendorId;";
+    $hResult = query_appdb($sQuery);
+
+    // show vendorlist
+    echo "<table width='100%' border=0 cellpadding=3 cellspacing=0>\n\n";
+
+    echo '<tr class="color4">',"\n";
+    echo '<td>Vendor name</td>',"\n";
+    echo '<td>Vendor\'s Web Page</td>',"\n";
+    echo '<td align="right">linked Apps</td>',"\n";
+    if ($_SESSION['current']->hasPriv("admin"))
+    {
+        echo '<td align="center">Action</td>',"\n";
+    }
+    echo '</tr>',"\n";
+        
+    $c = 1;
+    while($ob = mysql_fetch_object($hResult))
+    {
+        if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; }
+        $oVendor = new Vendor($ob->vendorId);
+        echo '<tr class="'.$bgcolor.'">',"\n";
+        echo '<td><a href="'.BASE.'vendorview.php?vendorId='.$oVendor->iVendorId.'">'.$oVendor->sName.'</a></td>',"\n";
+        echo '<td><a href="'.$oVendor->sWebpage.'">'.substr($oVendor->sWebpage,0,30).'</a></td>',"\n";
+        echo '<td align="right">'.sizeof($oVendor->aApplicationsIds).'</td>',"\n";
+        if ($_SESSION['current']->hasPriv("admin"))
+        {
+            echo '<td align="center">',"\n";
+            echo '[<a href="'.BASE.'admin/editVendor.php?iVendorId='.$oVendor->iVendorId.'">edit</a>]',"\n";
+            if(!sizeof($oVendor->aApplicationsIds)) 
+                echo '&nbsp[<a href="'.$_SERVER['PHP_SELF'].'?sub=delete&vendorId='.$oVendor->iVendorId.'">delete</a>]',"\n";
+            echo '</td>',"\n";
+        }
+        echo '</tr>',"\n";
+        $c++;
+    }
+
+    echo '<tr><td>',"\n";
+    echo html_back_link(1);
+    echo '</td></tr></table>',"\n";
+    apidb_footer();
 
-    $m = new htmlmenu("Admin");
-    $m->add("Edit this vendor", "admin/editVendor.php?vendorId=$vendorId");
-    $m->done();
 }
 
 ?>