new menu

better menu. updated layouts
Merge branch 'new-nav'