diff --git a/xCAT-web/prefs.php b/xCAT-web/config/prefs.php
similarity index 66%
rename from xCAT-web/prefs.php
rename to xCAT-web/config/prefs.php
index f5caf495d..e29b87bfe 100644
--- a/xCAT-web/prefs.php
+++ b/xCAT-web/config/prefs.php
@@ -1,13 +1,11 @@
 <?php
-/*------------------------------------------------------------------------------
-  Include files, insert header and menu bar
-------------------------------------------------------------------------------*/
 
-require_once "$TOPDIR/functions.php";	//NOTE: it is essential to include this file before include top.php and nav.php
+// Allow the user to set preferences for this web interface
 
-insertHeader('Preferences', NULL, NULL);
-insertNav('prefs');
-if (isAIX()) { $aixDisabled = 'disabled'; }
+$TOPDIR = '..';
+require_once "$TOPDIR/lib/functions.php";
+
+insertHeader('Preferences', NULL, NULL, array('config','prefs'));
 ?>
 <FORM NAME="prefs">
 <TABLE class="inner_table" cellspacing=0 cellpadding=5>
@@ -30,7 +28,6 @@ if (isAIX()) { $aixDisabled = 'disabled'; }
 </TD>
 </TR>
 </TABLE>
-<script type="text/javascript" src="function.js"> </script>
 <SCRIPT language="JavaScript">
 <!--
 
diff --git a/xCAT-web/config/site.php b/xCAT-web/config/site.php
new file mode 100644
index 000000000..838cec91e
--- /dev/null
+++ b/xCAT-web/config/site.php
@@ -0,0 +1,11 @@
+<?php
+
+// Display/change global settings in the site table
+
+$TOPDIR = '..';
+require_once "$TOPDIR/lib/functions.php";
+
+insertHeader('Site', NULL, NULL, array('config','site'));
+insertNotDoneYet();
+echo '</body></html>';
+?>
diff --git a/xCAT-web/deploy/osimages.php b/xCAT-web/deploy/osimages.php
new file mode 100644
index 000000000..b697c8f4a
--- /dev/null
+++ b/xCAT-web/deploy/osimages.php
@@ -0,0 +1,11 @@
+<?php
+
+// Manage OS images for deployment to nodes
+
+$TOPDIR = '..';
+require_once "$TOPDIR/lib/functions.php";
+
+insertHeader('OS Images', NULL, NULL, array('deploy','osimages'));
+insertNotDoneYet();
+echo '</body></html>';
+?>
diff --git a/xCAT-web/images/topl.jpg b/xCAT-web/images/topl.jpg
new file mode 100644
index 000000000..83f60b7c1
Binary files /dev/null and b/xCAT-web/images/topl.jpg differ
diff --git a/xCAT-web/images/topr.jpg b/xCAT-web/images/topr.jpg
new file mode 100644
index 000000000..c6a85332d
Binary files /dev/null and b/xCAT-web/images/topr.jpg differ
diff --git a/xCAT-web/images/xCAT_icon.gif b/xCAT-web/images/xCAT_icon-l.gif
similarity index 100%
rename from xCAT-web/images/xCAT_icon.gif
rename to xCAT-web/images/xCAT_icon-l.gif
diff --git a/xCAT-web/index.php b/xCAT-web/index.php
index 2854adfee..8595db178 100644
--- a/xCAT-web/index.php
+++ b/xCAT-web/index.php
@@ -1,89 +1,7 @@
 <?php
 
-// Main page of the xCAT web interface
+// Main page of the xCAT web interface, but will redirect to the default page
 
-$TOPDIR = '.';
-require_once "$TOPDIR/functions.php";
-if (isAIX()) { $aixDisabled = 'disabled'; }
+header( 'Location: machines/groups.php' ) ;
 
-require_once("lib/GroupNodeTable.class.php");
-require_once("lib/XCAT/XCATCommand/XCATCommandRunner.class.php");
-
-insertHeader('Nodes', array('index.css'), NULL, array('machines','nodes'));
-
-echo "<div id=content align=center>\n";
-
-insertButtons(array(
-	array(
-		'Attributes',
-		'Create Like',
-		'Create Group',
-		'Ping',
-		//'Updatenode',
-		'Run Cmd',
-		'Copy Files'
-	),
-	array(
-		//'Soft Maint',
-		'HW Ctrl',
-		'RSA/MM/FSP',
-		'Install',
-		'Perf Mon',
-		//'Webmin',
-		'Diagnose',
-		'Remove'
-	),
-	/*
-	array(
-		'name=propButton value="Attributes"',
-		'name=defineButton value="Create Like"',
-		'name=createGroupButton value="Create Group"',
-		'name=pingNodesButton value="Ping"',
-		//'name=updateButton value="Updatenode"',
-		'name=runcmdButton value="Run Cmd"',
-		'name=copyFilesButton value="Copy Files"'
-	),
-	array(
-		//'name=softMaintButton value="Soft Maint" onclick="this.form.nodesNeeded=1;"',
-		'name=hwctrlButton value="HW Ctrl"',
-		'name=rsaButton value="RSA/MM/FSP" onclick="this.form.nodesNeeded=1;"',
-		'name=installButton value="Install"',
-		'name=perfmonButton value="Perf Mon"',
-		//'name=webminButton value="Webmin" onclick="this.form.nodesNeeded=1;"',
-		'name=diagButton value="Diagnose" onclick="this.form.nodesNeeded=1;"',
-		'name=removeButton value="Remove"'
-	),
-	*/
-));
-
-echo '<form name="nodelist" class=ContentForm>';
-
-/* $output = array(); runcmd("/bin/sudo listattr", 2, $output); foreach ($output as $line) { echo "<p>line=$line</p>"; } */
-
-GroupNodeTable::insertGroupTableHeader();
-
-// Get the names and status of the groups
-$groups = getGroupStatus();
-
-// Print the HTML for each of them
-foreach($groups as $group => $status) {
-	//echo "<p>$group status is $status</p>";
-	echo GroupNodeTable::insertGroupTableRow($group, $status);
-}
-
-GroupNodeTable::insertGroupTableFooter();
-
-echo <<<EOS
-<!-- <SCRIPT language="JavaScript"> XCATEvent.doExpandNodes(); </SCRIPT> -->
-</form>
-<table>
-<tr><td><img src="$TOPDIR/images/green-ball-m.gif"></td><td align=left>Node is good (Status is ready/pbs/sshd)</td></tr>
-<tr><td><img src="$TOPDIR/images/red-ball-m.gif"></td><td align=left>Node is bad (Status is 'noping')</td></tr>
-<tr><td><img src="$TOPDIR/images/yellow-ball-m.gif"></td><td align=left>Other status (unknown/node unavailable...)</td></tr>
-</table>
-<p id=disclaimer>This interface is still under construction and not yet ready for use.</p>
-</div>
-</BODY>
-</HTML>
-EOS;
 ?>
\ No newline at end of file
diff --git a/xCAT-web/jobs/overview.php b/xCAT-web/jobs/overview.php
new file mode 100644
index 000000000..574cbca50
--- /dev/null
+++ b/xCAT-web/jobs/overview.php
@@ -0,0 +1,11 @@
+<?php
+
+// Manage OS images for deployment to nodes
+
+$TOPDIR = '..';
+require_once "$TOPDIR/lib/functions.php";
+
+insertHeader('Jobs Overview', NULL, NULL, array('jobs','overview'));
+insertNotDoneYet();
+echo '</body></html>';
+?>
diff --git a/xCAT-web/lib/functions.php b/xCAT-web/lib/functions.php
index fbd3b6d28..845afaa0c 100644
--- a/xCAT-web/lib/functions.php
+++ b/xCAT-web/lib/functions.php
@@ -60,16 +60,17 @@ if ($javascripts) {
 echo "</head><body>\n";
 echo <<<EOS
 <table id=headingTable border=0 cellspacing=0 cellpadding=0>
-<tr>
-    <td><img id=xcatImage src='$TOPDIR/images/xCAT_icon.gif'></td>
-    <td width='100%'>
+<tr valign=top>
+    <td><img src='$TOPDIR/images/topl.jpg'></td>
+    <td class=TopMiddle><img id=xcatImage src='$TOPDIR/images/xCAT_icon-l.gif' height=40px></td>
+    <td class=TopMiddle width='100%'>
 
 EOS;
 //echo "<div id=top><img id=xcatImage src='$TOPDIR/images/xCAT_icon.gif'><div id=menuDiv>\n";
 
 insertMenus($currents);
 
-echo "</td></tr></table>\n";
+echo "</td><td><img src='$TOPDIR/images/topr.jpg'></td></tr></table>\n";
 //echo "</div></div>\n";     // end the top div
 }  // end insertHeader
 
@@ -81,19 +82,54 @@ function insertMenus($currents) {
 	echo "<table border=0 cellspacing=0 cellpadding=0>\n";
 
 	insertMenuRow($currents[0], 1, array(
-		'machines' => array('Machines', "$TOPDIR/machines/frames.php"),
-		'jobs' => array('Jobs', "$TOPDIR/jobs/jobs.php"),
-		'deploy' => array('Deploy', "$TOPDIR/deploy/images.php"),
+		'machines' => array('Machines', "$TOPDIR/machines/groups.php"),
+		'jobs' => array('Jobs', "$TOPDIR/jobs/overview.php"),
+		'deploy' => array('Deploy', "$TOPDIR/deploy/osimages.php"),
 		'config' => array('Configuration', "$TOPDIR/config/site.php"),
 		'support' => array('Support', "$TOPDIR/support/diagnose.php")
 	));
 	if ($currents[0] == 'machines') {
 		insertMenuRow($currents[1], 0, array(
-			'lab' => array('Lab Floor', "$TOPDIR/views/lab.php"),
-			'frames' => array('Frames', "$TOPDIR/views/frames.php"),
-			'groups' => array('Groups', "$TOPDIR/views/groups.php"),
-			'nodes' => array('Nodes', "$TOPDIR/views/nodes.php"),
-			'layout' => array('Layout', "$TOPDIR/views/layout.php")
+			'lab' => array('Lab Floor', "$TOPDIR/machines/lab.php"),
+			'frames' => array('Frames', "$TOPDIR/machines/frames.php"),
+			'groups' => array('Groups', "$TOPDIR/machines/groups.php"),
+			'nodes' => array('Nodes', "$TOPDIR/machines/nodes.php"),
+			'layout' => array('Layout', "$TOPDIR/machines/layout.php")
+		));
+	}
+	elseif ($currents[0] == 'jobs') {
+		insertMenuRow($currents[1], 0, array(
+			'overview' => array('Overview', "$TOPDIR/jobs/overview.php"),
+			//todo:  Vallard fill in rest
+		));
+	}
+	elseif ($currents[0] == 'deploy') {
+		insertMenuRow($currents[1], 0, array(
+			'osimages' => array('OS Images', "$TOPDIR/deploy/osimages.php"),
+			'prepare' => array('Prepare', "$TOPDIR/deploy/prepare.php"),
+			'deploy' => array('Deploy', "$TOPDIR/deploy/deploy.php"),
+			'monitor' => array('Monitor', "$TOPDIR/deploy/monitor.php"),
+		));
+	}
+	elseif ($currents[0] == 'config') {
+		insertMenuRow($currents[1], 0, array(
+			'prefs' => array('Preferences', "$TOPDIR/config/prefs.php"),
+			'site' => array('Cluster Settings', "$TOPDIR/config/site.php"),
+			'mgmtnode' => array('Mgmt Node', "$TOPDIR/config/mgmtnode.php"),
+			'monitor' => array('Monitor Setup', "$TOPDIR/config/monitor.php"),
+			'eventlog' => array('Event Log', "$TOPDIR/config/eventlog.php"),
+		));
+	}
+	elseif ($currents[0] == 'support') {
+		insertMenuRow($currents[1], 0, array(
+			'diagnose' => array('Diagnose', "$TOPDIR/support/diagnose.php"),
+			'update' => array('Update', "$TOPDIR/support/update.php"),
+			'howtos' => array('HowTos', "$TOPDIR/support/howtos.php"),
+			'manpages' => array('Man Pages', "$TOPDIR/support/manpages.php"),
+			'maillist' => array('Mail List', "http://xcat.org/mailman/listinfo/xcat-user"),
+			'wiki' => array('Wiki', "http://xcat.wiki.sourceforge.net/"),
+			'suggest' => array('Suggestions', "$TOPDIR/support/suggest.php"),
+			'about' => array('About', "$TOPDIR/support/about.php"),
 		));
 	}
 	echo "</table>\n";
@@ -104,9 +140,9 @@ function insertMenus($currents) {
 function insertMenuRow($current, $isTop, $items) {
 	global $TOPDIR;
 	//$img = "$TOPDIR/images/h3bg_new.gif";
-	$menuRowClass = $isTop ? '' : 'class=MenuRow';
-	$menuItemClass = $isTop ? 'class=MenuItemTop' : 'class=MenuItem';
-	$currentClass = $isTop ? 'CurrentMenuItemTop' : '';
+	$menuRowClass = $isTop ? '' : 'class=MenuRowBottom';
+	$menuItemClass = $isTop ? 'class=MenuItemTop' : '';
+	$currentClass = $isTop ? 'class=CurrentMenuItemTop' : '';
 
 	//echo "<TABLE class=MenuTable id=mainNav cellpadding=0 cellspacing=0 border=0><tr>\n";
 	//echo "<div class=$menuRowClass><ul id=mainNav>\n";
@@ -115,10 +151,10 @@ function insertMenuRow($current, $isTop, $items) {
 	foreach ($items as $key => $link) {
 		if ($key == $current){
 			//echo "<TD><a id=$key href='$link[1]'>$link[0]</a></TD>\n";
-			echo "<li class='CurrentMenuItem $currentClass'>$link[0]</li>\n";
+			echo "<li><p $currentClass>$link[0]</p></li>";
 		} else {
 			//echo "<TD><a class=NavItem id=$key href='$link[1]'>$link[0]</a></TD>\n";
-			echo "<li><a $menuItemClass id=$key href='$link[1]'>$link[0]</a></li>\n";
+			echo "<li><a $menuItemClass id=$key href='$link[1]'>$link[0]</a></li>";
 		}
 	}
 
@@ -395,9 +431,13 @@ function getNodes($group, $noderange) { //------------------------------------
 }
 
 
-// Returns the node groups defined in the cluster.  Not finished.
+// Returns the node groups defined in the cluster.
 function getGroups() {
-	return array('AllNodes','group1','group2');
+	$groups = array();
+	$output = array();
+	runcmd("/bin/sudo listattr", 2, $output);
+	foreach ($output as $grp) { $groups[] = $grp; }
+	return $groups;
 }
 
 
@@ -454,4 +494,6 @@ function insertButtons ($buttonsets) { //------------------------------------
 }
 
 
+function insertNotDoneYet() { echo "<p class=NotDone>This page is not done yet.</p>\n"; }
+
 ?>
diff --git a/xCAT-web/phpinfo.php b/xCAT-web/lib/phpinfo.php
similarity index 100%
rename from xCAT-web/phpinfo.php
rename to xCAT-web/lib/phpinfo.php
diff --git a/xCAT-web/lib/style.css b/xCAT-web/lib/style.css
index 10b1117ef..e5b713e4d 100644
--- a/xCAT-web/lib/style.css
+++ b/xCAT-web/lib/style.css
@@ -1,9 +1,10 @@
 #headingTable {
 	margin: 0 20px 10px 20px;
-	/* background: #FFF url(../images/top.jpg) repeat-x top; */
-	background-color: #002432;
+	/* background-color: #002432; */
 }
 
+.TopMiddle { background: #FFF url(../images/top.jpg) repeat-x top; }
+
 /*
 #top {
 	margin: 0 auto 10px auto;
@@ -13,64 +14,85 @@
 	background-color: #002432;
 	height: 65px;
 }
+
+#topleft {
+	background: transparent url(../images/topl.jpg) no-repeat left;
+	height: 81px;
+}
+#topright {
+	background: transparent url(../images/topr.jpg) no-repeat right;
+	float: right;
+	height: 81px;
+	width: 18px;
+}
 */
 
 #xcatImage {
 	/* float: left; */
-	margin: 5px;
+	margin: 10px 8px 5px 0px;
+	/* height: 30px;   todo: create a smaller icon instead of scaling this on the fly */
 	}
 
-.MenuRow {
+.MenuRowBottom {   /* this is to help with the white border around the current menu items */
 	border-left: 2px solid white;
 	border-right: 2px solid white;
 }
 
-#mainNav {
+#mainNav {   /* the UL the contains the LIs of one row of menu items */
 	/* position: absolute;
 	float: left; */
 	list-style: none;
 	margin: 0px;
+	padding: 0px;
 }
 
-#mainNav li {
-	float: left;
-	font: .8em Verdana, Arial, Sans-Serif;
-	line-height: 2.5em;
+#mainNav li {      /* each menu item */
+	/* float: left; */
+	/* Start: cross-browser inline-block */
+	display: -moz-inline-stack;		/* firefox specific */
+	display: inline-block;		/* the right way (standards compliant browsers) */
+	zoom: 1;			/* internet explorer specific */
+	*display: inline;	/* internet explorer specific */
+	/* End: cross-browser inline-block */
+	line-height: 2.15em;  /*2.5em;*/
 	font-weight: bold;
 	/* border: 1px solid white; */
 }
 
-.CurrentMenuItem {
+#mainNav p  {   /* the LIs that are currently selected */
   display: block;
-  padding: 0 2em;
+  padding: 0 2em;  /*2em;*/
+  margin: 0px;
   background: #09334b;
   color: #fafafa;
 }
 
-.CurrentMenuItemTop {
+.CurrentMenuItemTop {   /* additional style for the current LI in the top menu row */
 	border-left: 2px solid white;
 	border-top: 2px solid white;
 	border-right: 2px solid white;
 	/* border-bottom: 2px solid #09334b; */
 }
 
-.MenuItemTop { border-bottom: 2px solid white; }
-.MenuItem { /* border-bottom: 2px solid #002432; */ }
+.MenuItemTop {    /* the non-current LIs in the top row */
+	/* border-top: 2px solid black; */
+	border-bottom: 2px solid white;
+	}
 
-#mainNav a {
+#mainNav a {       /* the non-current menu items */
   display: block;
-  float: left; /* IE/Mac 5.2 Fix */
-  padding: 0 2em;
+  /* float: left; IE/Mac 5.2 Fix */
+  padding: 0 2em;  /*2em;*/
   text-decoration: none;
   color: #a1a1a1;
   border-left: 1px solid #273942;
   cursor: pointer;
 }
 
-/* IE/Win 5.x Fix */
+/* IE/Win 5.x Fix
 * html #mainNav a {
   width: 1px;
-}
+} */
 
 #mainNav a:hover {
   background: #09334b;
@@ -102,21 +124,24 @@ div#content {
 .ContentForm { margin: 10px 2px 15px 2px; }
 
 BODY {
-	font-size : 10pt;
-	font-family : Arial;
 	margin: 0;
 	padding: 10px;
-	background: url(../images/background.gif) repeat-y;
-	/* background: black; */
+	font: .8em Verdana, Arial, Sans-Serif;
+	/*
+	font-size : 10pt;
+	font-family : Arial;
 	font: normal 12px Tahoma, Verdana, Arial, Helvetica, Sans-Serif;
 	line-height: 1.6em;
-	color: white;  /* #333; */
+	background: url(../images/background.gif) repeat-y;
+	background: black;
+	color: white;  #333;
+	*/
 }
 
 INPUT {vertical-align : middle; font-size : 8pt; font-family : sans-serif; font-weight : bold;}
 SELECT {vertical-align : middle; font-size : 8pt; font-family : sans-serif; font-weight : bold;}
 TEXTAREA {vertical-align : middle; font-size : 8pt; font-family : sans-serif; font-weight : bold;}
-TABLE {font-size : 10pt; font-family : Arial;}
+/* TABLE {font-size : 10pt; font-family : Arial;} */
 /* pre { padding: 0px; margin: 0px; } */
 
 .TableHeader { color: black; background-color : #fffdb0; font-weight : bold; font-size : 9pt; white-space: nowrap; }
@@ -148,6 +173,8 @@ TABLE {font-size : 10pt; font-family : Arial;}
 .NoPadding { padding: 0px; margin: 0px; border: 0px none white; }
 .Hidden { visibility : hidden ;}
 .Txtfld {font-size : 8pt; font-family : sans-serif; font-weight : bold;}
+.NotDone { font-weight: bold; font-size: 11pt; color: red; text-align: center; margin: 5px; }
+
 
 /*
 .but {
diff --git a/xCAT-web/dsh.php b/xCAT-web/machines/dsh.php
similarity index 80%
rename from xCAT-web/dsh.php
rename to xCAT-web/machines/dsh.php
index e3824b3bc..6d7cd9c22 100644
--- a/xCAT-web/dsh.php
+++ b/xCAT-web/machines/dsh.php
@@ -2,19 +2,17 @@
 /*------------------------------------------------------------------------------
   Produce the page for running commands on the nodes of the cluster
 ------------------------------------------------------------------------------*/
-$TOPDIR = '.';
+$TOPDIR = '..';
 $expire_time = gmmktime(0, 0, 0, 1, 1, 2038);
 setcookie("history", "date;hello.sh", $expire_time);
 
-require_once("lib/XCAT/XCATCommand/XCATCommandRunner.class.php");
+require_once "$TOPDIR/lib/functions.php";
+require_once("$TOPDIR/lib/XCAT/XCATCommand/XCATCommandRunner.class.php");
 
-require_once "$TOPDIR/functions.php";
-//require_once "$TOPDIR/nav.php";
+insertHeader('Run Commands on Nodes', array('themes/default.css'),
+			array('javascripts/prototype.js', 'javascripts/effect.js', 'javascripts/window.js'),
+			array('machines','dsh'));
 
-insertHeader('Run commands on xCAT nodes', array('themes/default.css'),
-			array('javascripts/prototype.js', 'javascripts/effect.js', 'javascripts/window.js'));
-insertNav('dsh');
-if (isAIX()) { $aixDisabled = 'disabled'; }
 ?>
 <div id=content>
 <FORM NAME="dsh_options" onsubmit="checkEmpty();">
@@ -28,9 +26,8 @@ if (isAIX()) { $aixDisabled = 'disabled'; }
   	  	<SELECT name=nodegrps id=nodegrpsCboBox class=middle>
   	  	<OPTION value="">Choose ...</OPTION>
   	  	<?php
-  	  	$xcmdr = new XCATCommandRunner();
-  	  	$nodegroups = $xcmdr->getAllGroupNames();
-		foreach ($nodegroups as $key => $group) {
+  	  	$nodegroups = getGroups();
+		foreach ($nodegroups as $group) {
 				//if($group == $currentGroup) { $selected = 'selected'; } else { $selected = ''; }
 				echo "<OPTION value='$group' $selected>$group</OPTION>\n";
 		}
@@ -38,15 +35,15 @@ if (isAIX()) { $aixDisabled = 'disabled'; }
    		</SELECT>
 
    		<?php }else{ ?>
-   		<font class="BlueBack">Run Command on node:</font>
+   		<font class="BlueBack">Run Command on Node:</font>
    		<SELECT name=nodegrps id=nodegrpsCboBox class=middle>
   	  	<OPTION value="">Choose ...</OPTION>
   	  	<?php
-  	  	$xcmdr = new XCATCommandRunner();
-  	  	$nodegroups = $xcmdr->getAllGroupNames();
-		foreach ($nodegroups as $key => $group) {
-				//if($group == $currentGroup) { $selected = 'selected'; } else { $selected = ''; }
-				echo "<OPTION value='$group' $selected>$group</OPTION>\n";
+  	  	$nodes = getNodes(NULL, NULL);
+		foreach ($nodes as $n) {
+				$nodename = $n['hostname'];
+				//if($nodename == $currentGroup) { $selected = 'selected'; } else { $selected = ''; }
+				echo "<OPTION value='$nodename' $selected>$nodename</OPTION>\n";
 		}
 		?>
    		</SELECT>
@@ -164,30 +161,5 @@ if (isAIX()) { $aixDisabled = 'disabled'; }
 <div>
 <script type="text/javascript" src="js_xcat/event.js"> </script>
 <script type="text/javascript" src="js_xcat/ui.js"> </script>
-<SCRIPT language="JavaScript">
-<!--
-// in CSM perl script this portion used to be javascript to get
-// and set cookies, now php has handled it
-
-window.onload = function(){window.document.dsh_options.runCmdButton_top.focus()};
-function _setvars(){
-	var form = window.document.dsh_options;
-	form.command.value = form.history.value;
-}
-function checkEmpty(){
-	var form = window.document.dsh_options;
-	var cmd = form.command.value;
-	if (cmd.length == 0)
-	  {
-	    alert('Enter a command before pressing the Run Cmd button.');
-	    return false;
-	  }
-	else { return true; }
-}
-
-XCATEvent.doRunCmdButton();
-
--->
-</SCRIPT>
 </BODY>
 </HTML>
\ No newline at end of file
diff --git a/xCAT-web/dsh_action.php b/xCAT-web/machines/dsh_action.php
similarity index 100%
rename from xCAT-web/dsh_action.php
rename to xCAT-web/machines/dsh_action.php
diff --git a/xCAT-web/rack.php b/xCAT-web/machines/frames.php
similarity index 99%
rename from xCAT-web/rack.php
rename to xCAT-web/machines/frames.php
index c6ac755d6..537bd3bb8 100644
--- a/xCAT-web/rack.php
+++ b/xCAT-web/machines/frames.php
@@ -1,9 +1,8 @@
 <?php
 /* session_start(); */
-$TOPDIR = '.';
-require_once "$TOPDIR/functions.php";
-insertHeader('xCAT Rack Node List', $TOPDIR, '', '');
-insertNav('nodes', $TOPDIR);
+$TOPDIR = '..';
+require_once "$TOPDIR/lib/functions.php";
+insertHeader('xCAT Frame Node List', NULL, NULL, array('machines','frames'));
 if (isAIX()) { $aixDisabled = 'disabled'; }
 ?>
 
diff --git a/xCAT-web/machines/groups.php b/xCAT-web/machines/groups.php
index 8ce44713e..cd3967222 100644
--- a/xCAT-web/machines/groups.php
+++ b/xCAT-web/machines/groups.php
@@ -16,20 +16,18 @@ echo "<div id=content align=center>\n";
 insertButtons(array(
 	array(
 		'Attributes',
-		'Create Like',
 		'Create Group',
 		'Ping',
 		//'Updatenode',
 		'Run Cmd',
-		'Copy Files'
+		'Copy Files',
+		'Sync Files'
 	),
 	array(
 		//'Soft Maint',
 		'HW Ctrl',
 		'RSA/MM/FSP',
-		'Install',
-		'Perf Mon',
-		//'Webmin',
+		'Deploy',
 		'Diagnose',
 		'Remove'
 	),
diff --git a/xCAT-web/node_table.html b/xCAT-web/node_table.html
deleted file mode 100644
index ba469baa4..000000000
--- a/xCAT-web/node_table.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Untitled Document</title>
-<link rel="stylesheet" href="menu.css">
-</head>
-
-<body>
-<table width="700" border="0" cellspacing="1">
-  <tr bgcolor="#C2CEDE" class="BlueBack">
-    <td><div align="center">Nodes</div></td>
-    <td><div align="center">HW Type</div></td>
-    <td><div align="center">OS</div></td>
-    <td><div align="center">Mode</div></td>
-    <td><div align="center">Status</div></td>
-    <td><div align="center">HW Ctrl Pt</div></td>
-    <td><div align="center">Comment</div></td>
-  </tr>
-  <tr>
-    <td bgcolor="#FFFFFF">&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-</body>
-</html>
diff --git a/xCAT-web/nodes.html b/xCAT-web/nodes.html
deleted file mode 100644
index 846b41848..000000000
--- a/xCAT-web/nodes.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Untitled Document</title>
-<link rel="stylesheet" href="menu.css">
-<style type="text/css">
-<!--
-.style1 {color: #FFFF66}
-.style2 {font-size: 1.1em}
--->
-</style>
-</head>
-
-<body>
-<table border="0" cellspacing="0" align="center">
-  
-  <tr class="White">
-    <td height="20" colspan="2" bgcolor="#CCCCCC">  
-    &nbsp;<span class="style2">&nbsp;<span class="style1">Filter: </span></span>&nbsp;&nbsp;&nbsp;&nbsp; Group    
-     <label></label>     <select name="group" id="group" class="Middle">
-     </select></td>
-    <td height="20" colspan="4" bgcolor="#CCCCCC"><label></label>
-or &nbsp;&nbsp; Node Range
-<input type="text" name="node_range" id="node_range" /></td>
-    <td height="20" bgcolor="#CCCCCC">&nbsp;</td>
-    <td height="20" bgcolor="#CCCCCC">&nbsp;</td>
-    <td height="20" bgcolor="#CCCCCC">&nbsp;</td>
-    <td height="20" bgcolor="#CCCCCC">&nbsp;</td>
-  </tr>
-  <tr>
-    <td colspan="10" bgcolor="#CCCCCC">&nbsp;</td>
-  </tr>
-  <tr class="BlueBack">
-    <td width="80" rowspan="2" bgcolor="#CCCCCC">&nbsp;</td>
-    <td width="80" height="20" background="images/baractive2.gif" bgcolor="#CCCCCC"><div align="center"><a href="#">Attribute</a></div></td>
-    <td width="80" height="20" background="images/baractive2.gif" bgcolor="#CCCCCC"><div align="center"><a href="#">Define Like</a></div></td>
-    <td width="80" height="20" background="images/baractive2.gif" bgcolor="#CCCCCC"><div align="center"><a href="#">Create Group</a></div></td>
-    <td width="80" height="20" background="images/baractive2.gif" bgcolor="#CCCCCC"><div align="center"><a href="#">Ping</a></div></td>
-    <td width="80" height="20" background="images/baractive2.gif" bgcolor="#CCCCCC"><div align="center"><a href="#">Update Nodes</a></div></td>
-    <td width="80" height="20" background="images/baractive2.gif" bgcolor="#CCCCCC"><div align="center"><a href="dsh.php">Run Cmd</a></div></td>
-    <td width="80" height="20" background="images/baractive2.gif" bgcolor="#CCCCCC"><div align="center"><a href="#">Copy Files</a></div></td>
-    <td width="80" height="20" background="images/baractive2.gif" bgcolor="#CCCCCC"><div align="center"><a href="#"></a></div></td>
-    <td width="80" rowspan="2" bgcolor="#CCCCCC">&nbsp;</td>
-  </tr>
-  <tr>
-    <td width="80" height="20" background="images/baractive2.gif" bgcolor="#CCCCCC" class="BlueBack"><div align="center"><a href="#">Soft Maint</a></div></td>
-    <td width="80" height="20" background="images/baractive2.gif" bgcolor="#CCCCCC" class="BlueBack"><div align="center"><a href="#">HW Ctrl</a></div></td>
-    <td width="80" height="20" background="images/baractive2.gif" bgcolor="#CCCCCC" class="BlueBack"><div align="center"><a href="#">RSA/MM/FSP</a></div></td>
-    <td width="80" height="20" background="images/baractive2.gif" bgcolor="#CCCCCC" class="BlueBack"><div align="center"><a href="#">Install</a></div></td>
-    <td width="80" height="20" background="images/baractive2.gif" bgcolor="#CCCCCC" class="BlueBack"><div align="center"><a href="#">Perf Mon</a></div></td>
-    <td width="80" height="20" background="images/baractive2.gif" bgcolor="#CCCCCC" class="BlueBack"><div align="center"><a href="#">Webmin</a></div></td>
-    <td width="80" height="20" background="images/baractive2.gif" bgcolor="#CCCCCC" class="BlueBack"><div align="center"><a href="#">Diagnose</a></div></td>
-    <td width="80" height="20" background="images/baractive2.gif" bgcolor="#CCCCCC" class="BlueBack"><div align="center"><a href="#">Remove</a></div></td>
-  </tr>
-  <tr>
-    <td colspan="10" bgcolor="#CCCCCC">&nbsp;</td>
-  </tr>
-</table>
-</body>
-</html>
diff --git a/xCAT-web/suggestions.html b/xCAT-web/suggestions.html
deleted file mode 100644
index bacf63ca7..000000000
--- a/xCAT-web/suggestions.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio Homepage Builder V6.0.2 for Windows">
-<title>Send Sugestions to the CSM Development Team</title>
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-
-<body>
-
-<h1 class="BlueBack">Send Sugestions to the CSM Development Team</h1>
-
-<p>Suggestions, bug reports, bug fixes, etc., are always welcome. &nbsp;Please post them to the <A href="doc.cgi?book=web&section=forum" target="_parent">CSM forum</A>. &nbsp;Contributions are also welcome, such as minor new features, better
-images, or even whole new pages. &nbsp;See the <a
-href="CSMLinuxGUIWhitepaper.html#developing">developer section of
-the CSM Linux GUI white paper</a> for more info. &nbsp;Thanks!</p>
-
-<h3>Todo List</h3>
-
-<p>The following items are already on our todo list, in
-approximately priority order:</p>
-
-<ul>
-  <li>When the license expires, have to give a good msg from the main page</li>
-  <li>Finish modifying the following pages with the More... links: definenode,
-  definehwdev, dev properties, condition properties, response properties.</li>
-  <li>Change the xcsm-utils resources so they can also be defined in the xcsm
-  dir</li>
-  <li>Add LastEvent to the Condition Attributes page, for releases in which it
-  is supported</li>
-  <li>Have the task pane save the current task in the cookie and have each page set the current task</li>
-  <li>Add list of CSM env vars to Tips section of CSM Config page.</li>
-  <li>Add hw ctrl info to the Add Nodes page</li>
-  <li>Finish rack layout of partitioned pSeries systems</li>
-  <li>Add -c option (adapter config) to updatenode page. &nbsp;Also run cfmupdatenode
-  if only -F specified and smsupdatenode if only -S specified.</li>
-  <li>Monitoring:
-  <ul>
-    <li>Add&nbsp;to Sensor page:
-    <ul>
-      <li>create&nbsp;a&nbsp;mkresources&nbsp;file&nbsp;to&nbsp;facilitate creating/modifying sensors on nodes</li>
-      <li>force the execution of a sensor immediately</li>
-    </ul>
-    </li>
-    <li>Provide an Operator monitoring mode (log in as non-root user and get simpler
-    monitoring page)</li>
-    <li>Add option to monitor in node group view and be able to drill down to the
-    problem node</li>
-    <li>Make drill down on the problem more obvious</li>
-    <li>Add additional conditions/sensors for a more complete &quot;Health Monitoring&quot;</li>
-  </ul>
-  </li>
-  <li>Be able to log in as non-root id and su to root (exploit webmin acls)</li>
-  <li>Display&nbsp;the 1st time user/set up cluster wizard page link automatically
-  if no nodes are defined.</li>
-  <li>Scalabilty improvements: <ul>
-            <li>When a large # of nodes are displayed on the main
-                page, only get the 1st 50.</li>
-  </ul>
-  </li>
-  <li>Fix running perfmondata -h in Tips section of perfmon page, and add it
-  to xcsm/utils</li>
-  <li>Get gnuplot (and plotutils on SLES) installed
-        automatically.</li>
-  <li>Add to the Diagnose MS page to restart the HWCTRLRM with
-        tracing on or off: <ul>
-            <li>stopsrc -s IBM.HWCTRLRM</li>
-            <li>If IBM.HWCTRLRM does not stop within a minute,
-                &quot;ps -ef | grep HW&quot; and kill any
-                processes.</li>
-            <li>Delete the contents of /var/log/csm</li>
-            <li>startsrc -s IBM.HWCTRLRM
-                -eHC_JAVA_VERBOSE=/tmp/jni.txt</li>
-            <li>send the trace files in /var/log/csm and
-                /tmp/jni.txt</li>
-        </ul>
-    </li>
-  <li>Add some items from csmsnap design to Diagnose MS page</li>
-  <li>Clean up code for HW Ctrl page</li>
-  <li>Add BIOS/firmware flashing page</li>
-  <li>Debug or improve opening a console for a node</li>
-  <li>Install page: <ul>
-            <li>Set up page should use InstallTemplate attribute
-                as default for the template file</li>
-            <li>Implement remaining buttons:&nbsp; Test Console,
-                Copy Distros, Run Install Probe.</li>
-    <li>Add nodegrp option to page and add a link to this page on the task list.</li>
-    <li>Update monitoring of install progress</li>
-    <li>Add list &amp; manipulation of install images (sets of distro rpms) that
-    are in /csminstall</li>
-  </ul>
-    </li>
-  <li>Add copycsmpkgs to Updatenode page.</li>
-  <li>Make the perf mon page extensible so users can add their
-        own conditions </li>
-    <li>Make the main page extensible so users can add their own
-        attributes to be shown in the node table. </li>
-  <li>Make the main page monitor the node Status and update it</li>
-  <li>Network management:
-  <ul>
-    <li>Query status, link speed, throughput of all network adapters on a node</li>
-  </ul>
-  </li>
-  <li>Implement a summary page</li>
-    <li>Software Maintenance page: &nbsp;Allow distro CDs to be
-        made available as ISOs and mounted</li>
-  <li>Modify the web interface so it can start up before CSM is
-        installed, so it can be used to install CSM on the mgmt
-        svr.</li>
-  <li>Have this interface launched from the new CSM LWC console and from IBM
-  Director.</li>
-</ul>
-
-<h3>Known Defects and Limitations</h3>
-
-<ul>
-  <li>Perfmon graph page doesn't download gnuplot for SuSE
-        correctly.</li>
-  <li>When you use the browser's Back button to return to the
-        main page, the image checkboxes of the rack nodes are not
-        checked.</li>
-</ul>
-
-<p>The <b>Change Log</b> describing recent enhancements is in the
-<a href="README">README file</a>.</p>
-</body>
-</html>
diff --git a/xCAT-web/support/about.php b/xCAT-web/support/about.php
new file mode 100644
index 000000000..6b483df59
--- /dev/null
+++ b/xCAT-web/support/about.php
@@ -0,0 +1,20 @@
+<?php
+
+// Display info about this web interface
+
+$TOPDIR = '..';
+require_once "$TOPDIR/lib/functions.php";
+
+insertHeader('About', NULL, NULL, array('support','about'));
+?>
+<h4>xCAT Web Interface version:  ???</h4>
+
+<h4>Developers</h4>
+
+<ul>
+  <li>Vallard Benincosa</li>
+  <li>Bruce Potter</li>
+  <li>Quyen Nguyen</li>
+</ul>
+</body>
+</html>
diff --git a/xCAT-web/support/diagnose.php b/xCAT-web/support/diagnose.php
new file mode 100644
index 000000000..20966fd88
--- /dev/null
+++ b/xCAT-web/support/diagnose.php
@@ -0,0 +1,11 @@
+<?php
+
+// Utilities to help diagnose problems in the cluster
+
+$TOPDIR = '..';
+require_once "$TOPDIR/lib/functions.php";
+
+insertHeader('Diagnose', NULL, NULL, array('support','diagnose'));
+insertNotDoneYet();
+echo '</body></html>';
+?>
diff --git a/xCAT-web/support/suggest.php b/xCAT-web/support/suggest.php
new file mode 100644
index 000000000..7f690eec3
--- /dev/null
+++ b/xCAT-web/support/suggest.php
@@ -0,0 +1,54 @@
+<?php
+
+// Allow the user to set preferences for this web interface
+
+$TOPDIR = '..';
+require_once "$TOPDIR/lib/functions.php";
+
+insertHeader('Suggestions', NULL, NULL, array('support','suggest'));
+?>
+
+<h1>Send Sugestions to the CSM Development Team</h1>
+
+<p>Suggestions, bug reports, bug fixes, etc., are always welcome. Please post them to the
+<A href="http://xcat.org/mailman/listinfo/xcat-user" >xCAT mailing list</A>.
+Contributions are also welcome, such as minor new features, better
+images, or even whole new pages.
+See <a href="https://sourceforge.net/projects/xcat">xCAT on SourceForge</a>. Thanks!</p>
+
+<h3>Todo List</h3>
+
+<p>The following items are already on our todo list, in
+approximately priority order:</p>
+
+<ul>
+  <li>Update the spec file for this web interface to have all the necessary post installation scripts.</li>
+  <li>One button update of this web interface from the internet.</li>
+  <li>Restructure the files in lib/XCAT and js_xcat to make them simpler.</li>
+  <li>Have the task pane save the current task in the cookie and have each page set the current task.</li>
+  <li>Do frame view and rack layout pages.</li>
+  <li>Do several of the buttons within the machines views:
+  <ul>
+    <li>Attributes</li>
+    <li>Ping</li>
+    <li>Run Cmds</li>
+    <li>Copy Files</li>
+    <li>Create Group</li>
+    <li>Diagnose</li>
+  </ul>
+  </li>
+  <li>Do RMC configuration pages</li>
+  <li>Do Cluster Settings (site table) page</li>
+  <li>Start set up cluster wizard page.</li>
+  <li>Do a summary page that lists # of bad nodes, # of jobs, etc.</li>
+</ul>
+
+<h3>Known Defects and Limitations</h3>
+
+<ul>
+  <li>to be filled in...</li>
+</ul>
+
+<p>The <b>Change Log</b> describing recent enhancements is in the xcat-web spec file</a>.</p>
+</body>
+</html>
diff --git a/xCAT-web/softmaint/updategui.php b/xCAT-web/support/updategui.php
similarity index 100%
rename from xCAT-web/softmaint/updategui.php
rename to xCAT-web/support/updategui.php