I have mostly implemented the new 2-level nav -- need to polish further