fixed navigation submenu issues
added links to navigation
fixed up merge