Navigation reads beta

/cc @cantlin @rich-nguyen 

Rich do you want to merge your changes in to this?