javascript and markup fixes for collapseable nav