Fix contentmenu template for add new content types. Added a more sane way to label with a class the li tags in the Plone toolbar. Thi fix last commit errors.