cleaned up and separated out nav from main-site-nav

main-site-nav is now just a modifer of the nav block