fix bug 768636 move span tag inside of block site_header_nav
Merge pull request #1281 from shansm/headerfix-branch

fix bug 768636 move span.toggle outside of nav element