diff -ur old/cobbler/webui/CobblerWeb.py build/cobbler/webui/CobblerWeb.py
--- old/cobbler/webui/CobblerWeb.py	2008-11-20 09:22:38.000000000 +0100
+++ build/cobbler/webui/CobblerWeb.py	2008-11-20 09:53:51.000000000 +0100
@@ -36,9 +36,10 @@
     it all run either under cgi-bin or CherryPy.  Supporting other Python
     frameworks should be trivial.
     """
-    def __init__(self, server=None, base_url='/', username=None, password=None, token=None, apache=None):
+    def __init__(self, server=None, base_url='/', mode=None, username=None, password=None, token=None, apache=None):
         self.server = server
         self.base_url = base_url
+        self.mode = mode
         self.remote = None
         self.token = token
         self.username = username
@@ -95,6 +96,7 @@
         of files while we're at it.
         """
         data['base_url'] = self.base_url
+        data['mode'] = self.mode
         filepath = os.path.join("/usr/share/cobbler/webui_templates/",template)
         tmpl = Template( file=filepath, searchList=[data] )
         return str(tmpl)
diff -ur old/scripts/index.py build/scripts/index.py
--- old/scripts/index.py	2008-11-17 09:18:05.000000000 +0100
+++ build/scripts/index.py	2008-11-20 09:52:52.000000000 +0100
@@ -107,17 +107,19 @@
 
     http_port = utils.parse_settings_lame("http_port",default="80")
 
+    mode = form.get('mode','index')
+
     # instantiate a CobblerWeb object
     cw = CobblerWeb.CobblerWeb(
          apache   = apache,
          token    = token, 
          base_url = "/cobbler/web/",
+         mode     = mode,
          server   = "http://127.0.0.1:%s/cobbler_api_rw" % http_port
     )
 
     # check for a valid path/mode
     # handle invalid paths gracefully
-    mode = form.get('mode','index')
     if mode in cw.modes():
         func = getattr( cw, mode )
         content = func( **form )
diff -ur old/webui_content/style.css build/webui_content/style.css
--- old/webui_content/style.css	2008-11-19 10:42:29.000000000 +0100
+++ build/webui_content/style.css	2008-11-20 10:39:26.000000000 +0100
@@ -67,12 +67,20 @@
   text-decoration: none;
 }
 
-ul#nav li#active {
-  list-style-image: url('http://cobbler.et.redhat.com/img/current-page.png');
+ul#nav li#active a, ul#nav li#active a:link, ul#nav li#active a:visited { */
+  list-style-image: url('/cobbler/webui/current-page.png');
+  color: white;
 }
 
-ul#nav li#active a, ul#nav li#active a:link, ul#nav li#active a:visited {
-  color: white;
+ul#navaction {
+  margin-left: 1em;
+  padding-left: 0;
+  list-style-type: none;
+}
+
+ul#navaction li a {
+  color: #C8C800;
+  text-decoration: none;
 }
 
 div#feed {
@@ -159,7 +167,7 @@
 }
 
 .back-to-top {
-  background: url('http://cobbler.et.redhat.com/img/up-arrow.gif') left no-repeat;
+  background: url('/cobbler/webui/up-arrow.gif') left no-repeat;
   padding-left: 20px;
   font-size: small;
 }
@@ -222,5 +230,3 @@
         background-image:       url('icon-tip.png');
         background-repeat:      no-repeat;
 }
-
-
diff -ur old/webui_templates/master.tmpl build/webui_templates/master.tmpl
--- old/webui_templates/master.tmpl	2008-11-20 09:23:09.000000000 +0100
+++ build/webui_templates/master.tmpl	2008-11-20 10:41:12.000000000 +0100
@@ -31,22 +88,43 @@
         <li><a href="/cobbler/webui/wui.html" class="menu">Docs</a></li>
         <li><a href="$base_url?mode=settings_view" class="menu">Settings</a></li>
         <li><hr/></li>
-        <li>LIST</li>
         <li><a href="$base_url?mode=distro_list" class="menu">Distros</a></li>
+	    #if $mode == "distro_list"
+    	    <ul id="navaction">
+        	<li><a href="$base_url?mode=distro_edit" class="menu">Add</a></li>
+	    </ul>
+	    #end if
         <li><a href="$base_url?mode=profile_list" class="menu">Profiles</a></li>
+	    #if $mode == "profile_list"
+    	    <ul id="navaction">
+        	<li><a href="$base_url?mode=profile_edit" class="menu">Add</a></li>
+    		<li><a href="$base_url?mode=subprofile_edit" class="menu">Add child</a></li>
+	    </ul>
+	    #end if	    
         <li><a href="$base_url?mode=system_list" class="menu">Systems</a></li>
+	    #if $mode == "system_list"       
+    	    <ul id="navaction">
+    		<li><a href="$base_url?mode=system_edit" class="menu">Add</a></li>
+	    </ul>
+	    #end if	    
         <li><a href="$base_url?mode=ksfile_list" class="menu">Kickstarts</a></li>
+	    #if $mode == "ksfile_list"
+    	    <ul id="navaction">
+	        <li><a href="$base_url?mode=ksfile_new" class="menu">Add</a></li>
+	    </ul>
+	    #end if	    
         <li><a href="$base_url?mode=repo_list" class="menu">Repos</a></li>
+	    #if $mode == "repo_list"
+    	    <ul id="navaction">
+	        <li><a href="$base_url?mode=repo_edit" class="menu">Add</a></li>
+	    </ul>
+	    #end if	    
         <li><a href="$base_url?mode=image_list" class="menu">Images</a></li>
-        <li><hr/></li>
-        <li>ADD</li>
-        <li><a href="$base_url?mode=distro_edit" class="menu">Distro</a></li>
-        <li><a href="$base_url?mode=profile_edit" class="menu">Profile</a></li>
-        <li><a href="$base_url?mode=subprofile_edit" class="menu">Subprofile</a></li>
-        <li><a href="$base_url?mode=system_edit" class="menu">System</a></li>
-        <li><a href="$base_url?mode=ksfile_new" class="menu">Kickstart</a></li>
-        <li><a href="$base_url?mode=repo_edit" class="menu">Repo</a></li>
-        <li><a href="$base_url?mode=image_edit" class="menu">Image</a></li>
+	    #if $mode == "image_list"
+    	    <ul id="navaction">
+	        <li><a href="$base_url?mode=image_edit" class="menu">Add</a></li>
+	    </ul>
+	    #end if	    
         <li><hr/><br/></li>
         <li><a class="button sync" href="$base_url?mode=sync">Sync</a></li>
     </ul>