Fix the way how we render main menu, render sub menu with markup requested by Tom
Set active menu for content types and paths - issue #805