add subnav, wysihtml5
small patch fixes