Index: /waeup_cms/trunk/skins/WAEUP/portlet_menu.pt
===================================================================
--- /waeup_cms/trunk/skins/WAEUP/portlet_menu.pt	(revision 16)
+++ /waeup_cms/trunk/skins/WAEUP/portlet_menu.pt	(revision 17)
@@ -16,12 +16,11 @@
                      isPlone20 python: True">
          
-      <div class="portletContent odd" id="portlet-navigation-tree">
+      <div>
         <tal:block tal:repeat="item items">
             <metal:item use-macro="context/portlet_menu/macros/item" />
         </tal:block>
       </div>
-      <div class="portletContent odd" style="padding-top: 0"
-           tal:condition="python: menu.portal_type=='TaskMenu' and menu.getMoreLink()">
-        <a href="#" class="portletMore"
+      <div tal:condition="python: menu.portal_type=='TaskMenu' and menu.getMoreLink()">
+        <a href="#"
            tal:attributes="href string:${portal_url}/${menu/getMoreLink}"
            i18n:translate="box_morelink">More...</a>
Index: /waeup_cms/trunk/skins/WAEUP/portlet_navtree_macro.pt
===================================================================
--- /waeup_cms/trunk/skins/WAEUP/portlet_navtree_macro.pt	(revision 17)
+++ /waeup_cms/trunk/skins/WAEUP/portlet_navtree_macro.pt	(revision 17)
@@ -0,0 +1,45 @@
+<tal:navitem repeat="item options/children">
+<li class="navTreeItem visualNoMarker"
+    tal:define="parent_shows_children options/show_children|nothing;
+                children item/children|nothing;
+                myType item/portal_type;
+                badtypes here/portal_properties/navtree_properties/metaTypesNotToList;
+                "
+                
+
+    tal:condition="python: (not item['no_display']) and (item['currentItem'] or parent_shows_children or children) 
+                            and (myType not in badtypes)">
+                           
+
+    <tal:level define="level               options/level|python:0;
+                       item_type_class     python: 'contenttype-' + here.plone_utils.normalizeString(item['portal_type']);
+                       item_wf_state_class python: 'state-' + here.plone_utils.normalizeString(item['review_state']);
+                       isNaviTree          options/isNaviTree | nothing;
+                       ">
+
+    <div tal:attributes="class item_type_class">
+        <a tal:condition="item/currentItem"
+           tal:attributes="href item/absolute_url;
+                           title item/Description|nothing;
+                           class string: $item_wf_state_class navTreeCurrentItem visualIconPadding"
+            tal:content="item/Title|nothing">
+            Selected Item Title</a>
+        <tal:children condition="python: parent_shows_children or children">
+        <a tal:condition="not: item/currentItem"
+           tal:attributes="href item/absolute_url;
+                           title item/Description|nothing;
+                           class string: $item_wf_state_class visualIconPadding;"
+            tal:content="item/Title|nothing">
+            Unselected Item Title</a>
+        </tal:children>
+    </div>
+        
+    <ul tal:attributes="class python:'navTree navTreeLevel'+str(level)"
+        tal:define="show_children item/show_children| python:True;"
+        tal:condition="python: (show_children or isNaviTree) and children"
+        tal:content="structure python:here.portlet_navtree_macro(children=children, level=level+1, show_children=show_children, isNaviTree=isNaviTree)">
+          Get subtree, if available.
+    </ul>
+    </tal:level>
+</li>
+</tal:navitem>
