Two tier nav updates

With mostly working scrolling...