Ian/nav

@nicolashery dont merge just yet waiting for ui and product review