diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 6c6ebe88c..87d78f75d 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -77,4 +77,8 @@ webgui.
    to allow templates to be hidden from forms and/or management.
  - Added dTree menu to the navigation system 
    (Thanks to Geir Landro, http://www.destroydrop.com)
+ - Added Cool Menus to the navigation system. (Thanks to Thomas Bratili,
+   http://www.dhtmlcentral.com)
+
+
 
diff --git a/docs/upgrades/upgrade_5.9.9-6.0.0.sql b/docs/upgrades/upgrade_5.9.9-6.0.0.sql
index 54402f478..8fac24521 100644
--- a/docs/upgrades/upgrade_5.9.9-6.0.0.sql
+++ b/docs/upgrades/upgrade_5.9.9-6.0.0.sql
@@ -525,6 +525,6 @@ INSERT INTO template VALUES (2,'Events List','<tmpl_if displayTitle>\r\n    <h1>
 INSERT INTO template VALUES (3,'Calendar Month (Small)','<tmpl_if displayTitle>\r\n    <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n    <tmpl_var description><p />\r\n</tmpl_if>\r\n\r\n<tmpl_if session.var.adminOn>\r\n    <a href=\"<tmpl_var addevent.url>\"><tmpl_var addevent.label></a>\r\n    <p />\r\n</tmpl_if>\r\n\r\n\n\n\n<tmpl_loop month_loop>\n	<table border=\"1\" width=\"100%\">\n	<tr><td colspan=7 class=\"tableHeader\"><h2 align=\"center\"><tmpl_var month> <tmpl_var year></h2></td></tr>\n	<tr>\n	<tmpl_if session.user.firstDayOfWeek>\n		<th class=\"tableData\"><tmpl_var monday.label.short></th>\n		<th class=\"tableData\"><tmpl_var tuesday.label.short></th>\n		<th class=\"tableData\"><tmpl_var wednesday.label.short></th>\n		<th class=\"tableData\"><tmpl_var thursday.label.short></th>\n		<th class=\"tableData\"><tmpl_var friday.label.short></th>\n		<th class=\"tableData\"><tmpl_var saturday.label.short></th>\n		<th class=\"tableData\"><tmpl_var sunday.label.short></th>\n	<tmpl_else>\n		<th class=\"tableData\"><tmpl_var sunday.label.short></th>\n		<th class=\"tableData\"><tmpl_var monday.label.short></th>\n		<th class=\"tableData\"><tmpl_var tuesday.label.short></th>\n		<th class=\"tableData\"><tmpl_var wednesday.label.short></th>\n		<th class=\"tableData\"><tmpl_var thursday.label.short></th>\n		<th class=\"tableData\"><tmpl_var friday.label.short></th>\n		<th class=\"tableData\"><tmpl_var saturday.label.short></th>\n	</tmpl_if>\n	</tr><tr>\n	<tmpl_loop prepad_loop>\n		<td>&nbsp;</td>\n	</tmpl_loop>\n 	<tmpl_loop day_loop>\n		<tmpl_if isStartOfWeek>\n			<tr>\n		</tmpl_if>\n		<td class=\"table<tmpl_if isToday>Header<tmpl_else>Data</tmpl_if>\" width=\"28\" valign=\"top\" align=\"left\"><p><b>\n				<tmpl_if url>\n					<a href=\"<tmpl_var url>\"><tmpl_var day></a>\n				<tmpl_else>\n					<tmpl_var day>\n				</tmpl_if>\n		</b></p></td>		\n		<tmpl_if isEndOfWeek>\n			</tr>\n		</tmpl_if>\n	</tmpl_loop>\n	<tmpl_loop postpad_loop>\n		<td>&nbsp;</td>\n	</tmpl_loop>\n	</tr>\n	</table>\n</tmpl_loop>\n\n\n<tmpl_if pagination.pageCount.isMultiple>\n  <div class=\"pagination\">\n    <tmpl_var pagination.previousPage>  &middot; <tmpl_var pagination.pageList.upTo20> &middot; <tmpl_var pagination.nextPage>\n  </div>\n</tmpl_if>\n','EventsCalendar');
 INSERT INTO template VALUES (1,'Calendar Month (Big)','<tmpl_if displayTitle>\r\n    <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n    <tmpl_var description><p />\r\n</tmpl_if>\r\n\r\n<tmpl_if session.var.adminOn>\r\n    <a href=\"<tmpl_var addevent.url>\"><tmpl_var addevent.label></a>\r\n    <p />\r\n</tmpl_if>\r\n\r\n<tmpl_loop month_loop>\n	<table border=\"1\" width=\"100%\">\n	<tr><td colspan=7 class=\"tableHeader\"><h2 align=\"center\"><tmpl_var month> <tmpl_var year></h2></td></tr>\n	<tr>\n	<tmpl_if session.user.firstDayOfWeek>\n		<th class=\"tableData\"><tmpl_var monday.label></th>\n		<th class=\"tableData\"><tmpl_var tuesday.label></th>\n		<th class=\"tableData\"><tmpl_var wednesday.label></th>\n		<th class=\"tableData\"><tmpl_var thursday.label></th>\n		<th class=\"tableData\"><tmpl_var friday.label></th>\n		<th class=\"tableData\"><tmpl_var saturday.label></th>\n		<th class=\"tableData\"><tmpl_var sunday.label></th>\n	<tmpl_else>\n		<th class=\"tableData\"><tmpl_var sunday.label></th>\n		<th class=\"tableData\"><tmpl_var monday.label></th>\n		<th class=\"tableData\"><tmpl_var tuesday.label></th>\n		<th class=\"tableData\"><tmpl_var wednesday.label></th>\n		<th class=\"tableData\"><tmpl_var thursday.label></th>\n		<th class=\"tableData\"><tmpl_var friday.label></th>\n		<th class=\"tableData\"><tmpl_var saturday.label></th>\n	</tmpl_if>\n	</tr><tr>\n	<tmpl_loop prepad_loop>\n		<td>&nbsp;</td>\n	</tmpl_loop>\n 	<tmpl_loop day_loop>\n		<tmpl_if isStartOfWeek>\n			<tr>\n		</tmpl_if>\n		<td class=\"table<tmpl_if isToday>Header<tmpl_else>Data</tmpl_if>\" width=\"14%\" valign=\"top\" align=\"left\"><p><b><tmpl_var day></b></p>\n		<tmpl_loop event_loop>\n			<tmpl_if name>\n				&middot;<a href=\"<tmpl_var url>\"><tmpl_var name></a><br />\n			</tmpl_if>\n		</tmpl_loop>\n		</td>\n		<tmpl_if isEndOfWeek>\n			</tr>\n		</tmpl_if>\n	</tmpl_loop>\n	<tmpl_loop postpad_loop>\n		<td>&nbsp;</td>\n	</tmpl_loop>\n	</tr>\n	</table>\n</tmpl_loop>\n\n\n<tmpl_if pagination.pageCount.isMultiple>\n  <div class=\"pagination\">\n    <tmpl_var pagination.previousPage>  &middot; <tmpl_var pagination.pageList.upTo20> &middot; <tmpl_var pagination.nextPage>\n  </div>\n</tmpl_if>\n','EventsCalendar');
 
-
-
+INSERT INTO template VALUES (7,'Cool Menus','<style>\n/* CoolMenus 4 - default styles - do not edit */\n.cCMAbs{position:absolute; visibility:hidden; left:0; top:0}\n/* CoolMenus 4 - default styles - end */\n\n/*Styles for level 0*/\n.cLevel0,.cLevel0over{position:absolute; padding:2px; font-family:tahoma,arial,helvetica; font-size:12px; font-weight:bold;\n\n}\n.cLevel0{background-color:navy; layer-background-color:navy; color:white;\ntext-align: center;\n}\n.cLevel0over{background-color:navy; layer-background-color:navy; color:white; cursor:pointer; cursor:hand; \ntext-align: center; \n}\n\n.cLevel0border{position:absolute; visibility:hidden; background-color:#569635; layer-background-color:#006699; \n \n}\n\n\n/*Styles for level 1*/\n.cLevel1, .cLevel1over{position:absolute; padding:2px; font-family:tahoma, arial,helvetica; font-size:11px; font-weight:bold}\n.cLevel1{background-color:Navy; layer-background-color:Navy; color:white;}\n.cLevel1over{background-color:#336699; layer-background-color:#336699; color:Yellow; cursor:pointer; cursor:hand; }\n.cLevel1border{position:absolute; visibility:hidden; background-color:#006699; layer-background-color:#006699}\n\n/*Styles for level 2*/\n.cLevel2, .cLevel2over{position:absolute; padding:2px; font-family:tahoma,arial,helvetica; font-size:10px; font-weight:bold}\n.cLevel2{background-color:Navy; layer-background-color:Navy; color:white;}\n.cLevel2over{background-color:#0099cc; layer-background-color:#0099cc; color:Yellow; cursor:pointer; cursor:hand; }\n.cLevel2border{position:absolute; visibility:hidden; background-color:#006699; layer-background-color:#006699}\n\n</style>\n\n  \n\n<script language=\"JavaScript1.2\" src=\"<tmpl_var session.config.extrasURL>/coolmenus/coolmenus4.js\">\n/*****************************************************************************\nCopyright (c) 2001 Thomas Brattli (webmaster@dhtmlcentral.com)\n\nDHTML coolMenus - Get it at coolmenus.dhtmlcentral.com\nVersion 4.0_beta\nThis script can be used freely as long as all copyright messages are\nintact.\n\nExtra info - Coolmenus reference/help - Extra links to help files **** \nCSS help: http://coolmenus.dhtmlcentral.com/projects/coolmenus/reference.asp?m=37\nGeneral: http://coolmenus.dhtmlcentral.com/reference.asp?m=35\nMenu properties: http://coolmenus.dhtmlcentral.com/properties.asp?m=47\nLevel properties: http://coolmenus.dhtmlcentral.com/properties.asp?m=48\n\nBackground bar properties: http://coolmenus.dhtmlcentral.com/properties.asp?m=49\nItem properties: http://coolmenus.dhtmlcentral.com/properties.asp?m=50\n******************************************************************************/\n</script>\n\n\n<script language=\"JavaScript\">\n\n/*** \nThis is the menu creation code - place it right after you body tag\nFeel free to add this to a stand-alone js file and link it to your page.\n**/\n\n//Menu object creation\ncoolmenu=new makeCM(\"coolmenu\") //Making the menu object. Argument: menuname\n\ncoolmenu.frames = 0\n\n//Menu properties   \ncoolmenu.pxBetween=2\ncoolmenu.fromLeft=200 \ncoolmenu.fromTop=100   \ncoolmenu.rows=1\ncoolmenu.menuPlacement=\"center\"   //The whole menu alignment, left, center, or right\n                                                             \ncoolmenu.resizeCheck=1 \ncoolmenu.wait=1000 \ncoolmenu.fillImg=\"cm_fill.gif\"\ncoolmenu.zIndex=100\n\n//Background bar properties\ncoolmenu.useBar=0\ncoolmenu.barWidth=\"100%\"\ncoolmenu.barHeight=\"menu\" \ncoolmenu.barClass=\"cBar\"\ncoolmenu.barX=0 \ncoolmenu.barY=0\ncoolmenu.barBorderX=0\ncoolmenu.barBorderY=0\ncoolmenu.barBorderClass=\"\"\n\n//Level properties - ALL properties have to be spesified in level 0\ncoolmenu.level[0]=new cm_makeLevel() //Add this for each new level\ncoolmenu.level[0].width=110\ncoolmenu.level[0].height=21 \ncoolmenu.level[0].regClass=\"cLevel0\"\ncoolmenu.level[0].overClass=\"cLevel0over\"\ncoolmenu.level[0].borderX=1\ncoolmenu.level[0].borderY=1\ncoolmenu.level[0].borderClass=\"cLevel0border\"\ncoolmenu.level[0].offsetX=0\ncoolmenu.level[0].offsetY=0\ncoolmenu.level[0].rows=0\ncoolmenu.level[0].arrow=0\ncoolmenu.level[0].arrowWidth=0\ncoolmenu.level[0].arrowHeight=0\ncoolmenu.level[0].align=\"bottom\"\n\n//EXAMPLE SUB LEVEL[1] PROPERTIES - You have to specify the properties you want different from LEVEL[0] - If you want all items to look the same just remove this\ncoolmenu.level[1]=new cm_makeLevel() //Add this for each new level (adding one to the number)\ncoolmenu.level[1].width=coolmenu.level[0].width+20\ncoolmenu.level[1].height=25\ncoolmenu.level[1].regClass=\"cLevel1\"\ncoolmenu.level[1].overClass=\"cLevel1over\"\ncoolmenu.level[1].borderX=1\ncoolmenu.level[1].borderY=1\ncoolmenu.level[1].align=\"right\" \ncoolmenu.level[1].offsetX=0\ncoolmenu.level[1].offsetY=0\ncoolmenu.level[1].borderClass=\"cLevel1border\"\n\n\n//EXAMPLE SUB LEVEL[2] PROPERTIES - You have to spesify the properties you want different from LEVEL[1] OR LEVEL[0] - If you want all items to look the same just remove this\ncoolmenu.level[2]=new cm_makeLevel() //Add this for each new level (adding one to the number)\ncoolmenu.level[2].width=coolmenu.level[0].width+20\ncoolmenu.level[2].height=25\ncoolmenu.level[2].offsetX=0\ncoolmenu.level[2].offsetY=0\ncoolmenu.level[2].regClass=\"cLevel2\"\ncoolmenu.level[2].overClass=\"cLevel2over\"\ncoolmenu.level[2].borderClass=\"cLevel2border\"\n\n//EXAMPLE SUB LEVEL[2] PROPERTIES - You have to spesify the properties you want different from LEVEL[1] OR LEVEL[0] - If you want all items to look the same just remove this\ncoolmenu.level[3]=new cm_makeLevel() //Add this for each new level (adding one to the number)\ncoolmenu.level[3].width=coolmenu.level[0].width+20\ncoolmenu.level[3].height=25\ncoolmenu.level[3].offsetX=0\ncoolmenu.level[3].offsetY=0\ncoolmenu.level[3].regClass=\"cLevel2\"\ncoolmenu.level[3].overClass=\"cLevel2over\"\ncoolmenu.level[3].borderClass=\"cLevel2border\"\n\n\n\n<tmpl_loop page_loop>\ncoolmenu.makeMenu(\'coolmenu<tmpl_var page.pageId>\',\'coolmenu<tmpl_var page.parentId>\',\'<tmpl_var page.menuTitle>\',\'<tmpl_var page.url>\'<tmpl_if page.newWindow>,\'_blank\'</tmpl_if>);\n</tmpl_loop>\n\n\ncoolmenu.construct();\n\n</script>','Navigation',1,1);
+INSERT INTO Navigation VALUES (17,'coolmenu',99,'descendants','WebGUIroot',-1,7,0,0,0,0);
 
diff --git a/lib/WebGUI/Navigation.pm b/lib/WebGUI/Navigation.pm
index 1b6b6029a..61f917f75 100644
--- a/lib/WebGUI/Navigation.pm
+++ b/lib/WebGUI/Navigation.pm
@@ -70,8 +70,7 @@ These methods are available from this package:
 #-------------------------------------------------------------------
 sub _getEditButton {
         my $self = shift;
-        return editIcon("op=editNavigation&navigationId=".$self->{_navigationId}."&identifier=".$self->{_identifier})
-              .copyIcon('op=copyNavigation&identifier='.$self->{_identifier}.'&navigationId='.$self->{_navigationId});
+        return editIcon("op=editNavigation&navigationId=".$self->{_navigationId}."&identifier=".$self->{_identifier});
 }
 
 #-------------------------------------------------------------------