Added nested navbar menu support
styles & markup cleanup