first pass at new nav

Signed-off-by: Chris Jones <chris@jonezy.org>
Merge branch 'new-nav'